新增假数据

Assets/FrameWork/ProjectManager/Image.prefab

@@ -11,13 +11,14 @@ GameObject:
   - component: {fileID: 7608598676142472618}
   - component: {fileID: 6399698229834585584}
   - component: {fileID: 6546605293001365448}
+  - component: {fileID: 4983239016688348473}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7608598676142472618
 RectTransform:
   m_ObjectHideFlags: 0
@@ -73,3 +74,15 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!114 &4983239016688348473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4458167396202558435}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/FrameWork/ProjectManager/Model.prefab

@@ -11,13 +11,14 @@ GameObject:
   - component: {fileID: 4980491567860670752}
   - component: {fileID: 8193688906978589056}
   - component: {fileID: 3114445212997545933}
+  - component: {fileID: 5787054142968232577}
   m_Layer: 5
   m_Name: Model
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4980491567860670752
 RectTransform:
   m_ObjectHideFlags: 0
@@ -74,6 +75,18 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!114 &5787054142968232577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2415235072230918127}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &512708586739425507
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -85,17 +98,41 @@ PrefabInstance:
       propertyPath: m_Name
       value: EarthCore
       objectReference: {fileID: 0}
+    - target: {fileID: 3299625430133236501, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3299625430133236501, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3299625430133236501, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1000
+      objectReference: {fileID: 0}
     - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: -104
       objectReference: {fileID: 0}
     - target: {fileID: 3299625430133236503, guid: d2623ff176304d74baa891dfa259bdb8, type: 3}
       propertyPath: m_LocalPosition.z

Assets/FrameWork/ProjectManager/Scripts/JinRuRenwu.cs

@@ -0,0 +1,196 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+using XRTool.Util;
+using static XunJianDataManager;
+
+public class JinRuRenwu : MonoBehaviour
+{
+    RenWuItem rwitem;
+    public GameObject WenJianLan;
+    public TextMeshProUGUI info;
+
+    public GameObject TaskGo;
+    public GameObject PaiZhaoGo;
+
+    public GameObject VideoBT;
+    public GameObject ModelBT;
+    public GameObject ImageBT;
+    public GameObject Image2BT;
+    public GameObject TextBT;
+
+    public GameObject AllBT;
+
+    public GameObject Video;
+    public GameObject Model;
+    public GameObject Image;
+    public GameObject Image2;
+    public GameObject Text;
+
+
+
+
+    public List<GameObject> updateList;
+
+    public GameObject kong;
+
+    private void OnEnable()
+    {
+        //RoadManager.Instance.gameObject.SetActive(true);
+        updateListRef();
+        TimerMgr.Instance.CreateTimer(()=> {
+
+            kong.SetActive(!kong.activeSelf);
+        },0.01f,6);
+        if(XunJianDataManager.Instance.chooseXunJian!=null)
+        updateData();
+    }
+    void updateData()
+    {
+        VideoBT.SetActive(false);
+        ModelBT.SetActive(false);
+        ImageBT.SetActive(false);
+        Image2BT.SetActive(false);
+        TextBT.SetActive(false);
+        rwitem = XunJianDataManager.Instance.GetRenWuItem(XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex]);
+        info.text = rwitem.info;
+        if (rwitem.typeList.Count > 0)
+        {
+            int img = 0;
+            for (int i = 0; i < rwitem.typeList.Count; i++)
+            {
+                switch (rwitem.typeList[i].type)
+                {
+                    case RenWuType.Image:
+                        if(img==0)
+                        {
+                            ImageBT.SetActive(true);
+                            Image.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
+                        }
+                        else
+                        {
+
+                            Image2BT.SetActive(false);
+                            Image2.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
+                        }
+                        img++;
+                        break;
+                    case RenWuType.Model:
+                        ModelBT.SetActive(true);
+                        Model.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
+                        break;
+                    case RenWuType.Text:
+                        TextBT.SetActive(true);
+                        Text.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
+                        break;
+                    case RenWuType.Video:
+                        VideoBT.SetActive(true);
+                        Video.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
+                        break;
+                }
+            }
+
+            if(rwitem.typeList.Count < 2)
+            {
+                AllBT.SetActive(false);
+            }else
+            {
+
+                AllBT.SetActive(true);
+            }
+
+            WenJianLan.SetActive(true);
+        }
+        else
+        {
+            WenJianLan.SetActive(false);
+        }
+    }
+    private void OnDisable()
+    {
+
+        //RoadManager.Instance.gameObject.SetActive(false);
+    }
+
+    public void showAll()
+    {
+        Text.SetActive(true);
+        Image.SetActive(true);
+        Image2.SetActive(true);
+        Model.SetActive(true);
+        Video.SetActive(true);
+        PaiZhaoGo.SetActive(true);
+    }
+
+    public void showText()
+    {
+        Text.SetActive(!Text.activeSelf);
+        Text.transform.SetAsFirstSibling();
+    }
+    public void showImage()
+    {
+
+        Image.SetActive(!Image.activeSelf);
+        Image.transform.SetAsFirstSibling();
+    }
+    public void showImage2()
+    {
+
+        Image2.SetActive(!Image2.activeSelf);
+        Image2.transform.SetAsFirstSibling();
+    }
+
+    public void showModel()
+    {
+
+        Model.SetActive(!Model.activeSelf);
+        Model.transform.SetAsFirstSibling();
+    }
+    public void showVideo()
+    {
+
+        Video.SetActive(!Video.activeSelf);
+        Video.transform.SetAsFirstSibling();
+    }
+
+    public void GotoPaiZhao()
+    {
+        PaiZhaoGo.SetActive(!PaiZhaoGo.activeSelf);
+    }
+
+    public void GotoTask()
+    {
+        TaskGo.SetActive(!TaskGo.activeSelf);
+    }
+
+    public void GotoLieBiao()
+    {
+        ProjectMainWindow.Instance.showXunJian();
+    }
+
+    public void updateListRef()
+    {
+        for (int i = updateList.Count-1; i >=0; i--)
+        {
+            if ((updateList[i].GetComponent<ContentSizeFitter>()))
+            {
+                updateList[i].GetComponent<ContentSizeFitter>().SetLayoutVertical();
+                updateList[i].GetComponent<ContentSizeFitter>().SetLayoutHorizontal();
+            }
+            if (updateList[i].GetComponent<HorizontalLayoutGroup>())
+            {
+                updateList[i].GetComponent<HorizontalLayoutGroup>().SetLayoutHorizontal();
+                updateList[i].GetComponent<HorizontalLayoutGroup>().CalculateLayoutInputHorizontal();
+
+            }
+            if ((updateList[i].GetComponent<VerticalLayoutGroup>()))
+            {
+
+                updateList[i].GetComponent<VerticalLayoutGroup>().SetLayoutVertical();
+                updateList[i].GetComponent<VerticalLayoutGroup>().CalculateLayoutInputVertical();
+            }
+        }
+    }
+}

Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -1,23 +1,165 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using XRTool.Util;
 
-public class XunJianDataManager : MonoSingleton<XunJianDataManager>
+public class XunJianDataManager : Singleton<XunJianDataManager>
 {
+    public XunJianListData chooseXunJian;
     public List<XunJianListData> xjDataList = new List<XunJianListData>();
 
-    public List<XunJianListData> GetXunJianList()
+    public Dictionary<string, RenWuItem> renwuItemList;
+    public void GetXunJianList(Action<List<XunJianListData>> callback)
     {
-        return new List<XunJianListData>();
+       WindowsManager.Instance.StartCoroutine(testBack(callback));
     }
+    IEnumerator testBack(Action<List<XunJianListData>> callback)
+    {
+        xjDataList = new List<XunJianListData>();
+        for (int i = 0; i < 7; i++)
+        {
+            XunJianListData xj = new XunJianListData();
+            xj.id = i.ToString();
+            xj.projectname = "projectname " + i.ToString();
+            xj.inarea = "inarea " + i.ToString();
+            xj.updateState = "updateState " + i.ToString();
+            xj.projectState = "projectState " + i.ToString();
+            xj.projectType = "projectType " + i.ToString();
+            xj.projectTime = "projectTime " + i.ToString();
+            switch(i)
+            {
+                case 0:
+                    xj.renwuModelType = RenWuModelType.DianYun;
+                    break;
+                case 1:
+                    xj.renwuModelType = RenWuModelType.DingWeiBan;
+                    break;
+                default:
+                    xj.renwuModelType = RenWuModelType.SaoTu;
+                    break;
+            }
+            xj.itemList = new List<string>();
+            for (int j = 0; j < 7; j++)
+            {
+                xj.itemList.Add(j.ToString());
+            }
+            xjDataList.Add(xj);
+        }
+        yield return null;
+        callback.Invoke(xjDataList);
+        GetXunJianItemList((Dictionary<string, RenWuItem> back) => { 
+        
+        
+        
+        });
+    }
+
+
+    public void GetXunJianItemList(Action<Dictionary<string, RenWuItem>> callback)
+    {
+        WindowsManager.Instance.StartCoroutine(testBack2(callback));
+    }
+    IEnumerator testBack2(Action<Dictionary<string,RenWuItem>> callback)
+    {
+        renwuItemList = new Dictionary<string, RenWuItem>();
+        for (int i = 0; i < 7; i++)
+        {
+            RenWuItem rw = new RenWuItem();
+            rw.id = i.ToString();
+            rw.index = i;
+            rw.info = "info" + i;
+            int randomInt = UnityEngine.Random.Range(0, 10);
+            rw.isPaiZhao = randomInt > 5 ? true : false;
+            int randomInt2 = UnityEngine.Random.Range(0, 10);
+            rw.isYuanChneg = randomInt2 > 5 ? true : false;
+            rw.typeList = new List<RenWuTypeModel>();
+
+            RenWuTypeModel rwtm = new RenWuTypeModel();
+            rwtm.id = "1";
+            rwtm.type = RenWuType.Image;
+            rwtm.url = "/renwuType/Image.png";
+            rw.typeList.Add(rwtm);
 
+
+            RenWuTypeModel rwtm2 = new RenWuTypeModel();
+            rwtm2.id = "2";
+            rwtm2.type = RenWuType.Video;
+            rwtm2.url = "/renwuType/Video.mp4";
+            rw.typeList.Add(rwtm2);
+
+            RenWuTypeModel rwtm3 = new RenWuTypeModel();
+            rwtm3.id = "2";
+            rwtm3.type = RenWuType.Model;
+            rwtm3.url = "/renwuType/Model.mp4";
+            rw.typeList.Add(rwtm3);
+
+            RenWuTypeModel rwtm4 = new RenWuTypeModel();
+            rwtm4.id = "2";
+            rwtm4.type = RenWuType.Text;
+            rwtm4.info = "Text12344566788";
+            rw.typeList.Add(rwtm4);
+
+            renwuItemList.Add(i.ToString(), rw);
+        }
+        yield return null;
+
+        callback?.Invoke(renwuItemList);
+    }
     public class XunJianListData
     {
+        public int nowIndex = 0;
+        public string id;
         public string projectname;
         public string inarea;
         public string updateState;
         public string projectState;
         public string projectType;
         public string projectTime;
+        public List<string> itemList;
+        public RenWuModelType renwuModelType;
+    }
+
+    public void GotoXunJian(XunJianListData xjld)
+    {
+        chooseXunJian = xjld;
+        WindowsManager.Instance.show(WindowConfig.windowType.XunJianStart);
+    }
+
+    public RenWuItem GetRenWuItem(string id)
+    {
+        return renwuItemList[id];
+    }
+
+    public class RenWuItem
+    {
+        public string id;
+        public int index;
+        public bool isPaiZhao;
+        public bool isYuanChneg;
+        public string info;
+        public List<RenWuTypeModel> typeList;
+
+    }
+    public class RenWuTypeModel
+    {
+        public RenWuType type;
+        public string id;
+        public string url;
+        public string info;
+    }
+
+    public enum RenWuType
+    {
+        Text = 100001, // 文字
+        Image = 100002, // 图片
+        Video = 100003, // 视频
+        Model = 100004, // 模型
+    }
+    public enum RenWuModelType
+    {
+        SaoTu = 100001, // 扫图
+        DingWeiBan = 100002, // 定位板
+        DianYun = 100003, // 点云
     }
 }

Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/进入任务.meta

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

Assets/FrameWork/ProjectManager/Text.prefab

@@ -13,13 +13,14 @@ GameObject:
   - component: {fileID: 581047748809393510}
   - component: {fileID: 5551775021085795401}
   - component: {fileID: 2229417628307891464}
+  - component: {fileID: 464504873149100750}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4560886240936283504
 RectTransform:
   m_ObjectHideFlags: 0
@@ -27,7 +28,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2240469572346570524}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -119,6 +120,18 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!114 &464504873149100750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2240469572346570524}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5530050303012494401
 GameObject:
   m_ObjectHideFlags: 0
@@ -153,10 +166,10 @@ RectTransform:
   m_Father: {fileID: 4560886240936283504}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 10, y: 0}
-  m_SizeDelta: {x: 555, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10, y: -10}
+  m_SizeDelta: {x: 555, y: 63.51}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5702499218529939106
 CanvasRenderer:

Assets/FrameWork/ProjectManager/Video.prefab

@@ -11,14 +11,14 @@ GameObject:
   - component: {fileID: 7255333946027317694}
   - component: {fileID: 6848787593610870211}
   - component: {fileID: 5759322430622227990}
-  - component: {fileID: 8244603453399750182}
+  - component: {fileID: 6375102404521121725}
   m_Layer: 5
   m_Name: Video
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7255333946027317694
 RectTransform:
   m_ObjectHideFlags: 0
@@ -67,45 +67,22 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 0}
+  m_Texture: {fileID: 8400000, guid: b33f6232f2309094cba123aa1ce4e3bf, type: 2}
   m_UVRect:
     serializedVersion: 2
     x: 0
     y: 0
     width: 1
     height: 1
---- !u!328 &8244603453399750182
-VideoPlayer:
+--- !u!114 &6375102404521121725
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2413293942919352051}
   m_Enabled: 1
-  m_VideoClip: {fileID: 32900000, guid: 09c406a2471014446a7c62dc77cf4dd9, type: 3}
-  m_TargetCameraAlpha: 1
-  m_TargetCamera3DLayout: 0
-  m_TargetCamera: {fileID: 0}
-  m_TargetTexture: {fileID: 0}
-  m_TimeReference: 0
-  m_TargetMaterialRenderer: {fileID: 0}
-  m_TargetMaterialProperty: <noninit>
-  m_RenderMode: 2
-  m_AspectRatio: 2
-  m_DataSource: 0
-  m_PlaybackSpeed: 1
-  m_AudioOutputMode: 2
-  m_TargetAudioSources:
-  - {fileID: 0}
-  m_DirectAudioVolumes:
-  - 1
-  m_Url: 
-  m_EnabledAudioTracks: 01
-  m_DirectAudioMutes: 00
-  m_ControlledAudioTrackCount: 1
-  m_PlayOnAwake: 1
-  m_SkipOnDrop: 1
-  m_Looping: 0
-  m_WaitForFirstFrame: 1
-  m_FrameReadyEventEnabled: 0
-  m_VideoShaders: []
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/FrameWork/ProjectManager/XunJian/列表模块/列表模块.prefab

@@ -468,6 +468,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1854011766680714898}
+  - component: {fileID: 5885534542193492986}
   m_Layer: 5
   m_Name: "\u5217\u8868\u6A21\u5757"
   m_TagString: Untagged
@@ -498,6 +499,20 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5885534542193492986
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 652535197827063607}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21c40cd618bfedd4994342e2947bbf64, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  parentGo: {fileID: 8610976162778903711}
+  itemList: []
 --- !u!1 &690978120645101105
 GameObject:
   m_ObjectHideFlags: 0
@@ -646,7 +661,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 120, y: 56}
+  m_SizeDelta: {x: 42.5, y: 56}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2381855711151854591
 CanvasRenderer:
@@ -703,8 +718,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 45
+  m_fontSizeBase: 45
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -739,7 +754,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: -161.10645, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -3246,7 +3261,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 120, y: 56}
+  m_SizeDelta: {x: 180, y: 56}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1874639643973739964
 CanvasRenderer:
@@ -3303,8 +3318,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 45
+  m_fontSizeBase: 45
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -4318,7 +4333,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 85, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &4594328452210515319
@@ -4581,7 +4596,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 350, y: 56}
+  m_SizeDelta: {x: 262.8, y: 56}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4529101201490287336
 CanvasRenderer:
@@ -4638,8 +4653,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 45
+  m_fontSizeBase: 45
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -4674,7 +4689,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: -183.22192, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -5079,7 +5094,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4965106398281372838}
-  - {fileID: 8442572400337192549}
+  - {fileID: 6909653917911400815}
   m_Father: {fileID: 4499540451088493367}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5535,7 +5550,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 120, y: 56}
+  m_SizeDelta: {x: 75, y: 56}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6212093495097558768
 CanvasRenderer:
@@ -5592,8 +5607,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 45
+  m_fontSizeBase: 45
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -5628,7 +5643,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: -147.34302, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -6749,8 +6764,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 45
+  m_fontSizeBase: 45
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -7741,7 +7756,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 120, y: 56}
+  m_SizeDelta: {x: 180, y: 56}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1267549482602457202
 CanvasRenderer:
@@ -7798,8 +7813,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 30
+  m_fontSize: 45
+  m_fontSizeBase: 45
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -8230,7 +8245,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 790570110717618169}
-  - {fileID: 4990685554793548739}
   m_Father: {fileID: 9164797641204290648}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8254,10 +8268,10 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
+    m_Top: 30
     m_Bottom: 30
   m_ChildAlignment: 0
-  m_Spacing: 0
+  m_Spacing: 15
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -9260,200 +9274,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
   m_PrefabInstance: {fileID: 3224853542018863665}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &5925610815745648762
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 627361399737624296}
-    m_Modifications:
-    - target: {fileID: 84005106427803231, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 84005106427803231, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 84005106427803231, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 84005106427803231, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1306434463556275609, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1306434463556275609, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1306434463556275609, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 2250.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 56
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2178372261103610537, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2178372261103610537, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2178372261103610537, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2178372261103610537, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2998635005852785804, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2998635005852785804, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2998635005852785804, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2998635005852785804, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7218987032283759202, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_Name
-      value: "\u6807\u9898"
-      objectReference: {fileID: 0}
-    - target: {fileID: 8055514334376918543, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8055514334376918543, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8055514334376918543, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8055514334376918543, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8209457683821730707, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8209457683821730707, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8209457683821730707, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8209457683821730707, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
---- !u!224 &4990685554793548739 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
-  m_PrefabInstance: {fileID: 5925610815745648762}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7085164331360478684
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9605,6 +9425,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -28
       objectReference: {fileID: 0}
+    - target: {fileID: 4447175759588271283, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7218987032283759202, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
       propertyPath: m_Name
       value: "\u6807\u9898"
@@ -9643,8 +9467,8 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
---- !u!224 &8442572400337192549 stripped
+--- !u!224 &6909653917911400815 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1691530150620947385, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
+  m_CorrespondingSourceObject: {fileID: 4447175759588271283, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
   m_PrefabInstance: {fileID: 7085164331360478684}
   m_PrefabAsset: {fileID: 0}

Assets/FrameWork/ProjectManager/XunJian/巡检项目.prefab

@@ -49,4 +49,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf4a7ca53aab73d4e972a0cdc744b457, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: 

Assets/FrameWork/ProjectManager/XunJian/进入任务/进入任务.prefab

@@ -53,11 +53,20 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bfc738a675d7b7a498af2482edf55d6a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  WenJianLan: {fileID: 2119617612598299047}
+  info: {fileID: 4732659491318721292}
   TaskGo: {fileID: 1133988090103490238}
   PaiZhaoGo: {fileID: 1602132266952499102}
+  VideoBT: {fileID: 5961737187245328613}
+  ModelBT: {fileID: 3035996216676226476}
+  ImageBT: {fileID: 2526870773437298684}
+  Image2BT: {fileID: 8843594528309396695}
+  TextBT: {fileID: 5032695721807427012}
+  AllBT: {fileID: 8976767908154181459}
   Video: {fileID: 8690263258676728082}
   Model: {fileID: 2522627176468705619}
   Image: {fileID: 1745053953211840778}
+  Image2: {fileID: 5832889701450925646}
   Text: {fileID: 6256073840031086573}
   updateList:
   - {fileID: 8404956001066638350}
@@ -101,6 +110,7 @@ RectTransform:
   - {fileID: 4400581250321736897}
   - {fileID: 7071973508610505565}
   - {fileID: 3652965086252367011}
+  - {fileID: 4110988468234863099}
   - {fileID: 2149561321449449202}
   - {fileID: 5876131396634548044}
   - {fileID: 8642210197716912206}
@@ -386,7 +396,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8539070734399644934}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1853,6 +1863,79 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2302547886377046790
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1709045177116960846}
+  - component: {fileID: 2501622236137551832}
+  - component: {fileID: 4743362197032102501}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1709045177116960846
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2302547886377046790}
+  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: 4110988468234863099}
+  m_RootOrder: 0
+  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: -45.6, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2501622236137551832
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2302547886377046790}
+  m_CullTransparentMesh: 1
+--- !u!114 &4743362197032102501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2302547886377046790}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 3364494b65d2c4a4cb904df05dc78459, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &2407144112196098143
 GameObject:
   m_ObjectHideFlags: 0
@@ -2103,7 +2186,7 @@ RectTransform:
   - {fileID: 8309953314668886620}
   - {fileID: 4179957076276521030}
   m_Father: {fileID: 8539070734399644934}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3313,7 +3396,7 @@ RectTransform:
   - {fileID: 5179722281126086159}
   - {fileID: 7400988319219844620}
   m_Father: {fileID: 8539070734399644934}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4477,6 +4560,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1941495110105555512}
   - component: {fileID: 7232986772469128766}
+  - component: {fileID: 4402741054232071158}
   m_Layer: 5
   m_Name: "\u4EFB\u52A1"
   m_TagString: Untagged
@@ -4534,6 +4618,18 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!114 &4402741054232071158
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7829472139561806699}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 639498abd949fe645a7e24d02a20479a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8058874369235617831
 GameObject:
   m_ObjectHideFlags: 0
@@ -4611,6 +4707,7 @@ RectTransform:
   m_Children:
   - {fileID: 4420183677033236063}
   - {fileID: 5511868129926330179}
+  - {fileID: 340916537086920711}
   - {fileID: 5159099031647131548}
   - {fileID: 8542819322292739457}
   m_Father: {fileID: 1941495110105555512}
@@ -4795,6 +4892,141 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &8490804794974359596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5934445610933777595}
+  - component: {fileID: 914558091244480567}
+  - component: {fileID: 167405425553777157}
+  m_Layer: 5
+  m_Name: "\u56FE\u7247"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5934445610933777595
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8490804794974359596}
+  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: 4110988468234863099}
+  m_RootOrder: 1
+  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: 0, y: 0}
+  m_SizeDelta: {x: 58.6, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &914558091244480567
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8490804794974359596}
+  m_CullTransparentMesh: 1
+--- !u!114 &167405425553777157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8490804794974359596}
+  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: "\u56FE\u7247"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, 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: 20
+  m_fontSizeBase: 20
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  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: 1
+  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 &8552327799105762122
 GameObject:
   m_ObjectHideFlags: 0
@@ -4928,6 +5160,7 @@ GameObject:
   - component: {fileID: 1848572066030707115}
   - component: {fileID: 7988796424969428945}
   - component: {fileID: 1419059507492043377}
+  - component: {fileID: 2161813774445057044}
   m_Layer: 5
   m_Name: "\u83DC\u5355"
   m_TagString: Untagged
@@ -4994,6 +5227,62 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2161813774445057044
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8651246719908619597}
+  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: 1419059507492043377}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 92646644269697503}
+        m_TargetAssemblyTypeName: 
+        m_MethodName: 
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &8660194411806878606
 GameObject:
   m_ObjectHideFlags: 0
@@ -5183,6 +5472,101 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!1 &8843594528309396695
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4110988468234863099}
+  - component: {fileID: 3519941393662929980}
+  m_Layer: 5
+  m_Name: "\u56FE\u7247"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4110988468234863099
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8843594528309396695}
+  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: 1709045177116960846}
+  - {fileID: 5934445610933777595}
+  m_Father: {fileID: 8539070734399644934}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 38}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3519941393662929980
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8843594528309396695}
+  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: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 3970750464468428354}
+        m_TargetAssemblyTypeName: JinRuRenwu, Assembly-CSharp
+        m_MethodName: showImage2
+        m_Mode: 1
+        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
 --- !u!1 &8976767908154181459
 GameObject:
   m_ObjectHideFlags: 0
@@ -5289,38 +5673,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: Model
       objectReference: {fileID: 0}
-    - target: {fileID: 2415235072230918127, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923316, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1000
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923316, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1000
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923316, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1000
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923316, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -104
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923318, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923318, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3086969497165923318, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 4980491567860670752, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -5331,7 +5683,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4980491567860670752, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 4980491567860670752, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
       propertyPath: m_AnchorMax.x
@@ -5632,10 +5984,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: Image
       objectReference: {fileID: 0}
-    - target: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -6049,10 +6397,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u4EFB\u52A1\u8BE6\u60C5"
       objectReference: {fileID: 0}
-    - target: {fileID: 2240469572346570524, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4560886240936283504, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
       propertyPath: m_Pivot.x
       value: 0
@@ -6063,7 +6407,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4560886240936283504, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 4560886240936283504, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
       propertyPath: m_AnchorMax.x
@@ -6137,26 +6481,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6928977368033764444, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6928977368033764444, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6928977368033764444, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 63.51
-      objectReference: {fileID: 0}
-    - target: {fileID: 6928977368033764444, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 6928977368033764444, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -10
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
 --- !u!1 &6256073840031086573 stripped
@@ -6282,14 +6606,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: Video
       objectReference: {fileID: 0}
-    - target: {fileID: 2413293942919352051, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5759322430622227990, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
-      propertyPath: m_Texture
-      value: 
-      objectReference: {fileID: 8400000, guid: b33f6232f2309094cba123aa1ce4e3bf, type: 2}
     - target: {fileID: 7255333946027317694, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -6374,10 +6690,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8244603453399750182, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
-      propertyPath: m_TargetTexture
-      value: 
-      objectReference: {fileID: 8400000, guid: b33f6232f2309094cba123aa1ce4e3bf, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
 --- !u!224 &4420183677033236063 stripped
@@ -6492,3 +6804,110 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 5316455699584253958, guid: 423e9aacca29f7d408a532074e0a92b2, type: 3}
   m_PrefabInstance: {fileID: 7637161214018163824}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7866664744296773037
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1363556228952835098}
+    m_Modifications:
+    - target: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_Name
+      value: Image
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 640
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 480
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 320
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -240
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+--- !u!224 &340916537086920711 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+  m_PrefabInstance: {fileID: 7866664744296773037}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5832889701450925646 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+  m_PrefabInstance: {fileID: 7866664744296773037}
+  m_PrefabAsset: {fileID: 0}

Assets/FrameWork/Scripts/Window/WindowsManager.cs

@@ -239,7 +239,6 @@ public class WindowsManager : MonoSingleton<WindowsManager>
         {
             if (list[i].type == wt)
             {
-                Debug.Log(" ´ò¿ª===¡·" + list[i].type);
                 list[i].window.SetActive(true) ;
             }
             else
@@ -256,7 +255,6 @@ public class WindowsManager : MonoSingleton<WindowsManager>
                     }
                     if(!isShow)
                     {
-                        Debug.Log(" ¹Ø±Õ===¡·"+ list[i].type);
                         list[i].window.SetActive(false);
                     }
                 }

Assets/FrameWork/Scripts/WindowSingleton.cs

@@ -3,7 +3,7 @@
 
 public abstract class WindowSingleton<T> : MonoBehaviour where T : MonoBehaviour
 {
-    public string data;
+    //public string data;
     static T instance;
     protected bool _isInit = false;
     public static T Instance
@@ -31,9 +31,8 @@ public abstract class WindowSingleton<T> : MonoBehaviour where T : MonoBehaviour
 
     }
 
-    public virtual void UpdateData(string data)
+    public virtual void UpdateData()
     {
-        this.data = data;
     }
 
     public virtual void OnEnable()

Assets/FrameWork/WindowsItem.asset

@@ -23,3 +23,7 @@ MonoBehaviour:
     - name: UserIcon
       obj: {fileID: 2484990173723969103, guid: 6a6629d77ac61824b8ac356d448e69cc, type: 3}
     type: 100001
+  - PrefabList:
+    - name: liebiao
+      obj: {fileID: 7599535087301401002, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
+    type: 200001

Assets/JinRuRenwu.cs

@@ -1,104 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-using XRTool.Util;
-
-public class JinRuRenwu : MonoBehaviour
-{
-    public GameObject TaskGo;
-    public GameObject PaiZhaoGo;
-    public GameObject Video;
-    public GameObject Model;
-    public GameObject Image;
-    public GameObject Text;
-
-    public List<GameObject> updateList;
-
-    public GameObject kong;
-
-    private void OnEnable()
-    {
-        //RoadManager.Instance.gameObject.SetActive(true);
-        updateListRef();
-        TimerMgr.Instance.CreateTimer(()=> {
-
-            kong.SetActive(!kong.activeSelf);
-        },0.01f,6);
-    }
-
-    private void OnDisable()
-    {
-
-        //RoadManager.Instance.gameObject.SetActive(false);
-    }
-
-    public void showAll()
-    {
-        Text.SetActive(true);
-        Image.SetActive(true);
-        Model.SetActive(true);
-        Video.SetActive(true);
-        PaiZhaoGo.SetActive(true);
-    }
-
-    public void showText()
-    {
-        Text.SetActive(!Text.activeSelf);
-        Text.transform.SetAsFirstSibling();
-    }
-    public void showImage()
-    {
-
-        Image.SetActive(!Image.activeSelf);
-        Text.transform.SetAsFirstSibling();
-    }
-
-    public void showModel()
-    {
-
-        Model.SetActive(!Model.activeSelf);
-        Text.transform.SetAsFirstSibling();
-    }
-    public void showVideo()
-    {
-
-        Video.SetActive(!Video.activeSelf);
-        Text.transform.SetAsFirstSibling();
-    }
-
-    public void GotoPaiZhao()
-    {
-        PaiZhaoGo.SetActive(!PaiZhaoGo.activeSelf);
-        Text.transform.SetAsFirstSibling();
-    }
-
-    public void GotoTask()
-    {
-        TaskGo.SetActive(!TaskGo.activeSelf);
-    }
-
-    public void updateListRef()
-    {
-        for (int i = updateList.Count-1; i >=0; i--)
-        {
-            if ((updateList[i].GetComponent<ContentSizeFitter>()))
-            {
-                updateList[i].GetComponent<ContentSizeFitter>().SetLayoutVertical();
-                updateList[i].GetComponent<ContentSizeFitter>().SetLayoutHorizontal();
-            }
-            if (updateList[i].GetComponent<HorizontalLayoutGroup>())
-            {
-                updateList[i].GetComponent<HorizontalLayoutGroup>().SetLayoutHorizontal();
-                updateList[i].GetComponent<HorizontalLayoutGroup>().CalculateLayoutInputHorizontal();
-
-            }
-            if ((updateList[i].GetComponent<VerticalLayoutGroup>()))
-            {
-
-                updateList[i].GetComponent<VerticalLayoutGroup>().SetLayoutVertical();
-                updateList[i].GetComponent<VerticalLayoutGroup>().CalculateLayoutInputVertical();
-            }
-        }
-    }
-}

Assets/RenWuItemWindow.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RenWuItemWindow : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/XuanJianItem.cs.meta → Assets/RenWuItemWindow.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cf06f4294b2280f41bcb57133fbf96dc
+guid: 639498abd949fe645a7e24d02a20479a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/RenWuTypeWindow.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static XunJianDataManager;
+
+public class RenWuTypeWindow : MonoBehaviour
+{
+    public RenWuTypeModel data;
+
+    public void updateData(RenWuTypeModel data)
+    {
+        this.data = data;
+    }
+}

Assets/RenWuTypeWindow.cs.meta

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

Assets/XuanJianItem.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class XuanJianItem : MonoBehaviour
-{
-    public void gotoXunjian()
-    {
-        WindowsManager.Instance.show(WindowConfig.windowType.XunJianStart);
-    }
-}

Assets/XunJianLieBiaoItem.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static XunJianDataManager;
+using UnityEngine.UI;
+using TMPro;
+
+public class XunJianLieBiaoItem : MonoBehaviour
+{
+    public XunJianListData data;
+
+    public TextMeshProUGUI pName;
+    public TextMeshProUGUI inarea;
+    public TextMeshProUGUI updateState;
+    public TextMeshProUGUI pType;
+    public TextMeshProUGUI XunJianState;
+    public TextMeshProUGUI XunTime;
+    public void updateData(XunJianListData data)
+    {
+        this.data = data;
+        pName.text = data.projectname;
+        inarea.text = data.inarea;
+        updateState.text = data.updateState;
+        pType.text = data.projectType;
+        XunJianState.text = data.projectState;
+        XunTime.text = data.projectTime;
+    }
+
+    public void gotoXunJian()
+    {
+        XunJianDataManager.Instance.GotoXunJian(data);
+    }
+}

Assets/XunJianLieBiaoItem.cs.meta

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

Assets/XunJianLieBiaoWindow.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static XunJianDataManager;
+
+public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
+{
+    public GameObject parentGo;
+    public List<GameObject> itemList;
+    protected override void OnStart()
+    {
+        base.OnStart();
+        GameObject liebiao = WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "liebiao");
+        XunJianDataManager.Instance.GetXunJianList((List<XunJianListData> data) => {
+            for (int i = 0; i < data.Count; i++)
+            {
+                GameObject itemGo = GameObject.Instantiate(liebiao, parentGo.transform);
+                XunJianLieBiaoItem item = itemGo.GetComponent<XunJianLieBiaoItem>();
+                item.updateData(data[i]);
+                itemList.Add(itemGo);
+            }
+        });
+    }
+
+    public void RemoveAll()
+    {
+        for (int i = 0; i < itemList.Count; i++)
+        {
+            Destroy(itemList[i]);
+        }
+
+    }
+}

Assets/XunJianLieBiaoWindow.cs.meta

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