diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 30b04703f5..9c0fb976f1 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -2458,4 +2458,4 @@ IndexValueDef = {
RoleUpStarMatType = {
item = 2,--万能狗粮
hero = 1,--英雄
-}
+}
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua
index d1a24a483b..7dad541547 100644
--- a/Assets/ManagedResources/~Lua/Common/Language.lua
+++ b/Assets/ManagedResources/~Lua/Common/Language.lua
@@ -2289,4 +2289,36 @@
[12288] = GetLanguageStrById("暂无可领取的奖励"),
[12289] = GetLanguageStrById("车迟斗法将于次日0点重置。"),
[12290] = GetLanguageStrById("请在以下道具中选择一种"),
+ [12291] = GetLanguageStrById("是否前往称号界面?"),
+ [12292] = GetLanguageStrById("今日剩余免费次数:%s"),
+ [12293] = GetLanguageStrById("距排名结算:%s"),
+ [12294] = GetLanguageStrById("金色灵兽或碎片"),
+ [12295] = GetLanguageStrById("紫色灵兽或碎片"),
+ [12296] = GetLanguageStrById("蓝色灵兽或碎片"),
+ [12297] = GetLanguageStrById("其他道具"),
+ [12298] = GetLanguageStrById("法宝\n直升25级"),
+ [12299] = GetLanguageStrById("剩余:%s"),
+ [12300] = GetLanguageStrById("已抢空"),
+ [12301] = GetLanguageStrById("奖励已发放完毕!"),
+ [12302] = GetLanguageStrById("请选择想要升级的装备!"),
+ [12303] = GetLanguageStrById("剩余:%s次"),
+ [12304] = GetLanguageStrById("已兑换"),
+ [12305] = GetLanguageStrById("兑换"),
+ [12306] = GetLanguageStrById("心魔试炼阵容:"),
+ [12307] = GetLanguageStrById("当前已激活该称号,是否要重复使用?"),
+ [12308] = GetLanguageStrById("成功激活称号!"),
+ [12309] = GetLanguageStrById("%s、单场战斗伤害到达%s"),
+ [12310] = GetLanguageStrById("装备升级"),
+ [12311] = GetLanguageStrById("请选择您要升级的装备"),
+ [12312] = GetLanguageStrById("暂无可升级的装备"),
+ [12313] = GetLanguageStrById("装备穿戴中,请卸下装备后升星!"),
+ [12314] = GetLanguageStrById("称号"),
+ [12315] = GetLanguageStrById("佩戴称号"),
+ [12316] = GetLanguageStrById("取消佩戴"),
+ [12317] = GetLanguageStrById("已佩戴称号!"),
+ [12318] = GetLanguageStrById("已取消佩戴称号!"),
+ [12319] = GetLanguageStrById("恭喜您等级提升至%s级,我们为您准备了超值礼包,助您提升战力!!!"),
+ [12320] = GetLanguageStrById("恭喜通关当前关卡,我们为您准备了超值礼包,助您战力飙升"),
+ [12321] = GetLanguageStrById("恭喜您击败心魔挑战成功,我们为您准备了超值礼包,帮助您击杀心魔快速通关!"),
+ [12322] = GetLanguageStrById("你好"),
}
diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
index 15099b6ddf..534d9e0f67 100644
--- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
@@ -780,7 +780,7 @@ function this.ShowWarPowerChange(powernum,type)
if type==PowerChangeJumpType.ride then
str=Language[12236]
elseif type== PowerChangeJumpType.title then
- str="是否前往称号界面?"
+ str=Language[12291]
end
MsgPanel.ShowTwo(str,nil,function()
UIManager.OpenPanel(UIName.SettingPanel,type)
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
index aa3233d024..a99eacd2f7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
@@ -6861,4 +6861,4 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.RoleBeDamaged, onRoleBeDamaged,nil,nil,role)
end,
}
-return passivityList
+return passivityList
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
index aaa6e71a55..231d50ed51 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
@@ -345,7 +345,7 @@ function this.SetTimeTip()
--LogGreen("buyTime "..buyTime.." freeTime "..freeTime)
local str=""
if freeTime>0 then
- str=string.format("今日剩余免费次数:%s",tostring(freeTime))
+ str=string.format(Language[12292],tostring(freeTime))
else
str=string.format(Language[10300],tostring(buyTime))
end
diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua
index f5800ba8c1..8e91353fad 100644
--- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua
@@ -255,11 +255,11 @@ function DemonSlayerPanel:SetTime(ActInfo)
local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400
--设置一进去的时间,不设置的话一进去会不对
local time = ActInfo.endTime - GetTimeStamp() - extraTime
- local timeStr = "距排名结算:%s"
+ local timeStr = Language[12293]
if time > 0 then
- timeStr = "距排名结算:%s"
+ timeStr = Language[12293]
else
- timeStr = "活动已结束"
+ timeStr = Language[10471]
end
if time > 3600 then
this.timeText.text = string.format(timeStr,TimeToDHM(time))
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua
index 158e6c3205..8bd75764b7 100644
--- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua
@@ -209,10 +209,10 @@ function ActivityDetail:RefreshMonsterRate()
table.insert(list4,v)--其他
end
end
- table.insert(monsterRateList,{tag=Language[10176],name="金色灵兽或碎片",value=self:ReculateRate(list1)-mainMonsterRate})
- table.insert(monsterRateList,{tag=Language[10178],name="紫色灵兽或碎片",value=self:ReculateRate(list2)})
- table.insert(monsterRateList,{tag=Language[10179],name="蓝色灵兽或碎片",value=self:ReculateRate(list3)})
- table.insert(monsterRateList,{tag=Language[10459],name="其他道具",value=self:ReculateRate(list4)})
+ table.insert(monsterRateList,{tag=Language[10176],name=Language[12294],value=self:ReculateRate(list1)-mainMonsterRate})
+ table.insert(monsterRateList,{tag=Language[10178],name=Language[12295],value=self:ReculateRate(list2)})
+ table.insert(monsterRateList,{tag=Language[10179],name=Language[12296],value=self:ReculateRate(list3)})
+ table.insert(monsterRateList,{tag=Language[10459],name=Language[12297],value=self:ReculateRate(list4)})
for n,m in ipairs(monsterRateList) do
if m and m.value>0 then
diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
index e60f9c0a3c..ab6d046d5f 100644
--- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
@@ -580,7 +580,7 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType)
elseif data.shopItemData.DailyUpdate == 30 then
data.tipImageText = Language[11357]
elseif shopData.goodsId == 9107 then
- data.tipImageText = "法宝\n直升25级"
+ data.tipImageText = Language[12298]
else
data.tipImageText = nil
end
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua
index fa0113e011..8eaf282733 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua
@@ -1,4 +1,4 @@
-local CommonActPage = {}
+local CommonActPage = {}
local rechargeNum = 0
function CommonActPage:New(gameObject)
local b = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
index 10bcb17024..d1de6d97e9 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
@@ -1,4 +1,4 @@
-CommonActPageManager = {}
+CommonActPageManager = {}
local this = CommonActPageManager
local dataList = {}
this.TaSuiLingXiaoMsg = nil
@@ -145,7 +145,7 @@ function this.GetExpertData(indexType,actType)
else
curData.rewards[i].otherData.state = 3
end
- curData.rewards[i].otherData.info = string.format("剩余:%s",curData.rewards[i].progress)
+ curData.rewards[i].otherData.info = string.format(Language[12299],curData.rewards[i].progress)
end
else --日累计充值 达人
if actType == ActivityTypeDef.AccumulativeRechargeExper then
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua
index 27f8fc2fe4..934fbca93c 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua
@@ -1,4 +1,4 @@
-local ConRechargePage = {}
+local ConRechargePage = {}
local rechargeNum = 0
function ConRechargePage:New(gameObject)
local b = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua
index db05b6fcdb..66c689160b 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua
@@ -1,4 +1,4 @@
-local ExpertPage = {}
+local ExpertPage = {}
function ExpertPage:New(gameObject)
local b = {}
b.gameObject = gameObject
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua
index 0456a97c71..ab03ef719d 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua
@@ -1,4 +1,4 @@
-ExpertPre = {}
+ExpertPre = {}
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
function ExpertPre:New(gameObject)
local b = {}
@@ -12,7 +12,7 @@ local BtnState = {
[0] = {Img = "s_slbz_1anniuongse", isRed = true, isGray = false, Text = Language[11948],},
[1] = {Img = "s_slbz_1anniuhuangse", isRed = false, isGray = false, Text = Language[10556]},
[2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[10101]},
- [3] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = "已抢空"},
+ [3] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[12300]},
}
--初始化组件(用于子类重写)
@@ -92,7 +92,7 @@ function ExpertPre:SetButton()
elseif self.data.otherData.state == 2 then
PopupTipPanel.ShowTip(Language[10101])
elseif self.data.otherData.state == 3 then
- PopupTipPanel.ShowTip("奖励已发放完毕!")
+ PopupTipPanel.ShowTip(Language[12301])
end
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua
index 8850dc743c..a1bbba08ad 100644
--- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua
+++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua
@@ -1,4 +1,4 @@
-ItemUpstarPre = {}
+ItemUpstarPre = {}
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
function ItemUpstarPre:New(gameObject)
local b = {}
@@ -35,7 +35,7 @@ function ItemUpstarPre:BindEvent()
end)
Util.AddOnceClick(self.btnExchange,function ()
if self.data.otherData.selectId == 0 then
- PopupTipPanel.ShowTip("请选择想要升级的装备!")
+ PopupTipPanel.ShowTip(Language[12302])
return
end
local cost = ConfigManager.GetConfigData(ConfigName.ComposeBook,self.data.otherData.selectId).NeedCost
@@ -108,9 +108,9 @@ function ItemUpstarPre:SetMask()
end
function ItemUpstarPre:SetButton()
- self.info.text = string.format("剩余:%s次",self.data.progress)
+ self.info.text = string.format(Language[12303],self.data.progress)
local bool = self.data.progress == 0
- self.btnText.text = bool and "已兑换" or "兑换"
+ self.btnText.text = bool and Language[12304] or Language[12305]
Util.SetGray(self.btnExchange,bool)
self.btnExchange:GetComponent("Button").interactable = not bool
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
index d4c849e969..832e400d44 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
@@ -32,7 +32,7 @@ local _ViewConfig = {
},
[PLAYER_INFO_VIEW_TYPE.MIND_DEMON] = {
formationType = FormationTypeDef.MONSTER_CAMP_ATTACK,
- tip = "心魔试炼阵容:",
+ tip = Language[12306],
btnType = {
}
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
index 6f6b004e2b..a5f742b343 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
@@ -183,11 +183,11 @@ function RewardItemSingleShowPopup:BindEvent()
elseif itemConfigData.ItemType == ItemType.Title then
local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
if PlayerManager.userTitleList[itemConfigData.Id] then
- MsgPanel.ShowTwo("当前已激活该称号,是否要重复使用?",nil,function()
+ MsgPanel.ShowTwo(Language[12307],nil,function()
NetManager.ActiveUserTitleRequest(itemSid,function (msg)
PlayerManager.SetPlayerTitleTime(itemSid,msg.validTime)
self:ClosePanel()
- PopupTipPanel.ShowTip("成功激活称号!")
+ PopupTipPanel.ShowTip(Language[12308])
this.WarPowerChange(oldPowerNum,PowerChangeJumpType.title)
end)
end)
@@ -195,7 +195,7 @@ function RewardItemSingleShowPopup:BindEvent()
NetManager.ActiveUserTitleRequest(itemSid,function (msg)
PlayerManager.SetPlayerTitleTime(itemSid,msg.validTime)
self:ClosePanel()
- PopupTipPanel.ShowTip("成功激活称号!")
+ PopupTipPanel.ShowTip(Language[12308])
this.WarPowerChange(oldPowerNum,PowerChangeJumpType.title)
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
index d69f1af5a2..f7cda41ab9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
@@ -157,7 +157,7 @@ function this.SetScrollPre2(root,data)
local info=Util.GetGameObject(root,"Title/Info"):GetComponent("Text")
local grid=Util.GetGameObject(root,"Grid")
local mask=Util.GetGameObject(root,"mask")
- info.text = string.format("%s、单场战斗伤害到达%s",data.otherData.Sort,data.otherData.Values[1][1])
+ info.text = string.format(Language[12309],data.otherData.Sort,data.otherData.Values[1][1])
if not itemList[root] then
itemList[root] = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua
index 67fa7c6717..16f60e4fff 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua
@@ -1,4 +1,4 @@
------ 云游商人选择装备 -----
+----- 云游商人选择装备 -----
local this = {}
--传入父脚本模块
local parent
@@ -84,7 +84,7 @@ function this:OnShow(_parent,...)
this:Refresh(true,true)
end
function this:Refresh(isTop,isAni)
- this.titleText.text = "装备升级"
+ this.titleText.text = Language[12310]
if not self.itemList then
self.itemList = {}
@@ -97,10 +97,10 @@ function this:Refresh(isTop,isAni)
end,not isTop,not isAni)
if #self.equipList ~= 0 then
- this.tip.text = "请选择您要升级的装备"
+ this.tip.text = Language[12311]
self.tip.gameObject:GetComponent("RectTransform").localPosition = Vector3.New(0,232,0)
else
- self.tip.text = "暂无可升级的装备"
+ self.tip.text = Language[12312]
self.tip.gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
end
end
@@ -137,7 +137,7 @@ function this:ShowSingleData(item,sdata,index)
end
end)
Util.AddOnceClick(equiped,function ()
- PopupTipPanel.ShowTip("装备穿戴中,请卸下装备后升星!")
+ PopupTipPanel.ShowTip(Language[12313])
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua
index 57efd4fc17..208e8927b7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua
@@ -7,7 +7,7 @@ local TabBox = require("Modules/Common/TabBox")
local _TabData={
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12266] , rpType = RedPointType.Setting_Head},
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12267] , rpType = RedPointType.Setting_Ride},
- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title },
+ [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12314],rpType = RedPointType.Setting_Title },
-- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "时装",rpType = RedPointType.Setting_Skin },
}
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
index 97eb4e67c2..d9f5dbb77a 100644
--- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
@@ -183,9 +183,9 @@ function this.SingleRideClickShowInfo(data,go)
this.goToBtnText.text = Language[11829]
this.stateImgGo:SetActive(false)
elseif isGet and not isUser then
- this.goToBtnText.text = "佩戴称号"
+ this.goToBtnText.text = Language[12315]
elseif isGet and isUser then
- this.goToBtnText.text = "取消佩戴"
+ this.goToBtnText.text = Language[12316]
end
local setateImageStr = curPlayerHeadIconConfig.Time == 0 and "c_zuoqi_yongjiu_zh" or "c_zuoqi_xianshi_zh"
this.stateImg.sprite = Util.LoadSprite(setateImageStr)
@@ -243,14 +243,14 @@ function this.SingleRideClickShowInfo(data,go)
PlayerManager.SetPlayerDesignation(curPlayerHeadIconConfig.Id)
this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true)
- PopupTipPanel.ShowTip("已佩戴称号!")
+ PopupTipPanel.ShowTip(Language[12317])
end)
elseif isGet and isUser then
NetManager.RequestChangeModifyDecoration(2,curPlayerHeadIconConfig.Id,function()
PlayerManager.SetPlayerDesignation(0)
this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true)
- PopupTipPanel.ShowTip("已取消佩戴称号!")
+ PopupTipPanel.ShowTip(Language[12318])
end)
end
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua
index 9f76f99ca6..3bf7a40a37 100644
--- a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua
@@ -1,4 +1,4 @@
-require("Base/BasePanel")
+require("Base/BasePanel")
local TaSuiLingXiao = Inherit(BasePanel)
local skillConfig = ConfigManager.GetConfig(ConfigName.SkillConfig)
local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua
index 684e3738a7..4e5c678848 100644
--- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua
@@ -182,11 +182,11 @@ function this:Refresh()
curGiftId = rechargeData.goodsId
LogBlue("#curGiftId:"..tostring(curGiftId))
if curType == 1 then
- this.tip.text = string.format("恭喜您等级提升至%s级,我们为您准备了超值礼包,助您提升战力!!!",RechargeConfig[curGiftId].Desc)
+ this.tip.text = string.format(Language[12319],RechargeConfig[curGiftId].Desc)
elseif curType == 3 then
- this.tip.text = string.format("恭喜通关当前关卡,我们为您准备了超值礼包,助您战力飙升")
+ this.tip.text = string.format(Language[12320])
elseif curType == 4 then
- this.tip.text = string.format("恭喜您击败心魔挑战成功,我们为您准备了超值礼包,帮助您击杀心魔快速通关!")
+ this.tip.text = string.format(Language[12321])
else
this.tip.text = ""
end
diff --git a/Assets/ManagedResources/~Lua/Modules/ZhiZunHaoLi/ZhiZunHaoLiPanel.lua b/Assets/ManagedResources/~Lua/Modules/ZhiZunHaoLi/ZhiZunHaoLiPanel.lua
index 1275329732..cd446fb3f1 100644
--- a/Assets/ManagedResources/~Lua/Modules/ZhiZunHaoLi/ZhiZunHaoLiPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/ZhiZunHaoLi/ZhiZunHaoLiPanel.lua
@@ -1,4 +1,4 @@
-require("Base/BasePanel")
+require("Base/BasePanel")
local ZhiZunHaoLiPanel = Inherit(BasePanel)
local this = ZhiZunHaoLiPanel
local sortingOrder = 0
diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
index 33d9be3384..5bcf48a7ae 100644
--- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
+++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
@@ -522,7 +522,7 @@ function SingleFightPlayerView:SetIconShow(_eventpoint)
str = ConfigManager.GetConfigData(ConfigName.SpecialConfig,112).Value
end
strList = string.split(str,"#")
- self.context.text = strList[FightPointPassManager.randomNum] or "你好"
+ self.context.text = strList[FightPointPassManager.randomNum] or Language[12322]
self:NotBattleShow()
elseif iconType == 8 or iconType == 11 then -- 宝箱
self:SetWalkDir(WALK_DIR.JINGYA)
diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv
index 462ccfd890..cc69657f70 100644
--- a/data_execl/Language_data/LanguageLua.csv
+++ b/data_execl/Language_data/LanguageLua.csv
@@ -2288,3 +2288,35 @@
12288,ȡĽ
12289,ٶڴ0á
12290,µѡһ
+12291,ǷǰƺŽ棿
+12292,ʣѴ%s
+12293,:%s
+12294,ɫƬ
+12295,ɫƬ
+12296,ɫƬ
+12297,
+12298,\nֱ25
+12299,ʣࣺ%s
+12300,
+12301,ѷϣ
+12302,ѡҪװ
+12303,ʣࣺ%s
+12304,Ѷһ
+12305,һ
+12306,ħ:
+12307,ǰѼóƺ\ǷҪظʹã
+12308,ɹƺţ
+12309,%sս˺%s
+12310,װ
+12311,ѡҪװ
+12312,װ
+12313,װУжװ!
+12314,ƺ
+12315,ƺ
+12316,ȡ
+12317,ƺ!
+12318,ȡƺ!
+12319,ϲȼ%sΪ˳ֵս!!!
+12320,ϲͨصǰؿΪ˳ֵս
+12321,ϲħսɹΪ˳ֵɱħͨأ
+12322,
diff --git a/data_execl/Language_data/LanguageText.csv b/data_execl/Language_data/LanguageText.csv
index 36b54c63b0..daa4856109 100644
--- a/data_execl/Language_data/LanguageText.csv
+++ b/data_execl/Language_data/LanguageText.csv
@@ -1996,3 +1996,12 @@
11996,
11997,ת̣ѡеĸΪս
11998,رȡרֱӻ200֣ɻȡ1980ʼȡ
+11999,ʮÿԱɿ1Σɣ
+12000,һ
+12001,δﵽһ˺ֵ
+12002,ʴ
+12003,40/75
+12004,ǰ
+12005,17Сʱ
+12006,µ
+12007,ѴнĿ꣡