فهرست منبع

摘星抽奖提示显示修改

huangxiaoyue 1 سال پیش
والد
کامیت
f9eae221a6
38فایلهای تغییر یافته به همراه11 افزوده شده و 7 حذف شده
  1. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs
  2. 2 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  3. 6 6
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  4. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  5. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  6. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  7. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  8. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  9. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  10. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  11. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  12. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  13. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png
  15. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png
  17. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png
  19. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  31. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  32. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  33. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  34. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  35. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  36. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  37. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  38. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -23,6 +23,7 @@ namespace UI.LuckyBox
         public GTextField m_txtCount;
         public GTextField m_txtHasTime;
         public GGroup m_grpActivityTips;
+        public GLoader m_ImgUp;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -86,6 +87,7 @@ namespace UI.LuckyBox
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtHasTime = (GTextField)comp.GetChild("txtHasTime");
             m_grpActivityTips = (GGroup)comp.GetChild("grpActivityTips");
+            m_ImgUp = (GLoader)comp.GetChild("ImgUp");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +110,7 @@ namespace UI.LuckyBox
             m_txtCount = null;
             m_txtHasTime = null;
             m_grpActivityTips = null;
+            m_ImgUp = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
                 LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
             }
 
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];  //默认跳转进来是第二个活动
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];  //默认跳转进来是第一个活动
             if (this.viewData != null)
             {
                 int index = (int)this.viewData;  //传入的值为第几个活动,不是活动id
@@ -174,6 +174,7 @@ namespace GFGGame
             else
                 _listActivityBtnObj[boxId] = obj;
 
+            comBox.m_ImgUp.visible = index == 0;
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2)
             {

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -963,14 +963,14 @@ namespace GFGGame
 
         private void CheckProbabilityUp()
         {
-            long curTime = TimeHelper.ServerNow();
-            long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
+            //long curTime = TimeHelper.ServerNow();
+            //long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
             //int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             //if (activityId > 0)
-            if (endTime >= curTime)
-                _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
-            else
-                _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;
+            //if (endTime >= curTime)
+            //    _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 1;
+            //else
+            //    _ui.m_btnZhaiXing.m_ProbabilityUpType.selectedIndex = 0;
         }
 
         private void CheckGuide(object param)

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_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_11!a.png


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


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


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


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


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


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


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


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


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


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.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