From 81549fdb3d87cb7821a866d530a9c6605895321e Mon Sep 17 00:00:00 2001
From: shurongsen <1799096798@qq.com>
Date: Thu, 24 Oct 2024 12:46:20 +0800
Subject: [PATCH] add

---
 .../Assets/Resources/Ain/Operate.fbx.meta     |   9 +-
 .../Assets/Resources/Ain/OperateFail.fbx.meta |   7 -
 .../Assets/Resources/Prefab/Timerbg.prefab    | 251 ++++++++++++
 .../Resources/Prefab/Timerbg.prefab.meta      |   7 +
 xiaofang/Assets/Scenes/Tmap.unity             | 363 ++++++++----------
 .../Script/Character/CharacterControl.cs      | 186 +--------
 .../Script/Character/CharacterInturn.cs       | 208 ++++++++++
 .../Script/Character/CharacterInturn.cs.meta  |  11 +
 xiaofang/Assets/Script/TimerMgr.cs            |  36 ++
 xiaofang/Assets/Script/TimerMgr.cs.meta       |  11 +
 xiaofang/Assets/Script/UI/SkillCoolDownUI.cs  |  46 +++
 .../Assets/Script/UI/SkillCoolDownUI.cs.meta  |  11 +
 xiaofang/Assets/Script/npc/RecuseNpc.cs       |   2 +-
 13 files changed, 755 insertions(+), 393 deletions(-)
 create mode 100644 xiaofang/Assets/Resources/Prefab/Timerbg.prefab
 create mode 100644 xiaofang/Assets/Resources/Prefab/Timerbg.prefab.meta
 create mode 100644 xiaofang/Assets/Script/Character/CharacterInturn.cs
 create mode 100644 xiaofang/Assets/Script/Character/CharacterInturn.cs.meta
 create mode 100644 xiaofang/Assets/Script/TimerMgr.cs
 create mode 100644 xiaofang/Assets/Script/TimerMgr.cs.meta
 create mode 100644 xiaofang/Assets/Script/UI/SkillCoolDownUI.cs
 create mode 100644 xiaofang/Assets/Script/UI/SkillCoolDownUI.cs.meta

diff --git a/xiaofang/Assets/Resources/Ain/Operate.fbx.meta b/xiaofang/Assets/Resources/Ain/Operate.fbx.meta
index 8a4ad940..c7ce6f82 100644
--- a/xiaofang/Assets/Resources/Ain/Operate.fbx.meta
+++ b/xiaofang/Assets/Resources/Ain/Operate.fbx.meta
@@ -56,14 +56,7 @@ ModelImporter:
       mirror: 0
       bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
       curves: []
-      events:
-      - time: 0.9230769
-        functionName: OperateClick
-        data: 
-        objectReferenceParameter: {fileID: 2548037664796076872, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3}
-        floatParameter: 0
-        intParameter: 0
-        messageOptions: 0
+      events: []
       transformMask: []
       maskType: 3
       maskSource: {instanceID: 0}
diff --git a/xiaofang/Assets/Resources/Ain/OperateFail.fbx.meta b/xiaofang/Assets/Resources/Ain/OperateFail.fbx.meta
index 9f139ef1..66afd438 100644
--- a/xiaofang/Assets/Resources/Ain/OperateFail.fbx.meta
+++ b/xiaofang/Assets/Resources/Ain/OperateFail.fbx.meta
@@ -64,13 +64,6 @@ ModelImporter:
         floatParameter: 0
         intParameter: 0
         messageOptions: 0
-      - time: 1
-        functionName: OperateClick
-        data: 
-        objectReferenceParameter: {fileID: 2548037664796076872, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3}
-        floatParameter: 0
-        intParameter: 0
-        messageOptions: 0
       transformMask: []
       maskType: 3
       maskSource: {instanceID: 0}
diff --git a/xiaofang/Assets/Resources/Prefab/Timerbg.prefab b/xiaofang/Assets/Resources/Prefab/Timerbg.prefab
new file mode 100644
index 00000000..6a7c4a60
--- /dev/null
+++ b/xiaofang/Assets/Resources/Prefab/Timerbg.prefab
@@ -0,0 +1,251 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &365379564041095616
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 365379564041095617}
+  - component: {fileID: 365379564041095623}
+  - component: {fileID: 365379564041095622}
+  - component: {fileID: -8610825410172477127}
+  m_Layer: 5
+  m_Name: Timerbg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &365379564041095617
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564041095616}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 365379564486897291}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 39.9, y: -71.5}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &365379564041095623
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564041095616}
+  m_CullTransparentMesh: 1
+--- !u!114 &365379564041095622
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564041095616}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 84487d73ca4b791498332d8f6858417f, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &-8610825410172477127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564041095616}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a16d2947a13fe2640a5df99fa50fe75b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cooldownImage: {fileID: 365379564486897288}
+  cooldowntext: {fileID: 365379564297725365}
+--- !u!1 &365379564297725367
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 365379564297725364}
+  - component: {fileID: 365379564297725322}
+  - component: {fileID: 365379564297725365}
+  m_Layer: 5
+  m_Name: Timernumer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &365379564297725364
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564297725367}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 365379564486897291}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000023365, y: -2.766}
+  m_SizeDelta: {x: 100, y: 41.0636}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &365379564297725322
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564297725367}
+  m_CullTransparentMesh: 1
+--- !u!114 &365379564297725365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564297725367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &365379564486897290
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 365379564486897291}
+  - component: {fileID: 365379564486897289}
+  - component: {fileID: 365379564486897288}
+  m_Layer: 5
+  m_Name: Timermusk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &365379564486897291
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564486897290}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 365379564297725364}
+  m_Father: {fileID: 365379564041095617}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &365379564486897289
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564486897290}
+  m_CullTransparentMesh: 1
+--- !u!114 &365379564486897288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 365379564486897290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4433962, g: 0.43712175, b: 0.43712175, a: 0.79607844}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 84487d73ca4b791498332d8f6858417f, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
diff --git a/xiaofang/Assets/Resources/Prefab/Timerbg.prefab.meta b/xiaofang/Assets/Resources/Prefab/Timerbg.prefab.meta
new file mode 100644
index 00000000..67e145d6
--- /dev/null
+++ b/xiaofang/Assets/Resources/Prefab/Timerbg.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bc668f179da11c14f904b8b3e75babd1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/xiaofang/Assets/Scenes/Tmap.unity b/xiaofang/Assets/Scenes/Tmap.unity
index 8343ae38..629d8354 100644
--- a/xiaofang/Assets/Scenes/Tmap.unity
+++ b/xiaofang/Assets/Scenes/Tmap.unity
@@ -1041,83 +1041,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &379927520
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 379927521}
-  - component: {fileID: 379927523}
-  - component: {fileID: 379927522}
-  m_Layer: 5
-  m_Name: Timermusk
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &379927521
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 379927520}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 435138782}
-  m_Father: {fileID: 689167531}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &379927522
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 379927520}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.4433962, g: 0.43712175, b: 0.43712175, a: 0.79607844}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 84487d73ca4b791498332d8f6858417f, type: 3}
-  m_Type: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 1
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &379927523
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 379927520}
-  m_CullTransparentMesh: 1
 --- !u!1 &411940721
 GameObject:
   m_ObjectHideFlags: 0
@@ -1401,7 +1324,7 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 4300000, guid: c48652879e7e34a42b6768d67614eca6, type: 2}
---- !u!1 &435138781
+--- !u!1 &447047637
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1409,78 +1332,79 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 435138782}
-  - component: {fileID: 435138784}
-  - component: {fileID: 435138783}
+  - component: {fileID: 447047638}
   m_Layer: 5
-  m_Name: Timernumer
+  m_Name: Timer
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &435138782
+--- !u!224 &447047638
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 435138781}
+  m_GameObject: {fileID: 447047637}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 379927521}
-  m_RootOrder: 0
+  m_Father: {fileID: 1039624185}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.000023365, y: -2.766}
-  m_SizeDelta: {x: 100, y: 41.0636}
+  m_AnchoredPosition: {x: 50, y: -39}
+  m_SizeDelta: {x: 270.709, y: 213.806}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &435138783
+--- !u!1 &479940072
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 479940075}
+  - component: {fileID: 479940074}
+  m_Layer: 0
+  m_Name: CoolDownTimer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &479940074
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 435138781}
+  m_GameObject: {fileID: 479940072}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: 3aea4be46f13a644b9831ef083a643a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: New Text
---- !u!222 &435138784
-CanvasRenderer:
+  cooldownTimerPrefab: {fileID: 365379564041095616, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+--- !u!4 &479940075
+Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 435138781}
-  m_CullTransparentMesh: 1
+  m_GameObject: {fileID: 479940072}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -14.559455, y: 5.3156457, z: 22.810667}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 22
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &526829806
 GameObject:
   m_ObjectHideFlags: 0
@@ -1962,83 +1886,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &689167530
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 689167531}
-  - component: {fileID: 689167533}
-  - component: {fileID: 689167532}
-  m_Layer: 5
-  m_Name: Timerbg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &689167531
+--- !u!224 &689167531 stripped
 RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+  m_PrefabInstance: {fileID: 365379564727735658}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 689167530}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 379927521}
-  m_Father: {fileID: 1402647586}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 39.9, y: -71.5}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &689167532
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 689167530}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 84487d73ca4b791498332d8f6858417f, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &689167533
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 689167530}
-  m_CullTransparentMesh: 1
 --- !u!1 &702643057
 GameObject:
   m_ObjectHideFlags: 0
@@ -2770,6 +2622,7 @@ RectTransform:
   m_Children:
   - {fileID: 891617942}
   - {fileID: 2025302171}
+  - {fileID: 447047638}
   - {fileID: 1402647586}
   m_Father: {fileID: 0}
   m_RootOrder: 7
@@ -3061,6 +2914,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 7
       objectReference: {fileID: 0}
+    - target: {fileID: 8781837037642864497, guid: 562e2877764dbb248a3ba04ac32ad56a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 562e2877764dbb248a3ba04ac32ad56a, type: 3}
 --- !u!4 &1053217554 stripped
@@ -4009,7 +3866,7 @@ RectTransform:
   - {fileID: 1301153374}
   - {fileID: 689167531}
   m_Father: {fileID: 1039624185}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5376,6 +5233,107 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &365379564727735658
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1402647586}
+    m_Modifications:
+    - target: {fileID: 365379564041095616, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_Name
+      value: Timerbg
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095616, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 39.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -71.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 365379564041095617, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bc668f179da11c14f904b8b3e75babd1, type: 3}
 --- !u!1001 &410985242984056442
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5547,6 +5505,25 @@ PrefabInstance:
       objectReference: {fileID: 1068997306}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3}
+--- !u!1 &2548037666199698155 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2548037664796076872, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3}
+  m_PrefabInstance: {fileID: 2548037666199698154}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &2548037666199698156
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2548037666199698155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cha: {fileID: 0}
+  xfs: {fileID: 0}
 --- !u!1001 &2907630900810539152
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/xiaofang/Assets/Script/Character/CharacterControl.cs b/xiaofang/Assets/Script/Character/CharacterControl.cs
index 70a3fa2f..2400a87a 100644
--- a/xiaofang/Assets/Script/Character/CharacterControl.cs
+++ b/xiaofang/Assets/Script/Character/CharacterControl.cs
@@ -49,18 +49,7 @@ public class CharacterControl : MonoBehaviour
     //跑步时平滑切换fov
     private float targetFOV;
 
-    private Button recubtn;//救援按钮
-    private Button disbtn;//配电箱按钮
-    private Button connectgun;//连接水枪按钮
-    private Button connectfa;//连接水阀按钮
-    private Button openfa;//打开水阀按钮
-    private Image Timermusk;
-    private Text TimerText;
-
-    private int XfsStep=0;
-
-    public GameObject cha;
-    public GameObject xfs;
+ 
 
     //private Animator animator;
     //private AnimatorStateInfo stateInfo;
@@ -74,29 +63,7 @@ public class CharacterControl : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        xfs = GameObject.Find("Canvas/xfs");
-
-        recubtn = GameObject.Find("Canvas/Recuse").GetComponent<Button>();
-        disbtn = GameObject.Find("Canvas/Distribution box").GetComponent<Button>();
-        connectgun = GameObject.Find("Canvas/xfs/ConnectGun").GetComponent<Button>();
-        connectfa = GameObject.Find("Canvas/xfs/ConnectFa").GetComponent<Button>();
-        openfa = GameObject.Find("Canvas/xfs/OpenFa").GetComponent<Button>();
-        Timermusk = GameObject.Find("Canvas/xfs/Timerbg/Timermusk").GetComponent<Image>();
-        TimerText = GameObject.Find("Canvas/xfs/Timerbg/Timermusk/Timernumer").GetComponent<Text>();
-        //animator = this.GetComponent<Animator>();
-        // stateInfo = animator.GetCurrentAnimatorStateInfo(0);
-
-        recubtn.gameObject.SetActive(false);
-        disbtn.gameObject.SetActive(false);
-        xfs.gameObject.SetActive(false);
-
-
-        recubtn.onClick.AddListener(Recuse);
-        disbtn.onClick.AddListener(disClick);
-        connectgun.onClick.AddListener(CgunClick);
-        connectfa.onClick.AddListener(CfaClick);
-        openfa.onClick.AddListener(OfaClick);
-
+       
         
     }
 
@@ -260,155 +227,6 @@ public class CharacterControl : MonoBehaviour
     //    }
     //}
 
-    void Recuse()//救援操作
-    {
-        Characterain.SetSkillAin(CharacterSkill.Rescue);
-        StartCoroutine("Rescuereturn");
-    }
-
-    void disClick()//配电箱操作
-    { 
-       
-
-    }
-
-    void CgunClick()//连接水枪操作
-    {
-        if (XfsStep == 0)
-        {
-            //执行操作动画
-            Debug.Log("连接水枪");
-            CoGunHide(0);
-            XfsStep++;
-            StartCoroutine(AnimTime(5));
-            Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
-        }
-        else
-        {
-          
-            //执行操作失败动画
-            Debug.Log("操作失败，重新开始");
-            XfsStep = 0;
-            CoGunHide(0);
-            Characterain.SetSkillAin(CharacterSkill.OperateFail);
-          
-        }
-    
-    }
-
-    void CfaClick()//连接水阀操作
-    {
-        if (XfsStep == 1)
-        {
-            //执行操作动画
-            Debug.Log("连接水阀");  
-            CoGunHide(1);
-            XfsStep++;
-            connectfa.gameObject.SetActive(false);
-          
-            Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
-        }
-        else
-        {
-            //执行操作失败动画
-            XfsStep = 0;
-            CoGunHide(0);
-            Characterain.SetSkillAin(CharacterSkill.OperateFail);
-        
-            
-        }
-
-    }
-
-    void OfaClick()//打开水阀操作
-    {
-        if (XfsStep == 2)
-        {
-            //执行操作动画
-            Debug.Log("打开水阀");
-            CoGunHide(1);
-            XfsStep++;
-            Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
-
-        }
-        else
-        {
-            //执行操作失败动画
-            XfsStep = 0;
-            CoGunHide(0);
-            Characterain.SetSkillAin(CharacterSkill.OperateFail);
-           
-        }
-
-    }
-
-
-
-    IEnumerator AnimTime(float timer)
-    {
-
-        //Timermusk.fillAmount = (5 - 0.2f * Time.deltaTime) / 5;
-        //TimerText.text = "" + ((5 - 0.2f * Time.deltaTime) / 5).ToString("F2");
-        yield return new WaitForSeconds(1f);
-    }
-
-
-
-    IEnumerator Rescuereturn()//携程实现npc被救援成功后进行撤离
-    {
-        recubtn.gameObject.SetActive(false);
-        yield return new WaitForSeconds(2);
-        Characterain.SetSkillAin(CharacterSkill.NoSkill);
-        cha.GetComponent<RecuseNpc>().Setnpcstate();
-       
-    }
-
-
-
-    void OperateClick()//帧事件函数，等动作执行完毕允许点击按钮
-    {
-        Characterain.SetSkillAin(CharacterSkill.NoSkill);
-           CoApper();
-      
-    }
-
-
-
-
-    void CoGunHide(int Hide)//执行动作期间对按钮进行隐藏
-    {
-        switch (Hide)
-        {
-            case 0:
-                connectgun.gameObject.SetActive(false);
-                connectfa.gameObject.SetActive(false);
-                openfa.gameObject.SetActive(false);
-                break;
-            case 1:
-                openfa.gameObject.SetActive(false);
-               break;
-        }
-    }
-
-    void CoApper()//显示当前步骤应该出现的按钮
-    {
-        switch (XfsStep)
-        {
-            case 0:
-                connectgun.gameObject.SetActive(true);
-                connectfa.gameObject.SetActive(true);
-                openfa.gameObject.SetActive(true);
-                break;
-            case 1:
-                connectfa.gameObject.SetActive(true);
-                openfa.gameObject.SetActive(true);
-                break;
-            case 2:
-                openfa.gameObject.SetActive(true);
-                break;
-        }
-    
-    }
 
      
     public  void Restore()//启用fire那边造成的脚本隐藏
diff --git a/xiaofang/Assets/Script/Character/CharacterInturn.cs b/xiaofang/Assets/Script/Character/CharacterInturn.cs
new file mode 100644
index 00000000..572b6030
--- /dev/null
+++ b/xiaofang/Assets/Script/Character/CharacterInturn.cs
@@ -0,0 +1,208 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class CharacterInturn : MonoBehaviour
+{
+
+    private Button recubtn;//救援按钮
+    private Button disbtn;//配电箱按钮
+    private Button connectgun;//连接水枪按钮
+    private Button connectfa;//连接水阀按钮
+    private Button openfa;//打开水阀按钮
+    //private Image Timermusk;
+    //private Text TimerText;
+
+    private CharacterAin Characterain;
+
+    private int XfsStep = 0;
+
+    public GameObject cha;
+    public GameObject xfs;
+    private GameObject timer;
+    // Start is called before the first frame update
+    void Start()
+    {
+        xfs = GameObject.Find("Canvas/xfs");
+
+        recubtn = GameObject.Find("Canvas/Recuse").GetComponent<Button>();
+        disbtn = GameObject.Find("Canvas/Distribution box").GetComponent<Button>();
+        connectgun = GameObject.Find("Canvas/xfs/ConnectGun").GetComponent<Button>();
+        connectfa = GameObject.Find("Canvas/xfs/ConnectFa").GetComponent<Button>();
+        openfa = GameObject.Find("Canvas/xfs/OpenFa").GetComponent<Button>();
+        //Timermusk = GameObject.Find("Canvas/xfs/Timerbg/Timermusk").GetComponent<Image>();
+        //TimerText = GameObject.Find("Canvas/xfs/Timerbg/Timermusk/Timernumer").GetComponent<Text>();
+        Characterain = this.GetComponent<CharacterAin>();
+        //animator = this.GetComponent<Animator>();
+        // stateInfo = animator.GetCurrentAnimatorStateInfo(0);
+
+        timer = GameObject.Find("Canvas/Timer");
+
+        recubtn.gameObject.SetActive(false);
+        disbtn.gameObject.SetActive(false);
+        xfs.gameObject.SetActive(false);
+
+
+        recubtn.onClick.AddListener(Recuse);
+        disbtn.onClick.AddListener(disClick);
+        connectgun.onClick.AddListener(CgunClick);
+        connectfa.onClick.AddListener(CfaClick);
+        openfa.onClick.AddListener(OfaClick);
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    void Recuse()//救援操作
+    {
+        Characterain.SetSkillAin(CharacterSkill.Rescue);
+        StartCoroutine(Rescuereturn(7f));
+    }
+
+    void disClick()//配电箱操作
+    {
+
+
+    }
+
+    void CgunClick()//连接水枪操作
+    {
+        if (XfsStep == 0)
+        {
+            //执行操作动画
+            Debug.Log("连接水枪");
+            CoGunHide(0);
+            XfsStep++;
+            StartCoroutine(AnimTime(6f));
+            Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
+        }
+        else
+        {
+
+            //执行操作失败动画
+            Debug.Log("操作失败，重新开始");
+            XfsStep = 0;
+            CoGunHide(0);
+            StartCoroutine(AnimTime(2f));
+            Characterain.SetSkillAin(CharacterSkill.OperateFail);
+
+        }
+
+    }
+
+    void CfaClick()//连接水阀操作
+    {
+        if (XfsStep == 1)
+        {
+            //执行操作动画
+            Debug.Log("连接水阀");
+            CoGunHide(1);
+            XfsStep++;
+            StartCoroutine(AnimTime(6f));
+            connectfa.gameObject.SetActive(false);
+            Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
+        }
+        else
+        {
+            //执行操作失败动画
+            XfsStep = 0;
+            CoGunHide(0);
+            StartCoroutine(AnimTime(2f));
+            Characterain.SetSkillAin(CharacterSkill.OperateFail);
+
+
+        }
+
+    }
+
+    void OfaClick()//打开水阀操作
+    {
+        if (XfsStep == 2)
+        {
+            //执行操作动画
+            Debug.Log("打开水阀");
+            CoGunHide(1);
+            XfsStep++;
+            StartCoroutine(AnimTime(6f));
+            Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
+
+        }
+        else
+        {
+            //执行操作失败动画
+            XfsStep = 0;
+            CoGunHide(0);
+            StartCoroutine(AnimTime(2f));
+            Characterain.SetSkillAin(CharacterSkill.OperateFail);
+
+        }
+
+    }
+
+
+
+    IEnumerator AnimTime(float timer)
+    {
+        TimerMgr.Instance.StartCooldown(timer, HandleCooldownFinished); // 传入冷却时间和结束事件
+        yield return null;
+    }
+
+    void HandleCooldownFinished()//这里添加一个事件用来处理计时器冷却技术后的逻辑
+    {
+        Characterain.SetSkillAin(CharacterSkill.NoSkill);
+        CoApper();
+    }
+
+    IEnumerator Rescuereturn(float timer)//携程实现npc被救援成功后进行撤离
+    {
+        recubtn.gameObject.SetActive(false);
+        TimerMgr.Instance.StartCooldown(timer,HandleRescue);
+        yield return  null;
+ 
+
+    }
+    void HandleRescue()
+    {
+        Characterain.SetSkillAin(CharacterSkill.NoSkill);
+        cha.GetComponent<RecuseNpc>().Setnpcstate();
+    }
+    void CoGunHide(int Hide)//执行动作期间对按钮进行隐藏
+    {
+        switch (Hide)
+        {
+            case 0:
+                connectgun.gameObject.SetActive(false);
+                connectfa.gameObject.SetActive(false);
+                openfa.gameObject.SetActive(false);
+                break;
+            case 1:
+                openfa.gameObject.SetActive(false);
+                break;
+        }
+    }
+
+    void CoApper()//显示当前步骤应该出现的按钮
+    {
+        switch (XfsStep)
+        {
+            case 0:
+                connectgun.gameObject.SetActive(true);
+                connectfa.gameObject.SetActive(true);
+                openfa.gameObject.SetActive(true);
+                break;
+            case 1:
+                connectfa.gameObject.SetActive(true);
+                openfa.gameObject.SetActive(true);
+                break;
+            case 2:
+                openfa.gameObject.SetActive(true);
+                break;
+        }
+
+    }
+
+}
diff --git a/xiaofang/Assets/Script/Character/CharacterInturn.cs.meta b/xiaofang/Assets/Script/Character/CharacterInturn.cs.meta
new file mode 100644
index 00000000..2014087b
--- /dev/null
+++ b/xiaofang/Assets/Script/Character/CharacterInturn.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/xiaofang/Assets/Script/TimerMgr.cs b/xiaofang/Assets/Script/TimerMgr.cs
new file mode 100644
index 00000000..cc96b131
--- /dev/null
+++ b/xiaofang/Assets/Script/TimerMgr.cs
@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+public class TimerMgr : MonoBehaviour
+{
+    public static TimerMgr Instance { get; private set; }
+    public GameObject cooldownTimerPrefab; // 在Inspector中拖入计时器预制体
+    private GameObject timerpos;
+    private void Awake()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+            DontDestroyOnLoad(gameObject); // 保证管理器在场景之间不被销毁
+        }
+        else
+        {
+            Destroy(gameObject);
+        }
+        timerpos = GameObject.Find("Canvas");
+
+    }
+
+    public void StartCooldown(float cooldownTime, Action onFinished)
+    {
+        GameObject timer = Instantiate(cooldownTimerPrefab);
+        timer.transform.SetParent(timerpos.transform,false);
+        SkillCoolDownUI cooldownTimer = timer.GetComponent<SkillCoolDownUI>();
+        cooldownTimer.OnCooldownFinished += onFinished; // 订阅冷却结束事件
+        cooldownTimer.StartCooldown(cooldownTime);
+    }
+
+
+
+}
diff --git a/xiaofang/Assets/Script/TimerMgr.cs.meta b/xiaofang/Assets/Script/TimerMgr.cs.meta
new file mode 100644
index 00000000..6ebf9037
--- /dev/null
+++ b/xiaofang/Assets/Script/TimerMgr.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3aea4be46f13a644b9831ef083a643a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs b/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs
new file mode 100644
index 00000000..7ce1f09a
--- /dev/null
+++ b/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using System;
+public class SkillCoolDownUI : MonoBehaviour
+{
+    public Image cooldownImage; // 拖动Image组件到这里
+    public Text cooldowntext;//显示计时器剩余时间
+    public event Action OnCooldownFinished; // 冷却结束事件
+
+    private Coroutine countdownCoroutine;
+
+    public void StartCooldown(float cooldownTime)
+    {
+        if (countdownCoroutine != null)
+        {
+            StopCoroutine(countdownCoroutine);
+        }
+        countdownCoroutine = StartCoroutine(CooldownRoutine(cooldownTime));
+    }
+
+    private IEnumerator CooldownRoutine(float cooldownTime)
+    {
+        float elapsed = 0f;
+        cooldownImage.fillAmount = 1; // 设置为满
+
+        while (elapsed < cooldownTime)
+        {
+            elapsed += Time.deltaTime;
+            cooldownImage.fillAmount = 1 - (elapsed / cooldownTime);
+            cooldowntext.text =((1 - (elapsed / cooldownTime))*10).ToString("F1");
+            yield return null;
+        }
+
+        HandleCooldownFinished();
+    }
+
+    private void HandleCooldownFinished()
+    {
+        cooldownImage.fillAmount = 0; // 重新设置为0
+        OnCooldownFinished?.Invoke(); // 触发冷却结束事件
+
+        Destroy(gameObject);
+    }
+}
diff --git a/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs.meta b/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs.meta
new file mode 100644
index 00000000..7a3b13aa
--- /dev/null
+++ b/xiaofang/Assets/Script/UI/SkillCoolDownUI.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a16d2947a13fe2640a5df99fa50fe75b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/xiaofang/Assets/Script/npc/RecuseNpc.cs b/xiaofang/Assets/Script/npc/RecuseNpc.cs
index d34dc91c..fe8d950d 100644
--- a/xiaofang/Assets/Script/npc/RecuseNpc.cs
+++ b/xiaofang/Assets/Script/npc/RecuseNpc.cs
@@ -34,7 +34,7 @@ public class RecuseNpc : MonoBehaviour
         if(other.name == "Man")
         recusebtn.gameObject.SetActive(true);
         if (statebool) return;
-        other.GetComponent<CharacterControl>().cha = this.gameObject ;
+        other.GetComponent<CharacterInturn>().cha = this.gameObject ;
     }
 
     private void OnTriggerExit(Collider other)