1

Assets/ArtRes/Prefabs/Player.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 2399593117452945568}
   - component: {fileID: 3910755197489471127}
   - component: {fileID: 7005868485670428847}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Player
   m_TagString: Player
   m_Icon: {fileID: 0}
@@ -66,6 +66,7 @@ MonoBehaviour:
   zoomKey: 324
   zoomFOV: 30
   zoomStepTime: 5
+  zoomScale: 1
   playerCanMove: 1
   stopForce: 1
   walkSpeed: 5
@@ -147,7 +148,7 @@ GameObject:
   - component: {fileID: 2399593117623680741}
   - component: {fileID: 2399593117623680740}
   - component: {fileID: 2399593117623680743}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Main Camera
   m_TagString: MainCamera
   m_Icon: {fileID: 0}
@@ -264,7 +265,7 @@ GameObject:
   - component: {fileID: 2399593117846495248}
   - component: {fileID: 2399593117846495251}
   - component: {fileID: 2399593117846495250}
-  m_Layer: 0
+  m_Layer: 9
   m_Name: Capsule
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Scripts/Project/Manager/OfficeManager.cs

@@ -8,12 +8,6 @@ using UnityEngine;
 /// </summary>
 public class OfficeManager : SingletonMono<OfficeManager>
 {
-    //public int currentProcessID;
-    //public int currentSubProcessID;
-    //public int currentSubProcessStepID;
-    //public int currentSubProcessStepTriggerID;
-
-
    
     /// <summary>
     /// 手机

Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml

@@ -5,7 +5,7 @@
 
       <Process id="" processName="任务接受" processDes="">
 
-          <Step id="" subProcessName="查看任务单" isPrecondition="FALSE" precondition="" tipTitle="" tips="请先打看掌机，查看您接受到的任务工单">
+          <Step id="" subProcessName="查看任务单" isPrecondition="FALSE" precondition="" tipTitle="" tips="请点击移动作业终端，查看您接受到的任务工单">
               <operation id="" subProcessStepName="查看任务单" isPrecondition="" precondition="Office" triggerID="手机" tipTitle="请点击桌面上的移动作业终端" score=""></operation>
           </Step>
        </Process >

ProjectSettings/DynamicsManager.asset

@@ -7,6 +7,7 @@ PhysicsManager:
   m_Gravity: {x: 0, y: -9.81, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
   m_SleepThreshold: 0.005
   m_DefaultContactOffset: 0.01
   m_DefaultSolverIterations: 6
@@ -17,7 +18,7 @@ PhysicsManager:
   m_ClothInterCollisionDistance: 0.1
   m_ClothInterCollisionStiffness: 0.2
   m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1
@@ -32,5 +33,6 @@ PhysicsManager:
   m_FrictionType: 0
   m_EnableEnhancedDeterminism: 0
   m_EnableUnifiedHeightmaps: 1
+  m_ImprovedPatchFriction: 0
   m_SolverType: 0
   m_DefaultMaxAngularSpeed: 7

ProjectSettings/TagManager.asset

@@ -15,7 +15,7 @@ TagManager:
   - BagRenderTexture
   - Tool
   - Deveice
-  - 
+  - Player
   - 
   - 
   -