From bc1c12d97b6f4838de3d3525f6028640c8ead23f Mon Sep 17 00:00:00 2001 From: Pasha Bibko <156938226+PashaBibko@users.noreply.github.com> Date: Tue, 20 Jan 2026 12:39:22 +0000 Subject: [PATCH] Updated art assets --- Assets/Prefabs/Art3D/ShieldBar.prefab | 42 +++--- Assets/Prefabs/Art3D/WeaponStats.prefab | 101 ++++++++++--- Assets/Prefabs/PlayerReplayer.prefab | 102 +++++++++++++- Assets/Scripts/PlayerController.cs | 4 +- Assets/Scripts/Windows/TriviaWindow.cs | 1 - .../Tmp/Character/Character_V001.controller | 43 ++++++ .../Character/Character_V001.controller.meta | 8 ++ Assets/Tmp/Map/Materials/Mat1.mat | 15 +- Assets/Tmp/Map/Materials/Mat2.mat | 15 +- Assets/Tmp/Map/Materials/Mat3.mat | 15 +- Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx | Bin 4156 -> 0 bytes Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx | Bin 0 -> 25724 bytes ...V001.fbx.meta => Shield_Bar_V002.fbx.meta} | 2 +- Assets/Tmp/WeaponStats/Mat1.mat | 133 ++++++++++++++++++ Assets/Tmp/WeaponStats/Mat1.mat.meta | 8 ++ Assets/Tmp/WeaponStats/Mat2.mat | 133 ++++++++++++++++++ Assets/Tmp/WeaponStats/Mat2.mat.meta | 8 ++ Assets/Tmp/WeaponStats/Mat3.mat | 133 ++++++++++++++++++ Assets/Tmp/WeaponStats/Mat3.mat.meta | 8 ++ 19 files changed, 707 insertions(+), 64 deletions(-) create mode 100644 Assets/Tmp/Character/Character_V001.controller create mode 100644 Assets/Tmp/Character/Character_V001.controller.meta delete mode 100644 Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx create mode 100644 Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx rename Assets/Tmp/ShieldBar/{Shield_Bar_V001.fbx.meta => Shield_Bar_V002.fbx.meta} (98%) create mode 100644 Assets/Tmp/WeaponStats/Mat1.mat create mode 100644 Assets/Tmp/WeaponStats/Mat1.mat.meta create mode 100644 Assets/Tmp/WeaponStats/Mat2.mat create mode 100644 Assets/Tmp/WeaponStats/Mat2.mat.meta create mode 100644 Assets/Tmp/WeaponStats/Mat3.mat create mode 100644 Assets/Tmp/WeaponStats/Mat3.mat.meta diff --git a/Assets/Prefabs/Art3D/ShieldBar.prefab b/Assets/Prefabs/Art3D/ShieldBar.prefab index 940cddc..dfd87c4 100644 --- a/Assets/Prefabs/Art3D/ShieldBar.prefab +++ b/Assets/Prefabs/Art3D/ShieldBar.prefab @@ -25,14 +25,14 @@ Transform: m_GameObject: {fileID: 228621501325938318} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 3} + m_LocalScale: {x: 0.050000004, y: 0.050000004, z: 0.05} + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 7157999321033704968} + - {fileID: 7207716708273798845} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &7267942319571001827 +--- !u!1001 &7173193334112115030 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -40,69 +40,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4417313079524746681} m_Modifications: - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: 919132149155446097, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_Name - value: Shield_Bar_V001 + value: Shield_Bar_V002 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f4616bcaca9d2874293fcf283b53dc9a, type: 3} ---- !u!4 &7157999321033704968 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} +--- !u!4 &7207716708273798845 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} - m_PrefabInstance: {fileID: 7267942319571001827} + m_PrefabInstance: {fileID: 7173193334112115030} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/WeaponStats.prefab b/Assets/Prefabs/Art3D/WeaponStats.prefab index 5a72c50..7141d1c 100644 --- a/Assets/Prefabs/Art3D/WeaponStats.prefab +++ b/Assets/Prefabs/Art3D/WeaponStats.prefab @@ -29,10 +29,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3999490423349189397} + - {fileID: 958187019283342279} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3462056610295414014 +--- !u!1001 &776470133911274540 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -40,69 +40,134 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1044419668733226994} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8743708241877161412, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8411208151607889731, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -5082775208107051557, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -4494622481652884282, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -4006721073217672483, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -3113411552344121775, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -2773002617504296819, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -540276461574901224, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 34571417957489200, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 919132149155446097, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_Name - value: Weapon_Stats_V002 + value: Weapon_Stats_V003 objectReference: {fileID: 0} + - target: {fileID: 1397318277702805348, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 58e9cc7346ee7d140bfe90df87afcf1c, type: 2} + - target: {fileID: 3630336498685884014, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 4938214463636535541, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 6913809767001870300, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9cc6a53237ebbed4c86848f2af1141fd, type: 3} ---- !u!4 &3999490423349189397 stripped + m_SourcePrefab: {fileID: 100100000, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} +--- !u!4 &958187019283342279 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} - m_PrefabInstance: {fileID: 3462056610295414014} + m_PrefabInstance: {fileID: 776470133911274540} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PlayerReplayer.prefab b/Assets/Prefabs/PlayerReplayer.prefab index e2c187d..fc4333a 100644 --- a/Assets/Prefabs/PlayerReplayer.prefab +++ b/Assets/Prefabs/PlayerReplayer.prefab @@ -97,6 +97,7 @@ Transform: - {fileID: 7845453783053460798} - {fileID: 5020301824866751461} - {fileID: 8852994287323472227} + - {fileID: 8969276565425859046} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1013965729963872153 @@ -117,6 +118,7 @@ MonoBehaviour: BulletTracerEnd: {fileID: 8852994287323472227} k__BackingField: 0 DeathIndices: be000000f8000000eb0100005a0200008f020000 + ShieldBarTransform: {fileID: 0} --- !u!20 &7220179918976106526 Camera: m_ObjectHideFlags: 0 @@ -148,7 +150,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.01 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -286,9 +288,7 @@ LineRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 100} + m_Positions: [] m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -348,3 +348,97 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1001 &2518478724410866651 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1807660236798938897} + m_Modifications: + - target: {fileID: 371116989439902891, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.804 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.016 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 16ff033aae936014092803accad2be58, type: 3} +--- !u!4 &8969276565425859046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + m_PrefabInstance: {fileID: 2518478724410866651} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index d78cd50..cc638c4 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -16,6 +16,8 @@ namespace InterfaceOff.WorldScene [field: SerializeField] public int FrameIndex { get; private set; } [SerializeField] private int[] DeathIndices; + private const int MAX_WINDOWS = 20; + private bool PlayerAlive = true; private float LerpValue; @@ -33,7 +35,7 @@ namespace InterfaceOff.WorldScene /* Iterates the frame index */ FrameIndex = (FrameIndex + 1) % (Frames.Length - 2); - if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > 20) + if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > MAX_WINDOWS) { ActiveWindowSpawner.StartEndSequence(); PlayerAlive = false; diff --git a/Assets/Scripts/Windows/TriviaWindow.cs b/Assets/Scripts/Windows/TriviaWindow.cs index 3aa47bb..0d3c615 100644 --- a/Assets/Scripts/Windows/TriviaWindow.cs +++ b/Assets/Scripts/Windows/TriviaWindow.cs @@ -1,6 +1,5 @@ using UnityEngine; using UnityEngine.UI; -using System.IO; namespace InterfaceOff { diff --git a/Assets/Tmp/Character/Character_V001.controller b/Assets/Tmp/Character/Character_V001.controller new file mode 100644 index 0000000..bb19e54 --- /dev/null +++ b/Assets/Tmp/Character/Character_V001.controller @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Character_V001 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 593256987451643658} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &593256987451643658 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/Tmp/Character/Character_V001.controller.meta b/Assets/Tmp/Character/Character_V001.controller.meta new file mode 100644 index 0000000..cc64214 --- /dev/null +++ b/Assets/Tmp/Character/Character_V001.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c901c9a361bf7ea46af244b1fd21dc33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tmp/Map/Materials/Mat1.mat b/Assets/Tmp/Map/Materials/Mat1.mat index e9bdf11..4276be0 100644 --- a/Assets/Tmp/Map/Materials/Mat1.mat +++ b/Assets/Tmp/Map/Materials/Mat1.mat @@ -11,7 +11,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -25,11 +28,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e0683699358dd9147bebf3d484588b68, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c69dddd0702caf24d86a1f6acb1a37f7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -49,11 +52,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e0683699358dd9147bebf3d484588b68, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ec165470d52a6604eaa2a01f6ffa01f6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -61,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c11f7f7cfc3e0bb41a2a7ae1fadc46e1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Tmp/Map/Materials/Mat2.mat b/Assets/Tmp/Map/Materials/Mat2.mat index e26f3d5..2292686 100644 --- a/Assets/Tmp/Map/Materials/Mat2.mat +++ b/Assets/Tmp/Map/Materials/Mat2.mat @@ -24,7 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -38,11 +41,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0201ab0ded07b894eade1681e98a6905, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 118d86b7052be054494e74b9ec0c1e0b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -62,11 +65,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0201ab0ded07b894eade1681e98a6905, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d006e7eaa040d3f44b94109572a7fbf0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -74,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 103b11e80cc75864db55577d69cecd7c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Tmp/Map/Materials/Mat3.mat b/Assets/Tmp/Map/Materials/Mat3.mat index f23c346..d1bbead 100644 --- a/Assets/Tmp/Map/Materials/Mat3.mat +++ b/Assets/Tmp/Map/Materials/Mat3.mat @@ -24,7 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -38,11 +41,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fc6f6fcba0b2c0d4a8cc1d0ce809d69f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d2e95338f00177e4abcee738a7f983a7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -62,11 +65,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fc6f6fcba0b2c0d4a8cc1d0ce809d69f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: bae07b92a178cc7418451b2e12c7daf1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -74,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0c465f52abd25ce41ad298fed390167b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx b/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx deleted file mode 100644 index b8338291adf5b99a00db4e4b827bfab285b1dd7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4156 zcmc&%OKclO7~Yb%6G~DZh0=mSeM6izrSzdntz$RMk~oR7PAJHt+IYvww(DJMA88_? zLdAg#0tt{P2e>0HMHILofk1+)0#OMh!~rfmRA?pO07cLWzJGRXkE_@z?SWA?J3IgU z-~8`?JYp=GhG)cw1`oyuEywT{<8ft;a&E1nT1J9j~Se5m6#qF zrSj*XRL<_G!s5suBtq+>%<#0Ip~WR>wJqy9!JJ0iefU>FX~`Ii+KpJ;BrUcMyP>DW zu)0@TZO>Xx7%=T7tUn^J>#X29rgjU~18KcGYuUEtN5l&t)QykD&LmblxT3D7-;a+$ zn>ny|e6t@IGdANM(#E&M`{NHLwkNj5M{_#n+Y`xc36+$*0X&=Vbm;}=FwH5t`mOjp zV7oJhO`pn&8l@AIDW7>6BQWj(CrL%xw~_;NnYvq0$<0+$oA`*q+?COpWr0ChbB%UC zDG}OoR$w!om`_N{9eOx(m=yv}I4Kd@Q(-U%s}RE(X}xoVEgp3})8~}$Wy&O*w@|2*IG#wA%eGbE`8AD*gPmoKuv3X}R$*3&$svO0EUyaW zaZrJLJ6=m6j~U3^rEynFxL3sbF9JLhf#2BxToix?_+8+tX3WE|0vRG3AyR@=#YOzG z94gGA1KAw6V`ZUcN1cRKlLPom?%JWoRdqN2OQ@>)l7JTe?USL0ESohk0fm$lDW3od znkyUdz^0_YsNn~?G0)5f4!*a&PA{@lmE}4;{FH#6h@`or5p)y%nz;B2fxbUNM`vgx zIPWW0tw!H`j4@$q6Yug_V`HV+LN-l1t#O(xJJ z922-#Gww#wpqft!&`xq{=43DCo8Q`c{+;!oe)#_BlUrZE@6vBMv5)-HQ`d&cr<4Qz zY7&3(q{sy1gZheKx~`VCn%a>VE2Ac+vmii~^*)#goA>uKVqYcfMBy`o#w1B2v+LkB8P`O+&r2e zibkcJ6`X3sNh;MimpwNIAxTr|+_Z}x+5B8ED8qtNI=9BT?77bfZt^+wrS4WqjO8r- z55^h6zCB{6UULQevJ&*7ijw9#BM7>kO*vMe7Yv&rX96@f^1JDVNEALD3rjP?-PB<) ze%<@HK-q^c=s{6l739C8odOy~)^LQ@gIB6FW8vnIc5MiRKvwu{^1z@@!bi)PC_6+ibiM$X|!3-Xi#(LUW$8-85U4QCQx|FxNM=|JS5;YL~tY%wZW`w zGM(BGbHY-s1!~l+jtZ7-5erE`EPB~+a6k6~uFD8tA_P9co8Ld^t-LD$9>5$b;7bB< z%MJNYes%5xgo<)m@Jr54hkoFehCG;H5}kZ`XYbqxpaw&u02ZUGT97kPl&U5fzb%bB zP{7N?9&DzY-#R>1{Q^$|`Wi*3Xs?4sj0NP&$&F1lNJms5rE}7CgE7RxX#Jk0zDklx zu}M~B9&-xJuiM&7NhwA*Le@e?;gasZCe9=+ss-J|$J-J?GI$GcNJdgM7FmY>ZXprs zTg4ws17Kf+k(5O2h@k6rn3gtlr(MUPB!Uigc+W|j+H%Gb<{uX#a~0E}2kR{H8>9~8 wulL^QI(z!d;+yk-KfU(i#$%jFzn%ZD@#kaD9{%?Cua8~$spq@!`7Pc50!WM_l>h($ diff --git a/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx b/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx new file mode 100644 index 0000000000000000000000000000000000000000..f4e4d6215677651f0e110a721294a114e0e33b57 GIT binary patch literal 25724 zcmeHQd3+Pq_Mg%v-Dp__1xi2=iUMVmvNm05A*F@1K(PvGJ8c7LQj-*0C`$3M2rdYy z2%?BQmiL|t$df06f^3SSfcRvQRg^`RC&(t-?|WwMOeSq6Nz3Q=`Mp1W_rqi+bMN`y zbIv{Y+;f+dA;yXVqs^#INf@O~Fj{ZOP>h-eNad zExE|_!xf0Dft)>pw^3%=Z~h!tt|$?T5>g(4FHqz~BwO-r6{QZ)WmS~&X~^QL2%4pa zi8kISPRBM?nEfjC#6mNslO_nkTpH>g=M=IYN_7Bl1w3_M8$Z=nLt9DoXb2&m*9GZ; z8i?7LZe8)OTc6%B+L)NW!oMytF){NQG;806O6U}mnfIUqGAV_n>;w`d=i1|fPDud0 z(e5x9C-4O-4cs=!MK02mOmd$sJcU7LirhS?2JJyU4^8|%Lr)gbF*2wzE{rR_v~gG1 z88pZZ6(JvRft1>`j*YyBVb2q>qi~b$N70dnqHj##snt~&&IVy(-&}IR_FUdkY_#NN zSokCxsB$HjV9#aUEjQk7=NZe{L5eY-*JczJ<{FAkyt!aZg3&f+L`+P#E*K;% z1;F(swT9CmpHCeii11bT&QLs5KyEMMsWEVWP3Bv*TCem*aFOD-pfG~=Ybr#7e5MX4cB8z9zxr~%Xa@L1a zY=}HOSBim(+rubhL`o9LN$IuTP%uf7D(X$NVvO`$F9^6)MyaURN$IuT8H}3R9P-lW zCUp#Nn!bm$i;?#d$!V;qM(&k^2JoUJd8`N#iCebCZhf+2Il)9^tF z24Y@(jR%f#4LuW0PVGP}cCl464jhGQi6-q^7^0I8%j zGGLZMWQUvtLCI^9@&gkQ133gY(I15=@@s`FSSqZ4HD_I4yx;^`gvi_Z)KCHM;;6Qw z2GZCgxR_oHn1kf=8DeNm7HoA!$wIRP0E{?djnNp7@j}DKTTCTrj{NZ+hGrCYONebDa z7vRf36&Xz76j%A9a}$pwYN)6gVctS4xDFN9Y61|UOG*PIy(BAEqESZ}#9K>vhpl2D zt5MPNzvB3I_ zU5&0S8h|Q&Or(R>x#4_15BKMd5+!{}=i7-^MBYhhMN}!dQgaov6?(yJnM~*yqw{D& z)Cc#Wpp;xp$R8RcQ07Z1q#ITS`?FbSA%rg5DipobR}@zd-rSrleCJC zrUW)wMybiV-5X_&8s$B2l%v%s`=GaY;MQ2K%B|fSr7E}Yd!tn4_7_H}aDGyU%CKRr zP>|A150Azin529h7kW5N;UzkRZ25eO)uuOd}vvs=fD@|=xf^b;}AwVfCaQ(>Wn zx7$Z~54t$+Qy+kGd;tnTa86Qr;%KxlKnV;eMih;@1x=Uqyu~|pJKX|M6A6p)DLl@! z@v?p?im1b|dx@bcd{L&=?zmsrj#!{0ojr=Hny>flh@J&uH7O-t?!yc1_kdb=7Ze5q zCn2LnA<2&`cvbDu2_DH*yK{v{GS$Ak+5?#fw{zMfnJSY}Sn^da zcABM_x0xJ5ysZ*YyvV2&ZiRDx zhHz=NWy)7X40R1Ydto+C@Iys-in`cj&Xg~CgSukRVc6*+Hl`#_Y-R_(Kr0MNHnIJH zrgmdPHO0&@{v_;q4mVngc%Met=2({YfZ@~Nn(G{HWx>=ni*iSBrX@kyv8t*98KP@-aLCDd%MFg^*j z&nt{iLN#k63e{U|DVokA9;5ZBf_O`j*|#o~>jlIof!_53;*&T(0))m{Hq?+fdaHGO zyhB=U5@OWqYl4w&MJhG~lZVPK6~j=EbOS+0t^<{lQ>Kay#nxxsO`rUb_ZL>2EyH4@ z;)e1?nAc9=vA~RT2o5aE;6OoHX{i;f!UX4LO=p)Y3MM(ydUm`6`|5dg*aAl(%GGyV zXba&MLwOkFV4YSXH5bJH#BF2z#DkFOz-3#^Ej!{` z_gB)Qx8lJc${-S^QWB5B`NYj|kdt;4+$3Q^qs;C}IW<<^<+b=%YjVTjeB$O5<0e_u z4S8Bb3}U*Q8=9A{)0Y~g_Pm4T%rTB#4h zvwB48Y8uFjB$@2k1j^^>l$iGo9S{hqX4{=*y!Asqc%!ycLi^6+;7+2> z3?dMgm)NqD67GIDeG?Us7FnZUWyehgzVmyQ@vHDz25eZDnT<9NK1o$l}RB zP`kK&RcNLSe5=KSK2TgpH4UpD1}M@;Ph3DGKZ9LchUk+<1YqwUsa;S3ieV?iWz?ln zgLbHeT@YcL`aL$t5?gHSCBl9Tfb>>#>d28Lb z>f1maBsKGG^<5EsU_s!+`$r%KU$3n!1Sv1D=B(DrH=teu@Y>1($ZymbEV;CDF!W5w z@E+94)T>7FrlMlc9V|!Jo6)rq>1aqv$Gk&rDo|LnxB(}6)QZ1Wvp7s>yjt;7D6Saa zNFMK=Sv?|Y4rLL>Bcg0%g2Kr{wG%$b=bm6R%x94|m*yhz`8fOxKTNL26T~70!8|Ta z>uBP^`$~V*m4!&q%WNl9lp5i8NtA3o!fm=}WE0OS>*=W$=`=H58Wfci0~&2*7nN9M zo50gX{9smEVZi<8MkDvoHpOMwDRmCOdo=1;Qp0;e z!#>Q6XgKot*PqY$$7d(DuGy*`sPBIwGHKJ+epyd1nACjA$y=}P?>hGFdJ|sp-_vqV ztp7s1yS8+uJz@W&+>ww6G-v(lEw~w?d#=sw*2kwWj11Q-=%amTdDOwm)v*h2YM*;| z|X^2-yET*F3{ua3Z2K)g@K)hN?yt|+ov zNHD%!SR*k>vQ-GOb$_|>e4jC()diH6^(h+^&8@9gp0xm>SDBRK>Zc_Vfeig z$I;po^%trKtE0jSR$JT=QwU~AeQghBKvXZ)*GL#glFdSdF3w2O@S5uck0+Ip&!X|j z&?zzkgcEgC{2BJP37#Lol%^CDdHS&pW;o;@g>5pyb5*#s)d!4>Bx)`X>D38IexX&f ztVt#tg1urUz;a}0M5gTp?eK*-eiIj2vo5Ih`KtaizTUa~qW=q@#Z7o{TgIGKg9CqW zdgJo3svA0P#QNho)8B6Om&i6%=dSzbXreN{$c${HS*2MN_QUtuW*fEyeQ}qYJ94!( zUGr7%`Ek#NtX*;9$X)yhxn-LcyhEAQ#^>bXUpVar0Px`!&nEZRgSzG=Z z+i%tE;6rJdeSnI(72%3v+F|dnLZy^^>^DK08hw8hPq&@%4ARU;DQ7_Nc+v zg6;-+m~Yq5zr_EhJNRqM zUpwgce?BkZSa!wNQ!7qxI#Rr`_~_5K6Z^c_c0uoJvmg3?(w6sMJFso)^%p)o*WBI|-`ZP+4J;AkZ^TC&^{Uf&rK8;G8 z>9M{}V``!_Hfc3cFu6*FNxGQaTt$Y{qikVsX{c25C_->(HXCr(`35UqODk*5SSPm{ zBC%^Xk)ctd=%YsZD@JuHKpi7c5Lb{dSD^)2z5Jpl znJ=qWKC>XO;h4=mFGQ`K7_?I}W6Q7c+ndhPo{K#2?yRlfSh-o3GzTNI-^mQgzQi@0 zaWKsAA-AsCvZzNcW=57p?pdsTy7`nH+KXCnHG{EE9z=E(JiaVeWH?>ne)hJO18-QI$Vn|-;unnUJz}nUaP>M~O2O5u z6=in}*L62qU-Lh!S#)9Fb-%NJxxTZ@^ZTRccUU&{Mrh^DOS;NAv8hi^%?zJ)W9sFd zUE?oDytrfU1nt#br(0L;-?FXo;D_GR{Tj<{k3Xk7sjUcH61!pIobq}ULPZ{p|H*%C zvwuXLiJG%PbMM~gnm6Al)n~M57vZnHI`&ExtT*!U)+?h524YUW@#e6=Ryt8y?~&CY zF|t~*{@%Ubea{tdof7!O!%KG^U!VBIijwaqm=>)Ya42-~ngcoSy`(>)S-j1U;#OyR z0~JXAz+GgOuXE3(c#5nle68iOS}k8O1n-g6FTU0#>8<9y%^)$dYJ)8N znGpPDM}Ml-R$9a2#7#k?jq?+C=>zbNmZ?S|7?Yf$+(KuNxh#dq#N-lV?F0oyYN@!e zwnw(;^Ffb&fgL(H$o{&R8V+ zH9;d27!7Wk#4`M47OWi8(8Qkc6C!+ZrUj_RA79(yVn*?{We@f+U=*}IBmN4%x?PmA zT1bB`cF{sHd2z9eUqL}Fn1Ku0CibWWeL7r362?C&8$->90kAd#r^?4|q7uq|m|br`sF~exMP4&-kw0R(52K?oNqP(0V~3Xvl=qv0HQDsYrXvQ6@{qBIyPP>9MG2>iIq^D`*BMED77jfayAE$poZ7NB zXH`&{UKB^6Ug;c!XZ5NyR~7KcTome+@O)73p16&SzOyJ$2yXJ>2#<#%`snU4Qd&8N z;ZeXPllpY7qK|GEjG7vkybtrb&QlO|(#Jd?l0JHhh_vtLMD#%;D6g7!3=^F~G)g#~ zLhjE)!-z!KR+C(TxUD9A6C6XpP_h3LcP@^h1Ir*|QgIB43fk(9;S+ErB^Sr=cMw(U zIX*cC-HD0Ygq|~Y$2*6F2f_AkF*t?gN*&pAOMy9ej-elh+G>_7;rY}~vp`=>y!&ws zUom#-=omsXMQQ5n7)Aqt#8IeM>d2netI}Kx8AEk-3_mdXIyi>rut;jz`)~~708vNB zprVg|FsA-D9K+7xqGKR|Bjghc!l5d?sms{*c+DBw(ueRjqbkK4{Tk0|5j}-`eoAl^ z8-OPzmo9Ba25Gh{F8E9G*6b{lhoeLR=DtM_pyd0En3-sOypp#*4GtdwK%kP^fo+P? zT@@g#!0X@Zxju-k#~BNBg+qD~YA7HZTa{sKjvNaDHXeOb1s zlPF|4El!YHpErJQ08t2M>=fz{RPi$Sps1QmN5kfm@`PnM%OpmF@Yfx2upw<_B**>8 z-qQxZ2Jh()3YqKS3nkLJlq6FN0((?TQ(W~4$Y?I(Q_NPQqfjCXmS}K~VZ|HbIUL1l zf}3JC7P)SS1sFMQ94kqjG+-t1H|2~Xwjeg;;F3~YWE>>GL|9QrB%_4+3x7t)W#3I= zPy*l@j8xb4u(TC4#c{9eKUtM-b=_!$sG{n+PGs+W*0qfhGzA+z==v>I+`F#-t>C0~ zy7q_0sQIam+UdG-l)A1bX8uHe&%Le-S(R>e{VdC@uImrkd!KcElo9x->tIMD>A|yI zC$N&Ww`;4Sj@s#ZPL5~4`u@J2Vqi<%X}H3X&?!8@nLG~!DY^L7aAef*c4~fATHuIx zN94_~PH;z5cfT6^gu4B`JhDjChw$kfW&~CI3O=Z*UF=Vi>@Lf!ZhyT;i$v`~DEn0! zgeWx^Z^Gx=`qTd)o0I(OI7av&-c{@K5_veX{J3>r(A9TZ))(^`iT8g0Eh|}jTfC*H z!=o)qObWu$N6TE#wm5fV9K|c*7;kWAi;+N(l8Y@aK$H4xiy}gfZnrxk&$gJOs|OZp z)a2O~b955VHSg2LsN3S&`k#`ex%Y)O@KM7SMf@DyES6c_7XS04NHiRjvMu%i6(J?# zLpV(^Wy!xfCu{#bcff-g@qhG=J{X*$y)dle_a-ynF5C3O>mjM1cl+ldZs~>P8x46u z`x+1IyfAcW>%hO*S97L$SAY6JyWyqlo1bVf`QcC7RW(f=zj)uj!k3Qkd2z#9zq9s| z#?MSCp0?tHL+5oHzP$NkZiC4MC;IwDXglwi^HccJ9w)bbUUlZlNkfZD>zSg?PCu;e z`@z0#uY{#q|8@5yH?y$&qVeC>HEsbelOL_J>wGG|M`eV&4kbn{nu~QCIv;AFX)w-&JQKPLE3V(@q}$?(rrK z-rrjKVtRwrAGc>`PdyVh>5rpRirb&v`E-JA!!p~S$qgo-->`mm%$(O_@()BT{b;#) zZxg?LlLqqN`0cH%T6=q`uCMXV_LK&jURZx2Y-ZtCYX&#--^cxSIDhf!r$mJwfl{k= zTuIk^kVU$VJ#lK?tp(p7o4<8v+ZNaRG}T;k#wwLz?+- ze<1eYL%W~u^wFXd`>nCtS7qka%lyaA=+lNz8{fKBxS~bIxy81)*ZOtq-XwO_(*?0d zP7f{}ck0E`PGjqHf4fq;@W$6iSKVFo$-K)WC$D(o*bh~Cp+gPj?ceITEby&?(KgN$ zwB%^y%h#@4>=*TM|4S=(e|+rK!r*c7+Lq{Bvf z3AV&-F=@40Mw{=pn6!Q+qkZbOm^6)(C$uNs7Lz7p^0cp&Q9RBjtRpbJWy*6lxl(sK zE_z1VhI6VsQ=Z<)7}B(DlH1}^gkHUP&fnY?mx9dd#YgW&aT>N3T;MF%4mrzfQkx#?^k7wWDF~; zMd4ui54yL&Hx+^|4&(S4AgYHVjc|nsD