合成补充提交

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

@@ -465,12 +465,12 @@ namespace GFGGame
 
         private void OnClickBtnOpenServerActivity()
         {
-            var titleIndex = PlayerPrefs.GetString("seeOpenServerActivityStoryGQ" + GameGlobal.userId);
-            if (titleIndex == null || titleIndex == "")
-            {
-                ViewManager.Show<StoryDialogView>(new object[] { "10151", false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, false }, true);
-            }
-            else
+            //var titleIndex = PlayerPrefs.GetString("seeOpenServerActivityStoryGQ" + GameGlobal.userId);
+            //if (titleIndex == null || titleIndex == "")
+            //{
+            //    ViewManager.Show<StoryDialogView>(new object[] { "10151", false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, false }, true);
+            //}
+            //else
                 ViewManager.Show<OpenServerActivityView>();
         }
 

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

@@ -296,6 +296,7 @@ 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;
+            MergeCfg mergeCfg = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(MiniGameDateManager.Instance.MergeGameMatType,id);
             _ui.m_name.text = id.ToString();
             _ui.m_desc.text = id.ToString();
             ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][0]);

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

@@ -66,9 +66,9 @@ namespace GFGGame
         {
             base.OnShown();
             _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);