Selaa lähdekoodia

七日来复活动

zhangyuqian 1 vuosi sitten
vanhempi
commit
e06fc98343
22 muutettua tiedostoa jossa 3 lisäystä ja 2 poistoa
  1. 2 1
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs
  2. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs
  3. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png
  4. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png
  5. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png
  6. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png
  7. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png
  8. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png
  9. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png
  10. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png
  11. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png
  12. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png
  13. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png
  15. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png
  17. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_fui.bytes
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 2 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -247,7 +247,8 @@ namespace GFGGame
         //招财进宝活动
         public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
         {
-            ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(5006).paramsArr[0];
+            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            ActivityDataManager.Instance.activityZCJBId = ActivityOpenCfgArray.Instance.GetCfg(activityID).paramsArr[0];
             S2C_GetDressRewrdStatusList response = null;
             response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = id });
             if (response != null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -124,7 +124,7 @@ namespace GFGGame
             UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(_ui.m_List.GetChildAt(itemCfg - 1));
             if (item.m_RewardBtn.m_c1.selectedIndex == 1)
             {
-                bool result = await ActivitySProxy.ReqActivityZCJBReward(5006, itemCfg);
+                bool result = await ActivitySProxy.ReqActivityZCJBReward(ActivityDataManager.Instance.GetCurOpenActiveByType(17), itemCfg);
                 if (!result) return;
                 GetSuitItemController.TryShow(0);
                 EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);

BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes