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

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

@@ -235,7 +235,7 @@ namespace GFGGame
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();
-            ActivityAfuGiftProxy.GetAfuGiftInfo().Coroutine();
+            ActivityAfuGiftSProxy.GetAfuGiftInfo().Coroutine();
 
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();
@@ -253,7 +253,6 @@ namespace GFGGame
             LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
-            TaskSProxy.GetTaskTypePro().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -56,7 +56,7 @@ namespace GFGGame
             }
         }
 
-        private static int _mainBgID;
+        private static int _mainBgID = MainBackgroundCfgArray.Instance.dataArray[0].id;
         public static int mainBgID
         {
             get
@@ -69,6 +69,29 @@ namespace GFGGame
             }
         }
 
+        private static int _saveDressUpBgToMainBg = 0;
+        public static int saveDressUpBgToMainBg
+        {
+            get
+            {
+                //return GameGlobal.myNumericComponent.GetAsInt(NumericType.IsOpenChangeGearBg);
+                return _saveDressUpBgToMainBg;
+            }
+        }
+
+        private static int _achievementTaskCollect;
+        public static int achievementTaskCollect
+        {
+            get
+            {
+                return _achievementTaskCollect;
+            }
+            set
+            {
+                _achievementTaskCollect = value;
+            }
+        }
+
         public static int power
         {
             get
@@ -331,5 +354,33 @@ namespace GFGGame
         {
             return ItemDataManager.GetItemNum(id) > 0;
         }
+
+        public static string GetMainBgRes()
+        {
+            // 如果主界面ID大于最大物品ID，说明是主界面专属背景
+            if(mainBgID > ConstItemID.MAX_ITEM_ID)
+            {
+                return ResPathUtil.GetBgImgPath(MainBackgroundCfgArray.Instance.GetCfg(mainBgID).res);
+            }
+            // 换装背景
+            else
+            {
+                return ResPathUtil.GetSceneBgPath(ItemCfgArray.Instance.GetCfg(mainBgID).res);
+            }
+        }
+
+        /// <summary>
+        /// 检查是否应该保存换装背景到主界面背景
+        /// </summary>
+        /// <param name="dressUpBgID"></param>
+        public static void CheckSaveDressUpBgToMainBg(int dressUpBgID)
+        {
+            // 小月卡
+            float endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
+            if (endTime > TimeHelper.ServerNow() && saveDressUpBgToMainBg == 1)
+            {
+                mainBgID = dressUpBgID;
+            }
+        }
     }
 }

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

@@ -166,24 +166,6 @@ namespace GFGGame
             return value;
         }
 
-        /// <summary>
-        /// 成就任务完成进度
-        /// </summary>
-        /// <returns></returns>
-        public int GetTaskAchieveProgress()
-        {
-            var taskTypeProList = TaskDataManager.Instance.GetAchievementTaskTypeProList();
-            int finishedCount = 0;
-            int totalCount = 0;
-            for (int i = 0; i < taskTypeProList.Count; i++)
-            {
-                finishedCount += taskTypeProList[i].CompleteTaskNum;
-                totalCount += taskTypeProList[i].AllTaskNum;
-            }
-            int value = FieldGuideView.ProgressCalculate(finishedCount, totalCount);
-            return value;
-        }
-
         public string GetLeagueName()
         {
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -11,14 +11,12 @@ namespace GFGGame
 {
     public class SceneController
     {
-        // 临时存主界面路径
-        public static string bgTempRes = ResPathUtil.GetBgImgPath("zjm_1");  
         public static void UpdateMainScene(GameObject sceneObj)
         {
             //背景0
             Transform tf = sceneObj.transform.Find("Bg");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-            var resPath = bgTempRes;
+            var resPath = RoleDataManager.GetMainBgRes();
 
             SpriteHelper.AddSpriteTo(spr, resPath);
             //角色

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListActivityItem.cs

@@ -10,6 +10,7 @@ namespace UI.Notice
         public GLoader m_loaShow;
         public GImage m_imgTips;
         public GTextField m_txtTime;
+        public GTextField m_txtName;
         public const string URL = "ui://d8t5ezjbkjq3l";
         public const string PACKAGE_NAME = "Notice";
         public const string RES_NAME = "ListActivityItem";
@@ -60,12 +61,14 @@ namespace UI.Notice
             m_loaShow = (GLoader)comp.GetChild("loaShow");
             m_imgTips = (GImage)comp.GetChild("imgTips");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaShow = null;
             m_imgTips = null;
             m_txtTime = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ButtonToggle2
+    {
+        public GButton target;
+        public Controller m_type;
+        public const string URL = "ui://374k3dwvr8a09fzt";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ButtonToggle2";
+        private static UI_ButtonToggle2 _proxy;
+
+        public static UI_ButtonToggle2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonToggle2();
+            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_ButtonToggle2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonToggle2();
+            }
+            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_type = comp.GetController("type");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_type = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI_old2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ButtonToggle2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 96512d990b8f7044fba064f6c5679134
+guid: cb84e614885ba964f8ec6317e6aa3dae
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_InputGiftCodeUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GTextInput m_inputCode;
+        public GButton m_btnSure;
+        public const string URL = "ui://374k3dwvr8a09fza";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "InputGiftCodeUI";
+        private static UI_InputGiftCodeUI _proxy;
+
+        public static UI_InputGiftCodeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_InputGiftCodeUI();
+            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_InputGiftCodeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_InputGiftCodeUI();
+            }
+            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_inputCode = (GTextInput)comp.GetChild("inputCode");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_inputCode = null;
+            m_btnSure = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI_old.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_InputGiftCodeUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8a458fd4cf839984fbc8f623cc93c282
+guid: 01ce10584e1589a4486c4e49ee54e12c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_MainBgChooseTipsUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public const string URL = "ui://374k3dwvr8a09fzm";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "MainBgChooseTipsUI";
+        private static UI_MainBgChooseTipsUI _proxy;
+
+        public static UI_MainBgChooseTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MainBgChooseTipsUI();
+            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_MainBgChooseTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MainBgChooseTipsUI();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI_old.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_MainBgChooseTipsUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dba6576478267e344acaf514c5334bf5
+guid: eb2a8ae417e8d8a459c518656f0df9ca
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -8,10 +8,16 @@ namespace UI.RoleInfo
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GComponent m_mainUIShow;
+        public GGraph m_mask;
         public GButton m_btnBack;
+        public GImage m_frame;
+        public GComponent m_mainUIShow;
         public GList m_bgList;
-        public GButton m_btnChange;
+        public UI_Button19 m_btnChange;
+        public UI_ButtonToggle2 m_btnSaveDressUpBg;
+        public GButton m_btnGoShop;
+        public GGraph m_heightAdaptHelper;
+        public GButton m_btnRule;
         public Transition m_openViewAction;
         public const string URL = "ui://374k3dwvc4t79fvz";
         public const string PACKAGE_NAME = "RoleInfo";
@@ -61,19 +67,33 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_mainUIShow = (GComponent)comp.GetChild("mainUIShow");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_frame = (GImage)comp.GetChild("frame");
+            m_mainUIShow = (GComponent)comp.GetChild("mainUIShow");
             m_bgList = (GList)comp.GetChild("bgList");
-            m_btnChange = (GButton)comp.GetChild("btnChange");
+            m_btnChange = (UI_Button19)UI_Button19.Create(comp.GetChild("btnChange"));
+            m_btnSaveDressUpBg = (UI_ButtonToggle2)UI_ButtonToggle2.Create(comp.GetChild("btnSaveDressUpBg"));
+            m_btnGoShop = (GButton)comp.GetChild("btnGoShop");
+            m_heightAdaptHelper = (GGraph)comp.GetChild("heightAdaptHelper");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_openViewAction = comp.GetTransition("openViewAction");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_mainUIShow = null;
+            m_mask = null;
             m_btnBack = null;
+            m_frame = null;
+            m_mainUIShow = null;
             m_bgList = null;
+            m_btnChange.Dispose();
             m_btnChange = null;
+            m_btnSaveDressUpBg.Dispose();
+            m_btnSaveDressUpBg = null;
+            m_btnGoShop = null;
+            m_heightAdaptHelper = null;
+            m_btnRule = null;
             m_openViewAction = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI_old.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PhoneBindingUI.cs

@@ -4,24 +4,27 @@ using FairyGUI;
 
 namespace UI.RoleInfo
 {
-    public partial class UI_SettingUI_old
+    public partial class UI_PhoneBindingUI
     {
         public GComponent target;
         public GImage m_bg;
         public GGraph m_holderLeftTop;
         public GGraph m_holderRightDowm;
-        public GButton m_btnLogout;
-        public GButton m_btnExit;
-        public GButton m_btnMusic;
-        public GButton m_btnSound;
-        public const string URL = "ui://374k3dwvc4t7gr";
+        public GTextInput m_inputName;
+        public GTextInput m_inputPhoneNumber;
+        public UI_Button19 m_btnSure;
+        public GTextField m_inputConfirmCode;
+        public GButton m_btnGetCode;
+        public GButton m_btnClose;
+        public GLoader m_icon;
+        public const string URL = "ui://374k3dwvr8a09fze";
         public const string PACKAGE_NAME = "RoleInfo";
-        public const string RES_NAME = "SettingUI_old";
-        private static UI_SettingUI_old _proxy;
+        public const string RES_NAME = "PhoneBindingUI";
+        private static UI_PhoneBindingUI _proxy;
 
-        public static UI_SettingUI_old Create(GObject gObject = null)
+        public static UI_PhoneBindingUI Create(GObject gObject = null)
         {
-            var ui = new UI_SettingUI_old();
+            var ui = new UI_PhoneBindingUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +33,11 @@ namespace UI.RoleInfo
             return ui;
         }
 
-        public static UI_SettingUI_old Proxy(GObject gObject = null)
+        public static UI_PhoneBindingUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_SettingUI_old();
+                _proxy = new UI_PhoneBindingUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -64,20 +67,27 @@ namespace UI.RoleInfo
             m_bg = (GImage)comp.GetChild("bg");
             m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
             m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
-            m_btnLogout = (GButton)comp.GetChild("btnLogout");
-            m_btnExit = (GButton)comp.GetChild("btnExit");
-            m_btnMusic = (GButton)comp.GetChild("btnMusic");
-            m_btnSound = (GButton)comp.GetChild("btnSound");
+            m_inputName = (GTextInput)comp.GetChild("inputName");
+            m_inputPhoneNumber = (GTextInput)comp.GetChild("inputPhoneNumber");
+            m_btnSure = (UI_Button19)UI_Button19.Create(comp.GetChild("btnSure"));
+            m_inputConfirmCode = (GTextField)comp.GetChild("inputConfirmCode");
+            m_btnGetCode = (GButton)comp.GetChild("btnGetCode");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_icon = (GLoader)comp.GetChild("icon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
             m_holderLeftTop = null;
             m_holderRightDowm = null;
-            m_btnLogout = null;
-            m_btnExit = null;
-            m_btnMusic = null;
-            m_btnSound = null;
+            m_inputName = null;
+            m_inputPhoneNumber = null;
+            m_btnSure.Dispose();
+            m_btnSure = null;
+            m_inputConfirmCode = null;
+            m_btnGetCode = null;
+            m_btnClose = null;
+            m_icon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

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

@@ -1,114 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.RoleInfo
-{
-    public partial class UI_RoleInfoUI_old
-    {
-        public GComponent target;
-        public GLoader m_loaBg;
-        public GTextField m_txtVersion;
-        public GButton m_btnHelp;
-        public GButton m_btnBack;
-        public GComponent m_comHead;
-        public GTextField m_txtLvl;
-        public GTextField m_txtExp;
-        public GTextField m_txtRoleName;
-        public GLoader m_loaChangeName;
-        public GTextInput m_txtSlogan;
-        public GGroup m_grpHead;
-        public UI_Button2 m_btnFieldGuide;
-        public GList m_list;
-        public GButton m_btnSkill;
-        public GButton m_btnSetting;
-        public const string URL = "ui://374k3dwvp4yn9fw1";
-        public const string PACKAGE_NAME = "RoleInfo";
-        public const string RES_NAME = "RoleInfoUI_old";
-        private static UI_RoleInfoUI_old _proxy;
-
-        public static UI_RoleInfoUI_old Create(GObject gObject = null)
-        {
-            var ui = new UI_RoleInfoUI_old();
-            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_RoleInfoUI_old Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_RoleInfoUI_old();
-            }
-            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_txtVersion = (GTextField)comp.GetChild("txtVersion");
-            m_btnHelp = (GButton)comp.GetChild("btnHelp");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comHead = (GComponent)comp.GetChild("comHead");
-            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
-            m_txtExp = (GTextField)comp.GetChild("txtExp");
-            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
-            m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
-            m_txtSlogan = (GTextInput)comp.GetChild("txtSlogan");
-            m_grpHead = (GGroup)comp.GetChild("grpHead");
-            m_btnFieldGuide = (UI_Button2)UI_Button2.Create(comp.GetChild("btnFieldGuide"));
-            m_list = (GList)comp.GetChild("list");
-            m_btnSkill = (GButton)comp.GetChild("btnSkill");
-            m_btnSetting = (GButton)comp.GetChild("btnSetting");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaBg = null;
-            m_txtVersion = null;
-            m_btnHelp = null;
-            m_btnBack = null;
-            m_comHead = null;
-            m_txtLvl = null;
-            m_txtExp = null;
-            m_txtRoleName = null;
-            m_loaChangeName = null;
-            m_txtSlogan = null;
-            m_grpHead = null;
-            m_btnFieldGuide.Dispose();
-            m_btnFieldGuide = null;
-            m_list = null;
-            m_btnSkill = null;
-            m_btnSetting = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -9,7 +9,6 @@ namespace UI.RoleInfo
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
-        public GButton m_btnChooseMainBg;
         public GLoader m_icon;
         public GList m_settingTypeList;
         public GButton m_btnExit;
@@ -19,13 +18,13 @@ namespace UI.RoleInfo
         public GButton m_btnSound;
         public UI_Slider2 m_voiceSlider;
         public GButton m_btnVoice;
-        public GTextField m_gameProtectAgree;
-        public GTextField m_privacyAgree;
-        public GTextField m_childrenAgree;
+        public GRichTextField m_gameProtectAgree;
+        public GRichTextField m_privacyAgree;
+        public GRichTextField m_childrenAgree;
         public GButton m_btnBinding;
         public UI_Button19 m_btnLogout;
         public UI_Button20 m_btnGiftCode;
-        public GButton m_btnBinding_2;
+        public GButton m_btnExchange;
         public Transition m_t0;
         public const string URL = "ui://374k3dwvr9ri1";
         public const string PACKAGE_NAME = "RoleInfo";
@@ -76,7 +75,6 @@ namespace UI.RoleInfo
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnChooseMainBg = (GButton)comp.GetChild("btnChooseMainBg");
             m_icon = (GLoader)comp.GetChild("icon");
             m_settingTypeList = (GList)comp.GetChild("settingTypeList");
             m_btnExit = (GButton)comp.GetChild("btnExit");
@@ -86,20 +84,19 @@ namespace UI.RoleInfo
             m_btnSound = (GButton)comp.GetChild("btnSound");
             m_voiceSlider = (UI_Slider2)UI_Slider2.Create(comp.GetChild("voiceSlider"));
             m_btnVoice = (GButton)comp.GetChild("btnVoice");
-            m_gameProtectAgree = (GTextField)comp.GetChild("gameProtectAgree");
-            m_privacyAgree = (GTextField)comp.GetChild("privacyAgree");
-            m_childrenAgree = (GTextField)comp.GetChild("childrenAgree");
+            m_gameProtectAgree = (GRichTextField)comp.GetChild("gameProtectAgree");
+            m_privacyAgree = (GRichTextField)comp.GetChild("privacyAgree");
+            m_childrenAgree = (GRichTextField)comp.GetChild("childrenAgree");
             m_btnBinding = (GButton)comp.GetChild("btnBinding");
             m_btnLogout = (UI_Button19)UI_Button19.Create(comp.GetChild("btnLogout"));
             m_btnGiftCode = (UI_Button20)UI_Button20.Create(comp.GetChild("btnGiftCode"));
-            m_btnBinding_2 = (GButton)comp.GetChild("btnBinding");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
-            m_btnChooseMainBg = null;
             m_icon = null;
             m_settingTypeList = null;
             m_btnExit = null;
@@ -120,7 +117,7 @@ namespace UI.RoleInfo
             m_btnLogout = null;
             m_btnGiftCode.Dispose();
             m_btnGiftCode = null;
-            m_btnBinding_2 = null;
+            m_btnExchange = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -1,107 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.RoleInfo
-{
-    public partial class UI_SettingUI_old2
-    {
-        public GComponent target;
-        public GImage m_bg;
-        public GGraph m_holderLeftTop;
-        public GGraph m_holderRightDowm;
-        public GButton m_btnLogout;
-        public GButton m_btnExit;
-        public GComponent m_musicSlider;
-        public GButton m_btnMusic;
-        public GButton m_btnSound;
-        public GComponent m_soundSlider;
-        public GComponent m_voiceSlider;
-        public GButton m_btnVoice;
-        public GButton m_btnChooseMainBg;
-        public Transition m_t0;
-        public const string URL = "ui://374k3dwvxvs39fyb";
-        public const string PACKAGE_NAME = "RoleInfo";
-        public const string RES_NAME = "SettingUI_old2";
-        private static UI_SettingUI_old2 _proxy;
-
-        public static UI_SettingUI_old2 Create(GObject gObject = null)
-        {
-            var ui = new UI_SettingUI_old2();
-            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_SettingUI_old2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_SettingUI_old2();
-            }
-            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");
-            m_btnLogout = (GButton)comp.GetChild("btnLogout");
-            m_btnExit = (GButton)comp.GetChild("btnExit");
-            m_musicSlider = (GComponent)comp.GetChild("musicSlider");
-            m_btnMusic = (GButton)comp.GetChild("btnMusic");
-            m_btnSound = (GButton)comp.GetChild("btnSound");
-            m_soundSlider = (GComponent)comp.GetChild("soundSlider");
-            m_voiceSlider = (GComponent)comp.GetChild("voiceSlider");
-            m_btnVoice = (GButton)comp.GetChild("btnVoice");
-            m_btnChooseMainBg = (GButton)comp.GetChild("btnChooseMainBg");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bg = null;
-            m_holderLeftTop = null;
-            m_holderRightDowm = null;
-            m_btnLogout = null;
-            m_btnExit = null;
-            m_musicSlider = null;
-            m_btnMusic = null;
-            m_btnSound = null;
-            m_soundSlider = null;
-            m_voiceSlider = null;
-            m_btnVoice = null;
-            m_btnChooseMainBg = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -8,7 +8,7 @@ namespace UI.RoleInfo
     {
         public GButton target;
         public GLoader m_bgImg;
-        public GGraph m_mask;
+        public GTextField m_name;
         public const string URL = "ui://374k3dwvc4t7gv";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "bgItem";
@@ -57,12 +57,12 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_bgImg = (GLoader)comp.GetChild("bgImg");
-            m_mask = (GGraph)comp.GetChild("mask");
+            m_name = (GTextField)comp.GetChild("name");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bgImg = null;
-            m_mask = null;
+            m_name = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityAfuGiftProxy.cs → GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityAfuGiftSProxy.cs

@@ -31,7 +31,7 @@ namespace ET
 
 namespace GFGGame
 {
-    public class ActivityAfuGiftProxy : MonoBehaviour
+    public class ActivityAfuGiftSProxy
     {
         /// <summary>
         /// 登陆游戏初始化

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

@@ -61,7 +61,7 @@ namespace GFGGame
                     RoleLimitSProxy.ReqUnitLimitInfos().Coroutine();
                     await ActivitySProxy.ReqSevenDayLoginInfos();
                     await ActivityGlobalSProxy.GetActivityInfo();
-                    await ActivityAfuGiftProxy.GetAfuGiftInfo();
+                    await ActivityAfuGiftSProxy.GetAfuGiftInfo();
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);
                     PromptController.Instance.ShowFloatTextPrompt("每日次数已重置", MessageType.SUCCESS);
                 }

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

@@ -18,6 +18,14 @@ namespace GFGGame
                     RoleDataManager.headId = response.HeadItemId;
                     RoleDataManager.headBorderId = response.HeadBorderItemId;
                     RoleDataManager.photoDatas = response.PictureIds;
+
+                    //for(int i = 0; i < response.ItemList.Count; i++)
+                    //{
+                    //    RoleDataManager.badgeDatas.Add(response.ItemList[i]);
+                    //}
+                    //RoleDataManager.mainBgID = response.MyMainBgId;
+                    //RoleDataManager.achievementTaskCollect = (int)response.AchievementTaskCollect;
+
                     return true;
                 }
             }
@@ -166,5 +174,19 @@ namespace GFGGame
             }
             return false;
         }
+
+        public static async ETTask<bool> ReqSaveChangeGearSwitch(int isOn)
+        {
+            S2C_SaveChangeGearSwitch response;
+            response = (S2C_SaveChangeGearSwitch)await MessageHelper.SendToServer(new C2S_SaveChangeGearSwitch() { Switch = isOn });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -0,0 +1,27 @@
+using ET;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class SettingSProxy
+    {
+        /// <summary>
+        /// 发送兑换码验证请求
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public static async ETTask<bool> ReqGiftCodeInfo(string code)
+        {
+            var response = (S2C_RedeemRewards)await MessageHelper.SendToServer(new C2S_RedeemRewards { ActivationCode = code });
+            if(!(response is { Error: ErrorCode.ERR_Success }))
+            {
+                return false;
+            }
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.ItemList));
+            return true;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/SettingSProxy.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -260,7 +260,7 @@ namespace GFGGame
 
             if (getState.canGet)
             {
-                ActivityAfuGiftProxy.ReqGetReward(getState.isVip, (int)obj.parent.data + 1).Coroutine();
+                ActivityAfuGiftSProxy.ReqGetReward(getState.isVip, (int)obj.parent.data + 1).Coroutine();
             }
             else
             {
@@ -294,7 +294,7 @@ namespace GFGGame
                 }
                 return;
             }
-            ActivityAfuGiftProxy.ReqGetAllReward().Coroutine();
+            ActivityAfuGiftSProxy.ReqGetAllReward().Coroutine();
         }
 
         /// <summary>

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -52,18 +52,17 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
             EventAgent.AddEventListener(ConstMessage.NEWLIMITCHARGE_GET, OnBtnRightClick);
-            //EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
         }
         protected override void OnShown()
         {
             base.OnShown();
 
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_bg1","jpg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_bg1", "jpg");
             _activityId = (int)(this.viewData as object[])[0];
             _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
-            //UpdateRedDot();
             //RefreshList();
             //由于这个需要外部参数所以在onshown里面预加载
             PreloadManager.Instance.PreloadSuitRes(_rechargeCfgs[0].suitId, ResType.Both, new int[] { ConstDressUpItemType.BEI_JING }, false);
@@ -88,8 +87,9 @@ namespace GFGGame
             _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
             _ui.m_btnRight.visible = _curSelectIndex < _rechargeCfgs.Count - 1 ? true : false;
             _ui.m_packageName.text = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
+            UpdateRedDot();
             //预加载套装，对于不同suitid
-            for (int i = 1; i< _rechargeCfgs.Count; i++)
+            for (int i = 1; i < _rechargeCfgs.Count; i++)
             {
                 if (_rechargeCfgs[i].suitId != _rechargeCfgs[i - 1].suitId)
                 {
@@ -105,7 +105,7 @@ namespace GFGGame
         {
             base.OnHide();
             DressUpObjUI dressUpObjUI = _ui.m_showItem.m_holder.data as DressUpObjUI;
-            if(dressUpObjUI != null)
+            if (dressUpObjUI != null)
             {
                 dressUpObjUI.Dispose();
             }
@@ -118,7 +118,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
             EventAgent.RemoveEventListener(ConstMessage.NEWLIMITCHARGE_GET, OnBtnRightClick);
-            //EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
         }
 
         private void RefreshList()
@@ -163,7 +163,7 @@ namespace GFGGame
                 }
                 dressUpObjUI = item.m_holder.data as DressUpObjUI;
                 dressUpObjUI.ResetSceneObj(120, false, true, null, false);
-                    dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+                dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                 dressUpObjUI.UpdateWrapper(item.m_holder);
             }
             previousIndex = _rechargeCfgs[index].suitId;
@@ -184,7 +184,7 @@ namespace GFGGame
             item.m_txtGiftBag.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
-                if(_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0)
+                if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0)
                 {
                     item.m_btnGetGiftBag.grayed = true;
                     item.m_btnGetGiftBag.title = "已领取";
@@ -248,7 +248,7 @@ namespace GFGGame
             string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
             _ui.m_packageName.text = name;
             UpdateSuitView();
-            //UpdateRedDot();
+            UpdateRedDot();
         }
         private void OnBtnRightClick()
         {
@@ -257,9 +257,57 @@ namespace GFGGame
             string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
             _ui.m_packageName.text = name;
             UpdateSuitView();
-            //UpdateRedDot();
+            UpdateRedDot();
 
         }
+        private void UpdateRedDot()
+        {
+            int indexPrior = Math.Max(0, _curSelectIndex - 1);
+            int indexNext = Math.Min(_rechargeCfgs.Count, _curSelectIndex + 1);
+            SetRedDot(indexPrior);
+            SetRedDot(indexNext);
+        }
+
+        private void SetRedDot(int index)
+        {
+            long limitChargeExp = _activityInfo.CountValue;
+            if (limitChargeExp >= _rechargeCfgs[index].value)
+            {
+                if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0)
+                {
+                    if (index < _curSelectIndex)
+                    {
+                        RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, false);
+                    }
+                    else
+                    {
+                        RedDotController.Instance.SetComRedDot(_ui.m_btnRight, false);
+                    }
+                }
+                else
+                {
+                    if (index < _curSelectIndex)
+                    {
+                        RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, true);
+                    }
+                    else
+                    {
+                        RedDotController.Instance.SetComRedDot(_ui.m_btnRight, true);
+                    }
+                }
+            }
+            else
+            {
+                if (index < _curSelectIndex)
+                {
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnLeft, false);
+                }
+                else
+                {
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnRight, false);
+                }
+            }
+        }
         private void OnBtnChargeClick()
         {
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE });

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -692,7 +692,7 @@ namespace GFGGame
             else
                 ViewManager.Show<StoryFightSingleView>(null, true);
 
-            ViewManager.DeleteViewStackCountDown(1);
+            ViewManager.DeleteViewStackCountDown(null,1);
         }
         private void OnClickBtnRecommend()
         {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -436,8 +436,9 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
-            //SceneController.bgTempRes = ResPathUtil.GetSceneBgPath(ItemCfgArray.Instance.GetCfg(MyDressUpHelper.dressUpObj.bgId).res);
             CustomSuitDataManager.SaveCurrentSuit(_ui.m_comboBox.selectedIndex);
+
+            RoleDataManager.CheckSaveDressUpBgToMainBg(MyDressUpHelper.dressUpObj.bgId);
         }
 
         private void OnComboBoxRarityChanged()

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

@@ -116,7 +116,7 @@ namespace GFGGame
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            ViewManager.DeleteViewStackCountDown(2);
+            ViewManager.DeleteViewStackCountDown(null, 2);
             ViewManager.Show<LeagueTeaPartyOverView>();
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -143,7 +143,7 @@ namespace GFGGame
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
 
-            if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
+            if (LauncherConfig.netType != LauncherConfig.EnumNetType.LOCAL && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 // 临时设置都可以跳过对话
                 skipable = false;

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -1,6 +1,8 @@
 using UnityEngine;
 using FairyGUI;
 using UI.Notice;
+using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
@@ -9,7 +11,8 @@ namespace GFGGame
         private UI_NoticeUI _ui;
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
-
+        private AdCfg[] activitydata;
+        private List<AdCfg> showActivity = new List<AdCfg>();
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -41,7 +44,7 @@ namespace GFGGame
             base.OnInit();
 
             _ui.m_listActivity.itemRenderer = ListActivityItemRender;
-            _ui.m_listActivity.onClick.Add(OnListActivityClick);
+            //_ui.m_listActivity.onClick.Add(OnListActivityClick);
 
             _ui.m_listNotice.itemRenderer = ListNoticeItemRender;
 
@@ -88,7 +91,8 @@ namespace GFGGame
         {
             if (_ui.m_c1.selectedIndex == 0)
             {
-                _ui.m_listActivity.numItems = 0;
+                UpdateInfo();
+                _ui.m_listActivity.numItems = showActivity.Count;
                 _ui.m_txtTips.visible = _ui.m_listActivity.numItems == 0;
             }
             else if (_ui.m_c1.selectedIndex == 1)
@@ -102,17 +106,56 @@ namespace GFGGame
         {
             UI_ListActivityItem item = UI_ListActivityItem.Proxy(obj);
             item.m_loaShow.url = ResPathUtil.GetActivityPath("");
-            item.target.data = index;
+            item.m_txtName.text = showActivity[index].res;
+            switch (showActivity[index].jumpId)
+            {
+                //后续添加其他活动
+                case "LuckyBoxView":
+                    item.m_imgTips.visible = RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes();
+                    break;
+                default:
+                    break;
+            }
+            long endTime = 0;
+            long curTime = TimeHelper.ServerNow();
+            if (showActivity[0] != null || showActivity != null)
+            {
+                endTime = TimeUtil.DateTimeToTimestamp(showActivity[0].endTime);
+            }
+            item.m_txtTime.text = string.Format("剩余时间：{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+            item.target.onClick.Add(OnListActivityClick);
+            item.target.data = showActivity[index];
             UI_ListActivityItem.ProxyEnd();
         }
 
         private void OnListActivityClick(EventContext context)
         {
-            // _ui.m_listActivity.visible = false;
-            // _ui.m_listNotice.visible = false;
-            // int noticeId = (int)(context.data as GObject).data;
+            AdCfg adCfg = (AdCfg)(context.sender as GObject).data;
+            object[] param = null;
+            int jumpIndex = 0;
+            if (adCfg.jumpId == nameof(LimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
+            if (adCfg.jumpId == nameof(NewLimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
+            if (adCfg.jumpId == nameof(LuckyBoxView))
+            {
+                jumpIndex = adCfg.jumpParamArr[0];
+            }
 
-            // ViewManager.Show<NoticeActivityShowView>(null, new object[] { typeof(NoticeView).Name, this.viewData });
+            if (jumpIndex != 0)
+            {
+                this.Hide();
+                ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex);
+            }
+            else
+            {
+                this.Hide();
+                ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
+            }
         }
 
         private void ListNoticeItemRender(int index, GObject obj)
@@ -149,5 +192,37 @@ namespace GFGGame
                 ViewManager.Show<NoticeSystemShowView>(noticeInfo);
             }
         }
+
+        private void UpdateInfo()
+        {
+            if(activitydata == null)
+            {
+                activitydata = AdCfgArray.Instance.dataArray;
+            }
+            showActivity.Clear();
+            for (int i = 0; i < activitydata.Length; i++)
+            {
+                AdCfg adCfg = activitydata[i];
+                if (adCfg.activityId > 0)
+                {
+                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
+                }
+                if (adCfg.startTime != "" && adCfg.startTime != null)
+                {
+                    long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                    long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                    if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        showActivity.Add(adCfg);
+                    }
+                }
+            }
+        }
     }
 }

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

@@ -32,7 +32,7 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_hzzs");
             _ui.m_btnback.onClick.Add(Hide);
             _ui.m_list.itemRenderer = OnRenderItem;
 

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

@@ -0,0 +1,50 @@
+using System.Collections;
+using UnityEngine;
+using UI.RoleInfo;
+
+namespace GFGGame
+{
+    public class InputGiftCodeView : BaseWindow
+    {
+        private UI_InputGiftCodeUI _ui;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_InputGiftCodeUI.PACKAGE_NAME;
+            _ui = UI_InputGiftCodeUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnSure.onClick.Add(OnClickBtnSure);
+
+        }
+
+        private async void OnClickBtnSure()
+        {
+            string code = _ui.m_inputCode.text;
+            if (string.IsNullOrEmpty(code))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请输入兑换码");
+                return;
+            }
+
+            bool result = await SettingSProxy.ReqGiftCodeInfo(code);
+            if (result)
+            {
+                _ui.m_inputCode.text = "";
+            }
+        }
+    }
+}

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

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

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

@@ -0,0 +1,32 @@
+using System.Collections;
+using UnityEngine;
+using UI.RoleInfo;
+
+namespace GFGGame
+{
+    public class MainBgChooseTipsView : BaseWindow
+    {
+        private UI_MainBgChooseTipsUI _ui;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MainBgChooseTipsUI.PACKAGE_NAME;
+            _ui = UI_MainBgChooseTipsUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+        }
+    }
+}

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

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

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

@@ -4,6 +4,8 @@ using UI.RoleInfo;
 using UI.Main;
 using ET;
 using FairyGUI;
+using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -28,20 +30,27 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_grsz");
 
             _ui.m_bgList.itemRenderer = BgListItemRenderer;
             _ui.m_bgList.onClickItem.Add(OnClickBgListItem);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnChange.onClick.Add(OnClickBtnChange);
+            _ui.m_btnChange.target.onClick.Add(OnClickBtnChange);
 
-            _ui.m_bgList.numItems = tempRes.Length;
+            _ui.m_bgList.numItems = MainBackgroundCfgArray.Instance.dataArray.Length;
+            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            _ui.m_btnSaveDressUpBg.target.onClick.Add(OnBtnSaveDressUpBgClick);
+            _ui.m_btnGoShop.onClick.Add(OnBtnGoShopClick);
+
+            PicAdaption();
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            SetDefaultSelectedBg();
             InitMainUIPreview();
+            UpdateSaveDressUpBgToggleState();
         }
 
         protected override void OnHide()
@@ -72,7 +81,7 @@ namespace GFGGame
             mainUI.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             mainUI.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             mainUI.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            
+
             mainUI.m_btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             mainUI.m_btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
 
@@ -99,28 +108,28 @@ namespace GFGGame
             Hide();
         }
 
-        // 背景资源名列表，需要从配置表读
-        string[] tempRes = { "zjm_1", "zjm_2", "tc_bjbj" };
         private void BgListItemRenderer(int index, GObject item)
         {
             UI_bgItem bgItem = UI_bgItem.Proxy(item);
-            bgItem.m_bgImg.url = ResPathUtil.GetBgImgPath(tempRes[index]);
+            bgItem.m_bgImg.url = ResPathUtil.GetBgImgPath(MainBackgroundCfgArray.Instance.dataArray[index].res);
+            bgItem.m_name.text = MainBackgroundCfgArray.Instance.dataArray[index].name;
             UI_bgItem.ProxyEnd();
 
-            item.data = tempRes[index];
+            item.data = MainBackgroundCfgArray.Instance.dataArray[index].id;
         }
 
         private void OnClickBgListItem(EventContext context)
         {
             GObject listItem = context.data as GObject;
-            string res = (string)listItem.data;
+            string res = MainBackgroundCfgArray.Instance.GetCfg((int)listItem.data).res;
 
             ChangeBg(res);
         }
 
         private void OnClickBtnChange()
         {
-            SceneController.bgTempRes = (string)_ui.m_bgList.GetChildAt(_ui.m_bgList.selectedIndex).data;
+            PromptController.Instance.ShowFloatTextPrompt("主界面背景已更换");
+            RoleDataManager.mainBgID = (int)_ui.m_bgList.GetChildAt(_ui.m_bgList.selectedIndex).data;
             Hide();
         }
 
@@ -130,5 +139,86 @@ namespace GFGGame
             mainUI.m_loaBg.url = ResPathUtil.GetBgImgPath(res);
             UI_MainUI.ProxyEnd();
         }
+
+        /// <summary>
+        /// 预览图适配
+        /// </summary>
+        /// <returns></returns>
+        private async Task PicAdaption()
+        {
+            await Task.Delay(5);
+            float orginHeight = _ui.m_frame.height;
+            float curHeight = _ui.m_heightAdaptHelper.size.y;
+
+            if (orginHeight != curHeight)
+            {
+                float rate = curHeight * 1.0f / orginHeight;
+
+                _ui.m_frame.scale *= rate;
+                _ui.m_mainUIShow.scale *= rate;
+                // 预览图居中
+                _ui.m_mainUIShow.y = _ui.m_frame.y +
+                    ((_ui.m_frame.height * _ui.m_frame.scale.y) - (_ui.m_mainUIShow.height * _ui.m_mainUIShow.scale.y)) / 2;
+            }
+        }
+
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<MainBgChooseTipsView>();
+        }
+
+        private void SetDefaultSelectedBg()
+        {
+            _ui.m_bgList.selectedIndex = 0;
+            string res = MainBackgroundCfgArray.Instance.dataArray[0].res;
+            ChangeBg(res);
+        }
+
+        private void OnBtnSaveDressUpBgClick()
+        {
+            // 小月卡
+            float endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
+            if (endTime > TimeHelper.ServerNow())
+            {
+                if (RoleDataManager.saveDressUpBgToMainBg == 0)
+                {
+                    AlertSystem.Show("特权开启后换装背景将用于主界面，是否前往更换?")
+                        .SetLeftButton(true)
+                        .SetRightButton(true, "确认", (object data) =>
+                        {
+                            RoleInfoSProxy.ReqSaveChangeGearSwitch(1);
+                            ViewManager.Show<DressUpView>(null, true);
+                        });
+                }
+                else
+                {
+                    AlertSystem.Show("特权关闭后仅可使用三个默认背景，是否确认关闭？")
+                    .SetLeftButton(true)
+                    .SetRightButton(true, "确认", (object data) =>
+                    {
+                        RoleInfoSProxy.ReqSaveChangeGearSwitch(0);
+                        RoleDataManager.mainBgID = MainBackgroundCfgArray.Instance.dataArray[0].id;
+                        UpdateSaveDressUpBgToggleState();
+                    });
+                }
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("该功能尚未开启~");
+            }
+
+        }
+
+        private void OnBtnGoShopClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
+        }
+
+        private void UpdateSaveDressUpBgToggleState()
+        {
+            UI_ButtonToggle2 buttonToggle2 = UI_ButtonToggle2.Proxy(_ui.m_btnSaveDressUpBg.target);
+            buttonToggle2.m_type.SetSelectedIndex(RoleDataManager.saveDressUpBgToMainBg);
+            UI_ButtonToggle2.ProxyEnd();
+        }
     }
 }

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

@@ -0,0 +1,59 @@
+using System.Collections;
+using UnityEngine;
+using UI.RoleInfo;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class PhoneBindingView : BaseWindow
+    {
+
+        private UI_PhoneBindingUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_PhoneBindingUI.PACKAGE_NAME;
+            _ui = UI_PhoneBindingUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnSure.target.onClick.Add(OnBtnSureClick);
+            _ui.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED));
+            _ui.m_btnGetCode.onClick.Add(OnBtnGetCode);
+            _ui.m_btnClose.onClick.Add(Hide);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnBtnSureClick()
+        {
+            Hide();
+        }
+
+        private void OnBtnGetCode()
+        {
+
+        }
+    }
+}

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

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

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

@@ -93,7 +93,8 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(RoleInfoView).FullName);
+            _ui.m_photoList.scrollPane.percX = 0;
+            Hide();
         }
 
         protected override void RemoveEventListener()
@@ -272,7 +273,7 @@ namespace GFGGame
 
             // 成就
             button2 = UI_Button2.Proxy(_ui.m_btnTaskArchieveGuide.target);
-            progress = RoleInfoManager.Instance.GetTaskAchieveProgress();
+            progress = RoleDataManager.achievementTaskCollect;
             button2.m_rate.text = progress.ToString();
             button2.m_progressBar.fillAmount = progress / 100;
 

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

@@ -35,14 +35,14 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_hzzs");
 
-            _ui.m_btnExit.onClick.Add(OnClickBtnExit);
+            _ui.m_btnExit.onClick.Add(OnClickBtnBack);
             _ui.m_btnLogout.target.onClick.Add(OnClickBtnLogout);
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
             _ui.m_btnVoice.onClick.Add(OnClickBtnVoice);
-            _ui.m_btnChooseMainBg.onClick.Add(OnClickBtnChangeMainBg);
+            _ui.m_btnExchange.onClick.Add(OnClickBtnChangeMainBg);
 
             _ui.m_voiceSlider.target.onChanged.Add(OnChangeVoiceVolumn);
             _ui.m_musicSlider.target.onChanged.Add(OnChangeMusicVolumn);
@@ -51,7 +51,9 @@ namespace GFGGame
             _ui.m_btnGiftCode.target.onClick.Add(OnClickGiftCode);
             _ui.m_settingTypeList.itemRenderer = RenderListType;
             _ui.m_settingTypeList.numItems = _ui.m_settingTypeList.numItems;
-
+            _ui.m_gameProtectAgree.onClick.Add(OnGameProtectAgreeClick);
+            _ui.m_privacyAgree.onClick.Add(OnPrivacyAgreeClick);
+            _ui.m_childrenAgree.onClick.Add(OnChildrenAgreeClick);
         }
 
         protected override void OnShown()
@@ -65,8 +67,9 @@ namespace GFGGame
             base.OnHide();
         }
 
-        private void OnClickBtnExit()
+        private void OnClickBtnBack()
         {
+            _ui.m_c1.SetSelectedIndex(0);
             Hide();
             //AlertSystem.Show("确认返回登录页吗？")
             //    .SetLeftButton(true)
@@ -178,12 +181,12 @@ namespace GFGGame
 
         private void OnClickPhoneBinding()
         {
-
+            ViewManager.Show<PhoneBindingView>(); 
         }
 
         private void OnClickGiftCode()
         {
-
+            ViewManager.Show<InputGiftCodeView>();
         }
 
         /// <summary>
@@ -198,5 +201,19 @@ namespace GFGGame
             UI_Button6.ProxyEnd();
         }
 
+        private void OnGameProtectAgreeClick()
+        {
+            FullScreenTextController.Show("event:a");
+        }
+
+        private void OnPrivacyAgreeClick()
+        {
+            FullScreenTextController.Show("event:b");
+        }
+
+        private void OnChildrenAgreeClick()
+        {
+            FullScreenTextController.Show("event:c");
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -27,7 +27,7 @@ namespace GFGGame
         private static GComponent _alertLayer;
         private static GComponent _debugLayer;
         private static GComponent _floatLayer;
-        private static bool _nowHideOthers = false;
+        private static bool _nowHideOthers = false;     //正在关闭所有界面的循环中
 
         private static Dictionary<string, List<object[]>> _goBackDatas = new Dictionary<string, List<object[]>>();
        
@@ -170,17 +170,36 @@ namespace GFGGame
                 viewStructure.viewData = viewData;
                 viewStructure.iUIView = obj;
                 _viewStack.Add(viewStructure);
-                if (_viewStack.Count > 1 && !hideOthers)
+                if (_viewStack.Count > 1 && !hideOthers) {
                     _viewStack[_viewStack.Count - 2].iUIView.Hide();
+                }
             }
 
             return true;
         }
 
-        //删除队列中的倒数几个
-        public static void DeleteViewStackCountDown(int count)
+        //
+        /// <summary>
+        /// 界面可返回栈里的跳转
+        /// </summary>
+        /// <param name="viewName">跳转到界面缓存栈里的某个界面，使用这个参数时写在打开下一个界面后</param>
+        /// <param name="count">删除队列中的倒数几个，较灵活应对更多种情况，可自由控制</param>
+        public static void DeleteViewStackCountDown(string viewName, int count = 0)
         {
+            if (viewName != null && viewName != "")
+            {
+                for (int i = _viewStack.Count - 2; i > 0; i--)
+                {
+                    ViewStructure viewStructure = _viewStack[i];
+                    if (viewStructure.name == viewName)
+                        break;
+                    _viewStack.RemoveAt(i);
+                }
+                return;
+            }
             for (int i = 0; i < count; i++) {
+                if (_viewStack.Count <= 1)
+                    break;
                 _viewStack.RemoveAt(_viewStack.Count-1);
             }
         }
@@ -212,9 +231,13 @@ namespace GFGGame
 
         public static void HideWin(string viewName)
         {
-            if (_viewStack.Count > 1 && !_nowHideOthers) {
-                ViewStructure viewStructure = _viewStack[_viewStack.Count - 1];
+            if (_nowHideOthers)
+                return;
+            
+            if (_viewStack.Count >= 1)
+            {
                 bool hasShowingView = false;
+                bool needShowNextView = false;
                 foreach (var info in _viewDic.Keys)
                 {
                     IUIView objIsShowing = _viewDic[info];
@@ -224,26 +247,35 @@ namespace GFGGame
                         break;
                     }
                 }
-                if (!hasShowingView || (viewStructure.iUIView.isReturnView && viewStructure.name == viewName))
+                ViewStructure viewStructure = _viewStack[_viewStack.Count - 1];
+                if (_viewStack.Count == 1)
                 {
-                    //关闭自己，在队列里去除
-                    if(viewStructure.iUIView.isReturnView && viewStructure.name == viewName)
-                        _viewStack.RemoveAt(_viewStack.Count - 1);
+                    //没有界面显示了，栈被清除剩1个的时候，做保底
+                    if (!hasShowingView)
+                        needShowNextView = true;
+                }
+                else { 
+                    if (!hasShowingView || (viewStructure.iUIView.isReturnView && viewStructure.name == viewName))
+                    {
+                        //关闭自己，在队列里去除
+                        if (viewStructure.iUIView.isReturnView && viewStructure.name == viewName)
+                            _viewStack.RemoveAt(_viewStack.Count - 1);
+
+                        if (_viewStack.Count >= 1)
+                            needShowNextView = true;
+                    }
+                }
 
-                    if (_viewStack.Count >= 1)
+                if (needShowNextView) { 
+                    viewStructure = _viewStack[_viewStack.Count - 1];
+                    ViewManager.Show($"GFGGame.{viewStructure.name}", viewStructure.viewData);
+                    foreach (var objName in _viewDic.Keys)
                     {
-                        viewStructure = _viewStack[_viewStack.Count - 1];
-                        ViewManager.Show($"GFGGame.{viewStructure.name}", viewStructure.viewData);
-                        foreach (var objName in _viewDic.Keys)
+                        if (objName != viewStructure.name)
                         {
-                            if (objName != viewStructure.name)
-                            {
-                                IUIView view = (IUIView)_viewDic[objName];
-                                if (view.isShowing)
-                                {
-                                    view.Show();
-                                }
-                            }
+                            IUIView view = (IUIView)_viewDic[objName];
+                            if (view.isShowing)
+                                view.Show();
                         }
                     }
                 }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -4,7 +4,7 @@ namespace GFGGame
 {
     public class LauncherConfig
     {
-        public enum EnumNetType { LOCAL, TEMP, TISHEN, PUBLIC }
+        public enum EnumNetType { DEV, LOCAL, TEMP, TISHEN, PUBLIC }
         public static EnumNetType netType = EnumNetType.LOCAL;
         public static string cfgName;
 
@@ -45,13 +45,13 @@ namespace GFGGame
         {
 #if PT_DEV
             //外网dev版本
-            netType = EnumNetType.TEMP;
+            netType = EnumNetType.PUBLIC;
             cfgName = "cfg_dev";
 #elif PT_TEMP
-            netType = EnumNetType.TEMP;
+            netType = EnumNetType.PUBLIC;
             cfgName = "cfg_temp";
 #elif PT_IOS
-            netType = EnumNetType.TEMP;
+            netType = EnumNetType.PUBLIC;
             cfgName = "cfg_ios";
             platformId = 2;
 #elif PT_TISHEN

GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -122,7 +122,7 @@ namespace GFGGame
             {
                 BuglyAgent.InitWithAppId("766c5bdb0f");
             }
-            else if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP)
+            else if (LauncherConfig.netType == LauncherConfig.EnumNetType.PUBLIC)
             {
                 BuglyAgent.InitWithAppId("b6d0b1b8c5");
             }

GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -18,7 +18,7 @@
     <application
         android:allowBackup="true"
 		android:icon="@drawable/ic_launcher"
-		android:label="test">
+		android:label="万世镜local">
 		<activity android:name="com.unity3d.player.UnityPlayerActivity"
             android:configChanges="mnc|keyboardHidden|screenSize|orientation|keyboard"
             android:screenOrientation="portrait"

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 72da739c8d375884a9b87eaf5a41b9a4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 92afd166cccaba948b8650754bcedd20
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e03eb36f31e33404d8dc258147eec833
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 01be678f3b6ea554e911ec21daed72f2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: