Merge remote-tracking branch 'remotes/origin/master' into douYou

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -225,6 +225,7 @@ namespace GFGGame
             await ActivitySProxy.GetNewPlayerOnceStatus();
             await ActivitySProxy.GetTipsStatus();
             await ActivitySProxy.GetOnceStatus(5006);
+            await RoleInfoSProxy.GetThemeID();
 
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             bool result = await FieldSProxy.ReqFieldInstanceInfos();

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

@@ -67,5 +67,8 @@ namespace GFGGame
                 _StorageStatus = value;
             }
         }
+
+        public int CardBgID = 0;
+        public int CardBgKey = 200000;
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_WeeklyGiftTipsUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_WeeklyGiftTipsUI
+    {
+        public GComponent target;
+        public GTextField m_descText;
+        public GList m_rewardList;
+        public GButton m_buyBtn;
+        public GTextField m_timeText;
+        public GLoader m_backBtn;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public Transition m_t0;
+        public const string URL = "ui://4ht5s77udm9g39";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "WeeklyGiftTipsUI";
+        private static UI_WeeklyGiftTipsUI _proxy;
+
+        public static UI_WeeklyGiftTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_WeeklyGiftTipsUI();
+            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_WeeklyGiftTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_WeeklyGiftTipsUI();
+            }
+            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_descText = (GTextField)comp.GetChild("descText");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_buyBtn = (GButton)comp.GetChild("buyBtn");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_descText = null;
+            m_rewardList = null;
+            m_buyBtn = null;
+            m_timeText = null;
+            m_backBtn = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_WeeklyGiftTipsUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComCardImgRes.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComCardImgRes
+    {
+        public GComponent target;
+        public GLoader m_loaCard;
+        public const string URL = "ui://mfvz4q8kdm9g9fzv";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComCardImgRes";
+        private static UI_ComCardImgRes _proxy;
+
+        public static UI_ComCardImgRes Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardImgRes();
+            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_ComCardImgRes Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardImgRes();
+            }
+            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_loaCard = (GLoader)comp.GetChild("loaCard");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCard = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComCardImgRes.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComImgCard.cs

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComImgCard
+    {
+        public GComponent target;
+        public UI_ComCardImgRes m_ComCardImgRes;
+        public const string URL = "ui://mfvz4q8kdm9g9fzu";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComImgCard";
+        private static UI_ComImgCard _proxy;
+
+        public static UI_ComImgCard Create(GObject gObject = null)
+        {
+            var ui = new UI_ComImgCard();
+            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_ComImgCard Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComImgCard();
+            }
+            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_ComCardImgRes = (UI_ComCardImgRes)UI_ComCardImgRes.Create(comp.GetChild("ComCardImgRes"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ComCardImgRes.Dispose();
+            m_ComCardImgRes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComImgCard.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -8,6 +8,8 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_type;
+        public UI_ComImgCard m_cardBgIcon;
+        public GGraph m_cardBg;
         public GLoader m_loaBg;
         public GComponent m_valueBar;
         public GGraph m_BottomEffectHolder;
@@ -35,6 +37,7 @@ namespace UI.Main
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
+        public UI_BtnModle m_btnWeeklyGift;
         public UI_ButtonModle1 m_btnZhaiXing;
         public UI_ButtonModleEffect m_btnMain;
         public UI_ButtonModle1 m_btnCiPai;
@@ -102,6 +105,8 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_type = comp.GetController("type");
+            m_cardBgIcon = (UI_ComImgCard)UI_ComImgCard.Create(comp.GetChild("cardBgIcon"));
+            m_cardBg = (GGraph)comp.GetChild("cardBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
@@ -129,6 +134,7 @@ namespace UI.Main
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
+            m_btnWeeklyGift = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnWeeklyGift"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
             m_btnMain = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnMain"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
@@ -152,6 +158,9 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_type = null;
+            m_cardBgIcon.Dispose();
+            m_cardBgIcon = null;
+            m_cardBg = null;
             m_loaBg = null;
             m_valueBar = null;
             m_BottomEffectHolder = null;
@@ -194,6 +203,8 @@ namespace UI.Main
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
+            m_btnWeeklyGift.Dispose();
+            m_btnWeeklyGift = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
             m_btnMain.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ButtonInValueBar.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_ButtonInValueBar
+    {
+        public GButton target;
+        public GImage m_imgAdd;
+        public const string URL = "ui://wgkh30qjhtuj4e";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ButtonInValueBar";
+        private static UI_ButtonInValueBar _proxy;
+
+        public static UI_ButtonInValueBar Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonInValueBar();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonInValueBar Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonInValueBar();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_imgAdd = (GImage)comp.GetChild("imgAdd");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgAdd = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ButtonInValueBar.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs

@@ -24,6 +24,7 @@ namespace UI.MiniGame
         public GButton m_shopBtn;
         public UI_NewMaterialShowView m_newMaterial;
         public UI_MergeGameItemUI m_guildDouBaoBtn;
+        public UI_ButtonInValueBar m_btnProp;
         public const string URL = "ui://wgkh30qjqbf42v";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "MergeGameUI";
@@ -88,6 +89,7 @@ namespace UI.MiniGame
             m_shopBtn = (GButton)comp.GetChild("shopBtn");
             m_newMaterial = (UI_NewMaterialShowView)UI_NewMaterialShowView.Create(comp.GetChild("newMaterial"));
             m_guildDouBaoBtn = (UI_MergeGameItemUI)UI_MergeGameItemUI.Create(comp.GetChild("guildDouBaoBtn"));
+            m_btnProp = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnProp"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -113,6 +115,8 @@ namespace UI.MiniGame
             m_newMaterial = null;
             m_guildDouBaoBtn.Dispose();
             m_guildDouBaoBtn = null;
+            m_btnProp.Dispose();
+            m_btnProp = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs

@@ -7,6 +7,7 @@ namespace UI.MiniGame
     public partial class UI_MergeGamematerialItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_iconBg;
         public GLoader m_icon;
         public GLoader m_newIcon;
@@ -58,6 +59,7 @@ namespace UI.MiniGame
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_iconBg = (GLoader)comp.GetChild("iconBg");
             m_icon = (GLoader)comp.GetChild("icon");
             m_newIcon = (GLoader)comp.GetChild("newIcon");
@@ -65,6 +67,7 @@ namespace UI.MiniGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_iconBg = null;
             m_icon = null;
             m_newIcon = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeThemeUI.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ChangeThemeUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GList m_list;
+        public GButton m_btnSure;
+        public GButton m_btnClose;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GButton m_btnClear;
+        public const string URL = "ui://374k3dwvdm9g9g0u";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ChangeThemeUI";
+        private static UI_ChangeThemeUI _proxy;
+
+        public static UI_ChangeThemeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChangeThemeUI();
+            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_ChangeThemeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChangeThemeUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_list = (GList)comp.GetChild("list");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_btnClear = (GButton)comp.GetChild("btnClear");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_list = null;
+            m_btnSure = null;
+            m_btnClose = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_btnClear = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeThemeUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -26,6 +26,7 @@ namespace UI.RoleInfo
         public UI_ButtonCollectProgress m_btnCardGuide;
         public UI_ButtonCollectProgress m_btnTaskArchieveGuide;
         public GButton m_btnExchange;
+        public GButton m_btnExchangeTheme;
         public GList m_badgeList;
         public GGroup m_center;
         public GList m_photoList;
@@ -102,6 +103,7 @@ namespace UI.RoleInfo
             m_btnCardGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnCardGuide"));
             m_btnTaskArchieveGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnTaskArchieveGuide"));
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
+            m_btnExchangeTheme = (GButton)comp.GetChild("btnExchangeTheme");
             m_badgeList = (GList)comp.GetChild("badgeList");
             m_center = (GGroup)comp.GetChild("center");
             m_photoList = (GList)comp.GetChild("photoList");
@@ -137,6 +139,7 @@ namespace UI.RoleInfo
             m_btnTaskArchieveGuide.Dispose();
             m_btnTaskArchieveGuide = null;
             m_btnExchange = null;
+            m_btnExchangeTheme = null;
             m_badgeList = null;
             m_center = null;
             m_photoList = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -432,6 +432,7 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, S2C_PushNewcomerRewardStatus message)
         {
+            ActivityDataManager.Instance.IsGetNewPlayerReward = message.Status;
             GameGlobal.AutoNewPlayersTips = message.OpenStatus;
             await ETTask.CompletedTask;
         }

GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -268,5 +268,21 @@ namespace GFGGame
             }
             return false;
         }
+
+        //获取主题id
+        public static async ETTask<bool> GetThemeID()
+        {
+            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
+            for (int i = 0; i < response.AllKs.Count; i++)
+            {
+                if (response.AllKs[i] == MainDataManager.Instance.CardBgKey)
+                {
+                    MainDataManager.Instance.CardBgID = (int)response.AllVs[i];
+                    return true;
+                }
+            }
+            MainDataManager.Instance.CardBgID = 0;
+            return true;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/WeeklyGiftTipsView.cs

@@ -0,0 +1,143 @@
+using FairyGUI;
+using UI.ActivityMain;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+using static GFGGame.ShopSProxy;
+using UI.CommonGame;
+using System.Text.RegularExpressions;
+
+namespace GFGGame
+{
+    class WeeklyGiftTipsView : BaseWindow
+    {
+        private UI_WeeklyGiftTipsUI _ui;
+        private int giftShopId = 0;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_WeeklyGiftTipsUI.PACKAGE_NAME;
+            _ui = UI_WeeklyGiftTipsUI.Create();
+            this.viewCom = _ui.target;
+            modal = true;
+            this.viewCom.Center();
+            //邊框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
+            //邊框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            _ui.m_rewardList.itemRenderer = ListItemRender;
+            _ui.m_rewardList.onClickItem.Add(OnListSelectorItemClick);
+            _ui.m_backBtn.onClick.Add(OnClickChange);
+            _ui.m_buyBtn.onClick.Add(OnClickBuy);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.GetCurOpenActiveByType(101));
+            giftShopId = activityCfg.paramsArr[0];
+            if (giftShopId != 0)
+            {
+                var shopCfg = ShopCfgArray.Instance.GetCfg(giftShopId);
+                ItemCfg item = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+                _ui.m_rewardList.numItems = item.itemsArr.Length;
+            }
+            else
+            {
+                _ui.m_rewardList.numItems = 0;
+            }
+            string pattern = @"\[([^\[\]]+)\]";  // 正则表达式模式
+            // 创建Regex对象
+            Regex regex = new Regex(pattern);
+
+            // 匹配文本中的所有结果
+            MatchCollection matchesOpen = regex.Matches(activityCfg.openTime);
+            MatchCollection matchesEnd = regex.Matches(activityCfg.endTime);
+            string openTime = matchesOpen[0].Groups[1].Value +"." + matchesOpen[1].Groups[1].Value + "." + matchesOpen[2].Groups[1].Value;
+            string endTime = matchesEnd[0].Groups[1].Value + "." + matchesEnd[1].Groups[1].Value + "." + matchesEnd[2].Groups[1].Value;
+            _ui.m_timeText.text = string.Format("本期特供时间：{0}-{1}", openTime, endTime);
+            UpdateBtn();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateBtn);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateBtn);
+        }
+        private void OnClickChange()
+        {
+            this.Hide();
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+            UI_ComItem uiItemChild = UI_ComItem.Proxy(obj);
+            var shopCfg = ShopCfgArray.Instance.GetCfg(giftShopId);
+            var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+            int[][] result;
+            result = itemCfg.itemsArr;
+            var itemArr = result[index];
+            var itemCfgChild = ItemCfgArray.Instance.GetCfg(itemArr[0]);
+            uiItemChild.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfgChild);
+            uiItemChild.m_txtCount.text = itemArr[1].ToString();
+            uiItemChild.target.data = itemCfgChild;
+            uiItemChild.m_QualityType.selectedIndex = itemCfgChild.rarity - 1;
+            UI_ComItem.ProxyEnd();
+        }
+
+        //弹出物品详细描述框
+        private void OnListSelectorItemClick(EventContext context)
+        {
+            GComponent item = context.data as GComponent;
+            ItemCfg itemCfg = item.data as ItemCfg;
+            GoodsItemTipsController.ShowItemTips(itemCfg.id);
+        }
+        private async void OnClickBuy()
+        {
+            if(giftShopId == 0)
+            {
+                return;
+            }
+            await ReqShopBuy(giftShopId);
+        }
+        private void UpdateBtn()
+        {
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(giftShopId);
+            var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            if (remainBuyNum == 0)
+            {
+                //已售完
+                _ui.m_buyBtn.visible = false;
+            }
+            else
+            {
+                //未售完
+                _ui.m_buyBtn.visible = true;
+            }
+            _ui.m_descText.text = string.Format("已购买次数：{0}/{1}", ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) ,shopCfg.maxBuyNum);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/WeeklyGiftTipsView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -8,6 +8,7 @@ using Assets.Game.HotUpdate.Data;
 using System.Collections;
 using System;
 using GFGGame.Launcher;
+using YooAsset;
 
 namespace GFGGame
 {
@@ -46,6 +47,7 @@ namespace GFGGame
         //用于分帧更新红点
         private int redPointUpdateFrame = -1;
 
+        private EffectUI _effectUI1;
         public override void Dispose()
         {
             if (_valueBarController != null)
@@ -130,6 +132,7 @@ namespace GFGGame
             _btnBag.onClick.Add(OnClickBtnBag);
             _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
             _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
+            _ui.m_btnWeeklyGift.target.onClick.Add(OnClickBtnWeeklyGift);
             _ui.m_btnHaiZhiShi.target.onClick.Add(OnClickBtnInstanceZones);
             _ui.m_touchMask.onClick.Add(ShowMainUI);
             _ui.m_btnShow.target.onClick.Add(HideMainUI);
@@ -206,6 +209,7 @@ namespace GFGGame
             SceneController.UpdateMainScene(_sceneObject);
             UpdateRoleLvl();
             UpdateHead();
+            CardBgRes();
             _valueBarController.OnShown();
 
             CheckFunOpen();
@@ -597,6 +601,10 @@ namespace GFGGame
             ViewManager.Show<SevenDayLoginView>();
         }
 
+        private void OnClickBtnWeeklyGift()
+        {
+            ViewManager.Show<WeeklyGiftTipsView>();
+        }
         //列表
         private void OnClickBtnGiftBag1()
         {
@@ -647,6 +655,22 @@ namespace GFGGame
 
                 _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
             }
+            _ui.m_btnWeeklyGift.m_c1.selectedIndex = 0;
+            if (_ui.m_btnGiftBag2.target.visible)
+            {
+                _ui.m_btnWeeklyGift.target.visible = false;
+            }
+            else
+            {
+                if (ActivityDataManager.Instance.GetCurOpenActiveByType(101) == 0)
+                {
+                    _ui.m_btnWeeklyGift.target.visible = false;
+                }
+                else
+                {
+                    _ui.m_btnWeeklyGift.target.visible = true;
+                }
+            }
         }
 
         //圆形样式
@@ -909,6 +933,37 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHead(_ui.m_headBar.m_comHead, RoleDataManager.headId,
                 RoleDataManager.headBorderId);
         }
+        private async void CardBgRes()
+        {
+            await RoleInfoSProxy.GetThemeID();
+            if (_effectUI1 != null)
+            {
+                EffectUIPool.Recycle(_effectUI1);
+                _effectUI1 = null;
+            }
+            if(MainDataManager.Instance.CardBgID == 0)
+            {
+                _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = "";
+                return;
+            }
+            ItemCfg cardItem = ItemCfgArray.Instance.GetCfg(MainDataManager.Instance.CardBgID);
+            string resName = cardItem.res;
+            string resPath = ResPathUtil.GetCardAnimationPath(resName);
+            Vector2 omCardImgResTargetSize = new Vector2((ViewGlobal.GetRealTopOffset() + _ui.target.height) * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, (ViewGlobal.GetRealTopOffset() + _ui.target.height));
+            if (YooAssets.CheckResExist(resPath))
+            {
+                await LoadManager.Instance.CheckResExsitedOrDownload(resPath);
+                _effectUI1 = new EffectUI();
+                _effectUI1.Reset(_ui.m_cardBg, resName, resName, 110, EffectUIType.Card);
+                float offY = GRoot.inst.height / 1000;
+                _ui.m_cardBg.y = _ui.m_cardBg.y + (offY*70);
+            }
+            else
+            {
+                _ui.m_cardBgIcon.m_ComCardImgRes.target.size = omCardImgResTargetSize;
+                _ui.m_cardBgIcon.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(resName);
+            }
+        }
         /// <summary>
         /// 获取当前开启的滚动广告列表
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeThemeView.cs

@@ -0,0 +1,146 @@
+using UI.RoleInfo;
+using System.Collections.Generic;
+using FairyGUI;
+using UI.CommonGame;
+using UnityEngine;
+using UI.Main;
+
+namespace GFGGame
+{
+    class ChangeThemeView : BaseWindow
+    {
+        private UI_ChangeThemeUI _ui;
+        private List<CardData> cardList = new List<CardData>();
+        private int selectIndex = 0;
+        private GComponent _comSelected;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
+
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            if (_comSelected != null)
+            {
+                _comSelected.RemoveFromParent();
+                _comSelected.Dispose();
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChangeThemeUI.PACKAGE_NAME;
+            _ui = UI_ChangeThemeUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            //_ui.m_list.SetVirtual();
+            _ui.m_list.itemRenderer = RenderListCardItem;
+            _ui.m_list.onClickItem.Add(OnListCardItemClick);
+            _ui.m_btnSure.onClick.Add(OnClickBtnSure);
+            _ui.m_btnClear.onClick.Add(OnClickBtnClear);
+            _ui.m_btnClose.onClick.Add(()=> { this.Hide(); });
+            AddEffect();
+            _comSelected = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComCardSelect").asCom;
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            cardList = CardDataManager.GetCardListByRoleType(0);
+            cardList = CardDataManager.SortItemList(cardList);
+            _ui.m_list.numItems = cardList.Count;
+            if(cardList.Count >0 )
+            {
+                _ui.m_list.GetChildAt(selectIndex).asCom.AddChild(_comSelected);
+            }     
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void RenderListCardItem(int index, GObject obj)
+        {
+            CardData cardData = cardList[index];
+            UI_ListCardFightItem item = UI_ListCardFightItem.Proxy(obj); // obj as GButton;
+            item.m_txtName.text = cardData.itemCfg.name;
+            item.m_comCardMask.m_loaCard.asLoader.url =
+                ResPathUtil.GetCardIconPath(cardData.resources[cardData.resIndex]);
+            item.m_txtLv.text = string.Format("{0}级", cardData.lv);
+            // item.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, cardData.itemCfg.id,
+                false); // ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            item.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (cardData.itemCfg.mainScore));
+            item.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + cardData.itemCfg.rarity;
+            // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
+
+            int starLevelDodge = cardData.star / 6;
+            item.m_starNumType.selectedIndex = cardData.itemCfg.starDescArr.Length - 1;
+            for (int i = 0; i < 4; i++)
+            {
+                UI_ComDodgeFightStar dodgeStar = UI_ComDodgeFightStar.Proxy(item.target.GetChild("dodgeStar" + i));
+                dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
+                UI_ComDodgeFightStar.ProxyEnd();
+            }
+            item.m_useIcon.visible = false;
+            if(cardData.id == MainDataManager.Instance.CardBgID)
+            {
+                selectIndex = index;
+            }
+            UI_ListCardFightItem.ProxyEnd();
+            // UI_ComStar.ProxyEnd();
+        }
+
+        private void OnListCardItemClick(EventContext context)
+        {
+            GObject obj = context.data as GObject;
+            UI_ListCardFightItem item = UI_ListCardFightItem.Proxy(obj);
+            item.m_t0.Play();
+
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            _effectUI3 = EffectUIPool.CreateEffectUI(item.m_effect, "ui_KP", "KP_Select");
+            _ui.m_list.GetChildAt(_ui.m_list.selectedIndex).asCom.AddChild(_comSelected);
+            OnCardSelected(cardList[_ui.m_list.selectedIndex].id);
+        }
+        private void OnCardSelected(int cardId)
+        {
+            MainDataManager.Instance.CardBgID = cardId;
+
+        }
+        private async void OnClickBtnSure()
+        {
+            await ActivitySProxy.SetOnceStatus(MainDataManager.Instance.CardBgKey, MainDataManager.Instance.CardBgID, 0);
+            PromptController.Instance.ShowFloatTextPrompt("更换成功！");
+            this.Hide();
+        }
+        private async void OnClickBtnClear()
+        {
+            await ActivitySProxy.SetOnceStatus(MainDataManager.Instance.CardBgKey, 0, 0);
+            MainDataManager.Instance.CardBgID = 0;
+            this.Hide();
+        }
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
+
+            //邊框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeThemeView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -52,6 +52,7 @@ namespace GFGGame
             _ui.m_photoList.onClickItem.Add(OnPhotoListItemClick);
             _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
             _ui.m_btnExchange.onClick.Add(OnClickBtnChangeMainBg);
+            _ui.m_btnExchangeTheme.onClick.Add(OnClickBtnChangeTheme);
             _ui.m_txtVersion.onClick.Add(OnClickGM);
 
         }
@@ -109,6 +110,10 @@ namespace GFGGame
         {
             ViewManager.Show<MainBgChooseView>();
         }
+        private void OnClickBtnChangeTheme()
+        {
+            ViewManager.Show<ChangeThemeView>();
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b517f578f586fe847b61443cf9e8353c
+guid: bdaaec3ce3c0f294f8fb0daeda7ce229
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -99,18 +99,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_6.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5194f05d469a3ff4ea1e913a81cfd0e4
+guid: 8050ce2cb1895a640936b547786fab5d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -99,18 +99,6 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []