From 0315aae7e77a341aba55c103e8360651bb2ad933 Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sat, 26 Feb 2022 14:38:52 +0800
Subject: [PATCH 1/7] 233

---
 .../Resources/Prefabs/UI/PlayerInfoUI.prefab  |  6 +++---
 Assets/Scripts/Data/GameData/GameEventData.cs |  1 +
 Assets/Scripts/UI/GameUI/PlayerInfoUI.cs      | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
index 5bd6869..8e43b1c 100644
--- a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
+++ b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
@@ -1781,7 +1781,7 @@ RectTransform:
   m_GameObject: {fileID: 2922561978496405277}
   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_LocalScale: {x: 1.0211886, y: 0.87064457, z: 0.86265}
   m_Children: []
   m_Father: {fileID: 2922561980104388487}
   m_RootOrder: 1
@@ -2932,7 +2932,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2922561980104388480}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -2.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2922561979714451338}
@@ -2943,7 +2943,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000076293945, y: -14.913}
+  m_AnchoredPosition: {x: 1.1000061, y: -14.799999}
   m_SizeDelta: {x: 0.000091552734, y: -29.825619}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2922561980104388486
diff --git a/Assets/Scripts/Data/GameData/GameEventData.cs b/Assets/Scripts/Data/GameData/GameEventData.cs
index 00986e8..edf07e2 100644
--- a/Assets/Scripts/Data/GameData/GameEventData.cs
+++ b/Assets/Scripts/Data/GameData/GameEventData.cs
@@ -72,6 +72,7 @@ public enum PlayerCommandType
     GameResume = 2012,
     LaunchExternalTransport = 2013,
     DeliveryAgreement = 2014,
+    ChangeTimeScaleToLevel = 2015,
 }
 
 public class GameEventData : GameDataBase
diff --git a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
index f993d05..b9f8d77 100644
--- a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
+++ b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
@@ -144,6 +144,12 @@ public class PlayerInfoUI : UIBase
             OnChangeTime(false);
         });
 
+        //时间调整到某一级
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel1").GetComponent<Button>().onClick.SetListener(() => {
+            OnChangeTime(true);
+        });
+
+
         //银行按钮
         Get<Button>("Bank").onClick.SetListener(OnClickBankButton); 
         Get<MouseEventHandler>("Bank").OnEnter += (data) =>
@@ -575,6 +581,21 @@ public class PlayerInfoUI : UIBase
         Data.Instance.PlayerLauncher.SendCommand(changeCommand);
     }
 
+    private void OnChangeTimeToLevel(int target)
+    {
+        if (Data.Instance.GameData.isPause)
+        {
+            return;
+        }
+        PlayerCommandArgs args = new PlayerCommandArgs();
+        PlayerCommandData changetolevelCommand = new PlayerCommandData(PlayerCommandType.ChangeTimeScaleToLevel,
+            Data.Instance.Time,
+            Data.Instance.Player.id,
+            args
+            );
+        Data.Instance.PlayerLauncher.SendCommand(changetolevelCommand) ;
+    }
+
     /// <summary>
     /// 打开财务信息
     /// </summary>
-- 
Gitee


From 0a65ecdff3f8ca58c8922f730e7e52a1c4a9dcb1 Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sat, 26 Feb 2022 14:42:07 +0800
Subject: [PATCH 2/7] obj

---
 Assets/Scripts/UI/GameUI/PlayerInfoUI.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
index b9f8d77..93c2220 100644
--- a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
+++ b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
@@ -588,6 +588,7 @@ public class PlayerInfoUI : UIBase
             return;
         }
         PlayerCommandArgs args = new PlayerCommandArgs();
+        args.param = new int[] { target };
         PlayerCommandData changetolevelCommand = new PlayerCommandData(PlayerCommandType.ChangeTimeScaleToLevel,
             Data.Instance.Time,
             Data.Instance.Player.id,
-- 
Gitee


From 92e0ba16305553d91111a4f522bb5bb2d57cac36 Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sun, 27 Feb 2022 10:31:31 +0800
Subject: [PATCH 3/7] 233

---
 .../Resources/Prefabs/UI/PlayerInfoUI.prefab  | 198 ++++++++++++++++++
 Assets/Scripts/{ => Data}/HexMap.meta         |   0
 .../Scripts/{ => Data}/HexMap/GridManager.cs  |   0
 .../{ => Data}/HexMap/GridManager.cs.meta     |   0
 Assets/Scripts/{ => Data}/HexMap/HexCell.cs   |   0
 .../Scripts/{ => Data}/HexMap/HexCell.cs.meta |   0
 .../{ => Data}/HexMap/HexCoordinatesDrawer.cs |   0
 .../HexMap/HexCoordinatesDrawer.cs.meta       |   0
 .../Scripts/{ => Data}/HexMap/HexDirection.cs |   0
 .../{ => Data}/HexMap/HexDirection.cs.meta    |   0
 .../{ => Data}/HexMap/HexFeatureManager.cs    |   0
 .../HexMap/HexFeatureManager.cs.meta          |   0
 .../Scripts/{ => Data}/HexMap/HexGridChunk.cs |   0
 .../{ => Data}/HexMap/HexGridChunk.cs.meta    |   0
 Assets/Scripts/{ => Data}/HexMap/HexMesh.cs   |   0
 .../Scripts/{ => Data}/HexMap/HexMesh.cs.meta |   0
 .../Scripts/{ => Data}/HexMap/HexMetrics.cs   |   0
 .../{ => Data}/HexMap/HexMetrics.cs.meta      |   0
 Assets/Scripts/{ => Data}/HexMap/HexWall.cs   |   0
 .../Scripts/{ => Data}/HexMap/HexWall.cs.meta |   0
 Assets/Scripts/{ => Data}/HexMap/ListPool.cs  |   0
 .../{ => Data}/HexMap/ListPool.cs.meta        |   0
 .../{ => Data}/HexMap/MapDesignData.cs        |   0
 .../{ => Data}/HexMap/MapDesignData.cs.meta   |   0
 .../{ => Data}/HexMap/MapDesignInfo.cs        |   0
 .../{ => Data}/HexMap/MapDesignInfo.cs.meta   |   0
 Assets/Scripts/UI/GameUI/PlayerInfoUI.cs      |   2 +-
 27 files changed, 199 insertions(+), 1 deletion(-)
 rename Assets/Scripts/{ => Data}/HexMap.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/GridManager.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/GridManager.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexCell.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexCell.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexCoordinatesDrawer.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexCoordinatesDrawer.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexDirection.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexDirection.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexFeatureManager.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexFeatureManager.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexGridChunk.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexGridChunk.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexMesh.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexMesh.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexMetrics.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexMetrics.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexWall.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/HexWall.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/ListPool.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/ListPool.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/MapDesignData.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/MapDesignData.cs.meta (100%)
 rename Assets/Scripts/{ => Data}/HexMap/MapDesignInfo.cs (100%)
 rename Assets/Scripts/{ => Data}/HexMap/MapDesignInfo.cs.meta (100%)

diff --git a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
index 8e43b1c..17ba2bb 100644
--- a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
+++ b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
@@ -1262,6 +1262,84 @@ RectTransform:
   m_AnchoredPosition: {x: -715.47, y: 2.5001}
   m_SizeDelta: {x: -1624.2081, y: -5.000122}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1414070470364757211
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4593319429246965785}
+  - component: {fileID: 6130680593851162841}
+  - component: {fileID: 8748438870039250793}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4593319429246965785
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1414070470364757211}
+  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_Children: []
+  m_Father: {fileID: 4692684708291118226}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6130680593851162841
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1414070470364757211}
+  m_CullTransparentMesh: 0
+--- !u!114 &8748438870039250793
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1414070470364757211}
+  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_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: <<
 --- !u!1 &1935444439651141422
 GameObject:
   m_ObjectHideFlags: 0
@@ -2938,6 +3016,7 @@ RectTransform:
   - {fileID: 2922561979714451338}
   - {fileID: 2922561978496405276}
   - {fileID: 2922561978843213462}
+  - {fileID: 4692684708291118226}
   m_Father: {fileID: 2922561979069304195}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4383,6 +4462,125 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &5298732016374699515
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4692684708291118226}
+  - component: {fileID: 1628722347439542909}
+  - component: {fileID: 4890934263295883062}
+  - component: {fileID: 5928020503033471794}
+  m_Layer: 0
+  m_Name: TimeLevel1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4692684708291118226
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5298732016374699515}
+  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_Children:
+  - {fileID: 4593319429246965785}
+  m_Father: {fileID: 2922561980104388487}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 54, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1628722347439542909
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5298732016374699515}
+  m_CullTransparentMesh: 0
+--- !u!114 &4890934263295883062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5298732016374699515}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ce5dfcf0b45530443bd2fbf805c38d52, 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 &5928020503033471794
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5298732016374699515}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4890934263295883062}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5545746889431509627
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/HexMap.meta b/Assets/Scripts/Data/HexMap.meta
similarity index 100%
rename from Assets/Scripts/HexMap.meta
rename to Assets/Scripts/Data/HexMap.meta
diff --git a/Assets/Scripts/HexMap/GridManager.cs b/Assets/Scripts/Data/HexMap/GridManager.cs
similarity index 100%
rename from Assets/Scripts/HexMap/GridManager.cs
rename to Assets/Scripts/Data/HexMap/GridManager.cs
diff --git a/Assets/Scripts/HexMap/GridManager.cs.meta b/Assets/Scripts/Data/HexMap/GridManager.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/GridManager.cs.meta
rename to Assets/Scripts/Data/HexMap/GridManager.cs.meta
diff --git a/Assets/Scripts/HexMap/HexCell.cs b/Assets/Scripts/Data/HexMap/HexCell.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexCell.cs
rename to Assets/Scripts/Data/HexMap/HexCell.cs
diff --git a/Assets/Scripts/HexMap/HexCell.cs.meta b/Assets/Scripts/Data/HexMap/HexCell.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexCell.cs.meta
rename to Assets/Scripts/Data/HexMap/HexCell.cs.meta
diff --git a/Assets/Scripts/HexMap/HexCoordinatesDrawer.cs b/Assets/Scripts/Data/HexMap/HexCoordinatesDrawer.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexCoordinatesDrawer.cs
rename to Assets/Scripts/Data/HexMap/HexCoordinatesDrawer.cs
diff --git a/Assets/Scripts/HexMap/HexCoordinatesDrawer.cs.meta b/Assets/Scripts/Data/HexMap/HexCoordinatesDrawer.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexCoordinatesDrawer.cs.meta
rename to Assets/Scripts/Data/HexMap/HexCoordinatesDrawer.cs.meta
diff --git a/Assets/Scripts/HexMap/HexDirection.cs b/Assets/Scripts/Data/HexMap/HexDirection.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexDirection.cs
rename to Assets/Scripts/Data/HexMap/HexDirection.cs
diff --git a/Assets/Scripts/HexMap/HexDirection.cs.meta b/Assets/Scripts/Data/HexMap/HexDirection.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexDirection.cs.meta
rename to Assets/Scripts/Data/HexMap/HexDirection.cs.meta
diff --git a/Assets/Scripts/HexMap/HexFeatureManager.cs b/Assets/Scripts/Data/HexMap/HexFeatureManager.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexFeatureManager.cs
rename to Assets/Scripts/Data/HexMap/HexFeatureManager.cs
diff --git a/Assets/Scripts/HexMap/HexFeatureManager.cs.meta b/Assets/Scripts/Data/HexMap/HexFeatureManager.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexFeatureManager.cs.meta
rename to Assets/Scripts/Data/HexMap/HexFeatureManager.cs.meta
diff --git a/Assets/Scripts/HexMap/HexGridChunk.cs b/Assets/Scripts/Data/HexMap/HexGridChunk.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexGridChunk.cs
rename to Assets/Scripts/Data/HexMap/HexGridChunk.cs
diff --git a/Assets/Scripts/HexMap/HexGridChunk.cs.meta b/Assets/Scripts/Data/HexMap/HexGridChunk.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexGridChunk.cs.meta
rename to Assets/Scripts/Data/HexMap/HexGridChunk.cs.meta
diff --git a/Assets/Scripts/HexMap/HexMesh.cs b/Assets/Scripts/Data/HexMap/HexMesh.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexMesh.cs
rename to Assets/Scripts/Data/HexMap/HexMesh.cs
diff --git a/Assets/Scripts/HexMap/HexMesh.cs.meta b/Assets/Scripts/Data/HexMap/HexMesh.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexMesh.cs.meta
rename to Assets/Scripts/Data/HexMap/HexMesh.cs.meta
diff --git a/Assets/Scripts/HexMap/HexMetrics.cs b/Assets/Scripts/Data/HexMap/HexMetrics.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexMetrics.cs
rename to Assets/Scripts/Data/HexMap/HexMetrics.cs
diff --git a/Assets/Scripts/HexMap/HexMetrics.cs.meta b/Assets/Scripts/Data/HexMap/HexMetrics.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexMetrics.cs.meta
rename to Assets/Scripts/Data/HexMap/HexMetrics.cs.meta
diff --git a/Assets/Scripts/HexMap/HexWall.cs b/Assets/Scripts/Data/HexMap/HexWall.cs
similarity index 100%
rename from Assets/Scripts/HexMap/HexWall.cs
rename to Assets/Scripts/Data/HexMap/HexWall.cs
diff --git a/Assets/Scripts/HexMap/HexWall.cs.meta b/Assets/Scripts/Data/HexMap/HexWall.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/HexWall.cs.meta
rename to Assets/Scripts/Data/HexMap/HexWall.cs.meta
diff --git a/Assets/Scripts/HexMap/ListPool.cs b/Assets/Scripts/Data/HexMap/ListPool.cs
similarity index 100%
rename from Assets/Scripts/HexMap/ListPool.cs
rename to Assets/Scripts/Data/HexMap/ListPool.cs
diff --git a/Assets/Scripts/HexMap/ListPool.cs.meta b/Assets/Scripts/Data/HexMap/ListPool.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/ListPool.cs.meta
rename to Assets/Scripts/Data/HexMap/ListPool.cs.meta
diff --git a/Assets/Scripts/HexMap/MapDesignData.cs b/Assets/Scripts/Data/HexMap/MapDesignData.cs
similarity index 100%
rename from Assets/Scripts/HexMap/MapDesignData.cs
rename to Assets/Scripts/Data/HexMap/MapDesignData.cs
diff --git a/Assets/Scripts/HexMap/MapDesignData.cs.meta b/Assets/Scripts/Data/HexMap/MapDesignData.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/MapDesignData.cs.meta
rename to Assets/Scripts/Data/HexMap/MapDesignData.cs.meta
diff --git a/Assets/Scripts/HexMap/MapDesignInfo.cs b/Assets/Scripts/Data/HexMap/MapDesignInfo.cs
similarity index 100%
rename from Assets/Scripts/HexMap/MapDesignInfo.cs
rename to Assets/Scripts/Data/HexMap/MapDesignInfo.cs
diff --git a/Assets/Scripts/HexMap/MapDesignInfo.cs.meta b/Assets/Scripts/Data/HexMap/MapDesignInfo.cs.meta
similarity index 100%
rename from Assets/Scripts/HexMap/MapDesignInfo.cs.meta
rename to Assets/Scripts/Data/HexMap/MapDesignInfo.cs.meta
diff --git a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
index 93c2220..b20fd13 100644
--- a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
+++ b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
@@ -146,7 +146,7 @@ public class PlayerInfoUI : UIBase
 
         //时间调整到某一级
         Get<RectTransform>("TimeSpeed").Find("TimeLevel1").GetComponent<Button>().onClick.SetListener(() => {
-            OnChangeTime(true);
+            OnChangeTimeToLevel(1);
         });
 
 
-- 
Gitee


From 7865a8d63264d9a480f4199abb6b883600e214bb Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sun, 27 Feb 2022 16:08:35 +0800
Subject: [PATCH 4/7] 233

---
 .../Resources/Prefabs/UI/PlayerInfoUI.prefab  | 582 +++++++++++++++---
 Assets/Scripts/Data/GameData/GameEventData.cs |   2 +-
 Assets/Scripts/UI/GameUI/PlayerInfoUI.cs      |   9 +-
 ...13\344\273\266\347\272\246\345\256\232.md" |   6 +
 4 files changed, 501 insertions(+), 98 deletions(-)

diff --git a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
index 17ba2bb..bc687dd 100644
--- a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
+++ b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
@@ -803,6 +803,84 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &873659781166989078
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8618354842889582021}
+  - component: {fileID: 4339729196401647720}
+  - component: {fileID: 4012879755525802638}
+  m_Layer: 0
+  m_Name: SpeedValue
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8618354842889582021
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 873659781166989078}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -2.7}
+  m_LocalScale: {x: 1.0211899, y: 0.87064, z: 0.86265}
+  m_Children: []
+  m_Father: {fileID: 2922561978259359279}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 1790.38, y: 70.81}
+  m_SizeDelta: {x: 70.481895, y: 29.264538}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4339729196401647720
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 873659781166989078}
+  m_CullTransparentMesh: 0
+--- !u!114 &4012879755525802638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 873659781166989078}
+  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_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: 1x
 --- !u!1 &919656913220392616
 GameObject:
   m_ObjectHideFlags: 0
@@ -1824,6 +1902,7 @@ RectTransform:
   - {fileID: 1848204479175910577}
   - {fileID: 3613058176611806088}
   - {fileID: 2601383411557449569}
+  - {fileID: 8618354842889582021}
   m_Father: {fileID: 2922561979905570471}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1832,84 +1911,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 496.4}
   m_SizeDelta: {x: 0, y: -994.44855}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &2922561978496405277
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2922561978496405276}
-  - component: {fileID: 2922561978496405474}
-  - component: {fileID: 2922561978496405475}
-  m_Layer: 0
-  m_Name: SpeedValue
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2922561978496405276
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978496405277}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.0211886, y: 0.87064457, z: 0.86265}
-  m_Children: []
-  m_Father: {fileID: 2922561980104388487}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 80, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2922561978496405474
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978496405277}
-  m_CullTransparentMesh: 0
---- !u!114 &2922561978496405475
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978496405277}
-  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_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: 1x
 --- !u!1 &2922561978550186578
 GameObject:
   m_ObjectHideFlags: 0
@@ -2048,7 +2049,7 @@ GameObject:
   - component: {fileID: 2922561978843213460}
   - component: {fileID: 2922561978843213461}
   m_Layer: 0
-  m_Name: Increase
+  m_Name: TimeLevel1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2067,7 +2068,7 @@ RectTransform:
   m_Children:
   - {fileID: 2922561978793781317}
   m_Father: {fileID: 2922561980104388487}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2101,7 +2102,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 27f0ae5f9f59faa49b5f2d3caa5d157c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d42cfe7bed8439c439378d1a7e76f4e3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2423,8 +2424,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 723.28, y: 1.62}
-  m_SizeDelta: {x: -1621.6296, y: -3.2456665}
+  m_AnchoredPosition: {x: 711.7, y: 1.62}
+  m_SizeDelta: {x: -1598.4657, y: -3.2456665}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2922561979069304193
 CanvasRenderer:
@@ -2497,8 +2498,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 27.11}
-  m_SizeDelta: {x: 0, y: -54.23201}
+  m_AnchoredPosition: {x: -30.1, y: 27.11}
+  m_SizeDelta: {x: -60.989258, y: -54.23201}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2922561979253515517
 CanvasRenderer:
@@ -2628,7 +2629,7 @@ GameObject:
   - component: {fileID: 2922561979714451336}
   - component: {fileID: 2922561979714451337}
   m_Layer: 0
-  m_Name: Decrease
+  m_Name: TimeLevel0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2681,7 +2682,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ce5dfcf0b45530443bd2fbf805c38d52, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a1bda28f797f71c4db09f6a0d4af4759, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3014,16 +3015,17 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2922561979714451338}
-  - {fileID: 2922561978496405276}
   - {fileID: 2922561978843213462}
   - {fileID: 4692684708291118226}
+  - {fileID: 8719476413412352491}
+  - {fileID: 7443107439656309093}
   m_Father: {fileID: 2922561979069304195}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1.1000061, y: -14.799999}
-  m_SizeDelta: {x: 0.000091552734, y: -29.825619}
+  m_AnchoredPosition: {x: 0.55007935, y: -14.799999}
+  m_SizeDelta: {x: -1.099884, y: -29.825619}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2922561980104388486
 MonoBehaviour:
@@ -4462,6 +4464,84 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &5270376128337137148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5221690963674741072}
+  - component: {fileID: 6982398152031470546}
+  - component: {fileID: 993612301110264911}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5221690963674741072
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5270376128337137148}
+  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_Children: []
+  m_Father: {fileID: 7443107439656309093}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6982398152031470546
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5270376128337137148}
+  m_CullTransparentMesh: 0
+--- !u!114 &993612301110264911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5270376128337137148}
+  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_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: <<
 --- !u!1 &5298732016374699515
 GameObject:
   m_ObjectHideFlags: 0
@@ -4475,7 +4555,7 @@ GameObject:
   - component: {fileID: 4890934263295883062}
   - component: {fileID: 5928020503033471794}
   m_Layer: 0
-  m_Name: TimeLevel1
+  m_Name: TimeLevel2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4494,7 +4574,7 @@ RectTransform:
   m_Children:
   - {fileID: 4593319429246965785}
   m_Father: {fileID: 2922561980104388487}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4528,7 +4608,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ce5dfcf0b45530443bd2fbf805c38d52, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d42cfe7bed8439c439378d1a7e76f4e3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4773,6 +4853,125 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5621340271805291152
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7443107439656309093}
+  - component: {fileID: 2559344650906831196}
+  - component: {fileID: 6429621268626864897}
+  - component: {fileID: 7727103082458286210}
+  m_Layer: 0
+  m_Name: TimeLevel4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7443107439656309093
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5621340271805291152}
+  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_Children:
+  - {fileID: 5221690963674741072}
+  m_Father: {fileID: 2922561980104388487}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 54, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2559344650906831196
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5621340271805291152}
+  m_CullTransparentMesh: 0
+--- !u!114 &6429621268626864897
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5621340271805291152}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 27f0ae5f9f59faa49b5f2d3caa5d157c, 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 &7727103082458286210
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5621340271805291152}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6429621268626864897}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5635218376200904991
 GameObject:
   m_ObjectHideFlags: 0
@@ -5280,6 +5479,84 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e18a56e1cf449f443bb257850f42633b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &5781477347791846647
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5470099839993664337}
+  - component: {fileID: 1725666515126658176}
+  - component: {fileID: 8363315545841243685}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5470099839993664337
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5781477347791846647}
+  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_Children: []
+  m_Father: {fileID: 8719476413412352491}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1725666515126658176
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5781477347791846647}
+  m_CullTransparentMesh: 0
+--- !u!114 &8363315545841243685
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5781477347791846647}
+  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_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: <<
 --- !u!1 &5896936486785619665
 GameObject:
   m_ObjectHideFlags: 0
@@ -5783,6 +6060,125 @@ RectTransform:
   m_AnchoredPosition: {x: -310.1, y: 2.5001}
   m_SizeDelta: {x: -1863.5365, y: -5.000122}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6355424765914731187
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8719476413412352491}
+  - component: {fileID: 7542755210462129290}
+  - component: {fileID: 7226050328066632551}
+  - component: {fileID: 8382017211428301826}
+  m_Layer: 0
+  m_Name: TimeLevel3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8719476413412352491
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6355424765914731187}
+  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_Children:
+  - {fileID: 5470099839993664337}
+  m_Father: {fileID: 2922561980104388487}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 54, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7542755210462129290
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6355424765914731187}
+  m_CullTransparentMesh: 0
+--- !u!114 &7226050328066632551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6355424765914731187}
+  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_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: d42cfe7bed8439c439378d1a7e76f4e3, 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 &8382017211428301826
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6355424765914731187}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7226050328066632551}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6452437697654078717
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Data/GameData/GameEventData.cs b/Assets/Scripts/Data/GameData/GameEventData.cs
index edf07e2..90318c1 100644
--- a/Assets/Scripts/Data/GameData/GameEventData.cs
+++ b/Assets/Scripts/Data/GameData/GameEventData.cs
@@ -72,7 +72,7 @@ public enum PlayerCommandType
     GameResume = 2012,
     LaunchExternalTransport = 2013,
     DeliveryAgreement = 2014,
-    ChangeTimeScaleToLevel = 2015,
+    ChangeTimeScaleToLevel = 2017,
 }
 
 public class GameEventData : GameDataBase
diff --git a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
index b20fd13..0879d0a 100644
--- a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
+++ b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
@@ -145,8 +145,8 @@ public class PlayerInfoUI : UIBase
         });
 
         //时间调整到某一级
-        Get<RectTransform>("TimeSpeed").Find("TimeLevel1").GetComponent<Button>().onClick.SetListener(() => {
-            OnChangeTimeToLevel(1);
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel0").GetComponent<Button>().onClick.SetListener(() => {
+            OnChangeTimeToLevel(0);
         });
 
 
@@ -177,7 +177,7 @@ public class PlayerInfoUI : UIBase
         Get<Button>("Demolish").onClick.SetListener(OnClickDemolishButton);
         Get<MouseEventHandler>("Demolish").OnEnter += (data) =>
         {
-            _briefUI = UIManager.Instance.Open("ItemBriefUI", "ItemBreifUI",
+            _briefUI = UIManager.Instance.Open("ItemBriefUI", "ItemBriefUI",
                 new string[] { Localization.Instance.GetText("UI_PlayerInfoUI_Demolish"), Localization.Instance.GetText("UI_PlayerInfoUI_Demolish_Brief") });
             _briefUI.transform.Find("Panel").position = data.position;
         };
@@ -589,7 +589,8 @@ public class PlayerInfoUI : UIBase
         }
         PlayerCommandArgs args = new PlayerCommandArgs();
         args.param = new int[] { target };
-        PlayerCommandData changetolevelCommand = new PlayerCommandData(PlayerCommandType.ChangeTimeScaleToLevel,
+        PlayerCommandData changetolevelCommand = new PlayerCommandData(
+            PlayerCommandType.ChangeTimeScaleToLevel,
             Data.Instance.Time,
             Data.Instance.Player.id,
             args
diff --git "a/ConfigurationTable/\346\270\270\346\210\217\345\221\275\344\273\244&\344\272\213\344\273\266\347\272\246\345\256\232.md" "b/ConfigurationTable/\346\270\270\346\210\217\345\221\275\344\273\244&\344\272\213\344\273\266\347\272\246\345\256\232.md"
index 506c5fd..ff905f9 100644
--- "a/ConfigurationTable/\346\270\270\346\210\217\345\221\275\344\273\244&\344\272\213\344\273\266\347\272\246\345\256\232.md"
+++ "b/ConfigurationTable/\346\270\270\346\210\217\345\221\275\344\273\244&\344\272\213\344\273\266\347\272\246\345\256\232.md"
@@ -96,6 +96,12 @@ senderID:玩家ID
 
 param[0]:工厂建筑ID
 
+### 2017 改变时间流速到某一等级
+
+senderID:玩家ID
+
+param[0]:x为时间流速等级
+
 ## 事件
 
 ### 4001 建造完成事件
-- 
Gitee


From 375cffbaf00d15392b75ed394426b89054a6738e Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sun, 27 Feb 2022 16:18:21 +0800
Subject: [PATCH 5/7] 233

---
 Assets/Scripts/UI/GameUI/PlayerInfoUI.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
index 0879d0a..18cea20 100644
--- a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
+++ b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
@@ -148,6 +148,18 @@ public class PlayerInfoUI : UIBase
         Get<RectTransform>("TimeSpeed").Find("TimeLevel0").GetComponent<Button>().onClick.SetListener(() => {
             OnChangeTimeToLevel(0);
         });
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel1").GetComponent<Button>().onClick.SetListener(() => {
+            OnChangeTimeToLevel(1);
+        });
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel2").GetComponent<Button>().onClick.SetListener(() => {
+            OnChangeTimeToLevel(2);
+        });
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel3").GetComponent<Button>().onClick.SetListener(() => {
+            OnChangeTimeToLevel(3);
+        });
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel4").GetComponent<Button>().onClick.SetListener(() => {
+            OnChangeTimeToLevel(4);
+        });
 
 
         //银行按钮
-- 
Gitee


From 1df9381db410a6c64ef2d23696a9bea6c89c6af9 Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sun, 27 Feb 2022 16:35:24 +0800
Subject: [PATCH 6/7] 233

---
 .../Resources/Prefabs/UI/PlayerInfoUI.prefab  | 405 +-----------------
 1 file changed, 5 insertions(+), 400 deletions(-)

diff --git a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
index bc687dd..49bc4bd 100644
--- a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
+++ b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
@@ -1340,84 +1340,6 @@ RectTransform:
   m_AnchoredPosition: {x: -715.47, y: 2.5001}
   m_SizeDelta: {x: -1624.2081, y: -5.000122}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1414070470364757211
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4593319429246965785}
-  - component: {fileID: 6130680593851162841}
-  - component: {fileID: 8748438870039250793}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4593319429246965785
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1414070470364757211}
-  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_Children: []
-  m_Father: {fileID: 4692684708291118226}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6130680593851162841
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1414070470364757211}
-  m_CullTransparentMesh: 0
---- !u!114 &8748438870039250793
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1414070470364757211}
-  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_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: <<
 --- !u!1 &1935444439651141422
 GameObject:
   m_ObjectHideFlags: 0
@@ -1958,84 +1880,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2922561978550186578}
   m_CullTransparentMesh: 0
---- !u!1 &2922561978793781318
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2922561978793781317}
-  - component: {fileID: 2922561978793781323}
-  - component: {fileID: 2922561978793781316}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2922561978793781317
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978793781318}
-  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_Children: []
-  m_Father: {fileID: 2922561978843213462}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2922561978793781323
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978793781318}
-  m_CullTransparentMesh: 0
---- !u!114 &2922561978793781316
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978793781318}
-  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_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: '>>'
 --- !u!1 &2922561978843213463
 GameObject:
   m_ObjectHideFlags: 0
@@ -2065,8 +1909,7 @@ RectTransform:
   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_Children:
-  - {fileID: 2922561978793781317}
+  m_Children: []
   m_Father: {fileID: 2922561980104388487}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2310,84 +2153,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: UI_PlayerInfoUI_SlotInfo_Title
---- !u!1 &2922561978930444871
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2922561978930444870}
-  - component: {fileID: 2922561978930444868}
-  - component: {fileID: 2922561978930444869}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2922561978930444870
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978930444871}
-  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_Children: []
-  m_Father: {fileID: 2922561979714451338}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2922561978930444868
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978930444871}
-  m_CullTransparentMesh: 0
---- !u!114 &2922561978930444869
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2922561978930444871}
-  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_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: <<
 --- !u!1 &2922561979069304252
 GameObject:
   m_ObjectHideFlags: 0
@@ -2645,8 +2410,7 @@ RectTransform:
   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_Children:
-  - {fileID: 2922561978930444870}
+  m_Children: []
   m_Father: {fileID: 2922561980104388487}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4464,84 +4228,6 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
---- !u!1 &5270376128337137148
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5221690963674741072}
-  - component: {fileID: 6982398152031470546}
-  - component: {fileID: 993612301110264911}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5221690963674741072
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5270376128337137148}
-  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_Children: []
-  m_Father: {fileID: 7443107439656309093}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6982398152031470546
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5270376128337137148}
-  m_CullTransparentMesh: 0
---- !u!114 &993612301110264911
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5270376128337137148}
-  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_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: <<
 --- !u!1 &5298732016374699515
 GameObject:
   m_ObjectHideFlags: 0
@@ -4571,8 +4257,7 @@ RectTransform:
   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_Children:
-  - {fileID: 4593319429246965785}
+  m_Children: []
   m_Father: {fileID: 2922561980104388487}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4882,8 +4567,7 @@ RectTransform:
   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_Children:
-  - {fileID: 5221690963674741072}
+  m_Children: []
   m_Father: {fileID: 2922561980104388487}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5479,84 +5163,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e18a56e1cf449f443bb257850f42633b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &5781477347791846647
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5470099839993664337}
-  - component: {fileID: 1725666515126658176}
-  - component: {fileID: 8363315545841243685}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5470099839993664337
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5781477347791846647}
-  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_Children: []
-  m_Father: {fileID: 8719476413412352491}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1725666515126658176
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5781477347791846647}
-  m_CullTransparentMesh: 0
---- !u!114 &8363315545841243685
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5781477347791846647}
-  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_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: <<
 --- !u!1 &5896936486785619665
 GameObject:
   m_ObjectHideFlags: 0
@@ -6089,8 +5695,7 @@ RectTransform:
   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_Children:
-  - {fileID: 5470099839993664337}
+  m_Children: []
   m_Father: {fileID: 2922561980104388487}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-- 
Gitee


From 337ea0f8287cfe825fdfe855905d445681979602 Mon Sep 17 00:00:00 2001
From: dnk1234567 <dnk1234567@sina.cn>
Date: Sat, 5 Mar 2022 12:05:49 +0800
Subject: [PATCH 7/7] 233

---
 .../Resources/Prefabs/UI/PlayerInfoUI.prefab  | 10 ++++----
 .../ServerModules/ServerLauncherModule.cs     | 13 ++++++++++
 Assets/Scripts/UI/GameUI/PlayerInfoUI.cs      | 24 ++++++++++---------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
index 49bc4bd..05a5c14 100644
--- a/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
+++ b/Assets/Resources/Prefabs/UI/PlayerInfoUI.prefab
@@ -1893,7 +1893,7 @@ GameObject:
   - component: {fileID: 2922561978843213460}
   - component: {fileID: 2922561978843213461}
   m_Layer: 0
-  m_Name: TimeLevel1
+  m_Name: a
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2394,7 +2394,7 @@ GameObject:
   - component: {fileID: 2922561979714451336}
   - component: {fileID: 2922561979714451337}
   m_Layer: 0
-  m_Name: TimeLevel0
+  m_Name: Increase
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4241,7 +4241,7 @@ GameObject:
   - component: {fileID: 4890934263295883062}
   - component: {fileID: 5928020503033471794}
   m_Layer: 0
-  m_Name: TimeLevel2
+  m_Name: TimeLevel_2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4551,7 +4551,7 @@ GameObject:
   - component: {fileID: 6429621268626864897}
   - component: {fileID: 7727103082458286210}
   m_Layer: 0
-  m_Name: TimeLevel4
+  m_Name: TimeLevel_4
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5679,7 +5679,7 @@ GameObject:
   - component: {fileID: 7226050328066632551}
   - component: {fileID: 8382017211428301826}
   m_Layer: 0
-  m_Name: TimeLevel3
+  m_Name: TimeLevel_3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/Assets/Scripts/GameLogic/ServerModules/ServerLauncherModule.cs b/Assets/Scripts/GameLogic/ServerModules/ServerLauncherModule.cs
index 3c0232c..334831d 100644
--- a/Assets/Scripts/GameLogic/ServerModules/ServerLauncherModule.cs
+++ b/Assets/Scripts/GameLogic/ServerModules/ServerLauncherModule.cs
@@ -253,6 +253,19 @@ public class ServerLauncherModule : Submodule
                 );
             SendGameEventToPlayer(refreshTimeScaleEvent);
         }
+
+        //如果是改变时间流速到某一等级事件
+        if ((int)playerCommand.type == 2017)
+        {   
+            _timeScaleLevel = Mathf.Clamp(playerCommand.param.param[0], 0, 4);
+            GameEventData refreshTimeScaleEvent = new GameEventData(
+                GameEventType.RefreshTimeScale,
+                _serverGameData.gameStatus.time,
+                -1,
+                new GameEventArgs(new int[] { _timeScaleLevel }, null)
+                );
+            SendGameEventToPlayer(refreshTimeScaleEvent);
+        }
     }
 
     /// <summary>
diff --git a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
index 18cea20..aa1e568 100644
--- a/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
+++ b/Assets/Scripts/UI/GameUI/PlayerInfoUI.cs
@@ -138,26 +138,28 @@ public class PlayerInfoUI : UIBase
 
         //时间加速减速
         Get<RectTransform>("TimeSpeed").Find("Increase").GetComponent<Button>().onClick.SetListener(()=> {
-            OnChangeTime(true);
+            //OnChangeTime(true);
+            OnChangeTimeToLevel(0);
         });
         Get<RectTransform>("TimeSpeed").Find("Decrease").GetComponent<Button>().onClick.SetListener(()=> {
             OnChangeTime(false);
         });
 
         //时间调整到某一级
-        Get<RectTransform>("TimeSpeed").Find("TimeLevel0").GetComponent<Button>().onClick.SetListener(() => {
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel_0").GetComponent<Button>().onClick.SetListener(() => {
             OnChangeTimeToLevel(0);
         });
-        Get<RectTransform>("TimeSpeed").Find("TimeLevel1").GetComponent<Button>().onClick.SetListener(() => {
-            OnChangeTimeToLevel(1);
-        });
-        Get<RectTransform>("TimeSpeed").Find("TimeLevel2").GetComponent<Button>().onClick.SetListener(() => {
-            OnChangeTimeToLevel(2);
+        Get<RectTransform>("TimeSpeed").Find("a").GetComponent<Button>().onClick.SetListener(() => {
+            //OnChangeTimeToLevel(1);
+            OnChangeTime(true);
         });
-        Get<RectTransform>("TimeSpeed").Find("TimeLevel3").GetComponent<Button>().onClick.SetListener(() => {
+        //Get<Button>("Increase").onClick.SetListener(() => {
+        //    OnChangeTimeToLevel(0);
+        //});
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel_3").GetComponent<Button>().onClick.SetListener(() => {
             OnChangeTimeToLevel(3);
         });
-        Get<RectTransform>("TimeSpeed").Find("TimeLevel4").GetComponent<Button>().onClick.SetListener(() => {
+        Get<RectTransform>("TimeSpeed").Find("TimeLevel_4").GetComponent<Button>().onClick.SetListener(() => {
             OnChangeTimeToLevel(4);
         });
 
@@ -601,13 +603,13 @@ public class PlayerInfoUI : UIBase
         }
         PlayerCommandArgs args = new PlayerCommandArgs();
         args.param = new int[] { target };
-        PlayerCommandData changetolevelCommand = new PlayerCommandData(
+        PlayerCommandData changeToLevelCommand = new PlayerCommandData(
             PlayerCommandType.ChangeTimeScaleToLevel,
             Data.Instance.Time,
             Data.Instance.Player.id,
             args
             );
-        Data.Instance.PlayerLauncher.SendCommand(changetolevelCommand) ;
+        Data.Instance.PlayerLauncher.SendCommand(changeToLevelCommand) ;
     }
 
     /// <summary>
-- 
Gitee