Merge remote-tracking branch 'remotes/origin/master' into douYouTap

# Conflicts:
#	GameClient/GameClient.sln.DotSettings.user

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using GFGGame;
 using System;
 using System.Linq;
+using ET;
 
 namespace GFGEditor
 {
@@ -719,19 +720,31 @@ namespace GFGEditor
         }
         private static bool CheckIsHasItem(int itemId, int checkId)
         {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(checkId);
-            if (itemCfg.itemType == ConstItemType.USEABLE)
+            try
             {
-                for (int i = 0; i < itemCfg.itemsArr.Length; i++)
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(checkId);
+                if (itemCfg == null)
+                {
+                    Log.Error($"CheckIsHasItem itemCfg is null. itemId:{itemId} checkId:{checkId}");
+                }
+                if (itemCfg.itemType == ConstItemType.USEABLE)
+                {
+                    for (int i = 0; i < itemCfg.itemsArr.Length; i++)
+                    {
+                        if (itemCfg.itemsArr[i][0] == itemId) return true;
+                    }
+                }
+                else if (checkId == itemId)
                 {
-                    if (itemCfg.itemsArr[i][0] == itemId) return true;
+                    return true;
                 }
+                return false;
             }
-            else if (checkId == itemId)
+            catch (Exception e)
             {
-                return true;
+                Log.Error($"CheckIsHasItemxxx itemCfg is null. itemId:{itemId} checkId:{checkId}");
+                throw;
             }
-            return false;
         }
 
         /// <summary>

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();

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

@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using UnityEngine;
 
 namespace GFGGame
@@ -11,7 +12,13 @@ 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 int MergeGameMatType = 1;
+        public bool CurLevelStatus;
 
         public bool CHECK_TIPS = false; //提示弹窗是否打开
 
@@ -44,6 +51,74 @@ namespace GFGGame
             return false;
         }
 
+        public List<List<int>> GetIdListToLL()
+        {
+            List<List<int>> idlist = new List<List<int>>();
+            int itemNum = 5;
+            int count = 0;
+            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[count]);
+                    idlist[i][j] = idList_CS[count];
+                    count++;
+                }
+            }
+            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++)
+                {
+                    //对两个按钮单独处理
+                    if (i == itemNum - 1)
+                    {
+                        if (j == 0)
+                        {
+                            continue;
+                        }
+                        if (j == itemNum - 1)
+                        {
+                            continue;
+                        }
+                    }
+                    idList_S.Add(idlist[i][j]);
+                }
+            }
+            return idList_S;
+        }
+        public List<int> GetIDListByString(string name)
+        {
+            List<int> idList = new List<int>();
+            string[] parts = Regex.Split(name, "-");
+            foreach (string id in parts)
+            {
+                idList.Add(int.Parse(id));
+            }
+            return idList;
+        }
     }
 
 }

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

@@ -924,7 +924,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetOpenServerRed()
         {
-           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed() || ActivityDataManager.Instance.CanGetNewYearLoginRed())
+           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed())
                 return true;
 
             return false;

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

@@ -192,7 +192,7 @@ namespace GFGGame
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
                 int lockValue = shopCfg.lockValue;
-                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM && shopCfg.menu2 < ArenaDataManager.Instance.SeasonId)
                 {
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
@@ -225,7 +225,7 @@ namespace GFGGame
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
                 int lockValue = shopCfg.lockValue;
-                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM && shopCfg.menu2 < ArenaDataManager.Instance.SeasonId)
                 {
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;

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;

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)

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

@@ -11,20 +11,29 @@ namespace UI.MiniGame
         public GLoader m_backBtn;
         public GComponent m_rangeTop;
         public GComponent m_rangeDown;
+        public GLoader m_afuicon;
+        public GTextField m_afuDesc;
+        public GTextField m_afunum;
+        public GLoader m_doubaoicon;
+        public GTextField m_doubaoDesc;
+        public GTextField m_doubaonum;
         public GTextField m_name;
         public GTextField m_desc;
         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";
@@ -76,20 +85,29 @@ namespace UI.MiniGame
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_rangeTop = (GComponent)comp.GetChild("rangeTop");
             m_rangeDown = (GComponent)comp.GetChild("rangeDown");
+            m_afuicon = (GLoader)comp.GetChild("afuicon");
+            m_afuDesc = (GTextField)comp.GetChild("afuDesc");
+            m_afunum = (GTextField)comp.GetChild("afunum");
+            m_doubaoicon = (GLoader)comp.GetChild("doubaoicon");
+            m_doubaoDesc = (GTextField)comp.GetChild("doubaoDesc");
+            m_doubaonum = (GTextField)comp.GetChild("doubaonum");
             m_name = (GTextField)comp.GetChild("name");
             m_desc = (GTextField)comp.GetChild("desc");
             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)
         {
@@ -97,19 +115,27 @@ namespace UI.MiniGame
             m_backBtn = null;
             m_rangeTop = null;
             m_rangeDown = null;
+            m_afuicon = null;
+            m_afuDesc = null;
+            m_afunum = null;
+            m_doubaoicon = null;
+            m_doubaoDesc = null;
+            m_doubaonum = null;
             m_name = null;
             m_desc = null;
             m_MergeTipBtn = null;
             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 +143,7 @@ namespace UI.MiniGame
             m_guildDouBaoBtn = null;
             m_btnProp.Dispose();
             m_btnProp = null;
+            m_valueBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnAnswerTianmen
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedgc";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnAnswerTianmen";
+        private static UI_BtnAnswerTianmen _proxy;
+
+        public static UI_BtnAnswerTianmen Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnAnswerTianmen();
+            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_BtnAnswerTianmen Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnAnswerTianmen();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnHeaven
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedga";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnHeaven";
+        private static UI_BtnHeaven _proxy;
+
+        public static UI_BtnHeaven Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnHeaven();
+            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_BtnHeaven Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnHeaven();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnMingTong
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedgb";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnMingTong";
+        private static UI_BtnMingTong _proxy;
+
+        public static UI_BtnMingTong Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnMingTong();
+            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_BtnMingTong Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnMingTong();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnNineZhouPool
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedg9";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnNineZhouPool";
+        private static UI_BtnNineZhouPool _proxy;
+
+        public static UI_BtnNineZhouPool Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnNineZhouPool();
+            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_BtnNineZhouPool Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnNineZhouPool();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,19 +8,18 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GGraph m_holderSmallBg;
         public GButton m_btnBack;
         public GGraph m_holderTitle;
-        public GGraph m_holderFog;
-        public GButton m_btnAnswerTianmen;
-        public GButton m_btnMingTong;
-        public GButton m_btnHeaven;
-        public GButton m_btnNineZhouPool;
+        public GTextField m_timeText;
+        public GButton m_ruleBtn;
         public GButton m_btnTenShu;
-        public GTextField m_txtDay;
-        public GTextField m_txtHour;
-        public GTextField m_txtMinute;
+        public GGraph m_holderFog;
+        public UI_BtnAnswerTianmen m_btnAnswerTianmen;
+        public UI_BtnMingTong m_btnMingTong;
+        public UI_BtnNineZhouPool m_btnNineZhouPool;
+        public UI_BtnHeaven m_btnHeaven;
         public GGraph m_holderSmallBgTx;
+        public GGraph m_holderSmallBg;
         public GButton m_buttonNewYearLogin;
         public Transition m_openEff;
         public const string URL = "ui://b8ha2mnsdedg0";
@@ -71,38 +70,40 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_holderSmallBg = (GGraph)comp.GetChild("holderSmallBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
-            m_holderFog = (GGraph)comp.GetChild("holderFog");
-            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_timeText = (GTextField)comp.GetChild("timeText");
+            m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
             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_holderFog = (GGraph)comp.GetChild("holderFog");
+            m_btnAnswerTianmen = (UI_BtnAnswerTianmen)UI_BtnAnswerTianmen.Create(comp.GetChild("btnAnswerTianmen"));
+            m_btnMingTong = (UI_BtnMingTong)UI_BtnMingTong.Create(comp.GetChild("btnMingTong"));
+            m_btnNineZhouPool = (UI_BtnNineZhouPool)UI_BtnNineZhouPool.Create(comp.GetChild("btnNineZhouPool"));
+            m_btnHeaven = (UI_BtnHeaven)UI_BtnHeaven.Create(comp.GetChild("btnHeaven"));
             m_holderSmallBgTx = (GGraph)comp.GetChild("holderSmallBgTx");
+            m_holderSmallBg = (GGraph)comp.GetChild("holderSmallBg");
             m_buttonNewYearLogin = (GButton)comp.GetChild("buttonNewYearLogin");
             m_openEff = comp.GetTransition("openEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_holderSmallBg = null;
             m_btnBack = null;
             m_holderTitle = null;
+            m_timeText = null;
+            m_ruleBtn = null;
+            m_btnTenShu = null;
             m_holderFog = null;
+            m_btnAnswerTianmen.Dispose();
             m_btnAnswerTianmen = null;
+            m_btnMingTong.Dispose();
             m_btnMingTong = null;
-            m_btnHeaven = null;
+            m_btnNineZhouPool.Dispose();
             m_btnNineZhouPool = null;
-            m_btnTenShu = null;
-            m_txtDay = null;
-            m_txtHour = null;
-            m_txtMinute = null;
+            m_btnHeaven.Dispose();
+            m_btnHeaven = null;
             m_holderSmallBgTx = null;
+            m_holderSmallBg = null;
             m_buttonNewYearLogin = null;
             m_openEff = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs

@@ -84,12 +84,12 @@ namespace GFGGame
                 return;
             }
 
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
-            if (itemCfg == null)
-            {
-                Log.Error($"recharge {buyID} itemCfgId:{shopCfg.itemId} config not found!");
-                return;
-            }
+            // ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+            // if (itemCfg == null)
+            // {
+            //     Log.Error($"recharge {buyID} itemCfgId:{shopCfg.itemId} config not found!");
+            //     return;
+            // }
 
             var zoneScene = GameGlobal.zoneScene;
             if (zoneScene == null) return;

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

@@ -1,4 +1,5 @@
 using ET;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -89,5 +90,97 @@ 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;
+            MiniGameDateManager.Instance.taskID = response.CurLevelId;
+            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;
+        }
+        public static async ETTask<bool> ReqMergeGameSellBtn(int id,int index)
+        {
+            var response = (S2C_MergeGameSellingMaterials)await MessageHelper.SendToServer(new C2S_MergeGameSellingMaterials
+            {
+                SubType = MiniGameDateManager.Instance.MergeGameType,
+                ResType = MiniGameDateManager.Instance.MergeGameMatType,
+                Materialld = id,
+                Position = index
+            });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            MiniGameDateManager.Instance.idList_CS = response.ShowLatticeList;
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
+            return true;
+        }
     }
 }

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

@@ -21,7 +21,15 @@ namespace GFGGame
             {   
                 levelInfo.Add(list[i].id, response.LevelRoleInfoList[i]);      
             }
-            TimeTracingDataManager._LevelMaxInfoDic.Add(chapID, levelInfo);
+            if(!TimeTracingDataManager._LevelMaxInfoDic.ContainsKey(chapID))
+            {
+                TimeTracingDataManager._LevelMaxInfoDic.Add(chapID, levelInfo);
+            }
+            else
+            {
+                TimeTracingDataManager._LevelMaxInfoDic[chapID] = levelInfo;
+            }
+            
             return true;
         }
         //获取套装积分奖励状态（已领取的奖励id）

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -147,6 +147,11 @@ namespace GFGGame
                 item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_aliz", "png"); ;
                 item.m_loaTitle.visible = false;
             }
+            else if (openCfg.id == 508)
+            {
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath("hdbn_xslc_dmdhdwn", "png"); ;
+                item.m_loaTitle.visible = false;
+            }
             else
             {
                 item.target.visible = false;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/RushSaleGiftBoxView.cs

@@ -172,7 +172,7 @@ namespace GFGGame
 
             if (list.Count == 0)
             {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                //PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 this.Hide();
                 return;
             }

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

@@ -206,7 +206,7 @@ namespace GFGGame
             if (LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT && _ui.m_btnLuckyDiscount.target.visible) {
                 LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData16();
                 LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT = false;
-                ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
+                //ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
             }
         }
 

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

@@ -465,10 +465,10 @@ namespace GFGGame
 
         private void OnClickBtnOpenServerActivity()
         {
-            var titleIndex = PlayerPrefs.GetString("seeOpenServerActivityStory" + GameGlobal.userId);
+            var titleIndex = PlayerPrefs.GetString("seeOpenServerActivityStoryGQ" + GameGlobal.userId);
             if (titleIndex == null || titleIndex == "")
             {
-                ViewManager.Show<StoryDialogView>(new object[] { "10151", false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, false }, true);
+                ViewManager.Show<StoryDialogView>(new object[] { "10238", false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, false }, true);
             }
             else
                 ViewManager.Show<OpenServerActivityView>();
@@ -477,7 +477,7 @@ namespace GFGGame
         private static void OnCompletePriorStoryDialog(bool done, object param)
         {
             if (done) { 
-                PlayerPrefs.SetString("seeOpenServerActivityStory" + GameGlobal.userId, "1");
+                PlayerPrefs.SetString("seeOpenServerActivityStoryGQ" + GameGlobal.userId, "1");
                 ViewManager.DeleteViewStackCountDown(null, 1);
                 ViewManager.Show<OpenServerActivityView>();
             }

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

@@ -50,15 +50,16 @@ namespace GFGGame
             _ui.m_DouBaoList.numItems = 10;
 
         }
-        protected override void OnHide()
+        protected async override void OnHide()
         {
+            bool result = await MiniGameProxy.ReqMergeGameNewStyle();
             base.OnHide();
         }
 
         private void RenderAFuList(int index, GObject obj)
         {
             UI_MergeGamematerialItem item = UI_MergeGamematerialItem.Proxy(obj);
-            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res,index+11)[0].resName,"MergeGame");
+            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res,index+11).resName,"MergeGame");
             if( (index+1) % 5 == 0)
             {
                 item.m_right.visible = false;
@@ -67,13 +68,34 @@ 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;
+            }
+            if (index % 5 == 0)
+            {
+                item.m_c1.selectedIndex = 0;
+            }
+
             UI_MergeGamematerialItem.ProxyEnd();
         }
         private void RenderDouBaoList(int index,GObject obj)
         {
             UI_MergeGamematerialItem item = UI_MergeGamematerialItem.Proxy(obj);
-            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, index+1)[0].resName, "MergeGame");
+            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, index+1).resName, "MergeGame");
             if ((index + 1) % 5 == 0)
             {
                 item.m_right.visible = false;
@@ -82,14 +104,35 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnClickItem);
             }
-            item.target.data = index + 1 + 10;
+            item.target.data = index + 1;
+            int id = index + 1;
+            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;
+            }
+            if (index % 5 == 0)
+            {
+                item.m_c1.selectedIndex = 0;
+            }
             UI_MergeGamematerialItem.ProxyEnd();
         }
         private void OnClickItem(EventContext context)
         {
             int index = (int)(context.sender as GObject).data;
-            _ui.m_name.text = index.ToString();
-            _ui.m_desc.text = index.ToString();
+            MergeCfg mergeCfg = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(MiniGameDateManager.Instance.MergeGameMatType, index);
+            _ui.m_name.text = mergeCfg.name;
+            _ui.m_desc.text = mergeCfg.desc;
         }
     }
 }

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

@@ -10,8 +10,11 @@ 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 bool canBtn = true;
         private List<List<int>> idList = new List<List<int>>();
         private int itemNum;
         private int maxLv;
@@ -26,6 +29,7 @@ namespace GFGGame
         private float startY;
         private int indexX;
         private int indexY;
+        private float waitBtnTime = 0.5f;
 
         //当前任务id；后台获取数据
         private int taskId;
@@ -36,6 +40,11 @@ namespace GFGGame
 
         public override void Dispose()
         {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -51,7 +60,8 @@ namespace GFGGame
             _ui = UI_MergeGameUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
+            isReturnView = 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);
@@ -59,15 +69,22 @@ namespace GFGGame
             _ui.m_sellBtn.target.onClick.Add(OnClickSellBtn);
             _ui.target.onClick.Add(OnClickHideTips);
             _ui.m_btnProp.target.onClick.Add(OnItemTips);
+            _ui.m_rewardIcon.onClick.Add(OnClickIconItem);
         }
         protected override void OnShown()
         {
             base.OnShown();
+            _valueBarController.OnShown();
             //进入这个界面的时候向后台获取任务id和历史id列表
+            idList = MiniGameDateManager.Instance.GetIdListToLL();
+            canBtn = true;
+            waitBtnTime = 0.5f;
             UpdateView();
             UpdateList();
             UpdateTask();
             UpdateItemData();
+            _ui.m_guildDouBaoBtn.target.touchable = false;
+            //Timers.inst.AddUpdate(CheckGuide);
         }
         protected override void OnHide()
         {
@@ -75,73 +92,96 @@ namespace GFGGame
             {
                 for (int j = 0; j < itemNum; j++)
                 {
+                    itemList[i][j].GetChild("icon").icon = "";
                     itemList[i][j].Dispose();
                     itemList[i][j] = null;
                 }
             }
             idList.Clear();
             itemList.Clear();
+            _ui.m_rangeDown.RemoveChildren();
+            Timers.inst.Remove(UpdateBtnTimer);
+            _valueBarController.OnHide();
             base.OnHide();
         }
-        private void UpdateData()
+        protected override void AddEventListener()
         {
-
+            base.AddEventListener();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void UpdateBtnTimer(object param)
+        {
+            canBtn = true;
+            Timers.inst.Remove(UpdateBtnTimer);
         }
         private void UpdateView()
         {
             itemNum = 5;
             taskId = MiniGameDateManager.Instance.taskID;
-            _res = MergeGameArray.Instance.GetCfg(taskId).resArr[0];
+            MergeGame mergeCfg = MergeGameArray.Instance.GetCfg(taskId);
+            propID = mergeCfg.comsumeBuyArr[0][0];
+            int sellId = mergeCfg.bonusWinArr[0][0];
+            _valueBarController.UpdateList(new List<int>() { propID, sellId });
+            _res = MergeGameArray.Instance.GetCfg(taskId).resType;
             maxLv = 5;
             materialID = 0;
             rand = new System.Random();
             _ui.m_rewardGet.visible = false;
             _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+            _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
             //_ui.m_newMaterial.target.visible = false;
             _ui.m_name.text = "";
             _ui.m_desc.text = ""; 
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("jbnf_xyxbj");
+            ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(propID);
+            _ui.m_doubaoicon.url = ResPathUtil.GetIconPath(itemcfg.res,"png");
+            _ui.m_afuicon.url = ResPathUtil.GetIconPath(itemcfg.res, "png");
         }
         private void UpdateList()
         {
             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)
                         {
-                            itemList[i][j].GetChild("icon").icon = "ui://MiniGame/jbnf_doubao_icon";
-                            itemList[i][j].onClick.Add(OnClickAFuBtn);
+                            guideAfuBtn = itemList[i][j];
+                            itemList[i][j].GetChild("icon").icon = "ui://MiniGame/doubao_txkicon";
+                            itemList[i][j].onClick.Add(OnClickDouBaoBtn);
                             continue;
                         }
                         if ( j == itemNum - 1)
                         {
-                            itemList[i][j].GetChild("icon").icon = "ui://MiniGame/jbnf_afu_icon";
-                            itemList[i][j].onClick.Add(OnClickDouBaoBtn);
+                            guideAfuBtn = itemList[i][j];
+                            itemList[i][j].GetChild("icon").icon = "ui://MiniGame/afu_txkicon";
+                            itemList[i][j].onClick.Add(OnClickAFuBtn);
                             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;
@@ -158,7 +198,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, idList[i][j])[0].resName, "MergeGame");
+                        itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, idList[i][j]).resName, "MergeGame");
                     }
                 }
             }
@@ -175,10 +215,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;
@@ -192,11 +232,11 @@ namespace GFGGame
                 itemList[indexX][indexY].GetChild("icon").icon = "";
                 idList[endIndexX][endIndexY] = itemEndInfo + 1;
                 itemList[endIndexX][endIndexY].data = itemEndInfo + 1;
-                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, itemEndInfo + 1)[0].resName, "MergeGame");
+                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, itemEndInfo + 1).resName, "MergeGame");
                 ShowNewMaterialView(endIndexX, endIndexY);
-                 UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[endIndexX][endIndexY]);
-                itemUI.m_t0.Play();
-                UI_MergeGameItemUI.ProxyEnd();
+                //UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[endIndexX][endIndexY]);
+                //itemUI.m_t0.Play();
+                //UI_MergeGameItemUI.ProxyEnd();
 
                 if(InspectionTasks())
                 {
@@ -206,6 +246,16 @@ namespace GFGGame
                 {
                     _ui.m_rewardGet.visible = false;
                 }
+                _ui.m_name.text = "";
+                _ui.m_desc.text = "";
+                _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
+                _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+                materialID = 0;
+                bool result = await MiniGameProxy.ReqMergeGame(itemEndInfo, itemEndInfo, afterIDList, MiniGameDateManager.Instance.GetListByll(idList));
+                if(result)
+                {
+                    idList = MiniGameDateManager.Instance.GetIdListToLL();
+                }
             }
             if (itemEndInfo != indexID && itemEndInfo == 0)
             {
@@ -214,7 +264,19 @@ namespace GFGGame
                 itemList[indexX][indexY].GetChild("icon").icon = "";
                 idList[endIndexX][endIndexY] = indexID;
                 itemList[endIndexX][endIndexY].data = indexID;
-                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, indexID)[0].resName, "MergeGame");
+                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, indexID).resName, "MergeGame");
+
+                _ui.m_name.text = "";
+                _ui.m_desc.text = "";
+                _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
+                _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+                materialID = 0;
+
+                bool result = await MiniGameProxy.ReqMergeGame(indexID, itemEndInfo, afterIDList, MiniGameDateManager.Instance.GetListByll(idList));
+                if(result)
+                {
+                    idList = MiniGameDateManager.Instance.GetIdListToLL();
+                }
 
                 itemEndInfo = indexID;
                 indexID = 0;
@@ -239,6 +301,7 @@ namespace GFGGame
 
             _ui.m_rangeTop.RemoveChild(item);
             _ui.m_rangeDown.AddChild(item);
+
         }
 
         private void OnClickItem(EventContext context)
@@ -252,41 +315,61 @@ namespace GFGGame
             indexY = Math.Min(itemNum - 1, (int)(item.x / (_ui.m_rangeDown.width / 5)));
             indexX = Math.Min(itemNum - 1, (int)(item.y / (_ui.m_rangeDown.height / 5)));
             materialID = id;
-            _ui.m_name.text = id.ToString();
-            _ui.m_desc.text = id.ToString();
-            ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, id)[0].bonusSellArr[0][0]);
-            _ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetCommonGameResPath(itemReward.res);
-            _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, id)[0].bonusSellArr[0][1].ToString();
+            MergeCfg mergeCfg = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(MiniGameDateManager.Instance.MergeGameMatType,id);
+            _ui.m_name.text = mergeCfg.name;
+            _ui.m_desc.text = mergeCfg.desc;
+            ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][0]);
+            _ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetIconPath(itemReward.res,"png");
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][1].ToString();
 
         }
-
-        private void OnClickSellBtn()
+        private void OnClickIconItem(EventContext context)
+        {
+            int id = MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][0];
+            GoodsItemTipsController.ShowItemTips(id);
+        }
+        private async void OnClickSellBtn()
         {
             if(materialID == 0)
             {
                 return;
             }
-            //移除
-            _ui.m_name.text = "";
-            _ui.m_desc.text = "";
-            _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
-            _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
-            materialID = 0;
-            idList[indexX][indexY] = 0;
-            itemList[indexX][indexY].data = 0;
-            UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[indexX][indexY]);
-            itemUI.m_t2.Play();
-            itemUI.m_t3.Play();
-            UI_MergeGameItemUI.ProxyEnd();
-            indexX = 0;
-            indexY = 0;
-            //获得奖励
+            int index = indexX * itemNum + indexY;
+            if(index >= 20)
+            {
+                index = index - 1;
+            }
+            bool result = await MiniGameProxy.ReqMergeGameSellBtn(materialID, index);
+            if(result)
+            {
+                //移除
+                _ui.m_name.text = "";
+                _ui.m_desc.text = "";
+                _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
+                _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+                materialID = 0;
+                idList[indexX][indexY] = 0;
+                itemList[indexX][indexY].data = 0;
+                UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[indexX][indexY]);
+                itemUI.m_t2.Play();
+                itemUI.m_t3.Play();
+                UI_MergeGameItemUI.ProxyEnd();
+                indexX = 0;
+                indexY = 0;
+                //获得奖励
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
+                UpdateTask();
+            }
         }
-        private void OnClickAFuBtn()
+        private async void OnClickAFuBtn()
         {
+            if (!canBtn)
+            {
+                return;
+            }
+            canBtn = false;
+            Timers.inst.Add(waitBtnTime, 1,UpdateBtnTimer);
             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 +383,59 @@ namespace GFGGame
             }
             if (!gameOver)
             {
+                PromptController.Instance.ShowFloatTextPrompt("没有存放空间！");
                 return;
             }
-            if(MergeGameArray.Instance.GetCfg(taskId).materialId1Arr.Length > 1)
-            {
-                isRand = true;
-            }
-            else
-            {
-                isRand = false;
-                materialID = MergeGameArray.Instance.GetCfg(taskId).materialId1Arr[0];
-            }
-            while (true)
+            bool result = await MiniGameProxy.ReqMergeGameBtn(2,taskId);
+            if(result)
             {
-                int x = rand.Next(0, itemNum);
-                int y = rand.Next(0, itemNum);
-                int num;
-                int randNum = rand.Next(0, 2);
-                if (randNum == 0)
+                int x = MiniGameDateManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] / itemNum;
+                int y = MiniGameDateManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] % itemNum;
+                int num = MiniGameDateManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[0];
+                //if (idList[x][y] == 0)
+                if (x == 4)
                 {
-                    num = 1;
-                }
-                else
-                {
-                    num = 6;
-                }
-                if(!isRand)
-                { 
-                   num = materialID;
+                    if(y == 0)
+                    {
+                        y = 1;
+                    }
+                    else if(y == 1)
+                    {
+                        y = 2;
+                    }
+                    else if(y == 2)
+                    {
+                        y = 3;
+                    }   
                 }
-                if (idList[x][y] == 0)
+                else if (x == 4 && y == 4)
                 {
-                    idList[x][y] = num;
-                    itemList[x][y].data = num;
-                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_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;
+                    y = 3;
                 }
+
+                idList[x][y] = num;
+                itemList[x][y].data = num;
+                itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, num).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
+            {
             }
         }
-        private void OnClickDouBaoBtn()
+        private async void OnClickDouBaoBtn()
         {
+            if(!canBtn)
+            {
+                return;
+            }
+            canBtn = false;
+            Timers.inst.Add(waitBtnTime, 1, UpdateBtnTimer);
             bool gameOver = false;
-            bool isRand = false;
-            int materialID = 0;
             for (int i = 0; i < itemNum; i++)
             {
                 for (int j = 0; j < itemNum; j++)
@@ -360,54 +449,66 @@ 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;
-            }
-            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)
+                int x = MiniGameDateManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] / itemNum;
+                int y = MiniGameDateManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[1] % itemNum;
+                int num = MiniGameDateManager.Instance.GetIDListByString(MiniGameDateManager.Instance.ItemIdVPosition)[0];
+                //if (idList[x][y] == 0)
+                if(x == 4)
                 {
-                    num = materialID;
+                    if (y == 0)
+                    {
+                        y = 1;
+                    }
+                    else if (y == 1)
+                    {
+                        y = 2;
+                    }
+                    else if (y == 2)
+                    {
+                        y = 3;
+                    }
                 }
-                if (idList[x][y] == 0)
+                else if(x== 4 && y== 4)
                 {
-                    idList[x][y] = num;
-                    itemList[x][y].data = num;
-                    itemList[x][y].draggable = true;
-                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, num)[0].resName, "MergeGame");
-                    UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
-                    itemUI.m_t1.Play();
-                    UI_MergeGameItemUI.ProxyEnd();
-                    break;
+                    y = 3;
                 }
+                    
+                idList[x][y] = num;
+                itemList[x][y].data = num;
+                itemList[x][y].draggable = true;
+                itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, num).resName, "MergeGame");
+                UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
+                itemUI.m_t1.Play();
+                UI_MergeGameItemUI.ProxyEnd();
+                    
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
+            }
+            else
+            {
             }
         }
 
         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);
+            _ui.m_rewardIcon.url = ResPathUtil.GetIconPath(itemReward.res,"png");
             for (int k = 0; k < MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
             {
                 int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
@@ -417,12 +518,12 @@ namespace GFGGame
                     case 0:
                         _ui.m_rewardOne.target.visible = true;
                         _ui.m_rewardTwo.target.visible = false;
-                        _ui.m_rewardOne.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, targetID)[0].resName, "MergeGame");
+                        _ui.m_rewardOne.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, targetID).resName, "MergeGame");
                         _ui.m_rewardOne.m_Count.text = targetNum.ToString();
                         break;
                     case 1:
                         _ui.m_rewardTwo.target.visible = true;
-                        _ui.m_rewardTwo.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, targetID)[0].resName, "MergeGame");
+                        _ui.m_rewardTwo.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, targetID).resName, "MergeGame");
                         _ui.m_rewardTwo.m_Count.text = targetNum.ToString();
                         break;
                     default:
@@ -437,45 +538,79 @@ namespace GFGGame
             {
                 _ui.m_rewardGet.visible = false;
             }
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+            _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
+            _ui.m_name.text = "";
+            _ui.m_desc.text = "";
+            materialID = 0;
         }
-        //提交任务
-        private void SubmitTask()
+        private void UpdateShowList()
         {
-            for(int k =  0;k< MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
+            for (int i = 0; i < itemNum; i++)
             {
-                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++)
                 {
-                    for (int j = 0; j < itemNum; j++)
+                    itemList[i][j].data = idList[i][j];
+                    if (idList[i][j] == 0)
                     {
-                        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;
-                            }
-                        }
+                        itemList[i][j].GetChild("icon").icon = "";
                     }
-                    if (targetNum == 0)
+                    else if (idList[i][j] > 0)
                     {
-                        break;
+                        itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, idList[i][j]).resName, "MergeGame");
                     }
                 }
             }
-            //向后台发送任务ID,获得奖励
-            //taskId = MiniGameDateManager.Instance.taskID;
-            //暂用
-            taskId++;
-            //
-            UpdateTask();
+        }
+        //提交任务
+        private async void SubmitTask()
+        {
+            if (!InspectionTasks())
+            {
+                PromptController.Instance.ShowFloatTextPrompt("提交材料不足！");
+                return;
+            }
+            bool result = await MiniGameProxy.ReqMergeGameLevelPass(taskId);
+            if(result)
+            {
+                //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();
+                UpdateShowList();
+            }
+            else
+            {
+            }
         }
         //检查是否达到提交要求
         private bool InspectionTasks()
@@ -518,15 +653,15 @@ namespace GFGGame
         private void ShowNewMaterialView(int i ,int j)
         {
             //判断是否是新材料。再显示
-
+            if(MiniGameDateManager.Instance.NewItemIdDic.ContainsKey(idList[i][j]))
+            {
+                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;
-            _ui.m_newMaterial.target.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, idList[i][j])[0].resName,"MergeGame");
-            UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(_ui.m_newMaterial.target);
-            itemUI.m_t0.Play();
-            UI_MergeGameItemUI.ProxyEnd();
-           
+            _ui.m_newMaterial.target.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, idList[i][j]).resName,"MergeGame");
+            _ui.m_newMaterial.m_t0.Play();         
         }
         private void OnClickHideTips()
         {
@@ -544,23 +679,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.title = item.num.ToString();
-            }
-            else
-            {
-                _ui.m_btnProp.target.title = "0";
-            }
+        {
+            _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)
+        //    {
+        //        UpdateCheckGuide(null);
+        //    }
+        //    else
+        //    {
+        //        Timers.inst.Remove(CheckGuide);
+        //    }
+        //}
+        //protected void UpdateCheckGuide(object param)
+        //{
+        //    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);
+        //}
     }
 }

GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope/NewYearRedEnvelopeView.cs

@@ -118,7 +118,7 @@ namespace GFGGame
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DDHHmm(time);
-            _ui.m_txtTime.text = "µÚÒ»Ì죺" + strTime;
+            _ui.m_txtTime.text = strTime;
             UI_Button1 btn = UI_Button1.Proxy(_ui.m_btnDoubleGet.target);
             btn.m_txtTime.text = strTime;
             UI_Button1.ProxyEnd();

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
 {
@@ -45,37 +46,43 @@ namespace GFGGame
             isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnHeaven.onClick.Add(OnClickBtnHeaven);
-            _ui.m_btnMingTong.onClick.Add(OnClickBtnMingTong);
-            _ui.m_btnAnswerTianmen.onClick.Add(OnClickBtnAnswerTianmen);
+            _ui.m_btnHeaven.target.onClick.Add(OnClickBtnHeaven);
+            _ui.m_btnMingTong.target.onClick.Add(OnClickBtnMingTong);
+            _ui.m_btnAnswerTianmen.target.onClick.Add(OnClickBtnAnswerTianmen);
             _ui.m_btnTenShu.onClick.Add(OnClickBtnTenShu);
-            _ui.m_btnNineZhouPool.onClick.Add(OnClickBtnNineZhouPool);
+            _ui.m_btnNineZhouPool.target.onClick.Add(OnClickBtnNineZhouPool);
             _ui.m_buttonNewYearLogin.onClick.Add(OnClickButtonNewYearLogin);
             AddEffect();
         }
 
         private void AddEffect()
         {
-            _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");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBg, "ui_Activity", "JXWJ_All_tx/JXWJ_All_tx");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_Activity", "JXWJ_Text/JXWJ_Text");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_holderFog, "ui_Activity", "JXWJ_Button/JXWJ_Button");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("Tx_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
+            _ui.m_buttonNewYearLogin.visible = false;
             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()
@@ -102,10 +109,10 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTenShu, (RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetMeiRiTeHuiRed()), "", -100, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen, RedDotDataManager.Instance.GetOpenServerStoryRed(), "", -80, 100);
-            RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTenShu, (RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetMeiRiTeHuiRed()), "");
+            //RedDotController.Instance.SetComRedDot(_ui.m_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen.target, RedDotDataManager.Instance.GetOpenServerStoryRed(), "");
+            //RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
         }
 
         private void UpdateTime(object param)
@@ -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()
@@ -147,22 +151,29 @@ namespace GFGGame
         private void OnClickBtnHeaven()
         {
             //小游戏入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<GameStartView>();
+            _ui.m_btnHeaven.m_t0.Play(() => {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<MergeGameView>();
+            });
         }
 
         private void OnClickBtnMingTong()
         {
             //副本入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            _ui.m_btnMingTong.m_t0.Play(() =>
+            {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            });
         }
 
         private void OnClickBtnAnswerTianmen()
         {
             //剧情入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            _ui.m_btnAnswerTianmen.m_t0.Play(()=> {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            });
         }
 
         private void OnClickBtnTenShu()
@@ -173,8 +184,11 @@ namespace GFGGame
 
         private void OnClickBtnNineZhouPool() 
         {
-            if(JudgeActivityExpire())
-                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            _ui.m_btnNineZhouPool.m_t0.Play(()=> {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            });
+
         }
 
         private void OnClickButtonNewYearLogin()
@@ -193,5 +207,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;
+        }
     }
 }

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

@@ -51,7 +51,7 @@ namespace GFGGame
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerFightView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_sdcy_gq");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(_activityCfg.params3Arr[0]);

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

@@ -60,11 +60,11 @@ namespace GFGGame
         {
             base.OnShown();
             _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() {  ConstItemID.GET_TICKETS });
+            _valueBarController.UpdateList(new List<int>() {  3008010 });
             _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();