zhangyuqian 1 жил өмнө
parent
commit
f3c640aab5
35 өөрчлөгдсөн 9 нэмэгдсэн , 8 устгасан
  1. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs
  2. 4 3
      GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs
  3. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs
  4. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png
  5. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png
  6. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png
  7. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png
  8. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10!a.png
  9. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_10.png
  10. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png
  11. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png
  12. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6.png
  14. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_7.png
  16. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_8.png
  18. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_9.png
  20. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_fui.bytes
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  31. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  32. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  33. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  34. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  35. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -80,7 +80,7 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
 
             //_comEff = new GComponent();
             //_comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
@@ -138,7 +138,7 @@ namespace GFGGame
             UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
             valueBar.m_c1.selectedIndex = 12;
             UI_ComponentValueBar.ProxyEnd();
-            _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+            _valueBarController.UpdateList(new List<int>() { ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
             _ui.m_selectChapter.visible = false;
             _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;
@@ -200,12 +200,12 @@ namespace GFGGame
             currentDifficulty = chapterCfg.type;
             if (currentDifficulty == 1)
             {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
             }
             else
             {
                 currentDifficulty = 0;
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ksxy_gq_bj");
             }
             //_comEff.visible = false;
             //_effFirst.visible = false;

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

@@ -51,7 +51,7 @@ namespace GFGGame
             ItemCfg costItem = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0]);
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -141,7 +141,7 @@ namespace GFGGame
         {
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -149,7 +149,8 @@ namespace GFGGame
             {
                 num = 0;
             }
-            _ui.m_num.text = "金元宝:" + num;
+            ItemCfg item = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0]);
+            _ui.m_num.text = item.name+ ":" + num;
         }
 
     }

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

@@ -45,7 +45,7 @@ namespace GFGGame
         {
             base.OnShown();
             ReqInfo();
-            _ui.m_time.visible = false;
+            //_ui.m_time.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
         }

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_6!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_6.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!a.png


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


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


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


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


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


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


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


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.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_atlas0_9!a.png


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


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