Merge branch 'U3D' of http://172.16.1.12/huangjiayu/EnergyEfficiencyManagement into U3D

2026-04-10 09:05:20 +08:00 · 2026-04-10 09:05:20 +08:00 · 09683178a6
parent 6ea6220576 d672eb821e
commit 09683178a6
29 changed files with 2971 additions and 26866 deletions
--- a/Assets/GameAssets/Models/Tools/Materials/3d66-Standardmaterial-16476192-029.mat
+++ b/Assets/GameAssets/Models/Tools/Materials/3d66-Standardmaterial-16476192-029.mat
@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 3d66-Standardmaterial-16476192-029
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.14142135
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.09019608, g: 0.09019608, b: 0.09019608, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/GameAssets/Models/Tools/Materials/3d66-Standardmaterial-16476192-029.mat.meta
+++ b/Assets/GameAssets/Models/Tools/Materials/3d66-Standardmaterial-16476192-029.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 614f252923f0b2e49ba03a268e6aae9c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameAssets/Models/Tools/Materials/3d66-VRayMtl-18541862-001.mat
+++ b/Assets/GameAssets/Models/Tools/Materials/3d66-VRayMtl-18541862-001.mat
@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 3d66-VRayMtl-18541862-001
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 1.0556064
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.28627452, g: 0.40000004, b: 0.47058827, a: 1}
+    - _EmissionColor: {r: 0.0057254904, g: 0.008, b: 0.009411765, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/GameAssets/Models/Tools/Materials/3d66-VRayMtl-18541862-001.mat.meta
+++ b/Assets/GameAssets/Models/Tools/Materials/3d66-VRayMtl-18541862-001.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7dcfd0332fefba4eafa8ddf5a3662b7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameAssets/Models/泵房/Materials/Mat3d66-7505369-65-50504.mat
+++ b/Assets/GameAssets/Models/泵房/Materials/Mat3d66-7505369-65-50504.mat
@ -12,7 +12,7 @@ Material:
  m_ValidKeywords:
  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 5
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
--- a/Assets/GameAssets/Models/泵房/Materials/Mat3d66-7505369-67-91959.mat
+++ b/Assets/GameAssets/Models/泵房/Materials/Mat3d66-7505369-67-91959.mat
@ -12,7 +12,7 @@ Material:
  m_ValidKeywords:
  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 5
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
--- a/Assets/GameAssets/Models/泵房/Materials/贴图.1.mat
+++ b/Assets/GameAssets/Models/泵房/Materials/贴图.1.mat
@ -12,7 +12,7 @@ Material:
  m_ValidKeywords:
  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 5
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
--- a/Assets/GameAssets/Models/空调/Materials/Material
+++ b/Assets/GameAssets/Models/空调/Materials/Material
@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Material #48
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: ef388951adcb52f4895f255065f3d799, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 0.3
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.4472136
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/GameAssets/Models/空调/Materials/Material
+++ b/Assets/GameAssets/Models/空调/Materials/Material
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 707a11b2fe9037a4dab635325940653d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Models
+++ b/Assets/Scenes/Models
--- a/Assets/Scenes/Models
+++ b/Assets/Scenes/Models
--- a/Assets/StreamingAssets/info.ini
+++ b/Assets/StreamingAssets/info.ini
@ -1 +1 @@
-2026-04-09 11:04:34#'efficiencymanagement://31,56,118,1,3,1491755674177110016,eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjExZmY1ZmQ3LTAxN2QtNGNlMC1hOGZkLTg1NzExY2M0OGQzNyJ9.fxpB_DdhcmFI0eRwbKyBMzV6ErQsYjRAeXHCTWIWE1cFbk5FVD6wuv3VB2_b40gFk4lYSCf0pTTiJVJwCTOeOg,&/#116;&#101;&#115;&#116;&#49;&#50;&#49;&#50;,10001,172.16.1.135:8081,60'|
+2026-04-09 17:40:09#'efficiencymanagement://31,56,118,1,3,1491855224107696128,eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdhZjBkZGRjLWYwNTItNGY5My04YjU5LTViYzI4ZmQ0MjY2MyJ9.rsd9IYB4lfb32egQ8aEcg9L00b0m-6uueWCGB3AhDt_po1c8lpu2j5l55wo2jiBxltDrzndZiBZASNXSJ8KykA,&/#116;&#101;&#115;&#116;&#49;&#50;&#49;&#50;,10001,172.16.1.135:8081,60'|
--- a/Assets/UIView/EquipmentSimulationView/Resources/EquipmentSimulationView.prefab
+++ b/Assets/UIView/EquipmentSimulationView/Resources/EquipmentSimulationView.prefab
--- a/Assets/Zion/Scripts/Manager/Enums.cs
+++ b/Assets/Zion/Scripts/Manager/Enums.cs
@ -1,21 +1,3 @@
-public enum E_SceneType
-{
-    None,
-    /// <summary>
-    /// 办公室
-    /// </summary>
-    Office,
-
-    /// <summary>
-    /// 工器具间
-    /// </summary>
-    ToolRoom,
-
-    /// <summary>
-    /// 现场
-    /// </summary>
-    Site,
-}
 /// <summary>
 /// 模式
 /// </summary>
--- a/Assets/Zion/Scripts/Manager/RunModelMgr.cs
+++ b/Assets/Zion/Scripts/Manager/RunModelMgr.cs
@ -14,11 +14,6 @@ public class RunModelMgr : MonoSingleton<RunModelMgr>
    /// </summary>
    private E_ModeType modeType = E_ModeType.None;

-    /// <summary>
-    /// 场景
-    /// </summary>
-    private E_SceneType sceneType = E_SceneType.None;
-
    /// <summary>
    /// 设备/方案id
    /// </summary>
@ -48,16 +43,5 @@ public class RunModelMgr : MonoSingleton<RunModelMgr>

        }
    }
-    /// <summary>
-    /// 场景信息
-    /// </summary>
-    public E_SceneType SceneType
-    {
-        get => sceneType;
-        set
-        {
-            sceneType = value;
-        }
-    }

 }
--- a/Assets/Zion/Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs
+++ b/Assets/Zion/Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs
@ -13,21 +13,21 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
    public List<TaskStep> taskStep = new List<TaskStep>();
    public int firstStep = 0;
    public int secondStep = 0;
-    private int currentStep;
+    public int currentStep;
    public bool currentState;
    void Awake()
    {
        instance = this;
        currentStep = firstStep;
-        taskStep.Add(new TaskStep { StepId = firstStep, Description = currentState ? "关闭" + transform.name : "开启" + transform.name });
-        taskStep.Add(new TaskStep { StepId = secondStep, Description = currentState ? "关闭" + transform.name : "开启" + transform.name });      
+        taskStep.Add(new TaskStep { StepId = firstStep, Description = "开启" + transform.name });
+        taskStep.Add(new TaskStep { StepId = secondStep, Description = "关闭" + transform.name });
+       
    }

    void OnMouseDown()
    {
        if (EventSystem.current.IsPointerOverGameObject()) return;
-
-
+        EquipmentProcessExample_TSQ.Instance.currentEquipment = this;
        switch (gameObject.name)
        {
            case "冷却塔风机1":
@ -64,7 +64,7 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
        if (EquipmentProcessExample_TSQ.Instance._expectStepIndex > EquipmentProcessExample_TSQ.Instance.EquipmentProcess_Task.Steps.Count) return;
        bool isError = currentStep != EquipmentProcessExample_TSQ.Instance._expectStepIndex;
        TaskManager.Instance.ReportCurrentStepResult(isError);
-        ScoreManager.Instance?.GetScoreBaseBySchemeID(GameManager.RunModelMgr.schemeID).steps[EquipmentProcessExample_TSQ.Instance._expectStepIndex].SetScore(!isError);
+        ScoreManager.Instance.GetScoreBaseBySchemeID(GameManager.RunModelMgr.schemeID).steps[EquipmentProcessExample_TSQ.Instance._expectStepIndex].SetScore(!isError);
        EquipmentProcessExample_TSQ.Instance._expectStepIndex++;
        currentStep = secondStep;
        currentState = state;
@ -79,8 +79,6 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("开启冷却塔风机Text1").text = "开启冷却塔风机1";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-冷却塔风机1").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机1").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却塔风机1").onClick.AddListener(() => { SetStep(false); });
            if (UIView.Get<EquipmentSimulationView>().Stepbools[0] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机1").Deactivate();
@ -106,8 +104,8 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("开启冷却塔风机Text2").text = "开启冷却塔风机2";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-冷却塔风机2").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机2").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却塔风机2").onClick.AddListener(() => { SetStep(false); });
+
+
            if (UIView.Get<EquipmentSimulationView>().Stepbools[1] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机2").Deactivate();
@ -133,8 +131,6 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("启动冷却水循环泵1Text").text = "启动冷却水循环泵";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-冷却泵1").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却泵1").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却泵1").onClick.AddListener(() => { SetStep(false); });
            if (UIView.Get<EquipmentSimulationView>().Stepbools[2] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却泵1").Deactivate();
@ -158,8 +154,7 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("启动冷却水循环泵2Text").text = "启动冷却水循环泵";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-冷却泵2").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却泵2").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却泵2").onClick.AddListener(() => { SetStep(false); });
+
            if (UIView.Get<EquipmentSimulationView>().Stepbools[3] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却泵2").Deactivate();
@ -183,8 +178,7 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("启动风机盘管Text1").text = "启动风机盘管1";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-风机盘管1").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-风机盘管1").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-风机盘管1").onClick.AddListener(() => { SetStep(false); });
+
            if (UIView.Get<EquipmentSimulationView>().Stepbools[4] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-风机盘管1").Deactivate();
@ -208,8 +202,7 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("启动风机盘管Text2").text = "启动风机盘管2";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-风机盘管2").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-风机盘管2").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-风机盘管2").onClick.AddListener(() => { SetStep(false); });
+
            if (UIView.Get<EquipmentSimulationView>().Stepbools[5] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-风机盘管2").Deactivate();
@ -234,8 +227,7 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("中央空调主机Text").text = "启动中央空调主机";
            UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-中央空调主机").Activate();

-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-中央空调主机").onClick.AddListener(() => { SetStep(true); });
-            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-中央空调主机").onClick.AddListener(() => { SetStep(false); });
+
            if (UIView.Get<EquipmentSimulationView>().Stepbools[6] == true)
            {
                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-中央空调主机").Deactivate();
@ -250,6 +242,7 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour
        //StartCoroutine(AutoHide(4,"参数面板-中央空调主机"));
    }

+   
    /// <summary>
    /// 自动隐藏运行成功信息协程，延迟一段时间后关闭框。
    /// </summary>
--- a/Assets/Zion/Scripts/TSQManager/EquipmentProcessExample_TSQ.cs
+++ b/Assets/Zion/Scripts/TSQManager/EquipmentProcessExample_TSQ.cs
@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using SK.Framework;
+using UnityEngine.UI;

 /// <summary>
 /// 操作流程
@ -9,6 +10,8 @@ using SK.Framework;
 public class EquipmentProcessExample_TSQ : MonoSingleton<EquipmentProcessExample_TSQ>
 {
    public TaskData EquipmentProcess_Task;
+
+    public EquipmentIIntroduction_TSQ currentEquipment;
    /// <summary>
    /// 当前期望输入的 Step 索引（0-based）
    /// 仅用于示例判断“是否按对”，不控制流程
@ -48,12 +51,12 @@ public class EquipmentProcessExample_TSQ : MonoSingleton<EquipmentProcessExample
        }
        BubbleSortList();

-
        EquipmentProcess_Task.OnTaskStarted += OnTaskStarted;

        TaskManager.Instance.SetMode(TaskMode.Exam);
        TaskManager.Instance.AddTask(EquipmentProcess_Task);
        TaskManager.Instance.Start();
+        InitButtonAction();

    }
    void BubbleSortList()
@ -150,4 +153,33 @@ public class EquipmentProcessExample_TSQ : MonoSingleton<EquipmentProcessExample
        Debug.Log("任务开始，等待操作输入");
        _expectStepIndex = 1;
    }
+
+     private void InitButtonAction()
+    {
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机1").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却塔风机1").onClick.AddListener(() => { SetStep(false); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-风机盘管1").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-风机盘管1").onClick.AddListener(() => { SetStep(false); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-风机盘管2").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-风机盘管2").onClick.AddListener(() => { SetStep(false); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却泵2").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却泵2").onClick.AddListener(() => { SetStep(false); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却泵1").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却泵1").onClick.AddListener(() => { SetStep(false); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机2").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却塔风机2").onClick.AddListener(() => { SetStep(false); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-中央空调主机").onClick.AddListener(() => { SetStep(true); });
+        UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-中央空调主机").onClick.AddListener(() => { SetStep(false); });
+    }
+
+     private void SetStep(bool state)
+    {
+        if (EquipmentProcessExample_TSQ.Instance._expectStepIndex > EquipmentProcessExample_TSQ.Instance.EquipmentProcess_Task.Steps.Count) return;
+        bool isError = currentEquipment.currentStep != EquipmentProcessExample_TSQ.Instance._expectStepIndex;
+        TaskManager.Instance.ReportCurrentStepResult(isError);
+        ScoreManager.Instance.GetScoreBaseBySchemeID(GameManager.RunModelMgr.schemeID).steps[EquipmentProcessExample_TSQ.Instance._expectStepIndex].SetScore(!isError);
+        EquipmentProcessExample_TSQ.Instance._expectStepIndex++;
+        currentEquipment.currentStep = currentEquipment.secondStep;
+        currentEquipment.currentState = state;
+    }
 }
--- a/Assets/Zion/Scripts/TSQManager/GameMangner_TSQ.cs
+++ b/Assets/Zion/Scripts/TSQManager/GameMangner_TSQ.cs
@ -5,7 +5,9 @@ using UnityEngine;
 public class GameMangner_TSQ : MonoBehaviour
 {
    public static GameMangner_TSQ instance;
-    
+
+    public ModbusDeviceController modbusDeviceController;
+
    /// <summary>
    /// 三个场景中第一人称
    /// </summary>
@ -27,4 +29,23 @@ public class GameMangner_TSQ : MonoBehaviour
    {
        Init();
    }
+
+    public void bengStartOrStop(bool ison)
+    {
+        modbusDeviceController.ControlRedPipe(ison);
+        modbusDeviceController.ControlGreenPipe(ison);
+        modbusDeviceController.ControlBluePipe(ison);
+        modbusDeviceController.ControlTank(ison);
+        modbusDeviceController.ControlLighting(ison);
+    }
+    public void FengJiStartOrStop(bool ison)
+    {
+        modbusDeviceController.ControlAirCompressor(ison);
+        modbusDeviceController.ControlCabinetLight(ison);
+        modbusDeviceController.ControlRedPipeFlow(ison);
+        modbusDeviceController.ControlTankUp(ison);
+        modbusDeviceController.ControlBluePipeFlow(ison);
+        modbusDeviceController.ControlSecondTankLight(ison);
+        modbusDeviceController.ControlSecondTurbine(ison);
+    }
 }
--- a/Assets/Zion/Scripts/UIView/EquipmentSimulationView.cs
+++ b/Assets/Zion/Scripts/UIView/EquipmentSimulationView.cs
@ -265,6 +265,7 @@ public class EquipmentSimulationView : UIView
            {
                devices[i].Activate();
                Debug.Log("_____________+_____________");
+                ShowPanel(selectedButton.name);
                enhancedModelViewerOrbitCamera.SetTarget(devices[i].transform);
            }
            else
@ -278,12 +279,52 @@ public class EquipmentSimulationView : UIView
        }
    }

+    public void ShowPanel(string BtnName)
+    {
+        switch (BtnName)
+        {
+            case "空调":
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("楼层").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板空调").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板水泵").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("空调操作步骤").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("togglegroup").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板空调").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("一键启停-空压机").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("一键启停-泵").Deactivate();
+                break;
+            case "泵":
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("楼层").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板空调").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板水泵").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("空调操作步骤").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("togglegroup").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板空调").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("一键启停-空压机").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("一键启停-泵").Activate();
+                BengPanel();
+                break;
+            case "空压机":
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("楼层").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板空调").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板水泵").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("空调操作步骤").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("togglegroup").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板空调").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("一键启停-空压机").Activate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<GameObject>("一键启停-泵").Deactivate();
+                FengJiPanel();
+                break;
+            default:
+                break;
+        }
+    }
    public void SetSelectedButton(Button button)
    {
        if (!buttonDictionary.ContainsKey(button))
        {
            Debug.LogWarning($"按钮 {button.name} 不在管理列表中");
-            return;
+            return; 
        }

        _currentSelectedButton = button;
@ -567,6 +608,46 @@ public class EquipmentSimulationView : UIView
            SBStartOperation("关闭中央空调主机成功");
            StartCoroutine(EquipmentIIntroduction_TSQ.instance.AutoHide(4, "参数面板-中央空调主机"));
        });
+        variables.Get<Button>("启动运行-泵").onClick.AddListener(delegate
+        {
+            Stepbools[7] = true;
+            GameMangner_TSQ.instance.bengStartOrStop(true);
+            SBStartOperation("开启泵成功");
+            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("泵机Text").text = "关闭泵";
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-泵").Deactivate();
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-泵").Activate();
+            //StartCoroutine(EquipmentIIntroduction_TSQ.instance.AutoHide(4, "参数面板-中央空调主机"));
+        });
+        variables.Get<Button>("停止运行-泵").onClick.AddListener(delegate
+        {
+            Stepbools[7] = false;
+            SBStartOperation("关闭泵成功");
+            GameMangner_TSQ.instance.bengStartOrStop(false);
+            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("泵机Text").text = "开启泵";
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-泵").Activate();
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-泵").Deactivate();
+            //StartCoroutine(EquipmentIIntroduction_TSQ.instance.AutoHide(4, "参数面板-中央空调主机"));
+        });
+        variables.Get<Button>("启动运行-空压机").onClick.AddListener(delegate
+        {
+            Stepbools[8] = true;
+            SBStartOperation("开启空压机成功");
+            GameMangner_TSQ.instance.FengJiStartOrStop(true);
+            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("空压机主机Text").text = "关闭空压机";
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-空压机").Deactivate();
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-空压机").Activate();
+            //StartCoroutine(EquipmentIIntroduction_TSQ.instance.AutoHide(4, "参数面板-中央空调主机"));
+        });
+        variables.Get<Button>("停止运行-空压机").onClick.AddListener(delegate
+        {
+            Stepbools[8] = false;
+            SBStartOperation("关闭空压机成功");
+            GameMangner_TSQ.instance.FengJiStartOrStop(false);
+            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("空压机主机Text").text = "开启空压机";
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-空压机").Activate();
+            UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-空压机").Deactivate();
+            //StartCoroutine(EquipmentIIntroduction_TSQ.instance.AutoHide(4, "参数面板-中央空调主机"));
+        });

        variables.Get<Button>("启动改造-空压机-改造方案").onClick.AddListener(delegate
       {
@ -1322,6 +1403,62 @@ public class EquipmentSimulationView : UIView
        }
    }

+    /// <summary>
+    /// 泵面板
+    /// </summary>
+    private void BengPanel()
+    {
+        if (UIView.Get<EquipmentSimulationView>().IsActiveSelf())
+        {
+            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("泵机Text").text = "开启泵";
+            //UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-冷却塔风机1").Activate();
+
+            //UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机1").onClick.AddListener(() => { SetStep(true); });
+            //UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却塔风机1").onClick.AddListener(() => { SetStep(false); });
+            if (UIView.Get<EquipmentSimulationView>().Stepbools[7] == true)
+            {
+               
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-泵").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-泵").Activate();
+            }
+            else
+            {
+                UIView.Get<EquipmentSimulationView>().variables.Get<Text>("泵机Text").text = "开启泵";
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-泵").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-泵").Activate();
+            }
+
+        }
+        //StartCoroutine(AutoHide(4,"参数面板-冷却塔风机1"));
+    }
+
+    /// <summary>
+    /// 风机面板
+    /// </summary>
+    private void FengJiPanel()
+    {
+        if (UIView.Get<EquipmentSimulationView>().IsActiveSelf())
+        {
+            UIView.Get<EquipmentSimulationView>().variables.Get<Text>("空压机主机Text").text = "开启空压机";
+            //UIView.Get<EquipmentSimulationView>().variables.Get<RectTransform>("参数面板-冷却塔风机1").Activate();
+
+            //UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-冷却塔风机1").onClick.AddListener(() => { SetStep(true); });
+            //UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-冷却塔风机1").onClick.AddListener(() => { SetStep(false); });
+            if (UIView.Get<EquipmentSimulationView>().Stepbools[8] == true)
+            {
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-空压机").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-空压机").Activate();
+            }
+            else
+            {
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("停止运行-空压机").Deactivate();
+                UIView.Get<EquipmentSimulationView>().variables.Get<Button>("启动运行-空压机").Activate();
+            }
+
+        }
+        //StartCoroutine(AutoHide(4,"参数面板-冷却塔风机1"));
+    }
+
    /// <summary>
    /// 设备运行
    /// </summary>
--- a/Assets/_TerrainAutoUpgrade.meta
+++ b/Assets/_TerrainAutoUpgrade.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2b318beed38aa64aa54e12fd47fd151
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_TerrainAutoUpgrade/layer_SandSand_normalda1e84dfe1860754.terrainlayer
+++ b/Assets/_TerrainAutoUpgrade/layer_SandSand_normalda1e84dfe1860754.terrainlayer
@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1953259897 &8574412962073106934
+TerrainLayer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: layer_SandSand_normalda1e84dfe1860754
+  m_DiffuseTexture: {fileID: 2800000, guid: a39f96ae41563433894cdbbfef321bce, type: 3}
+  m_NormalMapTexture: {fileID: 2800000, guid: 48a2f20cdf2b44338953cadf4c0d7ebd, type: 3}
+  m_MaskMapTexture: {fileID: 0}
+  m_TileSize: {x: 8, y: 8}
+  m_TileOffset: {x: 0, y: 0}
+  m_Specular: {r: 0, g: 0, b: 0, a: 0}
+  m_Metallic: 0.2
+  m_Smoothness: 0
+  m_NormalScale: 1
+  m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
+  m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
+  m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
+  m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}
--- a/Assets/_TerrainAutoUpgrade/layer_SandSand_normalda1e84dfe1860754.terrainlayer.meta
+++ b/Assets/_TerrainAutoUpgrade/layer_SandSand_normalda1e84dfe1860754.terrainlayer.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c8daf6f685bfeb14a9fe43ce8596151a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8574412962073106934
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -5,21 +5,21 @@
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.editorcoroutines": {
      "version": "1.0.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.feature.development": {
      "version": "1.0.1",
@ -42,7 +42,7 @@
      "dependencies": {
        "com.unity.ext.nunit": "1.0.6"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ide.visualstudio": {
      "version": "2.0.22",
@ -51,28 +51,28 @@
      "dependencies": {
        "com.unity.test-framework": "1.1.9"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ide.vscode": {
      "version": "1.2.5",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.performance.profile-analyzer": {
      "version": "1.2.2",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.settings-manager": {
      "version": "1.0.3",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.test-framework": {
      "version": "1.1.33",
@ -83,7 +83,7 @@
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.testtools.codecoverage": {
      "version": "1.2.5",
@ -93,7 +93,7 @@
        "com.unity.test-framework": "1.0.16",
        "com.unity.settings-manager": "1.0.1"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.textmeshpro": {
      "version": "3.0.6",
@ -102,19 +102,19 @@
      "dependencies": {
        "com.unity.ugui": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.timeline": {
      "version": "1.6.5",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.modules.audio": "1.0.0",
        "com.unity.modules.director": "1.0.0",
        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
        "com.unity.modules.particlesystem": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ugui": {
      "version": "1.0.0",
@ -133,7 +133,7 @@
        "com.unity.ugui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.modules.ai": {
      "version": "1.0.0",
--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
@ -21,7 +21,7 @@ MonoBehaviour:
  m_Registries:
  - m_Id: main
    m_Name: 
-    m_Url: https://packages.unity.com
+    m_Url: https://packages.unity.cn
    m_Scopes: []
    m_IsDefault: 1
    m_Capabilities: 7
@ -31,6 +31,6 @@ MonoBehaviour:
  m_RegistryInfoDraft:
    m_Modified: 0
    m_ErrorMessage: 
-    m_UserModificationsInstanceId: -840
-    m_OriginalInstanceId: -842
+    m_UserModificationsInstanceId: -844
+    m_OriginalInstanceId: -846
  m_LoadAssets: 0
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -371,6 +371,103 @@ PlayerSettings:
      m_Height: 36
      m_Kind: 0
      m_SubKind: 
+  - m_BuildTarget: iPhone
+    m_Icons:
+    - m_Textures: []
+      m_Width: 180
+      m_Height: 180
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 167
+      m_Height: 167
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 152
+      m_Height: 152
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 76
+      m_Height: 76
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 3
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 80
+      m_Height: 80
+      m_Kind: 3
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 80
+      m_Height: 80
+      m_Kind: 3
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 3
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 87
+      m_Height: 87
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 58
+      m_Height: 58
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 29
+      m_Height: 29
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 58
+      m_Height: 58
+      m_Kind: 1
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 29
+      m_Height: 29
+      m_Kind: 1
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 60
+      m_Height: 60
+      m_Kind: 2
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 2
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 2
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 20
+      m_Height: 20
+      m_Kind: 2
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 1024
+      m_Height: 1024
+      m_Kind: 4
+      m_SubKind: App Store
  m_BuildTargetBatching:
  - m_BuildTarget: Standalone
    m_StaticBatching: 1
@ -784,6 +881,7 @@ PlayerSettings:
  metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
  metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
  platformCapabilities: {}
  metroTargetDeviceFamilies: {}
  metroFTAName: 
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.37f1
-m_EditorVersionWithRevision: 2021.3.37f1 (3b6005ad5ad6)
+m_EditorVersion: 2021.3.37f1c1
+m_EditorVersionWithRevision: 2021.3.37f1c1 (a8737bcc389d)
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@ -18,7 +18,7 @@ QualitySettings:
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 0
-    blendWeights: 1
+    skinWeights: 1
    textureQuality: 1
    anisotropicTextures: 0
    antiAliasing: 0
@ -27,6 +27,7 @@ QualitySettings:
    realtimeReflectionProbes: 0
    billboardsFaceCameraPosition: 0
    vSyncCount: 0
+    realtimeGICPUUsage: 25
    lodBias: 0.3
    maximumLODLevel: 0
    streamingMipmapsActive: 0
@ -40,6 +41,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: Low
@ -53,7 +55,7 @@ QualitySettings:
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 0
-    blendWeights: 2
+    skinWeights: 2
    textureQuality: 0
    anisotropicTextures: 0
    antiAliasing: 0
@ -62,6 +64,7 @@ QualitySettings:
    realtimeReflectionProbes: 0
    billboardsFaceCameraPosition: 0
    vSyncCount: 0
+    realtimeGICPUUsage: 25
    lodBias: 0.4
    maximumLODLevel: 0
    streamingMipmapsActive: 0
@ -75,6 +78,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: Medium
@ -88,7 +92,7 @@ QualitySettings:
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 0
-    blendWeights: 2
+    skinWeights: 2
    textureQuality: 0
    anisotropicTextures: 1
    antiAliasing: 0
@ -97,6 +101,7 @@ QualitySettings:
    realtimeReflectionProbes: 0
    billboardsFaceCameraPosition: 0
    vSyncCount: 1
+    realtimeGICPUUsage: 25
    lodBias: 0.7
    maximumLODLevel: 0
    streamingMipmapsActive: 0
@ -110,6 +115,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: High
@ -123,7 +129,7 @@ QualitySettings:
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 1
-    blendWeights: 2
+    skinWeights: 2
    textureQuality: 0
    anisotropicTextures: 1
    antiAliasing: 0
@ -132,6 +138,7 @@ QualitySettings:
    realtimeReflectionProbes: 1
    billboardsFaceCameraPosition: 1
    vSyncCount: 1
+    realtimeGICPUUsage: 50
    lodBias: 1
    maximumLODLevel: 0
    streamingMipmapsActive: 0
@ -145,6 +152,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: Very High
@ -158,7 +166,7 @@ QualitySettings:
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 1
-    blendWeights: 4
+    skinWeights: 4
    textureQuality: 0
    anisotropicTextures: 2
    antiAliasing: 2
@ -167,6 +175,7 @@ QualitySettings:
    realtimeReflectionProbes: 1
    billboardsFaceCameraPosition: 1
    vSyncCount: 1
+    realtimeGICPUUsage: 50
    lodBias: 1.5
    maximumLODLevel: 0
    streamingMipmapsActive: 0
@ -180,6 +189,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: Ultra
@ -193,7 +203,7 @@ QualitySettings:
    shadowCascade2Split: 0.33333334
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 1
-    blendWeights: 4
+    skinWeights: 4
    textureQuality: 0
    anisotropicTextures: 2
    antiAliasing: 2
@ -202,6 +212,7 @@ QualitySettings:
    realtimeReflectionProbes: 1
    billboardsFaceCameraPosition: 1
    vSyncCount: 1
+    realtimeGICPUUsage: 100
    lodBias: 2
    maximumLODLevel: 0
    streamingMipmapsActive: 0
@ -215,12 +226,13 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  m_PerPlatformDefaultQuality:
    Android: 2
-    Lumin: 5
    GameCoreScarlett: 5
    GameCoreXboxOne: 5
+    Lumin: 5
    Nintendo 3DS: 5
    Nintendo Switch: 5
    PS4: 5
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,35 +6,35 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 575700075c075a08555b5f7746225a4444161e727c7975602b704e65e4b66139
-      flags: 0
-    RecentlyUsedSceneGuid-1:
      value: 5154050006005f030f0b0d7643215a44144f1e7e782d7732282c4937bbe2606e
      flags: 0
-    RecentlyUsedSceneGuid-2:
+    RecentlyUsedSceneGuid-1:
      value: 0001040353560b0c5c5d5520457506444e164e7f782973677e2c4435bab0316c
      flags: 0
-    RecentlyUsedSceneGuid-3:
+    RecentlyUsedSceneGuid-2:
      value: 0655560204535c595b0c5a264975084447151a73747e22682c7a4536b7b46d6c
      flags: 0
-    RecentlyUsedSceneGuid-4:
+    RecentlyUsedSceneGuid-3:
      value: 0009010551005859550d5c76417a0d44414e4b7e74297735742f1862e3b8673d
      flags: 0
-    RecentlyUsedSceneGuid-5:
+    RecentlyUsedSceneGuid-4:
      value: 5701055e57565e5e0f085d7344730644134f4b2e2d7a72322b784435b7b56c6b
      flags: 0
-    RecentlyUsedSceneGuid-6:
+    RecentlyUsedSceneGuid-5:
      value: 05030d5151000d0e085e547446710d444e151c2c787a73677f7c4931b0b56d3d
      flags: 0
-    RecentlyUsedSceneGuid-7:
+    RecentlyUsedSceneGuid-6:
      value: 5a53520253010a0b0f5d5870157b5d4441154e7b7b2a23667c2c4830b1e2606d
      flags: 0
-    RecentlyUsedSceneGuid-8:
+    RecentlyUsedSceneGuid-7:
      value: 5a54035507010c03545c5a2048750e4440164c787e7823627d2a4561e0b73568
      flags: 0
-    RecentlyUsedSceneGuid-9:
+    RecentlyUsedSceneGuid-8:
      value: 060607535d0d0a5d5b5a5e72497a0c44144e1a7c7b2e24647a7b4d32b7e56169
      flags: 0
+    RecentlyUsedSceneGuid-9:
+      value: 0202035457065d5e590d0f75477a0844144e4b727a7e76337e2b4560e7e16068
+      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
      flags: 0
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@ -25,7 +25,7 @@ MonoBehaviour:
  m_MinSize: {x: 400, y: 200}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 48000
+  controlID: 5474
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -47,9 +47,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 348
-    width: 767
-    height: 661
+    y: 602
+    width: 706
+    height: 407
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -97,23 +97,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 767
-      height: 640
-    m_Scale: {x: 0.39947918, y: 0.39947918}
-    m_Translation: {x: 383.49997, y: 320}
+      width: 706
+      height: 386
+    m_Scale: {x: 0.35740742, y: 0.35740742}
+    m_Translation: {x: 353, y: 193}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -959.9999
-      y: -801.04297
-      width: 1919.9999
-      height: 1602.0859
+      x: -987.66833
+      y: -540
+      width: 1975.3367
+      height: 1080
    m_MinimalGUI: 1
-  m_defaultScale: 0.39947918
-  m_LastWindowPixelSize: {x: 767, y: 661}
+  m_defaultScale: 0.35740742
+  m_LastWindowPixelSize: {x: 706, y: 407}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 00000000000000000000
@ -138,12 +138,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 768
+    width: 707
    height: 957
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 48001
+  controlID: 5475
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -161,8 +161,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 768
-    height: 275
+    width: 707
+    height: 529
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 5}
@ -193,8 +193,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 73
-    width: 767
-    height: 254
+    width: 706
+    height: 508
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -458,14 +458,14 @@ MonoBehaviour:
  m_OverrideSceneCullingMask: 6917529027641081856
  m_SceneIsLit: 1
  m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
  m_isRotationLocked: 0
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 0.40161926, y: -2.1288486, z: -0.00514357}
+    m_Target: {x: -1.4542392, y: -1.9387997, z: -7.739529}
    speed: 2
-    m_Value: {x: 0.40161926, y: -2.1288486, z: -0.00514357}
+    m_Value: {x: -1.4542392, y: -1.9387997, z: -7.739529}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -512,17 +512,17 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.0024754077, y: -0.98894346, z: 0.14734288, w: -0.016616998}
    speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.0024754063, y: -0.98894286, z: 0.14734279, w: -0.016616989}
  m_Size:
-    m_Target: 3.3267336
+    m_Target: 7.640584
    speed: 2
-    m_Value: 3.3267336
+    m_Value: 7.640584
  m_Ortho:
-    m_Target: 1
+    m_Target: 0
    speed: 2
-    m_Value: 1
+    m_Value: 0
  m_CameraSettings:
    m_Speed: 0.36819997
    m_SpeedNormalized: 0.17999999
@ -624,9 +624,9 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 275
-    width: 768
-    height: 682
+    y: 529
+    width: 707
+    height: 428
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 2}
@ -651,14 +651,14 @@ MonoBehaviour:
  - {fileID: 11}
  m_Position:
    serializedVersion: 2
-    x: 768
+    x: 707
    y: 0
-    width: 600
+    width: 661
    height: 957
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 47973
+  controlID: 5348
 --- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -676,7 +676,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 282
+    width: 309
    height: 957
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
@ -705,9 +705,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 768
+    x: 707
    y: 73
-    width: 280
+    width: 307
    height: 936
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -717,23 +717,23 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: eeedd8fffeeed8ff08efd8ff12efd8ff26efd8ffe065d9ffec65d9ff9c66d9ffd266d9ff0067d9ff9ac0deff20cfdeffc2cfdeffcccfdeffd6cfdeff16d0deffb0e6deffbce6deff6ce7deffa2e7deffd0e7deff604beeff964beeffc44beeff9242f0ff0049f0ff2e49f0ff644cf0ff504ef0ff544ef0ff584ef0ff5a4ef0ff0879f0ff98a4f0ff3ca6f0ff62aaf0ff1cd5ffff28d6ffff2cd6ffff30d7ffff3cdcffff8cefffff82f0ffffe6f0ffffe6faffff34fbffff38fbfffff4ffffffd6640000
+      m_SelectedIDs: 806cfeff
+      m_LastClickedID: -103296
+      m_ExpandedIDs: 283afeffca81feff5696feff28b0feff2ab0feffb0e3feff56e5feffc6b0010000b30100
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: "\u5E72\u71E5\u673A"
+        m_OriginalName: "\u5E72\u71E5\u673A"
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: 0
+        m_UserData: -116184
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
        m_IsRenamingFilename: 0
        m_ClientGUIView: {fileID: 9}
      m_SearchString: 
@ -758,9 +758,9 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 282
+    x: 309
    y: 0
-    width: 318
+    width: 352
    height: 957
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
@ -789,9 +789,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1050
+    x: 1016
    y: 73
-    width: 316
+    width: 350
    height: 936
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -809,7 +809,7 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/UIView/ManagementSimulationView/Resources
+    - Assets/GameAssets/Prefabs
    m_Globs: []
    m_OriginalText: 
    m_FilterByTypeIntersection: 0
@ -824,7 +824,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 287a0300
    m_LastClickedID: 227880
-    m_ExpandedIDs: ffffffff00000000f2a30000f4a30000f6a30000f8a30000faa30000fca30000fea3000000a4000002a4000004a4000006a4000008a400000aa400000ca400000ea4000010a4000012a4000014a4000016a4000018a400001aa400001ca400001ea4000020a4000022a4000024a4000026a4000028a400002aa400002ca400002ea4000032a4000034a4000036a400003ca400003ea400002ca6000040a60000
+    m_ExpandedIDs: ffffffff7aaf0100a0af0100aaaf01003ab401003eb4010050b40100
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -849,10 +849,10 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 302}
-    m_SelectedIDs: 
+    scrollPos: {x: 0, y: 54}
+    m_SelectedIDs: 806cfeff
    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000f2a30000f4a30000f6a30000f8a30000faa30000fca30000fea3000000a4000002a4000004a4000006a4000008a400000aa400000ca400000ea4000010a4000012a4000014a4000016a4000018a400001aa400001ca400001ea4000020a4000022a4000024a4000026a4000028a400002aa400002ca400002ea4000032a4000034a4000036a400003ca400003ea400002ca6000040a60000
+    m_ExpandedIDs: ffffffff7aaf0100a0af0100aaaf01003ab401003eb4010050b40100
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -877,8 +877,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: 806cfeff
+    m_LastClickedInstanceID: -103296
    m_HadKeyboardFocusLastEvent: 0
    m_ExpandedInstanceIDs: 
    m_RenameOverlay:
@ -927,8 +927,8 @@ MonoBehaviour:
    y: 0
    width: 552
    height: 957
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 14}
  m_Panes:
  - {fileID: 14}
@ -968,7 +968,7 @@ MonoBehaviour:
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
  m_PreviewResizer:
-    m_CachedPref: -151
+    m_CachedPref: 548
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1