From e709f0e32e52fcf6b0d1e195c8e2ede5ff9212e6 Mon Sep 17 00:00:00 2001 From: yangjing Date: Sun, 12 Jun 2022 13:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E5=9D=A6=E5=85=8B=E7=9A=84?= =?UTF-8?q?=E8=83=9C=E5=88=A9=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Arts/Animation/plane/AirPlane.controller | 72 +++++++++++++++++++ .../Animation/plane/AirPlane.controller.meta | 8 +++ .../Prefab/Soldier/Human/Human_05.prefab | 48 +++++++++++-- .../Prefab/Soldier/Human/Human_06.prefab | 44 ++++++++++-- .../Prefab/Soldier/Human/Human_07.prefab | 34 +++++++++ .../Prefab/Soldier/Human/Human_08.prefab | 34 +++++++++ .../Prefab/Soldier/Human/Human_09.prefab | 54 +++++++++++--- .../Prefab/Soldier/Human/Human_10.prefab | 34 +++++++++ .../Prefab/Soldier/Monster/Monster_07.prefab | 20 ++++++ .../Prefab/Soldier/Monster/Monster_08.prefab | 20 ++++++ .../Prefab/Soldier/Monster/Monster_09.prefab | 20 ++++++ .../Prefab/Soldier/Monster/Monster_10.prefab | 20 ++++++ Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs | 22 ++++++ .../Game/Wars/Soldiers/ACSwitch.cs.meta | 11 +++ .../Soldiers/SoldierStates/SoldierStateWin.cs | 6 ++ 15 files changed, 425 insertions(+), 22 deletions(-) create mode 100644 Assets/Arts/Animation/plane/AirPlane.controller create mode 100644 Assets/Arts/Animation/plane/AirPlane.controller.meta create mode 100644 Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs create mode 100644 Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs.meta diff --git a/Assets/Arts/Animation/plane/AirPlane.controller b/Assets/Arts/Animation/plane/AirPlane.controller new file mode 100644 index 00000000..2d0e9eec --- /dev/null +++ b/Assets/Arts/Animation/plane/AirPlane.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirPlane + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1052305444420312963} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1052305444420312963 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7259858181283866987} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 7259858181283866987} +--- !u!1102 &7259858181283866987 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: lr-6zhuanquan 1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fbab84417599fdf46bd672477cdd7534, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Arts/Animation/plane/AirPlane.controller.meta b/Assets/Arts/Animation/plane/AirPlane.controller.meta new file mode 100644 index 00000000..37563c4d --- /dev/null +++ b/Assets/Arts/Animation/plane/AirPlane.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18382a148bc5142f49f6e5329a5b884e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_05.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_05.prefab index b140163f..bec4dee7 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_05.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_05.prefab @@ -39,6 +39,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3379029487173006746} + - component: {fileID: 5892465592593166405} m_Layer: 0 m_Name: AirPlane m_TagString: Untagged @@ -53,7 +54,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4864245076312400190} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 2.5, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: @@ -61,7 +62,26 @@ Transform: - {fileID: 6277882891350748462} m_Father: {fileID: 6298363177329098253} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5892465592593166405 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864245076312400190} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18382a148bc5142f49f6e5329a5b884e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5157610036023325171 GameObject: m_ObjectHideFlags: 0 @@ -105,6 +125,7 @@ GameObject: - component: {fileID: 6853178916808210146} - component: {fileID: -6444872694838949404} - component: {fileID: 2849252137115275723} + - component: {fileID: 4589707778808201387} m_Layer: 0 m_Name: Human_05 m_TagString: Untagged @@ -205,6 +226,19 @@ MonoBehaviour: mGobOff: {fileID: 6277882891350389006} mTsfExplode: {fileID: 6865278595962745852} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &4589707778808201387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298363177329098252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 5892465592593166405} --- !u!95 &6455306629853930029 Animator: serializedVersion: 3 @@ -393,22 +427,22 @@ PrefabInstance: - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} @@ -418,7 +452,7 @@ PrefabInstance: - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 6982978888860988081, guid: 9271ab7c0c71bb946838b7cb4fc40fdf, type: 3} diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab index b7210aa8..e185adeb 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_06.prefab @@ -41,6 +41,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3379029487173006746} + - component: {fileID: 4224837267417838289} m_Layer: 0 m_Name: AirPlane m_TagString: Untagged @@ -55,7 +56,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4864245076312400190} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 2.5, z: -0.63} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} m_Children: @@ -63,7 +64,26 @@ Transform: - {fileID: 2554928991785136891} m_Father: {fileID: 6298363177329098253} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4224837267417838289 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864245076312400190} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18382a148bc5142f49f6e5329a5b884e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5157610036023325171 GameObject: m_ObjectHideFlags: 0 @@ -107,6 +127,7 @@ GameObject: - component: {fileID: 6853178916808210146} - component: {fileID: -6444872694838949404} - component: {fileID: 2849252137115275723} + - component: {fileID: -2810368367208950644} m_Layer: 0 m_Name: Human_06 m_TagString: Untagged @@ -207,6 +228,19 @@ MonoBehaviour: mGobOff: {fileID: 2554928991785234139} mTsfExplode: {fileID: 6865278595962745852} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-2810368367208950644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298363177329098252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 4224837267417838289} --- !u!1 &7706113341957618141 GameObject: m_ObjectHideFlags: 0 @@ -383,7 +417,7 @@ PrefabInstance: - target: {fileID: 5839753632695892556, guid: efb0ab68da49eef49bf9a8121909ac33, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5839753632695892556, guid: efb0ab68da49eef49bf9a8121909ac33, type: 3} @@ -393,7 +427,7 @@ PrefabInstance: - target: {fileID: 5839753632695892556, guid: efb0ab68da49eef49bf9a8121909ac33, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5839753632695892556, guid: efb0ab68da49eef49bf9a8121909ac33, type: 3} @@ -408,7 +442,7 @@ PrefabInstance: - target: {fileID: 5839753632695892556, guid: efb0ab68da49eef49bf9a8121909ac33, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 5839753632695892556, guid: efb0ab68da49eef49bf9a8121909ac33, type: 3} diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab index c17a7466..35f35638 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_07.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3379029487173006746} + - component: {fileID: 6754028640569269764} m_Layer: 0 m_Name: AirPlane m_TagString: Untagged @@ -32,6 +33,25 @@ Transform: m_Father: {fileID: 6298363177329098253} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6754028640569269764 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864245076312400190} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18382a148bc5142f49f6e5329a5b884e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!95 &7648612002255525782 Animator: serializedVersion: 3 @@ -94,6 +114,7 @@ GameObject: - component: {fileID: 6853178916808210146} - component: {fileID: -6444872694838949404} - component: {fileID: 2849252137115275723} + - component: {fileID: -4105361871247078609} m_Layer: 0 m_Name: Human_07 m_TagString: Untagged @@ -194,6 +215,19 @@ MonoBehaviour: mGobOff: {fileID: 4668224470899137920} mTsfExplode: {fileID: 6865278595962745852} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-4105361871247078609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298363177329098252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 6754028640569269764} --- !u!1 &9078043511581482947 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_08.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_08.prefab index 45ed0227..797b2788 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_08.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_08.prefab @@ -28,6 +28,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3379029487173006746} + - component: {fileID: 5817676776549868149} m_Layer: 0 m_Name: AirPlane m_TagString: Untagged @@ -51,6 +52,25 @@ Transform: m_Father: {fileID: 6298363177329098253} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5817676776549868149 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864245076312400190} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18382a148bc5142f49f6e5329a5b884e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5157610036023325171 GameObject: m_ObjectHideFlags: 0 @@ -94,6 +114,7 @@ GameObject: - component: {fileID: 6853178916808210146} - component: {fileID: -6444872694838949404} - component: {fileID: 2849252137115275723} + - component: {fileID: -3164735292149812733} m_Layer: 0 m_Name: Human_08 m_TagString: Untagged @@ -194,6 +215,19 @@ MonoBehaviour: mGobOff: {fileID: 2318932755108840336} mTsfExplode: {fileID: 6865278595962745852} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-3164735292149812733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298363177329098252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 5817676776549868149} --- !u!1 &8673534225677092812 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_09.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_09.prefab index 0aa4cb10..4b95e72b 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_09.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_09.prefab @@ -28,6 +28,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3379029487173006746} + - component: {fileID: 8152534315906276902} m_Layer: 0 m_Name: AirPlane m_TagString: Untagged @@ -47,9 +48,29 @@ Transform: m_LocalScale: {x: 0.65, y: 0.65, z: 0.65} m_Children: - {fileID: 3483981469898412002} + - {fileID: 5297580637714612181} m_Father: {fileID: 6298363177329098253} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8152534315906276902 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864245076312400190} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18382a148bc5142f49f6e5329a5b884e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5157610036023325171 GameObject: m_ObjectHideFlags: 0 @@ -78,7 +99,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6298363177329098253} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5897595817162843475 GameObject: @@ -123,6 +144,7 @@ GameObject: - component: {fileID: 6853178916808210146} - component: {fileID: -6444872694838949404} - component: {fileID: 2849252137115275723} + - component: {fileID: -5765917711041862664} m_Layer: 0 m_Name: Human_09 m_TagString: Untagged @@ -141,7 +163,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5297580637714612181} - {fileID: 3379029487173006746} - {fileID: 6865278595962745852} m_Father: {fileID: 0} @@ -224,12 +245,25 @@ MonoBehaviour: mGobOff: {fileID: 4814094191460558191} mTsfExplode: {fileID: 6865278595962745852} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-5765917711041862664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298363177329098252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 8152534315906276902} --- !u!1001 &2509275572460468760 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 6298363177329098253} + m_TransformParent: {fileID: 3379029487173006746} m_Modifications: - target: {fileID: 6925874319039209335, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} @@ -244,22 +278,22 @@ PrefabInstance: - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.923077 objectReference: {fileID: 0} - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.923077 objectReference: {fileID: 0} - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.923077 objectReference: {fileID: 0} - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} @@ -269,12 +303,12 @@ PrefabInstance: - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} propertyPath: m_LocalPosition.y - value: -0.69799995 + value: -5.243077 objectReference: {fileID: 0} - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} propertyPath: m_LocalPosition.z - value: 0.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7734498409597715917, guid: c74f62cf42969fb4fa4b9319007b2b69, type: 3} diff --git a/Assets/Resources/Prefab/Soldier/Human/Human_10.prefab b/Assets/Resources/Prefab/Soldier/Human/Human_10.prefab index ff169336..3ecaaa74 100644 --- a/Assets/Resources/Prefab/Soldier/Human/Human_10.prefab +++ b/Assets/Resources/Prefab/Soldier/Human/Human_10.prefab @@ -39,6 +39,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3379029487173006746} + - component: {fileID: 4643308491875984005} m_Layer: 0 m_Name: AirPlane m_TagString: Untagged @@ -62,6 +63,25 @@ Transform: m_Father: {fileID: 6298363177329098253} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4643308491875984005 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4864245076312400190} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 18382a148bc5142f49f6e5329a5b884e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5157610036023325171 GameObject: m_ObjectHideFlags: 0 @@ -105,6 +125,7 @@ GameObject: - component: {fileID: 6853178916808210146} - component: {fileID: -6444872694838949404} - component: {fileID: 2849252137115275723} + - component: {fileID: 5190093447345415853} m_Layer: 0 m_Name: Human_10 m_TagString: Untagged @@ -205,6 +226,19 @@ MonoBehaviour: mGobOff: {fileID: 2384491247842908443} mTsfExplode: {fileID: 6865278595962745852} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &5190093447345415853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298363177329098252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 4643308491875984005} --- !u!95 &4614247393724460956 Animator: serializedVersion: 3 diff --git a/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab b/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab index aa94a32f..33e2d436 100644 --- a/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab +++ b/Assets/Resources/Prefab/Soldier/Monster/Monster_07.prefab @@ -124,6 +124,7 @@ GameObject: - component: {fileID: 348933939345620633} - component: {fileID: -2147760158918702433} - component: {fileID: 2473898093118942636} + - component: {fileID: -5787467982571365087} m_Layer: 0 m_Name: Monster_07 m_TagString: Untagged @@ -224,6 +225,19 @@ MonoBehaviour: mGobOff: {fileID: 6693233695428583908} mTsfExplode: {fileID: 6894928259820531216} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-5787467982571365087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6279640603712343909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 3931663573663400339} --- !u!1001 &4593132912225224929 PrefabInstance: m_ObjectHideFlags: 0 @@ -325,6 +339,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4593132912225224929} m_PrefabAsset: {fileID: 0} +--- !u!95 &3931663573663400339 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 661471951262042482, guid: 6576d095c7ff91d4392c38de987cd343, + type: 3} + m_PrefabInstance: {fileID: 4593132912225224929} + m_PrefabAsset: {fileID: 0} --- !u!4 &1030129871109897124 stripped Transform: m_CorrespondingSourceObject: {fileID: 3600020579334304581, guid: 6576d095c7ff91d4392c38de987cd343, diff --git a/Assets/Resources/Prefab/Soldier/Monster/Monster_08.prefab b/Assets/Resources/Prefab/Soldier/Monster/Monster_08.prefab index a9bc184a..399e221d 100644 --- a/Assets/Resources/Prefab/Soldier/Monster/Monster_08.prefab +++ b/Assets/Resources/Prefab/Soldier/Monster/Monster_08.prefab @@ -94,6 +94,7 @@ GameObject: - component: {fileID: 348933939345620633} - component: {fileID: -2147760158918702433} - component: {fileID: 2473898093118942636} + - component: {fileID: -973709352079010807} m_Layer: 0 m_Name: Monster_08 m_TagString: Untagged @@ -194,6 +195,19 @@ MonoBehaviour: mGobOff: {fileID: 2177681987121308965} mTsfExplode: {fileID: 6894928259820531216} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-973709352079010807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6279640603712343909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 9138446716284166895} --- !u!1 &6370823664919513053 GameObject: m_ObjectHideFlags: 0 @@ -310,6 +324,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440790126861192371} m_PrefabAsset: {fileID: 0} +--- !u!95 &9138446716284166895 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7866942072861781596, guid: bdcfa93fc105d214dbebf33599bdd682, + type: 3} + m_PrefabInstance: {fileID: 1440790126861192371} + m_PrefabAsset: {fileID: 0} --- !u!4 &3742984317895878251 stripped Transform: m_CorrespondingSourceObject: {fileID: 2310195543960791768, guid: bdcfa93fc105d214dbebf33599bdd682, diff --git a/Assets/Resources/Prefab/Soldier/Monster/Monster_09.prefab b/Assets/Resources/Prefab/Soldier/Monster/Monster_09.prefab index a5a648ce..bf0e4885 100644 --- a/Assets/Resources/Prefab/Soldier/Monster/Monster_09.prefab +++ b/Assets/Resources/Prefab/Soldier/Monster/Monster_09.prefab @@ -105,6 +105,7 @@ GameObject: - component: {fileID: 348933939345620633} - component: {fileID: -2147760158918702433} - component: {fileID: 2473898093118942636} + - component: {fileID: -9184524323330930277} m_Layer: 0 m_Name: Monster_09 m_TagString: Untagged @@ -205,6 +206,19 @@ MonoBehaviour: mGobOff: {fileID: 3773857045844307028} mTsfExplode: {fileID: 6894928259820531216} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &-9184524323330930277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6279640603712343909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 6118714518181193764} --- !u!95 &1126849539119512547 Animator: serializedVersion: 3 @@ -315,6 +329,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7486426565900955792} m_PrefabAsset: {fileID: 0} +--- !u!95 &6118714518181193764 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 3679206852520171700, guid: 0d5b120cdfdcfe146a4d2c363d289588, + type: 3} + m_PrefabInstance: {fileID: 7486426565900955792} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7793108097745177754 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefab/Soldier/Monster/Monster_10.prefab b/Assets/Resources/Prefab/Soldier/Monster/Monster_10.prefab index 722367e8..0dba4bc3 100644 --- a/Assets/Resources/Prefab/Soldier/Monster/Monster_10.prefab +++ b/Assets/Resources/Prefab/Soldier/Monster/Monster_10.prefab @@ -105,6 +105,7 @@ GameObject: - component: {fileID: 348933939345620633} - component: {fileID: -2147760158918702433} - component: {fileID: 2473898093118942636} + - component: {fileID: 6606393211015025567} m_Layer: 0 m_Name: Monster_10 m_TagString: Untagged @@ -205,6 +206,19 @@ MonoBehaviour: mGobOff: {fileID: 2605789616753203779} mTsfExplode: {fileID: 6894928259820531216} mFxOff: {fileID: 7735186994768879082, guid: a27d62e8b2883458f9bbd5cdb1e731d9, type: 3} +--- !u!114 &6606393211015025567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6279640603712343909} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4fddeb8c31f41279907f0b59aca9ec, type: 3} + m_Name: + m_EditorClassIdentifier: + mAC: {fileID: 417098373382235795} --- !u!1001 &4198300496260306668 PrefabInstance: m_ObjectHideFlags: 0 @@ -388,3 +402,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8573880406449796885} m_PrefabAsset: {fileID: 0} +--- !u!95 &417098373382235795 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 8301644907060679046, guid: e86dc156cf93ea94ab9393e0db5656d9, + type: 3} + m_PrefabInstance: {fileID: 8573880406449796885} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs b/Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs new file mode 100644 index 00000000..9fd86478 --- /dev/null +++ b/Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ACSwitch : MonoBehaviour +{ + [SerializeField] Animator mAC; + + private bool mIsOn = false; + public bool IsOn + { + get + { + return mIsOn; + } + set + { + mIsOn = value; + mAC.enabled = mIsOn; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs.meta b/Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs.meta new file mode 100644 index 00000000..1d98aca6 --- /dev/null +++ b/Assets/Scripts/Game/Wars/Soldiers/ACSwitch.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: be4fddeb8c31f41279907f0b59aca9ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game/Wars/Soldiers/SoldierStates/SoldierStateWin.cs b/Assets/Scripts/Game/Wars/Soldiers/SoldierStates/SoldierStateWin.cs index 5fb7a4f2..1d40d177 100644 --- a/Assets/Scripts/Game/Wars/Soldiers/SoldierStates/SoldierStateWin.cs +++ b/Assets/Scripts/Game/Wars/Soldiers/SoldierStates/SoldierStateWin.cs @@ -10,6 +10,12 @@ public class SoldierStateWin : BaseState base.EnterState(pLastState); mMaster.SetACTrigger(SoldierACTrigger.TriggerWin); + + ACSwitch[] tACs = mMaster.transform.GetComponents(); + for (int i = 0; i < tACs.Length; i++) + { + tACs[i].IsOn = true; + } } public override void ExecuteState(float pDeltaTime)