Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs

@@ -0,0 +1,101 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueTeaPartyOverUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_txtTeaName;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem1;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem3;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem5;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem6;
+        public const string URL = "ui://tw70qm9dic4otq4";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueTeaPartyOverUI";
+        private static UI_LeagueTeaPartyOverUI _proxy;
+
+        public static UI_LeagueTeaPartyOverUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueTeaPartyOverUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LeagueTeaPartyOverUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueTeaPartyOverUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
+            m_TeaPartyOverItem1 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem1"));
+            m_TeaPartyOverItem3 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem3"));
+            m_TeaPartyOverItem4 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem4"));
+            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
+            m_TeaPartyOverItem5 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem5"));
+            m_TeaPartyOverItem6 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem6"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_txtTeaName = null;
+            m_TeaPartyOverItem1.Dispose();
+            m_TeaPartyOverItem1 = null;
+            m_TeaPartyOverItem3.Dispose();
+            m_TeaPartyOverItem3 = null;
+            m_TeaPartyOverItem4.Dispose();
+            m_TeaPartyOverItem4 = null;
+            m_TeaPartyOverItem2.Dispose();
+            m_TeaPartyOverItem2 = null;
+            m_TeaPartyOverItem5.Dispose();
+            m_TeaPartyOverItem5 = null;
+            m_TeaPartyOverItem6.Dispose();
+            m_TeaPartyOverItem6 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyRewardUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueTeaPartyRewardUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public const string URL = "ui://tw70qm9dic4otpz";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueTeaPartyRewardUI";
+        private static UI_LeagueTeaPartyRewardUI _proxy;
+
+        public static UI_LeagueTeaPartyRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueTeaPartyRewardUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LeagueTeaPartyRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueTeaPartyRewardUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyRewardUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyUI.cs

@@ -11,6 +11,7 @@ namespace UI.League
         public GButton m_btnBack;
         public GButton m_btnChallenge;
         public GButton m_btnChat;
+        public GButton m_btnReward;
         public GTextField m_txtTeaName;
         public UI_comTeaPartyItem m_teaPartyItem1;
         public UI_comTeaPartyItem m_teaPartyItem2;
@@ -70,6 +71,7 @@ namespace UI.League
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChallenge = (GButton)comp.GetChild("btnChallenge");
             m_btnChat = (GButton)comp.GetChild("btnChat");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
             m_teaPartyItem1 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem1"));
             m_teaPartyItem2 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem2"));
@@ -85,6 +87,7 @@ namespace UI.League
             m_btnBack = null;
             m_btnChallenge = null;
             m_btnChat = null;
+            m_btnReward = null;
             m_txtTeaName = null;
             m_teaPartyItem1.Dispose();
             m_teaPartyItem1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyOverItem.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_comTeaPartyOverItem
+    {
+        public GComponent target;
+        public GLoader m_iconRole;
+        public GTextField m_txtRoleName;
+        public const string URL = "ui://tw70qm9dic4otq5";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "comTeaPartyOverItem";
+        private static UI_comTeaPartyOverItem _proxy;
+
+        public static UI_comTeaPartyOverItem Create(GObject gObject = null)
+        {
+            var ui = new UI_comTeaPartyOverItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_comTeaPartyOverItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comTeaPartyOverItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_iconRole = (GLoader)comp.GetChild("iconRole");
+            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_iconRole = null;
+            m_txtRoleName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyOverItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs

@@ -0,0 +1,62 @@
+using ET;
+using FairyGUI;
+using Hutool;
+using System.Collections.Generic;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LeagueTeaPartyOverView : BaseWindow
+    {
+        private UI_LeagueTeaPartyOverUI _ui;
+        private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueTeaPartyOverUI.PACKAGE_NAME;
+            _ui = UI_LeagueTeaPartyOverUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+          
+        }
+
+        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 OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs

@@ -0,0 +1,58 @@
+using ET;
+using FairyGUI;
+using Hutool;
+using System.Collections.Generic;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LeagueTeaPartyRewardView : BaseWindow
+    {
+        private UI_LeagueTeaPartyRewardUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueTeaPartyRewardUI.PACKAGE_NAME;
+            _ui = UI_LeagueTeaPartyRewardUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+        }
+
+        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 OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -7,7 +7,6 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    //联盟
     public class LeagueTeaPartyView : BaseWindow
     {
         private UI_LeagueTeaPartyUI _ui;
@@ -35,6 +34,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
+            _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
 
             teaPartyItemList.Add(_ui.m_teaPartyItem1);
             teaPartyItemList.Add(_ui.m_teaPartyItem2);
@@ -45,9 +45,15 @@ namespace GFGGame
 
             _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
 
+            int index = 0;
+            int teaPartyType = 1;
+            List<TeapartyRoleCfg> teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(teaPartyType);
+
             foreach (var itemObj in teaPartyItemList) {
                 itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
                 itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
+                itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
+                index += 1;
             }
         }
 
@@ -79,9 +85,14 @@ namespace GFGGame
         {
             PromptController.Instance.ShowFloatTextPrompt("开始挑战");
 
-
+            ViewManager.Show<LeagueTeaPartyOverView>();
         }
 
+        private void OnBtnRewardClick()
+        {
+            ViewManager.Show<LeagueTeaPartyRewardView>();
+        }
+        
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -115,9 +115,9 @@ namespace GFGGame
         }
         private void OnBtnPartyClick()
         {
-            PromptController.Instance.ShowFloatTextPrompt("活动未开启");
+            //PromptController.Instance.ShowFloatTextPrompt("活动未开启");
 
-            //ViewManager.Show<LeagueTeaPartyView>();
+            ViewManager.Show<LeagueTeaPartyView>();
         }
         private void OnBtnShopClick()
         {