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

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -2,7 +2,6 @@ namespace GFGGame
 {
     public class ConstMessage
     {
-        public const string ON_PLATFORM_SDK_INITED = "INIT_PLATFORM_SDK_SUCCESS";
         public const string ON_PLATFORM_SDK_LOGINED = "ON_PLATFORM_SDK_LOGINED";
 
         public const string DRESS_UP_SCORE_CHANGED = "DRESS_UP_SCORE_CHANGED";

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

@@ -13,7 +13,7 @@ namespace GFGGame
                     return true;
                 case ET.ErrorCode.ERR_NetWorkError:
                     {
-                        AlertSystem.Show("网络异常，也有可能是服务器异常，请稍后再试！")
+                        AlertSystem.Show("网络异常，请稍后再试！")
                         .SetRightButton(true, "好的", (object data) =>
                         {
                             GameController.QuitToLoginView(false);

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

@@ -331,17 +331,13 @@ namespace GFGGame
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
             if (logout)
             {
-                if (PlayerPrefs.HasKey(GameConst.PASSWORD_LAST_LOGIN_KEY))
-                {
-                    PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
-                }
-                if (!fromSdkLogoutCallback)
-                {
-                    QDManager.Logout();
-                }
+                    QDManager.Logout(fromSdkLogoutCallback);
             }
             ViewManager.Hide<GuideView>();
-            ViewManager.Show<LoginView>(null, true);
+            if(!ViewManager.isViewOpen(typeof(LoginView).FullName))
+            {
+                ViewManager.Show<LoginView>(null, true);
+            }
         }
 
         //断线重连后需要处理的事情

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

@@ -273,14 +273,26 @@ namespace GFGGame
             int errorCode = await LoginHelper.EnterGame(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
             {
-                if (errorCode != ErrorCode.ERR_SessionStateError && errorCode != ErrorCode.ERR_NetWorkError)
+                string errMessage = "与服务器连接失败。";
+                Log.Error($"Reconnect fail, errorCode {errorCode}!");
+                if(errorCode == ErrorCode.ERR_TokenError)
                 {
-                    Log.Error($"Reconnect fail, errorCode {errorCode}!");
+                    errMessage = "登录已过期，请重新登录";
+                    AlertSystem.Show(errMessage)
+                            .SetRightButton(true, "好的", (object data) =>
+                            {
+                                GameController.QuitToLoginView(false);
+                            });
+                    return;
                 }
-                AlertSystem.Show("重新连接失败，游戏或已更新，请重新进入游戏获得最佳体验。")
-                        .SetRightButton(true, "好的", (object data) =>
+                else if(errorCode == ErrorCode.ERR_NetWorkError)
+                {
+                    errMessage = "网络异常，与服务器连接失败。";
+                }
+                AlertSystem.Show(errMessage)
+                        .SetRightButton(true, "重新连接", (object data) =>
                         {
-                            Application.Quit();
+                            ReqReConnectGate().Coroutine();
                         });
                 return;
             }

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

@@ -52,5 +52,20 @@ namespace Assets.Game.HotUpdate.Data
             }
             return false;
         }
+        //获取华容道可用次数
+        public bool CheckHRDRed()
+        {
+            RoleLimitData limitData;
+            limitData = RoleLimitDataManager.GetLimitData(300);
+            int times = limitData.TotalPlayMax - limitData.PlayTimes;
+            if(times > 0 && ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.AfternoonLeisure))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
     }
 }

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

@@ -109,23 +109,18 @@ namespace GFGGame
             if (!sort) return;
             _list.Sort((long a, long b) =>
             {
-                if(_friendDic[a].roleInfo.offlineTimeSec == 0)
+                long count = _friendDic[b].roleInfo.offlineTimeSec - _friendDic[a].roleInfo.offlineTimeSec;
+                if (count > 0)
                 {
                     return -1;
                 }
-                if(_friendDic[b].roleInfo.offlineTimeSec == 0)
+                else if(count < 0)
                 {
                     return 1;
                 }
-
-                long count = _friendDic[a].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
-                if (count > 0)
-                {
-                    return -1;
-                }
                 else
                 {
-                    return 1;
+                    return 0;
                 }
             });
         }
@@ -181,9 +176,9 @@ namespace GFGGame
 
         public bool CheckInApplyList(long roleId)
         {
-            foreach(var friendInfo in _applyDatas)
+            foreach (var friendInfo in _applyDatas)
             {
-                if(friendInfo.roleInfo.roleId == roleId)
+                if (friendInfo.roleInfo.roleId == roleId)
                 {
                     return true;
                 }

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

@@ -390,6 +390,12 @@ namespace GFGGame
                 var limitData = RoleLimitDataManager.GetLimitData(studioCfg.limit);
                 times = Math.Min(times, limitData.TotalPlayMax - limitData.PlayTimes);
             }
+            else if(type == ConstInstanceZonesType.PureFight && subType == 1)
+            {
+                var zcjbFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                var limitData = RoleLimitDataManager.GetLimitData(zcjbFightCfg.limit);
+                times = Math.Min(times, 10);
+            }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }
         public static void GetTotalProgress(out int count, out int totalCount)

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

@@ -196,12 +196,7 @@ namespace GFGGame
         public void UpdateHeadWithLv1(GComponent component, int headId, int roleBorderId, int lv)
         {
             UI_ComHeadWithLv1 comHeadWithLv = UI_ComHeadWithLv1.Proxy(component);
-
-            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
-            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
-
-            comHeadWithLv.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-            comHeadWithLv.m_loaHeadBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            UpdateHead(comHeadWithLv.m_comHead.target, headId, roleBorderId);
             comHeadWithLv.m_txtLv.text = lv > 0 ? lv.ToString() : "--";
             UI_ComHeadWithLv1.ProxyEnd();
 

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/DisConnected/DisConnectedCompnentSystem.cs

@@ -19,7 +19,7 @@ namespace ET
 
                     if (!Application.isFocused)
                     {
-                        AlertSystem.Show("连接已断开。")
+                        AlertSystem.Show("与服务器连接已断开。")
                         .SetRightButton(true, "重新连接", (object data) =>
                         {
                             LoginController.ReqReConnectGate().Coroutine();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs

@@ -7,7 +7,7 @@ namespace UI.ActivityAfternoonTea
     public partial class UI_ActivityTeaMainUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GLoader m_Bg;
         public GButton m_btnBack;
         public GLoader m_titleBg;
         public GLoader m_oneTimeIcon;
@@ -67,7 +67,7 @@ namespace UI.ActivityAfternoonTea
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Bg = (GLoader)comp.GetChild("Bg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_titleBg = (GLoader)comp.GetChild("titleBg");
             m_oneTimeIcon = (GLoader)comp.GetChild("oneTimeIcon");
@@ -83,7 +83,7 @@ namespace UI.ActivityAfternoonTea
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_Bg = null;
             m_btnBack = null;
             m_titleBg = null;
             m_oneTimeIcon = null;

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

@@ -11,6 +11,7 @@ namespace UI.ActivityMain
         public GList m_List;
         public UI_Button7 m_RewardBtn;
         public GTextField m_rewardName;
+        public GTextField m_rewardNum;
         public const string URL = "ui://4ht5s77uqbf4u";
         public const string PACKAGE_NAME = "ActivityMain";
         public const string RES_NAME = "ActivityRewardItemUI";
@@ -62,6 +63,7 @@ namespace UI.ActivityMain
             m_List = (GList)comp.GetChild("List");
             m_RewardBtn = (UI_Button7)UI_Button7.Create(comp.GetChild("RewardBtn"));
             m_rewardName = (GTextField)comp.GetChild("rewardName");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +72,7 @@ namespace UI.ActivityMain
             m_RewardBtn.Dispose();
             m_RewardBtn = null;
             m_rewardName = null;
+            m_rewardNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,6 +13,7 @@ namespace UI.ActivityMain
         public GTextField m_activityTime;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
+        public GLoader m_shopBtn;
         public GGraph m_bgEffect;
         public GGraph m_btnEffect;
         public const string URL = "ui://4ht5s77uqbf4l";
@@ -68,6 +69,7 @@ namespace UI.ActivityMain
             m_activityTime = (GTextField)comp.GetChild("activityTime");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+            m_shopBtn = (GLoader)comp.GetChild("shopBtn");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_btnEffect = (GGraph)comp.GetChild("btnEffect");
         }
@@ -79,6 +81,7 @@ namespace UI.ActivityMain
             m_activityTime = null;
             m_backBtn = null;
             m_viewBtn = null;
+            m_shopBtn = null;
             m_bgEffect = null;
             m_btnEffect = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertUI.cs

@@ -8,7 +8,7 @@ namespace UI.Common
     {
         public GComponent target;
         public Controller m_checkType;
-        public GGraph m_graphBg;
+        public GGraph m_mask;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
         public GButton m_btnLeft;
@@ -62,7 +62,7 @@ namespace UI.Common
         private void Init(GComponent comp)
         {
             m_checkType = comp.GetController("checkType");
-            m_graphBg = (GGraph)comp.GetChild("graphBg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -72,7 +72,7 @@ namespace UI.Common
         public void Dispose(bool disposeTarget = false)
         {
             m_checkType = null;
-            m_graphBg = null;
+            m_mask = null;
             m_txtContent = null;
             m_txtTips = null;
             m_btnLeft = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_ModalStatusUI.cs

@@ -7,6 +7,7 @@ namespace UI.Common
     public partial class UI_ModalStatusUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GTextField m_txtMessage;
         public GGraph m_holder;
         public const string URL = "ui://mk0fwx0xd4iw4m";
@@ -56,11 +57,13 @@ namespace UI.Common
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_txtMessage = (GTextField)comp.GetChild("txtMessage");
             m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_txtMessage = null;
             m_holder = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv1.cs

@@ -7,8 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComHeadWithLv1
     {
         public GComponent target;
-        public UI_ComHeadIcon m_comHead;
-        public GLoader m_loaHeadBorder;
+        public UI_ComHead m_comHead;
         public GTextField m_txtLv;
         public const string URL = "ui://eg2y0ldpqkjstl8";
         public const string PACKAGE_NAME = "CommonGame";
@@ -57,15 +56,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
-            m_loaHeadBorder = (GLoader)comp.GetChild("loaHeadBorder");
+            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
             m_txtLv = (GTextField)comp.GetChild("txtLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comHead.Dispose();
             m_comHead = null;
-            m_loaHeadBorder = null;
             m_txtLv = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -7,7 +7,7 @@ namespace UI.CommonGame
     public partial class UI_RewardUI
     {
         public GComponent target;
-        public GGraph m_bg;
+        public GGraph m_mask;
         public GGraph m_holderBgCom;
         public GGraph m_holderTitle;
         public GGroup m_downTipsText;
@@ -61,7 +61,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_bg = (GGraph)comp.GetChild("bg");
+            m_mask = (GGraph)comp.GetChild("mask");
             m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_downTipsText = (GGroup)comp.GetChild("downTipsText");
@@ -71,7 +71,7 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_mask = null;
             m_holderBgCom = null;
             m_holderTitle = null;
             m_downTipsText = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographSaveUI.cs

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_PhotographSaveUI
     {
         public GComponent target;
+        public GGraph m_mask;
         public GImage m_imgRes;
         public GImage m_imgBorder;
         public GButton m_btnClose;
@@ -62,6 +63,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_mask = (GGraph)comp.GetChild("mask");
             m_imgRes = (GImage)comp.GetChild("imgRes");
             m_imgBorder = (GImage)comp.GetChild("imgBorder");
             m_btnClose = (GButton)comp.GetChild("btnClose");
@@ -73,6 +75,7 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_mask = null;
             m_imgRes = null;
             m_imgBorder = null;
             m_btnClose = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -23,6 +23,7 @@ namespace UI.LuckyBox
         public GTextField m_txtCount;
         public GTextField m_txtHasTime;
         public GGroup m_grpActivityTips;
+        public GLoader m_ImgUp;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -86,6 +87,7 @@ namespace UI.LuckyBox
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtHasTime = (GTextField)comp.GetChild("txtHasTime");
             m_grpActivityTips = (GGroup)comp.GetChild("grpActivityTips");
+            m_ImgUp = (GLoader)comp.GetChild("ImgUp");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +110,7 @@ namespace UI.LuckyBox
             m_txtCount = null;
             m_txtHasTime = null;
             m_grpActivityTips = null;
+            m_ImgUp = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_StoryFightSingleScoreUI
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GLoader m_bg;
         public GGraph m_bgEffect;
         public GGraph m_holder;
@@ -62,6 +63,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_bg = (GLoader)comp.GetChild("bg");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_holder = (GGraph)comp.GetChild("holder");
@@ -73,6 +75,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_bg = null;
             m_bgEffect = null;
             m_holder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingUI.cs

@@ -8,12 +8,12 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_type;
-        public GLoader m_Bg;
+        public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GButton m_btnChange;
         public GLoader m_btnChageLine;
-        public GLoader m_loaBg;
+        public GLoader m_role;
         public GList m_list;
         public GButton m_btnReward;
         public GButton m_btnSuit;
@@ -71,12 +71,12 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_type = comp.GetController("type");
-            m_Bg = (GLoader)comp.GetChild("Bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChange = (GButton)comp.GetChild("btnChange");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_role = (GLoader)comp.GetChild("role");
             m_list = (GList)comp.GetChild("list");
             m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnSuit = (GButton)comp.GetChild("btnSuit");
@@ -90,12 +90,12 @@ namespace UI.Studio
         public void Dispose(bool disposeTarget = false)
         {
             m_type = null;
-            m_Bg = null;
+            m_loaBg = null;
             m_comValueBar = null;
             m_btnBack = null;
             m_btnChange = null;
             m_btnChageLine = null;
-            m_loaBg = null;
+            m_role = null;
             m_list = null;
             m_btnReward = null;
             m_btnSuit = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_XiuFangUI.cs

@@ -7,7 +7,7 @@ namespace UI.XiuFang
     public partial class UI_XiuFangUI
     {
         public GComponent target;
-        public GLoader m_bg;
+        public GLoader m_loaBg;
         public GButton m_btnBack;
         public UI_Component m_component;
         public const string URL = "ui://kv0ad4wy9xlo0";
@@ -57,13 +57,13 @@ namespace UI.XiuFang
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_component = (UI_Component)UI_Component.Create(comp.GetChild("component"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_btnBack = null;
             m_component.Dispose();
             m_component = null;

GameClient/Assets/Game/HotUpdate/HotUpdateDriver.cs

@@ -19,6 +19,11 @@ namespace GFGGame
             //Game
             OperationSystem.Initialize();
             GameController.Start();
+            Reporter reporter = GameObject.Find("Reporter").GetComponent<Reporter>();
+            if(LauncherConfig.ChannelId != (int)ChannelID.Test && reporter != null)
+            {
+                reporter.numOfCircleToShow = 50;
+            }
         }
 
         private void Update()
@@ -45,17 +50,17 @@ namespace GFGGame
             }
         }
 
-        private float pauseTime;
+        private long pauseTime;
 
         private void OnApplicationPause(bool pause)
         {
             if(pause)
             {
-                pauseTime = Time.realtimeSinceStartup;
+                pauseTime = ET.TimeHelper.ClientNowSeconds();
             }
             else
             {
-                if(Time.realtimeSinceStartup - pauseTime > 300 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+                if(ET.TimeHelper.ClientNowSeconds() - pauseTime > 180 || LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
                 {
                     StartCoroutine(CheckVersion(VersionController.DefaultPackage));
                 }

GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -1,10 +1,11 @@
-namespace GFGGame
+using ET;
+using UnityEngine;
+
+namespace GFGGame
 {
 
     public class QDManager
     {
-        public static bool isInited = false;
-
         public static void Init()
         {
             switch(LauncherConfig.ChannelId)
@@ -18,17 +19,6 @@
             }
         }
 
-        public static void InitPlatform()
-        {
-            ViewManager.Show<ModalStatusView>("正在初始化...");
-            switch (LauncherConfig.ChannelId)
-            {
-                default:
-                    EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
-                    break;
-            }
-        }
-
         public static void Login()
         {
             ViewManager.Show<ModalStatusView>("登录中...");
@@ -95,12 +85,19 @@
             }
         }
 
-        public static void Logout()
+        public static void Logout(bool fromSdkLogoutCallback)
         {
+            GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
+            GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
+            GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
+            if (PlayerPrefs.HasKey(GameConst.PASSWORD_LAST_LOGIN_KEY))
+            {
+                PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
+            }
             switch (LauncherConfig.ChannelId)
             {
                 default:
-
+                    ViewManager.Show<LoginInputView>();
                     break;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -47,6 +47,7 @@ namespace GFGGame
         {
             base.OnShown();
             RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-70);
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -11,6 +11,7 @@ namespace GFGGame
     {
         private UI_ActivityTeaVisitUI _ui;
         private int time;
+        private int activityID;
         private EffectUI _effectUI1;
         public override void Dispose()
         {
@@ -51,17 +52,17 @@ namespace GFGGame
             base.OnShown();
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xnbh_bg");
             _ui.m_ruleIcon.data = 300028;
-
-
+            activityID = 5004;
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
             time = limitData.TotalPlayMax - limitData.PlayTimes;
             _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;
-
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray.Length;
-            long timeActivity = ActivityTeaDataManager.Instance.GetEndTime(ActivityType.NewYearVisit) - TimeHelper.ServerNow();
-            _ui.m_time.text = timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity);
-
-            Timers.inst.Add(60.0f, 0, UpdateTime);
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            _ui.m_time.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            Timers.inst.Add(1, 0, UpdateTime);
         }
 
         protected override void OnHide()
@@ -86,9 +87,18 @@ namespace GFGGame
         
         private void UpdateTime(object param = null)
         {
-            long timeActivity = ActivityTeaDataManager.Instance.GetEndTime(ActivityType.NewYearVisit) - TimeHelper.ServerNow();
-            _ui.m_time.text = timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity);
-
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            if (endTime < curTime)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                Timers.inst.Remove(UpdateTime);
+                GameController.GoBackToMainView();
+                return;
+            }
+            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            _ui.m_time.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
         }
 
         private void UpdateVisitNum()

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

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_ActivityMainTipsUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            modal = true;
             _ui.m_icon.onClick.Add(OnBtnAdJump);
             _ui.m_btnChange.onClick.Add(OnClickChange);
             _ui.m_backBtn.onClick.Add(OnClickChange);

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

@@ -4,6 +4,7 @@ using UI.Main;
 using System.Collections.Generic;
 using UnityEngine;
 using System.Collections;
+using Assets.Game.HotUpdate.Data;
 using ET;
 
 namespace GFGGame
@@ -98,7 +99,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.target.touchable = false;
+            GRoot.inst.touchable = false;
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if ((this.viewData as object[]) != null)
@@ -134,19 +135,22 @@ namespace GFGGame
 
             _valueBarController.OnShown();
 
-                UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
-                valueBar.m_c1.selectedIndex = 12;
-                UI_ComponentValueBar.ProxyEnd();
-                _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
-                _ui.m_selectChapter.visible = false;
-                _ui.m_switchChapter.visible = false;
-                _ui.m_bonusBox.visible = false;
-                _ui.m_ActivityZCJB.visible = true;
-                long timeActivity = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(17).EndTime - TimeHelper.ServerNow();
-                _ui.m_ZCJBTimeText.text = "剩余时间：" + (timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity));
-                Timers.inst.Add(60.0f, 0, UpdateActivityTime);
+            UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
+            valueBar.m_c1.selectedIndex = 12;
+            UI_ComponentValueBar.ProxyEnd();
+            _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _ui.m_selectChapter.visible = false;
+            _ui.m_switchChapter.visible = false;
+            _ui.m_bonusBox.visible = false;
+            _ui.m_ActivityZCJB.visible = true;
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            _ui.m_ZCJBTimeText.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            Timers.inst.Add(1, 0, UpdateActivityTime);
             //
-            _ui.m_t0.SetHook("canHit", () => { _ui.target.touchable = true; });
+            _ui.m_t0.SetHook("canHit", () => { GRoot.inst.touchable = true; });
             _ui.m_t0.Play();
 
 
@@ -373,6 +377,16 @@ namespace GFGGame
 
         private void UpdateActivityTime(object param = null)
         {
+            ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            if (endTime < curTime)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                Timers.inst.Remove(UpdateActivityTime);
+                GameController.GoBackToMainView();
+                return;
+            }
             long timeActivity = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(17).EndTime - TimeHelper.ServerNow();
             _ui.m_ZCJBTimeText.text = "剩余时间：" + (timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity));
         }

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

@@ -28,9 +28,9 @@ namespace GFGGame
             _ui = UI_ActivityZCJBRewardUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
-            _ui.m_backBtn.onClick.Add(this.Hide);
+            modal = true;
             _ui.m_back.onClick.Add(this.Hide);
+            _ui.m_backBtn.onClick.Add(this.Hide);
             _ui.m_List.itemRenderer = RenderRewardList;
         }
         protected override void OnShown()
@@ -38,7 +38,7 @@ namespace GFGGame
             base.OnShown();
             UpdateList();
             _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
-            _ui.m_List.ScrollToView(ActivityDataManager.Instance.ActivityZCJBList.Count, false, true);
+            _ui.m_List.ScrollToView(Mathf.Max(0, ActivityDataManager.Instance.ActivityZCJBList.Count - 1), false, true);
         }
         protected override void OnHide()
         {
@@ -97,6 +97,19 @@ namespace GFGGame
             }
             item.m_List.data = ActivityDressCfgArray.Instance.dataArray[index].bonusArr;
             item.m_List.numItems = ActivityDressCfgArray.Instance.dataArray[index].bonusArr.Length;
+
+            //最后一档特殊处理
+            if(index == ActivityDressCfgArray.Instance.dataArray.Length - 1)
+            {
+                item.m_rewardNum.visible = true;
+                int numChange = GameGlobal.myNumericComponent.GetAsInt(NumericType.ActivityDressLastGearRewrdNum);
+                item.m_rewardNum.text = string.Format("已兑换次数：{0}/{1}", numChange, 50);
+                RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, false);
+            }
+            else
+            {
+                item.m_rewardNum.visible = false;
+            }
             UI_ActivityRewardItemUI.ProxyEnd();
         }
 

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

@@ -31,14 +31,16 @@ namespace GFGGame
             _ui = UI_ActivityZCJB.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            modal = true;
             _ui.m_viewBtn.onClick.Add(OnBtnAdJump);
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
             _ui.m_btnChange.onClick.Add(this.Hide);
+            _ui.m_shopBtn.onClick.Add(OnClickShopBtn);
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "zcjb_All");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "zcjb_icon");
-        }
+        }                
         protected override void OnShown()
         {
             base.OnShown();
@@ -73,6 +75,10 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityZCJBRewardView>();
         }
+        private void OnClickShopBtn()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+        }
         private async void ReqInfo()
         {
             bool result = await ActivitySProxy.ReqActivityZCJBInfo();

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

@@ -7,7 +7,7 @@ using ET;
 
 namespace GFGGame
 {
-    public class MonthlyCardTipsView : BaseView
+    public class MonthlyCardTipsView : BaseWindow
     {
         private UI_MonthlyCardTipsUI _ui;
         private int rewards = 3;
@@ -31,6 +31,7 @@ namespace GFGGame
             _ui = UI_MonthlyCardTipsUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            modal = true;
             _ui.m_rewardList.itemRenderer = ListItemRender;
             _ui.m_btnBuyTxt.onClick.Add(OnBtnAdJump);
             _ui.m_backBtn.onClick.Add(Hide);

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

@@ -61,7 +61,6 @@ namespace GFGGame
         private void OnClickBtnSure()
         {
             RoleLimitSProxy.ReqBuyLimitPlayTimes(500, 1, 1).Coroutine();
-            EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE);
         }
         private void LimitChanged(EventContext context = null)
         {

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertSystem.cs

@@ -44,6 +44,18 @@ namespace GFGGame
         {
             _alertWindow = null;
         }
+
+        public static bool IsShow
+        {
+            get
+            {
+                if (_alertWindow == null)
+                {
+                    return false;
+                }
+                return _alertWindow.isShowing;
+            }
+        }
     }
 
 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_comList.m_listReward.itemRenderer = RenderListRewardItem;
-            _ui.m_bg.onClick.Add(this.Hide);
+            _ui.m_mask.onClick.Add(this.Hide);
         }
         protected override void OnShown()
         {

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     {
         private UI_LoginUI _ui;
         private GameObject _sceneObject;
+        private bool autoLogined;
 
 
         public override void Dispose()
@@ -41,6 +42,8 @@ namespace GFGGame
         {
             base.OnInit();
             _ui.m_txtVersion.text = GameGlobal.version;
+
+
             _ui.m_btnNotice.onClick.Add(OnClickBtnNotice);
             _ui.m_btnStart.onClick.Add(OnClickBtnStart);
             _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
@@ -59,7 +62,6 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
             EventAgent.AddEventListener(ConstMessage.LOGIN_SUCCESS, OnLoginSuccess);
-            EventAgent.AddEventListener(ConstMessage.ON_PLATFORM_SDK_INITED, OnPlatformInitet);
             EventAgent.AddEventListener(ConstMessage.ON_PLATFORM_SDK_LOGINED, OnPlatformLogined);
         }
         protected override void OnShown()
@@ -74,9 +76,6 @@ namespace GFGGame
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             ServerInfo recentlyServerInfo = serverInfosComponent.recentlyServerInfo;
             UpdateServer(recentlyServerInfo);
-            _ui.m_btnStart.visible = false;
-            _ui.m_btnTapLogin.visible = false;
-            _ui.m_btnLogout.visible = false;
             //_ui.m_btnAgree.selected = LocalCache.GetBool(GameConst.LAST_LOGIN_IS_AGREE_KEY, false);
             _ui.m_btnAgree.selected = true;
 
@@ -95,22 +94,17 @@ namespace GFGGame
                         });
                 return;
             }
-
-            if (QDManager.isInited)
-            {
-                EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
-            }
-            else
+            if (!autoLogined)
             {
-                //初始化平台配置
-                QDManager.InitPlatform();
+                autoLogined = true;
+                ResetLoginButton();
+                TryLogin();
             }
-
         }
 
         protected override void OnHide()
         {
-
+            autoLogined = false;
             if (_sceneObject != null)
             {
                 PrefabManager.Instance.Restore(_sceneObject);
@@ -123,7 +117,6 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
             EventAgent.RemoveEventListener(ConstMessage.LOGIN_SUCCESS, OnLoginSuccess);
-            EventAgent.RemoveEventListener(ConstMessage.ON_PLATFORM_SDK_INITED, OnPlatformInitet);
             EventAgent.RemoveEventListener(ConstMessage.ON_PLATFORM_SDK_LOGINED, OnPlatformLogined);
         }
 
@@ -141,27 +134,6 @@ namespace GFGGame
             LogServerHelperHttp.SendNodeLog((int)LogNode.ShowSelectServer);
         }
 
-        private void OnPlatformInitet(EventContext context)
-        {
-            ViewManager.Hide<ModalStatusView>();
-            var success = (bool)context.data;
-            Debug.Log($"InitPlatform success {success}");
-            if (success)
-            {
-                QDManager.isInited = true;
-                _ui.m_btnTapLogin.visible = QDManager.IsTaptap;
-                _ui.m_btnStart.visible = !QDManager.IsTaptap;
-                //尝试自动登录
-                TryLogin();
-            }
-            else
-            {
-                AlertSystem.Show("初始化平台sdk失败！")
-                .SetRightButton(true, "重试", (t) => { QDManager.InitPlatform(); });
-            }
-
-        }
-
         private void OnPlatformLogined(EventContext context)
         {
             var account = (string)context.data;
@@ -211,7 +183,8 @@ namespace GFGGame
 
         private void OnClickBtnLogout()
         {
-            GameController.QuitToLoginView(true);
+            ResetLoginButton();
+            QDManager.Logout(false);
         }
         private void OnClickBtnAge()
         {
@@ -236,5 +209,12 @@ namespace GFGGame
                 LoginController.GetRoles().Coroutine();
             }
         }
+
+        private void ResetLoginButton()
+        {
+            _ui.m_btnLogout.visible = false;
+            _ui.m_btnTapLogin.visible = QDManager.IsTaptap;
+            _ui.m_btnStart.visible = !QDManager.IsTaptap;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
                 LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
             }
 
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];  //默认跳转进来是第二个活动
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];  //默认跳转进来是第一个活动
             if (this.viewData != null)
             {
                 int index = (int)this.viewData;  //传入的值为第几个活动，不是活动id
@@ -174,6 +174,7 @@ namespace GFGGame
             else
                 _listActivityBtnObj[boxId] = obj;
 
+            comBox.m_ImgUp.visible = index == 0;
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2)
             {

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

@@ -116,7 +116,7 @@ namespace GFGGame
         {
             base.OnShown();
 
-            _ui.target.touchable = false;
+            GRoot.inst.touchable = false;
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if ((this.viewData as object[]) != null)
@@ -139,7 +139,7 @@ namespace GFGGame
             }
 
             _valueBarController.OnShown();
-            _ui.m_t0.SetHook("canHit", () => { _ui.target.touchable = true; });
+            _ui.m_t0.SetHook("canHit", () => { GRoot.inst.touchable = true; });
             _ui.m_t0.Play();
             Timers.inst.AddUpdate(CheckGuide);
 

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

@@ -187,7 +187,7 @@ namespace GFGGame
             dressUpObjUI.ResetSceneObj(100, false, true, null, false);
             dressUpObjUI.dressUpObj.PutOnItemList(roleData.itemList);
             dressUpObjUI.UpdateWrapper(_ui.m_holder);
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
 
             if (!FightDataManager.Instance.autoPlay)
             {

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

@@ -55,6 +55,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBtnFightTimes);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateBtnFightTimes);
         }
         protected override void OnShown()
         {
@@ -83,6 +84,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBtnFightTimes);
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateBtnFightTimes);
         }
         private void OnClickBtnStart()
         {

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

@@ -945,7 +945,7 @@ namespace GFGGame
             if (_ui.m_btnTea.target.visible)
             {
                 if (redPointUpdateFrame == 19)
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -24, -3);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed() || ActivityTeaDataManager.Instance.CheckHRDRed(), "", -24, -3);
             }
             // 招财进宝活动
             if (_ui.m_btnActivityZCJB.target.visible)
@@ -963,14 +963,14 @@ namespace GFGGame
 
         private void CheckProbabilityUp()
         {
-            long curTime = TimeHelper.ServerNow();
-            long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
+            //long curTime = TimeHelper.ServerNow();
+            //long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
             //int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             //if (activityId > 0)
-            if (endTime >= curTime)
-                _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
-            else
-                _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;
+            //if (endTime >= curTime)
+            //    _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
+            //else
+            //    _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -41,7 +41,7 @@ namespace GFGGame
             isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
-            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
             _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 
             _ui.m_list.itemRenderer = RenderListItem;
@@ -116,7 +116,7 @@ namespace GFGGame
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
             _ui.m_btnAdd.visible = limitCfg.itemID > 0;
-            _ui.m_loaBg.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
+            _ui.m_role.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
             _ui.m_btnChange.title = _studioCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
 

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -36,7 +36,7 @@ namespace GFGGame
             _ui.m_component.m_btnClothingUpgrade.target.onClick.Add(OnClickBtnClothingUpgrade);
             _ui.m_component.m_btnDecompose.target.onClick.Add(OnClickBtnDecompose);
 
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("xf_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xf_bg");
         }
         protected override void AddEventListener()
         {

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_9!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 23cd6a994bf961b4b9bd7428cb851f33
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/CommonGame/CommonGame_atlas0_9.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 948a4a39b5437b041bf8fd286dab80a9
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: