ChivaTechFramework/Assets/ChivaFramework

@@ -1 +1 @@
-Subproject commit 5f51bd872d0436a640eebf736ddfcb884b01f26c
+Subproject commit 0635d959713b7431b02785af68622a8d413f52ca

ChivaTechFramework/Assets/GameAssets/03.Models/02.220kV变压器-SFPSZ10-180000型/管道及模型替模/220kV变压器周边_20250826/围栏_储油罐/Materials/JingShiPai_001.mat

@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 130afdc2ec33ace48bfa6ab521e1d4f2, type: 3}
+        m_Texture: {fileID: 2800000, guid: e89c0149fca875a49a333dc8fad49f88, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

ChivaTechFramework/Assets/GameAssets/03.Models/场景模型/主场景模型资源/主变检修/220kV主变补充_Material/ChaTou.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ChaTou
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _METALLICGLOSSMAP
+  m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19492b8d4adc99c49988bb52b0516d06
+guid: f250840a39b8efd44ba6b8cfc2515b99
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

ChivaTechFramework/Assets/GameAssets/Prefab.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/Prefab.meta
-guid: 6e61bf281206a464b8f4cb1821ea91a7
-========
-guid: f250840a39b8efd44ba6b8cfc2515b99
->>>>>>>> feature/JNHJ:ChivaTechFramework/Assets/GameAssets/06.Prefabs.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ChivaTechFramework/Assets/GameAssets/Scripts.meta

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

ChivaTechFramework/Assets/Scripts/Tool/RemoveRedundantOp.cs

@@ -0,0 +1,46 @@
+using ChivaXR;
+using ChivaXR.Op;
+using Sirenix.OdinInspector;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+public class RemoveRedundantOp : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    [Button("去除多余OP")]
+    public void RemoveRedundantOpOnScene()
+    {
+        List<string> dataInfos = new List<string>();
+
+        foreach (ProcessElement item in ProcessManagement.Instance.processes)
+        {
+            dataInfos.Add(((PB_OpData)item.processBase).opData.operationDataName);
+        }
+
+        for (int i = OperationManager.Instance.operationDataContainers.Count-1; i >0 ; i--)
+        {
+            if (!dataInfos.Contains(OperationManager.Instance.operationDataContainers[i].OpDataName))
+            {
+                GameObject obj = OperationManager.Instance.operationDataContainers[i].opData.gameObject;
+                OperationManager.Instance.operationDataContainers.RemoveAt(i);
+                DestroyImmediate(obj);
+            }
+                
+        }
+        
+        
+    }
+}

ChivaTechFramework/Assets/Scripts/Tool/RemoveRedundantOp.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2b28177a03a536044a579f131ee596ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: