Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

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: 0
+  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
@@ -26,17 +52,18 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
---- !u!1102 &-2189527384325299200
+--- !u!1102 &-4040564592419863537
 AnimatorState:
   serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Take 001
+  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
@@ -46,12 +73,37 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 118338acae861c649ab6aa979cc51535, type: 2}
+  m_Motion: {fileID: 6427199632879939849, guid: 394998ae06fc34948bfedba0fc8e1451, type: 3}
   m_Tag: 
   m_SpeedParameter: 
   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: 0
+  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
@@ -85,10 +143,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -4642162309094991576}
-    m_Position: {x: 520, y: 80, z: 0}
+    m_Position: {x: 490, y: 80, z: 0}
   - serializedVersion: 1
-    m_State: {fileID: -2189527384325299200}
-    m_Position: {x: 520, y: 200, z: 0}
+    m_State: {fileID: -4040564592419863537}
+    m_Position: {x: 500, y: 170, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -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}

Assets/Scenes/05_LiveScene.unity

@@ -2857,6 +2857,8 @@ MonoBehaviour:
   - "\u60A8\u597D"
   speackIndex: 0
   spriteRenderer: {fileID: 1638246613}
+  animator: {fileID: 0}
+  animatorParameters: 
 --- !u!136 &890581131
 CapsuleCollider:
   m_ObjectHideFlags: 0
@@ -2961,6 +2963,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
@@ -4616,6 +4623,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

Assets/Scripts/Project/Objects/Other/NPCController.cs

@@ -7,11 +7,13 @@ public class NPCController : PermanentTriggerBase
     public List<string> 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<UI_CustomSessionPanel>(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<UI_CustomSessionPanel>())

Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs

@@ -38,6 +38,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
                     case E_ModeType.Study:
                         number++;
                         GetControl<Text>("Text_True").gameObject.SetActive(true);
+                       
                         if (GetControl<Toggle>("ImageF").isOn)
                         {
                             GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
@@ -67,6 +68,10 @@ public class UI_SelectWorkTicketPanel : BasePanel
                             GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
                             GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                         }
+                        else
+                        {
+                            GetControl<Text>("Text_True").gameObject.SetActive(true);
+                        }
                         break;
                     case E_ModeType.Exam:
                         if (GetControl<Toggle>("ImageF").isOn)
@@ -75,48 +80,17 @@ public class UI_SelectWorkTicketPanel : BasePanel
                             GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
                             GameManager.UIMgr.HidePanel<UI_SelectWorkTicketPanel>();
                         }
+                        else
+                        {
+                            GetControl<Text>("Text_True").gameObject.SetActive(true);
+                        }
                         break;
                 }
                 break;
         }
     }
 
-    //protected override void OnChangeToggle(string toogleName, bool isOn)
-    //{
-    //    switch (toogleName)
-    //    {
-    //        case "ImageA":
-    //            Reduction();
-    //            GetControl<Image>("Image_ANoSelected").gameObject.SetActive(false);
-    //            Debug.Log("name" + toogleName);
-    //            break;
-    //        case "ImageB":
-    //            Reduction();
-    //            GetControl<Image>("Image_BNoSelected").gameObject.SetActive(false);
-    //            Debug.Log("name" + toogleName);
-    //            break;
-    //        case "ImageC":
-    //            Reduction();
-    //            GetControl<Image>("Image_CNoSelected").gameObject.SetActive(false);
-    //            Debug.Log("name" + toogleName);
-    //            break;
-    //        case "ImageD":
-    //            Reduction();
-    //            GetControl<Image>("Image_DNoSelected").gameObject.SetActive(false);
-    //            Debug.Log("name" + toogleName);
-    //            break;
-    //        case "ImageE":
-    //            Reduction();
-    //            GetControl<Image>("Image_ENoSelected").gameObject.SetActive(false);
-    //            Debug.Log("name" + toogleName);
-    //            break;
-    //        case "ImageF":
-    //            Reduction();
-    //            GetControl<Image>("Image_FNoSelected").gameObject.SetActive(false);
-    //            Debug.Log("name" + toogleName);
-    //            break;
-    //    }
-    //}
+   
 
     /// <summary>
     /// 恢复所有未选中image的显示状态