【+】

1.修改内部结构中选择透明状态内部不能隐藏的问题

ModeDisplay/Assets/ChivaFramework/Framework/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_URP_2019.3.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c6fdf170c41094947ab93e9608045ab8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ModeDisplay/Assets/ChivaFramework/Framework/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta → ModeDisplay/Assets/GameAssets/01.Animation.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 4a6eaddfb3bfecf479d8d3a3f1f30d57
+guid: cfbd5b91ae13fd2498bd192513957395
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

ModeDisplay/Assets/GameAssets/15.LineRenderer/Small.mat

@@ -55,7 +55,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 76b293ce6c463144aa5d643127dd77f4, type: 3}
         m_Scale: {x: 0.5, y: 0.125}
-        m_Offset: {x: 0, y: 0}
+        m_Offset: {x: 0.5, y: 0.75}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

ModeDisplay/Assets/Scenes/内部结构/02.220kV_变压器-SFPSZ10型.unity

@@ -234059,7 +234059,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4495632082915814161}
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0.0000003814697, z: -2.2188098}
+  m_LocalPosition: {x: 0, y: 0, z: -2.2188098}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 383935654}

ModeDisplay/Assets/Scripts/PartMark.cs

@@ -60,6 +60,12 @@ public class PartMark : MonoBehaviour
                 foreach (var item in m_DicOldMeshRender)
                 {
                     item.Key.material = tmpMaterial;
+
+                    if (item.Key.GetComponent<MeshCollider>())
+                    {
+                        item.Key.GetComponent<MeshCollider>().enabled = false;
+                    }
+
                 }
             }else
             {
@@ -92,6 +98,10 @@ public class PartMark : MonoBehaviour
                 foreach (var item in m_DicOldMeshRender)
                 {
                     item.Key.material = tmpMaterial;
+                    if (item.Key.GetComponent<MeshCollider>())
+                    {
+                        item.Key.GetComponent<MeshCollider>().enabled = false;
+                    }
                 }
             }
             else
@@ -129,6 +139,10 @@ public class PartMark : MonoBehaviour
         foreach (var item in m_DicOldMeshRender)
         {
             item.Key.material = item.Value;
+            if (item.Key.GetComponent<MeshCollider>())
+            {
+                item.Key.GetComponent<MeshCollider>().enabled = true;
+            }
         }
 
         this.gameObject.SetActive(true);

ModeDisplay/Assets/ChivaFramework/Framework/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_LWRP_2018.3.unitypackage.meta → ModeDisplay/Assets/StreamingAssets/Config/Audios/原理.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 0bf5a4388559b034fa0348f5330303ef
+guid: fbdbdcc1ed0433a45998830f11e641ff
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/220kV变压器.xlsx.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/ChivaXR.meta
-guid: 10f7ffbd9eabea54ba704cb2a5142189
-folderAsset: yes
-========
-guid: 27ef41358b2f9f64684a412bffac5405
->>>>>>>> develop:ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/220kV变压器.xlsx.meta
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/500kV变压器.xlsx.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: bf548bd3b4c87de4685d62498507e0e1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: