From fb1ae6e1c2a7fafc969cf063dc754c62016f423e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Fri, 28 Aug 2026 23:26:45 +0800 Subject: [PATCH] 1 --- .../AddressableAssetSettings.asset | 5 +- .../AssetGroups/Default Local Group.asset | 42 ++ .../14082_Animator.controller | 519 +++++++++--------- .../Game/display_wargod_in_14053_0_dev.prefab | 14 +- 4 files changed, 314 insertions(+), 266 deletions(-) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 63df43670..ee3699704 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: a263e71fce79f2f4cb5b5f1fa6b7291a m_currentHash: serializedVersion: 2 - Hash: 3b5966ded4e5ce389a0746e8c0fed56e + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_BundleLocalCatalog: 0 @@ -123,6 +123,7 @@ MonoBehaviour: m_ProfileVersion: 1 m_LabelTable: m_LabelNames: + - ZSYX - Default - FishPrefab - MoveLine @@ -167,7 +168,7 @@ MonoBehaviour: m_Key: HostingServiceUploadSpeed - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_ClassName: System.String - m_Data: Library/com.unity.addressables/aa/Android/Android + m_Data: Library/com.unity.addressables/aa/Windows/StandaloneWindows64 m_Key: ContentRoot - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_ClassName: System.Boolean diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index da9557ddd..d46ee1e08 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -24,12 +24,47 @@ MonoBehaviour: - Audio - Default FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 0f931173a2c732a478a6e8f5750a0bd0 + m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - PTCBZS + - ZSYX + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 26f68c48bf8dba74dba3fe7f38ae6e60 m_Address: XJMHCreateFish.asset m_ReadOnly: 0 m_SerializedLabels: - Default FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3ff18466016e86542b372582f348d0d6 + m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_6004.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - PTCBZS + - ZSYX + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 44d2d83d8b5556a4b9c447f7a099571f + m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - PTCBZS + - ZSYX + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 55692611ed57c594fa0d7ecba7dcf704 + m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - PTCBZS + - ZSYX + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 623f39d408d373f498bfa9c7ef4f4dd1 + m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_14080_0_DaTing.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - PTCBZS + - ZSYX + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 88507e399a88aa744970855b92a576a8 m_Address: Assets/MyGame/aa/UI/Home/Sub/Turret/ZhanShen.renderTexture m_ReadOnly: 0 @@ -42,6 +77,13 @@ MonoBehaviour: - FishPrefab - XJMH FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: fd77a1da22db21441ab0b116128a5e3a + m_Address: Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab + m_ReadOnly: 0 + m_SerializedLabels: + - PTCBZS + - ZSYX + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2} m_SchemaSet: diff --git a/Assets/Art/FengLei/ResLY/AnimatorController/14082_Animator.controller b/Assets/Art/FengLei/ResLY/AnimatorController/14082_Animator.controller index 851cfea0f..baa39d89f 100644 --- a/Assets/Art/FengLei/ResLY/AnimatorController/14082_Animator.controller +++ b/Assets/Art/FengLei/ResLY/AnimatorController/14082_Animator.controller @@ -2,12 +2,12 @@ %TAG !u! tag:unity3d.com,2011: --- !u!91 &9100000 AnimatorController: - serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 14082_Animator + serializedVersion: 5 m_AnimatorParameters: - m_Name: EnterIndex m_Type: 3 @@ -64,53 +64,211 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1107 &1107631214240176047 -AnimatorStateMachine: +--- !u!114 &114463064302351008 +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: dcd507dc4db3147124d31195b1c9b915, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114608524934381787 +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: dcd507dc4db3147124d31195b1c9b915, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1101 &1101139470903126181 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: PlayFire + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 1107394230827052448} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101176436383745865 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: FireIndex + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102291756601783495} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101469576725413562 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: PlayFire + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101471756381408024 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: PlayFire + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101903562445213422 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: FireIndex + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102474052752740152} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102291756601783495 +AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: [] - m_ChildStateMachines: - - m_StateMachine: {fileID: 1107732035373849828} - m_Position: {x: 0, y: 0, z: 0} - - m_StateMachine: {fileID: 1107394230827052448} - m_Position: {x: 250, y: 0, z: 0} - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: - - first: {fileID: 1107394230827052448} - second: - - {fileID: 1109573220635865130} + m_Name: Fire0 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101471756381408024} + - {fileID: 1101903562445213422} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 0, y: -100, z: 0} - m_EntryPosition: {x: 250, y: -100, z: 0} - m_ExitPosition: {x: 500, y: -100, z: 0} - m_ParentStateMachinePosition: {x: 0, y: -200, z: 0} - m_DefaultState: {fileID: 1102788101196145573} ---- !u!1107 &1107732035373849828 -AnimatorStateMachine: + m_Position: {x: 0, y: 0, 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: c6dbbc04dd1fd4047853373d2a7c35a8, type: 2} + m_Tag: Fire + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102474052752740152 +AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle - m_ChildStates: - - m_State: {fileID: 1102788101196145573} - m_Position: {x: 0, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} + m_Name: Fire1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101469576725413562} + - {fileID: 1101176436383745865} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 0, y: -100, z: 0} - m_EntryPosition: {x: 250, y: -100, z: 0} - m_ExitPosition: {x: 500, y: -100, z: 0} - m_ParentStateMachinePosition: {x: 0, y: -200, z: 0} - m_DefaultState: {fileID: 1102788101196145573} + m_Position: {x: 250, y: 0, 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: b2f0bebdc9abbeb49af3c575b0e237eb, type: 2} + m_Tag: Fire + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102788101196145573 AnimatorState: serializedVersion: 6 @@ -134,35 +292,10 @@ AnimatorState: m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 5ecf00310c9890348b8e205b7037d226, type: 2} m_Tag: Idle - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &1101139470903126181 -AnimatorStateTransition: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: PlayFire - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 1107394230827052448} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - m_TransitionDuration: 0.1 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &1107394230827052448 AnimatorStateMachine: serializedVersion: 6 @@ -172,10 +305,12 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Fire m_ChildStates: - - m_State: {fileID: 1102291756601783495} + - serializedVersion: 1 + m_State: {fileID: 1102291756601783495} m_Position: {x: 0, y: 0, z: 0} - - m_State: {fileID: 1102474052752740152} - m_Position: {x: 250, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102474052752740152} + m_Position: {x: 290, y: -10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: @@ -187,214 +322,84 @@ AnimatorStateMachine: m_ExitPosition: {x: 500, y: -100, z: 0} m_ParentStateMachinePosition: {x: 0, y: -200, z: 0} m_DefaultState: {fileID: 1102291756601783495} ---- !u!1102 &1102291756601783495 -AnimatorState: +--- !u!1107 &1107631214240176047 +AnimatorStateMachine: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Fire0 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101471756381408024} - - {fileID: 1101903562445213422} - m_StateMachineBehaviours: - - {fileID: 114463064302351008} - m_Position: {x: 0, y: 0, 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: c6dbbc04dd1fd4047853373d2a7c35a8, type: 2} - m_Tag: Fire - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!114 &114463064302351008 -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: dcd507dc4db3147124d31195b1c9b915, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1101 &1101471756381408024 -AnimatorStateTransition: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: PlayFire - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - m_TransitionDuration: 0.1 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101903562445213422 -AnimatorStateTransition: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: FireIndex - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102474052752740152} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - m_TransitionDuration: 0.1 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &1102474052752740152 -AnimatorState: + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: + - serializedVersion: 1 + m_StateMachine: {fileID: 1107732035373849828} + m_Position: {x: 0, y: 0, z: 0} + - serializedVersion: 1 + m_StateMachine: {fileID: 1107394230827052448} + m_Position: {x: 250, y: 0, z: 0} + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: + - first: {fileID: 1107394230827052448} + second: + - {fileID: 1109573220635865130} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 0, y: -100, z: 0} + m_EntryPosition: {x: 250, y: -100, z: 0} + m_ExitPosition: {x: 500, y: -100, z: 0} + m_ParentStateMachinePosition: {x: 0, y: -200, z: 0} + m_DefaultState: {fileID: 1102788101196145573} +--- !u!1107 &1107732035373849828 +AnimatorStateMachine: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Fire1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1101469576725413562} - - {fileID: 1101176436383745865} - m_StateMachineBehaviours: - - {fileID: 114608524934381787} - m_Position: {x: 250, y: 0, 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: b2f0bebdc9abbeb49af3c575b0e237eb, type: 2} - m_Tag: Fire - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!114 &114608524934381787 -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: dcd507dc4db3147124d31195b1c9b915, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1101 &1101469576725413562 -AnimatorStateTransition: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: PlayFire - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 0} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 1 - m_TransitionDuration: 0.1 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &1101176436383745865 -AnimatorStateTransition: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: FireIndex - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102291756601783495} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - m_TransitionDuration: 0.1 - m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1109 &1109860736733404647 -AnimatorTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 6 - m_ConditionEvent: FireIndex - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102474052752740152} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 + m_Name: Idle + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102788101196145573} + m_Position: {x: 0, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 0, y: -100, z: 0} + m_EntryPosition: {x: 250, y: -100, z: 0} + m_ExitPosition: {x: 500, y: -100, z: 0} + m_ParentStateMachinePosition: {x: 0, y: -200, z: 0} + m_DefaultState: {fileID: 1102788101196145573} --- !u!1109 &1109573220635865130 AnimatorTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 1107732035373849828} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 0 + serializedVersion: 1 +--- !u!1109 &1109860736733404647 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: FireIndex + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102474052752740152} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab index 28dee956c..5187beb7e 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab @@ -256,37 +256,37 @@ PrefabInstance: - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49838302 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.86695695 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: -120.214005 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2206251582291059388, guid: 859e1645f6d526647be9a958fb2f9f2a, type: 3}