浏览代码

摘星抽奖提示显示修改

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. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  5. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  6. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  7. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  8. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  9. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  10. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  11. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  12. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  13. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png
  14. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png
  15. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png
  16. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png
  17. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png
  18. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png
  19. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes
  20. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  21. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  22. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  23. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  24. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png
  25. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png
  26. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  27. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  28. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  29. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  30. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  31. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  32. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  33. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  34. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  35. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  36. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  37. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  38. 二进制
      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)

二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes