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

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

@@ -55,7 +55,7 @@ namespace GFGGame
                 ItemTypeCfgArray.Instance.Init();
                 GuideCfgArray.Instance.Init();
                 SuitCfgArray.Instance.Init();
-                ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
+                ShopCfgArray.Instance.Init();
                 SuitFosterCfgArray.Instance.Init();
                 VipCfgArray.Instance.Init();
                 ActivityRechargeCfgArray.Instance.Init();

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

@@ -112,6 +112,12 @@ namespace GFGGame
                     stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.num) ? 1 : -1;
                     stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.num) ? 1 : -1;
                 }
+                else if (typeId == ConstLimitTimeActivityType.ActLimitStlyc)
+                {
+                    allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                    stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.num) ? 1 : -1;
+                    stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.num) ? 1 : -1;
+                }
 
                 if (allPlayTimes >= a.num && allPlayTimes < b.num && stateA < 0) return -1;
                 if (allPlayTimes >= b.num && allPlayTimes < a.num && stateB < 0) return 1;

GameClient/Assets/Game/HotUpdate/Data/VO/PoemPhotoData.cs

@@ -13,12 +13,12 @@ namespace GFGGame
         /// <summary>
         /// 创建时间,毫秒
         /// </summary>
-        public long CreationTime;
+        public long CreationTime { get; set; }
 
         /// <summary>
         /// 置顶状态
         /// </summary>
-        public bool ToppingStatus;
+        public bool ToppingStatus { get; set; }
 
         /// <summary>
         /// 锁定状态

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

@@ -28,6 +28,7 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnWanShiLi;
         public UI_BtnModle m_btnFirstRecharge;
@@ -106,6 +107,7 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnWanShiLi = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnWanShiLi"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
@@ -152,6 +154,8 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_btnOpenServerActivity.Dispose();
+            m_btnOpenServerActivity = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
             m_btnWanShiLi.Dispose();

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button6.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_Button6
+    {
+        public GButton target;
+        public GTextField m_title1;
+        public GTextField m_title2;
+        public const string URL = "ui://wgkh30qj806ni";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "Button6";
+        private static UI_Button6 _proxy;
+
+        public static UI_Button6 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button6();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button6 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button6();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_title1 = (GTextField)comp.GetChild("title1");
+            m_title2 = (GTextField)comp.GetChild("title2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_title1 = null;
+            m_title2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComEctype.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button6.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 768a03a9f0e74e441974c116fe6c7644
+guid: 26c178eb6a967da4082bfa91e639a259
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,110 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_FlipGameStartUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_btnBack;
+        public GLoader m_nameIcon;
+        public GList m_settingTypeList;
+        public GLoader m_shop;
+        public GLoader m_showGame;
+        public GLoader m_gameStart;
+        public GLoader m_ticketIcon;
+        public GList m_passRewardList;
+        public GList m_failRewardList;
+        public GList m_descList;
+        public GLoader m_ticket;
+        public GLoader m_addIcon;
+        public GTextField m_ticketNum;
+        public const string URL = "ui://wgkh30qj806nf";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "FlipGameStartUI";
+        private static UI_FlipGameStartUI _proxy;
+
+        public static UI_FlipGameStartUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FlipGameStartUI();
+            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_FlipGameStartUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FlipGameStartUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_nameIcon = (GLoader)comp.GetChild("nameIcon");
+            m_settingTypeList = (GList)comp.GetChild("settingTypeList");
+            m_shop = (GLoader)comp.GetChild("shop");
+            m_showGame = (GLoader)comp.GetChild("showGame");
+            m_gameStart = (GLoader)comp.GetChild("gameStart");
+            m_ticketIcon = (GLoader)comp.GetChild("ticketIcon");
+            m_passRewardList = (GList)comp.GetChild("passRewardList");
+            m_failRewardList = (GList)comp.GetChild("failRewardList");
+            m_descList = (GList)comp.GetChild("descList");
+            m_ticket = (GLoader)comp.GetChild("ticket");
+            m_addIcon = (GLoader)comp.GetChild("addIcon");
+            m_ticketNum = (GTextField)comp.GetChild("ticketNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnBack = null;
+            m_nameIcon = null;
+            m_settingTypeList = null;
+            m_shop = null;
+            m_showGame = null;
+            m_gameStart = null;
+            m_ticketIcon = null;
+            m_passRewardList = null;
+            m_failRewardList = null;
+            m_descList = null;
+            m_ticket = null;
+            m_addIcon = null;
+            m_ticketNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,110 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_FlipGameUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GList m_cardList;
+        public GLoader m_back;
+        public GTextField m_timeText;
+        public GProgressBar m_ScareBar;
+        public GImage m_star11;
+        public GGroup m_star1;
+        public GImage m_star21;
+        public GImage m_star22;
+        public GGroup m_star2;
+        public GImage m_star31;
+        public GImage m_star32;
+        public GImage m_star33;
+        public GGroup m_star3;
+        public const string URL = "ui://wgkh30qjjmg10";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "FlipGameUI";
+        private static UI_FlipGameUI _proxy;
+
+        public static UI_FlipGameUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FlipGameUI();
+            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_FlipGameUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FlipGameUI();
+            }
+            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_cardList = (GList)comp.GetChild("cardList");
+            m_back = (GLoader)comp.GetChild("back");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_ScareBar = (GProgressBar)comp.GetChild("ScareBar");
+            m_star11 = (GImage)comp.GetChild("star11");
+            m_star1 = (GGroup)comp.GetChild("star1");
+            m_star21 = (GImage)comp.GetChild("star21");
+            m_star22 = (GImage)comp.GetChild("star22");
+            m_star2 = (GGroup)comp.GetChild("star2");
+            m_star31 = (GImage)comp.GetChild("star31");
+            m_star32 = (GImage)comp.GetChild("star32");
+            m_star33 = (GImage)comp.GetChild("star33");
+            m_star3 = (GGroup)comp.GetChild("star3");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_cardList = null;
+            m_back = null;
+            m_timeText = null;
+            m_ScareBar = null;
+            m_star11 = null;
+            m_star1 = null;
+            m_star21 = null;
+            m_star22 = null;
+            m_star2 = null;
+            m_star31 = null;
+            m_star32 = null;
+            m_star33 = null;
+            m_star3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameView.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_TZFEGameView
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GList m_numList;
+        public GLoader m_backBtn;
+        public GTextField m_score;
+        public const string URL = "ui://wgkh30qjjmg19";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "TZFEGameView";
+        private static UI_TZFEGameView _proxy;
+
+        public static UI_TZFEGameView Create(GObject gObject = null)
+        {
+            var ui = new UI_TZFEGameView();
+            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_TZFEGameView Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TZFEGameView();
+            }
+            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_numList = (GList)comp.GetChild("numList");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_score = (GTextField)comp.GetChild("score");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_numList = null;
+            m_backBtn = null;
+            m_score = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_cardItem
+    {
+        public GComponent target;
+        public Controller m_state;
+        public GButton m_card;
+        public GTextField m_id;
+        public const string URL = "ui://wgkh30qjjmg11";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "cardItem";
+        private static UI_cardItem _proxy;
+
+        public static UI_cardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_cardItem();
+            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_cardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_cardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_state = comp.GetController("state");
+            m_card = (GButton)comp.GetChild("card");
+            m_id = (GTextField)comp.GetChild("id");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_state = null;
+            m_card = null;
+            m_id = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_cardItembtn
+    {
+        public GButton target;
+        public Controller m_state;
+        public GLoader m_icon1;
+        public GLoader m_icon3;
+        public const string URL = "ui://wgkh30qjjmg18";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "cardItembtn";
+        private static UI_cardItembtn _proxy;
+
+        public static UI_cardItembtn Create(GObject gObject = null)
+        {
+            var ui = new UI_cardItembtn();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_cardItembtn Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_cardItembtn();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_state = comp.GetController("state");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_icon3 = (GLoader)comp.GetChild("icon3");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_state = null;
+            m_icon1 = null;
+            m_icon3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_descItem
+    {
+        public GComponent target;
+        public GLoader m_star1;
+        public GLoader m_star2;
+        public GLoader m_star3;
+        public GTextField m_desc;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public const string URL = "ui://wgkh30qj806nh";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "descItem";
+        private static UI_descItem _proxy;
+
+        public static UI_descItem Create(GObject gObject = null)
+        {
+            var ui = new UI_descItem();
+            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_descItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_descItem();
+            }
+            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_star1 = (GLoader)comp.GetChild("star1");
+            m_star2 = (GLoader)comp.GetChild("star2");
+            m_star3 = (GLoader)comp.GetChild("star3");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_star1 = null;
+            m_star2 = null;
+            m_star3 = null;
+            m_desc = null;
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComEctype.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_numItem.cs

@@ -2,22 +2,23 @@
 
 using FairyGUI;
 
-namespace UI.Poem
+namespace UI.MiniGame
 {
-    public partial class UI_ComEctype
+    public partial class UI_numItem
     {
         public GComponent target;
-        public Controller m_c1;
         public GLoader m_icon;
-        public GImage m_img;
-        public const string URL = "ui://iyz778gkv4822";
-        public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ComEctype";
-        private static UI_ComEctype _proxy;
+        public GTextField m_numTxt;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://wgkh30qjjmg1a";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "numItem";
+        private static UI_numItem _proxy;
 
-        public static UI_ComEctype Create(GObject gObject = null)
+        public static UI_numItem Create(GObject gObject = null)
         {
-            var ui = new UI_ComEctype();
+            var ui = new UI_numItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +27,11 @@ namespace UI.Poem
             return ui;
         }
 
-        public static UI_ComEctype Proxy(GObject gObject = null)
+        public static UI_numItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComEctype();
+                _proxy = new UI_numItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,15 +58,17 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
-            m_img = (GImage)comp.GetChild("img");
+            m_numTxt = (GTextField)comp.GetChild("numTxt");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_icon = null;
-            m_img = null;
+            m_numTxt = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_passRewardItem.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_passRewardItem
+    {
+        public GComponent target;
+        public GLoader m_passReward1;
+        public const string URL = "ui://wgkh30qj806ng";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "passRewardItem";
+        private static UI_passRewardItem _proxy;
+
+        public static UI_passRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_passRewardItem();
+            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_passRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_passRewardItem();
+            }
+            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_passReward1 = (GLoader)comp.GetChild("passReward1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_passReward1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,98 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerActivityUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GButton m_btnAnswerTianmen;
+        public GButton m_btnMingTong;
+        public GButton m_btnHeaven;
+        public GButton m_btnNineZhouPool;
+        public GButton m_btnTenShu;
+        public GTextField m_txtDay;
+        public GTextField m_txtHour;
+        public GTextField m_txtMinute;
+        public const string URL = "ui://b8ha2mnsdedg0";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerActivityUI";
+        private static UI_OpenServerActivityUI _proxy;
+
+        public static UI_OpenServerActivityUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerActivityUI();
+            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_OpenServerActivityUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerActivityUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnAnswerTianmen = (GButton)comp.GetChild("btnAnswerTianmen");
+            m_btnMingTong = (GButton)comp.GetChild("btnMingTong");
+            m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
+            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
+            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_txtHour = (GTextField)comp.GetChild("txtHour");
+            m_txtMinute = (GTextField)comp.GetChild("txtMinute");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_btnAnswerTianmen = null;
+            m_btnMingTong = null;
+            m_btnHeaven = null;
+            m_btnNineZhouPool = null;
+            m_btnTenShu = null;
+            m_txtDay = null;
+            m_txtHour = null;
+            m_txtMinute = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_Button15.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_Button15
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GImage m_img;
+        public const string URL = "ui://iyz778gkobt4tky";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "Button15";
+        private static UI_Button15 _proxy;
+
+        public static UI_Button15 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button15();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button15 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button15();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_img = (GImage)comp.GetChild("img");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_img = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_Button15.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPhotoPostcard.cs

@@ -7,6 +7,7 @@ namespace UI.Poem
     public partial class UI_ComPhotoPostcard
     {
         public GComponent target;
+        public Controller m_c1;
         public UI_ComTravel m_comTravel;
         public UI_Button1 m_btnLock;
         public UI_Button2 m_btnUp;
@@ -59,6 +60,7 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comTravel = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("comTravel"));
             m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
             m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
@@ -67,6 +69,7 @@ namespace UI.Poem
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comTravel.Dispose();
             m_comTravel = null;
             m_btnLock.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemPhotoUI.cs

@@ -17,8 +17,8 @@ namespace UI.Poem
         public GList m_typeList;
         public UI_Button7 m_btnConfirmDelete;
         public GButton m_btnRule;
-        public GButton m_btnDelete;
         public GTextField m_txtCount;
+        public GButton m_btnDelete;
         public const string URL = "ui://iyz778gkv4825";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemPhotoUI";
@@ -76,8 +76,8 @@ namespace UI.Poem
             m_typeList = (GList)comp.GetChild("typeList");
             m_btnConfirmDelete = (UI_Button7)UI_Button7.Create(comp.GetChild("btnConfirmDelete"));
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnDelete = (GButton)comp.GetChild("btnDelete");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -92,8 +92,8 @@ namespace UI.Poem
             m_btnConfirmDelete.Dispose();
             m_btnConfirmDelete = null;
             m_btnRule = null;
-            m_btnDelete = null;
             m_txtCount = null;
+            m_btnDelete = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemUI.cs

@@ -9,8 +9,8 @@ namespace UI.Poem
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnback;
-        public UI_ComEctype m_comphoto;
-        public UI_ComEctype m_comGallery;
+        public UI_Button15 m_comphoto;
+        public UI_Button15 m_comGallery;
         public const string URL = "ui://iyz778gkv4820";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemUI";
@@ -60,8 +60,8 @@ namespace UI.Poem
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_comphoto = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comphoto"));
-            m_comGallery = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comGallery"));
+            m_comphoto = (UI_Button15)UI_Button15.Create(comp.GetChild("comphoto"));
+            m_comGallery = (UI_Button15)UI_Button15.Create(comp.GetChild("comGallery"));
         }
         public void Dispose(bool disposeTarget = false)
         {

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

@@ -90,7 +90,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
-                    if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox) { 
+                    if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox)
+                    {
                         if (ActivityDataManager.Instance.actLuckyBoxId != response.ActivityId)
                         {
                             ActivityDataManager.Instance.luckyBoxActBonusState.Clear();
@@ -117,6 +118,10 @@ namespace GFGGame
                             ActivityDataManager.Instance.luckyActTsyBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
                         }
                     }
+                    else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                    { 
+
+                    }
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -171,6 +171,19 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 输入一段时间（毫秒），将时间转换成DD:HH:mm格式
+        /// </summary>
+        /// <param name="timeMsec"></param>
+        public static string FormattingTimeTo_DD_HH_mm(long timeMsec)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, (int)(timeMsec / 1000));
+            string strD = ts.Days.ToString();
+            string strH = ts.Hours.ToString();
+            string strM = ts.Minutes.ToString();
+            return string.Format("{0}:{1}:{2}", strD, strH, strM);
+        }
+
+        /// <summary>
         /// <summary>
         /// 将时间戳转换成HH:mm格式
         /// </summary>

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>(_activityId);
+            ViewManager.Show<LuckyBoxActivityView>(new object[] { _activityId, ConstLimitTimeActivityType.ActLimitLuckyBox});
         }
 
         private void OnBtnShopClick()

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -13,7 +13,6 @@ namespace GFGGame
         private UI_SuitGuideDetailUI _ui;
         private List<int> _suitIds;
         private int _suitTypeId;
-        private bool _startInAnim;
 
         public override void Dispose()
         {
@@ -39,7 +38,6 @@ namespace GFGGame
             _ui.m_listSuit.itemRenderer = RenderListSuitItem;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
-            _startInAnim = true;
         }
         protected override void AddEventListener()
         {
@@ -56,9 +54,8 @@ namespace GFGGame
             base.OnShown();
             _suitTypeId = (int)viewData;
             UpdateListSuit();
-            if (_startInAnim)
+            if (backRefresh)
             {
-                _startInAnim = false;
                 _ui.m_In.Play();
             }
         }
@@ -100,8 +97,7 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            _startInAnim = true;
-            ViewManager.GoBackFrom(typeof(SuitGuideDetailView).FullName);
+            Hide();
         }
 
         private void OnClickBtnSearch()
@@ -180,7 +176,7 @@ namespace GFGGame
             {
                 if (haveSuit)
                 {
-                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds });
+                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds }, false, false);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -13,7 +13,6 @@ namespace GFGGame
         private UI_SuitGuideUI _ui;
         private Dictionary<int, List<int>> _menuTypeAllDataDic;
         private List<UI_SuitTypeItem> _suitTypeItems;
-        private bool _needRefresh;
 
         public override void Dispose()
         {
@@ -42,7 +41,6 @@ namespace GFGGame
             _ui.m_suitType2Items.onClickItem.Add(OnClickListSuitType2Item);
             _ui.m_suitTypeList.onClick.Add(OnClickListSuitType);
             InitSuitGuideType();
-            _needRefresh = true;
         }
         protected override void AddEventListener()
         {
@@ -52,10 +50,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            if (_needRefresh)
+            if (backRefresh)
             {
-                _needRefresh = false;
                 // 让滑块直接置于最左边
+                _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
                 _ui.m_t0.Play();
                 UpdateItemsByType(1);
             }
@@ -164,7 +162,7 @@ namespace GFGGame
             item.m_icon.url = string.Format("ui://FieldGuide/tj_tz_{0}", typeId);
             item.target.onClick.Add(() =>
             {
-                ViewManager.Show<SuitGuideDetailView>(typeId);
+                ViewManager.Show<SuitGuideDetailView>(typeId, false, false);
             });
 
             _suitTypeItems.Add(item);
@@ -207,13 +205,11 @@ namespace GFGGame
         {
             GObject obj = eventContext.data as GObject;
             int index = _ui.m_suitType2Items.GetChildIndex(obj);
-            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index]);
+            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], false, false);
         }
 
         private void OnClickBtnBack()
         {
-            _needRefresh = true;
-            _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
             Hide();
         }
 

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

@@ -11,6 +11,7 @@ namespace GFGGame
         string viewName { get; set; }
         long closeTime { get; set; }
         bool isReturnView { get; set; }
+        bool backRefresh { get; set; }
         void Refresh();
         void Show();
         void Hide();

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

@@ -17,6 +17,7 @@ namespace GFGGame
         private ActivityOpenCfg _activityCfg;
         private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
+        private int _activityType;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
@@ -77,7 +78,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _activityId = (int)this.viewData;
+            _activityId = (int)(this.viewData as object[])[0];
+            _activityType = (int)(this.viewData as object[])[1];
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _valueBarController.OnShown();
@@ -91,7 +93,7 @@ namespace GFGGame
             UpdateRedDot();
             _ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
 
-            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
             if(activityOpenCfg.params2Arr.Length > 0)
                 GetWishingPoolInfo(activityId);
@@ -262,7 +264,7 @@ namespace GFGGame
 
         private void OnClickBtnReward()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxBonusView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            ViewManager.Show<ActivityThemeLuckyBoxBonusView>(_activityType);
         }
         private void OnClickBtnShop()
         {
@@ -310,7 +312,7 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnShop, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
@@ -331,7 +333,7 @@ namespace GFGGame
             {
                 int index = LuckyBoxDataManager.Instance.KsActivityId.IndexOf(activityId);
                 if (index < 0 || !LuckyBoxDataManager.Instance.VsStatus[index])
-                    ViewManager.Show<LuckyBoxWishView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
+                    ViewManager.Show<LuckyBoxWishView>(_activityType);
             }
         }
     }

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

@@ -394,7 +394,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;

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

@@ -105,6 +105,7 @@ namespace GFGGame
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
+            _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -377,7 +378,12 @@ namespace GFGGame
 
         private void OnClickBtnActivityLuckyBox()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null,true);
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+        }
+
+        private void OnClickBtnOpenServerActivity()
+        {
+            ViewManager.Show<OpenServerActivityView>();
         }
 
         private void OnClickBtnWanShiLi()
@@ -802,6 +808,7 @@ namespace GFGGame
             _ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
             _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
+            _ui.m_btnOpenServerActivity.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc) > 0;
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
             _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||

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

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

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

@@ -0,0 +1,73 @@
+using FairyGUI;
+
+public class Card : GButton
+{
+    GObject _back;
+    GObject _front;
+
+    public override void ConstructFromXML(FairyGUI.Utils.XML xml)
+    {
+        base.ConstructFromXML(xml);
+
+        _back = GetChild("n0");
+        _front = GetChild("icon");
+        _front.visible = false;
+    }
+
+    public bool opened
+    {
+        get
+        {
+            return _front.visible;
+        }
+
+        set
+        {
+            GTween.Kill(this);
+
+            _front.visible = value;
+            _back.visible = !value;
+        }
+    }
+
+    public void SetPerspective()
+    {
+        _front.displayObject.perspective = true;
+        _back.displayObject.perspective = true;
+    }
+
+    public void Turn()
+    {
+        if (GTween.IsTweening(this))
+            return;
+
+        bool toOpen = !_front.visible;
+        GTween.To(0, 180, 0.5f).SetTarget(this).SetEase(EaseType.QuadOut).OnUpdate(TurnInTween).SetUserData(toOpen);
+    }
+
+    void TurnInTween(GTweener tweener)
+    {
+        bool toOpen = (bool)tweener.userData;
+        float v = tweener.value.x;
+        if (toOpen)
+        {
+            _back.rotationY = v;
+            _front.rotationY = -180 + v;
+            if (v > 90)
+            {
+                _front.visible = true;
+                _back.visible = false;
+            }
+        }
+        else
+        {
+            _back.rotationY = -180 + v;
+            _front.rotationY = v;
+            if (v > 90)
+            {
+                _front.visible = false;
+                _back.visible = true;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: f508880d965b60742b34521caee31d63
+timeCreated: 1465454889
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class FlipGameStartView : BaseView
+    {
+        private UI_FlipGameStartUI _ui;
+        //后续这里改成读表内容
+        private List<string> name = new List<string>(){ "翻牌", "2048" };
+        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_FlipGameStartUI.PACKAGE_NAME;
+            _ui = UI_FlipGameStartUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_settingTypeList.itemRenderer = RenderListType;
+            _ui.m_descList.itemRenderer = RenderDescList;
+            _ui.m_failRewardList.itemRenderer = RenderFailReward;
+            _ui.m_passRewardList.itemRenderer = RenderPassReward;
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_shop.onClick.Add(OnClickBtnShop);
+            _ui.m_addIcon.onClick.Add(OnClickBtnAdd);
+            _ui.m_gameStart.onClick.Add(OnClickBtnStart);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateView();
+            UpdateList();
+        }
+        protected override void OnHide()
+        {
+
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            //_ui.m_showGame.url = _ui.m_c1.selectedIndex;
+            _ui.m_ticketNum.text = "999";
+        }
+        private void UpdateList()
+        {
+            _ui.m_settingTypeList.numItems = name.Count;
+            _ui.m_descList.numItems = 3;
+            _ui.m_passRewardList.numItems = name.Count;
+            _ui.m_failRewardList.numItems = name.Count;
+        }
+        private void OnClickBtnBack()
+        {
+            this.Hide();
+        }
+        private void RenderFailReward(int index, GObject item)
+        {
+            //这里也读表
+        }
+        private void RenderPassReward(int index, GObject item)
+        {
+            //这里也读表
+        }
+        private void RenderDescList(int index, GObject item)
+        {
+            UI_descItem descItem = UI_descItem.Proxy(item);
+            descItem.m_desc.text = CustemsDesc[index];
+            descItem.m_rewardNum.text = index.ToString();
+            switch (index)
+            {
+                case 0:
+                        break;
+                case 1:
+                    descItem.m_star3.visible = false;
+                    break;
+                case 2:
+                    descItem.m_star3.visible = false;
+                    descItem.m_star2.visible = false;
+                    break;
+                default:
+                        break;
+                            
+            };
+            UI_descItem.ProxyEnd();
+            //这里也读表
+        }
+
+        private void RenderListType(int index, GObject item)
+        {
+            UI_Button6 button6 = UI_Button6.Proxy(item);
+            button6.m_title1.text = name[index];
+            button6.m_title2.text = name[index];  
+            button6.target.onClick.Add(OnClickChangeGame);
+            button6.target.data = name;
+            UI_Button6.ProxyEnd();
+        }
+        private void OnClickChangeGame(EventContext param)
+        {
+            if(currentGame == _ui.m_c1.selectedIndex)
+            {
+                return;
+            }
+            currentGame = _ui.m_c1.selectedIndex;
+            UpdateView();
+            UpdateList();
+        }
+        private void OnClickBtnShop()
+        {
+
+        }
+        private void OnClickBtnAdd()
+        {
+
+        }
+        private void OnClickBtnStart()
+        {
+            if(_ui.m_c1.selectedIndex == 0)
+            {
+                ViewManager.Show<FlipGameView>();
+                this.Hide();
+            }
+        }
+    }
+}

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

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

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

@@ -0,0 +1,313 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class FlipGameView : BaseView
+    {
+        private UI_FlipGameUI _ui;
+        //卡牌数量（配置）
+        private int cardNum = 16;
+        //当前卡牌数量
+        private int currentCardNum = 16;
+        //当前翻开卡牌
+        //"state" 0:未翻开，1：已翻开，2：已消除
+        private List<Dictionary<string, int>> cardList = new List<Dictionary<string, int>>();
+        //消除所需数量(配置)
+        private int needNum;
+        //游戏结束时长(配置)
+        private int gameTime = 120;
+        //游戏当前时长
+        private int currentGameTime = 120;
+        //行数
+        private int rows = 0;
+        //列数
+        private int columns = 4;
+        System.Random rand;
+        //通关评价
+        private List<int> CustemsNum = new List<int>()
+        {
+            10,
+            30,
+            60,
+        };
+        private List<string> CustemsName = new List<string>()
+        {
+            "良好",
+            "优秀",
+            "卓越"
+        };
+
+        //假数据
+        private int[] cardArray = new int[] { 1,1, 2,2,  3, 3 , 4, 4 ,  5, 5 ,  6, 6 ,  8, 8 , 8, 8  };
+
+        Card _c1 = new Card();
+        private float waitTime = 0.6f;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_FlipGameUI.PACKAGE_NAME;
+            _ui = UI_FlipGameUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_cardList.itemRenderer = ListCardItem;
+            _ui.m_back.onClick.Add(OnClickBtnBack);
+
+            UIObjectFactory.SetPackageItemExtension("ui://MiniGame/CardComponent", typeof(Card));
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateView();
+            UpdateList();
+        }
+        protected override void OnHide()
+        {
+            _ui.m_cardList.RemoveChildrenToPool();
+            base.OnHide();
+            cardList.Clear();
+            Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(canTouch);
+            Timers.inst.Remove(UpdateCard);
+        }
+
+        private void OnClickBtnBack()
+        {
+            Timers.inst.Remove(UpdateTime);
+            AlertUI.Show("是否退出游戏")
+            .SetLeftButton(true, "取消", (object data) =>
+            {
+                Timers.inst.Add(1.0f, 0, UpdateTime);
+            })
+            .SetRightButton(true, "确定", (object data) =>
+            {
+                this.Hide();
+            });
+        }
+
+        private void ListCardItem(int index, GObject item)
+        {
+            UI_cardItem cardItem = UI_cardItem.Proxy(item);
+            Dictionary<string, int> itemInfo = new Dictionary<string, int>();
+
+            //备注的后续都读表
+            //cardItem.m_icon.url = "";
+            if (cardItem.target.data == null)
+            {
+                cardItem.target.onClick.Add(OnClickCardItem);
+            }
+            _c1 = (Card)cardItem.m_card;
+            _c1.opened = false;
+            _c1.SetPerspective();
+
+            itemInfo.Add("index", index);
+            itemInfo.Add("id", cardArray[index]);
+            itemInfo.Add("state", 0);
+            cardItem.m_id.text = itemInfo["id"].ToString();
+            cardItem.target.data = itemInfo;
+            UI_cardItem.ProxyEnd();
+        }
+        private void UpdateView()
+        {
+            currentGameTime = gameTime;
+            currentCardNum = cardNum;
+            needNum = 2;
+            rand = new System.Random();
+            //洗牌
+            RandomCardList(cardArray, cardArray.Length);
+            //
+            _ui.m_timeText.text = string.Format("倒计时：{0}", currentGameTime);
+            _ui.m_ScareBar.max = gameTime;
+            _ui.m_ScareBar.min = 0;
+            _ui.m_ScareBar.value = gameTime;
+            _ui.m_star1.SetPosition(((float)CustemsNum[0]/(float)gameTime)*_ui.m_ScareBar.width,_ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star2.SetPosition(((float)CustemsNum[1] / (float)gameTime) * _ui.m_ScareBar.width, _ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star3.SetPosition(((float)CustemsNum[2] / (float)gameTime) * _ui.m_ScareBar.width, _ui.m_star1.position.y, _ui.m_star1.position.z);
+ 
+            //计时器
+            Timers.inst.Add(1.0f, 0, UpdateTime);
+        }
+
+        private void UpdateList()
+        {
+            _ui.m_cardList.columnCount = columns;
+            _ui.m_cardList.numItems = cardNum;
+        }
+        private void OnClickCardItem(EventContext context)
+        {
+            GObject cardItem = context.sender as GObject;
+            Dictionary<string, int> cardInfo = (Dictionary<string, int>)cardItem.data;
+            UI_cardItem item = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardInfo["index"]));
+            Card card = (Card)item.m_card;
+            if (cardList.Count == 0)
+            {
+                //当前翻开列表为空，直接处理翻开，添加
+                cardInfo["state"] = 1;
+                //翻牌
+                card.Turn();
+                _ui.m_cardList.touchable = false;
+                Timers.inst.Add(waitTime, 1, canTouch);
+                //
+                cardList.Add(cardInfo);
+            }
+            else
+            {
+                bool isLast = false;
+                for (int i = 0; i < cardList.Count; i++)
+                {
+                    //点击到已翻开的就翻回去，
+                    if (cardInfo["index"] == cardList[i]["index"])
+                    {
+                        //翻牌
+                        card.Turn();
+                        _ui.m_cardList.touchable = false;
+                        Timers.inst.Add(waitTime, 1, canTouch);
+                        //
+                        cardList.RemoveAt(i);
+                        isLast = true;
+                        break;
+                    }  
+                }
+                if (!isLast)
+                {
+                    //翻牌
+                    card.Turn();
+                    _ui.m_cardList.touchable = false;
+                    cardInfo["state"] = 1;
+                    cardList.Add(cardInfo);
+                    Timers.inst.Add(waitTime, 1, UpdateCard);
+
+                }
+            }
+            UI_cardItem.ProxyEnd();
+        }
+
+        //这里是处理已翻开的数量
+        private void UpdateCard(object param = null)
+        {
+            bool isClear = true;
+            for (int i = 1; i < cardList.Count; i++)
+            {
+                if(cardList[0]["id"] != cardList[i]["id"])
+                {
+                    isClear = false;
+                    break;
+                }
+                isClear = true;
+            }
+            if(isClear)
+            {
+                if (cardList.Count == needNum)
+                {
+                    for (int i = 0; i < cardList.Count; i++)
+                    {
+                        cardList[i]["state"] = 2;
+                        //消除
+                        _ui.m_cardList.GetChildAt(cardList[i]["index"]).visible = false;
+                    }
+                    currentCardNum -= cardList.Count;
+                    cardList.Clear();
+                    if(currentCardNum <= 0)
+                    {
+                        Gameover(true);
+                    }
+                }
+                _ui.m_cardList.touchable = true;
+            }
+            else
+            {
+                _ui.m_cardList.touchable = false;
+                //= UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[0]["index"]));
+                for (int i = 0; i < cardList.Count; i++)
+                {
+                    UI_cardItem item = UI_cardItem.Proxy(_ui.m_cardList.GetChildAt(cardList[i]["index"]));
+                    //翻回去
+                    Card card = (Card)item.m_card;
+                    card.Turn();
+                    //card = null;
+                    UI_cardItem.ProxyEnd();
+                }
+                Timers.inst.Add(waitTime, 1, canTouch);
+                cardList.Clear(); 
+            }
+        }
+        private void UpdateTime(object param = null)
+        {
+            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 canTouch(object param = null)
+        {
+            _ui.m_cardList.touchable = true;
+        }
+
+        private void Gameover(bool isPass = false)
+        {
+            Timers.inst.Remove(UpdateTime);
+            if (!isPass)
+            {
+                AlertUI.Show("游戏时间到")
+                .SetLeftButton(false)
+                .SetRightButton(true, "确定", (object data) =>
+                {
+                    this.Hide();
+                });
+            }
+            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();
+                });
+            }
+        }
+        //洗牌
+        private void RandomCardList(int[] array, int length)
+        {
+            int index;
+            int value;
+            for (int i = length - 1; i >= 0; i--)
+            {
+                index = rand.Next(0, i + 1);
+                value = array[i];
+                array[i] = array[index];
+                array[index] = value;
+            }
+        }
+
+    }
+}

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

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

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

@@ -0,0 +1,334 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class TZFEGameView : BaseView
+    {
+        private UI_TZFEGameView _ui;
+
+        private int[,] Map;
+        enum Direction { up, down, left, right };
+        private Vector2 touchFirst = Vector2.zero;//手指开始按下的位置
+        private Vector2 touchSecond = Vector2.zero;//手指拖动的位置
+        private System.Random rand;
+
+        //这个是数组的行数和列数，mapLength一般采用行列一样
+        private int rows = 5;
+        private int columns = 5;
+        private int mapLength = 5;
+        //得分
+        private int score = 0;
+        private int scoreMax = 0;
+        private int targetNum = 2048;
+        private bool isMove;
+        private bool isMerge;
+        private struct NumPos
+        {
+            public int x;
+            public int y;
+            public bool isCreat;
+        }
+        private List<NumPos> numPosArray = new List<NumPos>();
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TZFEGameView.PACKAGE_NAME;
+            _ui = UI_TZFEGameView.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_numList.itemRenderer = ListNumItem;
+            _ui.target.onTouchBegin.Add(OnClickBegin);
+            _ui.target.onTouchEnd.Add(OnClickEnd);
+            _ui.m_backBtn.onClick.Add(OnClickBtnBack);
+            Map = new int[rows, columns];
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            InitMap();
+            UpdateView();
+            UpdateList();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnBack()
+        {
+            this.Hide();
+        }
+
+        private void InitMap()
+        {
+            for(int i = 0; i < rows; i++)
+                for(int j = 0; j < columns; j++)
+                {
+                    Map[i, j] = 0;
+                }
+        }
+        private void UpdateView()
+        {
+            score = 0;
+            targetNum = 2048;
+            _ui.m_score.text = string.Format("分数：{0}", score.ToString());
+            rand = new System.Random();
+        }
+        private void UpdateScore()
+        {
+            _ui.m_score.text = string.Format("分数：{0}", score.ToString());
+        }
+        private void UpdateList()
+        {
+            RandomCreateNum();
+            _ui.m_numList.numItems = rows * columns;
+        }
+
+        private void ListNumItem(int index, GObject item)
+        {
+            UI_numItem numItem = UI_numItem.Proxy(item);
+            int x = index / rows;
+            int y = index % columns;
+            numItem.m_numTxt.text = Map[x,y].ToString();
+            //这个后续根据数组内容替换图片
+            //_ui.m_icon.url = 
+            UI_numItem.ProxyEnd();
+        }
+
+        //随机生成数字2（%90），4（%10）
+        private void RandomCreateNum()
+        {
+            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)
+            {
+                // 还需要加，无法移动，无法合并时，游戏结束
+            }
+            while (true)
+            {
+                int x = rand.Next(0, rows);
+                int y = rand.Next(0, columns);
+                NumPos item;
+                int num;
+                int randNum = rand.Next(1, 11);
+                if(randNum <= 9)
+                {
+                    num = 2;
+                }
+                else
+                {
+                    num = 4 ;
+                }
+                if (Map[x,y] == 0)
+                {
+                    Map[x, y] = num;
+                    item.x = x;
+                    item.y = y;
+                    item.isCreat = true;
+                    numPosArray.Add(item);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 去零
+        /// </summary>
+        /// <param name="row">对于一行或一列元素</param>
+        private void Remove0(int[] row)
+        {
+            int pos = 0;
+            int[] rowB = new int[row.Length];
+            for (int i = 0; i < row.Length; i++)
+            {
+                rowB[i] = row[i];
+            }
+            for (int i = 0; i < row.Length; ++i)
+            {
+                if (row[i] != 0)
+                {
+                    row[pos] = row[i];
+                    pos++;
+                } 
+            }
+            for (; pos < row.Length; ++pos) row[pos] = 0;
+
+            for(int i= 0; i< row.Length; i++)
+            {
+                if(row[i] != rowB[i])
+                {
+                    isMove = true;
+                }
+            }
+        }
+        /// <summary>
+        /// 合并
+        /// </summary>
+        /// <param name="row">对于一行或一列元素，完成一次向左合并的操作</param>
+        private void Merge(int[] row , int colrow = 0)
+        {
+            Remove0(row);
+            // 相邻相同则合并
+            for (int i = 0; i < row.Length - 1; ++i)
+            {
+                if (row[i] != 0 && row[i] == row[i + 1])
+                {
+                    row[i] *= 2;
+                    row[i + 1] = 0;
+                    score += row[i];
+                    UpdateScore();
+                    if (row[i] == targetNum)
+                    {
+                        //游戏结束
+                    }
+                    isMerge = true;
+                }
+            }
+            Remove0(row);
+        }
+
+        /// <summary>
+        /// 上移
+        /// </summary>
+        /// <param name="map">原棋盘</param>
+        /// <returns></returns>
+        private void Up(int[,] map)
+        {
+            int[] arr = new int[rows];
+            for (int j = 0; j < columns; ++j)
+            {
+                for (int i = 0; i < rows; ++i) arr[i] = map[i, j];
+                Merge(arr);
+                for (int i = 0; i < rows; ++i) map[i, j] = arr[i];
+            }
+        }
+        /// <summary>
+        /// 下移
+        /// </summary>
+        private int[,] Down(int[,] map)
+        {
+            int[] arr = new int[rows];
+            for (int j = 0; j < columns; ++j)
+            {
+                for (int i = 0; i < rows; ++i) arr[rows - 1 - i] = map[i, j];
+                Merge(arr);
+                for (int i = 0; i < rows; ++i) map[i, j] = arr[rows - 1 - i];
+            }
+            return map;
+        }
+
+        /// <summary>
+        /// 左移
+        /// </summary>
+        private int[,] Left(int[,] map)
+        {
+            int[] arr = new int[columns];
+            for (int i = 0; i < rows; ++i)
+            {
+                for (int j = 0; j < columns; ++j) arr[j] = map[i, j];
+                Merge(arr);
+                for (int j = 0; j < columns; ++j) map[i, j] = arr[j];
+            }
+            return map;
+        }
+
+        /// <summary>
+        /// 右移
+        /// </summary>
+        private int[,] Right(int[,] map)
+        {
+            int[] arr = new int[columns];
+            for (int i = 0; i < rows; ++i)
+            {
+                for (int j = 0; j < columns; ++j) arr[columns - 1 - j] = map[i, j];
+                Merge(arr);
+                for (int j = 0; j < columns; ++j) map[i, j] = arr[columns - 1 - j];
+            }
+            return map;
+        }
+        /// <summary>
+        /// 进行一次移动操作
+        /// </summary>
+        /// <param name="map">原棋盘</param>
+        /// <param name="dir">移动的方向（枚举）</param>
+        private void Move(int[,] map, Direction dir)
+        {
+            switch (dir)
+            {
+                case Direction.up:
+                    Up(map); break;
+                case Direction.down:
+                    Down(map); break;
+                case Direction.left:
+                    Left(map); break;
+                case Direction.right:
+                    Right(map); break;
+            }
+            if(isMerge || isMove)
+            {
+                isMerge = false;
+                isMove = false;
+                UpdateList();
+                numPosArray.Clear();
+            }
+        }
+
+        private void OnClickBegin()
+        {
+            touchFirst = Input.mousePosition;//记录开始按下的位置
+        }
+        private void OnClickEnd()
+        {
+                touchSecond = Input.mousePosition;//记录拖动的位置
+                if (touchSecond.x < touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+                {
+                    //向左滑动
+                    Move(Map, Direction.left);
+                }
+                if (touchSecond.x > touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+                {
+                    //向右滑动
+                    Move(Map, Direction.right);
+                }
+                if (touchSecond.y < touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+                {
+                    //向下滑动
+                    Move(Map, Direction.down);
+                }
+                if (touchSecond.y > touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+                {
+                    //向上滑动
+                    Move(Map, Direction.up);
+                }
+                touchFirst = touchSecond;
+        }
+
+    }
+}

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

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

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

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

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

@@ -0,0 +1,126 @@
+using UnityEngine;
+using FairyGUI;
+using UI.OpenServerActivity;
+
+namespace GFGGame
+{
+    public class OpenServerActivityView : BaseView
+    {
+        private UI_OpenServerActivityUI _ui;
+
+        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_OpenServerActivityUI.PACKAGE_NAME;
+            _ui = UI_OpenServerActivityUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnHeaven.onClick.Add(OnClickBtnHeaven);
+            _ui.m_btnMingTong.onClick.Add(OnClickBtnMingTong);
+            _ui.m_btnAnswerTianmen.onClick.Add(OnClickBtnAnswerTianmen);
+            _ui.m_btnTenShu.onClick.Add(OnClickBtnTenShu);
+            _ui.m_btnNineZhouPool.onClick.Add(OnClickBtnNineZhouPool);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
+
+            RefreshTimeText();
+
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void UpdateTime(object param)
+        {
+            RefreshTimeText();
+        }
+
+        private void RefreshTimeText()
+        {
+            int time = 1000000;
+            string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
+            string[] str = strTime.Split(':');
+            _ui.m_txtDay.text = str[0];
+            _ui.m_txtHour.text = str[1];
+            _ui.m_txtMinute.text = str[2];
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(OpenServerActivityView).FullName);
+        }
+
+        private void OnClickBtnHeaven()
+        {
+            //小游戏入口
+            PromptController.Instance.ShowFloatTextPrompt("暂未开启");
+            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+        }
+
+        private void OnClickBtnMingTong()
+        {
+            //副本入口
+            PromptController.Instance.ShowFloatTextPrompt("暂未开启");
+            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+        }
+
+        private void OnClickBtnAnswerTianmen()
+        {
+            //剧情入口
+            PromptController.Instance.ShowFloatTextPrompt("暂未开启");
+            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+        }
+
+        private void OnClickBtnTenShu()
+        {
+            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (actLimitId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动未开启");
+                return;
+            }
+            ViewManager.Show<LuckyBoxActivityView>(new object[]{actLimitId, ConstLimitTimeActivityType.ActLimitStlyc});
+        }
+
+        private void OnClickBtnNineZhouPool() 
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+        }
+    }
+}

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

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

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

@@ -126,7 +126,7 @@ namespace GFGGame
                 _photoInfos = PoemPhotoDataManager.Instance.PersonalPhotoInfos;
                 _sourceType = (int)PictureSourceType.PersonalAlbum;
                 _ui.m_list.numItems = _photoInfos.Count;
-                _ui.m_txtCount.text = string.Format("（{0}/{1}）", _photoInfos.Count, GlobalCfgArray.globalCfg.maxPhotoCount);
+                _ui.m_txtCount.text = string.Format("{0}/{1}", _photoInfos.Count, GlobalCfgArray.globalCfg.maxPhotoCount);
             }
             else
             {
@@ -135,11 +135,11 @@ namespace GFGGame
                 _photoInfos = PoemPhotoDataManager.Instance.WsqsPhotoInfos;
                 _sourceType = (int)PictureSourceType.WanShuiQianShan;
                 _ui.m_listTravel.numItems = _photoInfos.Count;
-                _ui.m_txtCount.text = string.Format("（{0}/{1}）", _photoInfos.Count, RoleDataManager.WanShuiQianShanMaxStorageCount);
+                _ui.m_txtCount.text = string.Format("{0}/{1}", _photoInfos.Count, RoleDataManager.WanShuiQianShanMaxStorageCount);
             }
 
            
-            _ui.m_btnConfirmDelete.m_txtTitle.text = string.Format("删除（{0}/{1}）", _listDelete.Count, _photoInfos.Count);
+            _ui.m_btnConfirmDelete.m_txtTitle.text = string.Format("删除 {0}/{1}", _listDelete.Count, _photoInfos.Count);
         }
 
         private void RenderListItem(int index, GObject obj)
@@ -193,7 +193,7 @@ namespace GFGGame
 
             UI_ComPhotoPostcard item = UI_ComPhotoPostcard.Proxy(obj);
 
-            item.m_imgSelect.visible = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0;
+            item.m_c1.selectedIndex = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0 ? 1 : 0;
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             item.m_comTravel.m_loaRole.url = "";
             if (poemPhotoData.TravelSuitId > 0)
@@ -311,6 +311,7 @@ namespace GFGGame
             }
 
         }
+
         private void OnBtnUpClick(EventContext context)
         {
             if (_ui.m_c2.selectedIndex == 1)

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

@@ -26,7 +26,7 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_wss");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_comphoto.target.onClick.Add(OnComPhotoClick);

GameClient/Assets/Game/HotUpdate/Views/Store/BrocadeWeavTask.cs

@@ -178,7 +178,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            ViewManager.JumpToView(taskCfg.jumpId, param,true);
+            ViewManager.JumpToView(taskCfg.jumpId, param,true,true);
         }
 
         private async void OnBtnGetAllClick()

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskController.cs

@@ -204,7 +204,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            ViewManager.JumpToView(taskCfg.jumpId, param);
+            ViewManager.JumpToView(taskCfg.jumpId, param, false,false);
         }
 
         private async void OnBtnGetAllClick()

GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -7,7 +7,6 @@ namespace GFGGame
     {
         private UI_TaskUI _ui;
         private CombTaskController _combTaskController;
-
         public override void Dispose()
         {
             if(_combTaskController != null)
@@ -50,7 +49,7 @@ namespace GFGGame
 
         private void OnBtnAchieveClick()
         {
-            ViewManager.Show<TaskAchieveView>();
+            ViewManager.Show<TaskAchieveView>(null, false, false);
         }
 
         protected override void AddEventListener()
@@ -71,15 +70,17 @@ namespace GFGGame
         {
             base.OnShown();
             int selectedIndex = 0;
+            
             if (viewData != null)
             {
                 var t = viewData as object[];
                 if(t != null && t.Length > 0)
-                {
                     selectedIndex = (int)t[0];
-                }
             }
-            _ui.m_c1.selectedIndex = selectedIndex;
+
+            if(backRefresh)
+                _ui.m_c1.selectedIndex = selectedIndex;
+
             _combTaskController.OnShown(_ui.m_c1.selectedIndex);
             UpdateRedPoint();
         }
@@ -87,7 +88,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _ui.m_c1.selectedIndex = 0;
+            //_ui.m_c1.selectedIndex = 0;
             UpdateRedPoint();
         }
 
@@ -106,6 +107,5 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnWeekly, showRedPoint);
             RedDotController.Instance.SetComRedDot(_ui.m_btnAchieve, TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.Achievement), "", -13, 6);
         }
-
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -77,10 +77,8 @@ namespace GFGGame
         {
             base.OnShown();
             _valueBarController.OnShown();
-            // _valueBarController.Controller(7);
 
             UpdateView();
-
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -116,6 +114,8 @@ namespace GFGGame
                 UpdateTime(null);
                 Timers.inst.Add(1, secCount + 2, UpdateTime);
             }
+
+            UpdateRedDots();
         }
 
         private void UpdateTime(object param)
@@ -196,5 +196,10 @@ namespace GFGGame
                 _ui.m_btnPhoto.y + _ui.m_btnPhoto.height + 100);
             GuideController.TryCompleteGuide(ConstGuideId.TRAVEL, 1);
         }
+
+        private void UpdateRedDots()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnFieldGuide, RedDotDataManager.Instance.GetTravelGuideRed(), "", -15, 8);
+        }
     }
 }

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

@@ -34,6 +34,10 @@ namespace GFGGame
         /// </summary>
         public bool isReturnView { get; set; }
         /// <summary>
+        /// 设置返回界面是否刷新
+        /// </summary>
+        public bool backRefresh { get; set; }
+        /// <summary>
         /// FairyGUI包名
         /// </summary>
         public string packageName

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

@@ -11,6 +11,7 @@ namespace GFGGame
         public string name;
         public object viewData;
         public IUIView iUIView;
+        public bool backRefresh;
     }
     /// <summary>
     /// 视图管理类
@@ -118,7 +119,8 @@ namespace GFGGame
         /// <param name="viewData">要传递给视图的参数</param>
         /// <param name="goBackParams">从该视图返回的视图信息</param>
         /// <param name="hideOthers">是否关闭其他视图</param>
-        public static bool Show(string fullViewName, object viewData = null, bool hideOthers = false)
+        /// <param name="backRefresh">返回上一个界面的时候，上一个界面是否需要刷新界面</param>
+        public static bool Show(string fullViewName, object viewData = null, bool hideOthers = false, bool backRefresh = true,bool isHideToShow = false)
         {
             string name = GetName(fullViewName);
             if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
@@ -148,6 +150,10 @@ namespace GFGGame
                 view.viewData = viewData;
                 if (!view.isShowing)
                 {
+                    if (isHideToShow && _viewStack.Count > 0)
+                        view.backRefresh = _viewStack[_viewStack.Count - 1].backRefresh;
+                    else
+                        view.backRefresh = true;
                     view.Show();
                 }
                 else
@@ -165,6 +171,10 @@ namespace GFGGame
             //判断是否需要保存界面数据， 会帮助关闭上一个保存界面
             if (obj.isReturnView && (_viewStack.Count <= 0 || (_viewStack.Count > 0 && _viewStack[_viewStack.Count - 1].name != name)))
             {
+                //保存上一个界面是否需要返回刷新
+                if (!isHideToShow && _viewStack.Count > 1)
+                    _viewStack[_viewStack.Count - 1].backRefresh = backRefresh;
+               
                 ViewStructure viewStructure = new ViewStructure();
                 viewStructure.name = name;
                 viewStructure.viewData = viewData;
@@ -221,12 +231,12 @@ namespace GFGGame
             return false;
         }
 
-        public static bool Show<T>(object viewData = null, bool hideOthers = false) where T : class, new()
+        public static bool Show<T>(object viewData = null, bool hideOthers = false, bool backRefresh = true) where T : class, new()
         {
             // string[] names = typeof(T).FullName.Split('.');
             // string viewName = names[names.Length - 1];
             //string name = GetName(typeof(T).FullName);
-            return ViewManager.Show(typeof(T).FullName, viewData, hideOthers);
+            return ViewManager.Show(typeof(T).FullName, viewData, hideOthers, backRefresh);
         }
 
         public static void HideWin(string viewName)
@@ -238,6 +248,7 @@ namespace GFGGame
             {
                 bool hasShowingView = false;
                 bool needShowNextView = false;
+                bool backRefresh = true;
                 foreach (var info in _viewDic.Keys)
                 {
                     IUIView objIsShowing = _viewDic[info];
@@ -258,8 +269,10 @@ namespace GFGGame
                     if (!hasShowingView || (viewStructure.iUIView.isReturnView && viewStructure.name == viewName))
                     {
                         //关闭自己，在队列里去除
-                        if (viewStructure.iUIView.isReturnView && viewStructure.name == viewName)
+                        if (viewStructure.iUIView.isReturnView && viewStructure.name == viewName) {
+                            backRefresh = viewStructure.backRefresh;
                             _viewStack.RemoveAt(_viewStack.Count - 1);
+                        }
 
                         if (_viewStack.Count >= 1)
                             needShowNextView = true;
@@ -268,7 +281,8 @@ namespace GFGGame
 
                 if (needShowNextView) { 
                     viewStructure = _viewStack[_viewStack.Count - 1];
-                    ViewManager.Show($"GFGGame.{viewStructure.name}", viewStructure.viewData);
+                    ViewManager.Show($"GFGGame.{viewStructure.name}", viewStructure.viewData, false, backRefresh,  true);
+                    //重新打开小弹窗
                     foreach (var objName in _viewDic.Keys)
                     {
                         if (objName != viewStructure.name)
@@ -450,7 +464,7 @@ namespace GFGGame
         /// 任务界面跳转
         /// </summary>
         /// <param name="jumpId"></param>
-        public static void JumpToView(string jumpId, object[] param, bool hideOther = false, Action onSuccess = null)
+        public static void JumpToView(string jumpId, object[] param, bool hideOther = false, bool backRefresh = true, Action onSuccess = null)
         {
             switch (jumpId)
             {
@@ -458,13 +472,13 @@ namespace GFGGame
 
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, hideOther);
+                        ViewManager.Show<LeagueView>(null, hideOther, backRefresh);
                         ViewManager.Show($"GFGGame.{jumpId}");
                     }
                     else
                     {
                         if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                        ViewManager.Show<LeagueJoinView>(null, hideOther);
+                        ViewManager.Show<LeagueJoinView>(null, hideOther, backRefresh);
                     }
 
                     break;
@@ -472,36 +486,36 @@ namespace GFGGame
                     if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, hideOther);
+                        ViewManager.Show<LeagueView>(null, hideOther, backRefresh);
                     }
                     else
                     {
-                        ViewManager.Show<LeagueJoinView>(null, hideOther);
+                        ViewManager.Show<LeagueJoinView>(null, hideOther, backRefresh);
                     }
                     break;
                 case nameof(StoreView):
-                    ViewManager.Show<StoreView>(param, hideOther);
+                    ViewManager.Show<StoreView>(param, hideOther, backRefresh);
                     break;
                 case nameof(StoryChapterListView):
-                    ViewManager.Show($"GFGGame.{jumpId}", param, hideOther);
+                    ViewManager.Show($"GFGGame.{jumpId}", param, hideOther, backRefresh);
                     break;
                 case nameof(StoryChapterView):
-                    ViewManager.Show<StoryChapterView>(param[0], hideOther);
+                    ViewManager.Show<StoryChapterView>(param[0], hideOther, backRefresh);
                     break;
                 case nameof(FirstChargeBonusView):
-                    ViewManager.Show<FirstChargeBonusView>(param, false);
+                    ViewManager.Show<FirstChargeBonusView>(param, false, backRefresh);
                     break;
                 case nameof(ClothingSyntheticView):
-                    ViewManager.Show<ClothingSyntheticView>(param, hideOther);
+                    ViewManager.Show<ClothingSyntheticView>(param, hideOther, backRefresh);
                     break;
                 case nameof(LuckyBoxView):
                     if(param.Length > 0)
-                        ViewManager.Show<LuckyBoxView>(param[0], hideOther);
+                        ViewManager.Show<LuckyBoxView>(param[0], hideOther, backRefresh);
                     else
-                        ViewManager.Show<LuckyBoxView>(null, hideOther);
+                        ViewManager.Show<LuckyBoxView>(null, hideOther, backRefresh);
                     break;
                 default:
-                    ViewManager.Show($"GFGGame.{jumpId}", null, hideOther);
+                    ViewManager.Show($"GFGGame.{jumpId}", null, hideOther, backRefresh);
                     break;
             }
             onSuccess?.Invoke();

GameClient/Assets/ResIn/UI/MiniGame.meta

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

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5c2ddc318291d2e4da1750980a3b35a6
+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_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5d307345c390bf94da7949c2de50be57
+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

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

GameClient/Assets/ResIn/UI/OpenServerActivity.meta

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

GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9dfde0e5e485f0445a77e1bbd67a0781
+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/OpenServerActivity/OpenServerActivity_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 65803fc68671a9648a1b2c59e7c87384
+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/OpenServerActivity/OpenServerActivity_fui.bytes.meta

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

GameClient/Assets/ResIn/UI/OpenServerActivity_fui.bytes.meta

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