提交万世礼活动逻辑

修改周中活动副本

GameClient/Assets/Game/HotUpdate/Data/LimitedRechargeDBGiftDataManager.cs → GameClient/Assets/Game/HotUpdate/Data/ActivityWanShiLiDataManager.cs

@@ -5,11 +5,11 @@ using UnityEngine;
 
 namespace Assets.Game.HotUpdate.Data
 {
-    public class LimitedRechargeDBGiftDataManager : SingletonBase<LimitedRechargeDBGiftDataManager>
+    public class ActivityWanShiLiDataManager : SingletonBase<ActivityWanShiLiDataManager>
     {
         public bool CanGetReward()
         {
-            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             if (_activityInfo == null) return false;
             ActivityRecharge2Cfg[] _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
             for (int i = 0; i < _rechargeCfgs.Length; i++)
@@ -24,14 +24,14 @@ namespace Assets.Game.HotUpdate.Data
 
         public bool CheckOpen()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
                    activityInfo.EndTime > TimeHelper.ServerNow();
         }
 
         public long GetEndTime()
         {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             return activityInfo.EndTime;
         }
     }

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

@@ -923,9 +923,9 @@ namespace GFGGame
             return false;
         }
 
-        public bool GetLimitedRechargeDBGiftRed()
+        public bool GetActivityWanShiLiRed()
         {
-            return LimitedRechargeDBGiftDataManager.Instance.CanGetReward();
+            return ActivityWanShiLiDataManager.Instance.CanGetReward();
         }
 
         /// <summary>

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

@@ -15,7 +15,7 @@ namespace GFGGame
 
         public int filingChapterId;//查阅建档当前副本Id
         public int npcFilingChapterId;//记录查阅建档工作室入口id，为与限时活动章节做区分。
-        public int luckyBoxFilingChapterId = 31000;//查阅建档这个章节是限时抽奖活动专属，为测试能快速更新先临时写死，后边再改
+        public int luckyBoxFilingChapterId;//查阅建档这个章节是限时抽奖活动专属
 
         public int PorcelainTheme = 1;//瓷器修复当天主题
 
@@ -134,7 +134,7 @@ namespace GFGGame
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName), true);
         }
 
-        public float GetAdditionBySuitId(int suitId)
+        private float GetAdditionBySuitId(int suitId)
         {
             float addition = 0;
             SuitCfg cfg = SuitCfgArray.Instance.GetCfg(suitId);
@@ -149,6 +149,34 @@ namespace GFGGame
             return addition;
         }
 
+        private float GetAdditionBySuitIds(int[] suitIds)
+        {
+            float addition = 0;
+            for (int i = 0; i < suitIds.Length; i++)
+            {
+                addition += GetAdditionBySuitId(suitIds[i]);
+            }
+            return addition;
+        }
+
+        public float GetAddition()
+        {
+            float addition;
+            StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
+
+            // 活动
+            if (IsluckyBoxFilingChapter())
+            {
+                addition = GetAdditionBySuitIds(filingCfg.activitySuitIdArr);
+            }
+            // 查阅建档
+            else
+            {
+                addition = GetAdditionBySuitId(filingCfg.suitId);
+            }
+            return addition;
+        }
+
         public bool GetFilingRewardState(int chapterId)
         {
             StudioData studioData = GetStudioDataById(chapterId);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6ac2278b031bc744badbd46237c54794
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ActivityWanShiLiUI.cs

@@ -0,0 +1,100 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_ActivityWanShiLiUI
+    {
+        public GComponent target;
+        public UI_ProgressBar2 m_progress;
+        public UI_item m_DBGiftItem0;
+        public UI_item m_DBGiftItem1;
+        public UI_item m_DBGiftItem2;
+        public UI_item m_DBGiftItem3;
+        public GGroup m_DBGiftItemGroup;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GButton m_btnBack;
+        public const string URL = "ui://z8lqda6wc82k0";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "ActivityWanShiLiUI";
+        private static UI_ActivityWanShiLiUI _proxy;
+
+        public static UI_ActivityWanShiLiUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityWanShiLiUI();
+            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_ActivityWanShiLiUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityWanShiLiUI();
+            }
+            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_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+            m_DBGiftItem0 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem0"));
+            m_DBGiftItem1 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem1"));
+            m_DBGiftItem2 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem2"));
+            m_DBGiftItem3 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem3"));
+            m_DBGiftItemGroup = (GGroup)comp.GetChild("DBGiftItemGroup");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_progress.Dispose();
+            m_progress = null;
+            m_DBGiftItem0.Dispose();
+            m_DBGiftItem0 = null;
+            m_DBGiftItem1.Dispose();
+            m_DBGiftItem1 = null;
+            m_DBGiftItem2.Dispose();
+            m_DBGiftItem2 = null;
+            m_DBGiftItem3.Dispose();
+            m_DBGiftItem3 = null;
+            m_DBGiftItemGroup = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ActivityWanShiLiUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c89bb062d57852443bac6d8b98beecf8
+guid: 33cf8af667b3daa458b58911f34642ec
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ComProBonus2.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_ComProBonus2
+    {
+        public GComponent target;
+        public Controller m_state;
+        public GLoader m_loaIcon;
+        public GTextField m_count;
+        public GImage m_imgGot;
+        public const string URL = "ui://z8lqda6wevdh27";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "ComProBonus2";
+        private static UI_ComProBonus2 _proxy;
+
+        public static UI_ComProBonus2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComProBonus2();
+            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_ComProBonus2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComProBonus2();
+            }
+            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_state = comp.GetController("state");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_count = (GTextField)comp.GetChild("count");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_state = null;
+            m_loaIcon = null;
+            m_count = null;
+            m_imgGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ComProBonus2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ProgressBar2.cs

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_ProgressBar2
+    {
+        public GProgressBar target;
+        public UI_ComProBonus2 m_comProBonus0;
+        public UI_ComProBonus2 m_comProBonus1;
+        public UI_ComProBonus2 m_comProBonus2;
+        public UI_ComProBonus2 m_comProBonus3;
+        public GGroup m_comProBonusGroup;
+        public GGraph m_holder;
+        public GGraph m_holderReward;
+        public const string URL = "ui://z8lqda6wc82k1";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "ProgressBar2";
+        private static UI_ProgressBar2 _proxy;
+
+        public static UI_ProgressBar2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar2();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBar2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)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_comProBonus0 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus0"));
+            m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
+            m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
+            m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
+            m_comProBonusGroup = (GGroup)comp.GetChild("comProBonusGroup");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holderReward = (GGraph)comp.GetChild("holderReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comProBonus0.Dispose();
+            m_comProBonus0 = null;
+            m_comProBonus1.Dispose();
+            m_comProBonus1 = null;
+            m_comProBonus2.Dispose();
+            m_comProBonus2 = null;
+            m_comProBonus3.Dispose();
+            m_comProBonus3 = null;
+            m_comProBonusGroup = null;
+            m_holder = null;
+            m_holderReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ProgressBar2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_item.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityWanShiLi
+{
+    public partial class UI_item
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_icon;
+        public GGroup m_grpGot;
+        public const string URL = "ui://z8lqda6wjvt928";
+        public const string PACKAGE_NAME = "ActivityWanShiLi";
+        public const string RES_NAME = "item";
+        private static UI_item _proxy;
+
+        public static UI_item Create(GObject gObject = null)
+        {
+            var ui = new UI_item();
+            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_item Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_item();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_icon = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_item.cs.meta

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

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

@@ -27,7 +27,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public UI_BtnModle2 m_btnActivityAfuGift;
-        public UI_BtnModle2 m_btnLimitedRechargeDBGift;
+        public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
@@ -114,7 +114,7 @@ namespace UI.Main
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
-            m_btnLimitedRechargeDBGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnLimitedRechargeDBGift"));
+            m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
@@ -170,8 +170,8 @@ namespace UI.Main
             m_btnActivityLuckyBox = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
-            m_btnLimitedRechargeDBGift.Dispose();
-            m_btnLimitedRechargeDBGift = null;
+            m_btnWanShiLi.Dispose();
+            m_btnWanShiLi = null;
             m_btnFirstRecharge.Dispose();
             m_btnFirstRecharge = null;
             m_btnGiftBag1.Dispose();

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

@@ -7,6 +7,7 @@ namespace UI.Studio
     public partial class UI_StudioFilingUI
     {
         public GComponent target;
+        public Controller m_type;
         public GLoader m_Bg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
@@ -22,6 +23,8 @@ namespace UI.Studio
         public GTextField m_txtSuitProgress;
         public GLoader m_suitIcon;
         public GButton m_btnReward;
+        public GTextField m_activityTipText;
+        public GTextField m_activityTitle;
         public const string URL = "ui://xz8kxrecrqo41i";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingUI";
@@ -69,6 +72,7 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_type = comp.GetController("type");
             m_Bg = (GLoader)comp.GetChild("Bg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -84,9 +88,12 @@ namespace UI.Studio
             m_txtSuitProgress = (GTextField)comp.GetChild("txtSuitProgress");
             m_suitIcon = (GLoader)comp.GetChild("suitIcon");
             m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_activityTipText = (GTextField)comp.GetChild("activityTipText");
+            m_activityTitle = (GTextField)comp.GetChild("activityTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_type = null;
             m_Bg = null;
             m_comValueBar = null;
             m_btnBack = null;
@@ -102,6 +109,8 @@ namespace UI.Studio
             m_txtSuitProgress = null;
             m_suitIcon = null;
             m_btnReward = null;
+            m_activityTipText = null;
+            m_activityTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -47,10 +47,13 @@ namespace GFGGame
                     if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
                     {
                         StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-                        SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
-                        if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                        if(filingCfg.suitId != 0)
                         {
-                            PromptController.Instance.ShowFloatTextPrompt(string.Format("已解锁{0}套装制作", suitCfg.name));
+                            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
+                            if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                            {
+                                PromptController.Instance.ShowFloatTextPrompt(string.Format("已解锁{0}套装制作", suitCfg.name));
+                            }
                         }
                     }
                     EventAgent.DispatchEvent(ConstMessage.STORY_LEVEL_CHANGE);

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -59,16 +59,11 @@ namespace GFGGame
             // ½çÃæ¸ù¾ÝID¸Ä±ä
             _ui.m_c1.SetSelectedPage(_activityId.ToString());
             _ui.target.GetTransition("In_" + _activityId.ToString())?.Play();
-            if(_activityId == 1)
-            {
-                // Effect
-                _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/New_CK_Flower", "All_tx"));
-                _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/New_CK_Flower", "L"));
-                _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity/New_CK_Flower", "R"));
-            }
-
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res); 
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
+            StudioDataManager.Instance.luckyBoxFilingChapterId = _activityCfg.params3Arr != null ? _activityCfg.params3Arr[0] : 0;
+
+            UpdateEffect();
             UpdateRedDot();
             UpdateTime();
             Timers.inst.Add(1, 0, UpdateTime);
@@ -138,5 +133,16 @@ namespace GFGGame
                 || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -36, 39);
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask.target, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
         }
+
+        private void UpdateEffect()
+        {
+            if (_activityId == 1)
+            {
+                // Effect
+                _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/New_CK_Flower", "All_tx"));
+                _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/New_CK_Flower", "L"));
+                _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity/New_CK_Flower", "R"));
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d087e0316c47ed14695f074edaa2a7b3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs → GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs

@@ -2,17 +2,17 @@
 using FairyGUI;
 using System;
 using System.Collections.Generic;
-using UI.DailyWelfare;
+using UI.ActivityWanShiLi;
 using UnityEngine;
 
 namespace GFGGame
 {
-    public class LimitedRechargeDBGiftView : BaseWindow
+    public class ActivityWanShiLiView : BaseWindow
     {
-        private UI_LimitedRechargeDBGiftUI _ui;
+        private UI_ActivityWanShiLiUI _ui;
 
-        private int _minProgressOffset = 6;
-        private int _maxProgressOffset = -8;
+        private int _minProgressOffset = 11;
+        private int _maxProgressOffset = -11;
         private ActivityInfo _activityInfo;
         private ActivityRecharge2Cfg[] _rechargeCfgs;
 
@@ -29,17 +29,18 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_LimitedRechargeDBGiftUI.PACKAGE_NAME;
-            _ui = UI_LimitedRechargeDBGiftUI.Create();
+            packageName = UI_ActivityWanShiLiUI.PACKAGE_NAME;
+            _ui = UI_ActivityWanShiLiUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnTest.onClick.Add(OnBtnTestClick);
             _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
             InitProgressValueList();
             InitReward();
+
+            _ui.m_btnBack.onClick.Add(Hide);
         }
 
         protected override void AddEventListener()
@@ -71,12 +72,6 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
         }
 
-        private void OnBtnTestClick(EventContext context)
-        {
-            UpdateProgress();
-        }
-
-
         private int[] _progressValuePart;
         private int _partNum = 4;
 
@@ -105,15 +100,12 @@ namespace GFGGame
         {
             for (int i = 0; i < _partNum; i++)
             {
-                GObject gift = _ui.target.GetChild("DBGiftItem" + (i + 1));
-                UI_DBGiftItem item = UI_DBGiftItem.Proxy(gift);
+                GObject gift = _ui.target.GetChild("DBGiftItem" + i);
                 // 大奖icon
-                item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_rechargeCfgs[i].bonusArr[0][0]));
-                // 包子图
-                item.m_DBB.url = "ui://DailyWelfare/DBB_" + (i + 1);
+                UI_item item = UI_item.Proxy(gift);
+                item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_rechargeCfgs[i].bonusArr[0][0]));
                 gift.data = _rechargeCfgs[i].bonusArr[0][0];
-                gift.onClick.Add(OnRewardIconClick);
-                UI_DBGiftItem.ProxyEnd();
+                UI_item.ProxyEnd();
 
                 // 进度条分段值Text
                 GObject progressItem = _ui.m_progress.target.GetChild("comProBonus" + i);
@@ -172,7 +164,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             UpdateProgress();
         }
 
@@ -188,38 +180,71 @@ namespace GFGGame
         /// <param name="index">玩家可领取的最大奖励index</param>
         private void UpdateRewardState(int index)
         {
-            for(int i = 0; i < _partNum; i++)
+            for (int i = 0; i < _partNum; i++)
             {
+                GObject gift = _ui.target.GetChild("DBGiftItem" + i);
                 bool arrive = (i <= index);
                 GObject progressItem = _ui.m_progress.target.GetChild("comProBonus" + i);
                 UI_ComProBonus2 bonus = UI_ComProBonus2.Proxy(progressItem);
+
+                // 下方礼物icon加上data
                 bonus.target.data = new GetState
                 {
                     rewardID = _rechargeCfgs[i].id,
                     canGet = arrive
                 };
 
+
+                UI_item item = UI_item.Proxy(gift);
+                item.m_c1.SetSelectedIndex(0);
+
+                // 大奖icon加上data
+                item.target.data = new GetState
+                {
+                    rewardID = _rechargeCfgs[i].id,
+                    canGet = arrive
+                };
+
                 // 玩家已经达到的奖励
                 if (arrive)
                 {
                     // 已领
                     if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) >= 0)
                     {
-                        bonus.m_imgGot.visible = true;
+                        item.m_c1.SetSelectedIndex(1);
+                        bonus.m_state.SetSelectedIndex(2);
                         bonus.target.touchable = false;
+                        item.target.touchable = false;
                         // 隐藏红点
                         RedDotController.Instance.SetComRedDot(bonus.target, false);
+                        RedDotController.Instance.SetComRedDot(item.target, false);
                     }
                     // 未领
                     else
                     {
-                        bonus.m_imgGot.visible = false;
+                        bonus.m_state.SetSelectedIndex(0);
+                        bonus.target.touchable = true;
+                        item.target.touchable = true;
                         // 显示红点
                         RedDotController.Instance.SetComRedDot(bonus.target, true);
+                        RedDotController.Instance.SetComRedDot(item.target, true);
                     }
                 }
+                else
+                {
+                    bonus.target.touchable = true;
+                    item.target.touchable = true;
+                    bonus.m_state.SetSelectedIndex(1);
+                    
+                    // 隐藏红点
+                    RedDotController.Instance.SetComRedDot(bonus.target, false);
+                    RedDotController.Instance.SetComRedDot(item.target, false);
+                }
                 progressItem.onClick.Set(OnGiftClick);
+                item.target.onClick.Set(OnGiftClick);
+
                 UI_ComProBonus2.ProxyEnd();
+                UI_item.ProxyEnd();
             }
         }
 
@@ -239,27 +264,9 @@ namespace GFGGame
             else
             {
                 // 显示奖励详细列表
-                ViewManager.Show<GiftDetailView>(getState.rewardID, ViewManager.GetGoBackDatas(typeof(LimitedRechargeDBGiftView).FullName));
+                ViewManager.Show<GiftDetailView>(getState.rewardID, ViewManager.GetGoBackDatas(typeof(ActivityWanShiLiView).FullName));
             }
         }
 
-        /// <summary>
-        /// 点击上方的奖励icon，显示单个奖励介绍（奖励配置中的第一个奖励）
-        /// </summary>
-        /// <param name="eventContext"></param>
-        private void OnRewardIconClick(EventContext eventContext)
-        {
-            GObject gObject = eventContext.sender as GObject;
-            int id = (int)(gObject.data);
-            GoodsItemTipsController.ShowItemTips(id);
-        }
-
-        public bool CheckOpen()
-        {
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
-            return activityInfo != null && activityInfo.StartTime <= TimeHelper.ServerNow() &&
-                   activityInfo.EndTime > TimeHelper.ServerNow();
-        }
     }
-
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs.meta

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

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

@@ -61,8 +61,7 @@ namespace GFGGame
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
-                StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-                float addition = StudioDataManager.Instance.GetAdditionBySuitId(filingCfg.suitId);
+                float addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * FightDataManager.Instance.totalScore;
                 FightDataManager.Instance.totalScore += (int)Math.Round(addition);
             }

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

@@ -283,14 +283,26 @@ namespace GFGGame
             else if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
                 _ui.m_ctrlNeed.selectedIndex = 3;
-                StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
-                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
-                float addition = StudioDataManager.Instance.GetAdditionBySuitId(filingCfg.suitId);
+                _ui.m_grpAdditionDesc.visible = false;
+
+                // 如果是活动界面，不显示收集进度
+                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                {
+                    _ui.m_btnAdditionDesc.visible = false;
+                }
+                else
+                {
+                    StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
+                    DressUpMenuSuitDataManager.GetSuitProgressBySuitId(filingCfg.suitId, out int count, out int totalCount);
+                    _ui.m_txtAdditionDesc.text = string.Format("{0}套装收集进度:{1}/{2}", suitCfg.name, count, totalCount);
+                    _ui.m_btnAdditionDesc.visible = true;
+                }
+
+                float addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * 100;
                 _ui.m_txtAddition.text = string.Format("{0}%加成", addition);
-                DressUpMenuSuitDataManager.GetSuitProgressBySuitId(filingCfg.suitId, out int count, out int totalCount);
-                _ui.m_txtAdditionDesc.text = string.Format("{0}套装收集进度:{1}/{2}", suitCfg.name, count, totalCount);
-                _ui.m_grpAdditionDesc.visible = false;
+
             }
         }
 

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

@@ -127,7 +127,7 @@ namespace GFGGame
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
-            _ui.m_btnLimitedRechargeDBGift.target.onClick.Add(OnClickBtnLimitedRechargeDBGift);
+            _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnLimitedRechargeDBGift);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -492,7 +492,7 @@ namespace GFGGame
 
         private void OnClickBtnLimitedRechargeDBGift()
         {
-            ViewManager.Show<LimitedRechargeDBGiftView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<ActivityWanShiLiView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnCiPai()
@@ -819,8 +819,7 @@ namespace GFGGame
         private void UpdateLimitedActvityState()
         {
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
-            //_ui.m_btnLimitedRechargeDBGift.target.visible = LimitedRechargeDBGiftDataManager.Instance.CheckOpen();
-            _ui.m_btnLimitedRechargeDBGift.target.visible = false;
+            _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
         }
 
         private void UpdateTime()
@@ -831,10 +830,10 @@ namespace GFGGame
                 _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
 
-            if (_ui.m_btnLimitedRechargeDBGift.target.visible)
+            if (_ui.m_btnWanShiLi.target.visible)
             {
-                long time = LimitedRechargeDBGiftDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
-                _ui.m_btnLimitedRechargeDBGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                long time = ActivityWanShiLiDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
+                _ui.m_btnWanShiLi.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
 
             if (_ui.m_btnActivityAfuGift.target.visible)
@@ -1034,7 +1033,7 @@ namespace GFGGame
                 || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -11, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnLimitedRechargeDBGift.target, RedDotDataManager.Instance.GetLimitedRechargeDBGiftRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -25, -7);
             
             RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
             RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);

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

@@ -67,12 +67,10 @@ namespace GFGGame
             _valueBarController.OnShown();
 
             _viewData = this.viewData != null ? (int)this.viewData : 0;
-            _ui.m_btnChange.visible = _viewData != StudioDataManager.Instance.luckyBoxFilingChapterId;
             StudioDataManager.Instance.filingChapterId = _viewData > 0 ? _viewData : StudioDataManager.Instance.npcFilingChapterId;
 
             UpdateView();
             Timers.inst.AddUpdate(CheckGuide);
-
             UpdateItem();
         }
 
@@ -119,13 +117,24 @@ namespace GFGGame
             _ui.m_btnChange.title = _studioCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
 
-            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_studioCfg.suitId);
-            _ui.m_txtSuitName.text = suitCfg.name;
+            // 如果是活动界面，不显示套装获取进度
+            if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+            {
+                _ui.m_type.SetSelectedIndex(1);
+                _ui.m_activityTipText.SetVar("name", _studioCfg.name).FlushVars();
+                _ui.m_activityTitle.text = _studioCfg.name;
+            }
+            else
+            {
+                _ui.m_type.SetSelectedIndex(0);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_studioCfg.suitId);
+                _ui.m_txtSuitName.text = suitCfg.name;
 
-            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_studioCfg.suitId, out int count, out int totalCount);
-            _ui.m_txtSuitProgress.text = string.Format("({0}/{1})", count, totalCount);
+                DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_studioCfg.suitId, out int count, out int totalCount);
+                _ui.m_txtSuitProgress.text = string.Format("({0}/{1})", count, totalCount);
 
-            _ui.m_suitIcon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+                _ui.m_suitIcon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+            }
 
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_studioCfg.type, _studioCfg.subType, StudioDataManager.Instance.filingChapterId);
             _ui.m_list.numItems = _storyLevelCfgs.Count;

GameClient/Assets/ResIn/UI/ActivityWanShiLi.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7706d24d98ce25b49b1d9f913615ad11
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0!a.png.meta

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

GameClient/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_atlas0.png.meta

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

GameClient/Assets/ResIn/UI/ActivityWanShiLi/ActivityWanShiLi_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 773bab35dd6fbf447ba962ec275080e4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: