竞技场

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://4lc5fhlbpsphg" designImageOffsetX="-19" designImageAlpha="0">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="首次段位提升"/>
     <remark page="1" value="非首次段位提升"/>
   </controller>
   <displayList>
-    <loader id="n2_psph" name="loaDanicon" xy="423,842" size="200,200" url="ui://4lc5fhlbpsphz" autoSize="true"/>
-    <list id="n1_psph" name="listFirstDanReward" xy="186,1312" size="708,255" layout="row" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
-      <gearDisplay controller="c1" pages="0"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="440,625" size="200,200" url="ui://4lc5fhlbpsphz" autoSize="true"/>
+    <list id="n1_psph" name="listFirstDanReward" xy="186,1206" size="708,259" layout="row" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+      <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n3_psph" name="txtDanTitle" xy="472,1172" pivot="0.5,0" size="136,46" fontSize="34" text="段位名字"/>
+    <text id="n3_psph" name="txtDanTitle" xy="472,1021" pivot="0.5,0" size="136,46" fontSize="34" text="段位名字"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/ArenaRankUpUI.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://4lc5fhlbpsphd" designImageOffsetX="3" designImageAlpha="0">
   <displayList>
-    <component id="n1_psph" name="comMyHeadInfo" src="psphr" fileName="components/ComDanSimpleInfo.xml" xy="394,750"/>
-    <component id="n9_psph" name="comTargetHeadInfo" src="psphr" fileName="components/ComDanSimpleInfo.xml" xy="403,1190"/>
+    <component id="n9_psph" name="comTargetHeadInfo" src="psphr" fileName="components/ComDanSimpleInfo.xml" xy="403,501"/>
+    <component id="n1_psph" name="comMyHeadInfo" src="psphr" fileName="components/ComDanSimpleInfo.xml" xy="403,1025"/>
   </displayList>
+  <transition name="t0">
+    <item time="12" type="XY" target="n1_psph" tween="true" startValue="403,1025" endValue="403,501" duration="12" ease="Linear"/>
+    <item time="12" type="XY" target="n9_psph" tween="true" startValue="403,501" endValue="403,1025" duration="12" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Arena/package.xml

@@ -4,7 +4,7 @@
     <component id="psph0" name="ArenaUI.xml" path="/" exported="true"/>
     <component id="psph1" name="ArenaDressInfoUI.xml" path="/" exported="true"/>
     <component id="psph3" name="ArenaFightRecordUI.xml" path="/" exported="true"/>
-    <component id="psph4" name="ArenaRewardShowUI.xml" path="/" exported="true"/>
+    <component id="psph4" name="ArenaDanRewardUI.xml" path="/" exported="true"/>
     <component id="psph5" name="ArenaRankUI.xml" path="/" exported="true"/>
     <component id="psph6" name="ArenaResultUI.xml" path="/" exported="true"/>
     <component id="psph7" name="ArenaRankUpUI.xml" path="/" exported="true"/>

GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -1,9 +1,18 @@
 using System.Collections.Generic;
+using FairyGUI;
 
 namespace GFGGame
 {
     public class ArenaDataManager : SingletonBase<ArenaDataManager>
     {
 
+
+
+
+
+        public void UpdateDanIcon(GLoader loader, int danLv)
+        {
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaRewardShowUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDanRewardUI.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Arena
 {
-    public partial class UI_ArenaRewardShowUI
+    public partial class UI_ArenaDanRewardUI
     {
         public GComponent target;
         public Controller m_c1;
@@ -15,12 +15,12 @@ namespace UI.Arena
         public UI_ComMyDanReward m_comMyDanReward;
         public const string URL = "ui://4lc5fhlbpsph4";
         public const string PACKAGE_NAME = "Arena";
-        public const string RES_NAME = "ArenaRewardShowUI";
-        private static UI_ArenaRewardShowUI _proxy;
+        public const string RES_NAME = "ArenaDanRewardUI";
+        private static UI_ArenaDanRewardUI _proxy;
 
-        public static UI_ArenaRewardShowUI Create(GObject gObject = null)
+        public static UI_ArenaDanRewardUI Create(GObject gObject = null)
         {
-            var ui = new UI_ArenaRewardShowUI();
+            var ui = new UI_ArenaDanRewardUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +29,11 @@ namespace UI.Arena
             return ui;
         }
 
-        public static UI_ArenaRewardShowUI Proxy(GObject gObject = null)
+        public static UI_ArenaDanRewardUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ArenaRewardShowUI();
+                _proxy = new UI_ArenaDanRewardUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRewardShowView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDanRewardUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 08f4eb172804bb049ace4ac68ea25c48
+guid: 6d8dec7a019a1564d866855c3a45f670
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDanUpUI.cs

@@ -8,7 +8,7 @@ namespace UI.Arena
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaDanicon;
+        public GLoader m_loaDanIcon;
         public GList m_listFirstDanReward;
         public GTextField m_txtDanTitle;
         public const string URL = "ui://4lc5fhlbpsph8";
@@ -59,14 +59,14 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaDanicon = (GLoader)comp.GetChild("loaDanicon");
+            m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_listFirstDanReward = (GList)comp.GetChild("listFirstDanReward");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaDanicon = null;
+            m_loaDanIcon = null;
             m_listFirstDanReward = null;
             m_txtDanTitle = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaRankUpUI.cs

@@ -7,8 +7,9 @@ namespace UI.Arena
     public partial class UI_ArenaRankUpUI
     {
         public GComponent target;
-        public UI_ComDanSimpleInfo m_comMyHeadInfo;
         public UI_ComDanSimpleInfo m_comTargetHeadInfo;
+        public UI_ComDanSimpleInfo m_comMyHeadInfo;
+        public Transition m_t0;
         public const string URL = "ui://4lc5fhlbpsph7";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaRankUpUI";
@@ -56,15 +57,17 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_comMyHeadInfo = (UI_ComDanSimpleInfo)UI_ComDanSimpleInfo.Create(comp.GetChild("comMyHeadInfo"));
             m_comTargetHeadInfo = (UI_ComDanSimpleInfo)UI_ComDanSimpleInfo.Create(comp.GetChild("comTargetHeadInfo"));
+            m_comMyHeadInfo = (UI_ComDanSimpleInfo)UI_ComDanSimpleInfo.Create(comp.GetChild("comMyHeadInfo"));
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comMyHeadInfo.Dispose();
-            m_comMyHeadInfo = null;
             m_comTargetHeadInfo.Dispose();
             m_comTargetHeadInfo = null;
+            m_comMyHeadInfo.Dispose();
+            m_comMyHeadInfo = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -0,0 +1,58 @@
+using ET;
+using FairyGUI;
+using UI.Arena;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ArenaDanReward : BaseWindow
+    {
+        private UI_ArenaDanRewardUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ArenaUI.PACKAGE_NAME;
+            _ui = UI_ArenaDanRewardUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void UpdateView()
+        {
+
+        }
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaRewardShowUI.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 926354e07570e85498bac79c159487cd
+guid: 7e5e8291f8c61e341996a47a9c0cbbc2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanUpView.cs

@@ -9,6 +9,8 @@ namespace GFGGame
     {
         private UI_ArenaDanUpUI _ui;
 
+        private ArenaRankCfg cfg;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -27,6 +29,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _ui.m_listFirstDanReward.itemRenderer = RenderListItem;
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
@@ -38,6 +41,12 @@ namespace GFGGame
         {
             base.OnShown();
 
+            cfg = ArenaRankCfgArray.Instance.GetCfg(2);
+
+            _ui.m_txtDanTitle.text = cfg.gradeName;
+            _ui.m_listFirstDanReward.numItems = cfg.bonusUpgradeArr.Length;
+
+            ArenaDataManager.Instance.UpdateDanIcon(_ui.m_loaDanIcon, cfg.id);
         }
 
         protected override void OnHide()
@@ -51,5 +60,16 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            ItemData reward = ItemUtil.createItemData(cfg.bonusUpgradeArr[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankUpView.cs

@@ -38,18 +38,30 @@ namespace GFGGame
         {
             base.OnShown();
 
+            this.clickBlankToClose = false;
+
+            UpdateInfo(_ui.m_comMyHeadInfo.target);
+            UpdateInfo(_ui.m_comTargetHeadInfo.target);
+
+            _ui.m_t0.Play(() => { this.clickBlankToClose = false; });
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+        }
+
+        private void UpdateInfo(GComponent com)
+        {
+            UI_ComDanSimpleInfo comDanSimpleInfo = UI_ComDanSimpleInfo.Proxy(com);
+
 
+            UI_ComDanSimpleInfo.ProxyEnd();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRewardShowView.cs → GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultQuickView.cs

@@ -5,9 +5,9 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ArenaRewardShowView : BaseWindow
+    public class ArenaResultQuickView : BaseWindow
     {
-        private UI_ArenaRewardShowUI _ui;
+        private UI_ArenaResultQuickUI _ui;
 
         public override void Dispose()
         {
@@ -23,7 +23,7 @@ namespace GFGGame
         {
             base.OnInit();
             packageName = UI_ArenaUI.PACKAGE_NAME;
-            _ui = UI_ArenaRewardShowUI.Create();
+            _ui = UI_ArenaResultQuickUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
 

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultQuickView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -37,7 +37,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
         }
 
         protected override void OnHide()
@@ -51,5 +50,7 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+
     }
 }