小游戏补充提交

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

@@ -0,0 +1,13 @@
+using ET;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GFGGame
+{
+    class MiniGameDateManager : SingletonBase<MiniGameDateManager>
+    {
+        public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/MiniGameDateManager.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button7.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_Button7
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://wgkh30qjgtor2e";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "Button7";
+        private static UI_Button7 _proxy;
+
+        public static UI_Button7 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button7();
+            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_Button7 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button7();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardItem.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_ChallengeRewardItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public GTextField m_Num;
+        public const string URL = "ui://wgkh30qjqi5u2d";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ChallengeRewardItem";
+        private static UI_ChallengeRewardItem _proxy;
+
+        public static UI_ChallengeRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ChallengeRewardItem();
+            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_ChallengeRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChallengeRewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_Num = (GTextField)comp.GetChild("Num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            m_Num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -9,6 +9,8 @@ namespace UI.MiniGame
         public GComponent target;
         public GLoader m_bg;
         public GTextField m_rewardDesc;
+        public UI_Button7 m_getBtn;
+        public GList m_rewardList;
         public const string URL = "ui://wgkh30qjlw8c24";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "ChallengeRewardItemUI";
@@ -58,11 +60,16 @@ namespace UI.MiniGame
         {
             m_bg = (GLoader)comp.GetChild("bg");
             m_rewardDesc = (GTextField)comp.GetChild("rewardDesc");
+            m_getBtn = (UI_Button7)UI_Button7.Create(comp.GetChild("getBtn"));
+            m_rewardList = (GList)comp.GetChild("rewardList");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
             m_rewardDesc = null;
+            m_getBtn.Dispose();
+            m_getBtn = null;
+            m_rewardList = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,8 +9,7 @@ namespace UI.MiniGame
         public GComponent target;
         public GLoader m_exit;
         public GLoader m_bg;
-        public GList m_rewardOneList;
-        public GList m_rewardTwoList;
+        public UI_Component1 m_reward;
         public const string URL = "ui://wgkh30qjlw8c23";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "ChallengeRewardsUI";
@@ -60,15 +59,14 @@ namespace UI.MiniGame
         {
             m_exit = (GLoader)comp.GetChild("exit");
             m_bg = (GLoader)comp.GetChild("bg");
-            m_rewardOneList = (GList)comp.GetChild("rewardOneList");
-            m_rewardTwoList = (GList)comp.GetChild("rewardTwoList");
+            m_reward = (UI_Component1)UI_Component1.Create(comp.GetChild("reward"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_exit = null;
             m_bg = null;
-            m_rewardOneList = null;
-            m_rewardTwoList = null;
+            m_reward.Dispose();
+            m_reward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Component1.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_Component1
+    {
+        public GComponent target;
+        public GList m_rewardOneList;
+        public GList m_rewardTwoList;
+        public const string URL = "ui://wgkh30qjnjon2h";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            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_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            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_rewardOneList = (GList)comp.GetChild("rewardOneList");
+            m_rewardTwoList = (GList)comp.GetChild("rewardTwoList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardOneList = null;
+            m_rewardTwoList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -15,11 +15,11 @@ namespace UI.MiniGame
         public GLoader m_addIcon;
         public GTextField m_ticketNum;
         public GLoader m_game1;
-        public GTextField m_game1name;
+        public GImage m_tipsOne;
         public GLoader m_needIcon1;
         public GTextField m_needNum1;
         public GLoader m_game2;
-        public GTextField m_game2name;
+        public GImage m_tipsTwo;
         public GLoader m_needIcon2;
         public GTextField m_needNum2;
         public const string URL = "ui://wgkh30qjlw8c21";
@@ -77,11 +77,11 @@ namespace UI.MiniGame
             m_addIcon = (GLoader)comp.GetChild("addIcon");
             m_ticketNum = (GTextField)comp.GetChild("ticketNum");
             m_game1 = (GLoader)comp.GetChild("game1");
-            m_game1name = (GTextField)comp.GetChild("game1name");
+            m_tipsOne = (GImage)comp.GetChild("tipsOne");
             m_needIcon1 = (GLoader)comp.GetChild("needIcon1");
             m_needNum1 = (GTextField)comp.GetChild("needNum1");
             m_game2 = (GLoader)comp.GetChild("game2");
-            m_game2name = (GTextField)comp.GetChild("game2name");
+            m_tipsTwo = (GImage)comp.GetChild("tipsTwo");
             m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
             m_needNum2 = (GTextField)comp.GetChild("needNum2");
         }
@@ -95,11 +95,11 @@ namespace UI.MiniGame
             m_addIcon = null;
             m_ticketNum = null;
             m_game1 = null;
-            m_game1name = null;
+            m_tipsOne = null;
             m_needIcon1 = null;
             m_needNum1 = null;
             m_game2 = null;
-            m_game2name = null;
+            m_tipsTwo = null;
             m_needIcon2 = null;
             m_needNum2 = null;
             if(disposeTarget && target != null)

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

@@ -9,6 +9,7 @@ namespace UI.MiniGame
         public GComponent target;
         public GLoader m_bg;
         public GLoader m_icon;
+        public GTextField m_Count;
         public const string URL = "ui://wgkh30qjlw8c1z";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "rewardItem";
@@ -58,11 +59,13 @@ namespace UI.MiniGame
         {
             m_bg = (GLoader)comp.GetChild("bg");
             m_icon = (GLoader)comp.GetChild("icon");
+            m_Count = (GTextField)comp.GetChild("Count");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
             m_icon = null;
+            m_Count = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -219,6 +219,22 @@ namespace GFGGame
         //     }
         //     return false;
         // }
+
+        /*************************************************************活动弹窗*****************************************************/
+        public static async ETTask<bool> ReqActivityTips(int type , int val)
+        {
+            S2C_UpLimitNumericValue response = null;
+            response = (S2C_UpLimitNumericValue)await MessageHelper.SendToServer(new C2S_UpLimitNumericValue() { NumericType = type,NumericVal = val });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    GameGlobal.myNumericComponent.Set(response.NumericType, response.NumericVal);
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }
 

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

@@ -62,6 +62,8 @@ namespace GFGGame
                     await ActivitySProxy.ReqSevenDayLoginInfos();
                     await ActivityGlobalSProxy.GetActivityInfo();
                     await ActivityAfuGiftSProxy.GetAfuGiftInfo();
+                    ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
+                    ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);
                     PromptController.Instance.ShowFloatTextPrompt("每日次数已重置", MessageType.SUCCESS);
                 }

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

@@ -0,0 +1,30 @@
+using ET;
+
+namespace GFGGame
+{
+    class MiniGameProxy
+    {
+        public static async ETTask<bool> ReqMiniGameStart(int gameID,int gameType,int activityId)
+        {
+            //C2S_GetDay7Reward
+            var response = await MessageHelper.SendToServer(new C2S_MiniGameStart { GameId = gameID,GameType = gameType,ActivityId = activityId });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            EventAgent.DispatchEvent(ConstMessage.MINI_GAME_UPDATE);
+            //奖励弹窗
+            //BonusController.TryShowBonusList(cfg.bonusArr);
+            return true;
+        }
+
+        public static async ETTask<bool> ReqMiniGameEnd(int gameID, int gameType,int totalTime ,bool result,int activityId)
+        {
+            //C2S_GetDay7Reward
+            var response = (S2C_MiniGameEnd)await MessageHelper.SendToServer(new C2S_MiniGameEnd { GameId = gameID, GameType = gameType, TotalTime = totalTime, IsWin = result,ActivityId = activityId });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+
+            MiniGameDateManager.Instance.itemList = response.BonusList;
+            //奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            return true;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/MiniGameProxy.cs.meta

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

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

@@ -43,9 +43,10 @@ namespace GFGGame
             _ui.m_t4.Play();
             UpdateInfo();
         }
-        protected override void OnHide()
+        protected async override void OnHide()
         {
-            GameGlobal.myNumericComponent.Set(NumericType.IsPropYchmActivity, ActivityDataManager.Instance.todayActivityTips);
+            bool result;
+            result = await ActivitySProxy.ReqActivityTips(NumericType.IsPropYchmActivity, ActivityDataManager.Instance.todayActivityTips);
             showActivity.Clear();
             activitydata = null;
             base.OnHide();
@@ -53,7 +54,7 @@ namespace GFGGame
         private void UpdateView()
         {
             long endTime = 0;
-            if (showActivity[0] != null || showActivity != null)
+            if (showActivity.Count > 0  && showActivity[0] != null )
             {
                 if(showActivity[0].activityId != 0)
                 {

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

@@ -43,9 +43,10 @@ namespace GFGGame
             _ui.m_t0.Play();
             UpdateView();
         }
-        protected override void OnHide()
+        protected async override void OnHide()
         {
-            GameGlobal.myNumericComponent.Set(NumericType.IsPropCzykActivity, ActivityDataManager.Instance.todayMonthlyCardTips);
+            bool result;
+            result = await ActivitySProxy.ReqActivityTips(NumericType.IsPropCzykActivity, ActivityDataManager.Instance.todayMonthlyCardTips);
             base.OnHide();
         }
         private void UpdateView()
@@ -106,6 +107,5 @@ namespace GFGGame
             this.Hide();
         }
 
-
     }
 }

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

@@ -4,6 +4,7 @@ using ET;
 using FairyGUI;
 using UI.MiniGame;
 using UnityEngine;
+using System.Reflection;
 
 namespace GFGGame
 {
@@ -12,7 +13,13 @@ namespace GFGGame
         private UI_ChallengeRewardsUI _ui;
 
         private List<int> gameList = new List<int>();
-        private Dictionary<int, string> gameDic = new Dictionary<int, string>() { { 0,"翻牌"},{ 1,"2048"} };
+        private MiniGame[] gameNameDate;
+        //由于每个游戏都有一个表
+        private List<CardGame> CardGameDate;
+        private List<Merge2048Game> Merge2048GameDate;
+        private List<HuarongRoadGame> HuarongRoadGameDate;
+
+
         public override void Dispose()
         {
 
@@ -32,15 +39,40 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_exit.onClick.Add(Hide);
-            _ui.m_rewardOneList.itemRenderer = RenderListOne;
-            _ui.m_rewardTwoList.itemRenderer = RenderListTwo;
+            _ui.m_reward.m_rewardOneList.itemRenderer = RenderListOne;
+
+            _ui.m_reward.m_rewardTwoList.itemRenderer = RenderListTwo;
         }
         protected override void OnShown()
         {
             base.OnShown();
             gameList = (this.viewData as object[])[0] as List<int>;
-            _ui.m_rewardOneList.numItems = 3;
-            _ui.m_rewardTwoList.numItems = 3;
+
+            for(int i= 0;i< gameList.Count; i+=2)
+            {
+                GetGameArray(gameList[i], gameList[i + 1],i);
+            }
+
+            switch(gameList.Count)
+            {
+                case 0:
+                    _ui.m_reward.m_rewardOneList.numItems = 0;
+                    _ui.m_reward.m_rewardTwoList.numItems = 0;
+                    break;
+                case 2:
+                    _ui.m_reward.m_rewardOneList.numItems = 3;
+                    _ui.m_reward.m_rewardTwoList.numItems = 0;
+                    break;
+                case 4:
+                    _ui.m_reward.m_rewardOneList.numItems = 3;
+                    _ui.m_reward.m_rewardTwoList.numItems = 3;
+                    break;
+                default:
+                    _ui.m_reward.m_rewardOneList.numItems = 0;
+                    _ui.m_reward.m_rewardTwoList.numItems = 0;
+                    break;
+            }
+
 
         }
         protected override void OnHide()
@@ -52,15 +84,106 @@ namespace GFGGame
         {
             UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
             int starNum = 3 - index;
-            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关",gameDic[0], starNum);
+            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关",MiniGameArray.Instance.GetCfg(gameList[0]).typeName, starNum);
+            item.m_rewardList.itemRenderer = RenditemReward;
+            //var reward;
+            item.m_rewardList.data = 1;
+
+  
+            item.m_rewardList.numItems = CardGameDate[0].bonusStar3Arr.Length;
+
+            if (item.m_getBtn.target.data == null)
+            {
+                item.m_getBtn.target.onClick.Add(OnBtnGoClick);
+            }
+            item.m_getBtn.target.data = 1;
             UI_ChallengeRewardItemUI.ProxyEnd();
         }
-        private void RenderListTwo(int index, GObject obj)
+        private void RenderListTwo(int index , GObject obj)
         {
             UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
             int starNum = 3 - index;
-            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关", gameDic[1], starNum);
+            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关", MiniGameArray.Instance.GetCfg(gameList[2]).typeName, starNum);
+            item.m_rewardList.itemRenderer = RenditemReward;
+            //读表
+            //var reward;
+            item.m_rewardList.data = 2;
+            item.m_rewardList.numItems = Merge2048GameDate[0].bonusStar3Arr.Length;
+
+            if (item.m_getBtn.target.data == null)
+            {
+                item.m_getBtn.target.onClick.Add(OnBtnGoClick);
+            }
+            item.m_getBtn.target.data = 1;
             UI_ChallengeRewardItemUI.ProxyEnd();
         }
+        private void RenditemReward(int index, GObject obj)
+        {
+            UI_ChallengeRewardItem item = UI_ChallengeRewardItem.Proxy(obj);
+            int num = 3 - index;
+            if((int)item.target.parent.data == 1)
+            {
+                switch (num)
+                {
+                    case 1:
+                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar1Arr[0][0]).res);      
+                        item.m_Num.text = CardGameDate[0].bonusStar1Arr[0][1].ToString();
+                        break;
+                    case 2:
+                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar2Arr[0][0]).res);
+                        item.m_Num.text = CardGameDate[0].bonusStar2Arr[0][1].ToString();
+                        break;
+                    case 3:
+                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(CardGameDate[0].bonusStar3Arr[0][0]).res);
+                        item.m_Num.text = CardGameDate[0].bonusStar3Arr[0][1].ToString();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                switch (num)
+                {
+                    case 1:
+                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[0].bonusStar1Arr[0][0]).res);
+                        item.m_Num.text = Merge2048GameDate[0].bonusStar1Arr[0][1].ToString();
+                        break;
+                    case 2:
+                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[0].bonusStar3Arr[0][0]).res);
+                        item.m_Num.text = Merge2048GameDate[0].bonusStar2Arr[0][1].ToString();
+                        break;
+                    case 3:
+                        item.m_icon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(Merge2048GameDate[0].bonusStar3Arr[0][0]).res);
+                        item.m_Num.text = Merge2048GameDate[0].bonusStar3Arr[0][1].ToString();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            UI_ChallengeRewardItem.ProxyEnd();
+
+        }
+        private void OnBtnGoClick()
+        {
+            //读表和后台协议
+        }
+        private void GetGameArray(int i,int j,int index)
+        {
+            switch(i)
+            {
+                case 1:
+                    CardGameDate = CardGameArray.Instance.GetCfgsBytypeAndsubType(i,j);
+                    break;
+                case 2:
+                    Merge2048GameDate = Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(i,j);
+                    break;
+                case 3:
+                    HuarongRoadGameDate = HuarongRoadGameArray.Instance.GetCfgsBytypeAndsubType(i, j);
+                    break;
+            }
+
+        }
+
     }
 }

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

@@ -31,6 +31,8 @@ namespace GFGGame
         private int rows = 0;
         //列数
         private int columns = 4;
+        private int gameID;
+        private CardGame gameDate;
         System.Random rand;
         //通关评价
         private List<int> CustemsNum = new List<int>()
@@ -78,6 +80,15 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            if ((this.viewData as object[]).Length != 0 && this.viewData != null)
+            {
+                gameID = (int)(this.viewData as object[])[0];
+            }
+            else
+            {
+                gameID = 10001;
+            }
+            gameDate = CardGameArray.Instance.GetCfg(gameID);
             UpdateView();
             UpdateList();
         }
@@ -132,6 +143,22 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            gameTime = CardGameArray.Instance.GetCfg(gameID).time;
+            for(int i = 0;i<3;i++)
+            {
+                switch (i)
+                {
+                    case 0:
+                        CustemsNum[0] = gameDate.timeStar1;
+                        break;
+                    case 1:
+                        CustemsNum[1] = gameDate.timeStar2;
+                        break;
+                    case 2:
+                        CustemsNum[2] = gameDate.timeStar3;
+                        break;
+                }
+            }
             timeIndex = 0;
             currentGameTime = gameTime;
             currentCardNum = cardNum;
@@ -145,9 +172,9 @@ namespace GFGGame
             _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);
+            _ui.m_star1.SetPosition(((float)(gameTime - CustemsNum[0])/(float)gameTime) * _ui.m_ScareBar.width + 70,_ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star2.SetPosition(((float)(gameTime - CustemsNum[1]) / (float)gameTime) * _ui.m_ScareBar.width + 70, _ui.m_star1.position.y, _ui.m_star1.position.z);
+            _ui.m_star3.SetPosition(((float)(gameTime - CustemsNum[2]) / (float)gameTime) * _ui.m_ScareBar.width + 70, _ui.m_star1.position.y, _ui.m_star1.position.z);
  
             //计时器
             Timers.inst.Add(1.0f, 0, UpdateTime);
@@ -284,14 +311,7 @@ namespace GFGGame
         {
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateBar);
-            if (isPass)
-            {
-                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName, timeIndex });
-            }
-            else
-            {
-                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName });
-            }
+            ViewManager.Show<ResultTipsView>(new object[] { isPass, gameDate.type, timeIndex, gameDate.id });
         }
         //洗牌
         private void RandomCardList(int[] array, int length)

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

@@ -4,23 +4,24 @@ using ET;
 using FairyGUI;
 using UI.MiniGame;
 using UnityEngine;
+using System.Text.RegularExpressions;
 
 namespace GFGGame
 {
     public class GameStartView : BaseView
     {
         private UI_GameStartUI _ui;
-        //后续这里改成读表内容
-        private List<string> name = new List<string>() { "翻牌", "2048" };
-        private List<string> viewName = new List<string>() { "FlipGameView", "TZFEGameView" };
-        private List<string> CustemsDesc = new List<string>()
-        {
-            "首次评价达到卓越奖励：",
-            "首次评价达到优秀奖励：",
-            "首次评价达到良好奖励：",
-        };
+        //后续这里改成读表内容,1:CardGame,2:Merge2048Game,3:HuarongRoadGame
+        private List<string> viewJumpName = new List<string>() {"","FlipGameView", "TZFEGameView" ,"ActivityHuaRongDaoView"};
+        private List<ActivityOpenCfg> activityGameDate;
+        private List<int> GameType = new List<int>();
+        private List<int> ChallengeList = new List<int>();
 
-        private int currentGame = 0;
+        //由于每个游戏都有一个表
+        private List<CardGame> CardGameDate;
+        private List<Merge2048Game> Merge2048GameDate;
+        private int NumTicketOne = 3;
+        private int NumTicketTwo = 3;
 
         public override void Dispose()
         {
@@ -51,18 +52,33 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            activityGameDate = ActivityOpenCfgArray.Instance.GetCfgsBytype(ConstLimitTimeActivityType.ActLimitStlyc);
+            GetGameIdByActivityDate();
+            UpdateChallengeBtn();
+            UpdateView();
         }
         protected override void OnHide()
         {
-
+            GameType.Clear();
+            ChallengeList.Clear();
             base.OnHide();
         }
         private void UpdateView()
         {
+            if(ChallengeList.Count == 0)
+            {
+                _ui.m_rewardBtn.visible = false;
+            }
+            else
+            {
+                _ui.m_rewardBtn.visible = true;
+            }
+            _ui.m_ticket.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+            _ui.m_needNum1.text = NumTicketOne.ToString();
+            _ui.m_needNum2.text = NumTicketTwo.ToString();
+            _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+            _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
             _ui.m_ticketNum.text = "999";
-            _ui.m_game1name.text = name[0];
-            _ui.m_game2name.text = name[1];
         }
         private void OnClickBtnBack()
         {
@@ -74,21 +90,103 @@ namespace GFGGame
         }
         private void OnClickBtnReward()
         {
-            ViewManager.Show<ChallengeRewardView>(new object[] { new List<int>() { 0,1 } });
+            ViewManager.Show<ChallengeRewardView>(new object[] { ChallengeList });
         }
         private void OnClickBtnAdd()
         {
 
         }
-        private void OnClickBtnGameOne()
+        private async void OnClickBtnGameOne()
         {
-            ViewManager.Show($"GFGGame.{viewName[0]}");
+            var result = await MiniGameProxy.ReqMiniGameStart(CardGameArray.Instance.GetCfgsBytypeAndsubType(GameType[0], GameType[1])[0].id, GameType[0], activityGameDate[0].id);
+            if (!result) return;
+            ViewManager.Show($"GFGGame.{viewJumpName[GameType[0]]}", new object[] { CardGameArray.Instance.GetCfgsBytypeAndsubType(GameType[0], GameType[1])[0].id });
             this.Hide();
         }
-        private void OnClickBtnGameTwo()
+        private async void OnClickBtnGameTwo()
         {
-            ViewManager.Show($"GFGGame.{viewName[1]}");
+            var result = await MiniGameProxy.ReqMiniGameStart(Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(GameType[2], GameType[3])[0].id, GameType[0], activityGameDate[0].id);
+            if (!result) return;
+            //当存在关卡时需要获取后台数据，哪一关了,这个可以在关卡界面写
+            ViewManager.Show($"GFGGame.{viewJumpName[GameType[2]]}",new object[] { Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(GameType[2],GameType[3])[0].id });
             this.Hide();
         }
+
+        private void GetGameIdByActivityDate()
+        {
+            string pattern = @"\d+";
+            for(int i = 0; i < activityGameDate[0].params5Arr.Length; i++)
+            {
+                MatchCollection matches = Regex.Matches(activityGameDate[0].params5Arr[i], pattern);
+                foreach (Match match in matches)
+                {
+                    GameType.Add(int.Parse(match.Value));
+                }
+            }
+
+        }
+
+        private void UpdateChallengeBtn()
+        {
+            int index = 0;
+            //当两个游戏都只有一关时，奖励按钮隐藏
+            for(int i = 0;i<GameType.Count;i+=2)
+            {
+                switch (GameType[i])
+                {
+                    case 1:
+                       List<CardGame> CardGameDate = CardGameArray.Instance.GetCfgsBytypeAndsubType(GameType[i], GameType[i +1]);
+                        if( CardGameDate.Count <= 1)
+                        {
+                            ChallengeList.Add(GameType[i]);
+                            ChallengeList.Add(GameType[i+1]);
+                        }
+
+                        if(i < 1)
+                        {
+                            //NumTicketOne = CardGameDate[0].comsumeStartArr[0][1];
+                        }
+                        else
+                        {
+                            //NumTicketTwo = CardGameDate[0].comsumeStartArr[0][1];
+                        }
+                        break;
+                    case 2:
+                       List<Merge2048Game> Merge2048GameDate = Merge2048GameArray.Instance.GetCfgsBytypeAndsubType(GameType[i], GameType[i + 1]);
+                        if (Merge2048GameDate.Count <= 1)
+                        {
+                            ChallengeList.Add(GameType[i]);
+                            ChallengeList.Add(GameType[i + 1]);
+                        }
+
+                        if (i < 1)
+                        {
+                            //NumTicketOne = CardGameDate[0].comsumeStartArr[0][1];
+                        }
+                        else
+                        {
+                            //NumTicketTwo = CardGameDate[0].comsumeStartArr[0][1];
+                        }
+                        break;
+                    case 3:
+                       List <HuarongRoadGame> HuarongRoadGameDate = HuarongRoadGameArray.Instance.GetCfgsBytypeAndsubType(GameType[i], GameType[i + 1]);
+                        if (HuarongRoadGameDate.Count <= 1)
+                        {
+                            ChallengeList.Add(GameType[i]);
+                            ChallengeList.Add(GameType[i + 1]);
+                        }
+
+                        if (i < 1)
+                        {
+                            //NumTicketOne = CardGameDate[0].comsumeStartArr[0][1];
+                        }
+                        else
+                        {
+                            //NumTicketTwo = CardGameDate[0].comsumeStartArr[0][1];
+                        }
+                        break;
+                }
+            }
+        }
     }
 }

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

@@ -12,8 +12,10 @@ namespace GFGGame
         private UI_ResultTipsUI _ui;
         private bool gameResult;
         private int timeResult;
-        private string gameName;
+        private int gameType;
+        private int gameID;
 
+        private Dictionary<int, string> viewJumpView = new Dictionary<int, string>(){{1,"FlipGameView"},{ 2,"TZFEGameView"} };
         //通关评价,不同关卡不同
         private List<int> CustemsNum = new List<int>()
         {
@@ -41,27 +43,53 @@ namespace GFGGame
 
             _ui.m_exitBtn.onClick.Add(OnClickExit);
             _ui.m_againBtn.onClick.Add(OnClickAgain);
+
+            _ui.m_rewardList.itemRenderer = RenderRewardList;
         }
         protected override void OnShown()
         {
             base.OnShown();
-            if ((this.viewData as object[]).Length == 3)
+            if ((this.viewData as object[]).Length >= 3)
             {
                 gameResult = (bool)(this.viewData as object[])[0];
-                gameName = (string)(this.viewData as object[])[1];
+                gameType = (int)(this.viewData as object[])[1];
                 timeResult = (int) (this.viewData as object[])[2];
-                
-            }
-            else
-            {
-                gameResult = (bool)(this.viewData as object[])[0];
-                gameName = (string)(this.viewData as object[])[1];
+                gameID = (int)(this.viewData as object[])[3];
+
             }
             UpdateView();
+            ReqResultReward();
         }
         private void UpdateView()
         {
-            if(gameResult)
+            ItemCfg itemCfg;
+            switch (gameType)
+            {
+                case 1:
+                    CardGame cardGameDate = CardGameArray.Instance.GetCfg(gameID);
+                    CustemsNum[0] = cardGameDate.timeStar3;
+                    CustemsNum[1] = cardGameDate.timeStar2;
+                    CustemsNum[2] = cardGameDate.timeStar1;
+                    itemCfg = ItemCfgArray.Instance.GetCfg(cardGameDate.comsumeStartArr[0][0]);
+                    _ui.m_consumeIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                    _ui.m_consumeTxt.text = cardGameDate.comsumeStartArr[0][1].ToString();
+                    break;
+                case 2:
+                    Merge2048Game MergeGameDate = Merge2048GameArray.Instance.GetCfg(gameID);
+                    CustemsNum[0] = MergeGameDate.timeStar3;
+                    CustemsNum[1] = MergeGameDate.timeStar2;
+                    CustemsNum[2] = MergeGameDate.timeStar1;
+                    itemCfg = ItemCfgArray.Instance.GetCfg(MergeGameDate.comsumeStartArr[0][0]);
+                    _ui.m_consumeIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                    _ui.m_consumeTxt.text = MergeGameDate.comsumeStartArr[0][1].ToString();
+                    break;
+                case 3:
+
+                    break;
+                default:
+                    break;
+            }
+            if (gameResult)
             {
                 _ui.m_failTxt.visible = false;
                 _ui.m_success.visible = true ;
@@ -81,9 +109,9 @@ namespace GFGGame
         private void UpdateStar()
         {
             int starNum = 0;
-            for (int i = CustemsNum.Count - 1; i >= 0; i--)
+            for (int i = CustemsNum.Count - 1; i <= 0; i--)
             {
-                if (timeResult >= CustemsNum[i])
+                if (timeResult <= CustemsNum[i])
                 {
                     starNum = i + 1;
                     break;
@@ -121,12 +149,31 @@ namespace GFGGame
         private void OnClickExit()
         {
             this.Hide();
-            ViewManager.Hide(gameName);
+            ViewManager.Hide(viewJumpView[gameType]);
         }
         private void OnClickAgain()
         {
             this.Hide();
-            ViewManager.Show(gameName);
+            ViewManager.Show(viewJumpView[gameType]);
+        }
+        private void RenderRewardList(int index,GObject obj)
+        {
+            UI_rewardItem item = UI_rewardItem.Proxy(obj);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MiniGameDateManager.Instance.itemList[index].ConfigId);
+            if (itemCfg != null)
+            {
+                item.m_icon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_Count.text = MiniGameDateManager.Instance.itemList[index].Count.ToString();
+            }
+
+            UI_rewardItem.ProxyEnd();
+        }
+
+        private async void ReqResultReward()
+        {
+            var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameType, timeResult, gameResult, ActivityType.ShenDuChenYou);
+            if (!result) return;
+            _ui.m_rewardList.numItems = MiniGameDateManager.Instance.itemList.Count;
         }
     }
 }

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

@@ -26,6 +26,8 @@ namespace GFGGame
         private int scoreMax = 0;
         //目标分数
         private int targetNum = 128;
+        private int gameID;
+        private Merge2048Game gameDate;
         //评价
         private List<int> CustemsNum = new List<int>()
         {
@@ -73,6 +75,15 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            if ((this.viewData as object[]).Length != 0 && this.viewData != null)
+            {
+                gameID = (int)(this.viewData as object[])[0];
+            }
+            else
+            {
+                gameID = 128;
+            }
+            gameDate = Merge2048GameArray.Instance.GetCfg(gameID);
             InitMap();
             UpdateView();
             UpdateList();
@@ -100,7 +111,7 @@ namespace GFGGame
         {
             time = 0;
             score = 0;
-            targetNum = 512;
+            targetNum = Merge2048GameArray.Instance.GetCfg(gameID).targetNum;
             _ui.m_score.text = string.Format("分数：{0}", score.ToString());
             _ui.m_score.visible = false;
             rand = new System.Random();
@@ -537,14 +548,7 @@ namespace GFGGame
         private void GameOver(bool target)
         {
             Timers.inst.Remove(UpdateTime);
-            if (target)
-            {
-                ViewManager.Show<ResultTipsView>(new object[]{target, typeof(TZFEGameView).FullName, time });
-            }
-            else
-            {
-                ViewManager.Show<ResultTipsView>(new object[]{target,typeof(TZFEGameView).FullName });
-            }
+            ViewManager.Show<ResultTipsView>(new object[]{target, gameDate.type, time, gameDate.id });
         }
     }
 }

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 58d64be81b0adf34c91e0303b39b3e24
+guid: 0e46af6e4e1eb6246b53b81fd66ca3dc
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

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

GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes.meta

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