添加提示框的逻辑

Assets/FrameWork/Error.prefab

@@ -318,7 +318,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5334653716832587140}
   - component: {fileID: 4173974838123063170}
-  - component: {fileID: 8133370330338563334}
+  - component: {fileID: 4367362913326446209}
   m_Layer: 5
   m_Name: IconBG
   m_TagString: Untagged
@@ -355,7 +355,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5070508116327515235}
   m_CullTransparentMesh: 1
---- !u!114 &8133370330338563334
+--- !u!114 &4367362913326446209
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -364,7 +364,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5070508116327515235}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -375,13 +375,16 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 023ffa5ad2429624da12033e84e335c3, type: 3}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
+  m_Sprite: {fileID: 21300000, guid: 023ffa5ad2429624da12033e84e335c3, 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!1 &5125690250073721264
 GameObject:
   m_ObjectHideFlags: 0
@@ -647,8 +650,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 55a0d933e6f88a44b87d915c65d88875, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: 
-  iconBg: {fileID: 8133370330338563334}
+  iconBg: {fileID: 4367362913326446209}
   icon: {fileID: 1043259674818347613}
   TitleText: {fileID: 4387241829480015561}
   MessageText: {fileID: 2313284880258183863}
@@ -984,7 +986,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 6931225121936406927}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1767131574774296145}
+        m_TargetAssemblyTypeName: ErrorManager, Assembly-CSharp
+        m_MethodName: gotoBt
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &7558412984464349062
 GameObject:
   m_ObjectHideFlags: 0
@@ -1241,7 +1255,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 6648716879719691551}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1767131574774296145}
+        m_TargetAssemblyTypeName: ErrorManager, Assembly-CSharp
+        m_MethodName: gotoBt
+        m_Mode: 3
+        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 &9023872208268769342
 GameObject:
   m_ObjectHideFlags: 0

Assets/FrameWork/Login/Scripts/Window/WindowItemConfig.cs

@@ -22,4 +22,17 @@ public class WindowItemConfig : ScriptableObject
         public string name;
         public GameObject obj;
     }
+
+    public List<windowItemTexture> listTexture;
+    [Serializable]
+    public class windowItemTexture
+    {
+        public itemTexture PrefabList;
+    }
+    [Serializable]
+    public class itemTexture
+    {
+        public string name;
+        public Texture obj;
+    }
 }

Assets/FrameWork/ProjectManager/Scripts/JinRuRenwu.cs

@@ -1,3 +1,4 @@
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
 using TMPro;
@@ -6,7 +7,7 @@ using UnityEngine.UI;
 using XRTool.Util;
 using static XunJianDataManager;
 
-public class JinRuRenwu : MonoBehaviour
+public class JinRuRenwu : WindowSingleton<JinRuRenwu>
 {
     RenWuItem rwitem;
     public GameObject WenJianLan;
@@ -29,15 +30,15 @@ public class JinRuRenwu : MonoBehaviour
     public GameObject Image2;
     public GameObject Text;
 
-
+    public TextMeshProUGUI indexText;
 
 
     public List<GameObject> updateList;
 
     public GameObject kong;
-
-    private void OnEnable()
+    public override void OnEnable()
     {
+        base.OnEnable();
         //RoadManager.Instance.gameObject.SetActive(true);
         updateListRef();
         TimerMgr.Instance.CreateTimer(()=> {
@@ -45,16 +46,18 @@ public class JinRuRenwu : MonoBehaviour
             kong.SetActive(!kong.activeSelf);
         },0.01f,6);
         if(XunJianDataManager.Instance.chooseXunJian!=null)
-        updateData();
+            UpdateData();
     }
-    void updateData()
+    public override void UpdateData()
     {
+        base.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]);
+        rwitem = XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
+        indexText.text = (rwitem.index+1).ToString();
         info.text = rwitem.info;
         if (rwitem.typeList.Count > 0)
         {
@@ -114,14 +117,85 @@ public class JinRuRenwu : MonoBehaviour
         //RoadManager.Instance.gameObject.SetActive(false);
     }
 
+    public List<GameObject> getResGo()
+    {
+        List<GameObject> list = new List<GameObject>();
+        int img = 0;
+        for (int i = 0; i < rwitem.typeList.Count; i++)
+        {
+            switch (rwitem.typeList[i].type)
+            {
+                case RenWuType.Image:
+                    if (img == 0)
+                    {
+                        list.Add(Image);
+                    }
+                    else
+                    {
+                        list.Add(Image2);
+                    }
+                    img++;
+                    break;
+                case RenWuType.Model:
+                    list.Add(Model);
+                    break;
+                case RenWuType.Text:
+                    list.Add(Text);
+                    break;
+                case RenWuType.Video:
+                    list.Add(Video);
+                    break;
+            }
+        }
+        return list;
+    }
+
+    public void gotoRTC()
+    {
+
+        WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, "¾´ÇëÆÚ´ý!");
+
+  List<string> backTip = new List<string>();
+  backTip.Add("test1");
+  backTip.Add("test2");
+  backTip.Add("test3");
+  WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("Ìáʾ", "¾´ÇëÆÚ´ý!", Color.gray, "icon", backTip, true, "¾´ÇëÆÚ´ý",5).ToJson());
+
+
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("Ìáʾ", "¾´ÇëÆÚ´ý!", Color.gray, "icon", backTip, false, "¾´ÇëÆÚ´ý", 5).ToJson());
+
+
+        /*
+        List<string> backTip = new List<string>();
+        backTip.Add("test1");
+        backTip.Add("test2");
+        backTip.Add("test3");
+        WindowsManager.Instance.show(WindowConfig.windowType.Tip, false, WindowsManager.Instance.getTip1Data("Ìáʾ", "¾´ÇëÆÚ´ý!", true, true, "icon", Color.gray, backTip).ToJson());*/
+    }
+
     public void showAll()
     {
-        Text.SetActive(true);
-        Image.SetActive(true);
-        Image2.SetActive(true);
-        Model.SetActive(true);
-        Video.SetActive(true);
-        PaiZhaoGo.SetActive(true);
+        List<GameObject> list = getResGo();
+        bool isOpen=false;
+        for (int i = 0; i < list.Count; i++)
+        {
+            if(!list[i].activeSelf)
+            {
+                isOpen = true;
+            }
+        }
+        for (int i = 0; i < list.Count; i++)
+        {
+            list[i].SetActive(isOpen);
+        }
+    }
+    public void closeAll()
+    {
+        List<GameObject> list = getResGo();
+        for (int i = 0; i < list.Count; i++)
+        {
+            list[i].SetActive(false);
+        }
     }
 
     public void showText()
@@ -167,9 +241,23 @@ public class JinRuRenwu : MonoBehaviour
 
     public void GotoLieBiao()
     {
-        ProjectMainWindow.Instance.showXunJian();
+        WindowsManager.Instance.show(WindowConfig.windowType.XunJianLB);
     }
 
+    public void successItem()
+    {
+        rwitem.state = RenWuState.Success;
+        gotoNextItem();
+    }
+    public void failItem()
+    {
+        rwitem.state = RenWuState.Fail;
+        gotoNextItem();
+    }
+    public void gotoNextItem()
+    {
+        XunJianDataManager.Instance.gotoNext();
+    }
     public void updateListRef()
     {
         for (int i = updateList.Count-1; i >=0; i--)

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

@@ -9,7 +9,6 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
     public XunJianListData chooseXunJian;
     public List<XunJianListData> xjDataList = new List<XunJianListData>();
 
-    public Dictionary<string, RenWuItem> renwuItemList;
     public void GetXunJianList(Action<List<XunJianListData>> callback)
     {
        WindowsManager.Instance.StartCoroutine(testBack(callback));
@@ -39,73 +38,53 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                     xj.renwuModelType = RenWuModelType.SaoTu;
                     break;
             }
-            xj.itemList = new List<string>();
+            xj.itemList = new List<RenWuItem>();
+
             for (int j = 0; j < 7; j++)
             {
-                xj.itemList.Add(j.ToString());
+                RenWuItem rw = new RenWuItem();
+                rw.id = j.ToString();
+                rw.index = j;
+                rw.info = "info" + j;
+                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);
+                xj.itemList.Add(rw);
             }
             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;
@@ -116,7 +95,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         public string projectState;
         public string projectType;
         public string projectTime;
-        public List<string> itemList;
+        public List<RenWuItem> itemList;
         public RenWuModelType renwuModelType;
     }
 
@@ -126,11 +105,36 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         WindowsManager.Instance.show(WindowConfig.windowType.XunJianStart);
     }
 
-    public RenWuItem GetRenWuItem(string id)
+
+    public void gotoNext()
     {
-        return renwuItemList[id];
+        if(chooseXunJian.itemList.Count-1 > chooseXunJian.nowIndex)
+        {
+            chooseXunJian.nowIndex++;
+            if (JinRuRenwu.Instance != null)
+            {
+                JinRuRenwu.Instance.UpdateData();
+            }
+            if (RenWuListWindow.Instance != null)
+            {
+                RenWuListWindow.Instance.UpdateData();
+            }
+        }
+
     }
 
+    public void chooseItem(int i)
+    {
+        chooseXunJian.nowIndex = i;
+        if (JinRuRenwu.Instance != null)
+        {
+            JinRuRenwu.Instance.UpdateData();
+        }
+        if (RenWuListWindow.Instance != null)
+        {
+            RenWuListWindow.Instance.UpdateData();
+        }
+    }
     public class RenWuItem
     {
         public string id;
@@ -140,6 +144,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         public string info;
         public List<RenWuTypeModel> typeList;
 
+        public RenWuState state = RenWuState.None;
     }
     public class RenWuTypeModel
     {
@@ -148,6 +153,12 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         public string url;
         public string info;
     }
+    public enum RenWuState
+    {
+        None = 100001, // δ´¦Àí
+        Success = 100002, // ³É¹¦
+        Fail = 100003, // ʧ°Ü
+    }
 
     public enum RenWuType
     {

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

@@ -0,0 +1,56 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using static XunJianDataManager;
+
+public class RenWuListItemWindow : WindowSingleton<RenWuListItemWindow>
+{
+    public RenWuItem data;
+    public GameObject NoneGo;
+    public GameObject FailGo;
+    public GameObject SuccessGo;
+    public TextMeshProUGUI info;
+
+    public void UpdateData(RenWuItem data)
+    {
+        this.data = data;
+        info.text =(data.index+1)+"."+data.info;
+
+        switch(data.state)
+        {
+            case RenWuState.None:
+                info.color = Color.white;
+                NoneGo.SetActive(true);
+                FailGo.SetActive(false);
+                SuccessGo.SetActive(false);
+                break;
+            case RenWuState.Fail:
+                info.color = Color.red;
+                NoneGo.SetActive(false);
+                FailGo.SetActive(true);
+                SuccessGo.SetActive(false);
+                break;
+            case RenWuState.Success:
+                info.color = Color.green;
+                NoneGo.SetActive(false);
+                FailGo.SetActive(false);
+                SuccessGo.SetActive(true);
+                break;
+
+        }
+        if(XunJianDataManager.Instance.chooseXunJian.nowIndex == data.index)
+        {
+
+            info.color = Color.yellow;
+            NoneGo.SetActive(true);
+            FailGo.SetActive(false);
+            SuccessGo.SetActive(false);
+        }
+    }
+
+    public void chooseItem()
+    {
+        XunJianDataManager.Instance.chooseItem(data.index);
+    }
+}

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

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

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

@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static XunJianDataManager;
+
+public class RenWuListWindow : WindowSingleton<RenWuListWindow>
+{
+
+    List<GameObject> objlist = new List<GameObject>();
+    public override void OnEnable()
+    {
+        base.OnEnable();
+        if(XunJianDataManager.Instance!=null&& XunJianDataManager.Instance.chooseXunJian!=null)
+        {
+            UpdateData();
+        }
+    }
+
+    public override void UpdateData()
+    {
+        base.UpdateData();
+        removeData();
+        objlist = new List<GameObject>();
+        GameObject item = WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "RenWuListItem");
+        for (int i = 0; i < XunJianDataManager.Instance.chooseXunJian.itemList.Count; i++)
+        {
+            GameObject RenwuItem = GameObject.Instantiate(item,this.transform);
+            RenwuItem.GetComponent<RenWuListItemWindow>().UpdateData(XunJianDataManager.Instance.chooseXunJian.itemList[i]) ;
+            objlist.Add(RenwuItem);
+        }
+        
+    }
+
+    void removeData()
+    {
+        for (int i = 0; i < objlist.Count; i++)
+        {
+            Destroy(objlist[i]);
+        }
+    }
+}

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

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

Assets/TopManager.cs → Assets/FrameWork/ProjectManager/Scripts/TopManager.cs

@@ -14,7 +14,10 @@ public class TopManager : MonoSingleton<TopManager>
     }
     private void OnEnable()
     {
-        TopManager.Instance.root.SetActive(false);
-        UserManager.Instance.MoveIcon(Vector3.zero, TopManager.Instance.icon.transform, () => { TopManager.Instance.root.SetActive(true); });
+        if (TopManager.Instance.icon.transform.localPosition != Vector3.zero)
+        {
+            TopManager.Instance.root.SetActive(false);
+            UserManager.Instance.MoveIcon(Vector3.zero, TopManager.Instance.icon.transform, () => { TopManager.Instance.root.SetActive(true); });
+        }
     }
 }

Assets/FrameWork/ProjectManager/任务列表1.prefab

@@ -31,6 +31,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5316455699584253958}
+  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}
@@ -144,6 +145,9 @@ GameObject:
   m_Component:
   - component: {fileID: 5316455699584253958}
   - component: {fileID: 7126966266378260299}
+  - component: {fileID: 5715819761475222331}
+  - component: {fileID: 9042603065058919465}
+  - component: {fileID: 9150861459478568683}
   m_Layer: 5
   m_Name: "\u4EFB\u52A1\u5217\u88681"
   m_TagString: Untagged
@@ -165,8 +169,10 @@ RectTransform:
   m_Children:
   - {fileID: 2430936959127715427}
   - {fileID: 186276837125014058}
+  - {fileID: 3614801955580327975}
   - {fileID: 1681464599452290246}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -181,6 +187,105 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1450546709241375024}
   m_CullTransparentMesh: 1
+--- !u!114 &5715819761475222331
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1450546709241375024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06b6706251275f0428a0a5cb60c52b9e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NoneGo: {fileID: 7987558060785036881}
+  FailGo: {fileID: 2868089509887251869}
+  SuccessGo: {fileID: 8497244855814708495}
+  info: {fileID: 1537094468976094358}
+--- !u!114 &9042603065058919465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1450546709241375024}
+  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: 0}
+    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: 0}
+    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: 5715819761475222331}
+        m_TargetAssemblyTypeName: RenWuListItemWindow, Assembly-CSharp
+        m_MethodName: chooseItem
+        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!114 &9150861459478568683
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1450546709241375024}
+  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: 0.39215687}
+  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: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &2868089509887251869
 GameObject:
   m_ObjectHideFlags: 0
@@ -193,7 +298,7 @@ GameObject:
   - component: {fileID: 3008301726776798380}
   - component: {fileID: 8488983764402653248}
   m_Layer: 5
-  m_Name: Image
+  m_Name: Fail
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -210,8 +315,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8325072368926935725}
   m_Father: {fileID: 5316455699584253958}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -239,7 +346,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -256,6 +363,152 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5028482954332461297
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8325072368926935725}
+  - component: {fileID: 2022265547204465903}
+  - component: {fileID: 5283957269823443585}
+  m_Layer: 5
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8325072368926935725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5028482954332461297}
+  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: 186276837125014058}
+  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 &2022265547204465903
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5028482954332461297}
+  m_CullTransparentMesh: 1
+--- !u!114 &5283957269823443585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5028482954332461297}
+  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: fe36bdf18353d144a88d0213889348fd, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!1 &5271671463869898520
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1331294630190463915}
+  - component: {fileID: 3399496501405713772}
+  - component: {fileID: 6518320922287533265}
+  m_Layer: 5
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1331294630190463915
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5271671463869898520}
+  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: 3614801955580327975}
+  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 &3399496501405713772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5271671463869898520}
+  m_CullTransparentMesh: 1
+--- !u!114 &6518320922287533265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5271671463869898520}
+  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: fe36bdf18353d144a88d0213889348fd, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &7987558060785036881
 GameObject:
   m_ObjectHideFlags: 0
@@ -268,12 +521,12 @@ GameObject:
   - component: {fileID: 4781230419146059079}
   - component: {fileID: 3522590529092775669}
   m_Layer: 5
-  m_Name: Image (1)
+  m_Name: None
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2430936959127715427
 RectTransform:
   m_ObjectHideFlags: 0
@@ -287,6 +540,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5316455699584253958}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -331,3 +585,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8497244855814708495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3614801955580327975}
+  - component: {fileID: 7494655934580216951}
+  - component: {fileID: 6232473979375167864}
+  m_Layer: 5
+  m_Name: Success
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3614801955580327975
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8497244855814708495}
+  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: 1331294630190463915}
+  m_Father: {fileID: 5316455699584253958}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7494655934580216951
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8497244855814708495}
+  m_CullTransparentMesh: 1
+--- !u!114 &6232473979375167864
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8497244855814708495}
+  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: 0, g: 1, b: 0, 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: 023ffa5ad2429624da12033e84e335c3, 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

Assets/FrameWork/Scripts/Window/Tip1Window.cs

@@ -1,18 +1,38 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class Tip1Window : WindowSingleton<Tip1Window>
 {
-    // Start is called before the first frame update
-    void Start()
+    public RawImage rawimg;
+    public Image img;
+    public TextMeshProUGUI titeltext;
+    public TextMeshProUGUI infoText;
+    public GameObject qianwangGo;
+    public GameObject SuccessGo;
+    Action<string> callback;
+    List<string> backList;
+    public void show(string title,string info, bool isQianWang, bool isSuccess,Texture tex,Color color,List<string> backList,Action<string> callback)
     {
-        
+        this.transform.SetAsLastSibling();
+        titeltext.text = title;
+        infoText.text = info;
+        qianwangGo.SetActive(isQianWang);
+        SuccessGo.SetActive(isSuccess);
+        rawimg.texture = tex;
+        img.color = color;
+        this.callback = callback;
+        this.backList = backList;
     }
 
-    // Update is called once per frame
-    void Update()
+
+    public void gotoBt(int i)
     {
-        
+        callback.Invoke(backList[i]);
+        this.gameObject.SetActive(false);
+        WindowsManager.Instance.isShowTip = false;
     }
 }

Assets/FrameWork/Scripts/Window/Tip2Window.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using TMPro;
@@ -7,13 +8,15 @@ using XRTool.Util;
 public class Tip2Window : WindowSingleton<Tip2Window>
 {
     public TextMeshProUGUI infoText;
-    public void showTxt(string info)
+    public void showTxt(string info,Action callBack)
     {
         this.transform.SetAsLastSibling();
         infoText.text = info;
         TimerMgr.Instance.CreateTimer(()=> {
+            WindowsManager.Instance.isShowTip = false;
             this.gameObject.SetActive(false);
-        },5f);
+            callBack.Invoke();
+        },3f);
     }
 
 

Assets/FrameWork/Scripts/Window/WindowsManager.cs

@@ -1,3 +1,4 @@
+using LitJson;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -7,6 +8,9 @@ using static WindowConfig;
 
 public class WindowsManager : MonoSingleton<WindowsManager>
 {
+    public delegate void OnTipBackEvent(string msg);
+    public static OnTipBackEvent OnTipBackChange;
+    public bool isShowTip;
     public WindowItemConfig wConfig;
     [HideInInspector]
     public Canvas canvasRoot;
@@ -109,16 +113,14 @@ public class WindowsManager : MonoSingleton<WindowsManager>
         }
         return null;
     }
-
+    Queue<TipData> tdlist = new Queue<TipData>();
     void setWindowData(windowType wt,GameObject go, string data)
     {
-        switch(wt)
-        {
-            case windowType.Tip2:
-                Tip2Window t2w = go.GetComponent<Tip2Window>();
-                t2w.showTxt(data);
-                break;
-        }
+        TipData td = new TipData();
+        td.data = data;
+        td.go = go;
+        td.wt = wt;
+        tdlist.Enqueue(td);
         
     }
 
@@ -155,8 +157,20 @@ public class WindowsManager : MonoSingleton<WindowsManager>
         List<windowItemGameObject> wglist = getWindow(wt, needHandle);
         for (int i = 0; i < wglist.Count; i++)
         {
-            showWindow(windowItemGameObjectList, wglist, wglist[i].type, needHandle);
+            bool isTip = isHuLue(wglist[i].type);
+            Debug.Log("isTip===>"+ isTip);
             setWindowData(wglist[i].type, wglist[i].window, data);
+            if(!isTip)
+                showManagerWindow(windowItemGameObjectList, wglist, wglist[i].type, needHandle);
+        }
+        switch(wt)
+        {
+            case windowType.XunJianStart:
+                closeWindow(windowItemGameObjectList,windowType.Top);
+                break;
+            case windowType.XunJianLB:
+                showWindow(windowItemGameObjectList, windowType.Top);
+                break;
         }
 
         if(wlist.Count>0)
@@ -231,7 +245,36 @@ public class WindowsManager : MonoSingleton<WindowsManager>
         return null;
     }
 
-    void showWindow(List<windowItemGameObject> list, List<windowItemGameObject> wglist, windowType wt, bool needHandle = true)
+    void showWindow(List<windowItemGameObject> list, windowType wt)
+    {
+
+        //Ñ°ÕÒ
+        for (int i = 0; i < list.Count; i++)
+        {
+            if (list[i].type == wt)
+            {
+                list[i].window.SetActive(true);
+            }
+            showWindow(list[i].windowItemGameObjectList, wt);
+        }
+
+    }
+    void closeWindow(List<windowItemGameObject> list, windowType wt)
+    {
+
+        //Ñ°ÕÒ
+        for (int i = 0; i < list.Count; i++)
+        {
+            if (list[i].type == wt)
+            {
+                list[i].window.SetActive(false);
+            }
+            closeWindow(list[i].windowItemGameObjectList, wt);
+        }
+
+    }
+
+    void showManagerWindow(List<windowItemGameObject> list, List<windowItemGameObject> wglist, windowType wt, bool needHandle = true)
     {
 
         //Ñ°ÕÒ
@@ -260,7 +303,151 @@ public class WindowsManager : MonoSingleton<WindowsManager>
                 }
 
             }
-            showWindow(list[i].windowItemGameObjectList, wglist, wt, needHandle);
+            showManagerWindow(list[i].windowItemGameObjectList, wglist, wt, needHandle);
         }
     }
+
+    private void Update()
+    {
+        if(tdlist.Count>0&&!isShowTip)
+        {
+            TipData td = tdlist.Dequeue();
+            Debug.Log("×¼±¸ÏÔʾTip");
+            switch (td.wt)
+            {
+                case windowType.Tip2:
+                    Tip2Window t2w = td.go.GetComponent<Tip2Window>();
+                    td.go.SetActive(true);
+                    isShowTip = true;
+                    t2w.showTxt(td.data, () => {
+
+                        OnTipBackChange?.Invoke("");
+                    });
+                    break;
+                case windowType.Tip:
+                    Tip1Window tw = td.go.GetComponent<Tip1Window>();
+                    td.go.SetActive(true);
+                    isShowTip = true;
+                    JsonData d = JsonMapper.ToObject(td.data);
+                    Color c = new Color(float.Parse(d["cr"].ToString()), float.Parse(d["cg"].ToString()), float.Parse(d["cb"].ToString()), float.Parse(d["ca"].ToString()));
+                    List<string> blist = new List<string>();
+                    blist.Add(d["blist"][0].ToString());
+                    blist.Add(d["blist"][1].ToString());
+                    blist.Add(d["blist"][2].ToString());
+                    tw.show(d["title"].ToString(), d["info"].ToString(),bool.Parse( d["isQianWang"].ToString()), bool.Parse(d["isSuccess"].ToString()), getTexture(d["Texture"].ToString()), c, blist, (string msg)=> {
+
+                        OnTipBackChange?.Invoke(msg);
+
+                    });
+                    break;
+                case windowType.Error:
+                    saveNowWindowAndClose(false);
+                    ErrorManager em = td.go.GetComponent<ErrorManager>();
+                    td.go.SetActive(true);
+                    isShowTip = true;
+                    JsonData de = JsonMapper.ToObject(td.data);
+                    Color ce = new Color(float.Parse(de["cr"].ToString()), float.Parse(de["cg"].ToString()), float.Parse(de["cb"].ToString()), float.Parse(de["ca"].ToString()));
+                    List<string> bliste = new List<string>();
+                    bliste.Add(de["blist"][0].ToString());
+                    bliste.Add(de["blist"][1].ToString());
+                    bliste.Add(de["blist"][2].ToString());
+                    em.show(de["title"].ToString(), de["info"].ToString(), ce, getTexture(de["Texture"].ToString()), bliste, (string msg) => {
+
+                        saveNowWindowAndClose(true);
+                        OnTipBackChange?.Invoke(msg);
+
+                    },bool.Parse(de["isText"].ToString()), de["djsMsg"].ToString(),int.Parse(de["time"].ToString()));
+
+                    
+                    break;
+            }
+        }
+    }
+    List<windowItemGameObject> showList;
+    void saveNowWindowAndClose(bool isRef)
+    {
+        if(!isRef)
+        {
+
+            showList = new List<windowItemGameObject>();
+            for (int i = 0; i < windowItemGameObjectList.Count; i++)
+            {
+                if (windowItemGameObjectList[i].window.activeSelf&& windowItemGameObjectList[i].type!= windowType.Error)
+                {
+                    showList.Add(windowItemGameObjectList[i]);
+                    windowItemGameObjectList[i].window.SetActive(false);
+                }
+            }
+        }else
+        {
+            for (int i = 0; i < showList.Count; i++)
+            {
+                showList[i].window.SetActive(true);
+            }
+
+        }
+    }
+
+
+
+    public Texture getTexture(string texId)
+    {
+
+        for (int i = 0; i < wConfig.listTexture.Count; i++)
+        {
+            if(wConfig.listTexture[i].PrefabList.name== texId)
+            {
+                return wConfig.listTexture[i].PrefabList.obj;
+            }
+        }
+        return null;
+    }
+
+    public JsonData getErrorData(string title, string info, Color color, string icon, List<string> backList, bool isText = true, string djsMsg = "", int time = 5)
+    {
+        JsonData data = new JsonData();
+        data["title"] = title;
+        data["info"] = info;
+        data["isText"] = isText;
+        data["djsMsg"] = djsMsg;
+        data["time"] = time;
+        data["Texture"] = icon;
+        data["blist"] = new JsonData();
+        for (int i = 0; i < 3; i++)
+        {
+            data["blist"].Add(backList[i]);
+        }
+        data["cr"] = color.r;
+        data["cg"] = color.g;
+        data["cb"] = color.b;
+        data["ca"] = color.a;
+        return data;
+    }
+
+    public JsonData getTip1Data(string title, string info, bool isQianWang, bool isSuccess, string texID, Color color, List<string> backList)
+    {
+        JsonData data = new JsonData();
+        data["title"] = title;
+        data["info"] = info;
+        data["isQianWang"] = isQianWang;
+        data["isSuccess"] = isSuccess;
+        data["Texture"] = texID;
+        data["blist"] = new JsonData();
+        for (int i = 0; i < 3; i++)
+        {
+            data["blist"].Add(backList[i]);
+        }
+        data["cr"] = color.r;
+        data["cg"] = color.g;
+        data["cb"] = color.b;
+        data["ca"] = color.a;
+        return data;
+    }
+
+    public class TipData
+    {
+        public windowType wt;
+        public GameObject go;
+        public string data;
+    }
 }

Assets/FrameWork/Tools/ErrorManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using TMPro;
@@ -7,7 +8,7 @@ using XRTool.Util;
 
 public class ErrorManager : WindowSingleton<ErrorManager>
 {
-    public RawImage iconBg;
+    public Image iconBg;
     public RawImage icon;
     public TextMeshProUGUI TitleText;
     public TextMeshProUGUI MessageText;
@@ -18,22 +19,42 @@ public class ErrorManager : WindowSingleton<ErrorManager>
     public GameObject actionButtonGO;
 
     int timeDjs = 0;
-    public void show(string title,string Msg,Texture iconBg,Texture icon,bool isText=true,string djsMsg="",int time=5)
+    Action<string> callback;
+    List<string> backList;
+    public void show(string title,string Msg,Color iconBg,Texture icon, List<string> backList, Action<string> callback, bool isText = true, string djsMsg="", int time=5)
     {
         this.gameObject.SetActive(true);
-        if(isText)
+        TitleText.text = title;
+        MessageText.text = Msg;
+        actionText.text = "(" + time + ")" + djsMsg;
+        this.iconBg.color = iconBg;
+        this.icon.texture = icon;
+        this.backList = backList;
+        this.callback = callback;
+        if (isText)
         {
             actionTextGO.gameObject.SetActive(true);
             actionButtonGO.gameObject.SetActive(false);
             timeDjs = time;
             TimerMgr.Instance.CreateTimer(()=> {
                 timeDjs--;
-               // actionText = "";
+                if(timeDjs<=0)
+                {
+                    gotoBt(0);
+                }
+                actionText.text = "(" + timeDjs + ")" + djsMsg;
             },1, time);
+        }else
+        {
+
+            actionTextGO.gameObject.SetActive(false);
+            actionButtonGO.gameObject.SetActive(true);
         }
     }
-    public void hide()
+    public void gotoBt(int i)
     {
+        callback.Invoke(backList[i]);
         this.gameObject.SetActive(false);
+        WindowsManager.Instance.isShowTip = false;
     }
 }

Assets/FrameWork/WindowsItem.asset

@@ -26,4 +26,10 @@ MonoBehaviour:
   - PrefabList:
     - name: liebiao
       obj: {fileID: 7599535087301401002, guid: 1d3569e16c95d9a4885b942dcd623d89, type: 3}
+    - name: RenWuListItem
+      obj: {fileID: 1450546709241375024, guid: 423e9aacca29f7d408a532074e0a92b2, type: 3}
     type: 200001
+  listTexture:
+  - PrefabList:
+      name: icon
+      obj: {fileID: 2800000, guid: 8f01af81e5093ea4bb37d1dd09107316, type: 3}

Assets/FrameWork/提示.prefab

@@ -1,81 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &656718030615422984
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3254083379211796549}
-  - component: {fileID: 5700903538962329875}
-  - component: {fileID: 667133888990242297}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3254083379211796549
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 656718030615422984}
-  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: 6523650989686399176}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5700903538962329875
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 656718030615422984}
-  m_CullTransparentMesh: 1
---- !u!114 &667133888990242297
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 656718030615422984}
-  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: 8f01af81e5093ea4bb37d1dd09107316, 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!1 &946488601283162844
 GameObject:
   m_ObjectHideFlags: 0
@@ -106,7 +30,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3254083379211796549}
+  - {fileID: 2653619255571868761}
   m_Father: {fileID: 6543531952602785901}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -299,6 +223,7 @@ GameObject:
   - component: {fileID: 588991482224166130}
   - component: {fileID: 3017270918884527100}
   - component: {fileID: 8349406761966162923}
+  - component: {fileID: 1724449506752248062}
   m_Layer: 5
   m_Name: "\u4E0B\u4E00\u6B65"
   m_TagString: Untagged
@@ -365,6 +290,62 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1724449506752248062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3025620859508447759}
+  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: 8349406761966162923}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1255347042539349897}
+        m_TargetAssemblyTypeName: Tip1Window, Assembly-CSharp
+        m_MethodName: gotoBt
+        m_Mode: 3
+        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 &5309742452643931392
 GameObject:
   m_ObjectHideFlags: 0
@@ -500,6 +481,79 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &5562600992061023042
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2653619255571868761}
+  - component: {fileID: 1599809259187329532}
+  - component: {fileID: 3617457750769693971}
+  m_Layer: 5
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2653619255571868761
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5562600992061023042}
+  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: 6523650989686399176}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1599809259187329532
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5562600992061023042}
+  m_CullTransparentMesh: 1
+--- !u!114 &3617457750769693971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5562600992061023042}
+  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: 8f01af81e5093ea4bb37d1dd09107316, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &5654217798360618793
 GameObject:
   m_ObjectHideFlags: 0
@@ -511,6 +565,7 @@ GameObject:
   - component: {fileID: 3037621940837180353}
   - component: {fileID: 6450932614517851534}
   - component: {fileID: 6488111455101419541}
+  - component: {fileID: 9145351848706916710}
   m_Layer: 5
   m_Name: "\u5173\u95ED"
   m_TagString: Untagged
@@ -532,7 +587,7 @@ RectTransform:
   m_Children:
   - {fileID: 1195901783846354552}
   m_Father: {fileID: 6543531952602785901}
-  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}
@@ -577,6 +632,62 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &9145351848706916710
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5654217798360618793}
+  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: 6488111455101419541}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1255347042539349897}
+        m_TargetAssemblyTypeName: Tip1Window, Assembly-CSharp
+        m_MethodName: gotoBt
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 2
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &6255161961326102759
 GameObject:
   m_ObjectHideFlags: 0
@@ -664,6 +775,7 @@ GameObject:
   - component: {fileID: 8579250961683264373}
   - component: {fileID: 825746949911312423}
   - component: {fileID: 6642053338017449018}
+  - component: {fileID: 4410087192511977473}
   m_Layer: 5
   m_Name: "\u6B63\u786E"
   m_TagString: Untagged
@@ -685,11 +797,11 @@ RectTransform:
   m_Children:
   - {fileID: 219913035301213810}
   m_Father: {fileID: 6543531952602785901}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 451, y: -37}
+  m_AnchoredPosition: {x: 509, y: -37}
   m_SizeDelta: {x: 48, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &825746949911312423
@@ -730,6 +842,62 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4410087192511977473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6491204247026540439}
+  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: 6642053338017449018}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1255347042539349897}
+        m_TargetAssemblyTypeName: Tip1Window, Assembly-CSharp
+        m_MethodName: gotoBt
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &6562757316300249627
 GameObject:
   m_ObjectHideFlags: 0
@@ -903,7 +1071,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4172eaa9a750d644495febdeef5e80ab, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: 
+  rawimg: {fileID: 3617457750769693971}
+  img: {fileID: 6671703918747396199}
+  titeltext: {fileID: 4994488229445408678}
+  infoText: {fileID: 7028043683329042425}
+  qianwangGo: {fileID: 3025620859508447759}
+  SuccessGo: {fileID: 6491204247026540439}
 --- !u!1 &8739910006143727766
 GameObject:
   m_ObjectHideFlags: 0
@@ -1015,8 +1188,8 @@ RectTransform:
   - {fileID: 6523650989686399176}
   - {fileID: 8171738847667205719}
   - {fileID: 588991482224166130}
-  - {fileID: 3037621940837180353}
   - {fileID: 8579250961683264373}
+  - {fileID: 3037621940837180353}
   m_Father: {fileID: 3382183992457669934}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}