修改常驻

Assets/GameAssets/Models/Materials/办公室-chuanghuboli.mat

@@ -109,13 +109,13 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.613
     - _Mode: 3
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0
+    - _Smoothness: 0.716
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 5

Assets/GameAssets/Models/工器具间/Materials/qiang02.mat

@@ -105,10 +105,10 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BASE_COLOR: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _BASE_COLOR: {r: 0.79622644, g: 0.79622644, b: 0.79622644, a: 1}
     - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1}
+    - _EMISSION_COLOR: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

Assets/Scenes/03_OfficeScene.unity

@@ -674,6 +674,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e84b5b8de3a3f154ba32f7748599c99d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _highlight: []
+  currentProcessID: 0
+  currentSubProcessID: 0
+  currentSubProcessStepID: 0
+  currentSubProcessStepTriggerID: 0
 --- !u!1 &2077977345
 GameObject:
   m_ObjectHideFlags: 0
@@ -1564,9 +1569,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2a85b91b2d2519347b583e108b24f3c8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  triggerID: 5005
+  triggerName: "\u624B\u673A"
+  _highlight: {fileID: 0}
   downIndex: 0
-  modelID: 5005
-  currentSubProcessStepID: -1
 --- !u!65 &919132148358585194
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Scenes/04_ToolMaterialScene.unity

@@ -579,6 +579,39 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
   m_PrefabInstance: {fileID: 860489968}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &901742060
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 901742061}
+  m_Layer: 0
+  m_Name: "\u68B3\u5986\u955C"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &901742061
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 901742060}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 3.5699997, y: 1.068, z: -2.3}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6132854414382456745}
+  - {fileID: 543450653353674152}
+  m_Father: {fileID: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &983777792
 GameObject:
   m_ObjectHideFlags: 0
@@ -1647,14 +1680,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 919132149367037714}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.5699997, y: 1.068, z: -2.3}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.01, y: 1.9790282, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6132854414382456745}
   - {fileID: 2587898902532246539}
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_Father: {fileID: 901742061}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &546574357435488758
 Transform:
@@ -1756,6 +1788,8 @@ GameObject:
   - component: {fileID: 543450653353674152}
   - component: {fileID: 3469287837270444557}
   - component: {fileID: 1711813855422086855}
+  - component: {fileID: 3469287837270444558}
+  - component: {fileID: 3469287837270444559}
   m_Layer: 0
   m_Name: "\u68B3\u5986\u955C"
   m_TagString: Untagged
@@ -2039,6 +2073,7 @@ GameObject:
   - component: {fileID: 6547537557711297966}
   - component: {fileID: 613871186924262241}
   - component: {fileID: 7143490477662047359}
+  - component: {fileID: 7143490477662047360}
   m_Layer: 0
   m_Name: FireDoor_R_a
   m_TagString: Untagged
@@ -2389,6 +2424,7 @@ GameObject:
   - component: {fileID: 2002531610598337279}
   - component: {fileID: 3399922635411602228}
   - component: {fileID: 5888892787065851434}
+  - component: {fileID: 5888892787065851435}
   m_Layer: 0
   m_Name: pCube14
   m_TagString: Untagged
@@ -2685,7 +2721,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 543450653353674152}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &2588085967130580064
 Transform:
@@ -3156,6 +3192,34 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 919132149367037714}
   m_Mesh: {fileID: -5106236157677694661, guid: b328f3329c3e8fa42b67040d91fdad15, type: 3}
+--- !u!65 &3469287837270444558
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 919132149367037714}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &3469287837270444559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 919132149367037714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ff2a91380c2cabf4186aa2d24049a84d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  triggerID: 5012
+  triggerName: "\u955C\u5B50"
+  _highlight: {fileID: 0}
 --- !u!4 &3472720399544234224
 Transform:
   m_ObjectHideFlags: 0
@@ -3380,7 +3444,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: b5544628b5bea33458a16b0cec83edb3, type: 2}
+  - {fileID: 2100000, guid: 74bf1a8193dc00a4a85cf54a8097257c, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4728,6 +4792,7 @@ GameObject:
   - component: {fileID: 8373887989331991907}
   - component: {fileID: 4109990601406380437}
   - component: {fileID: 8576450275586677302}
+  - component: {fileID: 8576450275586677303}
   m_Layer: 0
   m_Name: Box128asdasd
   m_TagString: Untagged
@@ -4793,6 +4858,19 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &5888892787065851435
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2148690140096925999}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.1485153, y: 0.23546849, z: 0.075178504}
+  m_Center: {x: 0, y: -5.2939417e-23, z: 0.0000000037252896}
 --- !u!1 &5957718777836307894
 GameObject:
   m_ObjectHideFlags: 0
@@ -4833,11 +4911,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1150712073403325612}
   m_LocalRotation: {x: 0.019918658, y: -0.685602, z: 0.02113292, w: 0.72739714}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.9965645, y: 1.9723916, z: 0.020072164}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 543450653353674152}
+  m_Father: {fileID: 901742061}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6166879165778976081
@@ -5564,6 +5642,19 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &7143490477662047360
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1573520277904148674}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.19373341, y: 0.8751285, z: 2.3857257}
+  m_Center: {x: 0.02500026, y: -0.4375643, z: -0.024999976}
 --- !u!23 &7147321503659662890
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -5986,6 +6077,7 @@ GameObject:
   - component: {fileID: 2588085967130580064}
   - component: {fileID: 8767012901301994682}
   - component: {fileID: 4148718082160267344}
+  - component: {fileID: 8767012901301994683}
   m_Layer: 0
   m_Name: Object031asdasd
   m_TagString: Untagged
@@ -6215,6 +6307,7 @@ GameObject:
   - component: {fileID: 2026190830599880099}
   - component: {fileID: 1379736554053452210}
   - component: {fileID: 9163818804323785748}
+  - component: {fileID: 9163818804323785749}
   m_Layer: 0
   m_Name: FireDoor_L_a
   m_TagString: Untagged
@@ -6368,6 +6461,19 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &8576450275586677303
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5846932798130283589}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.6798517, y: 1.7959403, z: 2.1184397}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &8642374616143441851
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6501,6 +6607,19 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7785980324569223954}
   m_Mesh: {fileID: 6634934403492400389, guid: 156cca832bad49447b16a92685b1fa5b, type: 3}
+--- !u!65 &8767012901301994683
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7785980324569223954}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.7400064, y: 0.043001506, z: 1.6070548}
+  m_Center: {x: 0, y: 0.00000014808032, z: 0}
 --- !u!4 &8810854337581982736
 Transform:
   m_ObjectHideFlags: 0
@@ -6694,6 +6813,19 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &9163818804323785749
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8273280625189519447}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.19373341, y: 0.8751285, z: 2.3857257}
+  m_Center: {x: 0.025000378, y: -0.4375643, z: -0.024999976}
 --- !u!1 &9219368193252728695
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Project/Objects/Device/DeviceTriggerBase.cs

@@ -1,9 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class DeviceTriggerBase : MonoBehaviour
-{
-    public int triggerID;
-    public string triggerName;
-}

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

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MirrorController : PermanentTriggerBase
+{
+    protected override void OnMDown()
+    {
+        base.OnMDown();
+        GameManager.UIMgr.ShowPanel<UI_CheckMyselfPanel>(E_UI_Layer.Mid, (p) =>
+        {
+
+        });
+
+    }
+
+
+}

Assets/Scripts/Project/Objects/Other/MirrorController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ff2a91380c2cabf4186aa2d24049a84d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,44 +1,26 @@
-using HighlightPlus;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-public class Device_Mobile : MonoBehaviour
+public class MobileController : PermanentTriggerBase
 {
     public int downIndex = 0;
-    public int triggerID = 5005;
-    private HighlightEffect _highlight;
 
-    private void Awake()
+    protected override void OnAwake()
     {
-        _highlight = GetComponent<HighlightEffect>();
+        base.OnAwake();
         //×¢²á״̬³õʼ»¯»Øµ÷
-        StepStateControl.instance.AddStepStateBase(new int[]{3001,3002 },"ÊÖ»ú", para =>
+        StepStateControl.instance.AddStepStateBase(new int[] { 3001, 3002 }, "ĘÖťú", para =>
         {
             downIndex = int.Parse(para);
         });
     }
-    private void Start()
+
+
+    protected override void OnMDown()
     {
-        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-    }
-
-
-    private void SwitchSubProcessStepTriggerID(int arg0)
-    {
-        if (triggerID == arg0)
-        {
-            _highlight.highlighted = true;
-            Debug.Log("ÎÒÓ¦¸ÃÌáʾ");
-        }
-    }
-
-
-    private void OnMouseDown()
-    {
-        if (EventSystem.current.IsPointerOverGameObject()) return;
         switch (downIndex)
         {
             case 0:
@@ -82,13 +64,6 @@ public class Device_Mobile : MonoBehaviour
 
     }
 
-    private void OnMouseExit()
-    {
 
-    }
-
-    private void OnDestroy()
-    {
-        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-    }
+  
 }

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

@@ -0,0 +1,90 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using HighlightPlus;
+using UnityEngine.EventSystems;
+
+/// <summary>
+/// ³£×¤½»»¥
+/// </summary>
+public class PermanentTriggerBase : MonoBehaviour
+{
+    public int triggerID;
+    public string triggerName;
+    [HideInInspector]
+    public HighlightEffect _highlight;
+    private void Awake()
+    {
+        _highlight = GetComponent<HighlightEffect>();
+        OnAwake();
+    }
+
+    private void Start()
+    {
+        GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+        OnStart();
+    }
+    private void SwitchSubProcessStepTriggerID(int arg0)
+    {
+        if (triggerID == arg0)
+        {
+            _highlight.highlighted = true;
+            Debug.Log("ÎÒÓ¦¸ÃÌáʾ");
+        }
+    }
+    /// <summary>
+    /// Awake
+    /// </summary>
+    protected virtual void OnAwake()
+    {
+        
+    }
+    /// <summary>
+    /// Start
+    /// </summary>
+    protected virtual void OnStart()
+    {
+
+    }
+    private void OnMouseEnter()
+    {
+        if (EventSystem.current.IsPointerOverGameObject()) return;
+        OnMEnter();
+    }
+    private void OnMouseDown()
+    {
+        if (EventSystem.current.IsPointerOverGameObject()) return;
+        OnMDown();
+    }
+
+    private void OnMouseExit()
+    {
+        if (EventSystem.current.IsPointerOverGameObject()) return;
+        OnMExit();
+    }
+
+    protected virtual void OnMEnter()
+    {
+
+    }
+    protected virtual void OnMDown()
+    {
+
+    }
+    protected virtual void OnMExit()
+    {
+
+    }
+
+    private void OnDestroy()
+    {
+        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+    private void OnDisable()
+    {
+        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    }
+
+
+
+}

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

@@ -4,14 +4,17 @@ public class UI_CheckMyselfPanel : BasePanel
 {
     public void Init()
     {
+
     }
 
     public override void ShowMe()
     {
+        Debug.Log("ShowMe");
     }
 
     public override void HideMe()
     {
+        Debug.Log("HideMe");
     }
 
     protected override void OnClick(string btnName)