From a6b6b2222b2f92199ec917fdb6e13ecf8e4e8573 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 May 2021 11:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2=E5=A4=A9?= =?UTF-8?q?=E3=80=91=E5=A5=96=E5=8A=B1=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab | 2 +- .../~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua | 2 +- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab index a2751adb53..4c87e9d65b 100644 --- a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab @@ -8975,7 +8975,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 92.7, y: -1} + m_AnchoredPosition: {x: 200, y: -1} m_SizeDelta: {x: 85, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4295345761131377981 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index 4abc99e0b3..e1cd548bd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -254,7 +254,7 @@ function this.SwitchView(index) RankingManager.InitData(RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,function() local ranks,myRank = RankingManager.GetRankingInfo() this.SetRankDataShow(ranks,myRank,true) - this.myGuildName.text = PlayerManager.nickName + this.myGuildName.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel) end,nil,1) elseif curIndex == 1 then -- NetManager.RequestRankInfo(RANK_TYPE.GUILD_CAR_DELEAY_GUILD, function(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 1b16747cf3..e1b8ddc477 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -152,6 +152,9 @@ function NiuQiChongTianPanel:SetTime() end local updateTime = function() self.time.text = "剩余时间:"..TimeToFelaxible(tempTime) + if tempTime <= 0 then + self.parent:ClosePanel() + end end updateTime() self.timer = Timer.New(function()