修改 1 2 4 5 7

Assets/Game/Blue/Command/DeviceDetailsUpdataDataCommand.cs

@@ -7,10 +7,12 @@ namespace GHZLangChao
     {
         private DeviceParameters DeviceParameter;
         private Transform currentPos;
-        public DeviceDetailsUpdataDataCommand(DeviceParameters DeviceParameter,Transform currentPos)
+        private DataItem item;
+        public DeviceDetailsUpdataDataCommand(DeviceParameters DeviceParameter,Transform currentPos,DataItem item)
         {
             this.DeviceParameter = DeviceParameter;
             this.currentPos = currentPos;
+            this.item = item;
         }
 
         public void OnExcute()
@@ -18,7 +20,8 @@ namespace GHZLangChao
             this.SendEvent(new DeviceDetailsUpdataDataEvent()
             {
                 DeviceParameter = this.DeviceParameter,
-                currentPos = this.currentPos
+                currentPos = this.currentPos,
+                item = this.item
             });
         }
     }

Assets/Game/Blue/Controller/Item/DeviceInfo_Item.cs

@@ -8,6 +8,7 @@ namespace GHZLangChao
     {
         private DeviceParameters DeviceParameter;
         public Transform currentPos;
+        public DataItem item;
 
         [SerializeField] private Button DetailsBtn;
         private void Start()
@@ -16,10 +17,11 @@ namespace GHZLangChao
         }
 
         int i;
-        public void Init(DeviceParameters DeviceParameter,int i)
+        public void Init(DeviceParameters DeviceParameter,int i , DataItem item)
         {
             this.DeviceParameter = DeviceParameter;
             this.i = i;
+            this.item = item;
         }
 
         private void ClickDetails()
@@ -28,7 +30,8 @@ namespace GHZLangChao
 
           //  Vector3 currentPos = transform.position; // 为了将详情面板移动到面前
 
-            this.SendCommand(new DeviceDetailsUpdataDataCommand(DeviceParameter, currentPos)); // 触发事件，打开面板，更新数据
+            this.SendCommand(new DeviceDetailsUpdataDataCommand(DeviceParameter, currentPos,item)); // 触发事件，打开面板，更新数据
+            item.gameObject.SetActive(false);
         }
     }
 }

Assets/Game/Blue/Event/DeviceDetailsUpdataDataEvent.cs

@@ -7,5 +7,6 @@ namespace GHZLangChao
     {
         public DeviceParameters DeviceParameter;
         public Transform currentPos;
+        public DataItem item;
     }
 }

Assets/Game/PrefabTemplate/DeviceInfo.prefab

@@ -97,6 +97,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   currentPos: {fileID: 2284758589063455848}
+  item: {fileID: 0}
   DetailsBtn: {fileID: 4141881959723194254}
 --- !u!1 &2158934736428582835
 GameObject:
@@ -398,17 +399,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3935264146468868087}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.2}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8395069113887031565}
   m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 350, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4023689000873401868

Assets/Game/PrefabTemplate/ShowDeviceDetails.prefab

@@ -8018,6 +8018,7 @@ GameObject:
   - component: {fileID: 1430706321506380776}
   - component: {fileID: 7676175233057435773}
   - component: {fileID: 4463786867379493234}
+  - component: {fileID: 7765894792703319791}
   m_Layer: 5
   m_Name: ShowDeviceDetails
   m_TagString: Untagged
@@ -8139,6 +8140,47 @@ MonoBehaviour:
   facilityManagementOrganization: {fileID: 2541966862384306155}
   equipmentMaintenanceOrganization: {fileID: 5672989494178068352}
   businessSystem: {fileID: 4795609482497137297}
+--- !u!114 &7765894792703319791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6107917270000557272}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbccc4d71ae5b447bab3997600fbdce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PointerEnter:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDown:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerClick:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerUp:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerExit:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDrag:
+    m_PersistentCalls:
+      m_Calls: []
+  Target: {fileID: 0}
+  StartAudio: 6
+  EndAudio: 5
+  headRotate: 0
+  oneGameControllerRotate: 0
+  canOneHandRotate: 0
+  canTwoHandRotate: 0
+  canTwoHandScale: 0
+  minScaleRatio: 0.8
+  maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!1 &6166461397090500103
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/ShowChoose/ShowChoosePanelSelect.cs

@@ -11,7 +11,7 @@ namespace GHZLangChao
         private RoomName_Item item; // item
         void Start()
         {
-            currentRoom_Text.text = UICallManager.Instance.GetMachineRoomList()[0];
+         //   currentRoom_Text.text = UICallManager.Instance.GetMachineRoomList()[0];
 
             
             // 实例化 item

Assets/Game/ShowDevice/DeviceDetailsControl.cs

@@ -53,8 +53,8 @@ public class DeviceDetailsControl : AbstractController
     public Text equipmentMaintenanceOrganization; // 设备维护组织
 
     public Text businessSystem; // 业务系统
-
-    public void UpdateData(DeviceParameters DeviceParameter)
+    public DataItem item;
+    public void UpdateData(DeviceParameters DeviceParameter , DataItem item)
     {
         //deviceId.text = DeviceParameter.deviceId.ToString();
         //deviceName.text = DeviceParameter.deviceName;
@@ -99,4 +99,12 @@ public class DeviceDetailsControl : AbstractController
 
         businessSystem.text = DeviceParameter.businessSystem;
     }
+
+    public void CloseOnClick()
+    {
+        gameObject.SetActive(false);
+        if (item != null)
+            item.gameObject.SetActive(true);
+
+    }
 }

Assets/Game/ShowDevice/ShowDevice.cs

@@ -21,7 +21,7 @@ public class ShowDevice : RemoteSingleton<ShowDevice>,IController
                 DeviceDetailsControl = GetComponentInChildren<DeviceDetailsControl>();
 
             // 更新数据
-            DeviceDetailsControl.UpdateData(e.DeviceParameter);
+            DeviceDetailsControl.UpdateData(e.DeviceParameter,e.item);
             // 更新位置
             DeviceDetailsControl.transform.position = new Vector3(
                e.currentPos.transform.position.x,

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -3212,8 +3212,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6849333547157713582}
   - component: {fileID: 7143174724415241391}
-  - component: {fileID: 2029148211671594986}
-  - component: {fileID: 4793957439773292468}
+  - component: {fileID: 8655956205231949526}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -3249,7 +3248,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5163589280662988174}
   m_CullTransparentMesh: 1
---- !u!114 &2029148211671594986
+--- !u!114 &8655956205231949526
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3276,20 +3275,6 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
---- !u!114 &4793957439773292468
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5163589280662988174}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d4c33e92d8dc2934e919ffa2ff71afd6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  CaptureImage: {fileID: 0}
-  RGBCamTexture: {fileID: 0}
 --- !u!1 &5167328096264815852
 GameObject:
   m_ObjectHideFlags: 0
@@ -3457,7 +3442,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a011e80a917c76a48a42bf80dbee4699, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ShowRawImage: {fileID: 2029148211671594986}
+  ShowRawImage: {fileID: 8655956205231949526}
   arrayImage:
   - {fileID: 8339792878728185537}
   - {fileID: 2684463194480659542}

Assets/Game/ShowXunJian/StartXunJian.cs

@@ -49,9 +49,14 @@ namespace GHZLangChao
         Sprite sprite;
         private void ClickScreenshot()
         {
+            XRRGBCamera.Instance.playCamera(1280, 720);
+            ShowRawImage.texture = XRRGBCamera.Instance.CaptureImage;
             sprite = this.GetUtility<IRawImageForSpriteUtility>().SwitchSprite(ShowRawImage);
+         
             ScreenshotImage.gameObject.SetActive(true);
             ScreenshotImage.sprite = sprite;
+          
+            //ScreenshotImage.sprite = Sprite.Create(XRRGBCamera.Instance.CaptureImage as Texture2D, new Rect(0, 0, XRRGBCamera.Instance.CaptureImage.width, XRRGBCamera.Instance.CaptureImage.height), new Vector2(0.5f, 0.5f));
         }
         private void ClickSave()
         {

Assets/Game/ShowXunJian/XunJianManager.cs

@@ -18,6 +18,7 @@ namespace GHZLangChao
             Serach_Toggle.onValueChanged.AddListener(SerachChange);
             Fault_Toggle.onValueChanged.AddListener(FaultChange);
             UICallManager.Instance.MachineRoomInit();
+            XRRGBCamera.Instance.stopCamera();
             Init();
         }
 

Assets/LangChaoRTC/AgoraVideoAudioManager.cs

@@ -174,11 +174,11 @@ public class AgoraVideoAudioManager : SingletonMono<AgoraVideoAudioManager>
         // RtcEngine.DisableAudio();
         //  RtcEngine.DisableVideo();
         VideoEncoderConfiguration config = new VideoEncoderConfiguration();
-        //config.dimensions = new VideoDimensions(CustomInfo.mWidth, CustomInfo.mHight);
-        //config.frameRate = 15;
-        //config.bitrate = 0;
+        config.dimensions = new VideoDimensions(CustomInfo.mWidth, CustomInfo.mHight);
+        config.frameRate = 15;
+        config.bitrate = 2000;
         //    config.orientationMode = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
-        //RtcEngine.SetVideoEncoderConfiguration(config);
+        RtcEngine.SetVideoEncoderConfiguration(config);
         RtcEngine.SetChannelProfile(CHANNEL_PROFILE_TYPE.CHANNEL_PROFILE_COMMUNICATION);
         RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER);
         // _channelName = roomid;

Assets/LangChaoRTC/MediaSoup/RTCTexture.renderTexture

@@ -12,12 +12,13 @@ RenderTexture:
     Hash: 00000000000000000000000000000000
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
-  serializedVersion: 3
-  m_Width: 1280
-  m_Height: 720
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 1920
+  m_Height: 1080
   m_AntiAliasing: 1
   m_MipCount: -1
-  m_DepthFormat: 2
+  m_DepthStencilFormat: 92
   m_ColorFormat: 8
   m_MipMap: 0
   m_GenerateMips: 1
@@ -35,3 +36,4 @@ RenderTexture:
     m_WrapW: 1
   m_Dimension: 2
   m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2

Assets/LangChaoRTC/Remote/Chouli/LangChaoRTC.cs

@@ -8,12 +8,12 @@ using XRTool.Util;
 
 public class LangChaoRTC : MonoSingleton<LangChaoRTC>
 {
-    //自己账号
+    //鑷�繁璐﹀彿
     zhanghao my = new zhanghao();
     // Start is called before the first frame update
     void Start()
     {
-        Debug.Log("HJJLANGCHAORTC   开始登录");
+        Debug.Log("HJJLANGCHAORTC   寮€濮嬬櫥褰�");
       // StartCoroutine(init(0));
     }
 
@@ -24,7 +24,7 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
     public IEnumerator init(int index)
     {
         yield return new WaitForSeconds(1f);
-        //登录
+        //鐧诲綍
         List<zhanghao> zh = new List<zhanghao>();
         zhanghao zh1 = new zhanghao();
         zh1.zh = "test02";
@@ -57,14 +57,14 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
     {
         if (js["code"].ToString() == "200")
         {
-            Debug.Log("HJJLANGCHAORTC   登录成功登录");
+            Debug.Log("HJJLANGCHAORTC   鐧诲綍鎴愬姛鐧诲綍");
             NetWorkHeaders.Login(my.zh, my.mm, LoginOk, LoginFail);
         }
     }
 
     private void LoginOk(JsonData js)
     {
-        Debug.Log("HJJLANGCHAORTC   yu登录成功");
+        Debug.Log("HJJLANGCHAORTC   yu鐧诲綍鎴愬姛");
         LoginInitRTC.Instance.InitRTC();
         UserInfo.isSN = false;
         UserInfo.UnionId = js["data"]["unionId"].ToString();
@@ -72,7 +72,7 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
         UserInfo.Account = my.zh;
         UserInfo.PassWord = my.mm;
         NetWorkHeaders.GetUserInfo((JsonData sData) => {
-            Debug.Log("HJJLANGCHAORTC   获取用户信息");
+            Debug.Log("HJJLANGCHAORTC   鑾峰彇鐢ㄦ埛淇℃伅");
             UserInfo.phone = sData["data"]["phone"].ToString();
             UserInfo.userName = sData["data"]["nickName"].ToString();
             if (UserInfo.userName == "")
@@ -103,6 +103,8 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
                     CustomInfo.mHight = 360;
                     break;
             }
+            CustomInfo.mWidth = 1920;
+            CustomInfo.mHight = 1080;
             NetWorkHeaders.GetUserAvater((JsonData aData) =>
             {
                 NetWorkHeaders.Instance.getNetTexture(aData["data"]["user"][0].ToString(), null, (Texture tex) => {
@@ -139,8 +141,8 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
             OnCreateRoom();
     }
 
-    public List<InviteUserConfig> InvitingUnionIdList = new List<InviteUserConfig>();//已经邀请了还没同意或者拒绝
-    public List<InviteUserConfig> InviteUnionIdList = new List<InviteUserConfig>();//选择还未被邀请
+    public List<InviteUserConfig> InvitingUnionIdList = new List<InviteUserConfig>();//宸茬粡閭€璇蜂簡杩樻病鍚屾剰鎴栬€呮嫆缁�
+    public List<InviteUserConfig> InviteUnionIdList = new List<InviteUserConfig>();//閫夋嫨杩樻湭琚�個璇�
     private void InviteUsers(JsonData data)
     {
         if (data["data"]["code"].ToString() == "200")
@@ -177,7 +179,7 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
 
                             InviteUserConfig inviteUserConfig = new InviteUserConfig(data["data"]["data"][i]["unionId"].ToString(), data["data"]["data"][i]["phone"].ToString(), data["data"]["data"][i]["avatar"].ToString(), data["data"]["data"][i]["nickName"].ToString(), data["data"]["data"][i]["online"].ToString());
                             inviteUserConfigList.Add(inviteUserConfig);
-                            Debug.Log("11111111111111111    邀请中" + inviteUserConfig.UnionId);
+                            Debug.Log("11111111111111111    閭€璇蜂腑" + inviteUserConfig.UnionId);
                         }
 
                     }
@@ -250,19 +252,19 @@ public class LangChaoRTC : MonoSingleton<LangChaoRTC>
                 WSHandler.Office.ChangeUserType(UserInfo.BusyType);
                 break;
             case "1000":
-                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.Tip, "房间号无效");
+                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.Tip, "鎴块棿鍙锋棤鏁�");
                 SetClick();
                 break;
             case "1001":
-                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.PopOk, "房间人数已满", "知道了", GameStart.actionok);
+                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.PopOk, "鎴块棿浜烘暟宸叉弧", "鐭ラ亾浜�", GameStart.actionok);
                 SetClick();
                 break;
             case "1003":
-                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.Tip, "房间不存在");
+                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.Tip, "鎴块棿涓嶅瓨鍦�");
                 SetClick();
                 break;
             default:
-                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.Tip, "房间不存在");
+                PopUpInfo.Instance.showPublic(PopUpInfo.PopType.Tip, "鎴块棿涓嶅瓨鍦�");
                 SetClick();
                 break;
         }

Assets/LangChaoRTC/Remote/ShowRoom/SysSizeView.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
@@ -37,6 +37,8 @@ public class SysSizeView : BaseView
                 CustomInfo.mHight = 360;
                 break;
         }
+        CustomInfo.mWidth = 1920;
+        CustomInfo.mHight = 1080;
         CustomInfo.camIndex = viewIndex + 1;
         baselist.updateConfig(CustomInfo.sscList);
     }

Assets/Prefab/Route/Materials/LineMat_1_High.mat

@@ -46,7 +46,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: d3f7a4a407ccaee48915bc7827f79dd6, type: 3}
         m_Scale: {x: 1, y: 3}
-        m_Offset: {x: 0, y: -9.100017}
+        m_Offset: {x: 0, y: -44.149612}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

Assets/Scripts/Data/DataItem.cs

@@ -64,7 +64,7 @@ public class DataItem : MonoBehaviour
         this.DeviceParameterList = DeviceParameterList;
         for (int i = 0; i < DeviceInfoList.Count;i++)
         {
-            DeviceInfoList[i].Init(DeviceParameterList[0],i); // 数据只有一个，所以都是0
+            DeviceInfoList[i].Init(DeviceParameterList[0],i,this); // 数据只有一个，所以都是0
         }
     }
 

Assets/Scripts/UICallManager.cs

@@ -23,15 +23,32 @@ public class UICallManager : MonoSingleton<UICallManager>
     {
         DispatcherBase.KeyDownDelegateRegister(AnyDown);
         DispatcherBase.KeyUpDelegateRegister(AnyUp);
+        OnTrackFound += OnTrackfound;
+        OnTrackLast += OnTracklast;
+    }
+
+    public void OnTrackfound(DataItem item)
+    {
+
+        ScenesManager.Instance.showWindow(ScenesManager.SceneType.Navigationing);
+    }
+
+    public void OnTracklast(DataItem item)
+    {
+        ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowXunJian);
+        ShowXunJian.Instance.gotoWindow(ScenesManager.SceneType.ShowDH);
     }
     private void AnyUp(InputKeyCode keyCode, InputDevicePartBase part)
     {
+        Debug.Log("DGJ ====>  AnyUp  " + keyCode.ToString());
         // UILogManager.Instance.SendLogText(3, part.PartType.ToString());
         if (part.PartType == InputDevicePartType.KSRight )
         {
             switch (keyCode)
             {
-                case InputKeyCode.Enter:
+                case InputKeyCode.Enter: // 返回主界面
+
+                    ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
                     break;
                 case InputKeyCode.Cancel:
                     break;
@@ -162,6 +179,8 @@ public class UICallManager : MonoSingleton<UICallManager>
     private void AnyDown(InputKeyCode keyCode, InputDevicePartBase part)
     {
 
+        Debug.Log("DGJ ====>  AnyDown  " + keyCode.ToString());
+
         // UILogManager.Instance.SendLogText(3, part.PartType.ToString());
         if (part.PartType == InputDevicePartType.KSRight)
         {