From 59796d72df7f85da280815453d6fcd27825d40c0 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 16 Jan 2024 17:02:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=85=B5=E6=94=B9=E6=88=90=E5=90=8D?= =?UTF-8?q?=E5=88=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 4 ++-- .../~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua | 2 +- .../~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua | 8 ++++---- .../~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua | 4 ++-- .../~Lua/Modules/Popup/RewardItemSingleShowPopup.lua | 2 +- .../Modules/Popup/View/GeneralPopup_PokemonResolve.lua | 2 +- .../Modules/Popup/View/GeneralPopup_PokemonRestore.lua | 2 +- .../~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index b8186a2fc6..9bc9010591 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2873,8 +2873,8 @@ ExpeditionNodeType = { [50] = "万能碎片", [51] = "法相", [52] = "置换卡", - [53] = "神兵", - [54] = "神兵碎片", + [53] = "名刀", + [54] = "名刀碎片", [55] = "法术", [56] = "礼物", } diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua index 80f837369b..41fbfb16c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponGetInfoPopup.lua @@ -12,7 +12,7 @@ function GodWeaponGetInfoPopup:InitComponent() this.spLoader = SpriteLoader.New() this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack") - Util.GetGameObject(self.transform, "bg/title"):GetComponent("Text").text="查看神兵" + Util.GetGameObject(self.transform, "bg/title"):GetComponent("Text").text="查看名刀" this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot"):GetComponent("Image") this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text") this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/starGrid(Clone)") diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua index 4aa18857aa..e6aff583bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua @@ -6,7 +6,7 @@ local shenBingConfig = ConfigManager.GetConfig(ConfigName.ShenBing) local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = Language[10201] }, - --[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神兵" }, + --[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "名刀" }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} @@ -20,7 +20,7 @@ local redPointList = {} function this:InitComponent(gameObject) this.spLoader = SpriteLoader.New() this.ChipItemList={}--存储itemview 重复利用 - Util.GetGameObject(gameObject, "GodWeaponListPanel_List/name"):GetComponent("Text").text = "神兵列表" + Util.GetGameObject(gameObject, "GodWeaponListPanel_List/name"):GetComponent("Text").text = "名刀列表" this.tabBox = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/TabBox") this.ScrollParentView1 = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/ScrollParentView1") @@ -97,7 +97,7 @@ function this.OnClickTabBtn(_curIndex) this.SingPokemonDataShow(go, pokemonList[index]) end) this.NoneImage:SetActive(#pokemonList <= 0) - this.NoneImageText.text = "未获得神兵" + this.NoneImageText.text = "未获得名刀" elseif curIndex == 1 then this.ScrollParentView1:SetActive(false) this.ScrollParentView2:SetActive(true) @@ -113,7 +113,7 @@ function this.OnClickTabBtn(_curIndex) this.SingPokemonChipDataShow(go, pokemonChipList[index]) end) this.NoneImage:SetActive(#pokemonChipList <= 0) - this.NoneImageText.text = "未获得神兵碎片" + this.NoneImageText.text = "未获得名刀碎片" end -- this.ScrollView:ForeachItemGO(function(index, go) -- Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua index e5c110454e..e3cfcd561b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua @@ -9,7 +9,7 @@ local upZhenIndex function this:InitComponent(gameObject) this.spLoader = SpriteLoader.New() - Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/name"):GetComponent("Text").text = "选择上阵神兵" + Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/name"):GetComponent("Text").text = "选择上阵名刀" this.ItemPre = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ItemPre") local v2 = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/ScrollParentView"):GetComponent("RectTransform").rect @@ -19,7 +19,7 @@ function this:InitComponent(gameObject) this.ScrollView.moveTween.Strength = 1 this.NoneImage = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/NoneImage") this.NoneImageText = Util.GetGameObject(gameObject, "GodWeaponListPanel_UpWar/NoneImage/TextImage/Text"):GetComponent("Text") - this.NoneImageText.text = "无可上阵神兵" + this.NoneImageText.text = "无可上阵名刀" end function this:BindEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index cff48886aa..74d4bb12ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -611,7 +611,7 @@ function RewardItemSingleShowPopup:OnShow() this.checkHeroText.text = "查看灵兽" elseif rg and rg.ShowItem and itemConfigData.ItemType == ItemType.GodWeaponChip then this.checkHero:SetActive(true) - this.checkHeroText.text = "查看神兵" + this.checkHeroText.text = "查看名刀" else this.checkHero:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua index 5f4d493337..b9bf4500fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonResolve.lua @@ -67,7 +67,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11569] this.confirmBtnText.text=Language[11570] else - this.titleText.text="神兵回炉" + this.titleText.text="名刀回炉" this.confirmBtnText.text="回炉" end this.numImage.sprite = SetIcon(this.spLoader, id) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua index 816357501f..6929841271 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonRestore.lua @@ -55,7 +55,7 @@ function this:OnShow(_parent,...) this.infoTxt.text=Language[11576] this.titleText.text=Language[11573] else - this.infoTxt.text="确认要分解所选的神兵或神兵碎片?" + this.infoTxt.text="确认要分解所选的名刀或名刀碎片?" this.titleText.text="确认分解" end LogError("#args[1]====="..#args[1]) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua index febbb223e2..bee1af655f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua @@ -32,7 +32,7 @@ function this:InitComponent(gameObject) this.scrollbar = Util.GetGameObject(gameObject,"Content/Resolve_GodWeapon/Scrollbar"):GetComponent("Scrollbar") this.Empty = Util.GetGameObject(gameObject,"Content/Resolve_GodWeapon/Empty") local v21 = Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/ItemListRoot"):GetComponent("RectTransform").rect - Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/Empty/Bg/Text"):GetComponent("Text").text="无可分解神兵" + Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/Empty/Bg/Text"):GetComponent("Text").text="无可分解名刀" this.chipObj=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj") this.btn_remove=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj/btn_remove") this.btn_add=Util.GetGameObject(gameObject, "Content/Resolve_GodWeapon/chipObj/btn_add")