From f9d86397af13c87820d52fdea0f0cf032eb393cd Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 30 Sep 2025 20:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AE=BE=E6=90=AD=E9=85=8Dlua?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/Language.lua | 2 +- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 11 ++++++----- .../~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua | 6 +++--- .../~Lua/Modules/RoleInfo/RoleGiftPanel.lua | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index a6ca4f105b..0091a3fed5 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -325,7 +325,7 @@ Language = { [10324] = GetLanguageStrById("副本每周二,四,六,七开启"), [10325] = GetLanguageStrById("驭灵副本"), [10326] = GetLanguageStrById("仙灵副本"), - [10327] = GetLanguageStrById("神将副本"), + [10327] = GetLanguageStrById("礼物副本"), [10328] = GetLanguageStrById("法宝副本"), [10329] = GetLanguageStrById("魂印副本"), [10330] = GetLanguageStrById("简单"), diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index dc3396b571..d268d705e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -15,11 +15,11 @@ local maxForce = 0 --顶部背景图 local titleBg = { --金币 - [1] = { bg = "z_zhaohuan_banner_01", titleImg = Language[10325], titleTip = GetLanguageStrById(specialConfig[41].Value), pos = Vector3.New(257.08, 658.37, 0) }, + [1] = { bg = "z_zhaohuan_banner_01", titleImg = Language[10327], titleTip = GetLanguageStrById(specialConfig[41].Value), pos = Vector3.New(257.08, 658.37, 0) }, --经验 - [2] = { bg = "r_richang_banner_4", titleImg = Language[10326], titleTip = GetLanguageStrById(specialConfig[42].Value), pos = Vector3.New(257.08, 651.24, 0) }, + [2] = { bg = "r_richang_banner_4", titleImg = Language[10325], titleTip = GetLanguageStrById(specialConfig[42].Value), pos = Vector3.New(257.08, 651.24, 0) }, --神将 - [3] = { bg = "r_richang_banner_3_zh", titleImg = Language[10327], titleTip = GetLanguageStrById(specialConfig[43].Value), pos = Vector3.New(257.08, 658.37, 0) }, + [3] = { bg = "z_zhaohuan_banner_03", titleImg = Language[10326], titleTip = GetLanguageStrById(specialConfig[43].Value), pos = Vector3.New(257.08, 658.37, 0) }, --法宝 [4] = { bg = "r_richang_banner_2_zh", titleImg = Language[10328], titleTip = GetLanguageStrById(specialConfig[44].Value), pos = Vector3.New(257.08, 651.24, 0) }, --魂印 @@ -48,8 +48,9 @@ local maxFreeTime = 0 --Tab local TabBox = require("Modules/Common/TabBox") local _TabData = { - [1] = { default = "chall_tab_btn1", select = "chall_tab_btn1", lock = "chall_tab_btn1", name = Language[10309], type = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN }, - [2] = { default = "chall_tab_btn2", select = "chall_tab_btn2", lock = "chall_tab_btn2", name = Language[10310], type = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP }, + [1] = { default = "c_mp_00051_t1", select = "c_mp_00051_t1", lock = "c_mp_00051_t1", name = Language[10327], type = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN }, + [2] = { default = "c_negw_00009_t1", select = "c_negw_00009_t1", lock = "c_negw_00009_t1", name = Language[10309], type = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP }, + [3] = { default = "c_ttjz_00041_s1_t1", select = "c_ttjz_00041_s1_t1", lock = "c_ttjz_00041_s1_t1", name = Language[10310], type = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS }, } function DailyCarbonPanel:InitComponent() diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua index 9f411625b8..9014178590 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua @@ -43,7 +43,7 @@ function GodsWayTowerPanel:InitComponent() local rootHight = this.grid.transform.rect.height local width = this.grid.transform.rect.width this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.grid.transform, - this.pre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, -15)) + this.pre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) this.scrollView.moveTween.MomentumAmount = 1 this.scrollView.moveTween.Strength = 2 -- 挂机奖励 @@ -56,8 +56,8 @@ function GodsWayTowerPanel:InitComponent() this.buyMoppingTimes = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/buyMoppingTimes"):GetComponent( "Text") this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn") - this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank") - this.btnFormation = Util.GetGameObject(self.gameObject, "InfoRoot/btnFormation") + this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRankImg/btnRank") + this.btnFormation = Util.GetGameObject(self.gameObject, "InfoRoot/btnFormationBg/btnFormation") this.btnHelpFightObj = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFightBg") this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFightBg/btnHelpFight") Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFightBg/btnHelpFightText"):GetComponent("Text").text = Language diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua index 4ab61c6fcd..1ca6f89150 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua @@ -433,7 +433,7 @@ function this.SingleItemDataShow(_go, _itemData) redPoint:SetActive(isHave == false and curNum > #allUpIds) this.equipPreList[_go].gameObject:SetActive(true) this.equipPreList[_go].transform:SetAsFirstSibling() - this.equipPreList[_go]:ResetNameColor(Color.New(178 / 255, 85 / 255, 55 / 255, 1)) + this.equipPreList[_go]:ResetNameColor(Color.New(255 / 255, 255 / 255, 255 / 255, 1)) --if itemConfig[_itemData.id].ItemType == ItemType.Equip then this.equipPreList[_go]:OnOpen(false, { _itemData.id, _itemData.num }, 1.1, true, false, false, this.sortingOrder + 1, _itemData.idDyn)