diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index af603872..d46fb397 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -152,7 +152,6 @@ 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: 455923086} m_RootOrder: 0 @@ -303,7 +302,6 @@ 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: 1698788397} m_RootOrder: 0 @@ -464,7 +462,6 @@ 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: 1197977279} m_Father: {fileID: 0} @@ -549,7 +546,6 @@ 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 @@ -585,7 +581,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.2, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 46569006} m_Father: {fileID: 2106587791} @@ -753,7 +748,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 3.6, z: 10} m_LocalScale: {x: 1, y: 0.8, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 897683149} m_RootOrder: 0 @@ -769,7 +763,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -841,7 +834,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.2, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1401167277} m_Father: {fileID: 2106587791} @@ -903,7 +895,7 @@ MonoBehaviour: m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 5 + m_IntArgument: 13 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -1012,7 +1004,6 @@ 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 @@ -1045,7 +1036,6 @@ 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 @@ -1080,7 +1070,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.2, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2141716778} m_Father: {fileID: 2106587791} @@ -1223,7 +1212,6 @@ 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: - {fileID: 502516634} - {fileID: 1617351646} @@ -1258,7 +1246,6 @@ 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: 2106587791} m_RootOrder: 4 @@ -1393,7 +1380,6 @@ 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: 193991227} m_RootOrder: 0 @@ -1409,7 +1395,6 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -3352,7 +3337,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.3344173, y: -2.013585, z: -34.86502} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -3396,7 +3380,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.8525665, y: -0.1126967, z: -140.81984} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -3430,7 +3413,6 @@ 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: 680041735} m_RootOrder: 0 @@ -3579,7 +3561,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1.2, z: 10} m_LocalScale: {x: 1, y: 1.25, z: 1} - m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 897683149} m_RootOrder: 1 @@ -3595,7 +3576,6 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3666,7 +3646,6 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.5, y: 1.2, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 115406066} m_Father: {fileID: 2106587791} @@ -3873,7 +3852,6 @@ 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: 680041735} - {fileID: 455923086} @@ -3917,7 +3895,6 @@ 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: 840091553} m_RootOrder: 0 diff --git a/Assets/Scenes/OutsideWizardsHouse.unity b/Assets/Scenes/OutsideWizardsHouse.unity index 577192f8..b683129a 100644 --- a/Assets/Scenes/OutsideWizardsHouse.unity +++ b/Assets/Scenes/OutsideWizardsHouse.unity @@ -2859,8 +2859,8 @@ MonoBehaviour: moveSpeed: 2 enemyName: Mushroom1 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} - health: 3 - baseAttack: 1.5 + health: 8 + baseAttack: 2.5 path: - {fileID: 104855113} - {fileID: 121491879} @@ -2881,7 +2881,7 @@ MonoBehaviour: knockTime: 0.2 isKilled: 0 isKilled2: 0 - expValue: 7 + expValue: 8 --- !u!114 &19674079 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3292826684962005696, guid: ef9907b84e7629a4ea317ffe22da98dd, type: 3} @@ -11783,10 +11783,22 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: health + value: 6 + objectReference: {fileID: 0} - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} propertyPath: target value: objectReference: {fileID: 4869648843286970699, guid: 4cb7163e44af59f4c9350005c199db3c, type: 3} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: expValue + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: baseAttack + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} propertyPath: homePosition value: @@ -143146,6 +143158,14 @@ PrefabInstance: propertyPath: m_Name value: Crab_3 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: health + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: expValue + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: d1755122083ab6845abab032b2dce58e, type: 3} propertyPath: m_RootOrder value: 7 @@ -181397,6 +181417,18 @@ PrefabInstance: propertyPath: m_Name value: EarthSmall_3 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: health + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: expValue + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: baseAttack + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} propertyPath: m_RootOrder value: 0 @@ -198985,6 +199017,14 @@ PrefabInstance: propertyPath: m_Name value: Crab_2 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: health + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: expValue + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: d1755122083ab6845abab032b2dce58e, type: 3} propertyPath: m_RootOrder value: 6 @@ -217447,6 +217487,18 @@ PrefabInstance: propertyPath: m_Name value: EarthSmall_2 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: health + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: expValue + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} + propertyPath: baseAttack + value: 1.5 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: 609b0d668f72b0949843e40788d79e8c, type: 3} propertyPath: m_RootOrder value: 1 @@ -235150,6 +235202,14 @@ PrefabInstance: propertyPath: m_Name value: Crab_4 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: health + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: expValue + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: d1755122083ab6845abab032b2dce58e, type: 3} propertyPath: m_RootOrder value: 8 @@ -239022,6 +239082,14 @@ PrefabInstance: propertyPath: m_Name value: Crab_5 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: health + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: expValue + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: d1755122083ab6845abab032b2dce58e, type: 3} propertyPath: m_RootOrder value: 9 @@ -443532,8 +443600,8 @@ MonoBehaviour: moveSpeed: 3 enemyName: Mushroom1 maxHealth: {fileID: 11400000, guid: 1a234827b90bfc24da563fbd5ffb412a, type: 2} - health: 3 - baseAttack: 1.5 + health: 8 + baseAttack: 2.5 path: - {fileID: 2116128873} - {fileID: 2064526644} @@ -443554,7 +443622,7 @@ MonoBehaviour: knockTime: 0.2 isKilled: 0 isKilled2: 0 - expValue: 7 + expValue: 8 --- !u!114 &1478473689 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3292826684962005696, guid: ef9907b84e7629a4ea317ffe22da98dd, type: 3} @@ -808071,6 +808139,18 @@ PrefabInstance: propertyPath: m_Name value: Crab_1 objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: health + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: expValue + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2457082871272665691, guid: d1755122083ab6845abab032b2dce58e, type: 3} + propertyPath: baseAttack + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6082011507806275799, guid: d1755122083ab6845abab032b2dce58e, type: 3} propertyPath: m_RootOrder value: 5 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 1b758b41..70da64c1 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -468,7 +468,7 @@ MonoBehaviour: knockTime: 0.2 isKilled: 0 isKilled2: 0 - expValue: 5 + expValue: 3 --- !u!114 &8620312 MonoBehaviour: m_ObjectHideFlags: 0 @@ -720,6 +720,7 @@ GameObject: - component: {fileID: 68076407} - component: {fileID: 68076408} - component: {fileID: 68076405} + - component: {fileID: 68076409} m_Layer: 0 m_Name: Skeleton_0 m_TagString: Enemy @@ -890,7 +891,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 68076400} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 88d05133b4682194e90a88b0f3c16b70, type: 3} m_Name: @@ -944,6 +945,42 @@ MonoBehaviour: gridPosition: {x: 0, y: 0} isChasing: 0 path: [] +--- !u!114 &68076409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68076400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dd65ecdb4b7459489f8c03a18ccff46, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 0 + enemyName: + maxHealth: {fileID: 0} + health: 7 + baseAttack: 2 + path: [] + currentPoint: 0 + currentGoal: {fileID: 0} + agent: {fileID: 0} + target: {fileID: 0} + chaseRadius: 0 + attackRadius: 0 + homePosition: {fileID: 0} + roundingDistance: 0 + anim: {fileID: 0} + other: {fileID: 0} + inRange: 0 + hit: 0 + player: {fileID: 0} + thrust: 0 + knockTime: 0 + isKilled: 0 + isKilled2: 0 + expValue: 6 --- !u!1 &84519187 GameObject: m_ObjectHideFlags: 0 @@ -1204,7 +1241,7 @@ MonoBehaviour: knockTime: 0.2 isKilled: 0 isKilled2: 0 - expValue: 5 + expValue: 3 --- !u!114 &112145425 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2522,7 +2559,7 @@ MonoBehaviour: knockTime: 0.2 isKilled: 0 isKilled2: 0 - expValue: 5 + expValue: 3 --- !u!50 &242009515 Rigidbody2D: serializedVersion: 4 @@ -20748,6 +20785,7 @@ GameObject: - component: {fileID: 340745814} - component: {fileID: 340745813} - component: {fileID: 340745812} + - component: {fileID: 340745818} m_Layer: 0 m_Name: Slime_2 m_TagString: Enemy @@ -20818,7 +20856,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 340745810} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 88d05133b4682194e90a88b0f3c16b70, type: 3} m_Name: @@ -20947,6 +20985,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &340745818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 340745810} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dd65ecdb4b7459489f8c03a18ccff46, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 0 + enemyName: + maxHealth: {fileID: 0} + health: 5 + baseAttack: 0.5 + path: [] + currentPoint: 0 + currentGoal: {fileID: 0} + agent: {fileID: 0} + target: {fileID: 0} + chaseRadius: 0 + attackRadius: 0 + homePosition: {fileID: 0} + roundingDistance: 0 + anim: {fileID: 0} + other: {fileID: 0} + inRange: 0 + hit: 0 + player: {fileID: 0} + thrust: 0 + knockTime: 0 + isKilled: 0 + isKilled2: 0 + expValue: 3 --- !u!1 &359978799 GameObject: m_ObjectHideFlags: 0 @@ -27029,6 +27103,7 @@ GameObject: - component: {fileID: 641696208} - component: {fileID: 641696203} - component: {fileID: 641696204} + - component: {fileID: 641696209} m_Layer: 0 m_Name: Slime_0 m_TagString: Enemy @@ -27195,7 +27270,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641696201} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 88d05133b4682194e90a88b0f3c16b70, type: 3} m_Name: @@ -27228,6 +27303,42 @@ MonoBehaviour: isPanelEnabled: 1 expValue: 2 agent: {fileID: 641696203} +--- !u!114 &641696209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641696201} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dd65ecdb4b7459489f8c03a18ccff46, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 0 + enemyName: + maxHealth: {fileID: 0} + health: 5 + baseAttack: 0.5 + path: [] + currentPoint: 0 + currentGoal: {fileID: 0} + agent: {fileID: 0} + target: {fileID: 0} + chaseRadius: 0 + attackRadius: 0 + homePosition: {fileID: 0} + roundingDistance: 0 + anim: {fileID: 0} + other: {fileID: 0} + inRange: 0 + hit: 0 + player: {fileID: 0} + thrust: 0 + knockTime: 0 + isKilled: 0 + isKilled2: 0 + expValue: 3 --- !u!1 &652174079 GameObject: m_ObjectHideFlags: 0 @@ -27347,6 +27458,7 @@ GameObject: - component: {fileID: 682072032} - component: {fileID: 682072036} - component: {fileID: 682072031} + - component: {fileID: 682072033} m_Layer: 0 m_Name: Slime_1 m_TagString: Enemy @@ -27408,6 +27520,42 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &682072033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 682072029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dd65ecdb4b7459489f8c03a18ccff46, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 0 + enemyName: + maxHealth: {fileID: 0} + health: 5 + baseAttack: 0.5 + path: [] + currentPoint: 0 + currentGoal: {fileID: 0} + agent: {fileID: 0} + target: {fileID: 0} + chaseRadius: 0 + attackRadius: 0 + homePosition: {fileID: 0} + roundingDistance: 0 + anim: {fileID: 0} + other: {fileID: 0} + inRange: 0 + hit: 0 + player: {fileID: 0} + thrust: 0 + knockTime: 0 + isKilled: 0 + isKilled2: 0 + expValue: 3 --- !u!61 &682072034 BoxCollider2D: m_ObjectHideFlags: 0 @@ -27492,7 +27640,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 682072029} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 88d05133b4682194e90a88b0f3c16b70, type: 3} m_Name: @@ -39510,7 +39658,7 @@ MonoBehaviour: knockTime: 0.2 isKilled: 0 isKilled2: 0 - expValue: 5 + expValue: 3 --- !u!114 &1072778925 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index bbcfe12d..d40cf8c6 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -98,7 +98,7 @@ public class Player : MonoBehaviour { if (lvl == 1) { - maxExp = 10; + maxExp = 25; if (exp >= maxExp) { lvl = 2; @@ -340,11 +340,11 @@ public class Player : MonoBehaviour } else if (healthPoints == 2) { - PlayerPrefs.SetFloat("maxHealth", 15); + PlayerPrefs.SetFloat("maxHealth", 14); } else if (healthPoints == 3) { - PlayerPrefs.SetFloat("maxHealth", 20); + PlayerPrefs.SetFloat("maxHealth", 16); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5b2a3c93..381fc1d1 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -44,4 +44,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/FirstVillage.unity guid: d09d8f73d205f2c4b84728e6fe6c2839 + - enabled: 1 + path: Assets/Scenes/NewGame - Confirmation.unity + guid: 5a154444dad816d41b4e975d5866fd40 m_configObjects: {}