瀏覽代碼

合成补充提交

zhangyuqian 10 月之前
父節點
當前提交
f35df91944
共有 31 個文件被更改,包括 426 次插入179 次删除
  1. 1 0
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  2. 61 1
      GameClient/Assets/Game/HotUpdate/Data/MiniGameDateManager.cs
  3. 5 8
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs
  4. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs
  5. 12 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs
  6. 12 15
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerActivityUI.cs
  7. 78 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/MiniGameProxy.cs
  8. 36 3
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs
  9. 186 135
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs
  10. 28 7
      GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs
  11. 1 1
      GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs
  12. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  13. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  14. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  15. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  16. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png
  17. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png
  18. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png
  19. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png
  20. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png
  21. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png
  22. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png
  23. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png
  24. 二進制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes
  25. 二進制
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png
  26. 二進制
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes
  27. 二進制
      GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0!a.png
  28. 二進制
      GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0.png
  29. 二進制
      GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1!a.png
  30. 二進制
      GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1.png
  31. 二進制
      GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_fui.bytes

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -258,6 +258,7 @@ namespace GFGGame
             ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
             MiniGameProxy.ReqGetActivityGameInfos(5003).Coroutine();
+            MiniGameProxy.ReqMergeGameInfo().Coroutine();
 
             TimeTracingDataManager.Instance.InitRewardDic();
             TimeTracingSProxy.ReqGetLevelRewardStatus().Coroutine();

+ 61 - 1
GameClient/Assets/Game/HotUpdate/Data/MiniGameDateManager.cs

@@ -11,7 +11,11 @@ namespace GFGGame
         public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
         public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
         //记录合成游戏的矩阵信息
-        private List<List<int>> idList = new List<List<int>>();
+        public List<int> idList_CS = new List<int>();
+        public Dictionary<int, int> NewItemIdDic = new Dictionary<int, int>();
+        public string ItemIdVPosition = "";
+        public int MergeGameType = 1;
+        public bool CurLevelStatus;
 
         public bool CHECK_TIPS = false; //提示弹窗是否打开
 
@@ -44,6 +48,62 @@ namespace GFGGame
             return false;
         }
 
+        public List<List<int>> GetIdListToLL()
+        {
+            List<List<int>> idlist = new List<List<int>>();
+            int itemNum = 5;
+            for (int i = 0; i < itemNum; i++)
+            {
+                idlist.Add(new List<int>());
+                for (int j = 0; j < itemNum; j++)
+                {
+                    int index = i * itemNum + j;
+                    //对两个按钮单独处理
+                    if (i == itemNum - 1)
+                    {
+                        if (j == 0)
+                        {
+                            idlist[i].Add(-1);
+                            continue;
+                        }
+                        if (j == itemNum - 1)
+                        {
+                            idlist[i].Add(-1);
+                            continue;
+                        }
+                    }
+                    idlist[i].Add(idList_CS[index]);
+                    idlist[i][j] = idList_CS[index];
+                }
+            }
+            return idlist;
+        }
+
+        public List<int> GetListByll(List<List<int>> idlist)
+        {
+            List<int> idList_S = new List<int>();
+            int itemNum = 5;
+            for (int i = 0; i < itemNum; i++)
+            {
+                for (int j = 0; j < itemNum; j++)
+                {
+                    idList_S.Add(idlist[i][j]);
+                    //对两个按钮单独处理
+                    if (i == itemNum - 1)
+                    {
+                        if (j == 0)
+                        {
+                            continue;
+                        }
+                        if (j == itemNum - 1)
+                        {
+                            continue;
+                        }
+                    }
+                }
+            }
+            return idList_S;
+        }
     }
 
 }

+ 5 - 8
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs

@@ -6,8 +6,7 @@ namespace UI.MiniGame
 {
     public partial class UI_MergeGameItemUI
     {
-        public GComponent target;
-        public GLoader m_icon;
+        public GButton target;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_t2;
@@ -21,9 +20,9 @@ namespace UI.MiniGame
         {
             var ui = new UI_MergeGameItemUI();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -36,9 +35,9 @@ namespace UI.MiniGame
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -59,7 +58,6 @@ namespace UI.MiniGame
 
         private void Init(GComponent comp)
         {
-            m_icon = (GLoader)comp.GetChild("icon");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
@@ -67,7 +65,6 @@ namespace UI.MiniGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_icon = null;
             m_t0 = null;
             m_t1 = null;
             m_t2 = null;

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs

@@ -9,10 +9,10 @@ namespace UI.MiniGame
         public GComponent target;
         public GGraph m_btnBack;
         public GLoader m_bg;
-        public GLoader m_AFuHead;
-        public GList m_AFuList;
         public GLoader m_DouBaoHead;
         public GList m_DouBaoList;
+        public GLoader m_AFuHead;
+        public GList m_AFuList;
         public GTextField m_name;
         public GTextField m_desc;
         public const string URL = "ui://wgkh30qjqbf42z";
@@ -64,10 +64,10 @@ namespace UI.MiniGame
         {
             m_btnBack = (GGraph)comp.GetChild("btnBack");
             m_bg = (GLoader)comp.GetChild("bg");
-            m_AFuHead = (GLoader)comp.GetChild("AFuHead");
-            m_AFuList = (GList)comp.GetChild("AFuList");
             m_DouBaoHead = (GLoader)comp.GetChild("DouBaoHead");
             m_DouBaoList = (GList)comp.GetChild("DouBaoList");
+            m_AFuHead = (GLoader)comp.GetChild("AFuHead");
+            m_AFuList = (GList)comp.GetChild("AFuList");
             m_name = (GTextField)comp.GetChild("name");
             m_desc = (GTextField)comp.GetChild("desc");
         }
@@ -75,10 +75,10 @@ namespace UI.MiniGame
         {
             m_btnBack = null;
             m_bg = null;
-            m_AFuHead = null;
-            m_AFuList = null;
             m_DouBaoHead = null;
             m_DouBaoList = null;
+            m_AFuHead = null;
+            m_AFuList = null;
             m_name = null;
             m_desc = null;
             if(disposeTarget && target != null)

+ 12 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs

@@ -16,15 +16,18 @@ namespace UI.MiniGame
         public GButton m_MergeTipBtn;
         public UI_Button11 m_sellBtn;
         public GLoader m_taskBg;
-        public GTextField m_rewardNum;
+        public GTextField m_taskEnd;
         public UI_MaterialItem m_rewardOne;
+        public GTextField m_rewardNum;
         public UI_MaterialItem m_rewardTwo;
         public GLoader m_rewardIcon;
         public GButton m_rewardGet;
+        public GGroup m_taskShow;
         public GButton m_shopBtn;
         public UI_NewMaterialShowView m_newMaterial;
         public UI_MergeGameItemUI m_guildDouBaoBtn;
         public UI_ButtonInValueBar m_btnProp;
+        public GComponent m_valueBar;
         public const string URL = "ui://wgkh30qjqbf42v";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "MergeGameUI";
@@ -81,15 +84,18 @@ namespace UI.MiniGame
             m_MergeTipBtn = (GButton)comp.GetChild("MergeTipBtn");
             m_sellBtn = (UI_Button11)UI_Button11.Create(comp.GetChild("sellBtn"));
             m_taskBg = (GLoader)comp.GetChild("taskBg");
-            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+            m_taskEnd = (GTextField)comp.GetChild("taskEnd");
             m_rewardOne = (UI_MaterialItem)UI_MaterialItem.Create(comp.GetChild("rewardOne"));
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
             m_rewardTwo = (UI_MaterialItem)UI_MaterialItem.Create(comp.GetChild("rewardTwo"));
             m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
             m_rewardGet = (GButton)comp.GetChild("rewardGet");
+            m_taskShow = (GGroup)comp.GetChild("taskShow");
             m_shopBtn = (GButton)comp.GetChild("shopBtn");
             m_newMaterial = (UI_NewMaterialShowView)UI_NewMaterialShowView.Create(comp.GetChild("newMaterial"));
             m_guildDouBaoBtn = (UI_MergeGameItemUI)UI_MergeGameItemUI.Create(comp.GetChild("guildDouBaoBtn"));
             m_btnProp = (UI_ButtonInValueBar)UI_ButtonInValueBar.Create(comp.GetChild("btnProp"));
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -103,13 +109,15 @@ namespace UI.MiniGame
             m_sellBtn.Dispose();
             m_sellBtn = null;
             m_taskBg = null;
-            m_rewardNum = null;
+            m_taskEnd = null;
             m_rewardOne.Dispose();
             m_rewardOne = null;
+            m_rewardNum = null;
             m_rewardTwo.Dispose();
             m_rewardTwo = null;
             m_rewardIcon = null;
             m_rewardGet = null;
+            m_taskShow = null;
             m_shopBtn = null;
             m_newMaterial.Dispose();
             m_newMaterial = null;
@@ -117,6 +125,7 @@ namespace UI.MiniGame
             m_guildDouBaoBtn = null;
             m_btnProp.Dispose();
             m_btnProp = null;
+            m_valueBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 12 - 15
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerActivityUI.cs

@@ -12,14 +12,13 @@ namespace UI.OpenServerActivity
         public GButton m_btnBack;
         public GGraph m_holderTitle;
         public GGraph m_holderFog;
+        public GTextField m_timeText;
+        public GButton m_ruleBtn;
+        public GButton m_btnTenShu;
         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 GButton m_btnHeaven;
         public GGraph m_holderSmallBgTx;
         public GButton m_buttonNewYearLogin;
         public Transition m_openEff;
@@ -75,14 +74,13 @@ namespace UI.OpenServerActivity
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_holderFog = (GGraph)comp.GetChild("holderFog");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
+            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
             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");
+            m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
             m_holderSmallBgTx = (GGraph)comp.GetChild("holderSmallBgTx");
             m_buttonNewYearLogin = (GButton)comp.GetChild("buttonNewYearLogin");
             m_openEff = comp.GetTransition("openEff");
@@ -94,14 +92,13 @@ namespace UI.OpenServerActivity
             m_btnBack = null;
             m_holderTitle = null;
             m_holderFog = null;
+            m_timeText = null;
+            m_ruleBtn = null;
+            m_btnTenShu = 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;
+            m_btnHeaven = null;
             m_holderSmallBgTx = null;
             m_buttonNewYearLogin = null;
             m_openEff = null;

+ 78 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/MiniGameProxy.cs

@@ -1,4 +1,5 @@
 using ET;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -89,5 +90,82 @@ namespace GFGGame
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             return true;
         }
+
+        //合成游戏
+        public static async ETTask<bool> ReqMergeGameInfo()
+        {
+            var response = (S2C_GetMergeGameInfo)await MessageHelper.SendToServer(new C2S_GetMergeGameInfo { SubType = MiniGameDateManager.Instance.MergeGameType  });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            MiniGameDateManager.Instance.taskID =  response.CurLevelId;
+            MiniGameDateManager.Instance.idList_CS = response.ShowLatticeList;
+            MiniGameDateManager.Instance.NewItemIdDic.Clear();
+            for(int i =0;i< response.ItemsKey.Count;i++)
+            {
+                MiniGameDateManager.Instance.NewItemIdDic.Add(response.ItemsKey[i],response.ItemsVal[i]);
+            }
+            MiniGameDateManager.Instance.CurLevelStatus = response.CurLevelStatus;
+            return true;
+        }
+        //合成材料,小心引用传递
+        public static async ETTask<bool> ReqMergeGame(int OldIdA,int OldIdB, List<int> BeforeList,List<int> AfterList)
+        {
+            var response = (S2C_MergeGameMaterialSynthesis)await MessageHelper.SendToServer(new C2S_MergeGameMaterialSynthesis 
+            { 
+                SubType = MiniGameDateManager.Instance.MergeGameType,
+                OldItemIdA = OldIdA,
+                OldItemIdB = OldIdB,
+                BeforeMovShowLatticeList = BeforeList,
+                AfterMovShowLatticeList = AfterList
+            });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            MiniGameDateManager.Instance.idList_CS = response.ShowLatticeList;
+            MiniGameDateManager.Instance.NewItemIdDic.Clear();
+            for (int i = 0; i < response.ItemsKey.Count; i++)
+            {
+                MiniGameDateManager.Instance.NewItemIdDic.Add(response.ItemsKey[i], response.ItemsVal[i]);
+            }
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
+            return true;
+        }
+        //按钮获得材料
+        public static async ETTask<bool> ReqMergeGameBtn(int type,int id)
+        {
+            var response = (S2C_MergeGameExchangeMaterial)await MessageHelper.SendToServer(new C2S_MergeGameExchangeMaterial
+            {
+                ExchangeType = type,
+                LevelId = id
+            });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            MiniGameDateManager.Instance.idList_CS = response.ShowLatticeList;
+            MiniGameDateManager.Instance.ItemIdVPosition = response.ItemIdVPosition;
+            return true;
+        }
+        public static async ETTask<bool> ReqMergeGameLevelPass(int levelID)
+        {
+            var response = (S2C_MergeGameLevelPass)await MessageHelper.SendToServer(new C2S_MergeGameLevelPass
+            {
+                SubType = MiniGameDateManager.Instance.MergeGameType,
+                LevelId = levelID
+            }) ;
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            MiniGameDateManager.Instance.idList_CS = response.ShowLatticeList;
+            MiniGameDateManager.Instance.CurLevelStatus = response.CurLevelStatus;
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
+            return true;
+        }
+        public static async ETTask<bool> ReqMergeGameNewStyle()
+        {
+            var response = (S2C_MergeGameCancelNewStyle)await MessageHelper.SendToServer(new C2S_MergeGameCancelNewStyle
+            {
+                SubType = MiniGameDateManager.Instance.MergeGameType,
+            });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            MiniGameDateManager.Instance.NewItemIdDic.Clear();
+            for (int i = 0; i < response.ItemsKey.Count; i++)
+            {
+                MiniGameDateManager.Instance.NewItemIdDic.Add(response.ItemsKey[i], response.ItemsVal[i]);
+            }
+            return true;
+        }
     }
 }

+ 36 - 3
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs

@@ -50,8 +50,9 @@ namespace GFGGame
             _ui.m_DouBaoList.numItems = 10;
 
         }
-        protected override void OnHide()
+        protected async override void OnHide()
         {
+            bool result = await MiniGameProxy.ReqMergeGameNewStyle();
             base.OnHide();
         }
 
@@ -67,7 +68,23 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnClickItem);
             }
-            item.target.data = index + 1;
+            item.target.data = index + 1 + 10;
+            int id = index + 1 + 10;
+            if (MiniGameDateManager.Instance.NewItemIdDic.ContainsKey(id))
+            {
+                if (MiniGameDateManager.Instance.NewItemIdDic[id] == 1)
+                {
+                    item.m_c1.selectedIndex = 1;
+                }
+                else
+                {
+                    item.m_c1.selectedIndex = 0;
+                }
+            }
+            else
+            {
+                item.m_c1.selectedIndex = 2;
+            }
             UI_MergeGamematerialItem.ProxyEnd();
         }
         private void RenderDouBaoList(int index,GObject obj)
@@ -82,7 +99,23 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnClickItem);
             }
-            item.target.data = index + 1 + 10;
+            item.target.data = index + 1;
+            int id = index + 1 + 10;
+            if (MiniGameDateManager.Instance.NewItemIdDic.ContainsKey(id))
+            {
+                if (MiniGameDateManager.Instance.NewItemIdDic[id] == 1)
+                {
+                    item.m_c1.selectedIndex = 1;
+                }
+                else
+                {
+                    item.m_c1.selectedIndex = 0;
+                }
+            }
+            else
+            {
+                item.m_c1.selectedIndex = 2;
+            }
             UI_MergeGamematerialItem.ProxyEnd();
         }
         private void OnClickItem(EventContext context)

+ 186 - 135
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -10,8 +10,10 @@ namespace GFGGame
     public class MergeGameView : BaseWindow
     {
         private UI_MergeGameUI _ui;
-
+        private ValueBarController _valueBarController;
         private List<List<GComponent>> itemList = new List<List<GComponent>>();
+        private GComponent guideDouBaoBtn;
+        private GComponent guideAfuBtn;
         private List<List<int>> idList = new List<List<int>>();
         private int itemNum;
         private int maxLv;
@@ -36,6 +38,11 @@ namespace GFGGame
 
         public override void Dispose()
         {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -52,6 +59,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_backBtn.onClick.Add(Hide);
             _ui.m_rewardGet.onClick.Add(SubmitTask);
             _ui.m_MergeTipBtn.onClick.Add(ShowMergeRouteTips);
@@ -63,11 +71,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() {propID});
             //进入这个界面的时候向后台获取任务id和历史id列表
+            idList = MiniGameDateManager.Instance.GetIdListToLL();
             UpdateView();
             UpdateList();
             UpdateTask();
             UpdateItemData();
+            _ui.m_guildDouBaoBtn.target.touchable = false;
+            Timers.inst.AddUpdate(CheckGuide);
         }
         protected override void OnHide()
         {
@@ -83,6 +96,14 @@ namespace GFGGame
             itemList.Clear();
             base.OnHide();
         }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
         private void UpdateData()
         {
 
@@ -107,41 +128,43 @@ namespace GFGGame
             for (int i = 0; i < itemNum; i++)
             {
                 itemList.Add(new List<GComponent>());
-                idList.Add(new List<int>());
+                //idList.Add(new List<int>());
                 for (int j = 0; j < itemNum; j++)
                 {
-                    idList[i].Add(j);
+                    //idList[i].Add(j);
                     itemList[i].Add(UIPackage.CreateObject(UI_MergeGameUI.PACKAGE_NAME, "MergeGameItemUI").asCom);
                     _ui.m_rangeDown.AddChild(itemList[i][j]);
                     //对两个按钮单独处理
                     if (i == itemNum - 1)
                     {
                         itemList[i][j].data = -1;
-                        idList[i][j] = -1;
+                        //idList[i][j] = -1;
                         itemList[i][j].SetPosition((_ui.m_rangeDown.width / 10.0f) * (1 + (j * 2.0f)), (_ui.m_rangeDown.height / 10) * (1 + (i * 2.0f)), 0);
                         if (j == 0)
                         {
+                            guideAfuBtn = itemList[i][j];
                             itemList[i][j].GetChild("icon").icon = "ui://MiniGame/jbnf_doubao_icon";
                             itemList[i][j].onClick.Add(OnClickAFuBtn);
                             continue;
                         }
                         if ( j == itemNum - 1)
                         {
+                            guideAfuBtn = itemList[i][j];
                             itemList[i][j].GetChild("icon").icon = "ui://MiniGame/jbnf_afu_icon";
                             itemList[i][j].onClick.Add(OnClickDouBaoBtn);
                             continue;
                         }
                     }
-                    //表示id;这里后续要改
-                    idList[i][j] = 0;
-                    if (i == 1 && j == 2)
-                    {
-                        idList[i][j] = 1;
-                    }
-                    if(i== 2 && j== 2)
-                    {
-                        idList[i][j] = 1;
-                    }
+                    //表示id;这里后续要改,默认有两个基础材料
+                    //idList[i][j] = 0;
+                    //if (i == 1 && j == 2)
+                    //{
+                    //    idList[i][j] = 1;
+                    //}
+                    //if(i== 2 && j== 2)
+                    //{
+                    //    idList[i][j] = 1;
+                    //}
                     //
                     itemList[i][j].data = idList[i][j];
                     itemList[i][j].draggable = true;
@@ -175,10 +198,10 @@ namespace GFGGame
             _ui.m_rangeDown.RemoveChild(item);
             _ui.m_rangeTop.AddChild(item);
         }
-        private void onDragEnd(EventContext context)
+        private async void onDragEnd(EventContext context)
         {
             GObject item = context.sender as GObject;
-
+            List<int> afterIDList = MiniGameDateManager.Instance.GetListByll(idList);
             int endIndexY = Math.Min(itemNum - 1 , (int)(item.x / (_ui.m_rangeDown.width/5)));
             int endIndexX = Math.Min(itemNum - 1 ,(int)(item.y / (_ui.m_rangeDown.height/5)));
             int itemEndInfo = (int)itemList[endIndexX][endIndexY].data;
@@ -206,6 +229,12 @@ namespace GFGGame
                 {
                     _ui.m_rewardGet.visible = false;
                 }
+                bool result = await MiniGameProxy.ReqMergeGame(indexID, itemEndInfo, afterIDList, MiniGameDateManager.Instance.GetListByll(idList));
+                if(!result)
+                {
+                    idList = MiniGameDateManager.Instance.GetIdListToLL();
+                    UpdateList();
+                }
             }
             if (itemEndInfo != indexID && itemEndInfo == 0)
             {
@@ -218,6 +247,13 @@ namespace GFGGame
 
                 itemEndInfo = indexID;
                 indexID = 0;
+
+                bool result = await MiniGameProxy.ReqMergeGame(indexID, itemEndInfo, afterIDList, MiniGameDateManager.Instance.GetListByll(idList));
+                if (!result)
+                {
+                    idList = MiniGameDateManager.Instance.GetIdListToLL();
+                    UpdateList();
+                }
             }
 
             item.x = startX;
@@ -282,11 +318,9 @@ namespace GFGGame
             indexY = 0;
             //获得奖励
         }
-        private void OnClickAFuBtn()
+        private async void OnClickAFuBtn()
         {
             bool gameOver = false;
-            bool isRand = false;
-            int materialID = 0;
             for (int i = 0; i < itemNum; i++)
             {
                 for (int j = 0; j < itemNum; j++)
@@ -300,53 +334,36 @@ namespace GFGGame
             }
             if (!gameOver)
             {
+                PromptController.Instance.ShowFloatTextPrompt("没有存放空间!");
                 return;
             }
-            if(MergeGameArray.Instance.GetCfg(taskId).materialId1Arr.Length > 1)
+            bool result = await MiniGameProxy.ReqMergeGameBtn(2,taskId);
+            if(result)
             {
-                isRand = true;
+                int x = MatchingCompetitionDataManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] / itemNum;
+                int y = MatchingCompetitionDataManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] % itemNum;
+                int num = MatchingCompetitionDataManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[0];
+                if (idList[x][y] == 0)
+                    {
+                        idList[x][y] = num;
+                        itemList[x][y].data = num;
+                        itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
+                        itemList[x][y].draggable = true;
+                        UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
+                        itemUI.m_t1.Play();
+                        UI_MergeGameItemUI.ProxyEnd();
+                    }
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
             }
             else
             {
-                isRand = false;
-                materialID = MergeGameArray.Instance.GetCfg(taskId).materialId1Arr[0];
-            }
-            while (true)
-            {
-                int x = rand.Next(0, itemNum);
-                int y = rand.Next(0, itemNum);
-                int num;
-                int randNum = rand.Next(0, 2);
-                if (randNum == 0)
-                {
-                    num = 1;
-                }
-                else
-                {
-                    num = 6;
-                }
-                if(!isRand)
-                { 
-                   num = materialID;
-                }
-                if (idList[x][y] == 0)
-                {
-                    idList[x][y] = num;
-                    itemList[x][y].data = num;
-                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
-                    itemList[x][y].draggable = true;
-                    UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
-                    itemUI.m_t1.Play();
-                    UI_MergeGameItemUI.ProxyEnd();
-                    break;
-                }
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
+                UpdateList();
             }
         }
-        private void OnClickDouBaoBtn()
+        private async void OnClickDouBaoBtn()
         {
             bool gameOver = false;
-            bool isRand = false;
-            int materialID = 0;
             for (int i = 0; i < itemNum; i++)
             {
                 for (int j = 0; j < itemNum; j++)
@@ -360,51 +377,46 @@ namespace GFGGame
             }
             if (!gameOver)
             {
+                PromptController.Instance.ShowFloatTextPrompt("没有存放空间!");
                 return;
             }
-            if (MergeGameArray.Instance.GetCfg(taskId).materialId2Arr.Length > 1)
+            bool result = await MiniGameProxy.ReqMergeGameBtn(1,taskId);
+            if (result)
             {
-                isRand = true;
+                int x = MatchingCompetitionDataManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] / itemNum;
+                int y = MatchingCompetitionDataManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] % itemNum;
+                int num = MatchingCompetitionDataManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[0];
+                if (idList[x][y] == 0)
+                    {
+                        idList[x][y] = num;
+                        itemList[x][y].data = num;
+                        itemList[x][y].draggable = true;
+                        itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
+                        UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
+                        itemUI.m_t1.Play();
+                        UI_MergeGameItemUI.ProxyEnd();
+                    }
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
             }
             else
             {
-                isRand = false;
-                materialID = MergeGameArray.Instance.GetCfg(taskId).materialId2Arr[0];
-            }
-            while (true)
-            {
-                int x = rand.Next(0, itemNum);
-                int y = rand.Next(0, itemNum);
-                int num;
-                int randNum = rand.Next(0, 2);
-                if (randNum == 0)
-                {
-                    num = 11;
-                }
-                else
-                {
-                    num = 16;
-                }
-                if (!isRand)
-                {
-                    num = materialID;
-                }
-                if (idList[x][y] == 0)
-                {
-                    idList[x][y] = num;
-                    itemList[x][y].data = num;
-                    itemList[x][y].draggable = true;
-                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
-                    UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
-                    itemUI.m_t1.Play();
-                    UI_MergeGameItemUI.ProxyEnd();
-                    break;
-                }
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
+                UpdateList();
             }
         }
 
         private void UpdateTask()
         {
+            if(MiniGameDateManager.Instance.CurLevelStatus == true)
+            {
+                _ui.m_taskShow.visible = false;
+                _ui.m_taskEnd.visible = true;
+            }
+            else
+            {
+                _ui.m_taskShow.visible = true;
+                _ui.m_taskEnd.visible = false;
+            }
             _ui.m_rewardNum.text = String.Format("+{0}", MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][1]);
             ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][0]);
             _ui.m_rewardIcon.url = ResPathUtil.GetCommonGameResPath(itemReward.res);
@@ -437,45 +449,56 @@ namespace GFGGame
             {
                 _ui.m_rewardGet.visible = false;
             }
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+            _ui.m_name.text = "";
+            _ui.m_desc.text = "";
+            materialID = 0;
         }
         //提交任务
-        private void SubmitTask()
+        private async void SubmitTask()
         {
-            for(int k =  0;k< MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
+            bool result = await MiniGameProxy.ReqMergeGameLevelPass(taskId);
+            if(result)
             {
-                int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
-                int targetNum = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][1];
-                for (int i = 0; i < itemNum; i++)
-                {
-                    for (int j = 0; j < itemNum; j++)
-                    {
-                        if(idList[i][j] == targetID)
-                        {
-                            idList[i][j] = 0;
-                            itemList[i][j].data = 0;
-                            UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[i][j]);
-                            itemUI.m_t2.Play();
-                            itemUI.m_t3.Play();
-                            UI_MergeGameItemUI.ProxyEnd();
-                            targetNum--;
-                            if(targetNum == 0)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                    if (targetNum == 0)
-                    {
-                        break;
-                    }
-                }
+                //for (int k = 0; k < MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
+                //{
+                //    int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
+                //    int targetNum = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][1];
+                //    for (int i = 0; i < itemNum; i++)
+                //    {
+                //        for (int j = 0; j < itemNum; j++)
+                //        {
+                //            if (idList[i][j] == targetID)
+                //            {
+                //                idList[i][j] = 0;
+                //                itemList[i][j].data = 0;
+                //                //UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[i][j]);
+                //                //itemUI.m_t2.Play();
+                //                //itemUI.m_t3.Play();
+                //                //UI_MergeGameItemUI.ProxyEnd();
+                //                targetNum--;
+                //                if (targetNum == 0)
+                //                {
+                //                    break;
+                //                }
+                //            }
+                //        }
+                //        if (targetNum == 0)
+                //        {
+                //            break;
+                //        }
+                //    }
+                //}
+                //向后台发送任务ID,获得奖励
+                taskId = MiniGameDateManager.Instance.taskID;
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
+                UpdateTask();
+                UpdateList();
+            }
+            else
+            {
+                Debug.LogError("489有问题");
             }
-            //向后台发送任务ID,获得奖励
-            //taskId = MiniGameDateManager.Instance.taskID;
-            //暂用
-            taskId++;
-            //
-            UpdateTask();
         }
         //检查是否达到提交要求
         private bool InspectionTasks()
@@ -518,7 +541,13 @@ namespace GFGGame
         private void ShowNewMaterialView(int i ,int j)
         {
             //判断是否是新材料。再显示
-
+            if(MiniGameDateManager.Instance.NewItemIdDic.ContainsKey(idList[i][j]))
+            {
+                if(MiniGameDateManager.Instance.NewItemIdDic[idList[i][j]]!= 1)
+                {
+                    return;
+                }
+            }
             _ui.m_newMaterial.target.x = itemList[i][j].x + _ui.m_rangeDown.x;
             _ui.m_newMaterial.target.y = itemList[i][j].y + _ui.m_rangeDown.y;
             _ui.m_newMaterial.target.visible = true;
@@ -544,23 +573,45 @@ namespace GFGGame
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
         private void UpdateItemData()
-        { 
-            ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(propID);
-            _ui.m_btnProp.target.icon = ResPathUtil.GetIconPath(itemcfg.res,"png");
-            ItemData item;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(propID, out item))
+        {
+            _ui.m_btnProp.target.visible = false;
+            //ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(propID);
+            //_ui.m_btnProp.target.icon = ResPathUtil.GetIconPath(itemcfg.res,"png");
+            //ItemData item;
+            //if (BagDataManager.Instance.GetBagData().TryGetValue(propID, out item))
+            //{
+            //    _ui.m_btnProp.target.title = item.num.ToString();
+            //}
+            //else
+            //{
+            //    _ui.m_btnProp.target.title = "0";
+            //}
+        }
+        private void OnItemTips()
+        {
+            object[] sourceDatas = new object[] { propID, null };
+            GoodsItemTipsController.ShowItemTips(propID, sourceDatas);
+        }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
             {
-                _ui.m_btnProp.target.title = item.num.ToString();
+                UpdateCheckGuide(null);
             }
             else
             {
-                _ui.m_btnProp.target.title = "0";
+                Timers.inst.Remove(CheckGuide);
             }
         }
-        private void OnItemTips()
+        protected void UpdateCheckGuide(object param)
         {
-            object[] sourceDatas = new object[] { propID, null };
-            GoodsItemTipsController.ShowItemTips(propID, sourceDatas);
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(guideDouBaoBtn, ConstGuideId.FIELD, 1, "点击豆包按钮获取材料!");
+            GuideController.TryGuide(guideAfuBtn, ConstGuideId.FIELD, 2, "点击阿福按钮获取材料!");
+            GuideController.TryGuide(null, ConstGuideId.FIELD, 3, "拖拽相同材料进行合成!", -1, true, _ui.target.height - 600);
+            GuideController.TryGuide(_ui.m_rewardGet, ConstGuideId.FIELD, 4, "提交对应材料获得物品!");
+            GuideController.TryCompleteGuide(ConstGuideId.FIELD, 5);
         }
     }
 }

+ 28 - 7
GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -2,6 +2,7 @@ using UnityEngine;
 using FairyGUI;
 using UI.OpenServerActivity;
 using ET;
+using System.Text.RegularExpressions;
 
 namespace GFGGame
 {
@@ -56,26 +57,32 @@ namespace GFGGame
 
         private void AddEffect()
         {
-            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBg, "ui_Activity", "NewAtv_Quad");
-            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBgTx, "ui_Activity", "NewAtv_Quad_tx");
+            //_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBg, "ui_Activity", "NewAtv_Quad");
+            //_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBgTx, "ui_Activity", "NewAtv_Quad_tx");
             _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_holderFog, "ui_Activity", "NewAtv_BG_tx");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("Tx_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
             RefreshTimeText();
             UpdateRedDot();
             _ui.m_buttonNewYearLogin.visible = false;
             //RefreshButtonNewYearLogin();
+            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            ActivityOpenCfg activiyCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
+            if (activiyCfg != null)
+            {
+                _ui.m_timeText.text = GetTImeText(activiyCfg.endTime);
+            }
             Timers.inst.Add(1, 0, UpdateTime);
             Timers.inst.Add(0.2f, 1, ShowEffTime);
         }
 
         private void ShowEffTime(object param)
         {
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_Activity", "NewAtv_Text");
+            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_Activity", "NewAtv_Text");
         }
 
         protected override void OnHide()
@@ -134,9 +141,6 @@ namespace GFGGame
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             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()
@@ -193,5 +197,22 @@ namespace GFGGame
             }
             return true;
         }
+        private string GetTImeText(string time)
+        {
+            string pattern = @"\[(.*?)\]";
+
+            // 创建一个Regex对象
+            Regex regex = new Regex(pattern);
+
+            // 匹配输入字符串中的所有内容
+            MatchCollection matches = Regex.Matches(time, pattern);
+            // 存储所有提取的内容
+            string TimeText = matches[0].Groups[1].Value;
+            for (int i = 1; i < matches.Count; i++)
+            {
+                TimeText += "-" + matches[i].Groups[1].Value;
+            }
+            return TimeText;
+        }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sdcy_jq_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _storyLevelCfgs.Clear();

二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png


二進制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes


二進制
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes


二進制
GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0.png


二進制
GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_fui.bytes