Merge remote-tracking branch 'origin/master' into AnHui_BaoShi

Assets/Scripts/Actions/ActionHelper.cs

@@ -259,7 +259,7 @@ public class ActionHelper
     /// <returns></returns>
     public static ICondition GetCondition(XMLTool.ActionItem condition)
     {
-        if (condition!=null)
+        if (condition != null)
         {
             switch (condition.Type)
             {

Assets/Scripts/Actions/UIShowAction.cs

@@ -47,19 +47,37 @@ public class UIShowAction : IAction
 
     public void OnStart()
     {
-        if (isShow)
+        Type type = null;
+        if (ActionHelper.typeDict.ContainsKey(uiName))
         {
-            UIKit.OpenPanelAsync(ActionHelper.typeDict[uiName], assetBundleName: uiName).ToAction().StartGlobal(() => this.Finish());
+            type = ActionHelper.typeDict[uiName];
+        }
+        else if (CustomUIMap.typeDict.ContainsKey(uiName))
+        {
+            type = CustomUIMap.typeDict[uiName];
+        }
+
+        if (type == null)
+        {
+            Debug.LogError($"{uiName} ÀàÐÍûÓÐÕÒµ½");
         }
         else
         {
-            if (UIKit.GetPanel(ActionHelper.typeDict[uiName]) != null)
+            if (isShow)
             {
-                UIKit.HidePanel(ActionHelper.typeDict[uiName]);
+                UIKit.OpenPanelAsync(type, assetBundleName: uiName).ToAction().StartGlobal(() => this.Finish());
             }
+            else
+            {
+                if (UIKit.GetPanel(type) != null)
+                {
+                    UIKit.HidePanel(type);
+                }
 
-            this.Finish();
+                this.Finish();
+            }
         }
+
     }
 
     public void Reset()

Assets/Scripts/Custom.meta

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

Assets/Scripts/Custom/UIMap.meta

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

Assets/Scripts/Custom/UIMap/CustomUIMap.cs

@@ -0,0 +1,18 @@
+using QFramework.Example;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CustomUIMap : MonoBehaviour
+{
+
+    // 注意：此处专门给支线用的 主线的UI类型映射填写到 ActionHelper.cs的typeDict中
+    public static readonly Dictionary<string, Type> typeDict = new Dictionary<string, Type>()
+    {
+        //{ "UIOperationList", typeof(UIOperationList) },
+
+    };
+
+
+}

Assets/Scripts/Custom/UIMap/CustomUIMap.cs.meta

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