diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 78a40bd5e8..ea21687048 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2853,7 +2853,7 @@ ExpeditionNodeType = { [30] = "生命卡碎片", [31] = "命石", [32] = "挂机时长资源包", - [33] = "法相", + [33] = "神石", [34] = "神印", [35] = "好感度碎片", [36] = "装备碎片", @@ -2871,7 +2871,7 @@ ExpeditionNodeType = { [48] = "限时仙充卡", [49] = "大额直充卡", [50] = "万能碎片", - [51] = "法相", + [51] = "神石", [52] = "置换卡", [53] = "名刀", [54] = "名刀碎片", diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index a36e4f24d0..f545f665a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -118,12 +118,12 @@ function RewardTalismanSingleShowPopup2:BindEvent() if self.position>6 then if equipConfigData.Profession~=0 then if self.curHeroData.heroConfig.Profession~=equipConfigData.Profession then - PopupTipPanel.ShowTip("该英雄无法装备此法相") + PopupTipPanel.ShowTip("该英雄无法装备此神石") return end if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then - PopupTipPanel.ShowTip("该英雄无法装备此法相") + PopupTipPanel.ShowTip("该英雄无法装备此神石") return end end @@ -198,11 +198,11 @@ function RewardTalismanSingleShowPopup2:BindEvent() if self.position>6 then if equipConfigData.Profession~=0 then if self.curHeroData.heroConfig.Profession~=equipConfigData.Profession then - PopupTipPanel.ShowTip("该英雄无法装备此法相") + PopupTipPanel.ShowTip("该英雄无法装备此神石") return end if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then - PopupTipPanel.ShowTip("该英雄无法装备此法相") + PopupTipPanel.ShowTip("该英雄无法装备此神石") return end end @@ -327,7 +327,7 @@ function RewardTalismanSingleShowPopup2:OnShow() --计算战力 local Power = 0 if itemConfigData.ItemType==ItemType.FaXiang then - self.equipType.text = "道具种类:法相" + self.equipType.text = "道具种类:神石" self.skillNameInfo.text="技能详情" Power = equipConfigData.Score else diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua index 70f62e01cb..d87b725f64 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua @@ -15,7 +15,7 @@ function this:InitComponent() this.spLoader = SpriteLoader.New() this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn") this.Title = Util.GetGameObject(this.gameObject, "Title"):GetComponent("Text") - this.Title.text="法相图鉴" + this.Title.text="神石图鉴" this.mask = Util.GetGameObject(this.gameObject, "mask") for i = 1, 5 do tabs[i] = Util.GetGameObject(this.gameObject, "Tabs/Btn" .. i) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua index 4aa339ad06..c009932966 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangStrongPopup.lua @@ -101,7 +101,7 @@ function FaXiangStrongPopup:BindEvent() --如果强化界面 强化到最高等级谈提示 精炼界面 就切界面 if type==1 then if isMax then - PopupTipPanel.ShowTip("法相已达最大等级") + PopupTipPanel.ShowTip("神石已达最大等级") return end else @@ -139,7 +139,7 @@ function FaXiangStrongPopup:BindEvent() --如果精炼界面 精炼到最高等级谈提示 否 强化界面 就切界面 if type==2 then if isMax then - PopupTipPanel.ShowTip("法相以达最大星级") + PopupTipPanel.ShowTip("神石已达最大星级") return end else @@ -318,7 +318,7 @@ function FaXiangStrongPopup:SetWindShow(_index) curEquipData = FaXiangManager.GetSingleEquipTreasreData(curEquipData.idDyn) local items, propertyShow if _index == 1 then - this.titleTxt.text = "法相升级" + this.titleTxt.text = "神石升级" this.btnRefine:SetActive(false) this.btnStrong:SetActive(true) this.btnShenying:SetActive(false) @@ -345,15 +345,15 @@ function FaXiangStrongPopup:SetWindShow(_index) des= des..ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,skillId[i]).Desc end this.hintTxt.text="已提升至最大等级" - this.skillInfo.text= "".."法相技能: "..""..des + this.skillInfo.text= "".."神石技能: "..""..des elseif _index == 2 then - this.titleTxt.text="法相升星" + this.titleTxt.text="神石升星" this.btnRefine:SetActive(true) this.btnStrong:SetActive(false) this.btnShenying:SetActive(false) this.SetBtnSelect(this.btn_refinePage) isMax=curEquipData.refineLv==curEquipData.maxRefineLv - this.properList[0].leftTxt.text = "法相星级" + this.properList[0].leftTxt.text = "神石星级" if isMax then this.properList[0].rightTxt.text = Language[11062] this.btnRefine.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index cd5b5d1b9b..60bbb4d7ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -40,7 +40,7 @@ local typeTab = { [3] = Language[10393], [4] = Language[10394], [5] = "宝物", - [6] = "法相"} + [6] = "神石"} local tabs = {} local redTabs = {} local openThisPanel