From 897c41c22626eccabca711ca6742e413b8e98ee1 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 5 Sep 2024 11:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/New Folder(2)/人物/man.controller | 66 +++++++++++++++++-- Assets/Scenes/05_LiveScene.unity | 9 +++ .../Project/Objects/Other/NPCController.cs | 14 +++- 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/Assets/ArtRes/Models/New Folder(2)/人物/man.controller b/Assets/ArtRes/Models/New Folder(2)/人物/man.controller index 791aee5..605feff 100644 --- a/Assets/ArtRes/Models/New Folder(2)/人物/man.controller +++ b/Assets/ArtRes/Models/New Folder(2)/人物/man.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8014694128587225627 +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: NPCState + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4642162309094991576} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.85 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4642162309094991576 AnimatorState: serializedVersion: 6 @@ -10,7 +35,8 @@ AnimatorState: m_Name: "\u62FF\u7740\u6728\u677F\u548C\u7EB8\u8BA8\u8BBA" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3433326143476230490} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -36,7 +62,8 @@ AnimatorState: m_Name: "\u5F85\u673A\u52A8\u753B" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8014694128587225627} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -52,6 +79,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3433326143476230490 +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: NPCState + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4040564592419863537} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9893843 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -60,7 +112,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: man serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: NPCState + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -98,4 +156,4 @@ AnimatorStateMachine: 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: -4642162309094991576} + m_DefaultState: {fileID: -4040564592419863537} diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index 614e3b2..980c013 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -2566,6 +2566,8 @@ MonoBehaviour: - "\u60A8\u597D" speackIndex: 0 spriteRenderer: {fileID: 1638246613} + animator: {fileID: 0} + animatorParameters: --- !u!136 &890581131 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2670,6 +2672,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 37a1c4ccb0351ce4b84bf605bc9cbf11, type: 3} +--- !u!95 &897986306 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7850606089874859549, guid: 37a1c4ccb0351ce4b84bf605bc9cbf11, type: 3} + m_PrefabInstance: {fileID: 897986305} + m_PrefabAsset: {fileID: 0} --- !u!64 &909405519 MeshCollider: m_ObjectHideFlags: 0 @@ -4325,6 +4332,8 @@ MonoBehaviour: - "\u4ECA\u5929\u5DE5\u4F5C\u5185\u5BB9\u662F\u76F4\u63A5\u63A5\u5165\u5F0F\u7535\u80FD\u8BA1\u91CF\u88C5\u7F6E\u8F6E\u6362\u4F5C\u4E1A\uFF0C\u5DE5\u4F5C\u5730\u70B9\u662Fxxx......" speackIndex: 0 spriteRenderer: {fileID: 680750130} + animator: {fileID: 897986306} + animatorParameters: NPCState --- !u!4 &1198127457 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Project/Objects/Other/NPCController.cs b/Assets/Scripts/Project/Objects/Other/NPCController.cs index a12bc36..9a69f17 100644 --- a/Assets/Scripts/Project/Objects/Other/NPCController.cs +++ b/Assets/Scripts/Project/Objects/Other/NPCController.cs @@ -7,11 +7,13 @@ public class NPCController : PermanentTriggerBase public List npcSpeack; public int speackIndex = 0; public SpriteRenderer spriteRenderer; + public Animator animator; + public string animatorParameters; protected override void OnMDown() { base.OnMDown(); - - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false ) == 0) + + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0) { GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { @@ -19,6 +21,10 @@ public class NPCController : PermanentTriggerBase }); _highlight.SetHighlighted(false); spriteRenderer.gameObject.SetActive(false); + if(animator != null) + { + animator.SetInteger(animatorParameters, 1); + } } } @@ -35,6 +41,10 @@ public class NPCController : PermanentTriggerBase else { GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true); + if (animator != null) + { + animator.SetInteger(animatorParameters, 0); + } //̸»°»Øµ÷ ScoreManager.instance.Check(triggerName, null); if (GameManager.UIMgr.GetPanel())