Merge branch 'F/20231026_RTCChange' of ssh://gogs.ghz-tech.com:30979/GHzGlass/GHZLangChao into F/20231026_RTCChange

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

@@ -0,0 +1,115 @@
+using System.Collections;
+using TMPro;
+using Blue;
+using GHZLangChao;
+using SC.XR.Unity;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ShowXunJian_UIItem : MonoBehaviour, IController
+{
+    [SerializeField] private Button mNormal_Btn; //正常
+    [SerializeField] private Button Warning_Btn;  //异常
+
+    [SerializeField] private GameObject NormalBG1_go;
+    [SerializeField] private GameObject NormalBG2_go;
+    [SerializeField] private GameObject WarningBG1_go;
+    [SerializeField] private GameObject WarningBG2_go;
+    [SerializeField] private GameObject NormalPanel_go;
+    [SerializeField] private GameObject WarningPanel_go;
+
+    [SerializeField] private SCInputField LabelText_Input;
+
+    [SerializeField] private GameObject mErrorBtn_go;
+
+    private void Start()
+    {
+        mNormal_Btn.onClick.AddListener(NormalClick);
+        Warning_Btn.onClick.AddListener(WarningClick);
+        LabelText_Input.onValueChanged.AddListener(NewStr => mOutliers = NewStr);
+    }
+    private void OnEnable()
+    {
+        StartCoroutine(SetCurrentUIItem());
+    }
+    private IEnumerator SetCurrentUIItem()
+    {
+        yield return new WaitForSeconds(0.01f);
+        StartXunJian.Instance.currentUIItem = this;
+    }
+
+    private int mItemID; // 检查项目的编号 1-12
+    private bool mNormal = true; //是否正常
+    private string mOutliers = ""; // 标签
+    private int mInspectionId; // 巡检编号，巡检开始时返回的id
+
+    public void Set()
+    {
+        this.GetService<IInspectionService>().Set(mItemID, mNormal, mOutliers, mInspectionId);
+    }
+
+    public void InitData(int ItemID, int InspectionId, InspectionStep InspectionStep = null)
+    {
+        mItemID = ItemID;
+        mInspectionId = InspectionId;
+        if (InspectionStep != null)
+        {
+            if (InspectionStep.normal)
+                NormalClick();
+            else
+                WarningClick();
+            if (!string.IsNullOrWhiteSpace(InspectionStep.outliers))
+            {
+                LabelText_Input.text = InspectionStep.outliers;
+                mOutliers = InspectionStep.outliers;
+            }
+        }
+    }
+
+    private float mErrorBtn_go_offset = 319;
+    public void SetlabelBtnCount(string[] labelList)
+    {
+        foreach(string label in labelList)
+        {
+            GameObject go = Instantiate(mErrorBtn_go,mErrorBtn_go.transform.parent);
+            go.GetComponentInChildren<TMP_Text>().text = label;
+            go.name = label;
+            Vector3 v3 = mErrorBtn_go.transform.localPosition;
+            v3.x += mErrorBtn_go_offset;
+            go.transform.localPosition = v3;
+            go.SetActive(true);
+            go.GetComponent<Button>().onClick.AddListener(()=>
+            {
+                LabelText_Input.text += go.name;
+                mOutliers = LabelText_Input.text;
+            });
+        }
+    }
+
+    public void SetLabel(string Label)
+    {
+        mOutliers = Label;
+    }
+
+    private void NormalClick()
+    {
+        NormalBG1_go.SetActive(true);
+        NormalBG2_go.SetActive(false);
+        WarningBG1_go.SetActive(false);
+        WarningBG2_go.SetActive(true);
+        NormalPanel_go.SetActive(true);
+        WarningPanel_go.SetActive(false);
+        mNormal = true;
+    }
+
+    private void WarningClick()
+    {
+        NormalBG1_go.SetActive(false);
+        NormalBG2_go.SetActive(true);
+        WarningBG1_go.SetActive(true);
+        WarningBG2_go.SetActive(false);
+        NormalPanel_go.SetActive(false);
+        WarningPanel_go.SetActive(true);
+        mNormal = false;
+    }
+}

Assets/Game/Blue/Controller/Item/ShowXunJian_UIItem.cs.meta

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

Assets/Game/Blue/GHZLangChao.cs

@@ -21,6 +21,7 @@ namespace GHZLangChao
             this.RegisterService<IRTCService>(new RTCService());
             this.RegisterService<ISignallingService>(new SignallingService());
             this.RegisterService<ISendLogService>(new SendLogService());
+            this.RegisterService<IInspectionService>(new InspectionService());
         }
 
         private void RegisterUtility()

Assets/Game/Blue/RTC/ContactsInfo.cs.meta → Assets/Game/Blue/RTC/Info/ContactsInfo.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dbac058190e52bb48b39c517dfd82a3f
+guid: a246fa19c619eb64f93df7d21214f3ad
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Game/Blue/RTC/Info/InspectionInfo.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+/// <summary>
+/// 巡检
+/// </summary>
+[Serializable]
+public class InspectionInfo
+{
+    public int id; // 本次巡检ID
+    public Dictionary<string,InspectionItem> items;
+    public Dictionary<string,InspectionStep> steps;
+}
+
+[Serializable]
+public class InspectionItem
+{
+    public string name; // 巡检项名称
+    public string question; // 巡检项的问题
+    public string[] label; // 标签列表
+}
+
+[Serializable]
+public class InspectionStep
+{
+    public bool normal; // 是否正常
+    public string outliers; // 标签信息
+    public string[] images; // 图片
+}

Assets/Game/Blue/RTC/Info/InspectionInfo.cs.meta

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

Assets/Game/Blue/RTC/Service/InspectionService.cs

@@ -0,0 +1,61 @@
+using Blue;
+using LitJson;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+
+public class InspectionService : IInspectionService
+{
+    public InspectionInfo InspectionInfo { get; private set; }
+
+    public void OnInit()
+    {
+
+    }
+
+    public void Get()
+    {
+        CoroutineSystem.Instance.StartCoroutine(
+            HttpTool.Instance.SendHttp(HttpActionLang.inspection_begin, "", message =>
+            {
+                JObject jobject = JObject.Parse(message);
+                if (jobject["code"].ToString() == "200" && !string.IsNullOrWhiteSpace(jobject["data"].ToString()))
+                {
+                    Debug.LogError("data:" + jobject["data"].ToString());
+                    InspectionInfo = JsonConvert.DeserializeObject<InspectionInfo>(jobject["data"].ToString());
+                    /*
+                    Debug.LogError($"ID:{InspectionInfo.id}");
+                    foreach (var item in InspectionInfo.items)
+                    {
+                        Debug.LogError($"key:{item.Key},Value:{item.Value}");
+                    }
+                    Debug.LogError($"Steps:{InspectionInfo.steps.Count}");
+                    foreach (var item in InspectionInfo.steps)
+                    {
+                        Debug.LogError($"key:{item.Key}");
+                        Debug.LogError($"normal:{item.Value.normal}");
+                        Debug.LogError($"lable:{item.Value.label}");
+                        Debug.LogError($"images:{item.Value.images}");
+                    }
+                    */
+                }
+            }));
+    }
+
+    public void Set(int ItemID,bool Normal,string Label,int InspectionId)
+    {
+        JsonData data = new JsonData();
+        data["itemId"] = ItemID;
+        data["normal"] = Normal;
+        data["outliers"] = Label;
+        data["inspectionId"] = InspectionId;
+        CoroutineSystem.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.inspection_step, data.ToJson(), message =>
+        {
+            JObject jobject = JObject.Parse(message);
+            if (jobject["code"].ToString() == "200" && !string.IsNullOrWhiteSpace(jobject["data"].ToString()))
+            {
+                //Debug.LogError($"Message:{message}+finished:{jobject["data"]["finished"]}");
+            }
+        }));
+    }
+}

Assets/Game/Blue/RTC/Service/InspectionService.cs.meta

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

Assets/Game/Blue/RTC/Service/接口.meta

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

Assets/Game/Blue/RTC/Service/接口/IInspectionService.cs

@@ -0,0 +1,8 @@
+using Blue;
+
+public interface IInspectionService : IService
+{
+    InspectionInfo InspectionInfo { get; }
+    void Get();
+    void Set(int ItemID,bool Normal,string Label,int InspectionId);
+}

Assets/Game/Blue/RTC/Service/接口/IInspectionService.cs.meta

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

Assets/Game/Blue/RTC/Service/IRTCService.cs.meta → Assets/Game/Blue/RTC/Service/接口/IRTCService.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6fd44777e99f7f743baf87b49565d655
+guid: c54a73e3f159b354a8a44e41a15880d7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Game/Blue/RTC/Service/ISignallingService.cs.meta → Assets/Game/Blue/RTC/Service/接口/ISignallingService.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2d3fe64e99bf6cd4c8c71cfa2438a1fd
+guid: dc5a5983f7795224cb3c44cb10ab9506
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Game/PrefabTemplate/借用_XunjianToogleUI.prefab

@@ -385,7 +385,7 @@ RectTransform:
   - {fileID: 975195066659560577}
   - {fileID: 975195068466191497}
   m_Father: {fileID: 426336088900465281}
-  m_RootOrder: 4
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -769,6 +769,141 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -398}
   m_SizeDelta: {x: 1096, y: 553.47}
   m_Pivot: {x: 0, y: 1}
+--- !u!1 &1620012128636858333
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7710480350074813704}
+  - component: {fileID: 316303798191287414}
+  - component: {fileID: 1055929084722654153}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7710480350074813704
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620012128636858333}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 292977685651934832}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &316303798191287414
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620012128636858333}
+  m_CullTransparentMesh: 1
+--- !u!114 &1055929084722654153
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620012128636858333}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\u95E8\u7A97\u7834\u635F"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 53b37c1f568195149b410dacded90c09, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 53b37c1f568195149b410dacded90c09, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 60
+  m_fontSizeBase: 60
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 0
+  m_fontSizeMax: 0
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 4096
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &1665478907277382121
 GameObject:
   m_ObjectHideFlags: 0
@@ -904,6 +1039,152 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &1787561885454903764
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 292977685651934832}
+  - component: {fileID: 5608431096545896889}
+  - component: {fileID: 1882630950775925274}
+  - component: {fileID: 7828552023725679642}
+  m_Layer: 5
+  m_Name: Error_Btn (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &292977685651934832
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787561885454903764}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7710480350074813704}
+  m_Father: {fileID: 426336088900465281}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 372, y: 94}
+  m_SizeDelta: {x: 300, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5608431096545896889
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787561885454903764}
+  m_CullTransparentMesh: 1
+--- !u!114 &1882630950775925274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787561885454903764}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 4715960795a096d49baddcc42518441c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7828552023725679642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787561885454903764}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1882630950775925274}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 975195068224255630}
+        m_TargetAssemblyTypeName: SC.XR.Unity.SCInputField, Assembly-CSharp
+        m_MethodName: set_text
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: "\u95E8\u7A97\u7834\u635F"
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 8966606207285345890}
+        m_TargetAssemblyTypeName: ShowXunJian_UIItem, Assembly-CSharp
+        m_MethodName: SetLabel
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: "\u95E8\u7A97\u7834\u635F"
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &2069637635460717687
 GameObject:
   m_ObjectHideFlags: 0
@@ -1700,79 +1981,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3048334072771790211}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 5437390303013259983}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 4426317161651723890}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 2786768829415089053}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 7584859786364747502}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 1268108450370532904}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 3706178895091204087}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
+      m_Calls: []
 --- !u!1 &2786768829415089053
 GameObject:
   m_ObjectHideFlags: 0
@@ -2094,7 +2303,7 @@ RectTransform:
   - {fileID: 443678400480800778}
   - {fileID: 6478760537675272447}
   m_Father: {fileID: 426336088900465281}
-  m_RootOrder: 3
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2862,6 +3071,152 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4751438644437779260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1769505359654222316}
+  - component: {fileID: 1396601645124191864}
+  - component: {fileID: 1901988537819806534}
+  - component: {fileID: 7290336171566520708}
+  m_Layer: 5
+  m_Name: Error_Btn (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1769505359654222316
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4751438644437779260}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6979760688328333755}
+  m_Father: {fileID: 426336088900465281}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -266, y: 94}
+  m_SizeDelta: {x: 300, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1396601645124191864
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4751438644437779260}
+  m_CullTransparentMesh: 1
+--- !u!114 &1901988537819806534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4751438644437779260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 4715960795a096d49baddcc42518441c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7290336171566520708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4751438644437779260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1901988537819806534}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 975195068224255630}
+        m_TargetAssemblyTypeName: SC.XR.Unity.SCInputField, Assembly-CSharp
+        m_MethodName: set_text
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: "\u95E8\u7981\u5931\u7075"
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 8966606207285345890}
+        m_TargetAssemblyTypeName: ShowXunJian_UIItem, Assembly-CSharp
+        m_MethodName: SetLabel
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: "\u95E8\u7981\u5931\u7075"
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4884044017604430186
 GameObject:
   m_ObjectHideFlags: 0
@@ -3270,79 +3625,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 4823698988958155518}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2786768829415089053}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 7584859786364747502}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 5437390303013259983}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 4426317161651723890}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 1268108450370532904}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 3706178895091204087}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!1 &5715736191571057667
 GameObject:
   m_ObjectHideFlags: 0
@@ -3818,6 +4101,8 @@ RectTransform:
   - {fileID: 273424252448019309}
   - {fileID: 6088361386184106886}
   - {fileID: 1405034866829593793}
+  - {fileID: 292977685651934832}
+  - {fileID: 1769505359654222316}
   - {fileID: 3461209586397352647}
   - {fileID: 975195068224255629}
   m_Father: {fileID: 4751524369283230363}
@@ -4031,7 +4316,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6088361386184106886
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4050,7 +4335,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -266, y: 94}
+  m_AnchoredPosition: {x: -585, y: 94}
   m_SizeDelta: {x: 300, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3358976647464937657
@@ -4134,19 +4419,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5089669961876050262}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 975195068224255630}
-        m_TargetAssemblyTypeName: SC.XR.Unity.SCInputField, Assembly-CSharp
-        m_MethodName: set_text
-        m_Mode: 5
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: "\u95E8\u7981\u5931\u7075"
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!1 &7541715656771924501
 GameObject:
   m_ObjectHideFlags: 0
@@ -4156,6 +4429,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5928046332936845299}
+  - component: {fileID: 8966606207285345890}
   m_Layer: 5
   m_Name: "\u501F\u7528_XunjianToogleUI"
   m_TagString: Untagged
@@ -4189,6 +4463,28 @@ RectTransform:
   m_AnchoredPosition: {x: 8.297363, y: -933.74414}
   m_SizeDelta: {x: 1096, y: 1384}
   m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &8966606207285345890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7541715656771924501}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mNormal_Btn: {fileID: 4736414394839638515}
+  Warning_Btn: {fileID: 2398182161521905652}
+  NormalBG1_go: {fileID: 2786768829415089053}
+  NormalBG2_go: {fileID: 7584859786364747502}
+  WarningBG1_go: {fileID: 5437390303013259983}
+  WarningBG2_go: {fileID: 4426317161651723890}
+  NormalPanel_go: {fileID: 1268108450370532904}
+  WarningPanel_go: {fileID: 3706178895091204087}
+  LabelText_Input: {fileID: 975195068224255630}
+  mErrorBtn_go: {fileID: 7477279148625475104}
 --- !u!1 &7584859786364747502
 GameObject:
   m_ObjectHideFlags: 0
@@ -4418,7 +4714,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1405034866829593793
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4534,3 +4830,150 @@ MonoBehaviour:
           m_StringArgument: "\u95E8\u7A97\u7834\u635F"
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 8966606207285345890}
+        m_TargetAssemblyTypeName: ShowXunJian_UIItem, Assembly-CSharp
+        m_MethodName: SetLabel
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: "\u95E8\u7A97\u7834\u635F"
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!1 &8426859253182461188
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6979760688328333755}
+  - component: {fileID: 8692520412634995719}
+  - component: {fileID: 3287434331753710098}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6979760688328333755
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8426859253182461188}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1769505359654222316}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8692520412634995719
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8426859253182461188}
+  m_CullTransparentMesh: 1
+--- !u!114 &3287434331753710098
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8426859253182461188}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\u95E8\u7981\u5931\u7075"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 53b37c1f568195149b410dacded90c09, type: 2}
+  m_sharedMaterial: {fileID: 1738077909898060448, guid: 53b37c1f568195149b410dacded90c09, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 60
+  m_fontSizeBase: 60
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 0
+  m_fontSizeMax: 0
+  m_fontStyle: 1
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 4096
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/Game/ShowChoose/ChooseManager.cs

@@ -31,12 +31,14 @@ public class ChooseManager : MonoBehaviour,IController
         SceneIOCContainer.Instance.Push("ShowChoose",gameObject);
     }
 
-
     public void GotoXunJian()
     {
-        Debug.Log("DGJ   =====>GotoXunJian ");
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowXunJian);
     }
+    public void GetInspectionInfo()
+    {
+        this.GetService<IInspectionService>().Get();
+    }
 
     public void GotoSupport()
     {

Assets/Game/ShowChoose/ShowChoose.prefab

@@ -971,6 +971,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
+      - m_Target: {fileID: 6765360492072433445}
+        m_TargetAssemblyTypeName: ChooseManager, Assembly-CSharp
+        m_MethodName: GetInspectionInfo
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!114 &5426948904277699625
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2797,6 +2809,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5466424356445212017}
     m_Modifications:
+    - target: {fileID: 1010238914566425220, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1207.4
+      objectReference: {fileID: 0}
     - target: {fileID: 1010238914566425220, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -0.00018692
@@ -2863,11 +2879,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3099425425039806295, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1096
+      value: 1207.398
       objectReference: {fileID: 0}
     - target: {fileID: 3099425425039806295, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 833.0936
+      value: 833.094
       objectReference: {fileID: 0}
     - target: {fileID: 3099425425039806295, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_LocalScale.x
@@ -2911,11 +2927,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3099425425039806295, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 214.28
+      value: 176.576
       objectReference: {fileID: 0}
     - target: {fileID: 3099425425039806295, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 343.01
+      value: 202
       objectReference: {fileID: 0}
     - target: {fileID: 3099425425039806295, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2941,6 +2957,10 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: 783c52eb68a339f45a4d6065637055f1, type: 3}
+    - target: {fileID: 7210159607545658313, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
+      propertyPath: m_Color.a
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8611997968110666693, guid: 5737d81e5a250f240bcb0e4487c44eab, type: 3}
       propertyPath: m_text
       value: "\u786E\u8BA4"

Assets/Game/ShowSupport/SupportControl.cs

@@ -89,7 +89,7 @@ public class SupportControl : AbstractController
     {
         this.GetService<IRTCService>().CreatRoom();
         this.GetService<ISignallingService>().GetContacts();
-        ShowRTC.Instance.gotoWindow(ScenesManager.SceneType.ShowRTCRoomMain);
+        //ShowRTC.Instance.gotoWindow(ScenesManager.SceneType.ShowRTCRoomMain);
     }
 
     public void showRTC_Old()

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -7343,6 +7343,85 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
+  currentUIItem: {fileID: 0}
+  ItemNameTextList:
+  - {fileID: 1108556361098302881}
+  - {fileID: 5578992365418269874}
+  - {fileID: 350554453524060364}
+  - {fileID: 8017251258063615830}
+  - {fileID: 5750478349983831807}
+  - {fileID: 5191857975224918786}
+  - {fileID: 7880433090434242046}
+  - {fileID: 5012569488979258061}
+  - {fileID: 5708620666799604968}
+  - {fileID: 2425041055149409573}
+  - {fileID: 5308546815089580366}
+  - {fileID: 3033017988206634415}
+  ItemUIList:
+  - {fileID: 9046107881272395890}
+  - {fileID: 1770364759701963663}
+  - {fileID: 2781480086400883408}
+  - {fileID: 4222892640498215885}
+  - {fileID: 3581982461422041316}
+  - {fileID: 3113506996989206780}
+  - {fileID: 1119476758374350171}
+  - {fileID: 4396322994990589370}
+  - {fileID: 3232216701983671128}
+  - {fileID: 4960524424786101809}
+  - {fileID: 2582839287413569977}
+  - {fileID: 5280637855194368859}
+  ItemList:
+  - {fileID: 7763566785233398428}
+  - {fileID: 1055558331154178401}
+  - {fileID: 3507825332461680702}
+  - {fileID: 3219294801409083683}
+  - {fileID: 2846912651789638154}
+  - {fileID: 4396331225887654418}
+  - {fileID: 1855113357669212085}
+  - {fileID: 3113502003708970836}
+  - {fileID: 4245946790082486710}
+  - {fileID: 5972005401477489887}
+  - {fileID: 3886491367239883607}
+  - {fileID: 6881247126363744693}
+  ErrorList:
+  - {fileID: 6053672281467557228}
+  - {fileID: 3603970006897154535}
+  - {fileID: 4883488550302773944}
+  - {fileID: 5020232335481831922}
+  - {fileID: 289626133959593108}
+  - {fileID: 3035199284885173637}
+  - {fileID: 543873977242889935}
+  - {fileID: 7400936416869441172}
+  - {fileID: 312209473167876308}
+  - {fileID: 5553404987895201780}
+  - {fileID: 1890747940843677788}
+  - {fileID: 5969850150932372651}
+  BGList:
+  - {fileID: 5239137886390108593}
+  - {fileID: 7322129455695766415}
+  - {fileID: 6794313221270148077}
+  - {fileID: 354958024822014578}
+  - {fileID: 1832088770238566233}
+  - {fileID: 4446753775582161199}
+  - {fileID: 204864077801872450}
+  - {fileID: 7047470594158263888}
+  - {fileID: 3200431603065844103}
+  - {fileID: 724376063075805614}
+  - {fileID: 7200429483367853791}
+  - {fileID: 7596015723358158666}
+  ToggleList:
+  - {fileID: 3758438073573469531}
+  - {fileID: 882334318961465518}
+  - {fileID: 1670905041986409536}
+  - {fileID: 1168300055294925045}
+  - {fileID: 5490159111610505997}
+  - {fileID: 1327757389734018311}
+  - {fileID: 7003487511216209553}
+  - {fileID: 8491867359598014758}
+  - {fileID: 4818844828754337451}
+  - {fileID: 1848223607491329095}
+  - {fileID: 1994716478973536713}
+  - {fileID: 2051214061360007007}
   mScreenshotSprite: {fileID: 21300000, guid: 72a6f38aacb371e4e808f9b74800e742, type: 3}
 --- !u!114 &2159527941179580181
 MonoBehaviour:
@@ -12167,6 +12246,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 5928046332936845299, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 1716559808239604990}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7763566785233398428 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 1716559808239604990}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9186213369687959275}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &7850443637750246994 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -12189,6 +12279,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &9046107881272395890 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 1716559808239604990}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &9186213369687959275 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -12814,6 +12915,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &5280637855194368859 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 2526749305664477143}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5456497382579299778 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -12830,6 +12942,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &6881247126363744693 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 2526749305664477143}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5456497382579299778}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &8166283555527811108 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5928046332936845299, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -13332,6 +13455,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &4960524424786101809 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 3354930566222420669}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5054892548769573032 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -13348,6 +13482,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &5972005401477489887 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 3354930566222420669}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5054892548769573032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &6174164038122479633 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -13987,6 +14132,17 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 4714476215182031984}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3113506996989206780 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 4714476215182031984}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &4201081971833718492 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -13998,6 +14154,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &4396331225887654418 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 4714476215182031984}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3009707803965623909}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &5746345800532836404 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1067969030643694660, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -14511,11 +14678,33 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &3232216701983671128 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5081022223307612116}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3326722668647542209 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 5081022223307612116}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &4245946790082486710 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5081022223307612116}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3326722668647542209}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &4441525747300705656 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -15034,6 +15223,17 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 5296338269116212533}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &2582839287413569977 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5296338269116212533}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &3210220417144609849 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7281372740226316556, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -15056,6 +15256,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &3886491367239883607 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5296338269116212533}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2389671934643066656}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &5139292947868031345 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1067969030643694660, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -15567,6 +15778,17 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 5530847345265116764}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &2781480086400883408 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5530847345265116764}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &3012105191862730576 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7281372740226316556, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -15578,6 +15800,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &3507825332461680702 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5530847345265116764}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2623358009041286217}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &4026665239435099376 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -16106,6 +16339,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &3219294801409083683 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5819481150947473217}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4065480701626697044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &3877127227114573389 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7281372740226316556, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -16122,6 +16366,17 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 5819481150947473217}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &4222892640498215885 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 5819481150947473217}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &5446097138026363849 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1969936950275804296, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -16624,6 +16879,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 5928046332936845299, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 6294529543701297462}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3113502003708970836 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 6294529543701297462}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4608069912426973987}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &3205080436665861018 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -16646,6 +16912,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &4396322994990589370 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 6294529543701297462}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4608069912426973987 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -17168,6 +17445,28 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &2846912651789638154 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 6624103663167251560}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3694083371494200957}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3581982461422041316 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 6624103663167251560}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3694083371494200957 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -17697,6 +17996,28 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
   m_PrefabInstance: {fileID: 7336758602486161879}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1119476758374350171 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 7336758602486161879}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1855113357669212085 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 7336758602486161879}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 970782443334194114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &2229693014097992571 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -18145,6 +18466,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &1055558331154178401 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8966606207285345890, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 8271371314433367811}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900622455174360342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dfc512df28703e348bf2f1078ba25147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &1712900091210032655 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7281372740226316556, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
@@ -18156,6 +18488,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &1770364759701963663 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7662955294641609868, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+  m_PrefabInstance: {fileID: 8271371314433367811}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1900622455174360342 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7541715656771924501, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}

Assets/Game/ShowXunJian/StartXunJian.cs

@@ -1,7 +1,9 @@
+using System.Collections.Generic;
 using Blue;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
+using TMPro;
 
 namespace GHZLangChao
 {
@@ -23,18 +25,44 @@ namespace GHZLangChao
         [SerializeField] private GameObject HomeEndUI_go;
         [SerializeField] private Button Titile_Btn;
 
-        public UnityEvent OnReset = new UnityEvent();
-        public UnityEvent OnRetract = new UnityEvent();
-        public UnityEvent OnExpand = new UnityEvent();
+        public UnityEvent OnReset = new UnityEvent(); // 重置事件
+        public UnityEvent OnRetract = new UnityEvent(); // 收起时事件
+        public UnityEvent OnExpand = new UnityEvent(); // 展开时事件
+
+        public ShowXunJian_UIItem currentUIItem; // 当前选中的Item
+        public ShowXunJian_UIItem LastUIItem; // 当前选中的Item
+
+
+        private IInspectionService mInspectionService;
+
+        public static StartXunJian Instance;
+        private void Awake()
+        {
+            Instance = this;
+        }
         void Start()
         {
             foreach (Button btn in ScreenshotBtnList)
             {
                 btn.onClick.AddListener(ClickScreenshot);
             }
+            foreach (Toggle toggle in ToggleList)
+            {
+                toggle.onValueChanged.AddListener(isOn =>
+                {
+                    if (isOn)
+                    {
+                        currentUIItem.Set();
+                    }
+                });
+            }
             SaveBtn.onClick.AddListener(ClickSave);
             Titile_Btn.onClick.AddListener(ClickTitle);
             //CancelBtn.onClick.AddListener(ClickCancel);
+
+            if (mInspectionService == null)
+                mInspectionService = this.GetService<IInspectionService>();
+            Init(mInspectionService.InspectionInfo);
         }
         private void Update()
         {
@@ -60,6 +88,39 @@ namespace GHZLangChao
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
         }
 
+        [SerializeField] private List<TMP_Text> ItemNameTextList = new List<TMP_Text>(); // 步骤名
+        [SerializeField] private List<TMP_Text> ItemUIList = new List<TMP_Text>(); // 步骤内+“是否正常”
+        [SerializeField] private List<ShowXunJian_UIItem> ItemList = new List<ShowXunJian_UIItem>(); // 每个步骤内的数据
+        [SerializeField] private List<GameObject> ErrorList = new List<GameObject>(); // 错误图标
+        [SerializeField] private List<GameObject> BGList = new List<GameObject>(); // 选中后图标 
+        [SerializeField] private List<Toggle> ToggleList = new List<Toggle>();
+
+        /// <summary>
+        /// 初始化界面数据
+        /// </summary>
+        public void Init(InspectionInfo InspectionInfo)
+        {
+            foreach (var item in InspectionInfo.items)
+            {
+                ItemNameTextList[int.Parse(item.Key) - 1].text = item.Value.name + "接口";
+                ItemUIList[int.Parse(item.Key) - 1].text = item.Key + "、" + item.Value.question;
+                if (InspectionInfo.steps.ContainsKey(item.Key)) //是否执行到此步骤
+                {
+                    ItemList[int.Parse(item.Key) - 1].InitData(int.Parse(item.Key), InspectionInfo.id, InspectionInfo.steps[item.Key]);
+                }
+                else
+                {
+                    ItemList[int.Parse(item.Key) - 1].InitData(int.Parse(item.Key), InspectionInfo.id);
+                }
+                ItemList[int.Parse(item.Key) - 1].SetlabelBtnCount(item.Value.label);
+            }
+            foreach (var step in InspectionInfo.steps)
+            {
+                BGList[int.Parse(step.Key) - 1].SetActive(true);
+                if (!step.Value.normal)
+                    ErrorList[int.Parse(step.Key) - 1].SetActive(true);
+            }
+        }
 
         #region 按钮点击
         [SerializeField] private Sprite mScreenshotSprite;
@@ -103,6 +164,7 @@ namespace GHZLangChao
 
         public void End()
         {
+            currentUIItem.Set();
             foreach (bool isOn in toggleBoolList)
             {
                 if (!isOn)
@@ -117,6 +179,7 @@ namespace GHZLangChao
 
         public void HomeEnd()
         {
+            currentUIItem.Set();
             foreach (bool isOn in toggleBoolList)
             {
                 if (!isOn)
@@ -137,7 +200,7 @@ namespace GHZLangChao
         private void ClickTitle()
         {
             isRetract = !isRetract;
-            if(isRetract)
+            if (isRetract)
                 OnRetract?.Invoke();
             else
                 OnExpand?.Invoke();

Assets/Scenes/LangChaoDemo2.unity

@@ -24045,7 +24045,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1746801817
 RectTransform:
   m_ObjectHideFlags: 0

Packages/manifest.json

@@ -1,7 +1,11 @@
 {
   "dependencies": {
+    "com.cysharp.unitask": "https://gogs.ghz-tech.com:8843/GHzGlass/UniTaskXR.git",
+    "com.unity.webrtc": "https://gogs.ghz-tech.com:8843/GHzGlass/WebRtcXR.git",
     "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git#EasyMovieTexture",
+    "com.ghz.login": "https://gogs.ghz-tech.com:8843/GHzGlass/LoginXR.git",
     "com.ghz.mqtt": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
+    "com.maxst.unilivekit": "https://gogs.ghz-tech.com:8843/GHzGlass/LiveKitXR.git",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",

Packages/packages-lock.json

@@ -1,5 +1,12 @@
 {
   "dependencies": {
+    "com.cysharp.unitask": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/UniTaskXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "808e4b7c6a70f8780c33d2a9db6e9c5283ee98bf"
+    },
     "com.ghz.avideoplayer": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git#EasyMovieTexture",
       "depth": 0,
@@ -7,6 +14,13 @@
       "dependencies": {},
       "hash": "ec4bb2403989db8a5f491f8a9d6e5ac7c1288a67"
     },
+    "com.ghz.login": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/LoginXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "24c5e9adfa0f8cc1e0e3e7f995d94d8671dad746"
+    },
     "com.ghz.mqtt": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
       "depth": 0,
@@ -14,12 +28,26 @@
       "dependencies": {},
       "hash": "238c8807d10555932c59dbd78f2b7f4a56faa07c"
     },
+    "com.maxst.unilivekit": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/LiveKitXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "b545405b16adb2a653aa290d099ca474cf1aa3c4"
+    },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {}
     },
+    "com.unity.editorcoroutines": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -121,6 +149,17 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.webrtc": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/WebRtcXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.editorcoroutines": "1.0.0",
+        "com.unity.modules.audio": "1.0.0"
+      },
+      "hash": "34e62101b53a32adbd5c5a86b84c73a7153c566b"
+    },
     "com.unity.xr.arcore": {
       "version": "4.2.8",
       "depth": 0,