Browse Source

feat 通行证tip修改

Jae 2 years ago
parent
commit
8f4d5b621c

+ 2 - 2
FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="0"/>
   <displayList>
   <displayList>
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
       <relation target="" sidePair="left-right"/>
     </image>
     </image>
     <text id="n19_nd17" name="LeftTime" xy="59,240" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
     <text id="n19_nd17" name="LeftTime" xy="59,240" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
-    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
+    <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
       <relation target="" sidePair="left-left"/>
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
       <ProgressBar value="50" max="100"/>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardUI.cs

@@ -9,6 +9,7 @@ namespace UI.Task
         public GComponent target;
         public GComponent target;
         public Controller m_c1;
         public Controller m_c1;
         public GTextField m_LeftTime;
         public GTextField m_LeftTime;
+        public GButton m_tip;
         public UI_ExpProcess m_LevelProcess;
         public UI_ExpProcess m_LevelProcess;
         public GButton m_btnBuyLevel;
         public GButton m_btnBuyLevel;
         public GButton m_btnOpen;
         public GButton m_btnOpen;
@@ -64,6 +65,7 @@ namespace UI.Task
         {
         {
             m_c1 = comp.GetController("c1");
             m_c1 = comp.GetController("c1");
             m_LeftTime = (GTextField)comp.GetChild("LeftTime");
             m_LeftTime = (GTextField)comp.GetChild("LeftTime");
+            m_tip = (GButton)comp.GetChild("tip");
             m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
             m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
             m_btnBuyLevel = (GButton)comp.GetChild("btnBuyLevel");
             m_btnBuyLevel = (GButton)comp.GetChild("btnBuyLevel");
             m_btnOpen = (GButton)comp.GetChild("btnOpen");
             m_btnOpen = (GButton)comp.GetChild("btnOpen");
@@ -75,6 +77,7 @@ namespace UI.Task
         {
         {
             m_c1 = null;
             m_c1 = null;
             m_LeftTime = null;
             m_LeftTime = null;
+            m_tip = null;
             m_LevelProcess.Dispose();
             m_LevelProcess.Dispose();
             m_LevelProcess = null;
             m_LevelProcess = null;
             m_btnBuyLevel = null;
             m_btnBuyLevel = null;

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -36,6 +36,9 @@ namespace GFGGame
             _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
             _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
             _ui.m_RewardList.SetVirtual();
             _ui.m_RewardList.SetVirtual();
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
+            _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
+            //TODO 替换成新加的
+            _ui.m_tip.data = 300002;
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -210,7 +213,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 Timers.inst.Remove(UpdateTime);
                 return;
                 return;
             }
             }
-            _ui.m_LeftTime.text = TimeUtil.FormattingTime(TimeHelper.ServerNow(), seasonEndTime);
+            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_HHmmss((int)(seasonEndTime - TimeHelper.ServerNow()));
         }
         }
 
 
         private void SetBattlePassLevel()
         private void SetBattlePassLevel()

BIN
GameClient/Assets/ResIn/UI/Task/Task_fui.bytes