招财进宝活动提交

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -23,6 +23,7 @@ namespace UI.Main
         public UI_BtnModle2 m_btnTea;
         public UI_BtnModle2 m_btnOpenServerActivity;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnActivityZCJB;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -106,6 +107,7 @@ namespace UI.Main
             m_btnTea = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnTea"));
             m_btnOpenServerActivity = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnOpenServerActivity"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityZCJB = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZCJB"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -152,6 +154,8 @@ namespace UI.Main
             m_btnOpenServerActivity = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_btnActivityZCJB.Dispose();
+            m_btnActivityZCJB = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();

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

@@ -104,6 +104,7 @@ namespace GFGGame
             {
                 bool result = await ActivitySProxy.ReqActivityZCJBReward(5006, itemCfg);
                 if (!result) return;
+                GetSuitItemController.TryShow(0);
                 UI_ActivityRewardItemUI.ProxyEnd();
                 _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
                 UpdateList();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -212,11 +212,16 @@ namespace GFGGame
             {
                 EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
                 _ui.m_comCostCurrent.visible = true;
+                _ui.m_btnBg.url = "ui://Main/zcjb_zdgktc";
                 UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
                 com.m_c1.selectedIndex = 2;
                 UpdateVisitNum();
                 UI_ComCostCurrency.ProxyEnd();
             }
+            else
+            {
+                _ui.m_btnBg.url = "ui://Main/zx_jq_dituditu";
+            }
             // _ui.m_txtPowerDesc.SetVar("power", "" + levelCfg.power).FlushVars();
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + fightCfg.scoreType;
             if (fightCfg.targetName != null && fightCfg.targetName.Length > 0)

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

@@ -108,6 +108,7 @@ namespace GFGGame
             _ui.m_btnOpenServerActivity.target.onClick.Add(OnClickBtnOpenServerActivity);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
             _ui.m_btnTea.target.onClick.Add(OnClickBtnTea);
+            _ui.m_btnActivityZCJB.target.onClick.Add(OnClickBtnZCJB);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -371,7 +372,10 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityTeaMainView>();
         }
-
+        private void OnClickBtnZCJB()
+        {
+            ViewManager.Show<ActivityZCJBView>();
+        }
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -431,7 +435,6 @@ namespace GFGGame
         private void OnClickBtnHaoYou()
         {
             ViewManager.Show<FriendView>(null, true);
-            //ViewManager.Show<MergeGameView>();
         }
 
         private void OnClickBtnGongGao()
@@ -645,6 +648,7 @@ namespace GFGGame
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityTeaDataManager.Instance.CheckOpen();
+            _ui.m_btnActivityZCJB.target.visible = ActivityTeaDataManager.Instance.CheckOpenOne(17);
         }
 
         private void UpdateTime()
@@ -943,9 +947,15 @@ namespace GFGGame
                 if (redPointUpdateFrame == 19)
                     RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -24, -3);
             }
+            // 招财进宝活动
+            if (_ui.m_btnActivityZCJB.target.visible)
+            {
+                if (redPointUpdateFrame == 20)
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityZCJB.target, ActivityDataManager.Instance.CheckZCJBRed(), "", -20, -3);
+            }
 
             redPointUpdateFrame++;
-            if(redPointUpdateFrame > 20)
+            if(redPointUpdateFrame > 21)
             {
                 redPointUpdateFrame = -1;
             }

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

@@ -99,7 +99,7 @@ namespace GFGGame
                         itemCfg = ItemCfgArray.Instance.GetCfg(3000017);
                         consumeText = "";
                     }
-                    _ui.m_consumeIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                    _ui.m_consumeIcon.url = ResPathUtil.GetIconPath(itemCfg.res,"png");
                     _ui.m_consumeTxt.text = consumeText;
                     break;
                 case 2:
@@ -122,7 +122,7 @@ namespace GFGGame
                         itemCfg = ItemCfgArray.Instance.GetCfg(3000017);
                         consumeText = "";
                     }
-                    _ui.m_consumeIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                    _ui.m_consumeIcon.url = ResPathUtil.GetIconPath(itemCfg.res,"png");
                     _ui.m_consumeTxt.text = consumeText;
                     break;
                 case 3:
@@ -220,7 +220,7 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(MiniGameDateManager.Instance.itemList[index].ConfigId);
             if (itemCfg != null)
             {
-                item.m_icon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res,"png");
                 item.m_Count.text = MiniGameDateManager.Instance.itemList[index].Count.ToString();
             }