From 78449200c37847444638c3fa0d9486beb48df2b9 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Mon, 30 Jan 2023 18:16:49 +0800 Subject: [PATCH] =?UTF-8?q?jump=E5=AE=9E=E7=8E=B0=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameAssets/Map/1/1.prefab | 442 +++++++++++++++++- .../Prefabs/Role/Warrior/myWarrior.controller | 38 +- .../Main/AnimeScript/anime_JumpState.cs | 46 ++ .../Main/AnimeScript/anime_JumpState.cs.meta | 11 + .../CustomsComponent/MainPlayerComponent.cs | 35 +- .../NoMonoBehaviour/InputNoMono.cs | 4 + Assets/Scripts/Main/Definition/ConstClass.cs | 2 + .../MainPlayerJumpStateEventArgs.cs | 31 ++ .../MainPlayerJumpStateEventArgs.cs.meta | 11 + Assets/Scripts/Main/Role/MainRole.cs | 57 ++- Assets/Scripts/Main/Role/MonsterRole.cs | 5 + Assets/Scripts/Main/Role/RoleBase.cs | 104 ++++- 12 files changed, 728 insertions(+), 58 deletions(-) create mode 100644 Assets/Scripts/Main/AnimeScript/anime_JumpState.cs create mode 100644 Assets/Scripts/Main/AnimeScript/anime_JumpState.cs.meta create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs.meta diff --git a/Assets/GameAssets/Map/1/1.prefab b/Assets/GameAssets/Map/1/1.prefab index b34123b..b2720a1 100644 --- a/Assets/GameAssets/Map/1/1.prefab +++ b/Assets/GameAssets/Map/1/1.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 147785243049254779} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -45,7 +45,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6313912506294818579} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} @@ -81,7 +81,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1760303496742878943} - m_Layer: 0 + m_Layer: 6 m_Name: SpawnPos m_TagString: Untagged m_Icon: {fileID: 0} @@ -113,7 +113,7 @@ GameObject: - component: {fileID: 1377482919362635493} - component: {fileID: 1377482919362635514} - component: {fileID: 1377482919362635515} - m_Layer: 0 + m_Layer: 6 m_Name: Center m_TagString: Untagged m_Icon: {fileID: 0} @@ -193,7 +193,7 @@ GameObject: m_Component: - component: {fileID: 1377482919428722225} - component: {fileID: 3885786629723831083} - m_Layer: 0 + m_Layer: 6 m_Name: 1 m_TagString: Terrain m_Icon: {fileID: 0} @@ -288,7 +288,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5054700387564961953} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -332,7 +332,7 @@ GameObject: - component: {fileID: 7045584432084846720} - component: {fileID: 8289118413841889504} - component: {fileID: 5236808758534952140} - m_Layer: 0 + m_Layer: 6 m_Name: Capsule (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -425,7 +425,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4901701798875733858} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -463,7 +463,7 @@ GameObject: - component: {fileID: 3770184125752874499} - component: {fileID: 2577758212725522747} - component: {fileID: 9060989074116442420} - m_Layer: 0 + m_Layer: 6 m_Name: Terrain m_TagString: Untagged m_Icon: {fileID: 0} @@ -540,7 +540,7 @@ GameObject: - component: {fileID: 7444784570827038428} - component: {fileID: 511808398462585916} - component: {fileID: 4166831337901040734} - m_Layer: 0 + m_Layer: 6 m_Name: Capsule m_TagString: Untagged m_Icon: {fileID: 0} @@ -633,7 +633,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 874355422737507971} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -669,7 +669,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8603613436434879712} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -705,7 +705,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1906188405464683892} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -744,7 +744,7 @@ GameObject: - component: {fileID: 723101221313606351} - component: {fileID: 8847104743877954276} - component: {fileID: 3459944041128703491} - m_Layer: 0 + m_Layer: 6 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -839,7 +839,7 @@ GameObject: - component: {fileID: 2801372892746594492} - component: {fileID: 137322016712753701} - component: {fileID: 3425599640083899820} - m_Layer: 0 + m_Layer: 6 m_Name: Capsule (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -932,7 +932,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2994726617397947386} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -971,7 +971,7 @@ GameObject: - component: {fileID: 1978549724134734975} - component: {fileID: 2089279310296312926} - component: {fileID: 2651661587213878344} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1063,7 +1063,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7543904794786274740} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1104,7 +1104,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7760915159497649971} - m_Layer: 0 + m_Layer: 6 m_Name: GameObject (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1186,6 +1186,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat3 (2) objectReference: {fileID: 0} + - target: {fileID: 3691179351823567132, guid: 62dcdfc792ac6c9498ed848651a83bec, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 62dcdfc792ac6c9498ed848651a83bec, type: 3} --- !u!4 &2680159355609531015 stripped @@ -1204,6 +1208,10 @@ PrefabInstance: propertyPath: m_Name value: Tree2 (1) objectReference: {fileID: 0} + - target: {fileID: 467458995388004006, guid: 0387bcbcffced364fbbaa4a101c17c92, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6793637964037508681, guid: 0387bcbcffced364fbbaa4a101c17c92, type: 3} propertyPath: m_RootOrder value: 23 @@ -1266,6 +1274,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat5 (2) objectReference: {fileID: 0} + - target: {fileID: 1698056521122239450, guid: a529559f98693d544b6b8220a354ba5e, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 2479712593716126066, guid: a529559f98693d544b6b8220a354ba5e, type: 3} propertyPath: m_RootOrder value: 29 @@ -1328,6 +1340,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat4 (2) objectReference: {fileID: 0} + - target: {fileID: 4732806265743767927, guid: 7494612dacc88e44d8c8832594f276f0, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7551408929396306835, guid: 7494612dacc88e44d8c8832594f276f0, type: 3} propertyPath: m_RootOrder value: 28 @@ -1434,6 +1450,10 @@ PrefabInstance: propertyPath: m_Name value: Bush1 (1) objectReference: {fileID: 0} + - target: {fileID: 7786631812648375840, guid: 434c07691f066b047aca20842e738292, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 434c07691f066b047aca20842e738292, type: 3} --- !u!4 &6482558376906186205 stripped @@ -1496,6 +1516,10 @@ PrefabInstance: propertyPath: m_Name value: Bush1 (2) objectReference: {fileID: 0} + - target: {fileID: 7786631812648375840, guid: 434c07691f066b047aca20842e738292, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 434c07691f066b047aca20842e738292, type: 3} --- !u!4 &6482558375551839911 stripped @@ -1558,6 +1582,10 @@ PrefabInstance: propertyPath: m_Name value: Bush3 (1) objectReference: {fileID: 0} + - target: {fileID: 2970598490263652824, guid: 6a477a17b3621054e86759b408028755, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a477a17b3621054e86759b408028755, type: 3} --- !u!4 &2071848833083447010 stripped @@ -1620,6 +1648,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &183802808781840805 stripped @@ -1682,6 +1714,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &49020478781947726 stripped @@ -1700,6 +1736,10 @@ PrefabInstance: propertyPath: m_Name value: Bush2 objectReference: {fileID: 0} + - target: {fileID: 6607995221717834578, guid: f99ac27988230204ab512927b382e211, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7948097682415659514, guid: f99ac27988230204ab512927b382e211, type: 3} propertyPath: m_RootOrder value: 21 @@ -1806,6 +1846,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &559164141944995336 stripped @@ -1868,6 +1912,10 @@ PrefabInstance: propertyPath: m_Name value: Bush1 objectReference: {fileID: 0} + - target: {fileID: 7786631812648375840, guid: 434c07691f066b047aca20842e738292, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 434c07691f066b047aca20842e738292, type: 3} --- !u!4 &6772182566258376777 stripped @@ -1930,6 +1978,10 @@ PrefabInstance: propertyPath: m_Name value: Grass6 objectReference: {fileID: 0} + - target: {fileID: 4736041675894167234, guid: d87374be6bf344a43926a5389d25937d, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d87374be6bf344a43926a5389d25937d, type: 3} --- !u!4 &4470737160548457026 stripped @@ -1948,6 +2000,10 @@ PrefabInstance: propertyPath: m_Name value: Tree2 objectReference: {fileID: 0} + - target: {fileID: 467458995388004006, guid: 0387bcbcffced364fbbaa4a101c17c92, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6793637964037508681, guid: 0387bcbcffced364fbbaa4a101c17c92, type: 3} propertyPath: m_RootOrder value: 9 @@ -2054,6 +2110,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &919048481782331116 stripped @@ -2116,6 +2176,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &1087385645328684111 stripped @@ -2178,6 +2242,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (3) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &1274941838454016136 stripped @@ -2240,6 +2308,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &1495491781772995353 stripped @@ -2302,6 +2374,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &1399841005459099844 stripped @@ -2364,6 +2440,10 @@ PrefabInstance: propertyPath: m_Name value: Bush3 objectReference: {fileID: 0} + - target: {fileID: 2970598490263652824, guid: 6a477a17b3621054e86759b408028755, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a477a17b3621054e86759b408028755, type: 3} --- !u!4 &1078004877879059054 stripped @@ -2426,6 +2506,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat2 (1) objectReference: {fileID: 0} + - target: {fileID: 5728851475268051187, guid: c80556e8315922e4dac82443ee8ac65a, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c80556e8315922e4dac82443ee8ac65a, type: 3} --- !u!4 &2019899191750711032 stripped @@ -2488,6 +2572,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &1589929784413089980 stripped @@ -2550,6 +2638,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &1651460035539954896 stripped @@ -2612,6 +2704,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &2009426266588933352 stripped @@ -2674,6 +2770,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &1926820062612678090 stripped @@ -2736,6 +2836,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (3) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &2630598684689566666 stripped @@ -2798,6 +2902,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &2532866314734243327 stripped @@ -2860,6 +2968,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &2592324246097778678 stripped @@ -2922,6 +3034,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &2503574300944691342 stripped @@ -2984,6 +3100,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &2334662424584096416 stripped @@ -3046,6 +3166,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &2643888232969940712 stripped @@ -3108,6 +3232,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &2637739022013034794 stripped @@ -3126,6 +3254,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat1 objectReference: {fileID: 0} + - target: {fileID: 530139869118861757, guid: 8c443aa2f0d9d0e4ca2d5aaa5047431c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 3853543274052405693, guid: 8c443aa2f0d9d0e4ca2d5aaa5047431c, type: 3} propertyPath: m_RootOrder value: 10 @@ -3232,6 +3364,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &2593280289355210284 stripped @@ -3294,6 +3430,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &2921811367235793088 stripped @@ -3356,6 +3496,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &3429436660157377695 stripped @@ -3418,6 +3562,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &2970407686102429865 stripped @@ -3480,6 +3628,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &3251867329592872160 stripped @@ -3542,6 +3694,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &3322847798834691836 stripped @@ -3604,6 +3760,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &3794396380249983495 stripped @@ -3666,6 +3826,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &3558430622248454751 stripped @@ -3728,6 +3892,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (4) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &3661665117531014111 stripped @@ -3790,6 +3958,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &3620578855572575397 stripped @@ -3852,6 +4024,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &3976023977220851417 stripped @@ -3914,6 +4090,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &4024505692369443521 stripped @@ -3976,6 +4156,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &3719210660509864374 stripped @@ -4038,6 +4222,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (3) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &4346679112490572296 stripped @@ -4100,6 +4288,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &4053361623817189434 stripped @@ -4162,6 +4354,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &4481826590410500891 stripped @@ -4224,6 +4420,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &4135512275580479317 stripped @@ -4286,6 +4486,10 @@ PrefabInstance: propertyPath: m_Name value: Tree1 objectReference: {fileID: 0} + - target: {fileID: 7787474680208908760, guid: 1547870cc9ad6ff43a9da439e14b470c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1547870cc9ad6ff43a9da439e14b470c, type: 3} --- !u!4 &1099084695390688875 stripped @@ -4304,6 +4508,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat5 (1) objectReference: {fileID: 0} + - target: {fileID: 1698056521122239450, guid: a529559f98693d544b6b8220a354ba5e, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 2479712593716126066, guid: a529559f98693d544b6b8220a354ba5e, type: 3} propertyPath: m_RootOrder value: 19 @@ -4410,6 +4618,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &4205996068610743804 stripped @@ -4472,6 +4684,10 @@ PrefabInstance: propertyPath: m_Name value: Grass4 objectReference: {fileID: 0} + - target: {fileID: 3582236720428308148, guid: e65c6f3eed9a54f41bd5dd3d81bb7373, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e65c6f3eed9a54f41bd5dd3d81bb7373, type: 3} --- !u!4 &2409001797570340487 stripped @@ -4490,6 +4706,10 @@ PrefabInstance: propertyPath: m_Name value: Grass2 objectReference: {fileID: 0} + - target: {fileID: 169974662762826100, guid: b3931366235c76b46832937ce3b7876a, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7309587632157578731, guid: b3931366235c76b46832937ce3b7876a, type: 3} propertyPath: m_RootOrder value: 34 @@ -4596,6 +4816,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat3 (1) objectReference: {fileID: 0} + - target: {fileID: 3691179351823567132, guid: 62dcdfc792ac6c9498ed848651a83bec, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 62dcdfc792ac6c9498ed848651a83bec, type: 3} --- !u!4 &7468531914368278518 stripped @@ -4658,6 +4882,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &5179175916016000053 stripped @@ -4720,6 +4948,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &5184645573234931827 stripped @@ -4738,6 +4970,10 @@ PrefabInstance: propertyPath: m_Name value: Grass3 objectReference: {fileID: 0} + - target: {fileID: 2787239032939468289, guid: 556c33a001f683f49b0beb3feb85e883, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 4998470478716769639, guid: 556c33a001f683f49b0beb3feb85e883, type: 3} propertyPath: m_RootOrder value: 35 @@ -4844,6 +5080,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (4) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &5504513111370449021 stripped @@ -4906,6 +5146,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &5656612492521496069 stripped @@ -4968,6 +5212,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &5668292556573576999 stripped @@ -5030,6 +5278,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &5388575067385626031 stripped @@ -5092,6 +5344,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (4) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &5304421631661253271 stripped @@ -5154,6 +5410,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &5365765869541151457 stripped @@ -5172,6 +5432,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat5 objectReference: {fileID: 0} + - target: {fileID: 1698056521122239450, guid: a529559f98693d544b6b8220a354ba5e, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 2479712593716126066, guid: a529559f98693d544b6b8220a354ba5e, type: 3} propertyPath: m_RootOrder value: 14 @@ -5278,6 +5542,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &6073937557755096857 stripped @@ -5340,6 +5608,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &5896845134468261498 stripped @@ -5402,6 +5674,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &5954771395373072536 stripped @@ -5464,6 +5740,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &5794732583361639157 stripped @@ -5526,6 +5806,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (3) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &6599829456675367253 stripped @@ -5588,6 +5872,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &6421988504803654547 stripped @@ -5650,6 +5938,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &6740915188052632716 stripped @@ -5712,6 +6004,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &6878619427171586863 stripped @@ -5774,6 +6070,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (3) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &7165339919140894089 stripped @@ -5792,6 +6092,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat4 (1) objectReference: {fileID: 0} + - target: {fileID: 4732806265743767927, guid: 7494612dacc88e44d8c8832594f276f0, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7551408929396306835, guid: 7494612dacc88e44d8c8832594f276f0, type: 3} propertyPath: m_RootOrder value: 18 @@ -5898,6 +6202,10 @@ PrefabInstance: propertyPath: m_Name value: Grass5 objectReference: {fileID: 0} + - target: {fileID: 3921549868197282724, guid: 503282950ef56504eb2c3003edb270b6, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 503282950ef56504eb2c3003edb270b6, type: 3} --- !u!4 &5442129657852416632 stripped @@ -5960,6 +6268,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &7043592147709071937 stripped @@ -6022,6 +6334,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &7376278358908448893 stripped @@ -6084,6 +6400,10 @@ PrefabInstance: propertyPath: m_Name value: Grass1 objectReference: {fileID: 0} + - target: {fileID: 6740768790902088884, guid: 84764060172092f4e9950b03594974a5, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 84764060172092f4e9950b03594974a5, type: 3} --- !u!4 &2978061113016412013 stripped @@ -6146,6 +6466,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat2 objectReference: {fileID: 0} + - target: {fileID: 5728851475268051187, guid: c80556e8315922e4dac82443ee8ac65a, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c80556e8315922e4dac82443ee8ac65a, type: 3} --- !u!4 &7927709517162901830 stripped @@ -6208,6 +6532,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (3) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &7760683356727175695 stripped @@ -6270,6 +6598,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &7908107136510151258 stripped @@ -6332,6 +6664,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (2) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &7646386251397705935 stripped @@ -6394,6 +6730,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &7529000181202085049 stripped @@ -6456,6 +6796,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &7934441995238808937 stripped @@ -6518,6 +6862,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &7710251853616002262 stripped @@ -6580,6 +6928,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (4) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &8347469189348799099 stripped @@ -6642,6 +6994,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &8230488290071600302 stripped @@ -6704,6 +7060,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &8070893909185515068 stripped @@ -6766,6 +7126,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat3 objectReference: {fileID: 0} + - target: {fileID: 3691179351823567132, guid: 62dcdfc792ac6c9498ed848651a83bec, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 62dcdfc792ac6c9498ed848651a83bec, type: 3} --- !u!4 &6089657685709926606 stripped @@ -6784,6 +7148,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat1 (1) objectReference: {fileID: 0} + - target: {fileID: 530139869118861757, guid: 8c443aa2f0d9d0e4ca2d5aaa5047431c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 3853543274052405693, guid: 8c443aa2f0d9d0e4ca2d5aaa5047431c, type: 3} propertyPath: m_RootOrder value: 15 @@ -6890,6 +7258,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &8094953280275001397 stripped @@ -6952,6 +7324,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &8086636458388747080 stripped @@ -7014,6 +7390,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (2) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &8511989090722149578 stripped @@ -7076,6 +7456,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &8394311464078980703 stripped @@ -7094,6 +7478,10 @@ PrefabInstance: propertyPath: m_Name value: Wheat4 objectReference: {fileID: 0} + - target: {fileID: 4732806265743767927, guid: 7494612dacc88e44d8c8832594f276f0, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7551408929396306835, guid: 7494612dacc88e44d8c8832594f276f0, type: 3} propertyPath: m_RootOrder value: 13 @@ -7200,6 +7588,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (2) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &9042525936413348839 stripped @@ -7262,6 +7654,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower3 (1) objectReference: {fileID: 0} + - target: {fileID: 4693448939940326753, guid: 25bde8504746969429a6e055e376a793, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25bde8504746969429a6e055e376a793, type: 3} --- !u!4 &8844939838492314744 stripped @@ -7324,6 +7720,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower1 (1) objectReference: {fileID: 0} + - target: {fileID: 3602039253268305572, guid: 7f3681d376463044a9235aece2463c84, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f3681d376463044a9235aece2463c84, type: 3} --- !u!4 &9176986778376556855 stripped @@ -7386,6 +7786,10 @@ PrefabInstance: propertyPath: m_Name value: SunFlower2 (1) objectReference: {fileID: 0} + - target: {fileID: 6197195229345079834, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fa50b698a27e4146b97d8d86c79c59f, type: 3} --- !u!4 &9112284655333272430 stripped diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/myWarrior.controller b/Assets/GameAssets/Prefabs/Role/Warrior/myWarrior.controller index ac4412a..5d1e2b6 100644 --- a/Assets/GameAssets/Prefabs/Role/Warrior/myWarrior.controller +++ b/Assets/GameAssets/Prefabs/Role/Warrior/myWarrior.controller @@ -155,10 +155,10 @@ AnimatorStateMachine: m_Position: {x: 340, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: 381074812473331180} - m_Position: {x: 375, y: 325, z: 0} + m_Position: {x: 470, y: -200, z: 0} - serializedVersion: 1 m_State: {fileID: 1363684478293623723} - m_Position: {x: 410, y: 390, z: 0} + m_Position: {x: 730, y: -160, z: 0} - serializedVersion: 1 m_State: {fileID: -1871750871593261253} m_Position: {x: 445, y: 455, z: 0} @@ -439,7 +439,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: 3699321330036073150} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -597,7 +598,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: 1777839211832544646} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -638,6 +640,20 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &1777839211832544646 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 489a28a5fabbb684e9e115eb8456d5db, type: 3} + m_Name: + m_EditorClassIdentifier: + RoleID: 0 + Step: 2 --- !u!1102 &2819678479818455320 AnimatorState: serializedVersion: 6 @@ -683,6 +699,20 @@ MonoBehaviour: SendCanToNext: 0 RoleID: 0 NodeType: 0 +--- !u!114 &3699321330036073150 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 489a28a5fabbb684e9e115eb8456d5db, type: 3} + m_Name: + m_EditorClassIdentifier: + RoleID: 0 + Step: 1 --- !u!1102 &4054845936075069209 AnimatorState: serializedVersion: 6 diff --git a/Assets/Scripts/Main/AnimeScript/anime_JumpState.cs b/Assets/Scripts/Main/AnimeScript/anime_JumpState.cs new file mode 100644 index 0000000..78ed377 --- /dev/null +++ b/Assets/Scripts/Main/AnimeScript/anime_JumpState.cs @@ -0,0 +1,46 @@ +using Game; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum E_JUMP_STEP +{ + None, + JumpUp, + JumpFall +} + +public class anime_JumpState : StateMachineBehaviour +{ + public long RoleID = 0; + public E_JUMP_STEP Step; + + // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state + override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + RoleID = animator.GetInteger("RoleID"); + AppEntry.Event.Fire(null, MainPlayerJumpStateEventArgs.Create(RoleID, Step)); + } + + // OnState}Update is called on each Update frame between OnStateEnter and OnStateExit callbacks + override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + } + + // OnStateExit is called when a transition ends and the state machine finishes evaluating this state + override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + } + + // OnStateMove is called right after Animator.OnAnimatorMove() + //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that processes and affects root motion + //} + + // OnStateIK is called right after Animator.OnAnimatorIK() + //override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that sets up animation IK (inverse kinematics) + //} +} diff --git a/Assets/Scripts/Main/AnimeScript/anime_JumpState.cs.meta b/Assets/Scripts/Main/AnimeScript/anime_JumpState.cs.meta new file mode 100644 index 0000000..312f2bb --- /dev/null +++ b/Assets/Scripts/Main/AnimeScript/anime_JumpState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 489a28a5fabbb684e9e115eb8456d5db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs b/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs index 880b288..7851d1a 100644 --- a/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs +++ b/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs @@ -9,7 +9,6 @@ namespace Game { public Transform MainCamNode; public Transform CamPos; - public MainRole Player; /// @@ -27,12 +26,10 @@ namespace Game MainCamNode = transform.Find("MainCamNode"); CamPos = MainCamNode.Find("CamPos"); InGame = false; - AppEntry.Event.Subscribe(MainPlayerOnceAttackEventArgs.EventId, OnMainPlayerInAttackEventArgs); } private void OnDisable() { - AppEntry.Event.Unsubscribe(MainPlayerOnceAttackEventArgs.EventId, OnMainPlayerInAttackEventArgs); } public void ReSetMainPlayer() @@ -88,13 +85,23 @@ namespace Game Player.InputV2 = GamePlayEntry.Input.InputV2; - if (GamePlayEntry.Input.Attack - && - Player.AttackStep != E_ONCEATTACK_STEP.InAttack - ) + //如果处于攻击 后续不执行 + if (Player.AttackStep == E_ONCEATTACK_STEP.InAttack) + return; + + if (GamePlayEntry.Input.Attack) { //AxibugLog.Debug("DoAttack"); DoNextMotionAnimeName(); + return; + } + + if (Player.JumpStep == E_JUMP_STEP.None && GamePlayEntry.Input.Jump) + { + //AxibugLog.Debug("Jump"); + //TODO 放在这里是否合适？ 动作驱动 + Player.ChangeJumpState(E_JUMP_STEP.JumpUp); + return; } } @@ -134,20 +141,6 @@ namespace Game if(IsEndMotion) GamePlayEntry.Input.mInputMotionData.ClearHistoryMotion(); } - - #region 事件 - - private void OnMainPlayerInAttackEventArgs(object sender, LogicEventArgs e) - { - MainPlayerOnceAttackEventArgs msg = (MainPlayerOnceAttackEventArgs)e; - if (msg == null) throw new GameException("MainPlayerOnceAttackEventArgs is null"); - if (msg.RoleID == Player.RoleID) - { - Player.AttackStep = msg.Step; - } - } - - #endregion } } diff --git a/Assets/Scripts/Main/CustomsComponent/NoMonoBehaviour/InputNoMono.cs b/Assets/Scripts/Main/CustomsComponent/NoMonoBehaviour/InputNoMono.cs index 203291e..cf56d82 100644 --- a/Assets/Scripts/Main/CustomsComponent/NoMonoBehaviour/InputNoMono.cs +++ b/Assets/Scripts/Main/CustomsComponent/NoMonoBehaviour/InputNoMono.cs @@ -14,10 +14,12 @@ namespace Game { public Vector2 InputV2 { get { return _InputV2; } } public bool Attack { get { return _Attack; } } + public bool Jump { get { return _Jump; } } private Vector2 _clickPoint; //鼠标点击ui位置 private Vector2 _InputV2; private bool _Attack; + private bool _Jump; public InputMotionData mInputMotionData = new InputMotionData(); @@ -241,6 +243,8 @@ namespace Game _InputV2.y = Input.GetAxisRaw("Vertical"); _Attack = Input.GetKeyDown(KeyCode.J); + + _Jump = Input.GetKeyDown(KeyCode.K); } void Update_InputKeyCode() diff --git a/Assets/Scripts/Main/Definition/ConstClass.cs b/Assets/Scripts/Main/Definition/ConstClass.cs index 305e4a8..b017431 100644 --- a/Assets/Scripts/Main/Definition/ConstClass.cs +++ b/Assets/Scripts/Main/Definition/ConstClass.cs @@ -11,6 +11,8 @@ public class ConstClass public static float FastRunSpeedMultiplier = 3f; public static float FastModeShadowCreateIntervalTime = 0.25f; + public static float JumpSpeedY = 1; + public static float JumpSpeedY_Down = 1; public const float CellSize = 1f; } diff --git a/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs new file mode 100644 index 0000000..180e3bd --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs @@ -0,0 +1,31 @@ +using Axibug; +using Axibug.Event; + +namespace Game +{ + public class MainPlayerJumpStateEventArgs : LogicEventArgs + { + public static readonly int EventId = typeof(MainPlayerJumpStateEventArgs).GetHashCode(); + public long RoleID = 0; + public E_JUMP_STEP Step = E_JUMP_STEP.None; + + /// + /// 获取加载数据表成功事件编号。 + /// + public override int Id { get { return EventId; } } + + public static MainPlayerJumpStateEventArgs Create(long roleID,E_JUMP_STEP step) + { + MainPlayerJumpStateEventArgs s = ReferencePool.Acquire(); + s.Step = step; + s.RoleID = roleID; + return s; + } + + public override void Clear() + { + RoleID = 0; + Step = E_JUMP_STEP.None; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs.meta b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs.meta new file mode 100644 index 0000000..a343688 --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerJumpStateEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e78328b65d1102a4a82eb00394ba8909 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Role/MainRole.cs b/Assets/Scripts/Main/Role/MainRole.cs index cd9853b..dbc6552 100644 --- a/Assets/Scripts/Main/Role/MainRole.cs +++ b/Assets/Scripts/Main/Role/MainRole.cs @@ -1,4 +1,5 @@ using Axibug; +using Axibug.Event; using Axibug.Runtime; using System.Collections.Generic; using UnityEngine; @@ -31,11 +32,15 @@ namespace Game protected override void OnEnable() { base.OnEnable(); + AppEntry.Event.Subscribe(MainPlayerOnceAttackEventArgs.EventId, OnMainPlayerInAttackEventArgs); + AppEntry.Event.Subscribe(MainPlayerJumpStateEventArgs.EventId, OnMainPlayerJumpStateEventArgs); } protected override void OnDisable() { base.OnDisable(); + AppEntry.Event.Unsubscribe(MainPlayerOnceAttackEventArgs.EventId, OnMainPlayerInAttackEventArgs); + AppEntry.Event.Unsubscribe(MainPlayerJumpStateEventArgs.EventId, OnMainPlayerJumpStateEventArgs); } protected override void FixedUpdate() @@ -47,16 +52,24 @@ namespace Game const int SnapInterval = 3; int SnapIntervalIndex = 0; - protected override void Update() + /// + /// 快照更新逻辑 + /// + void Update_Snap() { - base.Update(); - SnapIntervalIndex++; if (SnapIntervalIndex >= SnapInterval) { mRoleSnapshot.AddSnap(mSpriteRenderer.sprite, mBridgeTransfrom.localEulerAngles, transform.position); SnapIntervalIndex = 0; } + } + + protected override void Update() + { + base.Update(); + + Update_Snap(); if (Input.GetKeyDown(KeyCode.T)) { @@ -101,6 +114,21 @@ namespace Game Anime.BackToIdle(); } } + public override void ChangeJumpState(E_JUMP_STEP jumpStep) + { + switch (jumpStep) + { + case E_JUMP_STEP.JumpUp: + Anime.SetOtherAnime("jump"); + break; + case E_JUMP_STEP.JumpFall: + Anime.SetOtherAnime("JumptoFall"); + break; + case E_JUMP_STEP.None: + Anime.BackToIdle(); + break; + } + } public override void Release() { @@ -186,5 +214,28 @@ namespace Game } } #endregion + + #region 事件 + + private void OnMainPlayerInAttackEventArgs(object sender, LogicEventArgs e) + { + MainPlayerOnceAttackEventArgs msg = (MainPlayerOnceAttackEventArgs)e; + if (msg == null) throw new GameException("MainPlayerOnceAttackEventArgs is null"); + if (msg.RoleID == RoleID) + { + AttackStep = msg.Step; + } + } + + private void OnMainPlayerJumpStateEventArgs(object sender, LogicEventArgs e) + { + MainPlayerJumpStateEventArgs msg = (MainPlayerJumpStateEventArgs)e; + if (msg == null) throw new GameException("MainPlayerJumpState is null"); + if (msg.RoleID == RoleID) + { + JumpStep = msg.Step; + } + } + #endregion } } diff --git a/Assets/Scripts/Main/Role/MonsterRole.cs b/Assets/Scripts/Main/Role/MonsterRole.cs index 8b56d1c..7f99849 100644 --- a/Assets/Scripts/Main/Role/MonsterRole.cs +++ b/Assets/Scripts/Main/Role/MonsterRole.cs @@ -72,5 +72,10 @@ namespace Game GamePlayEntry.RoleMgr.DestroyRole(this); } } + + public override void ChangeJumpState(E_JUMP_STEP jumpStep) + { + + } } } diff --git a/Assets/Scripts/Main/Role/RoleBase.cs b/Assets/Scripts/Main/Role/RoleBase.cs index d2dbf1c..082ef18 100644 --- a/Assets/Scripts/Main/Role/RoleBase.cs +++ b/Assets/Scripts/Main/Role/RoleBase.cs @@ -16,13 +16,6 @@ namespace Game public ICharMachineBase Anime => mAnime; - public Animator AttackBoxAnime; - public AttackBox AttackBoxCollider; - - public Vector2 InputV2; - - public E_ONCEATTACK_STEP AttackStep = E_ONCEATTACK_STEP.None; - public Transform ModelTransfrom { get { return mModelTransfrom; } } public Transform BridgeTransfrom { get { return mBridgeTransfrom; } } @@ -38,6 +31,12 @@ namespace Game protected Rigidbody mRigidbody; protected Collider mselfCollider; + public Animator AttackBoxAnime; + public AttackBox AttackBoxCollider; + + public Vector2 InputV2; + + public E_ONCEATTACK_STEP AttackStep = E_ONCEATTACK_STEP.None; protected virtual void Awake() { @@ -119,14 +118,15 @@ namespace Game protected virtual void Update() { Update_Move(); + Update_Jump(); } protected virtual void FixedUpdate() { FixedUpdate_Move(); } - public abstract void MeshChangeMoveState(bool ToMoveState); + public abstract void ChangeJumpState(E_JUMP_STEP jumpStep); public void MeshChangeDir(bool ToLeftDir) { @@ -155,7 +155,8 @@ namespace Game else//刚停止移动 { MoveTime = 0; - Move_currentVector = Vector3.zero;//清空移动方向 + //Move_currentVector = Vector3.zero;//清空移动方向 + Move_currentVector.x = 0;//清空移动方向 MeshChangeMoveState(false); } } @@ -191,10 +192,14 @@ namespace Game } else { - if (InputV2 != Vector2.zero) + //if (InputV2 != Vector2.zero) + //仅横向移动 + if (InputV2.x != 0) { isDoMove = true; - Move_currentVector = new Vector3(InputV2.x, 0, InputV2.y); + //Move_currentVector = new Vector3(InputV2.x, 0, InputV2.y); + //仅横向移动 + Move_currentVector.x = InputV2.x; } //AxibugLog.Debug("Move_currentVector =>" + Move_currentVector); @@ -230,11 +235,88 @@ namespace Game } #endregion + #region + public float JumpTime = 0; + public float Jump_CurrySpeedY = 0; + + + private E_JUMP_STEP mJumpStep = E_JUMP_STEP.None; + public E_JUMP_STEP JumpStep + { + get { return mJumpStep; } + set + { + if (mJumpStep != value) + { + mJumpStep = value; + switch (value) + { + case E_JUMP_STEP.JumpUp: + SetToUpVec(); + break; + } + } + } + } + + + + void Update_Jump() + { + //if(Move_currentVector.y) 跳跃衰减 + + //判断是否在空中 + + switch (JumpStep) + { + case E_JUMP_STEP.JumpUp: + Jump_CurrySpeedY -= Time.deltaTime * ConstClass.JumpSpeedY_Down; + if (Jump_CurrySpeedY <= 0) + { + Jump_CurrySpeedY = 0; + ChangeJumpState(E_JUMP_STEP.JumpFall); + } + break; + } + + Move_currentVector.y = Jump_CurrySpeedY; + //TODO 判断地面接触 + AxibugLog.Debug("TerrainEnterNumber->" + TerrainEnterNumber); + } + + // + void SetToUpVec() + { + Jump_CurrySpeedY = ConstClass.JumpSpeedY; + } + #endregion + #region 攻击盒子动画机 public void DoAtkBox(string AtkBoxAnimeName) { AttackBoxAnime.Play(AtkBoxAnimeName); } #endregion + + bool CheckRayTerrain() + { + Debug.DrawLine(transform.position, transform.position + Vector3.down, Color.red); + return Physics.RaycastAll(transform.position, transform.position + Vector3.down,1, LayerMask.NameToLayer("Terrain")).Length > 0; + } + + #region + int TerrainEnterNumber; + public void OnTriggerEnter(Collider other) + { + if (other.gameObject.layer == LayerMask.NameToLayer("Terrain")) + TerrainEnterNumber++; + } + + private void OnTriggerExit(Collider other) + { + if (other.gameObject.layer == LayerMask.NameToLayer("Terrain")) + TerrainEnterNumber--; + } + #endregion } }