Browse Source

刀片机编辑优化

DGJ 1 year ago
parent
commit
19f54b8d70

+ 5 - 4
Assets/Game/PrefabTemplate/ShowDeviceDetails.prefab

@@ -476,10 +476,10 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 6107917270000557272}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
+      - m_Target: {fileID: 4463786867379493234}
+        m_TargetAssemblyTypeName: DeviceDetailsControl, Assembly-CSharp
+        m_MethodName: CloseOnClick
+        m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -8140,6 +8140,7 @@ MonoBehaviour:
   facilityManagementOrganization: {fileID: 2541966862384306155}
   equipmentMaintenanceOrganization: {fileID: 5672989494178068352}
   businessSystem: {fileID: 4795609482497137297}
+  item: {fileID: 0}
 --- !u!114 &7765894792703319791
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 35 - 96
Assets/Scenes/LangChaoDemo2.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1418,7 +1418,7 @@ Transform:
   m_Children:
   - {fileID: 347313460}
   m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &108617015
 MonoBehaviour:
@@ -1678,7 +1678,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &154394636
 GameObject:
@@ -1800,7 +1800,7 @@ Transform:
   m_Children:
   - {fileID: 503826677}
   m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_RootOrder: 35
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &160490922
 GameObject:
@@ -2651,7 +2651,7 @@ RectTransform:
   m_Children:
   - {fileID: 1145787686}
   m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2753,7 +2753,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 37
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &258612956
 PrefabInstance:
@@ -2985,7 +2985,7 @@ Transform:
   - {fileID: 1504529038}
   - {fileID: 781181986}
   m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &281315257
 MonoBehaviour:
@@ -3130,7 +3130,7 @@ Transform:
   m_Children:
   - {fileID: 656363743}
   m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &284208614
 MonoBehaviour:
@@ -3416,7 +3416,7 @@ Transform:
   m_Children:
   - {fileID: 2056682100}
   m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &305417998
 GameObject:
@@ -3990,7 +3990,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_RootOrder
-      value: 32
+      value: 31
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_LocalPosition.x
@@ -4723,11 +4723,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 365461666}
   m_CullTransparentMesh: 1
---- !u!4 &365581006 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7594132202163909925, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
-  m_PrefabInstance: {fileID: 332018100}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &372108217
 GameObject:
   m_ObjectHideFlags: 0
@@ -5596,7 +5591,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &453102437
 MonoBehaviour:
@@ -7029,7 +7024,7 @@ Transform:
   - {fileID: 2050305761}
   - {fileID: 643100344}
   m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &571089642
 MonoBehaviour:
@@ -7124,7 +7119,6 @@ GameObject:
   - component: {fileID: 587736018}
   - component: {fileID: 587736017}
   - component: {fileID: 587736016}
-  - component: {fileID: 587736019}
   - component: {fileID: 587736020}
   m_Layer: 5
   m_Name: Canvas
@@ -7218,21 +7212,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!114 &587736019
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 587736014}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5aa2f5b965540ef4d8e216cb5828f538, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tagpos: {fileID: 183734198}
-  text: {fileID: 650042338}
-  camera: {fileID: 0}
 --- !u!114 &587736020
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8115,7 +8094,7 @@ RectTransform:
   m_Children:
   - {fileID: 877159228}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: -29.84, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -8790,7 +8769,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &684664681
 GameObject:
@@ -9649,9 +9628,9 @@ MonoBehaviour:
   Prefab:
   - {fileID: 5466424356445212314, guid: b554d4d077a22364cb3e4e185e4d171b, type: 3}
   window: []
---- !u!4 &779761766 stripped
+--- !u!4 &760969023 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 5985485923572795681, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+  m_CorrespondingSourceObject: {fileID: 233199913522317826, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
   m_PrefabInstance: {fileID: 332018100}
   m_PrefabAsset: {fileID: 0}
 --- !u!1 &781181985
@@ -12744,7 +12723,7 @@ Transform:
   - {fileID: 395315453}
   - {fileID: 1429598954}
   m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1012225064
 MonoBehaviour:
@@ -13092,7 +13071,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 33
+  m_RootOrder: 32
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1039426617
 MonoBehaviour:
@@ -13987,7 +13966,7 @@ Transform:
   m_Children:
   - {fileID: 1321099324}
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &1111232647
 MeshRenderer:
@@ -14852,7 +14831,7 @@ RectTransform:
   m_Children:
   - {fileID: 1990114660}
   m_Father: {fileID: 0}
-  m_RootOrder: 34
+  m_RootOrder: 33
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -15671,7 +15650,6 @@ MonoBehaviour:
   foundAngle: 90
   showDis: 0
   fadeDis: 0
-  selectPanel: {fileID: 1954795441}
   TestTracking: {fileID: 160490923}
 --- !u!4 &1342229047
 Transform:
@@ -15686,7 +15664,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1347902563
 GameObject:
@@ -16830,7 +16808,7 @@ Transform:
   m_Children:
   - {fileID: 1764105085}
   m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 36
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1429598953
 GameObject:
@@ -18409,6 +18387,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da9784d47d249a24aa52b50c9461c991, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!4 &1566022330 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2340497190717086068, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+  m_PrefabInstance: {fileID: 332018100}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1570711450
 GameObject:
   m_ObjectHideFlags: 0
@@ -19623,8 +19606,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   global: 1
   triggerState: 0
-  rightKS: {fileID: 365581006}
-  leftKS: {fileID: 779761766}
+  rightKS: {fileID: 1566022330}
+  leftKS: {fileID: 760969023}
   state: 0
 --- !u!4 &1747533902
 Transform:
@@ -19639,7 +19622,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1764105084
 GameObject:
@@ -20118,50 +20101,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 28}
   m_Pivot: {x: 0.5, y: 1}
---- !u!1 &1803535594
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1803535595}
-  - component: {fileID: 1803535596}
-  m_Layer: 0
-  m_Name: Log
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1803535595
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1803535594}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.044505924, y: -0.14082612, z: 0.5925658}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 13
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1803535596
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1803535594}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ccfb359ce40a63e459fd70f7152ab8bd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1824896367
 GameObject:
   m_ObjectHideFlags: 0
@@ -21447,7 +21386,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1954795442
 MonoBehaviour:
@@ -21596,7 +21535,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_RootOrder: 34
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1957186011
 GameObject:
@@ -21906,7 +21845,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1990114659
 GameObject:
@@ -22514,7 +22453,7 @@ Transform:
   m_Children:
   - {fileID: 197407318}
   m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2025435767
 GameObject:
@@ -24471,7 +24410,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8955719703749531883, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_RootOrder
-      value: 31
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 8955719703749531883, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_LocalScale.x

+ 2 - 2
Assets/Scripts/Data/DataItem.cs

@@ -17,7 +17,7 @@ public class DataItem : MonoBehaviour
 
     public Text idText;
 
-    public Transform selectPanel;
+  //  public Transform selectPanel;
 
     public bool isSelect;
 
@@ -49,7 +49,7 @@ public class DataItem : MonoBehaviour
         idText.text = "  当前设备ID为: " + ID;
         this.gameObject.name = "DataItem" + ID;
         BladeServerManager.Instance.listTagTracking.Add(this);
-        this.selectPanel = BladeServerManager.Instance.selectPanel;
+      //  this.selectPanel = BladeServerManager.Instance.selectPanel;
         this.machineParameters = machineParameters;
         this.tagId = machineParameters.tagID;
         //bgTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal,MachineRoomManager.Instance.data.cabinetW);

+ 30 - 27
Assets/Scripts/Managers/BladeServerManager.cs

@@ -52,7 +52,7 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
     /// <summary>
     ///  编辑Tag的移动框
     /// </summary>
-    public Transform selectPanel;
+  //  public Transform selectPanel;
 
     /// <summary>
     /// 模拟测试用的
@@ -69,17 +69,17 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
     private bool state = false;
 
 
-    public delegate void TrackingFound(DataItem tagobj);
-    /// <summary>
-    ///  物体识别到显示
-    /// </summary>
-    public TrackingFound OnTrackFound;
+    //public delegate void TrackingFound(DataItem tagobj);
+    ///// <summary>
+    /////  物体识别到显示
+    ///// </summary>
+    //public TrackingFound OnTrackFound;
 
-    public delegate void TrackingLast(DataItem tagobj);
-    /// <summary>
-    /// 物体识别到隐藏
-    /// </summary>
-    public TrackingLast OnTrackLast;
+    //public delegate void TrackingLast(DataItem tagobj);
+    ///// <summary>
+    ///// 物体识别到隐藏
+    ///// </summary>
+    //public TrackingLast OnTrackLast;
 
     private bool isSync;
 
@@ -90,12 +90,12 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
         tagObj.eulerAngles = Vector3.zero;
         isSync = false;
 
-        showDis = 0.4f;
-        fadeDis = 1;
+        showDis = 0.55f;
+        fadeDis = 1.3f;
 
-        ManipulationHandler manipulation = selectPanel.GetComponent<ManipulationHandler>();
-        manipulation.PointerDown.AddListener(( msg )=> { SelectPointerDown(); });
-        manipulation.PointerUp.AddListener((msg) => { SelectPointerUp(); });
+        //ManipulationHandler manipulation = selectPanel.GetComponent<ManipulationHandler>();
+        //manipulation.PointerDown.AddListener(( msg )=> { SelectPointerDown(); });
+        //manipulation.PointerUp.AddListener((msg) => { SelectPointerUp(); });
 
     }
 
@@ -129,13 +129,13 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
             
             angle = Vector3.Angle(OpenXRCamera.Instance.head.GetComponent<Camera>().transform.forward, foundTag.transform.position - OpenXRCamera.Instance.head.transform.position);
 
-             Debug.Log("Dis " + dis + "  Angle" + angle + "  showDis  " + showDis + "  fadeDis " + fadeDis);
+            // Debug.Log("Dis " + dis + "  Angle" + angle + "  showDis  " + showDis + "  fadeDis " + fadeDis);
             if (Mathf.Abs(dis) < showDis)
             {
                 if (!foundItem.gameObject.activeSelf)
                 {
                     foundItem.gameObject.SetActive(true);
-                    OnTrackFound(foundItem);
+                  //  OnTrackFound(foundItem);
                 }
                    
 
@@ -349,7 +349,7 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
                         {
                             foundItem.isSelect = false;
                             foundItem.SetSelect(false);
-                            foundItem.SaveEdiotrData(selectPanel);
+                          //  foundItem.SaveEdiotrData(selectPanel);
                         }
 
                     }
@@ -360,9 +360,9 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
                     Debug.Log(" QueryFoundItem " + foundID);
                     if (state)
                     {
-                        selectPanel.eulerAngles = foundItem.transform.eulerAngles;
-                        selectPanel.position = foundItem.transform.position;
-                        selectPanel.gameObject.SetActive(true);
+                        //selectPanel.eulerAngles = foundItem.transform.eulerAngles;
+                        //selectPanel.position = foundItem.transform.position;
+                        //selectPanel.gameObject.SetActive(true);
                         foundItem.isSelect = true;
                         foundItem.SetSelect(true);
                     }
@@ -395,14 +395,17 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
 
             if(state)
             {
-                selectPanel.eulerAngles = foundItem.transform.eulerAngles;
-                selectPanel.position = foundItem.transform.position;
-                selectPanel.gameObject.SetActive(true);
-
+                //selectPanel.eulerAngles = foundItem.transform.eulerAngles;
+                //selectPanel.position = foundItem.transform.position;
+                //selectPanel.gameObject.SetActive(true);
+                
+                foundItem.isSelect = true;
+                foundItem.SetSelect(true);
             }
             else
             {
-                selectPanel.gameObject.SetActive(false);
+                foundItem.SaveEdiotrData(foundTag.transform);
+                //selectPanel.gameObject.SetActive(false);
                 foundItem.isSelect = false;
                 foundItem.SetSelect(false);
             }

+ 2 - 1
Assets/Scripts/Managers/MachineRoomManager.cs

@@ -90,6 +90,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         if (PlayerPrefs.HasKey("MachineRoomData"))
         {
             string msg = PlayerPrefs.GetString("MachineRoomData");
+            UILogManager.Instance.text1.text = msg;
             Debug.Log("MachineRoomData  " + msg);
             data = JsonConvert.DeserializeObject<MachineRoomData>(msg);
          //   Debug.Log("PlayerPrefs.HasKey(MachineRoomData) ");
@@ -334,7 +335,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         //Init();
 
 #if UNITY_EDITOR
-       Init();
+    //   Init();
 #endif
     }
 

+ 8 - 6
Assets/Scripts/UICallManager.cs

@@ -23,8 +23,8 @@ public class UICallManager : MonoSingleton<UICallManager>
     {
         DispatcherBase.KeyDownDelegateRegister(AnyDown);
         DispatcherBase.KeyUpDelegateRegister(AnyUp);
-        //OnTrackFound += OnTrackfound;
-        //OnTrackLast += OnTracklast;
+        OnTrackFound += OnTrackfound;
+        OnTrackLast += OnTracklast;
     }
 
     public void OnTrackfound(DataItem item)
@@ -46,9 +46,7 @@ public class UICallManager : MonoSingleton<UICallManager>
         {
             switch (keyCode)
             {
-                case InputKeyCode.Enter: // 返回主界面
-
-                 //   ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
+                case InputKeyCode.Enter:             
                     break;
                 case InputKeyCode.Cancel:
                     break;
@@ -84,7 +82,10 @@ public class UICallManager : MonoSingleton<UICallManager>
                     break;
                 case InputKeyCode.RjoystickKey:
                     break;
-                case InputKeyCode.RFunction:
+                case InputKeyCode.RFunction: // 返回主界面
+
+                    Debug.Log("DGJ  ====> RFunction  按了  ");
+                     //  ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
                     break;
                 case InputKeyCode.RHallInside:
                     break;
@@ -223,6 +224,7 @@ public class UICallManager : MonoSingleton<UICallManager>
                 case InputKeyCode.RjoystickKey:
                     break;
                 case InputKeyCode.RFunction:
+                    Debug.Log("DGJ  ====> RFunction  按了  ");
                     break;
                 case InputKeyCode.RHallInside:
                     break;

+ 0 - 1
Packages/manifest.json

@@ -15,7 +15,6 @@
     "com.unity.xr.arfoundation": "4.2.8",
     "com.unity.xr.openxr": "1.5.3",
     "com.ximmerse.xr": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
-    "con.ghz.login": "file:D:/JiHe/LoginXR",
     "jh.baseeditor.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
     "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
     "com.unity.modules.ai": "1.0.0",

+ 0 - 6
Packages/packages-lock.json

@@ -219,12 +219,6 @@
       },
       "hash": "1be760e1a372b13db307dbe0e09b719455bd53bd"
     },
-    "con.ghz.login": {
-      "version": "file:D:/JiHe/LoginXR",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {}
-    },
     "jh.baseeditor.engine": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
       "depth": 0,