From 04cd0b85993f307b72d57ece481abdf54cdb87d0 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 19 Mar 2021 14:37:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E9=99=90=E6=97=B6=E7=A5=9E?= =?UTF-8?q?=E8=A3=85=E3=80=91=E8=B5=84=E6=BA=90=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...g => r_zjm_huodongicon-xianshishenzhuang_zh.png} | Bin ...r_zjm_huodongicon-xianshishenzhuang_zh.png.meta} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Assets/ManagedResources/Atlas/MainAtlas/ArtFont/{r_zjm_huodongicon-xianshishenzhuang.png => r_zjm_huodongicon-xianshishenzhuang_zh.png} (100%) rename Assets/ManagedResources/Atlas/MainAtlas/ArtFont/{r_zjm_huodongicon-xianshishenzhuang.png.meta => r_zjm_huodongicon-xianshishenzhuang_zh.png.meta} (100%) diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang.png rename to Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang.png.meta rename to Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png.meta From f30186c57eaae4cfb0c17b7e509c31d0004dbe50 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 19 Mar 2021 16:18:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=94=B9=E6=88=90=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityGift/OpenSeverWelfarePanel.lua | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua index b742ab0ae8..54b34c71fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua @@ -108,6 +108,7 @@ function this.SingleDataShow(go,rewardData) end end local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton") + local text = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton/Text"):GetComponent("Text") Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(false) local qianwangButton = Util.GetGameObject(activityRewardGo.gameObject, "qianwangButton") local getFinishText = Util.GetGameObject(activityRewardGo.gameObject, "getFinishText") @@ -116,9 +117,19 @@ function this.SingleDataShow(go,rewardData) local state = rewardData.state local value = sConFigData.Values[1][1] local isPass = FightPointPassManager.IsFightPointPass(value) - lingquButton:SetActive(state == 0 and isPass) + lingquButton:SetActive(isPass) qianwangButton:SetActive(state == 0 and not isPass) - getFinishText:SetActive(state == 1) + if state == 1 then + text.text = Language[10101] + Util.SetGray(lingquButton,true) + lingquButton:GetComponent("Button").interactable = false + else + text.text = Language[11948] + Util.SetGray(lingquButton,false) + lingquButton:GetComponent("Button").interactable = true + end + -- getFinishText:SetActive(state == 1) + getFinishText:SetActive(false) needGetUpText:SetActive(state == 0) if isShowNeedGetUpTextId == 0 and state == 0 or isShowNeedGetUpTextId == rewardData.missionId then isShowNeedGetUpTextId = rewardData.missionId From dfb4de8811d8009c439188ff92fe7b6bcf362a59 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 19 Mar 2021 16:30:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E9=99=90=E6=97=B6=E7=A5=9E?= =?UTF-8?q?=E8=A3=85=E3=80=91=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 6df4652a70..02531e100f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1001,7 +1001,7 @@ function this.TimeFormat() local time = limitSkinGift.endTime - GetTimeStamp() if time > 0 then activityTabs[k].go.gameObject:SetActive(true) - activityTabs[k].timeText.text = TimeToHMS(time) + activityTabs[k].timeText.text = TimeToFelaxible(time) local canGet = BagManager.GetTotalItemNum(1221) > 0 and BagManager.GetTotalItemNum(1222) > 0 and BagManager.GetTotalItemNum(1223) > 0 and BagManager.GetTotalItemNum(1224) > 0 activityTabs[k].redpot:SetActive(canGet) From 0adef18b301733949d62f7a62e2d56a022d5e9a6 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 19 Mar 2021 17:05:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E3=80=91=E6=88=98=E6=96=97=E7=BB=93=E6=9D=9F=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattleBestPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua index f5cb396bd3..176b5a2e59 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleBestPopup.lua @@ -43,7 +43,7 @@ function this:OnOpen(heroTId,skinId, damageValue, allDamage, func,_func2) this.liveName = GetResourcePath(heroTData.Live) this.liveNode = poolManager:LoadLive(this.liveName, this.firstRole.transform, Vector3.one * heroTData.Scale, Vector3.New(heroTData.Position[1], heroTData.Position[2])) - this.liveNode.transform.sizeDelta = Vector2.New(1000, 1000) + this.liveNode.transform.sizeDelta = Vector2.New(10, 10) local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic") local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)