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

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

@@ -246,5 +246,7 @@ namespace GFGGame
         public const string TIMETRACINGUPDATE = "TIMETRACING_UPDATE";
         //时光回溯红点更新
         public const string TIMETRACINGREDUPDATE = "TIMETRACING_RED_UPDATE";
+        //章节奖励红点更新
+        public const string STORYCHAPREDUPDATE = "STORYCHAP_RED_UPDATE";
     }
 }

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

@@ -216,6 +216,9 @@ namespace GFGGame
 
             await ShopSProxy.ReqShopInfo();
 
+            await ActivitySProxy.ReqGetNewPlayerBonusStatus();
+            await ActivitySProxy.GetNewPlayerOnceStatus();
+
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             bool result = await FieldSProxy.ReqFieldInstanceInfos();
             if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
@@ -229,11 +232,10 @@ namespace GFGGame
             GameGlobal.AfterDataInited = true;
             EventAgent.DispatchEvent(ConstMessage.AFTER_DATA_INITED);
 
-
-
             ItemProxy.GetItemAttributeInfos().Coroutine();
             ItemProxy.ReqGetItemCollect().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
+            MainStorySProxy.GetStoryBonusDate().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
             BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();     

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

@@ -38,6 +38,8 @@ namespace GFGGame
         /**********************************************************限时累充*************************************************/
         public int lastActLimitChargeId = 0;
         private int _actLimitChargeId = 0;
+        /**********************************************************限时累充*************************************************/
+        public bool IsGetNewPlayerReward = false;
         /// <summary>
         /// 当前限时累充活动id
         /// </summary>
@@ -210,6 +212,46 @@ namespace GFGGame
             }
             return true;
         }
+
+        public bool HaveGetSevenDayBonus()
+        {
+            foreach (int a in sevenDayLoginBonusStatusList)
+            {
+                if (a == 0) return true;
+            }
+            return false;
+        }
+        //判断最后可领取的奖励索引
+        public int NowSevenDayBonusDay(bool day = false)
+        {
+            if(AllSevenDayBonusGot())
+            {
+                return 8;
+            }
+            int a = 0;
+            int flog = -1;
+            if (day)
+            {
+                for (int j = 0; j < sevenDayLoginBonusStatusList.Count; j++)
+                {
+                    a = sevenDayLoginBonusStatusList[j];
+                    if (a == 1)
+                    {
+                        flog = j;
+                        return flog;
+                    }
+                }
+            }
+            else
+            {
+                for (int j = 0; j < sevenDayLoginBonusStatusList.Count; j++)
+                {
+                    a = sevenDayLoginBonusStatusList[j];
+                    if (a == 2) flog = j;
+                }
+            }
+            return flog;
+        }
         /******************************************************************************************************************/
 
         private int _firstChargeBonusStatus = 0;

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

@@ -168,5 +168,19 @@ namespace GFGGame
             return ConstInstanceZonesSubType.Normal;
         }
 
+        //章节奖励状态
+        public static Dictionary<int, int> ChapterRewardStatusDic = new Dictionary<int, int>();
+
+        public static bool GetChapterRewardStatus()
+        {
+            foreach(var item in ChapterRewardStatusDic)
+            {
+                if(item.Value == 1)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -0,0 +1,98 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_NewPlayersTipsUI
+    {
+        public GComponent target;
+        public GLoader m_btnBack;
+        public GLoader m_icon;
+        public GTextField m_activityDesc;
+        public GButton m_GetRewardBtn;
+        public GLoader m_backBtn;
+        public GGraph m_effectBtn;
+        public GGraph m_effectBG;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77uqdyb1f";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "NewPlayersTipsUI";
+        private static UI_NewPlayersTipsUI _proxy;
+
+        public static UI_NewPlayersTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewPlayersTipsUI();
+            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_NewPlayersTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewPlayersTipsUI();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_activityDesc = (GTextField)comp.GetChild("activityDesc");
+            m_GetRewardBtn = (GButton)comp.GetChild("GetRewardBtn");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_effectBtn = (GGraph)comp.GetChild("effectBtn");
+            m_effectBG = (GGraph)comp.GetChild("effectBG");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_icon = null;
+            m_activityDesc = null;
+            m_GetRewardBtn = null;
+            m_backBtn = null;
+            m_effectBtn = null;
+            m_effectBG = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_SevenDailyTipsUI
+    {
+        public GComponent target;
+        public GLoader m_btnBack;
+        public GTextField m_activityDesc;
+        public GLoader m_icon;
+        public GLoader m_backBtn;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77uymxo1o";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "SevenDailyTipsUI";
+        private static UI_SevenDailyTipsUI _proxy;
+
+        public static UI_SevenDailyTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SevenDailyTipsUI();
+            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_SevenDailyTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SevenDailyTipsUI();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_activityDesc = (GTextField)comp.GetChild("activityDesc");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_activityDesc = null;
+            m_icon = null;
+            m_backBtn = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ClothingDecomposeUI.cs

@@ -10,7 +10,7 @@ namespace UI.ClothingDecompose
         public Controller m_c1;
         public Controller m_TouchSelect;
         public Controller m_clothesType;
-        public GLoader m_loaBg;
+        public GLoader m_loadBg;
         public GLoader m_Top_img;
         public UI_Button6 m_btnClothing;
         public UI_Button6 m_btnSkillBook;
@@ -77,7 +77,7 @@ namespace UI.ClothingDecompose
             m_c1 = comp.GetController("c1");
             m_TouchSelect = comp.GetController("TouchSelect");
             m_clothesType = comp.GetController("clothesType");
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loadBg = (GLoader)comp.GetChild("loadBg");
             m_Top_img = (GLoader)comp.GetChild("Top_img");
             m_btnClothing = (UI_Button6)UI_Button6.Create(comp.GetChild("btnClothing"));
             m_btnSkillBook = (UI_Button6)UI_Button6.Create(comp.GetChild("btnSkillBook"));
@@ -100,7 +100,7 @@ namespace UI.ClothingDecompose
             m_c1 = null;
             m_TouchSelect = null;
             m_clothesType = null;
-            m_loaBg = null;
+            m_loadBg = null;
             m_Top_img = null;
             m_btnClothing.Dispose();
             m_btnClothing = null;

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_BtnModle3
+    {
+        public GButton target;
+        public GLoader m_bg;
+        public GLoader m_Icon;
+        public GLoader m_textIcon;
+        public const string URL = "ui://mfvz4q8kg91j9fzc";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "BtnModle3";
+        private static UI_BtnModle3 _proxy;
+
+        public static UI_BtnModle3 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnModle3();
+            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_BtnModle3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnModle3();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_Icon = (GLoader)comp.GetChild("Icon");
+            m_textIcon = (GLoader)comp.GetChild("textIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_Icon = null;
+            m_textIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component8
+    {
+        public GComponent target;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public const string URL = "ui://mfvz4q8kg91j9fzb";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Component8";
+        private static UI_Component8 _proxy;
+
+        public static UI_Component8 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component8();
+            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_Component8 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component8();
+            }
+            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_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -18,6 +18,7 @@ namespace UI.Main
         public GLoader m_numBg;
         public GTextField m_txtCurProgress;
         public GTextField m_txtMaxProgress;
+        public UI_Component8 m_reward;
         public GImage m_imgLockBg;
         public GTextField m_txtLockDesc;
         public const string URL = "ui://mfvz4q8kslb41t";
@@ -78,6 +79,7 @@ namespace UI.Main
             m_numBg = (GLoader)comp.GetChild("numBg");
             m_txtCurProgress = (GTextField)comp.GetChild("txtCurProgress");
             m_txtMaxProgress = (GTextField)comp.GetChild("txtMaxProgress");
+            m_reward = (UI_Component8)UI_Component8.Create(comp.GetChild("reward"));
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_txtLockDesc = (GTextField)comp.GetChild("txtLockDesc");
         }
@@ -95,6 +97,8 @@ namespace UI.Main
             m_numBg = null;
             m_txtCurProgress = null;
             m_txtMaxProgress = null;
+            m_reward.Dispose();
+            m_reward = null;
             m_imgLockBg = null;
             m_txtLockDesc = null;
             if(disposeTarget && target != null)

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

@@ -39,8 +39,10 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModleEffect m_btnHaiZhiShi;
-        public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnDailyWelfare;
+        public UI_BtnModle1 m_btnNewPlayerReward;
+        public UI_BtnModle3 m_btnSevenReward;
+        public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnActivityDay7;
         public GGroup m_AllUI;
         public GGraph m_touchMask;
@@ -126,8 +128,10 @@ namespace UI.Main
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnHaiZhiShi = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnHaiZhiShi"));
-            m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
+            m_btnNewPlayerReward = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewPlayerReward"));
+            m_btnSevenReward = (UI_BtnModle3)UI_BtnModle3.Create(comp.GetChild("btnSevenReward"));
+            m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
             m_AllUI = (GGroup)comp.GetChild("AllUI");
             m_touchMask = (GGraph)comp.GetChild("touchMask");
@@ -190,10 +194,14 @@ namespace UI.Main
             m_btnHuanZhuang = null;
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
-            m_btnNewYearRedEnvelope.Dispose();
-            m_btnNewYearRedEnvelope = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
+            m_btnNewPlayerReward.Dispose();
+            m_btnNewPlayerReward = null;
+            m_btnSevenReward.Dispose();
+            m_btnSevenReward = null;
+            m_btnNewYearRedEnvelope.Dispose();
+            m_btnNewYearRedEnvelope = null;
             m_btnActivityDay7.Dispose();
             m_btnActivityDay7 = null;
             m_AllUI = null;

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

@@ -10,7 +10,7 @@ namespace UI.RoleInfo
         public Controller m_type;
         public GLoader m_loaBg;
         public GLoader m_Top_img;
-        public GTextField m_txtVersion;
+        public GRichTextField m_txtVersion;
         public GButton m_btnHelp;
         public GButton m_btnBack;
         public GTextField m_leagueName;
@@ -84,7 +84,7 @@ namespace UI.RoleInfo
             m_type = comp.GetController("type");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_Top_img = (GLoader)comp.GetChild("Top_img");
-            m_txtVersion = (GTextField)comp.GetChild("txtVersion");
+            m_txtVersion = (GRichTextField)comp.GetChild("txtVersion");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_leagueName = (GTextField)comp.GetChild("leagueName");

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TimeTracing/UI_proBarItem.cs

@@ -9,6 +9,7 @@ namespace UI.TimeTracing
         public GComponent target;
         public Controller m_c1;
         public GImage m_Got;
+        public GLoader m_icon;
         public GImage m_GotIcon;
         public GImage m_canGet;
         public const string URL = "ui://gayfh946iwcl2u";
@@ -60,6 +61,7 @@ namespace UI.TimeTracing
         {
             m_c1 = comp.GetController("c1");
             m_Got = (GImage)comp.GetChild("Got");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_GotIcon = (GImage)comp.GetChild("GotIcon");
             m_canGet = (GImage)comp.GetChild("canGet");
         }
@@ -67,6 +69,7 @@ namespace UI.TimeTracing
         {
             m_c1 = null;
             m_Got = null;
+            m_icon = null;
             m_GotIcon = null;
             m_canGet = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            //LoginAddress = "10.108.64.127:10005";//测试地址
+            //LoginAddress = "192.168.2.12:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -39,6 +39,8 @@ namespace GFGGame
         public static bool AutoSpecialOfferGiftBoxView = true;
         public static bool AutoAcitivtyTipsLoginView = true;
         public static bool AutoMonthlyCardView = true;
+        public static bool AutoNewPlayersTips = true;
+        public static bool NewPlayerOnceTips = true;
         //用于标记自动检测打开界面流程已执行完毕
         public static bool AutoShowCompleted;
 

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

@@ -316,6 +316,75 @@ namespace GFGGame
             }
             return false;
         }
+
+        //**************************新人礼包领取
+        public static async ETTask<bool> ReqGetNewPlayerBonus()
+        {
+            S2C_GetNewcomerRewards response = null;
+            response = (S2C_GetNewcomerRewards)await MessageHelper.SendToServer(new C2S_GetNewcomerRewards() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.IsGetNewPlayerReward = response.Status;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+        //获取新人礼包状态
+        public static async ETTask<bool> ReqGetNewPlayerBonusStatus()
+        {
+            S2C_GetNewcomerRewardStatus response = null;
+            response = (S2C_GetNewcomerRewardStatus)await MessageHelper.SendToServer(new C2S_GetNewcomerRewardStatus() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.IsGetNewPlayerReward = response.Status;
+                    GameGlobal.AutoNewPlayersTips = response.OpenStatus;
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask SetNewPlayerOnceStatus(long id)
+        {
+            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord (){ K = 100001, V = id });
+        }
+        public static async ETTask<bool> GetNewPlayerOnceStatus()
+        {
+            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
+            for (int i = 0; i < response.AllKs.Count; i++)
+            {
+                if (response.AllKs[i] == 100001)
+                {
+                    if(response.AllVs[i] == 0)
+                    {
+                        GameGlobal.NewPlayerOnceTips = false;
+                        return true;
+                    }
+                    else
+                    {
+                        GameGlobal.NewPlayerOnceTips = true;
+                        return true;
+                    }
+                }
+            }
+            GameGlobal.NewPlayerOnceTips = true;
+            return true;
+        }
+    }
+    //新人活动开启状态推送
+    public class NewPlayerOpenStatus : AMHandler<S2C_PushNewcomerRewardStatus>
+    {
+        protected override async ETTask Run(Session session, S2C_PushNewcomerRewardStatus message)
+        {
+            GameGlobal.AutoNewPlayersTips = message.OpenStatus;
+            await ETTask.CompletedTask;
+        }
+
     }
 }
 

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

@@ -244,7 +244,8 @@ namespace GFGGame
                         }
                     }
                     EventAgent.DispatchEvent(ConstMessage.ARENA_FIGHT_RESULT);
-                    PromptController.Instance.ShowFloatTextPrompt("对方排名已发生变化");
+                    //PromptController.Instance.ShowFloatTextPrompt("对方排名已发生变化");
+                    ErrorCodeController.Handler(response.Error);
                     return false;
                 }
                 else

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

@@ -53,5 +53,48 @@ namespace GFGGame
             return false;
         }
 
+        //请求章节奖励数据
+        public static async ETTask<bool> GetStoryBonusDate()
+        {
+            S2C_GetChapterPassStatus response = null;
+            response = (S2C_GetChapterPassStatus)await MessageHelper.SendToServer(new C2S_GetChapterPassStatus() {  });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    MainStoryDataManager.ChapterRewardStatusDic.Clear();
+                    for(int i = 0;i < response.PassStatusKs.Count;i++)
+                    {
+                        MainStoryDataManager.ChapterRewardStatusDic.Add(response.PassStatusKs[i], response.PassStatusVs[i]);
+                    }    
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //领取章节奖励数据
+        public static async ETTask<bool> GetStoryBonusReward(int id)
+        {
+            S2C_GethapterPassReward response = null;
+            response = (S2C_GethapterPassReward)await MessageHelper.SendToServer(new C2S_GethapterPassReward() { ChapterId = id});
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    for (int i = 0; i < response.PassStatusKs.Count; i++)
+                    {
+                        if(response.PassStatusKs[i] == id)
+                        {
+                            MainStoryDataManager.ChapterRewardStatusDic[id] = response.PassStatusVs[i];
+                        }  
+                    }
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }

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

@@ -152,14 +152,14 @@ namespace GFGGame
         public static async ETTask<bool> ReqSetDataRecord(long SuitID)
         {
             TimeTracingDataManager.Instance.LevelRankDatasDic[1].Clear();
-            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord { K = 6200123,V = SuitID });
+            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord() { K = 6200123,V = SuitID });
             return true;
         }
 
         public static async ETTask<bool> ReqGetDataRecord()
         {
             TimeTracingDataManager.Instance.LevelRankDatasDic[1].Clear();
-            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord { });
+            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
             for(int i = 0; i<response.AllKs.Count;i++)
             {
                 if(response.AllKs[i] == 6200123)

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

@@ -0,0 +1,75 @@
+using FairyGUI;
+using UI.ActivityMain;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class NewPlayersTipsView : BaseWindow
+    {
+        private UI_NewPlayersTipsUI _ui;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_NewPlayersTipsUI.PACKAGE_NAME;
+            _ui = UI_NewPlayersTipsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            modal = true;
+            _ui.m_GetRewardBtn.onClick.Add(OnClickGetReward);
+            _ui.m_backBtn.onClick.Add(OnClickChange);
+            _ui.m_btnBack.onClick.Add(OnClickChange);
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effectBtn, "ui_Activity", "JLQQ_button");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_effectBG, "ui_Activity", "JLQQ_tx_loop");
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            UpdateInfo();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+
+        }
+
+        private async void UpdateInfo()
+        {
+           await ActivitySProxy.SetNewPlayerOnceStatus(0);
+        }
+        private async void OnClickGetReward()
+        {
+            bool result;
+            GameGlobal.NewPlayerOnceTips = false;
+            result = await ActivitySProxy.ReqGetNewPlayerBonus();
+            this.Hide();
+        }
+        private void OnClickChange()
+        {
+            GameGlobal.NewPlayerOnceTips = false;
+            this.Hide();
+        }
+
+    }
+}

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

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

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

@@ -0,0 +1,65 @@
+using FairyGUI;
+using UI.ActivityMain;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class SevenDailyTipsView : BaseWindow
+    {
+        private UI_SevenDailyTipsUI _ui;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_SevenDailyTipsUI.PACKAGE_NAME;
+            _ui = UI_SevenDailyTipsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            modal = true;
+            _ui.m_icon.onClick.Add(OnClickGetReward);
+            _ui.m_backBtn.onClick.Add(OnClickChange);
+            _ui.m_btnBack.onClick.Add(OnClickChange);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            UpdateInfo();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+
+        }
+
+        private void UpdateInfo()
+        {
+            GameGlobal.AutoSevenDayLoginView = false;
+        }
+        private void OnClickGetReward()
+        {
+            ViewManager.Show<SevenDayLoginView>();
+            this.Hide();
+        }
+        private void OnClickChange()
+        {
+            this.Hide();
+        }
+
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -107,10 +108,10 @@ namespace GFGGame
             item.m_txtName.text = itemCfg.name;
             //是礼包就加入红点
             if (((itemCfg.itemType == ConstItemType.USEABLE &&
-                 itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
-                (itemCfg.itemType == ConstItemType.USEABLE &&
-                 itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
-                 && itemData.id != 6003001 && itemData.id != 6003002)
+                  itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
+                 (itemCfg.itemType == ConstItemType.USEABLE &&
+                  itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
+                && itemData.id != 6003001 && itemData.id != 6003002)
             {
                 RedDotController.Instance.SetComRedDot(item.target, true);
             }
@@ -118,6 +119,7 @@ namespace GFGGame
             {
                 RedDotController.Instance.SetComRedDot(item.target, false);
             }
+
             UI_ComItem.ProxyEnd();
         }
 
@@ -141,9 +143,18 @@ namespace GFGGame
             }
             else
             {
-                object[] sourceDatas = new object[]
-                    { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
-                GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+                var bagExchangeCfg = BagExchangeCfgArray.Instance.GetCfg(itemCfg.id);
+                if (bagExchangeCfg != null)
+                {
+					//从背包使用物品
+                    ViewManager.Show<BagExchangeView>(itemCfg.id);
+                }
+                else
+                {
+                    object[] sourceDatas = new object[]
+                        { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
+                    GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+                }
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -49,7 +49,7 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
+            _ui.m_loadBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
 
             _ui.m_listTab.onClickItem.Add((EventContext context) =>
             {

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -149,7 +149,7 @@ namespace GFGGame
             ViewManager.Show<FieldView>();
         }
 
-        private void OnClickBtnArena()
+        private async void OnClickBtnArena()
         {
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name))
             {
@@ -160,7 +160,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("赛季未开始");
                 return;
             }
-
+            await ArenaSproxy.ReqArenaInfos();
             ViewManager.Show<ArenaView>(this.viewData);
             ViewManager.Show<ArenaLoadingView>();
         }

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

@@ -196,7 +196,7 @@ namespace GFGGame
             item.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
             item.m_comIcon.m_txtName.text = itemCfg.name;
             item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_comIcon.m_FlipOpenType.selectedIndex = 1;
+            item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
             item.m_comIcon.m_t1.Play();
 
             // 圆盘出现时等待玩家点击的特效
@@ -274,7 +274,7 @@ namespace GFGGame
             item.m_t0.Play();
             if (item.target.data == null)
             {
-                item.target.onClick.Add(ShowItemTips);
+                //item.target.onClick.Add(ShowItemTips);
             }
             item.target.data = index;
 
@@ -356,18 +356,18 @@ namespace GFGGame
                 _chooseIndex = -1;
                 this.Hide();
             }
-            else
-            {
-                for (int index = 0; index < _rewardList.Count; index++)
-                {
-                    if (!_recordOpenIndex.Contains(index))
-                    {
-                        _chooseIndex = index;
-                        HandClickItem(index);
-                        break;
-                    }
-                }
-            }
+            //else
+            //{
+            //    for (int index = 0; index < _rewardList.Count; index++)
+            //    {
+            //        if (!_recordOpenIndex.Contains(index))
+            //        {
+            //            _chooseIndex = index;
+            //            HandClickItem(index);
+            //            break;
+            //        }
+            //    }
+            //}
         }
 
         private void OnClickBtnPass()
@@ -550,9 +550,9 @@ namespace GFGGame
                     _recordTurnIndex.Add(index);
 
                 //先翻开牌面 
-                item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
+                //item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
                 //item.m_t1.Play();
-                item.m_t2.Play();
+                //item.m_t2.Play();
 
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemIdList[index]);
 
@@ -584,7 +584,7 @@ namespace GFGGame
                 }
 
 
-                item.m_comIcon.m_t0.Play();
+                //item.m_comIcon.m_t0.Play();
                 _recordOpenIndex.Add(index);
                 UI_LuckyBoxBonusShowItem.ProxyEnd();
             }

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

@@ -349,9 +349,10 @@ namespace GFGGame
 
                 RemoveListener();
                 //ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
-
-                ViewManager.Show<LuckyBoxBonusShowView>(_rewardList);
                 this.Hide();
+                LuckyBoxVideoView.Instance.Show(_rewardList);
+                //ViewManager.Show<LuckyBoxBonusShowView>(_rewardList);
+                
                 //ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
 
             }

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

@@ -0,0 +1,127 @@
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.Video;
+using YooAsset;
+using GFGGame.Launcher;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class LuckyBoxVideoView : SingletonMonoBase<LuckyBoxVideoView>
+    {
+        private const float VideoWidth = 1080f;
+        private const float VideoHeight = 1920f;
+        private GameObject _ui;
+        private AssetOperationHandle handle;
+        private RawFileOperationHandle videoHandle;
+        private RawImage imgVideo;
+        private Button BtnSkipVertical;
+        private VideoPlayer videoPlayer;
+        private List<ItemData> _rewardList;
+
+        public void Show(List<ItemData> _reward = null)
+        {
+            MusicManager.Instance.Stop();
+            string path = ResPathUtil.GetUUIPrefabPath("UILuckyBox");
+            handle = YooAssets.LoadAssetSync<GameObject>(path);
+            _ui = handle.InstantiateSync(UGUIManager.Instance.desktop.transform);
+            imgVideo = _ui.transform.Find("ImgVideo").GetComponent<RawImage>();
+
+
+            BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();
+            BtnSkipVertical.onClick.AddListener(OnClickrectBtnSkip);
+            BtnSkipVertical.gameObject.SetActive(false);
+
+            videoPlayer = _ui.transform.Find("VideoPlayer").GetComponent<VideoPlayer>();
+            videoPlayer.loopPointReached += OnVideoEnded;
+            videoPlayer.prepareCompleted += OnVideoPrepared;
+
+            string assetPath = ResPathUtil.GetVideoPath("normalLucky");
+            videoHandle = YooAssets.LoadRawFileSync(assetPath);
+            videoPlayer.url = videoHandle.GetRawFilePath();
+            videoPlayer.Play();
+
+            _rewardList = _reward;
+        }
+
+        private void OnVideoPrepared(VideoPlayer source)
+        {
+            videoPlayer.prepareCompleted -= OnVideoPrepared;
+            StartCoroutine(FadeButtonOverTime(BtnSkipVertical));
+        }
+
+        IEnumerator FadeButtonOverTime(Button btn)
+        {
+            Image buttonImage = btn.GetComponent<Image>();
+            //Image img = btn.GetComponentInChildren<Image>();
+            yield return new WaitForSeconds((float)videoPlayer.length - 3f);
+            if (buttonImage != null)
+            {
+                // 获取初始颜色
+                Color startColor = buttonImage.color;
+                //Color startColorText = img.color;
+
+                // 目标颜色，透明度设为 0
+                Color targetColor = new Color(startColor.r, startColor.g, startColor.b, 0f);
+                //Color targetColorText = new Color(startColorText.r, startColorText.g, startColorText.b, 0f);
+
+                float fadeDuration = 1f;
+                // 记录开始时间
+                float startTime = Time.time;
+
+                while (Time.time - startTime < fadeDuration)
+                {
+                    // 在一定时间内逐渐插值颜色
+                    float t = (Time.time - startTime) / fadeDuration;
+                    buttonImage.color = Color.Lerp(startColor, targetColor, t);
+                    //img.color = Color.Lerp(startColorText, targetColorText, t);
+                    yield return null; // 等待下一帧
+                }
+
+                // 设置最终颜色，确保透明度为 0
+                buttonImage.color = targetColor;
+                //img.color = targetColorText;
+            }
+        }
+
+        private void OnVideoEnded(VideoPlayer source)
+        {
+            this.Hide();
+        }
+
+        private void OnClickrectBtnSkip()
+        {
+            Hide();
+        }
+
+        private void OnClickBtnFullScreen()
+        {
+            BtnSkipVertical.gameObject.SetActive(false);
+            imgVideo.rectTransform.localRotation = Quaternion.Euler(0, 0, -90);
+            Vector2 imgVideoSizeDelta = imgVideo.rectTransform.sizeDelta;
+            imgVideoSizeDelta.y = Screen.width;
+            imgVideoSizeDelta.x = (VideoWidth / VideoHeight) * imgVideoSizeDelta.y;
+            imgVideo.rectTransform.sizeDelta = imgVideoSizeDelta;
+            if (videoPlayer.time <= 3)
+            {
+                videoPlayer.Stop();
+                videoPlayer.Play();
+            }
+        }
+
+        public void Hide()
+        {
+            StopAllCoroutines();
+            videoPlayer.Stop();
+            videoPlayer.loopPointReached -= OnVideoEnded;
+            handle.Release();
+            handle = null;
+            videoHandle.Release();
+            videoHandle = null;
+            GameObject.Destroy(_ui);
+            _ui = null;
+            ViewManager.Show<LuckyBoxBonusShowView>(_rewardList);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxVideoView.cs.meta

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

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

@@ -3,6 +3,8 @@ using FairyGUI;
 using System.Collections.Generic;
 using UI.Main;
 using UnityEngine;
+using UnityEngine.PlayerLoop;
+
 namespace GFGGame
 {
     public class StoryChapterListView : BaseWindow
@@ -12,6 +14,7 @@ namespace GFGGame
         private int subType = ConstInstanceZonesSubType.Normal;
         private List<StoryChapterCfg> _chapterCfgs;
         private int chapterIndex = 1;
+        private int rewardID = 0;
         public override void Dispose()
         {
             if (_ui != null)
@@ -50,6 +53,17 @@ namespace GFGGame
 
 
         }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.STORYCHAPREDUPDATE, UpdateChapterRed);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.STORYCHAPREDUPDATE,UpdateChapterRed);
+        }
 
         protected override void OnShown()
         {
@@ -144,6 +158,39 @@ namespace GFGGame
             }
 
         }
+        private async void OnClickReward(EventContext context)
+        {
+            GObject chapterItem = context.sender as GObject;
+            int chapterID = (int)chapterItem.data;
+            rewardID = chapterID;
+            int status;
+            if(MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID,out status) && status == 1)
+            {
+                //领取奖励
+                bool result = await MainStorySProxy.GetStoryBonusReward(chapterID);
+                if(result)
+                {
+                    EventAgent.DispatchEvent(ConstMessage.STORYCHAPREDUPDATE);
+                    return;
+                }
+            }
+        }
+
+        private void UpdateChapterRed()
+        {
+            //UpdateList();
+            foreach (var item in ChapterRewardCfgArray.Instance.dataArray)
+            {
+                if (item.chapterId == rewardID)
+                {
+                    UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(_ui.m_listChapter.GetChildAt(item.id%10));
+                    listItem.m_content.m_reward.target.visible = false;
+                    RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, false, "");
+                    UI_ListChapterItem.ProxyEnd();
+                }
+            }
+
+        }
 
         private void ListChapterItem(int index, GObject item)
         {
@@ -202,12 +249,12 @@ namespace GFGGame
 
             // listItem.m_content.m_txtTitle.text = chapterCfg.name;
             listItem.m_content.m_compPic.m_pic.url = "ui://Main/" + chapterCfg.res;
-            if (listItem.m_content.target.data == null)
+            if (listItem.m_content.m_compPic.target.data == null)
             {
-                listItem.m_content.target.onClick.Add(OnClickListChapterItem);
+                listItem.m_content.m_compPic.target.onClick.Add(OnClickListChapterItem);
             }
             listItem.target.data = chapterCfg.id;
-            listItem.m_content.target.data = chapterCfg.id;
+            listItem.m_content.m_compPic.target.data = chapterCfg.id;
             RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", -100, (int)listItem.m_content.m_txtCurProgress.y - 20);
             UI_ListChapterItem.ProxyEnd();
         }
@@ -266,9 +313,42 @@ namespace GFGGame
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
                     currentChapterIndex = i;
+                    List<StoryLevelCfg> storylevelList = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type,chapterCfg.subType,chapterCfg.id);
+                    
+                    if(InstanceZonesDataManager.CheckLevelPass(storylevelList[storylevelList.Count - 1].id))
+                    {
+                        listItem.m_content.m_reward.target.visible = true;
+                        RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, false, "");
+                        int status;
+                        if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status))
+                        {
+                            ChapterRewardCfg chapterReward = ChapterRewardCfgArray.Instance.GetCfgBychapterId(chapterID);
+                            listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward.bonusOnceArr[0][0]).res, "png");
+                            listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward.bonusOnceArr[0][1].ToString());
+                        }
+                        if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 1)
+                        {
+                            RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, true, "",-50,20);
+                        }
+                        else if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 2)
+                        {
+                            listItem.m_content.m_reward.target.visible = false;
+                        }
+
+                        if (listItem.m_content.m_reward.target.data == null)
+                        {
+                            listItem.m_content.m_reward.target.onClick.Add(OnClickReward);
+                        }
+                        listItem.m_content.m_reward.target.data = chapterID;
+                    }
+                    else
+                    {
+                        listItem.m_content.m_reward.target.visible = false;
+                    }
                 }
                 else
                 {
+                    listItem.m_content.m_reward.target.visible = false;
                     listItem.m_content.m_imgLockBg.visible = true;
                     listItem.m_content.m_txtLockDesc.visible = true;
                     if (chapterCfg.lvl > GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl))
@@ -288,6 +368,11 @@ namespace GFGGame
                         }
                     }
                 }
+                //暂定精英关卡不显示
+                if (subType == 1)
+                {
+                    listItem.m_content.m_reward.target.visible = false;
+                }
                 UI_ListChapterItem.ProxyEnd();
             }
             if (isView)

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

@@ -508,11 +508,11 @@ namespace GFGGame
             // bonusBox.m_ComRewardEffect.visible = status == ConstBonusStatus.CAN_GET;
             if (status == ConstBonusStatus.GOT)
             {
-                bonusBox.m_icon.url = "ui://Main/zxian_gift_get";
+                bonusBox.m_icon.url = "ui://Main/tgjljinnang_off";
             }
             else
             {
-                bonusBox.m_icon.url = "ui://Main/zxian_gift_unget";
+                bonusBox.m_icon.url = "ui://Main/tgjljinnang_no";
             }
             bonusBox.target.data = status;
         }

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

@@ -23,6 +23,7 @@ namespace GFGGame
 
                 if (fistPassLastLvl)
                 {
+                    MainStorySProxy.GetStoryBonusDate().Coroutine();
                     StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
                     StoryChapterCfg nextStoryChapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId + 1);
                     if (nextStoryChapterCfg != null)

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

@@ -129,6 +129,8 @@ namespace GFGGame
             _ui.m_btnHaiZhiShi.target.onClick.Add(OnClickBtnInstanceZones);
             _ui.m_touchMask.onClick.Add(ShowMainUI);
             _ui.m_btnShow.target.onClick.Add(HideMainUI);
+            _ui.m_btnNewPlayerReward.target.onClick.Add(OnClickNewPlayerReward);
+            _ui.m_btnSevenReward.target.onClick.Add(OnClickSevenReward);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -550,6 +552,15 @@ namespace GFGGame
             ViewManager.Show<RoleInfoView>();
         }
 
+        private void OnClickNewPlayerReward()
+        {
+            ViewManager.Show<NewPlayersTipsView>();
+        }
+        private void OnClickSevenReward()
+        {
+            ViewManager.Show<SevenDayLoginView>();
+        }
+
         //列表
         private void OnClickBtnGiftBag1()
         {
@@ -693,6 +704,7 @@ namespace GFGGame
 
         private void UpdateLimitedActvityState()
         {
+            _ui.m_btnNewPlayerReward.target.visible = false;
             int actLimitTsyId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (actLimitTsyId > 0)
             {
@@ -717,12 +729,13 @@ namespace GFGGame
             if (ActivityDataManager.Instance.lastActLimitChargeId != actLimitChargeId)
             {
                 ActivityDataManager.Instance.actLimitChargeId = actLimitChargeId;
-                _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
-                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
-                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
-                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
-                !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
-                ActivityDataManager.Instance.AllSevenDayBonusGot()));
+                //_ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
+                //FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
+                //FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
+                //FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
+                //!(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
+                //ActivityDataManager.Instance.AllSevenDayBonusGot()));
+                _ui.m_btnDailyWelfare.target.visible = false;
             }
 
             int activeNewYearRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
@@ -731,6 +744,51 @@ namespace GFGGame
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
             _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
+            _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
+
+            _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
+            UpdateSevenIcon();
+
+            if (!ActivityDataManager.Instance.IsGetNewPlayerReward)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
+            }
+        }
+
+        private void UpdateSevenIcon()
+        {
+            if(ActivityDataManager.Instance.CanGetSevenDayBonus())
+            {
+                //显示今日可领取
+                int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(true)].rewardsArr[0][0];
+                if (DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(true)]
+                        .type == 2)
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf","png");
+                }
+                else
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                }
+                _ui.m_btnSevenReward.m_textIcon.url = "ui://Main/zjm_hdjrkl";
+                RedDotController.Instance.SetComRedDot(_ui.m_btnSevenReward.target, true, "", -8);
+            }
+            else if(ActivityDataManager.Instance.HaveGetSevenDayBonus() && ActivityDataManager.Instance.NowSevenDayBonusDay(false)<6)
+            {
+                //显示明日可领取
+                int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)+1].rewardsArr[0][0];
+                if (DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)+1]
+                        .type == 2)
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf","png");
+                }
+                else
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                }
+                _ui.m_btnSevenReward.m_textIcon.url = "ui://Main/zjm_hdmrkl";
+                RedDotController.Instance.SetComRedDot(_ui.m_btnSevenReward.target, false, "", -8);
+            }
         }
 
         private void UpdateTime()
@@ -870,23 +928,24 @@ namespace GFGGame
             AdCfg adCfg = obj.data as AdCfg;
             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];
-            }
+            //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];
+            //}
 
-            if (jumpIndex != 0)
-                ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex);
-            else
-                ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
+            //if (jumpIndex != 0)
+            //    ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex);
+            //else
+            //    ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
+            ViewManager.Show<DailyWelfareView>();
         }
         private void OnListAdScrollEnd()
         {
@@ -897,7 +956,7 @@ namespace GFGGame
         {
             _ui.m_btnGiftBag1.target.visible = false;
             _ui.m_btnGiftBag2.target.visible = false;
-
+            _ui.m_btnNewPlayerReward.target.visible = false;
             _ui.m_btnHaiZhiShi.m_loaLockIcons.visible = false;
 
             _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
@@ -909,12 +968,22 @@ namespace GFGGame
             _ui.m_btnOpenServerActivity.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc) > 0;
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
-            _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
-            FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
-            FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
-            FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
-            !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
-            ActivityDataManager.Instance.AllSevenDayBonusGot()));
+            //_ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
+            //FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
+            //FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
+            //FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
+            //!(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
+            //ActivityDataManager.Instance.AllSevenDayBonusGot()));
+            _ui.m_btnDailyWelfare.target.visible = false;
+            _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
+            if(!ActivityDataManager.Instance.IsGetNewPlayerReward)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
+            }
+
+            _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
+            UpdateSevenIcon();
+
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
@@ -970,7 +1039,7 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
 
             if (redPointUpdateFrame == 9) 
-                RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -19, 5);
+                RedDotController.Instance.SetComRedDot(_ui.m_comListAd.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 0, 5);
 
             if (redPointUpdateFrame == 10)
                 RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed()
@@ -1066,9 +1135,14 @@ namespace GFGGame
 
                 }
             }
+            if (redPointUpdateFrame == 24)
+                {
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnMain.target
+                        , MainStoryDataManager.GetChapterRewardStatus(), "",-30,20);
+                }
 
             redPointUpdateFrame++;
-            if(redPointUpdateFrame > 24)
+            if(redPointUpdateFrame > 25)
             {
                 redPointUpdateFrame = -1;
             }
@@ -1222,11 +1296,19 @@ namespace GFGGame
             if (!GameGlobal.AfterDataInited) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            if (GameGlobal.AutoNewPlayersTips)
+            {
+                if (GameGlobal.NewPlayerOnceTips)
+                {
+                    ViewManager.Show<NewPlayersTipsView>();
+                    return;
+                }
+            }
             if (GameGlobal.AutoSevenDayLoginView)
             {
                 if (ActivityDataManager.Instance.CanGetSevenDayBonus())
                 {
-                    ViewManager.Show<SevenDayLoginView>();
+                    ViewManager.Show<SevenDailyTipsView>();
                     return;
                 }
 

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs

@@ -43,8 +43,7 @@ namespace GFGGame
 
             bool isPhotoOpen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false);
             bool isgalleryOpen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemGalleryView).Name, false);
-            //_ui.m_TimeTracing.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0 ? false : true;
-            _ui.m_TimeTracing.target.visible = false;
+            _ui.m_TimeTracing.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0 ? false : true;
             if (_ui.m_TimeTracing.target.visible == true)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_TimeTracing.target, TimeTracingDataManager.Instance.GetLevelRewardStatus() || TimeTracingDataManager.Instance.GetAllChapterReward());

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

@@ -165,6 +165,8 @@ namespace GFGGame
             string messageSuc = string.Format("当前关卡第{0}章第{1}关", _ui.m_ComBtn.m_txtChapter.text,
                 _ui.m_ComBtn.m_txtChapterLv.text);
             GMController.SendGMCommand("chapter " + content, messageSuc).Coroutine();
+            ActivitySProxy.ReqGetNewPlayerBonusStatus().Coroutine();
+            MainStorySProxy.GetStoryBonusDate().Coroutine();
         }
 
         private async void OnClickBtnSkipCheckOpen()

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

@@ -51,6 +51,8 @@ namespace GFGGame
             _ui.m_photoList.onClickItem.Add(OnPhotoListItemClick);
             _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
 
+            _ui.m_txtVersion.onClick.Add(OnClickGM);
+
         }
 
         protected override void AddEventListener()
@@ -93,6 +95,14 @@ namespace GFGGame
             Hide();
         }
 
+        private void OnClickGM()
+        {
+            if (GameConfig.showGM >= 1)
+            {
+                ViewManager.Show<GMPanelView>();
+            }
+        }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs

@@ -112,7 +112,7 @@ namespace GFGGame
                             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(itemInfo[levelCfg.id].HeadBorderItemId);
                             levelItem.m_player.m_headFrame.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
                             levelItem.m_player.m_head.url = ResPathUtil.GetHeadPath(headCfg.res);
-                            RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id), "", -30);
+                            RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id), "", -30,10);
                         }
                     }
                     else
@@ -129,7 +129,7 @@ namespace GFGGame
                 if (!InstanceZonesDataManager.CheckLevelPass(levelCfg.id))
                 {
                     //设置为解锁关卡
-                    RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id),"",-30);
+                    RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id),"",-30,10);
                     MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                     levelItem.m_player.target.visible = false;
                 }
@@ -208,6 +208,7 @@ namespace GFGGame
 
                 //}
                 item.m_c1.selectedIndex = TimeTracingDataManager.Instance.GetChapterRewardIDStatus(datas[i].id, datas[i].paramsArr[0]);
+                item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(datas[i].bonusArr[0][0]).res, "png");
                 if (item.target.data == null)
                 {
                     item.target.onClick.Add(OnBtnGetProBonus);
@@ -223,6 +224,7 @@ namespace GFGGame
             CompositebonusCfg compositeCfg = obj.data as CompositebonusCfg;
             if(num < compositeCfg.count || TimeTracingDataManager.Instance.GetChapterRewardIDStatus(compositeCfg.id, compositeCfg.paramsArr[0]) != 1)
             {
+                GoodsItemTipsController.ShowItemTips(compositeCfg.bonusArr[0][0]);
                 return;
             }
             await TimeTracingSProxy.ReqGetSuitReward(compositeCfg.id);

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -44,10 +44,10 @@ namespace GFGGame
 
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "http://cdn.wanshijing.com/";
+            launcherRootUrl = "http://gfgclient.obs.cn-north-4.myhuaweicloud.com/";
 #if PT_DEV
             //外网dev版本
-            netType = EnumNetType.PUBLIC;
+            netType = EnumNetType.LOCAL;
             cfgName = "cfg_dev";
 #elif PT_TAPTAP
             netType = EnumNetType.PUBLIC;
@@ -69,7 +69,7 @@ namespace GFGGame
 #else
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_local";
-            launcherRootUrl = "http://10.108.64.189:81/";
+            //launcherRootUrl = "http://10.108.64.189:81/";
 #endif
             cfgUrl = launcherRootUrl + "platform/{cfgName}.json";
         }

GameClient/Assets/ResIn/Fight/bg_fhl.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/fightBg.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/jingzhongh_bg.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_bj_bja_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_bj_bja_2.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/RenderTexture/videoLuckyBox.renderTexture

@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: videoLuckyBox
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 3
+  m_Width: 1080
+  m_Height: 1920
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthFormat: 2
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1

GameClient/Assets/ResIn/RenderTexture/videoLuckyBox.renderTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7142109c5429d1c41b321c07317cf75c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3.png.meta

@@ -99,6 +99,18 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 9b4b18cd60ad0c54fa345c5707c788df
+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: Standalone
+    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/ActivityMain/ActivityMain_atlas0_4.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: bc2910e271b81d64f8dc6c557346e7fc
+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: Standalone
+    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: