diff --git a/Assets/ArtRes/Models/Device/计量柜/Materials/三相四线电表.mat b/Assets/ArtRes/Models/Device/计量柜/Materials/三相四线电表.mat index 4d6e1c6..4a62b99 100644 --- a/Assets/ArtRes/Models/Device/计量柜/Materials/三相四线电表.mat +++ b/Assets/ArtRes/Models/Device/计量柜/Materials/三相四线电表.mat @@ -13,7 +13,7 @@ Material: m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque @@ -84,7 +84,7 @@ Material: - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _Cull: 2 + - _Cull: 0 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 diff --git a/Assets/ArtRes/Prefabs/Player.prefab b/Assets/ArtRes/Prefabs/Player.prefab index 5481114..cc1aed8 100644 --- a/Assets/ArtRes/Prefabs/Player.prefab +++ b/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} diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index 4fb5792..f3c02f7 100644 --- a/Assets/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Scripts/Project/Manager/OfficeManager.cs @@ -8,13 +8,7 @@ using UnityEngine; /// public class OfficeManager : SingletonMono { - //public int currentProcessID; - //public int currentSubProcessID; - //public int currentSubProcessStepID; - //public int currentSubProcessStepTriggerID; - - - + /// /// ֻ /// diff --git a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml index c9b0222..1bc480c 100644 --- a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml +++ b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml @@ -5,7 +5,7 @@ - + diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 5d5bacb..c13e29c 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/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 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d2fae2d..af4c354 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - BagRenderTexture - Tool - Deveice - - + - Player - - -