From 63e9a01c73c39f804398765648af7d7e792990a5 Mon Sep 17 00:00:00 2001
From: wangzhenxing <1545929779@qq.com>
Date: Fri, 8 Dec 2023 21:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E6=94=B9=E6=88=90=E7=94=9F?=
=?UTF-8?q?=E5=91=BD=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UI/Recruit/RecruitEquipPanelNew.prefab | 36 ++-----------------
.../TailsmanSoulMainPanel.prefab | 8 ++---
.../~Lua/Common/GlobalDefine.lua | 6 ++--
.../ManagedResources/~Lua/Common/Language.lua | 26 +++++++-------
.../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 2 +-
.../View/GeneralBigPopup_RecrutDetail.lua | 2 +-
.../View/GeneralBigPopup_WishEquipDraw.lua | 6 ++--
.../GeneralBigPopup_WishTailsmanSoulChip.lua | 2 +-
.../Modules/Popup/FaLingSingleShowPopup.lua | 6 ++--
.../~Lua/Modules/Popup/FaLingStrongPopup.lua | 2 +-
.../Modules/Popup/WishHeroRewardPopup.lua | 2 +-
.../Modules/Recruit/HeroPreviewNewPanel.lua | 2 +-
.../Modules/Recruit/RecruitEquipPanelNew.lua | 6 ++--
.../RoleInfo/FaLingUpStarListPanel.lua | 10 +++---
.../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 +-
.../TailsManSoul/TailsManSoulManager.lua | 2 +-
16 files changed, 45 insertions(+), 75 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab
index 49bff4c9eb..7e279177e5 100644
--- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab
@@ -80,7 +80,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u6CD5\u5B9D\u53EC\u5524"
+ m_Text: "\u751F\u547D\u5361\u63A2\u7D22"
--- !u!114 &1769283131
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -16341,7 +16341,6 @@ GameObject:
m_Component:
- component: {fileID: 4513234844339929278}
- component: {fileID: 673140584530500892}
- - component: {fileID: 4540445879532771798}
m_Layer: 5
m_Name: title
m_TagString: Untagged
@@ -16377,35 +16376,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3363185461273472464}
m_CullTransparentMesh: 0
---- !u!114 &4540445879532771798
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3363185461273472464}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 0}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
--- !u!1 &3406376756503936526
GameObject:
m_ObjectHideFlags: 0
@@ -16896,7 +16866,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.0012417, y: 32.50392}
+ m_AnchoredPosition: {x: -0.0012417, y: 32.500023}
m_SizeDelta: {x: 156.9, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6093919403513127437
@@ -16929,7 +16899,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 26
+ m_FontSize: 22
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab
index 5ba1fec76e..37cb320ce9 100644
--- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab
@@ -620,7 +620,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 178.9, y: 114.750084}
+ m_AnchoredPosition: {x: 178.9, y: 114.749916}
m_SizeDelta: {x: 308.4, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &5086809663402702269
@@ -1397,7 +1397,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u6CD5\u5B9D\u4E4B\u7075\u5171\u9E23"
+ m_Text: "\u7F81\u7ECA\u5171\u9E23"
--- !u!114 &3523274889559435842
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2690,7 +2690,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u5168\u4F53\u795E\u5C06\u5C5E\u6027\u52A0\u6210\uFF1A"
+ m_Text: "\u5168\u4F53\u82F1\u96C4\u5C5E\u6027\u52A0\u6210\uFF1A"
--- !u!114 &4833478898529433853
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4203,7 +4203,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 30
+ m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 43f5e7eabb..cf6381bc84 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -2831,7 +2831,7 @@ ExpeditionNodeType = {
[11] = "玩家头像框",
[12] = "改名卡",
[13] = "霸气",
- [14] = "法宝",
+ [14] = "生命卡",
[15] = "头像",
[16] = "称号",
[17] = "皮肤",
@@ -2883,11 +2883,11 @@ ItemBaseTypeName = {
[5] = "宝器",
[6] = "霸气",
[7] = "材料",
- [8] = "法宝碎片",
+ [8] = "生命卡碎片",
[9] = "命石",
[10] = "神印",
[11] = "奥义卡",
- [12] = "法宝",
+ [12] = "生命卡",
[13] = "神石",
[14] = "主角礼物",
[15] = "英雄礼物",
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index dc172747f7..3d4db188b8 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -283,7 +283,7 @@ Language = {
[10282] = GetLanguageStrById("金币副本"),
[10283] = GetLanguageStrById("经验副本"),
[10284] = GetLanguageStrById("英雄副本"),
- [10285] = GetLanguageStrById("法宝副本"),
+ [10285] = GetLanguageStrById("生命卡副本"),
[10286] = GetLanguageStrById("霸气副本"),
[10287] = GetLanguageStrById("挑战"),
[10288] = GetLanguageStrById("战力:%s"),
@@ -535,7 +535,7 @@ Language = {
[10534] = GetLanguageStrById("MonsterGroup 表中找不到奖励组ID "),
[10535] = GetLanguageStrById("星解锁"),
[10536] = GetLanguageStrById("英雄"),
- [10537] = GetLanguageStrById("星获得专属法宝!"),
+ [10537] = GetLanguageStrById("星获得专属生命卡!"),
[10538] = GetLanguageStrById("点击查看英雄属性"),
[10539] = GetLanguageStrById("无符合要求的英雄!"),
[10540] = GetLanguageStrById("已将所有英雄复活并恢复全部血量!"),
@@ -1520,8 +1520,8 @@ Language = {
[11519] = GetLanguageStrById("宝物"),
[11520] = GetLanguageStrById("霸气"),
[11521] = GetLanguageStrById("材料"),
- [11522] = GetLanguageStrById("分解中,包含了史诗及以上的法宝。分解操作不可逆转,确定要进行分解吗?"),
- [11523] = GetLanguageStrById("此英雄尚未获得专属法宝!"),
+ [11522] = GetLanguageStrById("分解中,包含了史诗及以上的生命卡。分解操作不可逆转,确定要进行分解吗?"),
+ [11523] = GetLanguageStrById("此英雄尚未获得专属生命卡!"),
[11524] = GetLanguageStrById("已装备该霸气"),
[11525] = GetLanguageStrById("是否要将%s的%s装备到%s上?"),
[11526] = GetLanguageStrById("装备成功!"),
@@ -1609,9 +1609,9 @@ Language = {
[11608] = GetLanguageStrById("英雄归元成功,等级重置为1级"),
[11609] = GetLanguageStrById("确认归元"),
[11610] = GetLanguageStrById("归元英雄会返还所有的升级材料,英雄重置为1级,此操作不可逆,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:"),
- [11611] = GetLanguageStrById("法宝归元成功!"),
+ [11611] = GetLanguageStrById("生命卡归元成功!"),
[11612] = GetLanguageStrById("确定归元"),
- [11613] = GetLanguageStrById("%s的法宝会重置为1阶,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:"),
+ [11613] = GetLanguageStrById("%s的生命卡会重置为1阶,并返还进阶时消耗的金币和陨铁,是否确认归元?\n\n\t\t\t\t\t\t\t归元后获得:"),
[11614] = GetLanguageStrById("当前不可使用炸弹!"),
[11615] = GetLanguageStrById("奖励层不可使用炸弹~"),
[11616] = GetLanguageStrById("炸弹使用已达最大次数~"),
@@ -1717,7 +1717,7 @@ Language = {
[11716] = GetLanguageStrById("四星英雄"),
[11717] = GetLanguageStrById("三星英雄"),
[11718] = GetLanguageStrById("星:"),
- [11719] = GetLanguageStrById("法宝+25:"),
+ [11719] = GetLanguageStrById("生命卡+25:"),
[11720] = GetLanguageStrById("火"),
[11721] = GetLanguageStrById("水"),
[11722] = GetLanguageStrById("风"),
@@ -1732,7 +1732,7 @@ Language = {
[11731] = GetLanguageStrById("资源已达上限,超出部分将无法获得,是否分解?"),
[11732] = GetLanguageStrById("伙伴退役"),
[11733] = GetLanguageStrById("英雄归元"),
- [11734] = GetLanguageStrById("法宝归元"),
+ [11734] = GetLanguageStrById("生命卡归元"),
[11735] = GetLanguageStrById("放生灵兽"),
[11736] = GetLanguageStrById("请选择需要恭送的英雄!"),
[11737] = GetLanguageStrById("最多选择%s个英雄!"),
@@ -1750,9 +1750,9 @@ Language = {
[11749] = GetLanguageStrById("请选择一个需要归元的英雄!"),
[11750] = GetLanguageStrById("请选择一个需要归元的英雄"),
[11751] = GetLanguageStrById("请选择一个"),
- [11752] = GetLanguageStrById("需要法宝归元的英雄"),
- [11753] = GetLanguageStrById("无可归元的法宝!"),
- [11754] = GetLanguageStrById("请选择一个需要归元法宝的英雄!"),
+ [11752] = GetLanguageStrById("需要生命卡归元的英雄"),
+ [11753] = GetLanguageStrById("无可归元的生命卡!"),
+ [11754] = GetLanguageStrById("请选择一个需要归元生命卡的英雄!"),
[11755] = GetLanguageStrById("宝箱开启数量不能为0"),
[11756] = GetLanguageStrById("宝物强化"),
[11757] = GetLanguageStrById("宝物精炼"),
@@ -2263,7 +2263,7 @@ Language = {
[12262] = GetLanguageStrById("道具种类:%s"),
[12263] = GetLanguageStrById("1级英雄无法进行归元!"),
[12264] = GetLanguageStrById("此英雄已被锁定!"),
- [12265] = GetLanguageStrById("1级法宝无法进行归元!"),
+ [12265] = GetLanguageStrById("1级生命卡无法进行归元!"),
[12266] = GetLanguageStrById("信息"),
[12267] = GetLanguageStrById("坐骑"),
[12268] = GetLanguageStrById("暂未解锁"),
@@ -2296,7 +2296,7 @@ Language = {
[12295] = GetLanguageStrById("紫色灵兽或碎片"),
[12296] = GetLanguageStrById("蓝色灵兽或碎片"),
[12297] = GetLanguageStrById("其他道具"),
- [12298] = GetLanguageStrById("法宝\n直升25级"),
+ [12298] = GetLanguageStrById("生命卡\n直升25级"),
[12299] = GetLanguageStrById("剩余:%s"),
[12300] = GetLanguageStrById("已抢空"),
[12301] = GetLanguageStrById("奖励已发放完毕!"),
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
index 8d82ee89f0..315bebab1a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
@@ -21,7 +21,7 @@ local titleBg={
--神将
[3]={bg="r_richang_banner_3_zh", titleImg = "r_richang_banner_3_zi_zh", name="英雄副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)},
--法宝
- [4]={bg="r_richang_banner_2_zh", titleImg = "r_richang_banner_2_zi_zh",name="法宝副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)},
+ [4]={bg="r_richang_banner_2_zh", titleImg = "r_richang_banner_2_zi_zh",name="生命卡副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)},
--魂印
[5]={bg="r_richang_banner_1_zh", titleImg = "r_richang_banner_1_zi_zh", name="霸气副本",titleTip = GetLanguageStrById(specialConfig[45].Value),pos = Vector3.New(257.08,651.24,0)},
}
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua
index fe8c9f6c8f..89bf1bc2b9 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua
@@ -210,7 +210,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
elseif actType == ActivityTypeDef.tiandihonglu then
for n,m in ipairs(upItemList) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
- table.insert(_upRateList,{id = m.Reward[1],tag = "法宝碎片UP!", name=itemConfig.Name,value = m.WeightShow,color = "AD4152"})
+ table.insert(_upRateList,{id = m.Reward[1],tag = "生命卡碎片UP!", name=itemConfig.Name,value = m.WeightShow,color = "AD4152"})
end
rateList = this:RefreshSoulRate(UpItem,_upRateList,ItemType.talismanSoulChip)
elseif actType == ActivityTypeDef.Incarnation then
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua
index 6c4204adf9..4914ab2d9a 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua
@@ -107,7 +107,7 @@ function this:Refresh(isTop,isAni)
self.parent:ClosePanel()
return
end
- local aaa=string.format("抽到5星英雄法宝时,有%s%s几率转化为心愿法宝!",RecruitManager.GetWishPro(),"%")
+ local aaa=string.format("抽到5星英雄生命卡时,有%s%s几率转化为心愿生命卡!",RecruitManager.GetWishPro(),"%")
self.infoTxt.text=aaa
self.selectBtn:SetActive(false)
--self.selectBtn:GetComponent("RectTransform").localPosition = self.tabListObj[self.curSelect]:GetComponent("RectTransform").localPosition
@@ -190,12 +190,12 @@ function this:ShowSingleHero(go,data,index)
Util.SetGray(self.itemList[self.curSelect][index],true)
Util.AddOnceClick(go,function ()
--PopupTipPanel.ShowTip("同系法宝只可选择一位~")
- PopupTipPanel.ShowTip("心愿法宝已满~")
+ PopupTipPanel.ShowTip("心愿生命卡已满~")
end)
elseif value == 2 then--上方选满
Util.SetGray(self.itemList[self.curSelect][index],true)
Util.AddOnceClick(go,function ()
- PopupTipPanel.ShowTip("心愿法宝已满~")
+ PopupTipPanel.ShowTip("心愿生命卡已满~")
end)
elseif value == 1 then--上方存在自己
self.maskList[self.curSelect][index]:SetActive(true)
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua
index 0e63968fb0..4846025c46 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua
@@ -16,7 +16,7 @@ end
function this:BindEvent()
Util.AddOnceClick(self.sureBtn,function()
if LengthOfTable(self.selectData) < 4 then
- PopupTipPanel.ShowTip("请选择4个法宝之灵碎片作为心愿!")
+ PopupTipPanel.ShowTip("请选择4个羁绊碎片作为心愿!")
return
end
NetManager.SendRefreshTailsmanSoulData(self.selectData,function()
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua
index 05957f9f93..74e5017b30 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua
@@ -50,7 +50,7 @@ function FaLingSingleShowPopup:InitComponent()
--superPro
self.superPro = Util.GetGameObject(self.midBar, "superPro")
self.superTitle = Util.GetGameObject(self.midBar, "superPro/Image/PropertyName"):GetComponent("Text")
- self.superTitle.text="法宝天赋"
+ self.superTitle.text="生命卡天赋"
self.superProGrid = Util.GetGameObject(self.superPro, "proGrid")
self.superProPre = Util.GetGameObject(self.superPro, "proGrid/Desc")
self.superProPre:SetActive(false)
@@ -215,7 +215,7 @@ function FaLingSingleShowPopup:OnShow()
else
self.powerNum.text=EquipManager.CalculateWarForce(self.equipData.staticId)
end
- self.equipType.text="法宝"
+ self.equipType.text="生命卡"
--下部按钮信息
self.effectbaijin:SetActive(equipConfigData.Quantity==7)
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
@@ -278,7 +278,7 @@ function FaLingSingleShowPopup:OnShow()
end)
end
local args={}
- args[1]="是否卸下当前护佑法宝?"
+ args[1]="是否卸下当前护佑生命卡?"
args[2]="卸下"
args[3]="取消"
args[4]=sureFunc
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua
index 896a125b43..b1ea50a159 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua
@@ -49,7 +49,7 @@ function FaLingStrongPopup:InitComponent()
--superPro
self.superPro = Util.GetGameObject(self.midBar, "superPro")
self.superTitle = Util.GetGameObject(self.midBar, "superPro/Image/name"):GetComponent("Text")
- self.superTitle.text="法宝天赋"
+ self.superTitle.text="生命卡天赋"
self.superProGrid = Util.GetGameObject(self.superPro, "proGrid")
self.superProPre = Util.GetGameObject(self.superPro, "proGrid/Desc")
self.superProPre:SetActive(false)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua
index 9142de1f3d..7d5a90e20f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua
@@ -92,7 +92,7 @@ function this.RefreshPanel(isTop,isAni)
this.title.text = "英雄心愿奖励"
actId=11701
elseif type==4 then
- this.title.text = "法宝心愿奖励"
+ this.title.text = "生命卡心愿奖励"
actId=11901
end
actconfigs=ActivityGiftManager.GetActivityInfoByType(actId)
diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua
index b68b74e433..cb135036fa 100644
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua
@@ -8,7 +8,7 @@ local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
--Tab
local TabBox = require("Modules/Common/TabBox")
local _TabData={[1] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = Language[10536] },
- [2] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = "法宝" },
+ [2] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = "生命卡" },
--[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10306] }
}
local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1),
diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua
index 546ffb66d2..ac844c0e69 100644
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua
@@ -214,7 +214,7 @@ function RecruitEquipPanelNew:UpdataWishPanel()
self.wishOpen.gameObject:SetActive(false)
Util.SetGray(self.wishBtn,true)
self.wishText.text = string.format("%s/%s",wishLv,data)
- self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿法宝~"
+ self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿生命卡~"
else
self.wishNoOpen.gameObject:SetActive(false)
self.wishOpen.gameObject:SetActive(true)
@@ -254,7 +254,7 @@ function RecruitEquipPanelNew:UpdataWishPanel()
self.wishOpen.gameObject:SetActive(false)
Util.SetGray(self.wishBtn,true)
self.wishText.text = string.format("%s/%s",0,data)
- self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿法宝~"
+ self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿生命卡~"
end
--self:CheckNewWishHero()
end)
@@ -262,7 +262,7 @@ function RecruitEquipPanelNew:UpdataWishPanel()
-- if RecruitManager.isTenRecruit == 0 then
-- self.tenTipText.text = "每次十连必得五星神将法宝"
-- else
- self.tenTipText.text = string.format("剩余%s次必得五星英雄法宝",RecruitManager.GetRecruit2MustCount())
+ self.tenTipText.text = string.format("剩余%s次必得五星英雄生命卡",RecruitManager.GetRecruit2MustCount())
--end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua
index c5ab9b9cce..625e3799d7 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua
@@ -89,7 +89,7 @@ function FaLingUpStarListPanel:OnOpen(heroData,_openThisPanel,_curSelectHeroList
this.ScrollView:SetData(heroDataList, function (index, go)
this.OnShowSingleCardData(go, heroDataList[index])
end,false,false)
- this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum)
+ this.infoTxt.text=string.format("强化所要生命卡 %s/%s",#curSelectHeroList,curNeedRoleNum)
end
function this.OnClickEnterHero(go,heroData,type)
this.OnShowSingleCardData(go,heroData,type)
@@ -147,7 +147,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
table_removebyvalue(curSelectHeroList,heroData.did)
isSelect=false
choosed:SetActive(false)
- this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum)
+ this.infoTxt.text=string.format("强化所要生命卡 %s/%s",#curSelectHeroList,curNeedRoleNum)
return
end
if LengthOfTable(curSelectHeroList)>=curNeedRoleNum then
@@ -159,10 +159,10 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
table.insert(curSelectHeroList,heroData.did)
isSelect=true
choosed:SetActive(true)
- this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum)
+ this.infoTxt.text=string.format("强化所要生命卡 %s/%s",#curSelectHeroList,curNeedRoleNum)
end
local args={}
- args[1]="法宝已经升级、升星,作为其他法宝的材料将不会返还升级、升星材料"
+ args[1]="生命卡已经升级、升星,作为其他生命卡的材料将不会返还升级、升星材料"
args[2]="确定"
args[3]="取消"
args[4]=sureFunc
@@ -171,7 +171,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
table.insert(curSelectHeroList,heroData.did)
isSelect=true
choosed:SetActive(true)
- this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum)
+ this.infoTxt.text=string.format("强化所要生命卡 %s/%s",#curSelectHeroList,curNeedRoleNum)
end
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
index 33a604706e..5f1d60582d 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
@@ -757,7 +757,7 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills
if this.skillData[i].Type < 5 then
local maxLv= HeroManager.GetHeroSkillMaxLevel(curHeroData.heroConfig.Id,this.skillData[i].Type)
if this.skillData[i].Type == 4 and this.skillData[i].state == 0 then
- this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),"\n(法宝25级解锁)")
+ this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId),"\n(生命卡25级解锁)")
this.skillPanelId = UIName.SkillInfoPopup
else
this.skillPanel = UIManager.OpenPanel(UIName.SkillInfoPopup,this.skillData[i],1,10,maxLv,i,nil,GodSoulManager.GetGodSoulLv(curHeroData.dynamicId))
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
index edf5d5d7a6..a9d62c92ef 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua
@@ -92,7 +92,7 @@ function this.GetTailsmanSoulDataById(id)
if not skillList[trumpBook[id].SkillList[i][1]] then
skillList[trumpBook[id].SkillList[i][1]] = ""
end
- skillList[trumpBook[id].SkillList[i][1]] = string.format("四种法宝之灵全部到达%s星:\n%s",trumpBook[id].SkillList[i][1],GetSkillConfigDesc(passiveSkillConfig[trumpBook[id].SkillList[i][2]]))
+ skillList[trumpBook[id].SkillList[i][1]] = string.format("四种羁绊全部到达%s星:\n%s",trumpBook[id].SkillList[i][1],GetSkillConfigDesc(passiveSkillConfig[trumpBook[id].SkillList[i][2]]))
end
return trumpList,maxLv,lv,skillList
end