diff --git a/Assets/Resources/Dialogue/Wizard/ENG/WizardCaveDial.asset b/Assets/Resources/Dialogue/Wizard/ENG/WizardCaveDial.asset index 005a5c54..655dce69 100644 --- a/Assets/Resources/Dialogue/Wizard/ENG/WizardCaveDial.asset +++ b/Assets/Resources/Dialogue/Wizard/ENG/WizardCaveDial.asset @@ -12,10 +12,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3} m_Name: WizardCaveDial m_EditorClassIdentifier: - SpeakerName: Kabix015 + SpeakerName: kabix09 CurrentStep: 0 DialogueSteps: - - Header: Kabix015 + - Header: kabix09 WasDisplayed: 0 ListOfSentences: - Sentence: Mercenary! You've found me! Do you have the scroll? @@ -42,9 +42,9 @@ MonoBehaviour: ButtonActions: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11400000} - m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp - m_MethodName: GoToNextSentence + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: CheckCondition m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -61,9 +61,9 @@ MonoBehaviour: ButtonActions: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 11400000} - m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp - m_MethodName: GoToNextSentence + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: TakeItem m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -75,43 +75,14 @@ MonoBehaviour: m_CallState: 2 EndOfDialogueStepAction: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - Header: Kabix015 + m_Calls: [] + - Header: kabix09 WasDisplayed: 0 ListOfSentences: - Sentence: Now I posses the unlimited power of the Darkness! The world will be mine! And as your reward, you can choose to join me and help me conquer the world! Buttons: - - ButtonName: I'd be glad to join you. - Type: 1 - ButtonActions: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 11400000, guid: 18c346a423dc37b4cbd99cb02648802c, type: 2} - m_TargetAssemblyTypeName: MultiDialogue, Assembly-CSharp - m_MethodName: GoToNextDialogue - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 1 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - ButtonName: What? Over my dead body! Type: 1 ButtonActions: @@ -129,6 +100,23 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - ButtonName: I'd be glad to join you. + Type: 1 + ButtonActions: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400000, guid: 18c346a423dc37b4cbd99cb02648802c, type: 2} + m_TargetAssemblyTypeName: MultiDialogue, Assembly-CSharp + m_MethodName: GoToNextDialogue + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 EndOfDialogueStepAction: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Dialogue/Wizard/ENG/WizardNoDial.asset b/Assets/Resources/Dialogue/Wizard/ENG/WizardNoDial.asset index f139c9d7..5d6eb943 100644 --- a/Assets/Resources/Dialogue/Wizard/ENG/WizardNoDial.asset +++ b/Assets/Resources/Dialogue/Wizard/ENG/WizardNoDial.asset @@ -12,14 +12,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3} m_Name: WizardNoDial m_EditorClassIdentifier: - SpeakerName: Kabix015 + SpeakerName: kabix09 CurrentStep: 0 DialogueSteps: - - Header: Kabix015 + - Header: kabix09 WasDisplayed: 0 ListOfSentences: - Sentence: You will never find me! Muahahahahahaha! Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: EscapeToDungeon + 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/Dialogue/Wizard/ENG/WizardYesDial.asset b/Assets/Resources/Dialogue/Wizard/ENG/WizardYesDial.asset index a74b32d6..d052d831 100644 --- a/Assets/Resources/Dialogue/Wizard/ENG/WizardYesDial.asset +++ b/Assets/Resources/Dialogue/Wizard/ENG/WizardYesDial.asset @@ -12,14 +12,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3} m_Name: WizardYesDial m_EditorClassIdentifier: - SpeakerName: Kabix015 + SpeakerName: kabix09 CurrentStep: 0 DialogueSteps: - - Header: Kabix015 + - Header: kabix09 WasDisplayed: 0 ListOfSentences: - Sentence: Wise of you. Take this sword as a sign of our alliance! Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: GetReward + 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/Dialogue/Wizard/PL/WizardCaveDialPL.asset b/Assets/Resources/Dialogue/Wizard/PL/WizardCaveDialPL.asset index 24178b50..1277fbf5 100644 --- a/Assets/Resources/Dialogue/Wizard/PL/WizardCaveDialPL.asset +++ b/Assets/Resources/Dialogue/Wizard/PL/WizardCaveDialPL.asset @@ -76,13 +76,13 @@ MonoBehaviour: EndOfDialogueStepAction: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: TakeItem m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: diff --git a/Assets/Resources/Dialogue/Wizard/PL/WizardNoDialPL.asset b/Assets/Resources/Dialogue/Wizard/PL/WizardNoDialPL.asset index 0d8cedb8..d8797b5b 100644 --- a/Assets/Resources/Dialogue/Wizard/PL/WizardNoDialPL.asset +++ b/Assets/Resources/Dialogue/Wizard/PL/WizardNoDialPL.asset @@ -22,4 +22,16 @@ MonoBehaviour: Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: EscapeToDungeon + 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/Dialogue/Wizard/PL/WizardYesDialPL.asset b/Assets/Resources/Dialogue/Wizard/PL/WizardYesDialPL.asset index 6a3b24f4..82e0aaaf 100644 --- a/Assets/Resources/Dialogue/Wizard/PL/WizardYesDialPL.asset +++ b/Assets/Resources/Dialogue/Wizard/PL/WizardYesDialPL.asset @@ -22,4 +22,16 @@ MonoBehaviour: Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 4314423216663515159, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + m_TargetAssemblyTypeName: GetScroolWizard, Assembly-CSharp + m_MethodName: GetReward + 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/Items/NecklaceOfHope.asset b/Assets/Resources/Items/NecklaceOfHope.asset index daf6208f..754c94d7 100644 --- a/Assets/Resources/Items/NecklaceOfHope.asset +++ b/Assets/Resources/Items/NecklaceOfHope.asset @@ -19,7 +19,7 @@ MonoBehaviour: value: 0 image: {fileID: -1042470306147753749, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 4524781388140831047, guid: c08f3c1754b787b4baa4fbe549e1f3f1, type: 3} - price: 170 + price: 370 useEffect: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/NPC/TheCave/TalkingWizard.prefab b/Assets/Resources/NPC/TheCave/TalkingWizard.prefab index dbb40f14..deccdca7 100644 --- a/Assets/Resources/NPC/TheCave/TalkingWizard.prefab +++ b/Assets/Resources/NPC/TheCave/TalkingWizard.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 574776200439751497} - component: {fileID: 2255085012972026895} - component: {fileID: 7400036343426951234} + - component: {fileID: 4314423216663515159} m_Layer: 0 m_Name: TalkingWizard m_TagString: NPC @@ -33,6 +34,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -20.848145, y: 18.195751, z: 133.20683} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6451347682704892650} m_Father: {fileID: 0} @@ -49,6 +51,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -128,7 +131,7 @@ CircleCollider2D: m_Radius: 1.5 --- !u!95 &6815460739701989453 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -141,6 +144,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -157,7 +161,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d622984048644f87804ad1a3f20aa23a, type: 3} m_Name: m_EditorClassIdentifier: - speed: 0.5 + speed: 5 currentPosition: GCost: 0 hCost: 0 @@ -205,6 +209,27 @@ MonoBehaviour: keyToOpen: 101 CanBeOpened: 1 OpenInDefaultWay: 1 +--- !u!114 &4314423216663515159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872844846741150860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 961214ee9197dae4096dc53f82a5169c, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredItem: {fileID: 11400000, guid: e2b2ed01bfff8e0468e4ef5207b50a60, type: 2} + Reward: + Items: + - {fileID: 11400000, guid: 2f8335046aa0e9e4f860fb08bad905f7, type: 2} + - {fileID: 11400000, guid: 8843c76bd7a4cce4190d020494a5bbc9, type: 2} + Cash: 1500 + Experience: 60 + teleportPosition: {fileID: 0} + canEscape: 0 --- !u!1 &3370531153457017342 GameObject: m_ObjectHideFlags: 0 @@ -232,6 +257,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: 872844846741150863} m_RootOrder: 0 diff --git a/Assets/Scenes/TheCave.unity b/Assets/Scenes/TheCave.unity index 5cbe88c8..8152bae7 100644 --- a/Assets/Scenes/TheCave.unity +++ b/Assets/Scenes/TheCave.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: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1315339609} m_RootOrder: 0 @@ -230,6 +231,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.35, y: 0.2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1225012411} m_Father: {fileID: 184083800} @@ -401,9 +403,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6.345227, y: 49.440952, z: -3.263591} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &23852502 GameObject: @@ -433,6 +436,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: 1463806450} m_RootOrder: 0 @@ -508,6 +512,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: 1751060206} m_RootOrder: 5 @@ -585,6 +590,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: 626405957} m_RootOrder: 0 @@ -695,6 +701,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: 1464669569} m_RootOrder: 1 @@ -802,6 +809,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: 1.67, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 936481726} m_Father: {fileID: 174581754} @@ -933,6 +941,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: 1602706375} m_RootOrder: 2 @@ -990,6 +999,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: 913447033} m_RootOrder: 0 @@ -1005,6 +1015,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1086,6 +1097,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: 13 @@ -1130,6 +1142,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: 1273555370} m_RootOrder: 2 @@ -1146,10 +1159,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3} m_Name: m_EditorClassIdentifier: - ElementsToBuildOnSceneList: - - Key: 2 - Value: - EquippableItem: {fileID: 11400000, guid: 5935777f7ac390a4187e03f34e7cafdd, type: 2} + ElementsToBuildOnSceneList: [] convertedData: [] --- !u!1 &163167163 GameObject: @@ -1179,6 +1189,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: 1081484091} - {fileID: 1736078184} @@ -1255,9 +1266,10 @@ 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: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &174581753 GameObject: @@ -1287,6 +1299,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: 838488725} - {fileID: 552589338} @@ -1435,6 +1448,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: 1327986482} - {fileID: 1427837626} @@ -1454,7 +1468,7 @@ RectTransform: - {fileID: 1464669569} - {fileID: 1554558664} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1487,9 +1501,10 @@ 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: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &190767204 GameObject: @@ -1504,6 +1519,7 @@ GameObject: - component: {fileID: 190767207} - component: {fileID: 190767206} - component: {fileID: 190767205} + - component: {fileID: 190767210} m_Layer: 0 m_Name: DoorToHell m_TagString: SceneTransition @@ -1530,7 +1546,7 @@ MonoBehaviour: coords: {x: 0, y: 0, z: 0} nextMapName: Dungeon respawnCoords: {x: 0, y: 0, z: 0} - isEnabled: 1 + isEnabled: 0 --- !u!114 &190767206 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1555,8 +1571,8 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 + m_Mass: 10 + m_LinearDrag: 5 m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} @@ -1600,10 +1616,23 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10.5, y: 79.13, z: 0} m_LocalScale: {x: 1.975, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &190767210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190767204} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a60d2bf69c4ccc40ae03b215fb36f23, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &220874724 GameObject: m_ObjectHideFlags: 0 @@ -1634,6 +1663,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: 271856465} m_RootOrder: 0 @@ -1714,6 +1744,71 @@ MonoBehaviour: textEnglish: sound volume textPolish: dzwieki displayText: {fileID: 220874727} +--- !u!1001 &230804971 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 574776200439751497, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: speed + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150860, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_Name + value: TalkingWizard + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_RootOrder + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalPosition.x + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalPosition.y + value: 73.3 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalPosition.z + value: 133.20683 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7400036343426951234, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} + propertyPath: CanBeOpened + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} --- !u!1 &241381573 GameObject: m_ObjectHideFlags: 0 @@ -1745,6 +1840,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 61.51, y: -0.87, z: 10} m_LocalScale: {x: 2.5, y: 2.3, z: 6} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1470567433} m_Father: {fileID: 702184447} @@ -1854,6 +1950,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1925,6 +2022,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: 1255147975} m_RootOrder: 3 @@ -2089,6 +2187,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: 1751060206} m_RootOrder: 1 @@ -2162,9 +2261,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.9420447, y: 69.83791, z: -6.7609825} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &271856464 GameObject: @@ -2194,6 +2294,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: 220874725} - {fileID: 739374132} @@ -2273,6 +2374,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: 1602706375} m_RootOrder: 3 @@ -2320,6 +2422,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5000002, y: 2.5000002, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 174581754} m_RootOrder: 3 @@ -2473,6 +2576,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: 1193056562} m_RootOrder: 1 @@ -3259,6 +3363,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14320,6 +14425,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.61, y: 0.87, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1106490676} m_RootOrder: 0 @@ -14357,6 +14463,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: 1122422017} m_Father: {fileID: 440573953} @@ -14459,6 +14566,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: 378577487} m_RootOrder: 3 @@ -14539,6 +14647,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.020001221, y: -0.14782615, z: -0.6089853} m_LocalScale: {x: 2.8599997, y: 3.1086955, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1200894937} m_RootOrder: 0 @@ -14568,6 +14677,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14598,6 +14708,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.1 @@ -14621,6 +14732,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &359978803 ParticleSystem: @@ -14629,19 +14744,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 359978799} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 3 simulationSpeed: 0.9 stopAction: 1 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -15191,6 +15306,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 6 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -19416,6 +19532,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: 562803613} - {fileID: 564650393} @@ -19540,6 +19657,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: 612814820} m_Father: {fileID: 163167164} @@ -19640,9 +19758,10 @@ 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: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &405555967 GameObject: @@ -19687,9 +19806,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.5422058, y: -6.3744965, z: -0.05380429} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &440573952 GameObject: @@ -19719,6 +19839,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: 1008082824} - {fileID: 1653917294} @@ -19801,6 +19922,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 64.28, y: -4.67, z: 10} m_LocalScale: {x: 2.5, y: 2.3, z: 6} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 804494075} m_Father: {fileID: 702184447} @@ -19910,6 +20032,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -45511,6 +45634,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -45558,6 +45682,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: 1193056562} m_RootOrder: 3 @@ -45592,6 +45717,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: 1221753085} m_RootOrder: 0 @@ -45769,9 +45895,10 @@ 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: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &547743593 GameObject: @@ -45803,6 +45930,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5000002, y: 2.5000002, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 174581754} m_RootOrder: 2 @@ -45955,6 +46083,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5000002, y: 2.5000002, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 174581754} m_RootOrder: 1 @@ -46105,6 +46234,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: 378577487} m_RootOrder: 0 @@ -46180,6 +46310,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: 378577487} m_RootOrder: 1 @@ -46256,6 +46387,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: 379044510} m_RootOrder: 0 @@ -46350,6 +46482,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: 60127188} - {fileID: 992827805} @@ -46430,6 +46563,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: 1.67, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 873758864} m_Father: {fileID: 174581754} @@ -46562,6 +46696,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: 626405957} m_RootOrder: 3 @@ -46640,6 +46775,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: 1193056562} m_RootOrder: 2 @@ -46655,6 +46791,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -55745,13 +55882,14 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.594118, y: 49.970684, z: -3.6539116} m_LocalScale: {x: 1.3, y: 1.3, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1200894937} - {fileID: 935551913} - {fileID: 441303621} - {fileID: 241381574} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &708386335 GameObject: @@ -55785,6 +55923,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: 1464669569} m_RootOrder: 0 @@ -55917,6 +56056,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: 1114704610} m_RootOrder: 0 @@ -55993,6 +56133,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: 271856465} m_RootOrder: 1 @@ -56059,67 +56200,6 @@ MonoBehaviour: textEnglish: music volume textPolish: muzyka displayText: {fileID: 739374133} ---- !u!1001 &754696784 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 872844846741150860, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_Name - value: TalkingWizard - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalPosition.x - value: -5.21 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalPosition.y - value: 74.49 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalPosition.z - value: 133.20683 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7400036343426951234, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} - propertyPath: languageDetector.InstanceTemplates.Array.data[1].Value - value: - objectReference: {fileID: 11400000, guid: 3c87bd9622d56d14d8f8fbec4f364eac, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3} --- !u!1 &763832645 GameObject: m_ObjectHideFlags: 0 @@ -56151,6 +56231,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: 1806895117} m_RootOrder: 3 @@ -56316,6 +56397,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: 1.67, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1264259732} m_Father: {fileID: 174581754} @@ -56451,6 +56533,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: 271856465} m_RootOrder: 2 @@ -56618,6 +56701,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: 1255147975} m_RootOrder: 0 @@ -56783,6 +56867,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.020001221, y: -0.14782615, z: -0.6089853} m_LocalScale: {x: 2.8599997, y: 3.1086955, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 441303621} m_RootOrder: 0 @@ -56812,6 +56897,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -56842,6 +56928,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.1 @@ -56865,6 +56952,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &804494078 ParticleSystem: @@ -56873,19 +56964,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804494074} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 3 simulationSpeed: 0.9 stopAction: 1 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -57435,6 +57526,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 6 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -61662,6 +61754,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: 1806895117} m_RootOrder: 0 @@ -61829,6 +61922,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: 174581754} m_RootOrder: 0 @@ -62047,6 +62141,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.61, y: 0.87, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 629088855} m_RootOrder: 0 @@ -62082,9 +62177,10 @@ 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 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &897697749 GameObject: @@ -62118,6 +62214,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: 1255147975} m_RootOrder: 1 @@ -62508,6 +62605,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: 131599443} m_Father: {fileID: 1315339609} @@ -62585,6 +62683,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.020001221, y: -0.14782615, z: -0.6089853} m_LocalScale: {x: 2.8599997, y: 3.1086955, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 935551913} m_RootOrder: 0 @@ -62614,6 +62713,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -62644,6 +62744,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.1 @@ -62667,6 +62768,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &928170237 ParticleSystem: @@ -62675,19 +62780,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 928170233} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 3 simulationSpeed: 0.9 stopAction: 1 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -63237,6 +63342,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 6 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -67461,6 +67567,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: 1230558964} m_RootOrder: 0 @@ -67539,6 +67646,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 63.85, y: 0.53, z: 10} m_LocalScale: {x: 2.5, y: 2.3, z: 6} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 928170234} m_Father: {fileID: 702184447} @@ -67648,6 +67756,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -67758,6 +67867,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.61, y: 0.87, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 88436047} m_RootOrder: 0 @@ -67798,6 +67908,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: 1794238134} m_RootOrder: 0 @@ -67965,6 +68076,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: 626405957} m_RootOrder: 1 @@ -68153,6 +68265,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: 440573953} m_RootOrder: 0 @@ -68232,6 +68345,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: 1751060206} m_RootOrder: 2 @@ -68307,6 +68421,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: 163167164} m_RootOrder: 0 @@ -68387,6 +68502,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: 1751060206} m_RootOrder: 4 @@ -68480,6 +68596,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: 1.67, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1891497582} m_Father: {fileID: 174581754} @@ -68613,6 +68730,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: 1.67, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 313956440} m_Father: {fileID: 174581754} @@ -68743,6 +68861,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: 721418782} m_Father: {fileID: 1724888070} @@ -68782,6 +68901,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: 318506651} m_RootOrder: 0 @@ -68879,6 +68999,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: 1221753085} m_RootOrder: 3 @@ -69045,6 +69166,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: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1464669569} m_RootOrder: 2 @@ -69219,6 +69341,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: 1644923231} - {fileID: 311956049} @@ -69226,7 +69349,7 @@ Transform: - {fileID: 490741522} - {fileID: 1193618488} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1193618487 GameObject: @@ -69256,6 +69379,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: 1193056562} m_RootOrder: 4 @@ -69271,6 +69395,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -69481,6 +69606,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 67.61, y: -1.98, z: 10} m_LocalScale: {x: 2.5, y: 2.3, z: 6} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 359978800} m_Father: {fileID: 702184447} @@ -69577,6 +69703,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -69661,6 +69788,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: 1794238134} m_RootOrder: 1 @@ -69823,6 +69951,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: 495325820} - {fileID: 2146696729} @@ -69903,6 +70032,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: 1751060206} m_RootOrder: 0 @@ -69979,6 +70109,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3, y: 5, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3269899} m_RootOrder: 0 @@ -70071,6 +70202,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: 930976545} m_Father: {fileID: 1724888070} @@ -70109,6 +70241,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: 788474928} - {fileID: 897697750} @@ -70230,6 +70363,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.61, y: 0.87, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779165262} m_RootOrder: 0 @@ -70265,6 +70399,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: 1396222005} - {fileID: 1833717355} @@ -70302,6 +70437,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: 378577487} m_RootOrder: 2 @@ -70377,6 +70513,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: 1724888070} m_RootOrder: 0 @@ -70452,6 +70589,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: 2019942} - {fileID: 913447033} @@ -70532,6 +70670,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: 1315339609} m_RootOrder: 2 @@ -70680,6 +70819,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: 1794238134} m_RootOrder: 3 @@ -70846,6 +70986,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: 184083800} m_RootOrder: 0 @@ -70991,6 +71132,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: 1602706375} m_RootOrder: 4 @@ -71056,6 +71198,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: 626405957} m_RootOrder: 2 @@ -71217,6 +71360,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: 1273555370} m_RootOrder: 0 @@ -71264,6 +71408,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: 184083800} m_RootOrder: 1 @@ -71408,6 +71553,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: 1602706375} m_RootOrder: 5 @@ -71453,6 +71599,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: 1221753085} m_RootOrder: 4 @@ -71534,6 +71681,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: 1602706375} m_RootOrder: 0 @@ -71688,6 +71836,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: 23852503} - {fileID: 1556249457} @@ -71803,6 +71952,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: 708386336} - {fileID: 88145927} @@ -71881,6 +72031,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: 1556249457} m_RootOrder: 0 @@ -71957,6 +72108,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.020001221, y: -0.14782615, z: -0.6089853} m_LocalScale: {x: 2.8599997, y: 3.1086955, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 241381574} m_RootOrder: 0 @@ -71986,6 +72138,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -72016,6 +72169,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.1 @@ -72039,6 +72193,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1470567436 ParticleSystem: @@ -72047,19 +72205,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470567432} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 3 simulationSpeed: 0.9 stopAction: 1 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -72609,6 +72767,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 6 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -76833,6 +76992,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: 1794238134} m_RootOrder: 2 @@ -76911,6 +77071,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: 184083800} m_RootOrder: 16 @@ -76965,6 +77126,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: 1467420220} m_Father: {fileID: 1463806450} @@ -77001,6 +77163,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: 1754712846} m_Father: {fileID: 1463806450} @@ -77042,6 +77205,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.4999998, y: 2.4999998, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1255147975} m_RootOrder: 2 @@ -77208,6 +77372,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: 1458715759} - {fileID: 1273555370} @@ -77306,6 +77471,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: 1193056562} m_RootOrder: 0 @@ -77321,6 +77487,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -204868,6 +205035,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: 1847256926} m_Father: {fileID: 440573953} @@ -204970,6 +205138,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: 440573953} m_RootOrder: 1 @@ -205053,6 +205222,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: 1806895117} m_RootOrder: 1 @@ -205235,6 +205405,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5000002, y: 2.5000002, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 174581754} m_RootOrder: 5 @@ -205384,6 +205555,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: 1303176333} - {fileID: 1230558964} @@ -205525,6 +205697,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: 1751060206} m_RootOrder: 6 @@ -205562,6 +205735,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: 163167164} m_RootOrder: 1 @@ -205643,6 +205817,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5000002, y: 2.5000002, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 174581754} m_RootOrder: 4 @@ -205794,6 +205969,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: 1221981387} - {fileID: 265628973} @@ -205920,6 +206096,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: 1573631012} m_RootOrder: 0 @@ -205995,6 +206172,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: 961477910} - {fileID: 1209918097} @@ -206074,6 +206252,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: 824404438} - {fileID: 1696523481} @@ -206152,6 +206331,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: 1273555370} m_RootOrder: 1 @@ -206199,6 +206379,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: 1221753085} m_RootOrder: 2 @@ -206362,6 +206543,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: 1649998918} m_RootOrder: 0 @@ -206498,6 +206680,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.61, y: 0.87, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101503073} m_RootOrder: 0 @@ -206536,6 +206719,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: 1751060206} m_RootOrder: 3 @@ -206630,6 +206814,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 @@ -206662,9 +206847,10 @@ 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: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2020454682 GameObject: @@ -206743,9 +206929,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -6.5, z: 0} m_LocalScale: {x: 1.975, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2020454687 MonoBehaviour: @@ -206810,6 +206997,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: 1806895117} m_RootOrder: 2 @@ -206991,9 +207179,10 @@ 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: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2059437275 GameObject: @@ -207022,6 +207211,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: 1273555370} m_RootOrder: 4 @@ -207070,6 +207260,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: 1273555370} m_RootOrder: 3 @@ -207116,6 +207307,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: 1602706375} m_RootOrder: 6 @@ -207193,6 +207385,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: 1221753085} m_RootOrder: 1 @@ -207604,7 +207797,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: m_RootOrder - value: 14 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs b/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs index b5a46b96..8dcc52ad 100644 --- a/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs +++ b/Assets/Scripts/Pathfinding/AStarPathfindingAgent.cs @@ -43,7 +43,6 @@ public class AStarPathfindingAgent : MonoBehaviour public void FindPath() { var player = FindObjectOfType().gameObject; - Debug.Log("Findign Path"); point = player.transform.position; FindPoint(); diff --git a/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs b/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs index c539b930..18583d8c 100644 --- a/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs +++ b/Assets/Scripts/REFACTORING/Story/Dungeon/DungeonManager.cs @@ -28,6 +28,7 @@ public class DungeonManager : MonoBehaviour public static bool hasTeleported; + // well finally useless public static void SetTeleported() { hasTeleported = true; diff --git a/Assets/Scripts/REFACTORING/Story/TheCave.meta b/Assets/Scripts/REFACTORING/Story/TheCave.meta new file mode 100644 index 00000000..07ca3e78 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Story/TheCave.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c9c1c2c37bfb884f98c268f9bebab2a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Story/TheCave/GetScroolWizard.cs b/Assets/Scripts/REFACTORING/Story/TheCave/GetScroolWizard.cs new file mode 100644 index 00000000..e5e9b851 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Story/TheCave/GetScroolWizard.cs @@ -0,0 +1,106 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +[RequireComponent(typeof(AStarPathfindingAgent))] +class GetScroolWizard : MonoBehaviour +{ + public Item RequiredItem; + + public MissionReward Reward; + public Transform teleportPosition; + + public bool canEscape = false; + + private void Start() + { + teleportPosition = GameObject.Find("DoorToHell").transform; + } + + public void EscapeToDungeon() + { + var wizardOnScene = GameObject.FindGameObjectsWithTag("NPC").ToList().Where(el => el.name == gameObject.name).First(); + + wizardOnScene.GetComponent().point = wizardOnScene.GetComponent().teleportPosition.position; + Debug.Log(wizardOnScene.GetComponent().point); + Debug.Log(Vector2.Distance(wizardOnScene.GetComponent().point, wizardOnScene.transform.position)); + + wizardOnScene.GetComponent().FindPoint(); + + wizardOnScene.GetComponent().Escape(); + } + + public void Escape() + { + Debug.Log("Start courtine"); + StartCoroutine(gameObject.GetComponent().FollowPath()); + } + + // CHANGE THIS - we dupplicated herelogic from mission!!! + + public void CheckCondition() + { + // CHECK CONDITION JEST WYWOŁYWANE W SUROWYM OBIEKCIE scriptable boject + // TO SIE DOWOŁUJE DO prefaba wizarda wiec musimy sila szuakc obietow na scenie heh + if(InventoryUIManager.Instance.FindItemInWarehouseByName(RequiredItem.name).Any()) + { + var wizardOnScene = GameObject.FindGameObjectsWithTag("NPC").ToList().Where(el => el.name == gameObject.name).First(); + + wizardOnScene.GetComponent().Dialogue.GoToNextSentence(); + } else + { + var wizardOnScene = GameObject.FindGameObjectsWithTag("NPC").ToList().Where(el => el.name == gameObject.name).First(); + + wizardOnScene.GetComponent().Dialogue.BreakDialogueStep(); + } + } + + // Move to npc action bucket (Action script) + public void TakeItem() + { + if(-1 != InventoryUIManager.Instance.RemoveOneByItemName(RequiredItem.name)) + { + TaskUIManager.Instance.RemoveByName("Wizard Quest"); + + // go to next sentence + var wizardOnScene = GameObject.FindGameObjectsWithTag("NPC").ToList().Where(el => el.name == gameObject.name).First(); + + wizardOnScene.GetComponent().Dialogue.GoToNextSentence(); + } else + { + var wizardOnScene = GameObject.FindGameObjectsWithTag("NPC").ToList().Where(el => el.name == gameObject.name).First(); + + // Beacuse we have CheckCondition this should be uselles + if (wizardOnScene.GetComponent().Dialogue) + wizardOnScene.gameObject.GetComponent().Dialogue.BreakDialogueStep(); + } + + } + + // copied from mission + public void GetReward() + { + var Player = GameObject.FindGameObjectWithTag("Player"); + + if (!Player) + Debug.LogError("GetScroolWizard::GetReward - There is no player on scene!!!"); + + Player.GetComponent().GetReward(Reward); + } + + public void OnCollisionEnter2D(Collision2D collision) + { + if (collision.collider.tag == "SceneTransition") + { + // basically useless xd + DungeonManager.SetTeleported(); + + collision.gameObject.GetComponent().isEnabled = true; + + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/REFACTORING/Story/TheCave/GetScroolWizard.cs.meta b/Assets/Scripts/REFACTORING/Story/TheCave/GetScroolWizard.cs.meta new file mode 100644 index 00000000..17760337 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Story/TheCave/GetScroolWizard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 961214ee9197dae4096dc53f82a5169c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: