Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

Assets/Res/UI/HeroDetailPanel.prefab

@@ -4865,135 +4865,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &2664411918127213144
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5850134046284175611}
-  - component: {fileID: 2205012396656506486}
-  - component: {fileID: 6941861712494805128}
-  - component: {fileID: 8626836081362064263}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Front
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5850134046284175611
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2664411918127213144}
-  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: 6531592034564531019}
-  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: 7.5999985}
-  m_SizeDelta: {x: 47, y: 85}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2205012396656506486
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2664411918127213144}
-  m_CullTransparentMesh: 1
---- !u!114 &6941861712494805128
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2664411918127213144}
-  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: 8626836081362064263}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &8626836081362064263
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2664411918127213144}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 0}
-  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
-  _icon_name: btn_Arrow_Prev
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &2680084534974993720
 GameObject:
   m_ObjectHideFlags: 0
@@ -7307,8 +7178,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7191109268169310659}
+  m_Children: []
   m_Father: {fileID: 6190678789095275899}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
@@ -11370,135 +11240,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &5623919370622512555
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7191109268169310659}
-  - component: {fileID: 5838345212174405239}
-  - component: {fileID: 2423761399384436179}
-  - component: {fileID: 7281062742177871665}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_Front
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7191109268169310659
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5623919370622512555}
-  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: 7655727355699048888}
-  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.0000019073, y: 6.5}
-  m_SizeDelta: {x: 47, y: 85}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5838345212174405239
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5623919370622512555}
-  m_CullTransparentMesh: 1
---- !u!114 &2423761399384436179
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5623919370622512555}
-  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: 7281062742177871665}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &7281062742177871665
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5623919370622512555}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 0}
-  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
-  _icon_name: btn_Arrow_Next
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &5664409606135363520
 GameObject:
   m_ObjectHideFlags: 0
@@ -17744,8 +17485,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5850134046284175611}
+  m_Children: []
   m_Father: {fileID: 6190678789095275899}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}

Assets/Scripts/Core/UI/UTool/Enum.cs

@@ -1,5 +1,15 @@
 namespace Fort23.UTool
 {
+
+    public enum UIPanelName
+    {
+        None,
+        MainPanel,
+        BagPanel,
+        HeroPanel,
+        SkillPanel,
+    }
+    
     /// <summary>
     /// 英雄提升结果的类型(各种情况)
     /// </summary>

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -45,41 +45,72 @@ namespace Fort23.Mono
 
         private void OnclickPrevHero()
         {
-            if (sourcePanel == null)
-            {
-                LogTool.Error("打开英雄界面的上个一个UIPanel未知");
-                return;
-            }
-            if (sourcePanel is HeroBagPanel)
-            {
-                HeroBagPanel heroBagPanel = (HeroBagPanel)sourcePanel;
-                HeroUITools.GetCloseHero(heroBagPanel.widgetHeroes, heroWidget, false);
-            }
+            SwitchHero(false);
         }
 
         private void OnclickNextHero()
         {
-
+            SwitchHero(true);
         }
 
         public void SwitchHero(bool isNext)
         {
-            if (sourcePanel == null)
+            if (sourcePanel == UIPanelName.None)
             {
                 LogTool.Error("打开英雄界面的上个一个UIPanel未知");
                 return;
             }
-            if (sourcePanel is HeroBagPanel)
+            
+            GObjectPool.Instance.Recycle(modelObj);
+            
+            if (sourcePanel == UIPanelName.BagPanel)
             {
-                HeroBagPanel heroBagPanel = (HeroBagPanel)sourcePanel;
-                HeroUITools.GetCloseHero(heroBagPanel.widgetHeroes, heroWidget, isNext);
+                HeroBagPanel heroBagPanel = UIManager.Instance.GetComponent<HeroBagPanel>();
+                WidgetHero widgetHero = HeroUITools.
+                    GetCloseHero(heroBagPanel.widgetHeroes, heroWidget, isNext);
+                if (widgetHero != null)
+                {
+                    InitHeroDetailPanel(widgetHero, sourcePanel);
+                }
             }
 
-            if (sourcePanel is MainUIPanel)
+            if (sourcePanel == UIPanelName.MainPanel)
             {
-                MainUIPanel mainUIPanel = (MainUIPanel)sourcePanel;
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                WidgetHero widgetHero = HeroUITools.
+                    GetCloseHero(mainUIPanel.widgetHeroes, heroWidget, isNext);
+                if (widgetHero != null)
+                {
+                    InitHeroDetailPanel(widgetHero, sourcePanel);
+                }
+            }
+        }
+
+        private bool IsShowArrow(bool isNext)
+        {
+            if (sourcePanel == UIPanelName.None)
+            {
+                return false;
+            }
+            
+            if (sourcePanel == UIPanelName.BagPanel)
+            {
+                HeroBagPanel heroBagPanel = UIManager.Instance.GetComponent<HeroBagPanel>();
+                WidgetHero widgetHero = HeroUITools.
+                    GetCloseHero(heroBagPanel.widgetHeroes, heroWidget, isNext);
+                
+                return widgetHero != null;
+            }
+
+            if (sourcePanel == UIPanelName.MainPanel)
+            {
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                WidgetHero widgetHero = HeroUITools.
+                    GetCloseHero(mainUIPanel.widgetHeroes, heroWidget, isNext);
+                return widgetHero != null;
             }
             
+            return false;
         }
 
         public SkillUIComponent skillUIComponent;
@@ -296,6 +327,12 @@ namespace Fort23.Mono
         }
         
         private void OnClickClose()
+        {
+            CloseLogic();
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        private void CloseLogic()
         {
             if (isOpenPre)
             {
@@ -303,17 +340,16 @@ namespace Fort23.Mono
             }
             else
             {
-                UIManager.Instance.HideUIUIPanel(this);
                 GObjectPool.Instance.Recycle(modelObj);
             }
         }
 
         public WidgetHero heroWidget;
-        public UIPanel sourcePanel;
+        public UIPanelName sourcePanel;
         
         private GameObjectPool modelObj;
         HeroPowerUpPre upPre;
-        public async void InitHeroDetailPanel(WidgetHero heroWidget, UIPanel sourcePanel = null)
+        public async void InitHeroDetailPanel(WidgetHero heroWidget, UIPanelName sourcePanel = UIPanelName.None)
         {
             this.heroInfo = heroWidget.heroInfo;
             this.heroWidget = heroWidget;
@@ -321,6 +357,10 @@ namespace Fort23.Mono
             
             btns1.SetActive(true);
             objHeroPowerUpPre.SetActive(false);
+            
+            //是否显示左右切换按钮
+            btnNext.gameObject.SetActive(IsShowArrow(true));
+            btnPrev.gameObject.SetActive(IsShowArrow(false));
 
             iconZhiYe.icon_name = heroInfo.iconZhiYe;
             heroName.text = LanguageManager.Instance.Text(heroInfo.modelConfig.name);

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -159,9 +159,10 @@ namespace Fort23.Mono
             // {
             //     heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
             // }
+            UIPanelName current = UIPanelName.MainPanel;
             HeroDetailPanel heroDetailPanel =
                 await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback, isFullUI: true);
-            heroDetailPanel.InitHeroDetailPanel(this, UIManager.Instance.currOpenPanel);
+            heroDetailPanel.InitHeroDetailPanel(this, current);
         }
 
         private void Callback(HeroDetailPanel obj)

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -202,7 +202,7 @@ namespace Fort23.Mono
         //     }
         // }
 
-        private List<WidgetHero> widgetHeroes = new List<WidgetHero>();
+        public List<WidgetHero> widgetHeroes = new List<WidgetHero>();
 
         /// <summary>
         /// 把主界面的几个英雄UI归位

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615