修改效果

GQ_URP/GQ/Assets/Adam/Scripts/DragController.cs

@@ -178,7 +178,10 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
             uPosManger.SetCurrentUPosIsOccupied(index, dt.volume, true);
             var q = dt.transform.GetComponent<DeviceQuery>();
             if (q && q.deviceList.deviceType == "3")
+            {
                 q.deviceList.devicePosition = uPosManger.uPosItems[index].transform.name;
+                dt.transform.localPosition = Vector3.zero;
+            }
 
             DeviceItem di;
             if (dt.gameObject.GetComponent<DeviceItem>() == null)

GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4 1.unity.meta

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

GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity

@@ -12629,7 +12629,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 242085846}
-  - component: {fileID: 242085847}
   m_Layer: 0
   m_Name: ---------------------------------------
   m_TagString: Untagged
@@ -12653,18 +12652,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &242085847
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 242085844}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 466f0a0ed11afee4f89249fb48d13c4a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &242246369
 GameObject:
   m_ObjectHideFlags: 0
@@ -19319,7 +19306,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 59510595}
   m_HandleRect: {fileID: 59510594}
   m_Direction: 2
-  m_Value: -0.084745765
+  m_Value: 0
   m_Size: 0.9999919
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -20526,7 +20513,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.003913538}
+  m_AnchoredPosition: {x: 0, y: 0.0035793786}
   m_SizeDelta: {x: 318.95, y: 443.74}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &413199003
@@ -45191,10 +45178,10 @@ MonoBehaviour:
   m_RequiresOpaqueTextureOption: 2
   m_CameraType: 0
   m_Cameras: []
-  m_RendererIndex: -1
+  m_RendererIndex: 0
   m_VolumeLayerMask:
     serializedVersion: 2
-    m_Bits: 1
+    m_Bits: 262144
   m_VolumeTrigger: {fileID: 0}
   m_VolumeFrameworkUpdateModeOption: 2
   m_RenderPostProcessing: 1
@@ -86965,7 +86952,7 @@ MonoBehaviour:
     jqr_bczb: 
     jqr_xj_cx: 
   arguments:
-    token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDA1NjI3NzQsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.p3sZyGcm0rQYSgDhz2N_GgUs9j_hkdMmWI7jylJanOA
+    token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDA3MjY3MTksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.rmkxt8s8IKU9Y340ssS_aQVIMtI-90mzaZsLHo4j1yI
     heatThresholdValueMax: 
     heatThresholdValueMin: 
     humidityThresholdValueMax: 
@@ -102423,7 +102410,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2116972269}
   - component: {fileID: 2116972268}
-  m_Layer: 0
+  m_Layer: 18
   m_Name: GlobalVolume
   m_TagString: Untagged
   m_Icon: {fileID: 0}

GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs

@@ -389,6 +389,8 @@ public class UIToCabinet : MonoBehaviour
                     //GameManager.Inst.objectToShow_add.SetActive(true);
                     var SN1 = GameManager.Inst.objectToShow_add.GetComponent<SearchName1>();
                     SN1.hide_menu();
+                    GameManager.Inst.search_box.GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.»ú¹ñ);
+                    GameManager.Inst.search_box.SetActive(true);
                     ExtendedFlycam.Inst.QieHuan(Menu.M_数字孪生_场景管理);
                     CabinetUIManager.ChangeMenu(Menu.M_数字孪生_场景管理);
 
@@ -484,6 +486,8 @@ public class UIToCabinet : MonoBehaviour
                     init(Menu.M_数字孪生_线缆连接_配置);
                     //ExtendedFlycam.Inst.QuanJing();
                     //GameManager.Inst.power_open();
+                    GameManager.Inst.search_box.GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.»ú¹ñ);
+                    GameManager.Inst.search_box.SetActive(true);
                     ExtendedFlycam.Inst.QieHuan(Menu.M_数字孪生_线缆连接_配置);
                     CabinetUIManager.ChangeMenu(Menu.M_数字孪生_线缆连接_配置);
 

GQ_URP/GQ/Assets/Settings/URP-HighFidelity-Renderer.asset

@@ -62,10 +62,10 @@ MonoBehaviour:
   m_AssetVersion: 1
   m_OpaqueLayerMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 2147483647
   m_TransparentLayerMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 2147483647
   m_DefaultStencilState:
     overrideStencilState: 0
     stencilReference: 0

GQ_URP/GQ/Assets/Settings/URP-HighFidelity.asset

@@ -25,15 +25,18 @@ MonoBehaviour:
   m_SupportsTerrainHoles: 1
   m_StoreActionsOptimization: 0
   m_SupportsHDR: 1
-  m_MSAA: 4
+  m_MSAA: 2
   m_RenderScale: 1
+  m_UpscalingFilter: 0
+  m_FsrOverrideSharpness: 0
+  m_FsrSharpness: 0.92
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
-  m_MainLightShadowmapResolution: 4096
+  m_MainLightShadowmapResolution: 1024
   m_AdditionalLightsRenderingMode: 1
   m_AdditionalLightsPerObjectLimit: 8
   m_AdditionalLightShadowsSupported: 1
-  m_AdditionalLightsShadowmapResolution: 4096
+  m_AdditionalLightsShadowmapResolution: 1024
   m_AdditionalLightsShadowResolutionTierLow: 128
   m_AdditionalLightsShadowResolutionTierMedium: 256
   m_AdditionalLightsShadowResolutionTierHigh: 512
@@ -48,7 +51,9 @@ MonoBehaviour:
   m_ShadowDepthBias: 1
   m_ShadowNormalBias: 1
   m_SoftShadowsSupported: 1
-  m_AdditionalLightsCookieResolution: 4096
+  m_ConservativeEnclosingSphere: 0
+  m_NumIterationsEnclosingSphere: 64
+  m_AdditionalLightsCookieResolution: 1024
   m_AdditionalLightsCookieFormat: 4
   m_UseSRPBatcher: 1
   m_SupportsDynamicBatching: 0

GQ_URP/GQ/Assets/script/GameManager.cs

@@ -1,5 +1,4 @@
-using DG.Tweening;
+using Newtonsoft.Json;
-using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -572,7 +571,10 @@ public class GameManager : MonoBehaviour
             PortQuery P;
             DeviceQuery DP;
             P = TmsPorts_go[i].GetComponent<PortQuery>();
-            DP = TmsPorts_go[i].transform.parent.GetComponent<DeviceQuery>();
+            //DP = TmsPorts_go[i].transform.parent.GetComponent<DeviceQuery>();
+            var _DP = FindParent(TmsPorts_go[i], IsFindRacks_goORTmsCards_go);
+            if (!_DP) continue;
+            DP = _DP.GetComponent<DeviceQuery>();
             if (!DP) continue;
             foreach (var item in TmsPorts)
             {
@@ -807,7 +809,10 @@ public class GameManager : MonoBehaviour
             DeviceQuery D;
             DeviceQuery DP;
             D = MachineSlots_go[i].transform.GetComponent<DeviceQuery>();//机槽
-            DP = MachineSlots_go[i].transform.parent.GetComponent<DeviceQuery>();//机槽父物体
+            //DP = MachineSlots_go[i].transform.parent.GetComponent<DeviceQuery>();//机槽父物体
+            var _DP = FindParent(MachineSlots_go[i], IsFindRacks_go);//机槽父物体
+            if (!_DP) continue;
+            DP = _DP.GetComponent<DeviceQuery>();
             if (!DP) continue;
             foreach (var item in MachineSlots)
             {
@@ -851,6 +856,38 @@ public class GameManager : MonoBehaviour
                     TmsCards_go.Add(bk[j].gameObject);
                 }
             }
+            #region new
+            //var jk = Racks_go[i].GetComponent<DeviceQuery>();
+            //for (int j = 0; j < TmsCards.Count; j++)
+            //{
+            //    if (TmsCards[j].shelfId == jk.deviceList.id)
+            //    {
+            //        //获取模型编号
+            //        string modelNum = TmsCards[j].modelNum;
+            //        //获取U位
+            //        var U = TmsCards[j].devicePosition;
+            //        GameObject go;
+            //        try
+            //        {
+            //            go = Instantiate(Resources.Load<GameObject>("古泉站机房模型90个型号/" + modelNum));
+            //            //写入板卡配置
+            //            go.GetComponent<DeviceQuery>().deviceList = Racks[i];
+            //            Racks_go.Add(go);
+
+            //            DragController drag = gameObject.GetComponent<DeviceManager>().dragController.GetComponent<DragController>();
+            //            drag.oriObjectPrefab = go.GetComponent<DragTest1>();
+            //            drag.uPosManger = jk.transform.Find("U位").GetComponent<UPosManger>();
+            //            drag.CountUPos(drag.oriObjectPrefab, Convert.ToInt32(TmsCards[j].devicePosition) - 1);
+            //            break;
+            //        }
+            //        catch (Exception e)
+            //        {
+            //            Debug.LogError("板卡模型生成错误:" + modelNum + "\n" + e.Message + "\n" + e.StackTrace);
+            //            break;
+            //        }
+            //    }
+            //}
+            #endregion
         }
         Debug.Log("##010");
         //读取板卡配置

GQ_URP/GQ/Assets/script/UI/PatternChoose.cs

@@ -115,6 +115,11 @@ public class PatternChoose : MonoBehaviour
                 SearchName searchName = search_go.GetComponent<SearchName>();
                 searchName.showXianLan(searchName._co);
             }
+            else if (Menu.M_数字孪生_场景管理 == CabinetUIManager.Instance.current_menu)
+            {
+                GameManager.Inst.search_box.GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
+                GameManager.Inst.search_box.SetActive(true);
+            }
         });
 
         //Debug.Log("版本号 1.1.1");

GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs

@@ -198,6 +198,8 @@ public class AddDevice : MonoBehaviour
         close_bt.onClick.AddListener(() =>
         {
             gameObject.SetActive(false);
+            if (CabinetUIManager.Instance.current_menu==Menu.M_数字孪生_场景管理)
+                GameManager.Inst.objectToShow_add.SetActive(true);
         });
     }
 

GQ_URP/GQ/Assets/script/接口/修改/RedactDevice.cs

@@ -181,6 +181,8 @@ public class RedactDevice : MonoBehaviour
         close_bt.onClick.AddListener(() =>
         {
             gameObject.SetActive(false);
+            if (CabinetUIManager.Instance.current_menu == Menu.M_数字孪生_场景管理) 
+                GameManager.Inst.objectToShow_add.SetActive(true);
         });
     }
 

GQ_URP/GQ/Assets/script/点击/ClickEvent.cs

@@ -930,6 +930,8 @@ public class ClickEvent : MonoBehaviour
     /// </summary>
     public void Zoomin(GameObject cabine)
     {
+        if (CabinetUIManager.Instance.current_menu == Menu.M_数字孪生_场景管理) 
+            GameManager.Inst.search_box.SetActive(false);
         ExtendedFlycam.Inst.CameraRtDisable();
         ExtendedFlycam.Inst.QieHuan(CabinetUIManager.Instance.current_menu, 99);
 

GQ_URP/GQ/Assets/script/设备信息/DeviceInfor.cs

@@ -73,6 +73,8 @@ public class DeviceInfor : MonoBehaviour
         {
             gameObject.SetActive(false);
             GameManager.Inst.now_CK_Device = null;
+            if (CabinetUIManager.Instance.current_menu == Menu.M_数字孪生_场景管理)
+                GameManager.Inst.objectToShow_add.SetActive(true);
         });
     }
 

GQ_URP/GQ/ProjectSettings/ProjectSettings.asset

@@ -520,7 +520,7 @@ PlayerSettings:
     m_APIs: 0b00000008000000
     m_Automatic: 0
   - m_BuildTarget: WebGLSupport
-    m_APIs: 080000000b000000
+    m_APIs: 0b000000
     m_Automatic: 0
   m_BuildTargetVRSettings: []
   openGLRequireES31: 0
@@ -535,7 +535,7 @@ PlayerSettings:
   - m_BuildTarget: Android
     m_EncodingQuality: 1
   - m_BuildTarget: WebGL
-    m_EncodingQuality: 2
+    m_EncodingQuality: 1
   m_BuildTargetGroupLightmapSettings: []
   m_BuildTargetNormalMapEncoding:
   - m_BuildTarget: Android

GQ_URP/GQ/ProjectSettings/QualitySettings.asset

@@ -95,7 +95,7 @@ QualitySettings:
     skinWeights: 255
     textureQuality: 0
     anisotropicTextures: 2
-    antiAliasing: 4
+    antiAliasing: 2
     softParticles: 0
     softVegetation: 1
     realtimeReflectionProbes: 1
@@ -126,10 +126,10 @@ QualitySettings:
     Nintendo Switch: 1
     PS4: 2
     PS5: 2
-    Server: 0
+    Server: 1
     Stadia: 2
     Standalone: 2
-    WebGL: 2
+    WebGL: 1
     Windows Store Apps: 2
     XboxOne: 2
     iPhone: 1

GQ_URP/GQ/ProjectSettings/TagManager.asset

@@ -23,7 +23,7 @@ TagManager:
   - "\u84C4\u7535\u6C60"
   - "\u6444\u50CF\u5934"
   - "\u5899"
-  - 
+  - PostVolume
   - 
   - 
   -