Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

jsjsjjs
2024-09-06 17:12:29 +08:00 · 2024-09-06 17:12:23 +08:00
2 changed files with 4 additions and 4 deletions
--- a/Assets/Scenes/03_OfficeScene.unity
+++ b/Assets/Scenes/03_OfficeScene.unity
@ -952,7 +952,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!4 &2089319124
 Transform:
@ -1322,7 +1322,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!23 &909288443134137593
 MeshRenderer:
@ -4190,7 +4190,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!65 &6944469734800208481
 BoxCollider:
--- a/Assets/Scenes/04_ToolMaterialScene.unity
+++ b/Assets/Scenes/04_ToolMaterialScene.unity
@ -1196,7 +1196,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &983777793
 Transform:
  m_ObjectHideFlags: 0
Author	SHA1	Message	Date
陈向学	585bf2e774	Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology	2024-09-06 17:12:29 +08:00
陈向学	0f63b1c886	jsjsjjs	2024-09-06 17:12:23 +08:00