[+]暂存

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

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/尖嘴钳&链条钳&摇把&二次插头/尖嘴钳&链条钳&摇把_Tex.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d7169f2046eb3634fa0acdbbadbd1b44
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/推车.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ab4200d27faaf549aaf2e0ab6d6d371
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ChivaTechFramework/Assets/GameAssets/03.Models/广州番禺.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/03.Models/广州番禺.meta
-guid: 0c1376799096d8947bdb849bc25b0af3
-========
-guid: 871d4fa3514aadb4eba4da970d6a1498
->>>>>>>> feature/JNHJ:ChivaTechFramework/Assets/GameAssets/StreamingAssets.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ChivaTechFramework/Assets/GameAssets/StreamingAssets.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/03.Models/广州番禺.meta
-guid: c29351964690cbb4e956733672302194
-========
-guid: 871d4fa3514aadb4eba4da970d6a1498
->>>>>>>> feature/JNHJ:ChivaTechFramework/Assets/GameAssets/StreamingAssets.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: