合成补充提交

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

@@ -130,8 +130,9 @@ namespace GFGGame
         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

@@ -301,8 +301,8 @@ namespace GFGGame
             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();
+            _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.GetCommonGameResPath(itemReward.res);
             _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][1].ToString();

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

@@ -109,9 +109,9 @@ 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_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(), "", -80, 100);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen.target, RedDotDataManager.Instance.GetOpenServerStoryRed(), "");
             //RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
         }
 

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

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