소스 검색

Merge branch 'feature/BASE' into develop_合作分支

# Conflicts:
#	ChivaTechFramework/Assets/GameAssets/StreamingAssets.meta
#	ChivaTechFramework/Assets/GameAssets/StreamingAssets/尖嘴钳&链条钳&摇把&二次插头/尖嘴钳&链条钳&摇把_Tex.meta
#	ChivaTechFramework/Assets/GameAssets/StreamingAssets/推车.meta
1905626492 3 달 전
부모
커밋
cde3569b88

+ 5 - 4
ChivaTechFramework/Assets/GameAssets/03.Models/09.10kV开关柜-KYN28型/Materials/铭牌_02.mat

@@ -9,12 +9,13 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: "\u94ED\u724C_02"
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: _ALPHATEST_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2450
+  stringTagMap:
+    RenderType: TransparentCutout
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -64,7 +65,7 @@ Material:
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0
-    - _Mode: 0
+    - _Mode: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 288 - 259
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV真空断路器-VS1型分合闸弹簧更换.unity


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.