Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -14,6 +14,7 @@ namespace GFGGame
             luckyActTsyBonusState.Clear();
             allTsyPlayTimes = 0;
             lastActLimitTsyId = 0;
+            lastActLimitStlycId = 0;
         }
 
         /**********************************************************活动*************************************************/
@@ -49,8 +50,10 @@ namespace GFGGame
         /**********************************************************限时抽奖活动*********************************************/
         public int lastActLuckyBoxId = 0;
         public int lastActLimitTsyId = 0;
+        public int lastActLimitStlycId = 0;
         private int _actLuckyBoxId = 0;
         private int _actLuckyTsyId = 0;
+        private int _actLimitStlycId = 0;
         /// <summary>
         /// 当前抽奖活动id
         /// </summary>
@@ -94,6 +97,29 @@ namespace GFGGame
         /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
         /// <returns></returns>
         public Dictionary<int, int> luckyActTsyBonusState = new Dictionary<int, int>();
+
+        /// <summary>
+        /// 当前隋唐洛阳城活动id
+        /// </summary>
+        /// <value></value>
+        public int actLimitStlycId { get { return _actLimitStlycId; } set { _actLimitStlycId = value; } }
+        /// <summary>
+        /// 开服活动抽奖总次数
+        /// </summary>
+        /// <value></value>
+        public long allLimitStlycTimes { get; set; }
+        /// <summary>
+        /// 开服抽奖必掉次数
+        /// </summary>
+        /// <value></value>
+        public int lastStlycDrawCount { get; set; }
+        /// <summary>
+        /// </summary>
+        /// <typeparam name="int">奖励key，这里对应抽奖次数</typeparam>
+        /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
+        /// <returns></returns>
+        public Dictionary<int, int> limitStlycActBonusState = new Dictionary<int, int>();
+
         public List<ActivityLuckybonusCfg> SortActivityLuckybonusCfg(List<ActivityLuckybonusCfg> list,int typeId)
         {
             list.Sort((ActivityLuckybonusCfg a, ActivityLuckybonusCfg b) =>

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

@@ -248,7 +248,6 @@ namespace GFGGame
             {
                 long needNum = costNum - hasNum;
                 // ItemExchangeCfgArray.Instance.GetMoneyIdAndNum(costId, ItemDataManager.GetItemExchangeTimes(costId), times, out int costItemId, out int costItemNeedNum, out int buyNum);
-
                 ItemExchangeCfg itemExchangeCfg = ItemExchangeCfgArray.Instance.GetCfg(costId);
                 int exchangedTimes = ItemDataManager.GetItemExchangeTimes(costId);
                 int costItemNeedNum = 0;
@@ -293,6 +292,10 @@ namespace GFGGame
             {
                 return cfg.costNumTen;
             }
+            else if (times == LuckyBoxDataManager.FIFTY_TIME)
+            {
+                return cfg.costNumfifty;
+            }
             return 0;
         }
 

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

@@ -139,6 +139,7 @@ namespace GFGGame
         {
             ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX);
         }
+
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, true);
@@ -169,20 +170,22 @@ namespace GFGGame
             return addition;
         }
 
-        public float GetAddition()
+        public float GetAddition(int type = 0)
         {
             float addition;
-            StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
-
-            // 活动
-            if (IsluckyBoxFilingChapter())
-            {
-                addition = GetAdditionBySuitIds(filingCfg.activitySuitIdArr);
-            }
-            // 查阅建档
-            else
-            {
-                addition = GetAdditionBySuitId(filingCfg.suitId);
+            // 开服活动
+            if (type == ConstInstanceZonesType.PureFight) {
+                ActivityFightCfg fightCfg = ActivityFightCfgArray.Instance.GetCfg(filingChapterId);
+                addition = GetAdditionBySuitIds(fightCfg.activitySuitIdArr);
+            }
+            else {
+                StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
+                // 活动
+                if (IsluckyBoxFilingChapter())
+                    addition = GetAdditionBySuitIds(filingCfg.activitySuitIdArr);
+                // 查阅建档
+                else
+                    addition = GetAdditionBySuitId(filingCfg.suitId);
             }
             return addition;
         }
@@ -217,7 +220,6 @@ namespace GFGGame
             return studioData.RewardsStatus;
         }
 
-
         public bool IsluckyBoxFilingChapter()
         {
             return filingChapterId == GetLuckyBoxActivityID();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -11,7 +11,8 @@ namespace UI.ClothingSynthetic
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GComponent m_valueBar;
-        public UI_Component1 m_compHolder;
+        public UI_Component1WithMask m_compHolder;
+        public GGraph m_posHelper;
         public UI_CompItemInfo m_compItemInfo;
         public GTextField m_txtSuitName;
         public GTextField m_txtProgress;
@@ -72,7 +73,8 @@ namespace UI.ClothingSynthetic
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
+            m_compHolder = (UI_Component1WithMask)UI_Component1WithMask.Create(comp.GetChild("compHolder"));
+            m_posHelper = (GGraph)comp.GetChild("posHelper");
             m_compItemInfo = (UI_CompItemInfo)UI_CompItemInfo.Create(comp.GetChild("compItemInfo"));
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_txtProgress = (GTextField)comp.GetChild("txtProgress");
@@ -91,6 +93,7 @@ namespace UI.ClothingSynthetic
             m_valueBar = null;
             m_compHolder.Dispose();
             m_compHolder = null;
+            m_posHelper = null;
             m_compItemInfo.Dispose();
             m_compItemInfo = null;
             m_txtSuitName = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Component1WithMask.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingSynthetic
+{
+    public partial class UI_Component1WithMask
+    {
+        public GComponent target;
+        public GGraph m_mask;
+        public UI_Component1 m_compHolder;
+        public const string URL = "ui://4f294tdkgvbr2m";
+        public const string PACKAGE_NAME = "ClothingSynthetic";
+        public const string RES_NAME = "Component1WithMask";
+        private static UI_Component1WithMask _proxy;
+
+        public static UI_Component1WithMask Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1WithMask();
+            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_Component1WithMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1WithMask();
+            }
+            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_mask = (GGraph)comp.GetChild("mask");
+            m_compHolder = (UI_Component1)UI_Component1.Create(comp.GetChild("compHolder"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_mask = null;
+            m_compHolder.Dispose();
+            m_compHolder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead3.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Component1WithMask.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1e6a25231dbcb22429610cacda2f3239
+guid: 9ce3f0ccda45d434f9a9861e3d85e781
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -7,7 +7,6 @@ namespace UI.CommonGame
     public partial class UI_ComHeadWithLv2
     {
         public GComponent target;
-        public UI_ComHead2 m_comHead2;
         public UI_ComHead m_comHead;
         public UI_ComHeadLv1 m_comLv;
         public const string URL = "ui://eg2y0ldpo9ghtlp";
@@ -57,14 +56,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comHead2 = (UI_ComHead2)UI_ComHead2.Create(comp.GetChild("comHead2"));
             m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
             m_comLv = (UI_ComHeadLv1)UI_ComHeadLv1.Create(comp.GetChild("comLv"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comHead2.Dispose();
-            m_comHead2 = null;
             m_comHead.Dispose();
             m_comHead = null;
             m_comLv.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComHead3
+    public partial class UI_ComHead_new
     {
         public GComponent target;
         public Controller m_c1;
@@ -13,12 +13,12 @@ namespace UI.CommonGame
         public GLoader m_loaBorder;
         public const string URL = "ui://eg2y0ldpp4yntr6";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComHead3";
-        private static UI_ComHead3 _proxy;
+        public const string RES_NAME = "ComHead_new";
+        private static UI_ComHead_new _proxy;
 
-        public static UI_ComHead3 Create(GObject gObject = null)
+        public static UI_ComHead_new Create(GObject gObject = null)
         {
-            var ui = new UI_ComHead3();
+            var ui = new UI_ComHead_new();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComHead3 Proxy(GObject gObject = null)
+        public static UI_ComHead_new Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComHead3();
+                _proxy = new UI_ComHead_new();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Studio
+namespace UI.CommonGame
 {
     public partial class UI_CompFlower
     {
@@ -11,8 +11,8 @@ namespace UI.Studio
         public GImage m_f1;
         public GImage m_f2;
         public GImage m_f3;
-        public const string URL = "ui://xz8kxrecrqo41r";
-        public const string PACKAGE_NAME = "Studio";
+        public const string URL = "ui://eg2y0ldprqo41r";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "CompFlower";
         private static UI_CompFlower _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0233d817117a37f43a12ccee1f3a6ce4
+guid: 934e11bcdecb10f4a9233b66743da7c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Studio
+namespace UI.CommonGame
 {
     public partial class UI_ListLevelItem
     {
@@ -20,8 +20,8 @@ namespace UI.Studio
         public Transition m_ToLeft;
         public Transition m_ToRight;
         public Transition m_Left;
-        public const string URL = "ui://xz8kxrecv4822p";
-        public const string PACKAGE_NAME = "Studio";
+        public const string URL = "ui://eg2y0ldpv4822p";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ListLevelItem";
         private static UI_ListLevelItem _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 986b3dc77d6d72a489b1bc56a30ce90d
+guid: 89fb192eda147f948abfbc01c6c50a45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_ChallengeRewardItemUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GTextField m_rewardDesc;
+        public const string URL = "ui://wgkh30qjlw8c24";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ChallengeRewardItemUI";
+        private static UI_ChallengeRewardItemUI _proxy;
+
+        public static UI_ChallengeRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChallengeRewardItemUI();
+            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_ChallengeRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChallengeRewardItemUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_rewardDesc = (GTextField)comp.GetChild("rewardDesc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_rewardDesc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_ChallengeRewardsUI
+    {
+        public GComponent target;
+        public GLoader m_exit;
+        public GLoader m_bg;
+        public GList m_rewardOneList;
+        public GList m_rewardTwoList;
+        public const string URL = "ui://wgkh30qjlw8c23";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ChallengeRewardsUI";
+        private static UI_ChallengeRewardsUI _proxy;
+
+        public static UI_ChallengeRewardsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChallengeRewardsUI();
+            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_ChallengeRewardsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChallengeRewardsUI();
+            }
+            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_exit = (GLoader)comp.GetChild("exit");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_rewardOneList = (GList)comp.GetChild("rewardOneList");
+            m_rewardTwoList = (GList)comp.GetChild("rewardTwoList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_exit = null;
+            m_bg = null;
+            m_rewardOneList = null;
+            m_rewardTwoList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -10,8 +10,8 @@ namespace UI.MiniGame
         public GLoader m_loaBg;
         public GList m_cardList;
         public GLoader m_back;
-        public GTextField m_timeText;
         public GProgressBar m_ScareBar;
+        public GTextField m_timeText;
         public GImage m_star11;
         public GGroup m_star1;
         public GImage m_star21;
@@ -71,8 +71,8 @@ namespace UI.MiniGame
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_cardList = (GList)comp.GetChild("cardList");
             m_back = (GLoader)comp.GetChild("back");
-            m_timeText = (GTextField)comp.GetChild("timeText");
             m_ScareBar = (GProgressBar)comp.GetChild("ScareBar");
+            m_timeText = (GTextField)comp.GetChild("timeText");
             m_star11 = (GImage)comp.GetChild("star11");
             m_star1 = (GGroup)comp.GetChild("star1");
             m_star21 = (GImage)comp.GetChild("star21");
@@ -88,8 +88,8 @@ namespace UI.MiniGame
             m_loaBg = null;
             m_cardList = null;
             m_back = null;
-            m_timeText = null;
             m_ScareBar = null;
+            m_timeText = null;
             m_star11 = null;
             m_star1 = null;
             m_star21 = null;

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

@@ -0,0 +1,113 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_GameStartUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_btnBack;
+        public GLoader m_rewardBtn;
+        public GLoader m_shopBtn;
+        public GLoader m_ticket;
+        public GLoader m_addIcon;
+        public GTextField m_ticketNum;
+        public GLoader m_game1;
+        public GTextField m_game1name;
+        public GLoader m_needIcon1;
+        public GTextField m_needNum1;
+        public GLoader m_game2;
+        public GTextField m_game2name;
+        public GLoader m_needIcon2;
+        public GTextField m_needNum2;
+        public const string URL = "ui://wgkh30qjlw8c21";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "GameStartUI";
+        private static UI_GameStartUI _proxy;
+
+        public static UI_GameStartUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GameStartUI();
+            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_GameStartUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GameStartUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_rewardBtn = (GLoader)comp.GetChild("rewardBtn");
+            m_shopBtn = (GLoader)comp.GetChild("shopBtn");
+            m_ticket = (GLoader)comp.GetChild("ticket");
+            m_addIcon = (GLoader)comp.GetChild("addIcon");
+            m_ticketNum = (GTextField)comp.GetChild("ticketNum");
+            m_game1 = (GLoader)comp.GetChild("game1");
+            m_game1name = (GTextField)comp.GetChild("game1name");
+            m_needIcon1 = (GLoader)comp.GetChild("needIcon1");
+            m_needNum1 = (GTextField)comp.GetChild("needNum1");
+            m_game2 = (GLoader)comp.GetChild("game2");
+            m_game2name = (GTextField)comp.GetChild("game2name");
+            m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
+            m_needNum2 = (GTextField)comp.GetChild("needNum2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_btnBack = null;
+            m_rewardBtn = null;
+            m_shopBtn = null;
+            m_ticket = null;
+            m_addIcon = null;
+            m_ticketNum = null;
+            m_game1 = null;
+            m_game1name = null;
+            m_needIcon1 = null;
+            m_needNum1 = null;
+            m_game2 = null;
+            m_game2name = null;
+            m_needIcon2 = null;
+            m_needNum2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,104 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_ResultTipsUI
+    {
+        public GComponent target;
+        public GLoader m_resultTitle;
+        public GTextField m_failTxt;
+        public GLoader m_star1;
+        public GLoader m_star2;
+        public GLoader m_star3;
+        public GGroup m_success;
+        public GTextField m_resultTxt;
+        public GList m_rewardList;
+        public GLoader m_againBtn;
+        public GLoader m_exitBtn;
+        public GLoader m_consumeIcon;
+        public GTextField m_consumeTxt;
+        public const string URL = "ui://wgkh30qjlw8c1w";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ResultTipsUI";
+        private static UI_ResultTipsUI _proxy;
+
+        public static UI_ResultTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ResultTipsUI();
+            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_ResultTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ResultTipsUI();
+            }
+            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_resultTitle = (GLoader)comp.GetChild("resultTitle");
+            m_failTxt = (GTextField)comp.GetChild("failTxt");
+            m_star1 = (GLoader)comp.GetChild("star1");
+            m_star2 = (GLoader)comp.GetChild("star2");
+            m_star3 = (GLoader)comp.GetChild("star3");
+            m_success = (GGroup)comp.GetChild("success");
+            m_resultTxt = (GTextField)comp.GetChild("resultTxt");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_againBtn = (GLoader)comp.GetChild("againBtn");
+            m_exitBtn = (GLoader)comp.GetChild("exitBtn");
+            m_consumeIcon = (GLoader)comp.GetChild("consumeIcon");
+            m_consumeTxt = (GTextField)comp.GetChild("consumeTxt");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_resultTitle = null;
+            m_failTxt = null;
+            m_star1 = null;
+            m_star2 = null;
+            m_star3 = null;
+            m_success = null;
+            m_resultTxt = null;
+            m_rewardList = null;
+            m_againBtn = null;
+            m_exitBtn = null;
+            m_consumeIcon = null;
+            m_consumeTxt = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -11,6 +11,10 @@ namespace UI.MiniGame
         public GList m_numList;
         public GLoader m_backBtn;
         public GTextField m_score;
+        public GLoader m_target;
+        public GTextField m_time;
+        public GTextField m_timeNum;
+        public GLoader m_mergeBtn;
         public const string URL = "ui://wgkh30qjjmg19";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "TZFEGameView";
@@ -62,6 +66,10 @@ namespace UI.MiniGame
             m_numList = (GList)comp.GetChild("numList");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_score = (GTextField)comp.GetChild("score");
+            m_target = (GLoader)comp.GetChild("target");
+            m_time = (GTextField)comp.GetChild("time");
+            m_timeNum = (GTextField)comp.GetChild("timeNum");
+            m_mergeBtn = (GLoader)comp.GetChild("mergeBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +77,10 @@ namespace UI.MiniGame
             m_numList = null;
             m_backBtn = null;
             m_score = null;
+            m_target = null;
+            m_time = null;
+            m_timeNum = null;
+            m_mergeBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,6 @@ namespace UI.MiniGame
     {
         public GComponent target;
         public GLoader m_icon;
-        public GTextField m_numTxt;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://wgkh30qjjmg1a";
@@ -59,14 +58,12 @@ namespace UI.MiniGame
         private void Init(GComponent comp)
         {
             m_icon = (GLoader)comp.GetChild("icon");
-            m_numTxt = (GTextField)comp.GetChild("numTxt");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_icon = null;
-            m_numTxt = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_rewardItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public const string URL = "ui://wgkh30qjlw8c1z";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "rewardItem";
+        private static UI_rewardItem _proxy;
+
+        public static UI_rewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_rewardItem();
+            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_rewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_rewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_icon = (GLoader)comp.GetChild("icon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerFightUI.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerFightUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GList m_list;
+        public const string URL = "ui://b8ha2mnspll2h";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerFightUI";
+        private static UI_OpenServerFightUI _proxy;
+
+        public static UI_OpenServerFightUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerFightUI();
+            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_OpenServerFightUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerFightUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerFightUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerStoryUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerStoryUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public const string URL = "ui://b8ha2mnspll2g";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerStoryUI";
+        private static UI_OpenServerStoryUI _proxy;
+
+        public static UI_OpenServerStoryUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerStoryUI();
+            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_OpenServerStoryUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerStoryUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerStoryUI.cs.meta

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

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

@@ -18,6 +18,8 @@ namespace GFGGame
                 ActivityDataManager.Instance.lastDrawCount = message.Count;
             else if (activityOpenCfg.type == ConstLimitTimeActivityType.ActLimitTsy)
                 ActivityDataManager.Instance.lastTsyDrawCount = message.Count;
+            else if (activityOpenCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                ActivityDataManager.Instance.lastStlycDrawCount = message.Count;
 
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_LUCKY_BOX);
             await ETTask.CompletedTask;
@@ -119,8 +121,18 @@ namespace GFGGame
                         }
                     }
                     else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
-                    { 
-
+                    {
+                        if (ActivityDataManager.Instance.actLimitStlycId != response.ActivityId)
+                        {
+                            ActivityDataManager.Instance.limitStlycActBonusState.Clear();
+                        }
+                        ActivityDataManager.Instance.actLimitStlycId = response.ActivityId;
+                        ActivityDataManager.Instance.allLimitStlycTimes = response.AllPlayTimes;
+                        ActivityDataManager.Instance.lastStlycDrawCount = response.Count;
+                        for (int i = 0; i < response.KsBonusState.Count; i++)
+                        {
+                            ActivityDataManager.Instance.limitStlycActBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
+                        }
                     }
                     return true;
                 }
@@ -159,7 +171,15 @@ namespace GFGGame
                         }
                         ActivityDataManager.Instance.luckyActTsyBonusState[response.BonusKey] = response.BonusStatus;
                     }
-                        
+                    else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                    {
+                        if (ActivityDataManager.Instance.actLimitStlycId != response.ActivityId)
+                        {
+                            return false;
+                        }
+                        ActivityDataManager.Instance.limitStlycActBonusState[response.BonusKey] = response.BonusStatus;
+                    }
+
                     // int[][] bonus = ActivityLuckybonusCfgArray.Instance.GetCfgByidAndnum(response.ActivityId, response.BonusKey).bonusArr;
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);

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

@@ -47,15 +47,23 @@ namespace GFGGame
         {
             base.OnShown();
             _typeId = (int)this.viewData;
-
-            _activityId = ActivityDataManager.Instance.actLuckyBoxId;
-            _allPlayTimes = ActivityDataManager.Instance.allPlayTimes;
-            _bonusState = ActivityDataManager.Instance.luckyBoxActBonusState;
-            if (_typeId == ConstLimitTimeActivityType.ActLimitTsy) { 
+            if (_typeId == ConstLimitTimeActivityType.ActLimitLuckyBox)
+            {
+                _activityId = ActivityDataManager.Instance.actLuckyBoxId;
+                _allPlayTimes = ActivityDataManager.Instance.allPlayTimes;
+                _bonusState = ActivityDataManager.Instance.luckyBoxActBonusState;
+            }
+            else if(_typeId == ConstLimitTimeActivityType.ActLimitTsy) {
                 _activityId = ActivityDataManager.Instance.actLimitTsyId;
                 _allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;
                 _bonusState = ActivityDataManager.Instance.luckyActTsyBonusState;
             }
+            else if (_typeId == ConstLimitTimeActivityType.ActLimitStlyc)
+            {
+                _activityId = ActivityDataManager.Instance.actLimitStlycId;
+                _allPlayTimes = ActivityDataManager.Instance.allLimitStlycTimes;
+                _bonusState = ActivityDataManager.Instance.limitStlycActBonusState;
+            }
 
             _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(_activityId);
             _bonueCfgs = ActivityDataManager.Instance.SortActivityLuckybonusCfg(_bonueCfgs, _typeId);
@@ -65,13 +73,11 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-
         }
 
         private void RenderListItem(int index, GObject obj)

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

@@ -105,7 +105,7 @@ namespace GFGGame
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
-            ViewManager.Show<LuckyBoxActivityView>(new object[] { _activityId, ConstLimitTimeActivityType.ActLimitLuckyBox});
+            ViewManager.Show<LuckyBoxActivityView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
         }
 
         private void OnBtnShopClick()

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System;
 using ET;
 using System.Collections;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -44,6 +45,7 @@ namespace GFGGame
         private List<ItemData> _materiarsOfSelectedItem;
 
         private UI_MateriasListItem listTypeItem_CloSynthetic;
+        private UI_Component2 _compMover;
 
 
         public override void Dispose()
@@ -85,6 +87,7 @@ namespace GFGGame
             isReturnView = true;
             //this.clickBlankToClose = false;
 
+            _compMover = _ui.m_compHolder.m_compHolder.m_compMover;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 
             _dressUpObjUI = new DressUpObjUI("SceneDressUpSynthetic");
@@ -101,6 +104,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnProduction.onClick.Add(OnClickBtnProcuction);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            UpdateMaskHeight();
 
         }
         protected override void AddEventListener()
@@ -208,10 +212,15 @@ namespace GFGGame
         private EaseType ease = EaseType.CubicOut;
         private void UpdateRole(bool tween)
         {
+            // 根据高度比例放大（越高越大）
+            float rate = Screen.height * 1080f / 1920f / Screen.width;
+            // 平板会比宽手机更宽，设定最小值防止缩小
+            rate = Mathf.Max(rate, 1);
+
             _dressUpObjUI.ResetSceneObj(45, true, true, null, false);
             _dressUpObjUI.dressUpObj.AddOrRemove(_selectedItemId, true);
             _imgSelected.visible = _dressUpObjUI.dressUpObj.CheckDressUpItemIsOn(_selectedItemId);
-            _dressUpObjUI.UpdateWrapper(_ui.m_compHolder.m_compMover.m_holder);
+            _dressUpObjUI.UpdateWrapper(_compMover.m_holder);
             int type = ItemUtilCS.GetItemSubType(_selectedItemId);
             float duration = DURATION;
             if (!tween)
@@ -222,33 +231,33 @@ namespace GFGGame
             var dy = _ui.m_compHolder.target.height - 642;
             if (Array.IndexOf(HEAD_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(HEAD_Y + dy, duration).SetEase(ease);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(HEAD_SCALE, HEAD_SCALE), duration).SetEase(ease);
+                _compMover.target.TweenMoveY(HEAD_Y + dy, duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(HEAD_SCALE * rate, HEAD_SCALE * rate), duration).SetEase(ease);
             }
             else if (Array.IndexOf(FA_XING_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(FA_XING_Y + dy, duration).SetEase(ease);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(FA_XING_SCALE, FA_XING_SCALE), duration).SetEase(ease);
+                _compMover.target.TweenMoveY(FA_XING_Y + dy, duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(FA_XING_SCALE * rate, FA_XING_SCALE * rate), duration).SetEase(ease);
             }
             else if (Array.IndexOf(UPPER_BODY_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(UPPER_BODY_Y + dy, duration).SetEase(ease);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(UPPER_BODY_SCALE, UPPER_BODY_SCALE), duration).SetEase(ease);
+                _ui.m_compHolder.m_compHolder.m_compMover.target.TweenMoveY(UPPER_BODY_Y + dy, duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(UPPER_BODY_SCALE* rate, UPPER_BODY_SCALE * rate), duration).SetEase(ease);
             }
             else if (Array.IndexOf(LOWER_BODY_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(LOWER_BODY_Y + dy, duration).SetEase(ease);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(LOWER_BODY_SCALE, LOWER_BODY_SCALE), duration).SetEase(ease);
+                _compMover.target.TweenMoveY(LOWER_BODY_Y + dy, duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(LOWER_BODY_SCALE * rate, LOWER_BODY_SCALE* rate), duration).SetEase(ease);
             }
             else if (Array.IndexOf(SHOES_Y_ARR, type) >= 0)
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(SHOES_Y + dy, duration).SetEase(ease);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(SHOES_SCALE, SHOES_SCALE), duration).SetEase(ease);
+                _compMover.target.TweenMoveY(SHOES_Y + dy, duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(SHOES_SCALE * rate, SHOES_SCALE * rate), duration).SetEase(ease);
             }
             else
             {
-                _ui.m_compHolder.m_compMover.target.TweenMoveY(BODY_Y + dy, duration).SetEase(ease);
-                _ui.m_compHolder.m_compMover.target.TweenScale(new Vector2(BODY_SCALE, BODY_SCALE), duration).SetEase(ease);
+                _compMover.target.TweenMoveY(BODY_Y + dy, duration).SetEase(ease);
+                _compMover.target.TweenScale(new Vector2(BODY_SCALE * rate, BODY_SCALE * rate), duration).SetEase(ease);
             }
 
             if (!tween)
@@ -457,5 +466,15 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 5, "点击获得新的服饰。");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
         }
+
+        /// <summary>
+        /// 按照屏幕尺寸 更新遮罩的高度
+        /// </summary>
+        /// <returns></returns>
+        private async Task UpdateMaskHeight()
+        {
+            await Task.Delay(5);
+            _ui.m_compHolder.m_mask.height = _ui.m_posHelper.height;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -222,6 +222,7 @@ namespace GFGGame
                 case ConstItemID.ARENA_CUR_COST:
                 case ConstItemID.ARENA_PAST_COST:
                 case ConstItemID.LUCKYBOX_ACTIVITY_STORE_COST_2:
+                case ConstItemID.OPEN_SERVER_COST_1:
                     button.m_imgAdd.visible = true;
                     break;
                 default:
@@ -282,6 +283,7 @@ namespace GFGGame
                 case ConstItemID.LUCKYBOX_COST_0:
                 case ConstItemID.LUCKYBOX_COST_1:
                 case ConstItemID.LUCKYBOX_COST_2:
+                case ConstItemID.OPEN_SERVER_COST_1:
                     // ItemUtil.ExchangeItemById(itemId, 10, true, null, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED, true);
                     BuyItemConteoller.Show(itemId, 1, ConstBuyType.TYPE_ITEM, null, true, false, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
                     break;

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

@@ -78,12 +78,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _activityId = (int)(this.viewData as object[])[0];
-            _activityType = (int)(this.viewData as object[])[1];
+            _activityType = (int)this.viewData;
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
+            _valueBarController.UpdateList(new List<int>() {  _luckyBoxCfg.costID, ConstItemID.DIAMOND_RED, ConstItemID.DIAMOND_PURPLE });
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
             LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
             LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
@@ -92,6 +92,10 @@ namespace GFGGame
             UpdateListItemData();
             UpdateRedDot();
             _ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
+            if(_activityType == ConstLimitTimeActivityType.ActLimitStlyc)
+                _ui.m_comBox.m_c1.selectedIndex = 2;
+            else
+                _ui.m_comBox.m_c1.selectedIndex = 1;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
@@ -110,7 +114,7 @@ namespace GFGGame
                 return;
             }
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            _ui.m_txtTime.text = "剩余时间：" + TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
 
             //=====限时礼包倒计时
             UpGiftBox();
@@ -120,13 +124,12 @@ namespace GFGGame
 
         private void UpdateListItemData()
         {
-
             UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
             //comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
-            comBox.m_btnPreview.m_c1.selectedIndex = 1;
 
+            comBox.m_btnPreview.m_c1.selectedIndex = 1;
 
             comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.costNum.ToString();
             comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
@@ -165,7 +168,14 @@ namespace GFGGame
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
             comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", _luckyBoxCfg.maxCount - boughtCount);
             UI_ComBox.ProxyEnd();
-            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
+
+            string strDrawCount = "";
+            if (_activityType == ConstLimitTimeActivityType.ActLimitLuckyBox)
+                strDrawCount = ActivityDataManager.Instance.lastDrawCount.ToString();
+            else if (_activityType == ConstLimitTimeActivityType.ActLimitStlyc)
+                strDrawCount = ActivityDataManager.Instance.lastStlycDrawCount.ToString();
+
+            _ui.m_txtCount.SetVar("value", strDrawCount).FlushVars();
             _ui.m_txtCount.SetVar("name", _luckyBoxCfg.name).FlushVars();
         }
         private void UpGiftBox()

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

@@ -183,9 +183,9 @@ namespace GFGGame
             else
                 comBox.m_showActivityType.selectedIndex = 0;
 
-            //if (cfg.costNumfifty > 0)
-            //    comBox.m_comLuckBoxBtn.m_btnNumberType.selectedIndex = 1;
-            //else
+            if (cfg.costNumfifty > 0)
+                comBox.m_comLuckBoxBtn.m_btnNumberType.selectedIndex = 1;
+            else
                 comBox.m_comLuckBoxBtn.m_btnNumberType.selectedIndex = 0;
 
             if (_luckyBoxCtrl.ContainsKey(boxId))

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

@@ -20,6 +20,7 @@ namespace GFGGame
             _onFinishStoryLevelCall = onFinishStoryLevelCall;
             InstanceZonesDataManager.currentLevelCfgId = levelCfgId;
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+
             if (levelCfg.fightID.Length > 0)
             {
                 StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);

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

@@ -191,7 +191,7 @@ namespace GFGGame
             _ui.m_proScore.m_comSecondScore.target.x = (((float)fightCfg.score2 / (float)fightCfg.score3)) * (_ui.m_proScore.target.width - offsetX);
             _ui.m_proScore.m_comThirdScore.target.x = (((float)fightCfg.score3 / (float)fightCfg.score3)) * (_ui.m_proScore.target.width - offsetX);
             _ui.m_proScore.m_holder.visible = false;
-            _ui.m_proScore.m_txtCount.text = "总分 0";
+            _ui.m_proScore.m_txtCount.text = "0";
             _ui.m_comClick.target.touchable = false;
             _ui.m_comClick.m_comAllPerfect.target.visible = false;
             _isAllPerfect = false;
@@ -417,7 +417,7 @@ namespace GFGGame
             }).OnComplete(() =>
             {
                 FightDataManager.Instance.totalScore = _score;
-                _ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
+                _ui.m_proScore.m_txtCount.text = string.Format("{0}", _score);
                 GetCurStar(out int star);
                 _ui.m_proScore.m_comFirstScore.m_c1.selectedIndex = star > 0 ? 1 : 0;
                 _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = star > 1 ? 1 : 0;
@@ -539,9 +539,9 @@ namespace GFGGame
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             if (storyLevelCfg != null)
             {
-                if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+                if ((storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3) || storyLevelCfg.type == ConstInstanceZonesType.PureFight)
                 {
-                    float addition = StudioDataManager.Instance.GetAddition();
+                    float addition = StudioDataManager.Instance.GetAddition(storyLevelCfg.type);
                     addition = addition / 10000 * FightDataManager.Instance.totalScore;
                     _score += (int)Math.Round(addition);
                     UpdateProgressA();
@@ -683,7 +683,7 @@ namespace GFGGame
             GTween.Kill(_ui.m_proScore.m_comBar);
 
             _ui.m_proScore.target.value = 0;
-            _ui.m_proScore.m_txtCount.text = "总分 0";
+            _ui.m_proScore.m_txtCount.text = "0";
 
             _ui.m_proScore.m_comFirstScore.m_c1.selectedIndex = 0;
             _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = 0;

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

@@ -278,16 +278,16 @@ namespace GFGGame
             }
             else if (fightCfg.needTagsArr.Length > 0)
             {
-                _ui.m_ctrlNeed.selectedIndex = 2;
+                _ui.m_ctrlNeed.selectedIndex = 2; 
                 _ui.m_listTag.numItems = fightCfg.needTagsArr.Length;
             }
-            else if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            else if ((levelCfg.type == ConstInstanceZonesType.Studio  && levelCfg.subType == ConstInstanceZonesSubType.Hard3) || levelCfg.type == ConstInstanceZonesType.PureFight)
             {
                 _ui.m_ctrlNeed.selectedIndex = 3;
                 _ui.m_grpAdditionDesc.visible = false;
 
                 // 如果是活动界面，不显示收集进度
-                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                if (StudioDataManager.Instance.IsluckyBoxFilingChapter() || levelCfg.type == ConstInstanceZonesType.PureFight)
                 {
                     _ui.m_btnAdditionDesc.visible = false;
                 }
@@ -300,10 +300,16 @@ namespace GFGGame
                     _ui.m_btnAdditionDesc.visible = true;
                 }
 
-                float addition = StudioDataManager.Instance.GetAddition();
+                float addition = 0;
+                if (levelCfg.type == ConstInstanceZonesType.PureFight)
+                {
+                    StudioDataManager.Instance.filingChapterId = levelCfg.chapterId;
+                    addition = StudioDataManager.Instance.GetAddition(ConstInstanceZonesType.PureFight);  
+                }
+                else 
+                    addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * 100;
                 _ui.m_txtAddition.text = string.Format("{0}%加成", addition);
-
             }
         }
 

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

@@ -626,6 +626,15 @@ namespace GFGGame
                     ActivityDataManager.Instance.lastActLimitTsyId = actLimitTsyId;
                 }
             }
+            int actLimitStlycId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (actLimitStlycId > 0)
+            {
+                if (actLimitStlycId != ActivityDataManager.Instance.lastActLimitStlycId)
+                {
+                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLimitStlycId).Coroutine();
+                    ActivityDataManager.Instance.lastActLimitStlycId = actLimitStlycId;
+                }
+            }
 
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ChallengeRewardView : BaseView
+    {
+        private UI_ChallengeRewardsUI _ui;
+
+        private List<int> gameList = new List<int>();
+        private Dictionary<int, string> gameDic = new Dictionary<int, string>() { { 0,"翻牌"},{ 1,"2048"} };
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChallengeRewardsUI.PACKAGE_NAME;
+            _ui = UI_ChallengeRewardsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_exit.onClick.Add(Hide);
+            _ui.m_rewardOneList.itemRenderer = RenderListOne;
+            _ui.m_rewardTwoList.itemRenderer = RenderListTwo;
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            gameList = (this.viewData as object[])[0] as List<int>;
+            _ui.m_rewardOneList.numItems = 3;
+            _ui.m_rewardTwoList.numItems = 3;
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListOne(int index ,GObject obj)
+        {
+            UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
+            int starNum = 3 - index;
+            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关",gameDic[0], starNum);
+            UI_ChallengeRewardItemUI.ProxyEnd();
+        }
+        private void RenderListTwo(int index, GObject obj)
+        {
+            UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
+            int starNum = 3 - index;
+            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关", gameDic[1], starNum);
+            UI_ChallengeRewardItemUI.ProxyEnd();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -23,6 +23,8 @@ namespace GFGGame
         private int gameTime = 120;
         //游戏当前时长
         private int currentGameTime = 120;
+        //进度条
+        private float barTime = 120.0f;
         //行数
         private int rows = 0;
         //列数
@@ -85,15 +87,18 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(canTouch);
             Timers.inst.Remove(UpdateCard);
+            Timers.inst.Remove(UpdateBar);
         }
 
         private void OnClickBtnBack()
         {
             Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(UpdateBar);
             AlertUI.Show("是否退出游戏")
             .SetLeftButton(true, "取消", (object data) =>
             {
                 Timers.inst.Add(1.0f, 0, UpdateTime);
+                Timers.inst.Add(0.1f, 0, UpdateBar);
             })
             .SetRightButton(true, "确定", (object data) =>
             {
@@ -127,12 +132,13 @@ namespace GFGGame
         {
             currentGameTime = gameTime;
             currentCardNum = cardNum;
+            barTime = (float)gameTime;
             needNum = 2;
             rand = new System.Random();
             //洗牌
             RandomCardList(cardArray, cardArray.Length);
             //
-            _ui.m_timeText.text = string.Format("倒计时：{0}", currentGameTime);
+            _ui.m_timeText.text = string.Format("{0}", currentGameTime);
             _ui.m_ScareBar.max = gameTime;
             _ui.m_ScareBar.min = 0;
             _ui.m_ScareBar.value = gameTime;
@@ -142,6 +148,8 @@ namespace GFGGame
  
             //计时器
             Timers.inst.Add(1.0f, 0, UpdateTime);
+            //进度条计时器
+            Timers.inst.Add(0.1f, 0, UpdateBar);
         }
 
         private void UpdateList()
@@ -250,14 +258,18 @@ namespace GFGGame
         private void UpdateTime(object param = null)
         {
             currentGameTime--;
-            _ui.m_ScareBar.value = currentGameTime;
-            _ui.m_timeText.text = string.Format ("倒计时：{0}", currentGameTime);
+            //_ui.m_ScareBar.value = currentGameTime;
+            _ui.m_timeText.text = string.Format ("{0}", currentGameTime);
             if(currentGameTime <= 0)
             {
-                Timers.inst.Remove(UpdateTime);
                 Gameover(false);
             }
         }
+        private void UpdateBar(object param = null)
+        {
+            barTime -= 0.1f;
+            _ui.m_ScareBar.value = barTime;
+        }
 
         private void canTouch(object param = null)
         {
@@ -267,32 +279,14 @@ namespace GFGGame
         private void Gameover(bool isPass = false)
         {
             Timers.inst.Remove(UpdateTime);
-            if (!isPass)
+            Timers.inst.Remove(UpdateBar);
+            if (isPass)
             {
-                AlertUI.Show("游戏时间到")
-                .SetLeftButton(false)
-                .SetRightButton(true, "确定", (object data) =>
-                {
-                    this.Hide();
-                });
+                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName, currentGameTime });
             }
             else
             {
-                string custemsName = "";
-                for(int i = CustemsNum.Count - 1; i>=0; i--)
-                {
-                    if(currentGameTime >= CustemsNum[i])
-                    {
-                        custemsName = CustemsName[i];
-                        break;
-                    }
-                }
-                AlertUI.Show(string.Format("恭喜通过，所用时长：{0}，通关评价：{1}", currentGameTime, custemsName))
-                .SetLeftButton(false)
-                .SetRightButton(true, "确定", (object data) =>
-                {
-                    this.Hide();
-                });
+                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName });
             }
         }
         //洗牌

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class GameStartView : BaseView
+    {
+        private UI_GameStartUI _ui;
+        //后续这里改成读表内容
+        private List<string> name = new List<string>() { "翻牌", "2048" };
+        private List<string> viewName = new List<string>() { "FlipGameView", "TZFEGameView" };
+        private List<string> CustemsDesc = new List<string>()
+        {
+            "首次评价达到卓越奖励：",
+            "首次评价达到优秀奖励：",
+            "首次评价达到良好奖励：",
+        };
+
+        private int currentGame = 0;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_GameStartUI.PACKAGE_NAME;
+            _ui = UI_GameStartUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_game1.onClick.Add(OnClickBtnGameOne);
+            _ui.m_game2.onClick.Add(OnClickBtnGameTwo);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_shopBtn.onClick.Add(OnClickBtnShop);
+            _ui.m_addIcon.onClick.Add(OnClickBtnAdd);
+            _ui.m_rewardBtn.onClick.Add(OnClickBtnReward);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+        protected override void OnHide()
+        {
+
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            _ui.m_ticketNum.text = "999";
+            _ui.m_game1name.text = name[0];
+            _ui.m_game2name.text = name[1];
+        }
+        private void OnClickBtnBack()
+        {
+            this.Hide();
+        }
+        private void OnClickBtnShop()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+        }
+        private void OnClickBtnReward()
+        {
+            ViewManager.Show<ChallengeRewardView>(new object[] { new List<int>() { 0,1 } });
+        }
+        private void OnClickBtnAdd()
+        {
+
+        }
+        private void OnClickBtnGameOne()
+        {
+            ViewManager.Show($"GFGGame.{viewName[0]}");
+            this.Hide();
+        }
+        private void OnClickBtnGameTwo()
+        {
+            ViewManager.Show($"GFGGame.{viewName[1]}");
+            this.Hide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ResultTipsView : BaseView
+    {
+        private UI_ResultTipsUI _ui;
+        private bool gameResult;
+        private int timeResult;
+        private string gameName;
+
+        //通关评价
+        private List<int> CustemsNum = new List<int>()
+        {
+            10,
+            30,
+            60,
+        };
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ResultTipsUI.PACKAGE_NAME;
+            _ui = UI_ResultTipsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_exitBtn.onClick.Add(OnClickExit);
+            _ui.m_againBtn.onClick.Add(OnClickAgain);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if ((this.viewData as object[]).Length == 3)
+            {
+                gameResult = (bool)(this.viewData as object[])[0];
+                gameName = (string)(this.viewData as object[])[1];
+                timeResult = (int) (this.viewData as object[])[2];
+                
+            }
+            else
+            {
+                gameResult = (bool)(this.viewData as object[])[0];
+                gameName = (string)(this.viewData as object[])[1];
+            }
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            if(gameResult)
+            {
+                _ui.m_failTxt.visible = false;
+                _ui.m_success.visible = true ;
+                _ui.m_resultTxt.text = "通关奖励";
+                _ui.m_resultTitle.url = "ui://MiniGame/shengli_bt";
+                UpdateStar();
+            }
+            else
+            {
+                _ui.m_failTxt.visible = true;
+                _ui.m_success.visible = false;
+                _ui.m_resultTxt.text = "失败奖励";
+                _ui.m_resultTitle.url = "ui://MiniGame/shibai_bt";
+            }
+        }
+
+        private void UpdateStar()
+        {
+            int starNum = 0;
+            for (int i = CustemsNum.Count - 1; i >= 0; i--)
+            {
+                if (timeResult >= CustemsNum[i])
+                {
+                    starNum = i + 1;
+                    break;
+                }
+            }
+            switch(starNum)
+             {
+                case 1:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    break;
+                case 2:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    break;
+                case 3:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star";
+                    break;
+                default:
+                    break;
+            }
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickExit()
+        {
+            this.Hide();
+            ViewManager.Hide(gameName);
+        }
+        private void OnClickAgain()
+        {
+            this.Hide();
+            ViewManager.Show(gameName);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class SyntheticRoutetipView : BaseView
+    {
+        private UI_SyntheticRouteTipUI _ui;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_SyntheticRouteTipUI.PACKAGE_NAME;
+            _ui = UI_SyntheticRouteTipUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_bg.onClick.Add(Hide);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -18,13 +18,14 @@ namespace GFGGame
         private System.Random rand;
 
         //这个是数组的行数和列数，mapLength一般采用行列一样
-        private int rows = 5;
-        private int columns = 5;
+        private int rows = 4;
+        private int columns = 4;
         private int mapLength = 5;
         //得分
         private int score = 0;
         private int scoreMax = 0;
-        private int targetNum = 2048;
+        //目标分数
+        private int targetNum = 128;
         private bool isMove;
         private bool isMerge;
         private struct NumPos
@@ -35,7 +36,7 @@ namespace GFGGame
         }
         //需要播放动效的列表
         private List<NumPos> numPosArray = new List<NumPos>();
-
+        private int time = 0;
 
         public override void Dispose()
         {
@@ -58,6 +59,7 @@ namespace GFGGame
             _ui.target.onTouchBegin.Add(OnClickBegin);
             _ui.target.onTouchEnd.Add(OnClickEnd);
             _ui.m_backBtn.onClick.Add(OnClickBtnBack);
+            _ui.m_mergeBtn.onClick.Add(OnClickMergeTips);
             Map = new int[rows, columns];
         }
 
@@ -70,6 +72,7 @@ namespace GFGGame
         }
         protected override void OnHide()
         {
+            Timers.inst.Remove(UpdateTime);
             base.OnHide();
         }
 
@@ -88,10 +91,13 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            time = 0;
             score = 0;
-            targetNum = 2048;
+            targetNum = 64;
             _ui.m_score.text = string.Format("分数：{0}", score.ToString());
+            _ui.m_score.visible = false;
             rand = new System.Random();
+            Timers.inst.Add(1.0f, 0, UpdateTime);
         }
         private void UpdateScore()
         {
@@ -108,17 +114,15 @@ namespace GFGGame
             UI_numItem numItem = UI_numItem.Proxy(item);
             int x = index / rows;
             int y = index % columns;
-            numItem.m_numTxt.text = Map[x,y].ToString();
             if(Map[x,y] == 0)
             {
-                numItem.m_numTxt.visible = false;
+                numItem.m_icon.visible = false;
             }
             else
             {
-                numItem.m_numTxt.visible = true;
+                numItem.m_icon.url = string.Format("ui://MiniGame/sgll2_{0}", Map[x, y]);
+                numItem.m_icon.visible = true;
             }
-            //这个后续根据数组内容替换图片
-            //_ui.m_icon.url = 
             //播放生成和合并动效
             for(int i=0; i<numPosArray.Count; i++)
             {
@@ -158,7 +162,9 @@ namespace GFGGame
             }
             if(!gameOver)
             {
-                // 还需要加，无法移动，无法合并时，游戏结束
+                // 游戏结束
+                GameOver(false);
+                return;
             }
             while (true)
             {
@@ -205,7 +211,7 @@ namespace GFGGame
                 {
                     row[pos] = row[i];
                     
-                    //-----这里修改需要播放动效的列表-----
+                    //-----这里修改需要播放动效的数字位置列表-----
                     int x = 0;
                     int y = 0;
                     int nextX = 0;
@@ -287,14 +293,15 @@ namespace GFGGame
                     UpdateScore();
                     if (row[i] == targetNum)
                     {
-                        //游戏结束
+                        //游戏成功
+                        GameOver(true);
                     }
                     isMerge = true;
                 }
             }
             Remove0(row,dir,xy);
         }
-        //将合并的数字放入列表的准备
+        //将合并的数字位置放入列表的准备
         private NumPos MoveAddNum(int i, int xy, Direction dir,int length)
         {
             NumPos item = new NumPos();
@@ -418,6 +425,7 @@ namespace GFGGame
                 UpdateList();
                 numPosArray.Clear();
             }
+            CheckArray();
         }
 
         private void OnClickBegin()
@@ -450,5 +458,84 @@ namespace GFGGame
                 touchFirst = touchSecond;
         }
 
+        private void OnClickMergeTips()
+        {
+            ViewManager.Show<SyntheticRoutetipView>() ;
+        }
+        private void UpdateTime(object param = null)
+        {
+            _ui.m_timeNum.text = sec_to_hms(time);
+            time++;
+        }
+
+        //将秒数转化为时分秒 duration为秒数
+        private string sec_to_hms(int duration)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, duration);
+            int _hours = 0;
+            if (ts.Days > 0)
+            {
+                _hours = ts.Days * 24;
+            }
+            string str = "";
+            if (ts.Hours > 0)
+            {
+
+                str = String.Format("{0:00}", ts.Hours + _hours) + ":" + String.Format("{0:00}", ts.Minutes) + ":" + String.Format("{0:00}", ts.Seconds);
+            }
+            if (ts.Hours == 0 && ts.Minutes > 0)
+            {
+                str = "00:";
+                if (_hours > 0)
+                {
+                    str = String.Format("{0:00}", ts.Hours + _hours) + ":";
+                }
+                str += String.Format("{0:00}", ts.Minutes) + ":" + String.Format("{0:00}", ts.Seconds);
+            }
+            if (ts.Hours == 0 && ts.Minutes == 0)
+            {
+                str = "00";
+                if (_hours > 0)
+                {
+                    str = String.Format("{0:00}", ts.Hours + _hours);
+                }
+                str += ":00:" + String.Format("{0:00}", ts.Seconds);
+            }
+            return str;
+        }
+        private void CheckArray()
+        {
+            bool gameOver = false;
+            for (int i = 0; i < rows; i++)
+            {
+                for (int j = 0; j < columns; j++)
+                {
+                    if (Map[i, j] == 0)
+                    {
+                        gameOver = true;
+                        break;
+                    }
+                }
+            }
+            if (!gameOver)
+            {
+                // 游戏结束
+                GameOver(false);
+                return;
+            }
+        }
+
+        private void GameOver(bool target)
+        {
+            Timers.inst.Remove(UpdateTime);
+            if (target)
+            {
+                ViewManager.Show<ResultTipsView>(new object[]{target, typeof(TZFEGameView).FullName, time });
+            }
+            else
+            {
+                ViewManager.Show<ResultTipsView>(new object[]{target,typeof(TZFEGameView).FullName });
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -4,7 +4,7 @@ using UI.OpenServerActivity;
 
 namespace GFGGame
 {
-    public class OpenServerActivityView : BaseView
+    public class OpenServerActivityView : BaseWindow
     {
         private UI_OpenServerActivityUI _ui;
 
@@ -96,15 +96,14 @@ namespace GFGGame
         private void OnClickBtnMingTong()
         {
             //副本入口
-            PromptController.Instance.ShowFloatTextPrompt("暂未开启");
-            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+            ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnAnswerTianmen()
         {
             //剧情入口
             PromptController.Instance.ShowFloatTextPrompt("暂未开启");
-            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+            //ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnTenShu()
@@ -115,7 +114,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动未开启");
                 return;
             }
-            ViewManager.Show<LuckyBoxActivityView>(new object[]{actLimitId, ConstLimitTimeActivityType.ActLimitStlyc});
+            ViewManager.Show<LuckyBoxActivityView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnNineZhouPool() 

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerFightView.cs

@@ -0,0 +1,166 @@
+using UnityEngine;
+using FairyGUI;
+using UI.OpenServerActivity;
+using UI.CommonGame;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class OpenServerFightView : BaseWindow
+    {
+        private UI_OpenServerFightUI _ui;
+        private int itemIndex = 0;
+        private List<StoryLevelCfg> _storyLevelCfgs;
+        private ActivityFightCfg _activityFightCfg;
+        private int _activityId;
+        private int _activityType;
+        private ActivityOpenCfg _activityCfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_OpenServerFightUI.PACKAGE_NAME;
+            _ui = UI_OpenServerFightUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+            _ui.m_list.itemRenderer = RenderListItem;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _activityType = (int)this.viewData;
+            StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerFightView).FullName;
+            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_sdcy_gq");
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
+            _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            _activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(_activityCfg.params3Arr[0]);
+            _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
+            _ui.m_list.numItems = _storyLevelCfgs.Count;
+            UpdateItem();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(OpenServerFightView).FullName);
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            // int _index = _storyLevelCfgs.Count - index - 1;
+            UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
+            //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
+            item.m_txtName.text = _storyLevelCfgs[index].name;
+            bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
+            string resBg = isFight ? "cyjd_di_1" : "cyjd_di_2";
+            //item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
+
+            if (isFight)
+            {
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_1";
+                item.m_loaIcon.visible = false;
+                item.m_loaItem.visible = true;
+                StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
+                int itemId = storyFightCfg.bonusBaseArr[0][0];
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                item.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
+                if (item.m_loaItem.data == null)
+                {
+                    item.m_loaItem.onClick.Add(OnLoaItemClick);
+                }
+                item.m_loaItem.data = index;
+            }
+            else
+            {
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_2";
+                item.m_loaItem.visible = false;
+                item.m_loaIcon.visible = true;
+                item.m_loaIcon.url = string.Format("ui://Studio/{0}", _activityFightCfg.res);
+            }
+            item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
+            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            if (item.m_loaBg.data == null)
+            {
+                item.m_loaBg.onClick.Add(OnListItemClick);
+            }
+            item.m_loaBg.data = index;
+            UI_ListLevelItem.ProxyEnd();
+        }
+
+        private void OnListItemClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+            StoryLevelCfg storyLevelCfg = _storyLevelCfgs[index];
+            if (index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("Ðèͨ¹ØÇ°Öùؿ¨");
+                return;
+            }
+            MainStoryDataManager.currentLevelCfgId = storyLevelCfg.id;
+            InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishStudioStoryLevel);
+        }
+
+        private void OnLoaItemClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+            StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
+            int itemId = storyFightCfg.bonusBaseArr[0][0];
+            GoodsItemTipsController.ShowItemTips(itemId);
+
+        }
+        private void UpdateItem()
+        {
+            for (int i = 0; i < _ui.m_list.numChildren; i++)
+            {
+                _ui.m_list.GetChildAt(i).visible = false;
+            }
+            itemIndex = 0;
+            Timers.inst.Add(0.05f, _ui.m_list.numChildren, AddItemUpdate, 1);
+        }
+
+        private void AddItemUpdate(object param)
+        {
+            _ui.m_list.GetChildAt(itemIndex).visible = true;
+            UI_ListLevelItem item = UI_ListLevelItem.Proxy(_ui.m_list.GetChildAt(itemIndex));
+            item.m_Left.Play();
+            itemIndex++;
+            UI_ListLevelItem.ProxyEnd();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerFightView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -0,0 +1,80 @@
+using UnityEngine;
+using FairyGUI;
+using UI.OpenServerActivity;
+using UI.CommonGame;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class OpenServerStoryView : BaseWindow
+    {
+        private UI_OpenServerStoryUI _ui;
+        private int itemIndex = 0;
+        private List<StoryLevelCfg> _storyLevelCfgs;
+        private ActivityFightCfg _activityFightCfg;
+        private int _activityId;
+        private int _activityType;
+        private ActivityOpenCfg _activityCfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_OpenServerStoryUI.PACKAGE_NAME;
+            _ui = UI_OpenServerStoryUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _activityType = (int)this.viewData;
+            StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
+            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
+            _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            _activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(_activityCfg.params3Arr[0]);
+            _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(OpenServerStoryView).FullName);
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs.meta

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

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
 

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
 
@@ -81,8 +82,8 @@ namespace GFGGame
             _valueBarController.OnHide();
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(AddItemUpdate);
-
         }
+
         protected void GoBackFrom()
         {
             ViewManager.GoBackFrom(typeof(StudioFilingView).FullName);

GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5c2ddc318291d2e4da1750980a3b35a6
+guid: 1c60b79975a61e1419b1d4cc33fc1ca3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5d307345c390bf94da7949c2de50be57
+guid: 53795278d3ee2c14cb85c5f8b0ac85b7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: de024764057581c469f68dfb185ad81e
+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/MiniGame/MiniGame_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 58d64be81b0adf34c91e0303b39b3e24
+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/MiniGame/MiniGame_fui.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e8687b1c3c750724d90b43f0e9a8366b
+guid: c536a234fca2ec44f9b4c13ea67e96a8
 TextScriptImporter:
   externalObjects: {}
   userData: