Эх сурвалжийг харах

修改寻奇访胜的时间显示;领取奖励界面的背景显示

leiyasi 1 жил өмнө
parent
commit
7d1536891e

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComPostcard.cs

@@ -10,6 +10,7 @@ namespace UI.Travel
         public UI_ComTravel m_comTravel;
         public GTextField m_txtLocationName;
         public GTextField m_txtTime;
+        public Transition m_t0;
         public const string URL = "ui://jitclg1gwono1d";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "ComPostcard";
@@ -60,6 +61,7 @@ namespace UI.Travel
             m_comTravel = (UI_ComTravel)UI_ComTravel.Create(comp.GetChild("comTravel"));
             m_txtLocationName = (GTextField)comp.GetChild("txtLocationName");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -67,6 +69,7 @@ namespace UI.Travel
             m_comTravel = null;
             m_txtLocationName = null;
             m_txtTime = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelRewardUI.cs

@@ -12,6 +12,7 @@ namespace UI.Travel
         public GButton m_btnGet;
         public Transition m_t0;
         public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://jitclg1gwono2";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelRewardUI";
@@ -64,6 +65,7 @@ namespace UI.Travel
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,6 +75,7 @@ namespace UI.Travel
             m_btnGet = null;
             m_t0 = null;
             m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelTimeDetailUI.cs

@@ -16,6 +16,7 @@ namespace UI.Travel
         public GLoader m_iconSpeedUpSpend;
         public GTextField m_numSpeedUpSpend;
         public GComponent m_comValueBar;
+        public GLoader m_spend;
         public const string URL = "ui://jitclg1gghq1110";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelTimeDetailUI";
@@ -72,6 +73,7 @@ namespace UI.Travel
             m_iconSpeedUpSpend = (GLoader)comp.GetChild("iconSpeedUpSpend");
             m_numSpeedUpSpend = (GTextField)comp.GetChild("numSpeedUpSpend");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
+            m_spend = (GLoader)comp.GetChild("spend");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +86,7 @@ namespace UI.Travel
             m_iconSpeedUpSpend = null;
             m_numSpeedUpSpend = null;
             m_comValueBar = null;
+            m_spend = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelRewardView.cs

@@ -28,7 +28,6 @@ namespace GFGGame
             _ui = UI_TravelRewardUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelTimeDetailView.cs

@@ -47,6 +47,7 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(spendItemID);
             _ui.m_iconFinishSpend.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
             _ui.m_iconSpeedUpSpend.url = _ui.m_iconFinishSpend.url;
+            _ui.m_spend.url = _ui.m_iconFinishSpend.url;
         }
 
         protected override void OnShown()

+ 6 - 7
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -133,13 +133,12 @@ namespace GFGGame
                 UpdateView();
             }
 
-            // 如果大于1分钟,则显示上少1s
-            if(endTime - curTime > 60000)
-            {
-                endTime -= 1000;
-            }
-
-            _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(curTime, endTime));
+            //// 如果大于1分钟,则显示上少1s
+            //if(endTime - curTime > 60000)
+            //{
+            //    endTime -= 1000;
+            //}
+            _ui.m_txtTime.text = string.Format("预计{0}后归来", TimeUtil.FormattingTimeTo_HHmmss(endTime - curTime));
         }
 
         private void OnBtnBackClick()

BIN
GameClient/Assets/ResIn/UI/InstanceZones/InstanceZones_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes