From 00f210e83c9a2e8574583f1c423d2d134071481c Mon Sep 17 00:00:00 2001 From: kabix09 Date: Tue, 20 Dec 2022 04:37:00 +0100 Subject: [PATCH] Wizard - first action --- Assets/Palettes/HouseInside.prefab | 23 +- .../Wizard/PL/WizardFirstDialogue.asset | 14 +- .../Resources/NPC/WizardHouse/Wizard.prefab | 27 +- .../HouseInside/inside_5 1.asset | 36 ++ .../HouseInside/inside_5 1.asset.meta | 8 + Assets/Scenes/WizardHouse.unity | 394 +++++++++++++++++- Assets/Scripts/NPCs' Scripts/NPCFollowing.cs | 58 +-- .../Pathfinding/AStarPathfindingAgent.cs | 1 - .../TileData/Ground - Wizard House.asset | 19 + .../TileData/Ground - Wizard House.asset.meta | 8 + .../Application/NPC/NpcDialogueManager.cs | 7 +- .../Application/NPC/NpcShopManager.cs | 28 +- .../Application/Shared/LanguageDetector.meta | 8 + .../LanguageDetector/LanguageDetector.cs | 37 ++ .../LanguageDetector/LanguageDetector.cs.meta | 11 + .../Domain/Enum/SystemLanguageEnum.cs | 5 + .../Domain/Enum/SystemLanguageEnum.cs.meta | 11 + 17 files changed, 603 insertions(+), 92 deletions(-) create mode 100644 Assets/Scene Sprites/HouseInside/inside_5 1.asset create mode 100644 Assets/Scene Sprites/HouseInside/inside_5 1.asset.meta create mode 100644 Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset create mode 100644 Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset.meta create mode 100644 Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector.meta create mode 100644 Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs create mode 100644 Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs.meta create mode 100644 Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs create mode 100644 Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs.meta diff --git a/Assets/Palettes/HouseInside.prefab b/Assets/Palettes/HouseInside.prefab index 440465ee..5def1355 100644 --- a/Assets/Palettes/HouseInside.prefab +++ b/Assets/Palettes/HouseInside.prefab @@ -27,6 +27,7 @@ Transform: 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_Children: - {fileID: 8200704089772688228} m_Father: {fileID: 0} @@ -72,6 +73,7 @@ Transform: 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_Children: [] m_Father: {fileID: 3486965691320864245} m_RootOrder: 0 @@ -5205,6 +5207,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 12, y: -11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 750 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 14, y: -11, z: 0} second: serializedVersion: 2 @@ -9087,6 +9099,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: d90c4377fe799d24a907e16c49d733cc, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: c0ff3f7c040bfc041a2a0e4aa11c36a1, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 5c6bb9f647437dd4abf63fe1280c5512, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 3105379272556981734, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -9098,7 +9112,7 @@ Tilemap: m_Data: {fileID: 6696878938533527509, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: -3159373967292191595, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 6995023442814134182, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: 5081585780740693538, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -10589,7 +10603,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -179191534720846178, guid: e7698f36d680635418599dd2745a3e61, type: 3} m_TileMatrixArray: - - m_RefCount: 750 + - m_RefCount: 751 m_Data: e00: 1 e01: 0 @@ -10608,7 +10622,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 750 + - m_RefCount: 751 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -10645,6 +10659,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -10682,7 +10697,7 @@ TilemapRenderer: m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &2835299736381380299 +--- !u!114 &4797349935403030433 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialogue.asset b/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialogue.asset index 398f513a..5b2bb79b 100644 --- a/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialogue.asset +++ b/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialogue.asset @@ -103,4 +103,16 @@ MonoBehaviour: Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4759712171538235750, guid: 417d111e604a8124cb960805d809e513, type: 3} + m_TargetAssemblyTypeName: NpcDialogueManager, Assembly-CSharp + m_MethodName: StepEndAction + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Assets/Resources/NPC/WizardHouse/Wizard.prefab b/Assets/Resources/NPC/WizardHouse/Wizard.prefab index 8c70c1df..92adb168 100644 --- a/Assets/Resources/NPC/WizardHouse/Wizard.prefab +++ b/Assets/Resources/NPC/WizardHouse/Wizard.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 4759712171538235752} - component: {fileID: 4759712171538235748} - component: {fileID: 4759712171538235749} + - component: {fileID: 1190203389089447339} - component: {fileID: -8463239967595622325} - component: {fileID: 4759712171538235750} - component: {fileID: 7232042190984337245} @@ -33,6 +34,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.9412931, y: -2.068871, z: 133.20683} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -48,6 +50,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -125,6 +128,26 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 1.5 +--- !u!95 &1190203389089447339 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759712171538235754} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4e408ead2b862ca4685d5ace7011f083, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &-8463239967595622325 MonoBehaviour: m_ObjectHideFlags: 0 @@ -138,6 +161,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Name: Wizard + State: 1 --- !u!114 &4759712171538235750 MonoBehaviour: m_ObjectHideFlags: 0 @@ -193,7 +217,7 @@ MonoBehaviour: isAfterAction: 0 isDuringConversation: 0 actionRadius: 1 - state: 1 + state: 5 --- !u!114 &-7576677615092044163 MonoBehaviour: m_ObjectHideFlags: 0 @@ -213,4 +237,5 @@ MonoBehaviour: walkable: 0 worldPosition: {x: 0, y: 0, z: 0} gridPosition: {x: 0, y: 0} + isChasing: 0 path: [] diff --git a/Assets/Scene Sprites/HouseInside/inside_5 1.asset b/Assets/Scene Sprites/HouseInside/inside_5 1.asset new file mode 100644 index 00000000..bc281896 --- /dev/null +++ b/Assets/Scene Sprites/HouseInside/inside_5 1.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: inside_5 1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 6995023442814134182, guid: e7698f36d680635418599dd2745a3e61, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Scene Sprites/HouseInside/inside_5 1.asset.meta b/Assets/Scene Sprites/HouseInside/inside_5 1.asset.meta new file mode 100644 index 00000000..c8364a14 --- /dev/null +++ b/Assets/Scene Sprites/HouseInside/inside_5 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c6bb9f647437dd4abf63fe1280c5512 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index 2cd805c8..58a6f18b 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -151,6 +151,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1871643637} m_RootOrder: 0 @@ -226,6 +227,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 28, y: 17.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 31 @@ -241,6 +243,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -400,6 +403,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1197245780} - {fileID: 1119076090} @@ -449,6 +453,7 @@ Transform: 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_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -486,6 +491,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 42.26, y: 15.92, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 19 @@ -531,6 +537,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -599,6 +606,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 13, y: 22.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 5 @@ -614,6 +622,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -718,6 +727,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2116489015} m_RootOrder: 2 @@ -880,6 +890,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 182615358} m_RootOrder: 0 @@ -954,6 +965,7 @@ Transform: 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_Children: [] m_Father: {fileID: 123966187} m_RootOrder: 3 @@ -1021,6 +1033,7 @@ Transform: 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_Children: - {fileID: 970484981} - {fileID: 736555228} @@ -1041,6 +1054,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -11581,7 +11595,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 40 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -12111,7 +12125,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 14 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -13230,8 +13244,8 @@ Tilemap: - first: {x: 11, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 40 + m_TileIndex: 41 + m_TileSpriteIndex: 39 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -13880,8 +13894,8 @@ Tilemap: - first: {x: 16, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 40 + m_TileIndex: 41 + m_TileSpriteIndex: 39 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -14460,8 +14474,8 @@ Tilemap: - first: {x: 14, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 40 + m_TileIndex: 41 + m_TileSpriteIndex: 39 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -15010,8 +15024,8 @@ Tilemap: - first: {x: 9, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 40 + m_TileIndex: 41 + m_TileSpriteIndex: 39 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -21959,9 +21973,9 @@ Tilemap: m_Data: {fileID: 11400000, guid: d7dc9ff406354dc4f89f69ecf7694bb7, type: 2} - m_RefCount: 30 m_Data: {fileID: 11400000, guid: bec11d2d34297a3408bbc98c5c458271, type: 2} - - m_RefCount: 4 - m_Data: {fileID: 11400000, guid: 92a70a1ec8ca28449a478c3c342192ee, type: 2} - - m_RefCount: 42 + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 46 m_Data: {fileID: 11400000, guid: 0ee6194169e25d549b4d73f743602734, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: a49aee5eb8adb5a47a830d6fa0ac46d6, type: 2} @@ -22042,10 +22056,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: -2398560551144953831, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 151343189093169592, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -2580247301756904582, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 3 m_Data: {fileID: -1250751726918572047, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} - m_RefCount: 1 @@ -22088,10 +22102,10 @@ Tilemap: m_Data: {fileID: -6819854677430199386, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} - m_RefCount: 4 m_Data: {fileID: 8383326030176537407, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} - - m_RefCount: 42 + - m_RefCount: 46 m_Data: {fileID: 6785954314084845185, guid: e7698f36d680635418599dd2745a3e61, type: 3} - - m_RefCount: 4 - m_Data: {fileID: 5255221295182832467, guid: e7698f36d680635418599dd2745a3e61, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -2580247301756904582, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: 8545433974396740287, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 2 @@ -22214,6 +22228,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 26.48, y: 23.489, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1532943573} m_Father: {fileID: 1690057315} @@ -22230,6 +22245,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -22326,6 +22342,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4602706, y: -0.8430535, z: -2.7875266} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 @@ -22357,6 +22374,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 93305069} - {fileID: 1121980354} @@ -22460,6 +22478,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14.003, y: 22.084, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 6 @@ -22475,6 +22494,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -22583,6 +22603,7 @@ Transform: 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_Children: - {fileID: 1546781089} - {fileID: 123966187} @@ -22620,6 +22641,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 39.004, y: 16.385, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 23 @@ -22666,6 +22688,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -22737,6 +22760,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1111939640} m_RootOrder: 3 @@ -22900,6 +22924,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1319528602} - {fileID: 2087434078} @@ -22979,6 +23004,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 32.99, y: 22.206, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 17 @@ -23025,6 +23051,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -23091,6 +23118,7 @@ RectTransform: 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_Children: - {fileID: 736132788} m_Father: {fileID: 182615358} @@ -23129,6 +23157,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 25.008, y: 27.709, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 8 @@ -23174,6 +23203,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -23242,6 +23272,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 36.92, y: 26.19, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 24 @@ -23294,6 +23325,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -23362,6 +23394,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 825517630} - {fileID: 949853989} @@ -23440,6 +23473,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 123966187} m_RootOrder: 4 @@ -23529,6 +23563,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 36, y: 20, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 18 @@ -23591,6 +23626,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 729464758} m_RootOrder: 3 @@ -23666,6 +23702,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 505800830} m_RootOrder: 0 @@ -23741,6 +23778,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 12.788, y: 17.925, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 11 @@ -23756,6 +23794,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -23853,6 +23892,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1848909921} - {fileID: 1393296043} @@ -23931,6 +23971,7 @@ RectTransform: 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_Children: - {fileID: 1022610406} m_Father: {fileID: 654061994} @@ -23968,6 +24009,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 13.794, y: 27.192, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 14 @@ -23983,6 +24025,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -24052,6 +24095,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1330636596} m_RootOrder: 0 @@ -24177,6 +24221,18 @@ PrefabInstance: propertyPath: tilemap value: objectReference: {fileID: 123966189} + - target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3} + propertyPath: mapSize.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3} + propertyPath: mapSize.y + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 3079617781123838031, guid: 6b44df46620f48f41903e7858379f704, type: 3} + propertyPath: TileDatas.Array.data[0] + value: + objectReference: {fileID: 11400000, guid: 968830a9b677b6e46bbc887a37627ac6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b44df46620f48f41903e7858379f704, type: 3} --- !u!1 &503438401 @@ -24207,6 +24263,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 505800830} m_RootOrder: 3 @@ -24287,6 +24344,7 @@ RectTransform: 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_Children: - {fileID: 381983244} - {fileID: 954225005} @@ -24411,6 +24469,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 23.94, y: 23.18, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 35 @@ -24457,6 +24516,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -24524,6 +24584,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1144548810} m_RootOrder: 3 @@ -24537,9 +24598,10 @@ MonoBehaviour: m_GameObject: {fileID: 543241738} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a200e4962f3c3e04d8d1eaec90f407cc, type: 3} + m_Script: {fileID: 11500000, guid: e54b4b7aad48d1a4cb5bb17f73048fa7, type: 3} m_Name: m_EditorClassIdentifier: + isAfterReset: 0 --- !u!1 &549018180 GameObject: m_ObjectHideFlags: 0 @@ -24567,6 +24629,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -659.28564, y: -370.71426, z: 0} m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 914701147} m_RootOrder: 0 @@ -24582,6 +24645,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -24655,6 +24719,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 729464758} m_RootOrder: 1 @@ -24846,6 +24911,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 729464758} m_RootOrder: 2 @@ -25007,6 +25073,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.9589837} m_LocalScale: {x: 2, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 990767761} - {fileID: 1810835383} @@ -25110,6 +25177,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1121980354} m_RootOrder: 0 @@ -25184,6 +25252,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 19.293, y: 23.492, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 37 @@ -25199,6 +25268,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -25269,6 +25339,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 729464758} m_RootOrder: 0 @@ -25376,6 +25447,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 12.788, y: 15.925, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 12 @@ -25391,6 +25463,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -25488,6 +25561,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 38.009, y: 27.455, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 28 @@ -25540,6 +25614,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -25608,6 +25683,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 686847451} - {fileID: 579432192} @@ -25687,6 +25763,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 239388425} m_RootOrder: 0 @@ -25761,6 +25838,7 @@ Transform: 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_Children: [] m_Father: {fileID: 123966187} m_RootOrder: 1 @@ -25834,6 +25912,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 37.982, y: 17.367, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 21 @@ -25879,6 +25958,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -25950,6 +26030,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 350505633} m_RootOrder: 3 @@ -26113,6 +26194,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 984746020} m_RootOrder: 0 @@ -26192,6 +26274,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 39.004, y: 17.272, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 20 @@ -26207,6 +26290,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -26307,6 +26391,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 350505633} m_RootOrder: 0 @@ -26470,6 +26555,7 @@ Transform: 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_Children: [] m_Father: {fileID: 192929700} m_RootOrder: 2 @@ -26485,6 +26571,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -26627,6 +26714,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 350505633} m_RootOrder: 2 @@ -26790,6 +26878,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 505800830} m_RootOrder: 2 @@ -26865,6 +26954,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 549018181} m_Father: {fileID: 1296807694} @@ -26940,6 +27030,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 30, y: 20, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 2 @@ -27006,6 +27097,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 350505633} m_RootOrder: 1 @@ -27336,6 +27428,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 505800830} m_RootOrder: 1 @@ -27410,6 +27503,7 @@ Transform: 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_Children: [] m_Father: {fileID: 123966187} m_RootOrder: 0 @@ -27474,6 +27568,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 821634910} - {fileID: 1823960544} @@ -27553,6 +27648,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 654061994} m_RootOrder: 0 @@ -27628,6 +27724,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 40.007, y: 17.367, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 22 @@ -27675,6 +27772,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -27743,6 +27841,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 445619922} m_RootOrder: 0 @@ -27818,6 +27917,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1224728667} - {fileID: 1669603313} @@ -27897,6 +27997,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9499999, y: 0.2, z: 4.799999} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1754029346} - {fileID: 1638143924} @@ -27977,6 +28078,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 41323702} m_RootOrder: 1 @@ -28119,6 +28221,7 @@ RectTransform: 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_Children: - {fileID: 660706621} m_Father: {fileID: 182615358} @@ -28157,6 +28260,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 26.01, y: 28.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 9 @@ -28203,6 +28307,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28270,6 +28375,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1539180721} m_RootOrder: 0 @@ -28317,6 +28423,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 422014595} m_RootOrder: 2 @@ -28541,11 +28648,13 @@ Transform: 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_Children: - {fileID: 1701466737} - {fileID: 1539180721} - {fileID: 2042768023} - {fileID: 543241739} + - {fileID: 1839194624} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28575,6 +28684,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 3 @@ -28607,6 +28717,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1545793234} m_Father: {fileID: 1321775218} @@ -28711,6 +28822,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1.48, y: 1.48, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 41323702} m_RootOrder: 0 @@ -28855,6 +28967,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 30.01, y: 17.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 32 @@ -28870,6 +28983,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28971,6 +29085,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1111939640} m_RootOrder: 0 @@ -29134,6 +29249,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321775218} m_RootOrder: 0 @@ -29213,6 +29329,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 30.004, y: 25.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 27 @@ -29262,6 +29379,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29330,6 +29448,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 28.02, y: 15.79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 34 @@ -29345,6 +29464,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29445,6 +29565,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 29.001, y: 25.803, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 26 @@ -29494,6 +29615,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29562,6 +29684,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14.6, y: 30.271, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 0 @@ -29608,6 +29731,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29702,6 +29826,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4530646, y: -3.8489263, z: 4.197498} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -29733,6 +29858,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1539180721} m_RootOrder: 1 @@ -29779,6 +29905,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1396458363} m_Father: {fileID: 1321775218} @@ -29881,6 +30008,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1618954995} - {fileID: 914701147} @@ -29958,6 +30086,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1539180721} m_RootOrder: 2 @@ -30006,6 +30135,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 984746020} m_RootOrder: 3 @@ -30172,6 +30302,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224657176} m_RootOrder: 0 @@ -30334,6 +30465,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9500031, y: 0.20000178, z: 4.8} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1244895044} - {fileID: 2141892241} @@ -30413,6 +30545,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1871643637} m_RootOrder: 1 @@ -30488,6 +30621,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 498142311} m_Father: {fileID: 1114095954} @@ -30590,6 +30724,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 30.01, y: 15.79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 33 @@ -30605,6 +30740,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30705,6 +30841,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 422014595} m_RootOrder: 1 @@ -30797,6 +30934,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.9412931, y: -3.931129, z: -133.20683} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 52921958} m_Father: {fileID: 0} @@ -30831,6 +30969,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1292506477} m_RootOrder: 0 @@ -30925,6 +31064,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 13.795, y: 26.444, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 15 @@ -30970,6 +31110,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31038,6 +31179,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1871643637} m_RootOrder: 2 @@ -31112,6 +31254,7 @@ Transform: 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_Children: [] m_Father: {fileID: 123966187} m_RootOrder: 2 @@ -31175,6 +31318,7 @@ Transform: 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_Children: [] m_Father: {fileID: 159795063} m_RootOrder: 0 @@ -31236,6 +31380,7 @@ Transform: 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_Children: - {fileID: 1134345425} - {fileID: 1284827861} @@ -31272,6 +31417,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 4.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1177864141} m_RootOrder: 0 @@ -31366,6 +31512,7 @@ Transform: 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_Children: [] m_Father: {fileID: 192929700} m_RootOrder: 0 @@ -31381,6 +31528,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -31609,6 +31757,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1871643637} m_RootOrder: 4 @@ -31781,6 +31930,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.5, y: -15.5, z: 0} m_LocalScale: {x: 1.975, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -31813,6 +31963,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.81, y: 23.492, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 4 @@ -31828,6 +31979,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31898,6 +32050,42 @@ PolygonCollider2D: - {x: 0.07526779, y: -1.2324028} - {x: 0.6131158, y: -1.1927528} - {x: 0.6131151, y: -0.4312675} +--- !u!1 &1594888881 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4759712171538235754, guid: 417d111e604a8124cb960805d809e513, type: 3} + m_PrefabInstance: {fileID: 4759712171552950031} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1594888882 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594888881} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4e408ead2b862ca4685d5ace7011f083, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1594888885 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7232042190984337245, guid: 417d111e604a8124cb960805d809e513, type: 3} + m_PrefabInstance: {fileID: 4759712171552950031} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594888881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a582cacb34cf5c49a4c572aa826a582, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1618954994 GameObject: m_ObjectHideFlags: 0 @@ -31926,6 +32114,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1296807694} m_RootOrder: 0 @@ -32005,6 +32194,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.01, y: 0.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 192929700} m_RootOrder: 4 @@ -32020,6 +32210,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -33325,6 +33516,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1114095954} m_RootOrder: 1 @@ -33404,6 +33596,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 2116489015} m_RootOrder: 4 @@ -33482,6 +33675,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1111939640} m_RootOrder: 1 @@ -33647,6 +33841,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2116489015} m_RootOrder: 0 @@ -33752,6 +33947,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -20.508186, y: -27.991179, z: -3.4962616} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1271000239} - {fileID: 1745953801} @@ -33808,6 +34004,8 @@ GameObject: - component: {fileID: 1701466740} - component: {fileID: 1701466739} - component: {fileID: 1701466738} + - component: {fileID: 1701466744} + - component: {fileID: 1701466743} m_Layer: 0 m_Name: UiManager m_TagString: Untagged @@ -33825,6 +34023,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1144548810} m_RootOrder: 0 @@ -33905,6 +34104,37 @@ MonoBehaviour: DynamicPanel: {fileID: 0} keyToOpen: 113 Elements: [] +--- !u!114 &1701466743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1701466736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 703bf6cf8b4d9d949a3bf7543e072e30, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 0 + Elements: [] +--- !u!114 &1701466744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1701466736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d0be1073753419b9be341d0f373ba56, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicPanel: {fileID: 0} + keyToOpen: 101 + Elements: [] + CurrentShopOwnerName: --- !u!1 &1702764354 GameObject: m_ObjectHideFlags: 0 @@ -33936,6 +34166,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2116489015} m_RootOrder: 3 @@ -34099,6 +34330,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 28, y: 22.46, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 36 @@ -34146,6 +34378,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34214,6 +34447,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 39.009, y: 26.799, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 25 @@ -34263,6 +34497,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34331,6 +34566,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1810835383} m_RootOrder: 0 @@ -34405,6 +34641,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 19, y: 30.46, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 1 @@ -34467,6 +34704,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 6, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1114095954} m_RootOrder: 0 @@ -34546,6 +34784,7 @@ Transform: 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_Children: - {fileID: 1975041134} m_Father: {fileID: 192929700} @@ -34562,6 +34801,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -36129,6 +36369,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 984746020} m_RootOrder: 2 @@ -36208,6 +36449,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 29.02, y: 16.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 30 @@ -36252,6 +36494,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36318,6 +36561,7 @@ RectTransform: 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_Children: - {fileID: 1720096838} m_Father: {fileID: 654061994} @@ -36359,6 +36603,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1111939640} m_RootOrder: 2 @@ -36524,6 +36769,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -36556,6 +36802,7 @@ Transform: 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_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -36588,6 +36835,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 984746020} m_RootOrder: 1 @@ -36639,6 +36887,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823960543} m_CullTransparentMesh: 1 +--- !u!1 &1839194623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1839194624} + - component: {fileID: 1839194625} + m_Layer: 0 + m_Name: ShopManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1839194624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839194623} + 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_Children: [] + m_Father: {fileID: 1144548810} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1839194625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839194623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40e9faa037584ea2bfba8168125f3fde, type: 3} + m_Name: + m_EditorClassIdentifier: + UiManager: {fileID: 0} --- !u!1 &1841894126 GameObject: m_ObjectHideFlags: 0 @@ -36667,6 +36960,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 12.789, y: 19.923, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 10 @@ -36682,6 +36976,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36781,6 +37076,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 422014595} m_RootOrder: 0 @@ -36952,6 +37248,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -36989,6 +37286,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2116489015} m_RootOrder: 1 @@ -37344,6 +37642,7 @@ RectTransform: 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_Children: - {fileID: 23544963} - {fileID: 1329746425} @@ -37466,6 +37765,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1780199715} m_RootOrder: 0 @@ -37498,6 +37798,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 21.009, y: 22.206, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 16 @@ -37513,6 +37814,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37611,6 +37913,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 13.795, y: 27.928, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 13 @@ -37626,6 +37929,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37697,6 +38001,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224657176} m_RootOrder: 3 @@ -37859,6 +38164,7 @@ Transform: 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_Children: [] m_Father: {fileID: 1144548810} m_RootOrder: 2 @@ -37926,6 +38232,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.007, y: 21.929, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1690057315} m_RootOrder: 7 @@ -37941,6 +38248,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38041,6 +38349,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224657176} m_RootOrder: 1 @@ -38205,6 +38514,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1296807694} m_RootOrder: 2 @@ -38349,6 +38659,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224657176} m_RootOrder: 2 @@ -38466,6 +38777,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1688860587} - {fileID: 1868257115} @@ -38509,6 +38821,7 @@ RectTransform: 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_Children: [] m_Father: {fileID: 1871643637} m_RootOrder: 3 @@ -38601,6 +38914,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1321775218} m_RootOrder: 1 @@ -38659,14 +38973,42 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1393757793} m_Modifications: + - target: {fileID: -7576677615092044163, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: currentPosition.walkable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4759712171538235748, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: m_BodyType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4759712171538235748, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: m_LinearDrag + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4759712171538235748, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: m_Constraints + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4759712171538235748, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: m_GravityScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4759712171538235749, guid: 417d111e604a8124cb960805d809e513, type: 3} propertyPath: m_Radius value: 2 objectReference: {fileID: 0} + - target: {fileID: 4759712171538235750, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: languageDetector.InstanceTemplates.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4759712171538235750, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: languageDetector.InstanceTemplates.Array.data[0].Value + value: + objectReference: {fileID: 11400000, guid: d4f0b63e09b976d4a81990d13d767629, type: 2} - target: {fileID: 4759712171538235750, guid: 417d111e604a8124cb960805d809e513, type: 3} propertyPath: EndactionEventList.Array.data[0].Value.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 7232042190984337245, guid: 417d111e604a8124cb960805d809e513, type: 3} + objectReference: {fileID: 1594888885} - target: {fileID: 4759712171538235750, guid: 417d111e604a8124cb960805d809e513, type: 3} propertyPath: EndactionEventList.Array.data[0].Value.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: AfterAction @@ -38719,9 +39061,21 @@ PrefabInstance: propertyPath: m_Name value: Wizard objectReference: {fileID: 0} + - target: {fileID: 7232042190984337245, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: state + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7232042190984337245, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7232042190984337245, guid: 417d111e604a8124cb960805d809e513, type: 3} propertyPath: approaching value: 1 objectReference: {fileID: 0} + - target: {fileID: 7232042190984337245, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: actionRadius + value: 1.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 417d111e604a8124cb960805d809e513, type: 3} diff --git a/Assets/Scripts/NPCs' Scripts/NPCFollowing.cs b/Assets/Scripts/NPCs' Scripts/NPCFollowing.cs index e801a5ae..13e9a4b7 100644 --- a/Assets/Scripts/NPCs' Scripts/NPCFollowing.cs +++ b/Assets/Scripts/NPCs' Scripts/NPCFollowing.cs @@ -2,39 +2,38 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +[RequireComponent(typeof(NPC))] public class NPCFollowing : MonoBehaviour { private Rigidbody2D myRigidbody; public Animator anim; - public Transform homePosition; + public Vector3 homePosition; public Transform targetPosition; public AStarPathfindingAgent agent; - public GameObject player; + //public GameObject player; public bool approaching = false; public bool isAfterAction = false; public bool isDuringConversation = false; - public float actionRadius = 1.0f; - - public NPCStateEnum state = NPCStateEnum.Pending; + public float actionRadius = 1.5f; void Awake() { - //agent = GetComponent(); + agent = GetComponent(); } // Start is called before the first frame update void Start() { isAfterAction = System.Convert.ToBoolean(PlayerPrefs.GetInt(gameObject.GetComponent().name + ".FirstDialogue")); - state = NPCStateEnum.Walking; + gameObject.GetComponent().State = NPCStateEnum.Walking; myRigidbody = GetComponent(); anim = GetComponent(); - + homePosition = new Vector3(gameObject.transform.position.x, gameObject.transform.position.y, gameObject.transform.position.z); targetPosition = GameObject.FindWithTag("Player").transform; } @@ -47,63 +46,53 @@ public class NPCFollowing : MonoBehaviour public void CheckDistance() { StopAllCoroutines(); + if (isAfterAction == false) { if (approaching && Vector2.Distance(targetPosition.position, transform.position) >= actionRadius) { agent.FindPath(); - //transform.position = Vector2.MoveTowards(transform.position, target.position, moveSpeed * Time.deltaTime); + StartCoroutine(agent.FollowPath()); } - /* else if (Vector2.Distance(target.position, transform.position) > chaseRadius) - { - - //Debug.Log(Vector2.Distance(transform.position, path[currentPoint].position)); - - if (Vector2.Distance(transform.position, path[currentPoint].position) > roundingDistance) - { - StopAllCoroutines(); - transform.position = Vector2.MoveTowards(transform.position, path[currentPoint].position, 2 * Time.deltaTime); - } - else - { - changeGoal(); - } - }*/ else if (approaching) { //start dialogue here we want uga bunga - state = NPCStateEnum.Talking; + gameObject.GetComponent().State = NPCStateEnum.Talking; } } else if (!approaching && isAfterAction) { - if (Vector2.Distance(transform.position, homePosition.position) > 1) + if (Vector2.Distance(transform.position, homePosition) > 0.05) { - transform.position = Vector2.MoveTowards(transform.position, homePosition.position, 2 * Time.deltaTime); + transform.position = Vector2.MoveTowards(transform.position, homePosition, 2 * Time.deltaTime); } else { - state = NPCStateEnum.Pending; + gameObject.GetComponent().State = NPCStateEnum.Pending; } } } public void OnTriggerExit2D(Collider2D other) { + // don't listen when component is disabled + if (!gameObject.GetComponent().enabled) + return; + if (approaching && !isAfterAction) { gameObject.GetComponent().Dialogue.BreakDialogueStep(); isDuringConversation = false; - state = NPCStateEnum.Walking; + gameObject.GetComponent().State = NPCStateEnum.Walking; } } public void HandleState() { - switch (state) + switch (gameObject.GetComponent().State) { case NPCStateEnum.Walking: { @@ -140,13 +129,8 @@ public class NPCFollowing : MonoBehaviour { approaching = false; isAfterAction = true; + isDuringConversation = false; PlayerPrefs.SetInt(gameObject.name + ".FirstDialogue", System.Convert.ToInt32(isAfterAction)); - state = NPCStateEnum.Walking; + gameObject.GetComponent().State = NPCStateEnum.Walking; } - - public void SaveCheckpoint() - { - //PlayerPrefs.SetInt(enemyName + "-S", isKilled); - } - } diff --git a/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs b/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs index f233c629..37e43419 100644 --- a/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs +++ b/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs @@ -83,7 +83,6 @@ public class AStarPathfindingAgent : MonoBehaviour myAnim.SetBool("Left", false); } transform.position = Vector3.MoveTowards(current, target, speed * Time.deltaTime); - Debug.Log(current + "target:" + target); yield return null; } } diff --git a/Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset b/Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset new file mode 100644 index 00000000..f3fd2b60 --- /dev/null +++ b/Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9890013e3eb0ea54b90ab8d093688ac6, type: 3} + m_Name: Ground - Wizard House + m_EditorClassIdentifier: + Tiles: + - {fileID: 11400000, guid: 8c3ddee63bc5db14db29c992ee3723b7, type: 2} + - {fileID: 11400000, guid: 0ee6194169e25d549b4d73f743602734, type: 2} + - {fileID: 11400000, guid: 329a66bde198f1940b719c63b8a3a0e6, type: 2} + walkable: 1 diff --git a/Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset.meta b/Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset.meta new file mode 100644 index 00000000..458f9efc --- /dev/null +++ b/Assets/Scripts/Pathfinding/TileData/Ground - Wizard House.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 968830a9b677b6e46bbc887a37627ac6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Application/NPC/NpcDialogueManager.cs b/Assets/Scripts/REFACTORING/Application/NPC/NpcDialogueManager.cs index 62cf372f..e86a6ddd 100644 --- a/Assets/Scripts/REFACTORING/Application/NPC/NpcDialogueManager.cs +++ b/Assets/Scripts/REFACTORING/Application/NPC/NpcDialogueManager.cs @@ -6,14 +6,13 @@ using UnityEngine; using UnityEngine.Events; [RequireComponent(typeof(NPC))] -[Serializable] public class NpcDialogueManager : MonoBehaviour { [SerializeField] public string SpeakerName; [SerializeField] - public MultiDialogue DialogueTemplate; + public LanguageDetector languageDetector; /* We user object CLONED TO PREVENT overwritting changes in main object inassets */ [SerializeField] @@ -24,8 +23,10 @@ public class NpcDialogueManager : MonoBehaviour public void Start() { - Dialogue = Instantiate(DialogueTemplate); + Dialogue = Instantiate(languageDetector.DetectInstanceBasedOnLanguage()); Dialogue.SetSpeakerName(SpeakerName); + + Dialogue.Dialogues.ForEach(dial => dial.Value.SetActionAfterDialogueStep(dial.Key, dial.Value.ResetDialogue)); // reset dial } public void Update() { } diff --git a/Assets/Scripts/REFACTORING/Application/NPC/NpcShopManager.cs b/Assets/Scripts/REFACTORING/Application/NPC/NpcShopManager.cs index 94a4cb89..18105bac 100644 --- a/Assets/Scripts/REFACTORING/Application/NPC/NpcShopManager.cs +++ b/Assets/Scripts/REFACTORING/Application/NPC/NpcShopManager.cs @@ -6,10 +6,10 @@ using UnityEngine; using UnityEngine.SceneManagement; [RequireComponent(typeof(NPC))] -class NpcShopManager : MonoBehaviour +public class NpcShopManager : MonoBehaviour { [SerializeField] - public List> DialogueTemplate; + public LanguageDetector languageDetector; /* We user object CLONED TO PREVENT overwritting changes in main object inassets */ public Dialogue Dialogue; @@ -97,7 +97,7 @@ class NpcShopManager : MonoBehaviour public void CreateInstanceBasedOnLanguage() { - Dialogue = Instantiate(DetectInstanceBasedOnLanguage()); + Dialogue = Instantiate(languageDetector.DetectInstanceBasedOnLanguage()); Dialogue.SetSpeakerName(gameObject.GetComponent().name); Dialogue.SetActionAfterDialogueStep(0, Dialogue.ResetDialogue); Dialogue.SetActionAfterDialogueStep(0, OpenShop); @@ -138,27 +138,5 @@ class NpcShopManager : MonoBehaviour ShopUIManager.Instance.ClosePanel(); } - - public Dialogue DetectInstanceBasedOnLanguage() - { - /*if (!PlayerPrefs.HasKey("language")) - throw new Exception("Language not setted !!!");*/ - - switch(PlayerPrefs.GetString("language")) - { - case "English": - { - return DialogueTemplate.Where(template => template.Key == SystemLanguageEnum.English).First().Value; - } - case "Polish": - { - return DialogueTemplate.Where(template => template.Key == SystemLanguageEnum.Polish).First().Value; - } - default: - { - return DialogueTemplate.Where(template => template.Key == SystemLanguageEnum.Polish).First().Value; - } - } - } } diff --git a/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector.meta b/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector.meta new file mode 100644 index 00000000..8ed4ed44 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cf4c4c44d6cc154bb21b10b864fefb5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs b/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs new file mode 100644 index 00000000..e0e4654c --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +[Serializable] +public class LanguageDetector +{ + [SerializeField] + public List> InstanceTemplates; + + + public T DetectInstanceBasedOnLanguage() + { + /*if (!PlayerPrefs.HasKey("language")) + throw new Exception("Language not setted !!!");*/ + + switch (PlayerPrefs.GetString("language")) + { + case "English": + { + return InstanceTemplates.Where(template => template.Key == SystemLanguageEnum.English).First().Value; + } + case "Polish": + { + return InstanceTemplates.Where(template => template.Key == SystemLanguageEnum.Polish).First().Value; + } + default: + { + return InstanceTemplates.Where(template => template.Key == SystemLanguageEnum.Polish).First().Value; + } + } + } +} + diff --git a/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs.meta b/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs.meta new file mode 100644 index 00000000..3be9be53 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/Shared/LanguageDetector/LanguageDetector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0d1b9bde94433a94fae37ee26490c838 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs b/Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs new file mode 100644 index 00000000..aaf5dc3c --- /dev/null +++ b/Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs @@ -0,0 +1,5 @@ +public enum SystemLanguageEnum +{ + Polish, + English +} \ No newline at end of file diff --git a/Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs.meta b/Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs.meta new file mode 100644 index 00000000..ba676fe9 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Domain/Enum/SystemLanguageEnum.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0a2d284cc5c4464418386d1b5484d6a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: