From f6afa8fb26b5b54240143ef316947319c2b26e75 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 7 Nov 2022 10:30:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E6=B4=9E=E5=BA=9C=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=E5=8D=87=E7=BA=A7=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua index 174941e9b8..622b03b12d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua @@ -3,7 +3,7 @@ local this = {} local HomeLand = ConfigManager.GetConfig(ConfigName.HomeLand) local HomeLandLevel = ConfigManager.GetConfig(ConfigName.HomeLandLevel) local HomeLandTask = ConfigManager.GetConfig(ConfigName.HomeLandTask) -local price = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1120).Price +--local price = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1120).Price --传入父脚本模块 local parent --传入特效层级 @@ -55,7 +55,7 @@ function this:Refresh() this.text2.text = "每日可使用五次特权加速功能,每次可减少8小时建筑升级时间" this.text3.text = "购买后赠送唤元神符*2以及金币*150万" this.leftTime.text = "购买后持续30天" - this.btnText.text = string.format("%s元",price) + --this.btnText.text = string.format("%s元",price) Util.SetGray(this.btn,false) this.btn:GetComponent("Button").enabled = true local data = PrivilegeManager.GetSerData(4022) From c26cb4a0b983e1c48bec0d964bdb39c1a85b782f Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 7 Nov 2022 10:55:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E7=A7=98?= =?UTF-8?q?=E5=AE=9D=E3=80=91=3D=3D=3D=3D=E6=8F=8F=E8=BF=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index 9a39ba7404..35f797d0ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -108,7 +108,7 @@ function this:OnShow(_parent,...) elseif curType == 4 then --七界秘宝 rewardData,rewardData1 = GeneralTreasureMangaer.GetAllRewardData() this:SetItem(rewardData,rewardData1) - this.tip.text = "·获得1500积分\n·获取1980妖晶,激活进阶专属奖励\n 妖晶奖励通过邮件发送" + this.tip.text = "·获得1500积分\n·获取198万妖晶,激活进阶专属奖励\n 妖晶奖励通过邮件发送" this.dealBtnIma.gameObject:SetActive(false) this.dealBtnText.gameObject:SetActive(true) local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id) From 4d5c9b0e53dc56ab8cfdc593a09a68f3f45f1c48 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 7 Nov 2022 11:54:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A5=9E=E5=8D=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua index 1428b56cae..ce93ca1b63 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua @@ -250,8 +250,9 @@ function GodPrintPopUp:RefreshShow(type) if equipConfig[soulId] then --魂印效果 local txt = "" - if equipConfig[soulId].PassiveSkill then - self.effectText.text = GetLanguageStrById(passiveSkillConfig[equipConfig[soulId].PassiveSkill[1]].Desc) + local pass=equipConfig[soulId].PassiveSkill + if pass~=nil and tonumber(pass[1])~=nil and tonumber(pass[1])~=0 then + self.effectText.text = GetLanguageStrById(passiveSkillConfig[pass[1]].Desc) else if equipConfig[soulId].Property then for index, value in ipairs(equipConfig[soulId].Property) do --propertyconfig