From 2497735700dd70ae32107fc6ea3d5c2bcd523024 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 1 Apr 2021 16:21:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E5=9C=A825=E7=BA=A7=E5=85=B3=E5=8D=A1=E5=92=8C27=E7=BA=A7?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=EF=BC=8C=E5=8D=A1=E7=AD=89=E7=BA=A7=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E2=80=9C=E6=8C=91=E6=88=98=E5=85=B3?= =?UTF-8?q?=E5=8D=A1=E2=80=9D=E6=8C=89=E9=92=AE=E6=98=AF=E7=BD=AE=E7=81=B0?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index ddc115f5fd..17622a4f68 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -326,6 +326,7 @@ function FightPointPassMainPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint) Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare) Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) + Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText) end --移除事件监听(用于子类重写) @@ -338,6 +339,7 @@ function FightPointPassMainPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint) Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) + Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText) end --界面打开时调用(用于子类重写) From acfe38c97301a2600e6565f5f5bb0aeba5984f44 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 1 Apr 2021 17:11:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E8=A2=AB=E5=8A=A8263=20=20=20=E8=A2=AB=E5=8A=A8168?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e09bc5c8de..bfa9d2869c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -3464,10 +3464,14 @@ local passivityList = { list[i]:AddBuff(Buff.Create(role, BuffName.Shield, i1, ShieldTypeName.AllReduce, 0.25, 0)) end end + --如果只有一个人,这个人第一次上无敌盾就返回 + if index==1 and #list==1 then + return + end --如果场上能加无敌盾的不足两个,就给上过无敌盾的在上一个无敌盾 by: wangzhenxing 2021/3/30 if index<2 then for i = 1,2-index do - if not list[i]:IsRealDead() then + if list[i] and not list[i]:IsRealDead() then -- 吸血率%25 策划说写死 list[i]:AddBuff(Buff.Create(role, BuffName.Shield, i1, ShieldTypeName.AllReduce, 0.25, 0)) end @@ -5675,7 +5679,7 @@ local passivityList = { BattleUtil.RandomAction(pro, function() BattleLogic.BuffMgr:ClearBuff(defRole, function(buff) if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then - buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) + -- buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) return true end return false From cbb28ebeae0b9c37b38ac16e0754f4e724a16d52 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 1 Apr 2021 18:36:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=96=87=E6=9C=AC=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../ManagedResources/~Lua/Common/Language.lua | 45 ++++++++++++++++++- .../~Lua/Modules/Bag/BagPanel.lua | 2 +- .../~Lua/Modules/Battle/View/BattlePanel.lua | 2 +- .../Modules/Battle/View/GuideBattleLogic.lua | 2 +- .../~Lua/Modules/Chat/ChatManager.lua | 6 +-- .../Compound/view/CompoundPanel_Treasure.lua | 2 +- .../DynamicActivityManager.lua | 4 +- .../Modules/Fight/FastExploreInfoPopup.lua | 4 +- .../FuXingGaoZhao/FuXingGaoZhaoManager.lua | 2 +- .../FuXingGaoZhao/FuXingGaoZhaoPanel.lua | 14 +++--- .../~Lua/Modules/Main/GMPanel.lua | 8 ++-- .../~Lua/Modules/Main/MainPanel.lua | 6 +-- .../NiuQiChongTian/NiuQiChongTianManager.lua | 4 +- .../NiuQiChongTian/NiuQiChongTianPanel.lua | 8 ++-- .../Operating/CumulativeSignInPage.lua | 14 +++--- .../~Lua/Modules/Operating/GrowthGiftPage.lua | 10 ++--- .../~Lua/Modules/Operating/MissionPre.lua | 8 ++-- .../~Lua/Modules/Operating/MonthCardPage.lua | 14 +++--- .../Modules/Operating/UppperMonthCard.lua | 18 ++++---- .../~Lua/Modules/Player/PrivilegeManager.lua | 2 +- .../Popup/RewardItemSingleShowPopup.lua | 6 +-- .../Modules/Recharge/View/EveryDayGift.lua | 4 +- .../~Lua/Modules/Recharge/View/GiftPre.lua | 10 ++--- .../~Lua/Modules/Recharge/View/GiftView.lua | 4 +- .../Resolve/HeroAndEquipResolvePanel.lua | 2 +- .../Modules/RoleInfo/RoleEquipChangePopup.lua | 4 +- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 4 +- .../Modules/RoleInfo/RoleTalismanPanelV2.lua | 2 +- .../~Lua/Modules/Setting/SettingPanel.lua | 4 +- .../Modules/Setting/SettingPlayerRide.lua | 20 ++++----- .../TianShuMiJuan/TianShuMiJuanMainPanel.lua | 12 ++--- .../TianShuMiJuan/TianShuMiJuanManger.lua | 2 +- .../TimeLimitSkin/TimeLimitSkinPanel.lua | 4 +- .../ManagedResources/~Lua/View/FetterItem.lua | 2 +- .../~Lua/View/PlayerInfoView.lua | 2 +- data_execl/Language_data/LanguageLua.csv | 43 ++++++++++++++++++ data_execl/Language_data/LanguageText.csv | 33 +++++++++++++- 38 files changed, 224 insertions(+), 111 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 54a5333721..e6ec4b3aea 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2380,4 +2380,4 @@ PlayerTitleRideSkinRedPointTypeStr = { Skin = "PlayerSkin", Ride = "PlayerRide", Title = "PlayerTitle", -} +} \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 19eea2f567..5bdd05a8fb 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2234,6 +2234,47 @@ [12233] = GetLanguageStrById("核心神将:"), [12234] = GetLanguageStrById("%d次内必得金色及以上魂印"), [12235] = GetLanguageStrById("重连失败,请重新登录"), - [12236] = GetLanguageStrById("破盾"), - [12237] = GetLanguageStrById("清除"), + [12236] = GetLanguageStrById("是否前往坐骑界面?"), + [12237] = GetLanguageStrById("30级或充值任意金额后解锁"), + [12238] = GetLanguageStrById("%s 级公会 %s 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 %s 级)【马上加入】"), + [12239] = GetLanguageStrById("%s 发送了%s,请迅速前往抢夺红包!"), + [12240] = GetLanguageStrById("无可合成宝物!"), + [12241] = GetLanguageStrById("极速探索特权:每天增加免费2次,增加购买8次"), + [12242] = GetLanguageStrById("极速探索特权:每天增加免费2次,增加购买8次"), + [12243] = GetLanguageStrById("是否花费%s%s进行储值?"), + [12244] = GetLanguageStrById("您已成功进行储值!"), + [12245] = GetLanguageStrById("储 值"), + [12246] = GetLanguageStrById("剩余结束时间:%s"), + [12247] = GetLanguageStrById("一键装备"), + [12248] = GetLanguageStrById("一键宝器"), + [12249] = GetLanguageStrById("一键魂印"), + [12250] = GetLanguageStrById("一键灵兽"), + [12251] = GetLanguageStrById("诸神"), + [12252] = GetLanguageStrById("地煞"), + [12253] = GetLanguageStrById("天罡"), + [12254] = GetLanguageStrById("当前已激活该坐骑,是否要重复使用?"), + [12255] = GetLanguageStrById("成功激活坐骑!"), + [12256] = GetLanguageStrById("原价:%s元"), + [12257] = GetLanguageStrById("现价:%s元"), + [12258] = GetLanguageStrById("轩辕宝境必备特权!每天增加2次免费次数,6次额外购买次数!"), + [12259] = GetLanguageStrById("每日可额外增加3次免费的灵兽山招募机会,同时灵兽山妖晶招募价格变为8折!"), + [12260] = GetLanguageStrById("分解的魂印中包含金色或金色以上魂印,确定进行分解?"), + [12261] = GetLanguageStrById("替 换"), + [12262] = GetLanguageStrById("道具种类:%s"), + [12263] = GetLanguageStrById("1级神将无法进行归元!"), + [12264] = GetLanguageStrById("此神将已被锁定!"), + [12265] = GetLanguageStrById("1级法宝无法进行归元!"), + [12266] = GetLanguageStrById("信息"), + [12267] = GetLanguageStrById("坐骑"), + [12268] = GetLanguageStrById("暂未解锁"), + [12269] = GetLanguageStrById("使用中"), + [12270] = GetLanguageStrById("骑乘"), + [12271] = GetLanguageStrById("取消骑乘"), + [12272] = GetLanguageStrById("已骑乘坐骑!"), + [12273] = GetLanguageStrById("已取消骑乘!"), + [12274] = GetLanguageStrById("神将篇"), + [12275] = GetLanguageStrById("魂印篇"), + [12276] = GetLanguageStrById("灵兽篇"), + [12277] = GetLanguageStrById("激活属性:"), + [12278] = GetLanguageStrById("激活成功,获得%s%s"), } diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 3696bffc78..608490224c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -765,7 +765,7 @@ function this.ShowGuideGo() end function this.ShowWarPowerChange() Timer.New(function() - MsgPanel.ShowTwo("是否前往坐骑界面?",nil,function() + MsgPanel.ShowTwo(Language[12236],nil,function() UIManager.OpenPanel(UIName.SettingPanel,2) end) end, 1):Start() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 4e4cae3fbe..e656d90cdf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -90,7 +90,7 @@ function this:BindEvent() end) Util.AddClick(this.ButtonLock, function () - PopupTipPanel.ShowTip("30级或充值任意金额后解锁") + PopupTipPanel.ShowTip(Language[12237]) end) local pauseTime = 31 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua index cd06e4dc7e..a3ef68df3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua @@ -1,4 +1,4 @@ -local GuideBattleLogic = {} +local GuideBattleLogic = {} -- 引导节点配置 local _GuideConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index 44426d25f1..dd47490893 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -453,7 +453,7 @@ function this.RequestSendGuildTranscript(func) local channel = CHAT_CHANNEL.FAMILY local guildData = MyGuildManager.GetMyGuildInfo() local content = string.format( - GetLanguageStrById("%s发起了集结号角,请全体公会成员前往挑战副本首领!"), + GetLanguageStrById(Language[10314]), PlayerManager.nickName) this.RequestSendChatMsg(channel, content, function() end) @@ -499,7 +499,7 @@ function this.AnalysisGlobalChat(msg) chat.gLimitLv = tonumber(headList[5]) chat.joinType = tonumber(headList[6]) chat.content = string.format( - GetLanguageStrById("%s 级公会 %s 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 %s 级)【马上加入】"), + GetLanguageStrById(Language[12238]), chat.gLv, chat.gName, chat.gLimitLv) @@ -507,7 +507,7 @@ function this.AnalysisGlobalChat(msg) chat.nickName=headList[2] chat.redpackName=GetLanguageStrById(headList[3]) chat.content = string.format( - GetLanguageStrById("%s 发送了%s,请迅速前往抢夺红包!"), + GetLanguageStrById(Language[12239]), chat.nickName, chat.redpackName) elseif chat.type==GLOBAL_CHAT_TYPE.GUILD_AID then diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index a15ad636d7..5d8a2571aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -330,7 +330,7 @@ function this.AutoCompound(_position) PopupTipPanel.ShowTip(Language[10400]) return elseif LengthOfTable(endReward) < 1 then - PopupTipPanel.ShowTip("无可合成宝物!") + PopupTipPanel.ShowTip(Language[12240]) return end --BagManager.GetItemCountById(14) - diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 9e582c27de..65b4159533 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -578,7 +578,7 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType) else return nil end - data.buyInfo = "剩余:"..data.limitNum - data.boughtNum.."次" + data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048] _data.data = data _data.DataType = DataTypeIndex _data.sortId = curSortId @@ -617,7 +617,7 @@ function this.CreatSingleMissionData(missionData,havaBought) data.missionId = missionData.missionId data.shows = actRewardConfig[missionData.missionId].Reward data.itemName = itemConfig[data.shows[1][1]].Name - data.content = "达到"..actRewardConfig[data.missionId].Values[1][2].."级可领取" + data.content = Language[11367]..actRewardConfig[data.missionId].Values[1][2]..Language[11368] data.isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2] --0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取 if missionData.state == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua index e500139667..90559b1f63 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua @@ -179,9 +179,9 @@ function this.RefreshItemNum() this.effect:SetActive(not isActive) this.privilegeEffect:SetActive(isActive) if isActive then - this.privilegeContent.text = "极速探索特权:每天增加免费2次,增加购买8次" + this.privilegeContent.text = Language[12241] else - this.privilegeContent.text = "极速探索特权:每天增加免费2次,增加购买8次" + this.privilegeContent.text = Language[12242] end if isActive then local leftTime = PrivilegeManager.GetPrivilegeLeftTimeById(33) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua index 7add48d179..a866766492 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoManager.lua @@ -1,4 +1,4 @@ -FuXingGaoZhaoManager = {} +FuXingGaoZhaoManager = {} local this = FuXingGaoZhaoManager local Data = {} diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index a265bbe09c..686c20f583 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local FuXingGaoZhao = Inherit(BasePanel) local this = FuXingGaoZhao local sortingOrder = 0 @@ -39,9 +39,9 @@ function FuXingGaoZhao:BindEvent() JumpManager.GoJump(36003) else local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name - MsgPanel.ShowTwo(string.format("是否花费%s%s进行储值?",costNum,itemName), nil, function() + MsgPanel.ShowTwo(string.format(Language[12243],costNum,itemName), nil, function() NetManager.FuXingStoreBuyRequest(data.activityId,function () - PopupTipPanel.ShowTip("您已成功进行储值!") + PopupTipPanel.ShowTip(Language[12244]) FuXingGaoZhao:Refresh() end) end) @@ -98,7 +98,7 @@ function FuXingGaoZhao:SetBtn() local text = Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text") local redPoint = Util.GetGameObject(self.getBtn,"redPoint") if data.ActState == 0 then - text.text = "储 值" + text.text = Language[12245] self.getBtn:SetActive(true) redPoint:SetActive(false) elseif data.ActState == 1 then @@ -117,7 +117,7 @@ function FuXingGaoZhao:SetTime() self.timer = nil end local time = data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp() - self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) + self.time.text = string.format(Language[12246],TimeToFelaxible(time)) self.timer = Timer.New(function() time = time - 1 if time < 1 then @@ -125,7 +125,7 @@ function FuXingGaoZhao:SetTime() self.timer = nil self:ClosePanel() end - self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) + self.time.text = string.format(Language[12246],TimeToFelaxible(time)) end, 1, -1, true) self.timer:Start() end @@ -134,7 +134,7 @@ function FuXingGaoZhao:SetSingleReward(go,sdata,index) local reward = Util.GetGameObject(go,"GameObject") local mask = Util.GetGameObject(go,"mask") -- LogBlue("index:"..index.." go:"..tostring(go.name).." 天数:"..tostring(NumToSimplenessFont[index])) - Util.GetGameObject(go,"Text"):GetComponent("Text").text = string.format("第%s天",NumToSimplenessFont[index]) + Util.GetGameObject(go,"Text"):GetComponent("Text").text = string.format(Language[10528],NumToSimplenessFont[index]) if not itemPreList[index] then itemPreList[index] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index bd8512d0ec..ca39cd4d75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -155,7 +155,7 @@ function GMPanel:BindEvent() end function this.GetManyItems(text) - if text == "一键装备" then + if text == Language[12247] then local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) local cor = coroutine.start(function() for k,v in (config) do @@ -168,7 +168,7 @@ function this.GetManyItems(text) end) return end - if text == "一键宝器" then + if text == Language[12248] then local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) local cor = coroutine.start(function() for k,v in (config) do @@ -179,7 +179,7 @@ function this.GetManyItems(text) end) return end - if text == "一键魂印" then + if text == Language[12249] then local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) local cor = coroutine.start(function() for k,v in (config) do @@ -192,7 +192,7 @@ function this.GetManyItems(text) end) return end - if text == "一键灵兽" then + if text == Language[12250] then local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimal)) local cor = coroutine.start(function() for k,v in (config) do diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 8c43efa6c3..a892381cb3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1059,13 +1059,13 @@ function this.TimeFormat() -- 当日五点开始显示 if tempTime > 0 and tempTime < 16 * 60 * 60 then activityTabs[k].go.gameObject:SetActive(true) - activityTabs[k].timeText.text = "距开始\n"..TimeToHMS(tempTime) + activityTabs[k].timeText.text = Language[11211]..TimeToHMS(tempTime) else activityTabs[k].go.gameObject:SetActive(false) end else activityTabs[k].go.gameObject:SetActive(true) - activityTabs[k].timeText.text = "鏖战中" + activityTabs[k].timeText.text = Language[11212] end elseif v.FunType == 72 then local status = DeathPosManager.GetStatus() @@ -1076,7 +1076,7 @@ function this.TimeFormat() if endTime then local tempTime = endTime - PlayerManager.serverTime if tempTime and tempTime > 0 then - activityTabs[k].timeText.text = "距闯阵结束\n"..TimeToHMS(tempTime) + activityTabs[k].timeText.text = Language[11213]..TimeToHMS(tempTime) activityTabs[k].go.gameObject:SetActive(true) else activityTabs[k].go.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index 78fcef5a6a..78351532fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -1,4 +1,4 @@ -NiuQiChongTianManager = {} +NiuQiChongTianManager = {} local this = NiuQiChongTianManager this.rewardData = {} this.configData = {} @@ -165,4 +165,4 @@ function this.NiuQiCheckRedPoint4() return false end -return this +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 50333d56a6..a1ccb45fee 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local NiuQiChongTian = Inherit(BasePanel) local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) @@ -13,9 +13,9 @@ local curPage = 1 local redPointList = {} local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "诸神" ,rpType = RedPointType.NiuQiChongTian_1}, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "地煞" ,rpType = RedPointType.NiuQiChongTian_2}, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "天罡" ,rpType = RedPointType.NiuQiChongTian_3},} +local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12251] ,rpType = RedPointType.NiuQiChongTian_1}, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12252] ,rpType = RedPointType.NiuQiChongTian_2}, + [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12253] ,rpType = RedPointType.NiuQiChongTian_3},} local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} local curIndex = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index 4fa7800b59..538aa32f32 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -62,7 +62,7 @@ function CumulativeSignInPage:BindEvent() if data.mission[i].state == 0 then--未领取 if data.value < SignRewardConfig[i].Values[1][1] then --点击显示预览 - local getInfo Util.GetGameObject(self.rewardPanel,"getInfo"):GetComponent("Text").text = "连续签到"..SignRewardConfig[i].Values[1][1].."天获得:" + local getInfo Util.GetGameObject(self.rewardPanel,"getInfo"):GetComponent("Text").text = Language[11350]..SignRewardConfig[i].Values[1][1]..Language[11351] for j = 1, #SignRewardConfig[i].Reward do if not self.items[j] then local view = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(self.rewardPanel, "ViewRect/grid").transform) @@ -198,7 +198,7 @@ end --点击事件 function CumulativeSignInPage:OnSignInClicked(Id, index) if index < SignData.days then - PopupTipPanel.ShowTip("已领取") + PopupTipPanel.ShowTip(Language[10101]) elseif index == SignData.days then if receiveNum>0 then NetManager.RequestSignIn(Id, function(respond) @@ -218,15 +218,15 @@ function CumulativeSignInPage:OnSignInClicked(Id, index) CheckRedPointStatus(RedPointType.CumulativeSignIn) end) elseif receiveNum==0 and rechargeNum==1 then - MsgPanel.ShowTwo("今日充值任意金额后可再次领取签到奖励,是否前往充值?", function() + MsgPanel.ShowTwo(Language[11352], function() end, function() JumpManager.GoJump(27001) - end, "取消", "前往",nil, false) + end, Language[10731], Language[10019],nil, false) else - PopupTipPanel.ShowTip("已领取") + PopupTipPanel.ShowTip(Language[10101]) end else - PopupTipPanel.ShowTip("未达到签到天数") + PopupTipPanel.ShowTip(Language[11353]) end end @@ -256,7 +256,7 @@ function CumulativeSignInPage:RefreshBox() data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SignInfo) local curDay = data.value self.progressBottom.fillAmount = curDay/7 - self.dayText.text = curDay.."天" + self.dayText.text = curDay..Language[10017] self.rewardPanel:SetActive(false) for i = 1, #data.mission do if self.boxs[i] then diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 12a128fb65..67110691d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -129,7 +129,7 @@ function GrowthGiftPage:SetBtnInvestState() Util.SetGray(self.btnInvest, false) else self.btnInvest:GetComponent("Button").enabled = false - self.btnInvestText.text = "已购买" + self.btnInvestText.text = Language[10514] Util.SetGray(self.btnInvest, true) end end @@ -172,7 +172,7 @@ function GrowthGiftPage:CheckAllGet(curActiId,missionId) end function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId,self) if data.state == -1 then - PopupTipPanel.ShowTip("未达到等级要求~~~") + PopupTipPanel.ShowTip(Language[11372]) elseif data.state == 2 then NetManager.GetActivityRewardRequest(data.missionId,curActiId, function(drop) UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1) @@ -183,15 +183,15 @@ function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId,self) return end if(curActiId == 16)then--16是最后一个礼包的ActivityId - MsgPanel.ShowOne("恭喜!您已领取全部成长基金!") + MsgPanel.ShowOne(Language[11370]) self:RefreshGiftData(true) else - MsgPanel.ShowOne("恭喜!您已激活更高等级成长基金,大量妖晶福利等您领取,快来激活吧!") + MsgPanel.ShowOne(Language[11371]) self:OnShow(sortingOrder) end end) elseif data.state ~= 1 then - PopupTipPanel.ShowTip("请购买基金后领取") + PopupTipPanel.ShowTip(Language[11369]) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index 32b77327af..ffb7dd1339 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -126,18 +126,18 @@ function MissionPre:SetIcon(_itemdata) self.btnGet:GetComponent("Button").enabled = true if self.data.state == -1 then Util.SetGray(self.btnGet,true) - self.btnGetText.text = "领取" + self.btnGetText.text = Language[10018] elseif self.data.state == 2 then self.redPoint.gameObject:SetActive(true) - self.btnGetText.text = "领取" + self.btnGetText.text = Language[10018] elseif self.data.state == 1 then self.redPoint.gameObject:SetActive(false) - self.btnGetText.text = "已领取" + self.btnGetText.text = Language[10101] self.btnGet:GetComponent("Button").enabled = false Util.SetGray(self.btnGet,true) elseif self.data.state == 0 then self.redPoint.gameObject:SetActive(true) - self.btnGetText.text = "领取" + self.btnGetText.text = Language[10018] end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index c9b787781f..d422e1230b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -94,15 +94,15 @@ end function MonthCardPage:SetCardShow(i) cardData[i].curState = self.curAllMonthCardData[cardData[i].cardType] and self.curAllMonthCardData[cardData[i].cardType].endingTime ~= 0 - self.cardPres[i].day1.text = "累计充值".. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[cardData[i].cardType].Price) .."即可激活30天月卡"--"元即可激活30天月卡" - self.cardPres[i].day2.text = "激活后每日可领 "..monthCardConFig[cardData[i].cardType].BaseReward[1][2] .."" + self.cardPres[i].day1.text = Language[11377].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[cardData[i].cardType].Price) ..Language[11378]--Language[11379] + self.cardPres[i].day2.text = Language[11380]..monthCardConFig[cardData[i].cardType].BaseReward[1][2] .."" self.cardPres[i].icon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[cardData[i].cardType].BaseReward[1][1]).ResourceID)) self.cardPres[i].progress:SetActive(not cardData[i].curState) self.cardPres[i].progress:GetComponent("Text").text = "("..OperatingManager.GetmonthSaveAmt(i).."/"..monthCardConFig[cardData[i].cardType].Price..")" self.cardPres[i].dayRightUpText = monthCardConFig[cardData[i].cardType].ContiueDays * monthCardConFig[cardData[i].cardType].BaseReward[1][2] self.cardPres[i].dayRightUpIcon = SetIcon(monthCardConFig[cardData[i].cardType].BaseReward[1][1]) self.cardPres[i].monthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(cardData[i].cardType)) - self.cardPres[i].btnText = "立即激活" + self.cardPres[i].btnText = Language[11381] if not cardData[i].curState then self.cardPres[i].time:SetActive(false) Util.SetGray(self.cardPres[i].month,false) @@ -112,18 +112,18 @@ function MonthCardPage:SetCardShow(i) local residueTimeNum = self.curAllMonthCardData[cardData[i].cardType].endingTime + addTimeNum - GetTimeStamp() local dayNum = math.floor(residueTimeNum / (24 * 3600)) if dayNum > 0 then - self.cardPres[i].time:GetComponent("Text").text = "剩余" .. dayNum .."天" + self.cardPres[i].time:GetComponent("Text").text = Language[10480] .. dayNum ..Language[10017] else self:SetMonthCardTimes(residueTimeNum,cardData[i].time,self.cardPres[i].time,i) end if self.curAllMonthCardData[cardData[i].cardType].state == 0 then Util.SetGray(self.cardPres[i].month,false) self.cardPres[i].month:GetComponent("Button").enabled = true - Util.GetGameObject(self.cardPres[i].month, "Text"):GetComponent("Text").text = "立即领取" + Util.GetGameObject(self.cardPres[i].month, "Text"):GetComponent("Text").text = Language[11382] elseif self.curAllMonthCardData[cardData[i].cardType].state == 1 then Util.SetGray(self.cardPres[i].month,true) self.cardPres[i].month:GetComponent("Button").enabled = false - Util.GetGameObject(self.cardPres[i].month, "Text"):GetComponent("Text").text = "已领取" + Util.GetGameObject(self.cardPres[i].month, "Text"):GetComponent("Text").text = Language[10101] end end end @@ -134,7 +134,7 @@ function MonthCardPage:SetMonthCardTimes(timeNums,timer,timeCom,index) timer = nil end timer = Timer.New(function() - timeCom:GetComponent("Text").text = "剩余时间:"..TimeStampToDateStr3(timeNums) + timeCom:GetComponent("Text").text = Language[10023]..TimeStampToDateStr3(timeNums) if timeNums < 0 then OperatingManager.RefreshMonthCardEnd() self.curAllMonthCardData = OperatingManager.GetMonthCardData() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 3efe0b5333..930a2a583b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -79,10 +79,10 @@ function UpperMonthCard:BindEvent() Util.AddClick(self.btnBuy, function() local isActive = VipManager.GetMonthCardOpenState() if not isActive then - MsgPanel.ShowTwo("请先激活豪华月卡", function() + MsgPanel.ShowTwo(Language[11387], function() end, function(isShow) JumpManager.GoJump(36004) - end, "取消", "前往",nil, false) + end, Language[10731], Language[10019],nil, false) else PayManager.Pay(self.baseType, function(id) self:RechargeSuccessFunc(id) @@ -205,7 +205,7 @@ function UpperMonthCard:SetBuyPanelInfo() end end, 1, -1, true) self.buyTimer:Start() - self.actLeftTime.text = "剩余时间: " .. self:TimeFormat(endTime - PlayerManager.serverTime) + self.actLeftTime.text = Language[10573] .. self:TimeFormat(endTime - PlayerManager.serverTime) end else self.actLeftTime.gameObject:SetActive(false) @@ -215,9 +215,9 @@ end function UpperMonthCard:SetBoughtPanelInfo() local endTime = OperatingManager.GetGoodsEndTime(self.chargerBaseType) - self.totalLoginday.text = "当前天数:" .. OperatingManager.GetRewardDay(self.chargerBaseType) .. "天" + self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017] local startStr, endStr = OperatingManager.GetShowTime(endTime) - self.boughtLeftTime.text = "领取时间:" ..startStr .. " — ".. endStr + self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr --- 购买后倒计时显示 self.timer = nil @@ -229,7 +229,7 @@ function UpperMonthCard:SetBoughtPanelInfo() self.timer:Stop() else OperatingManager.SetSerData(self.chargerBaseType) - self.totalLoginday.text = "当前天数:" .. OperatingManager.GetRewardDay(self.chargerBaseType) .. "天" + self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017] end end, 1, -1, true) self.timer:Start() @@ -253,9 +253,9 @@ end function UpperMonthCard:FreshBoughtShow() self.boughtPanel:SetActive(true) self.buyPanel:SetActive(false) - self.totalLoginday.text = "当前天数:" .. OperatingManager.GetRewardDay(self.chargerBaseType) .. "天" + self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017] local startStr, endStr = OperatingManager.GetShowTime(OperatingManager.GetGoodsEndTime(self.chargerBaseType)) - self.boughtLeftTime.text = "领取时间:" ..startStr .. " — ".. endStr + self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr end @@ -264,7 +264,7 @@ function UpperMonthCard:TimeFormat(second) local minute = math.floor(second / 60) % 60 local sec = second % 60 local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - return string.format("%d天%02d时%02d分", day, hour, minute) + return string.format(Language[11390], day, hour, minute) end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index e51d05c383..a34723514d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -257,7 +257,7 @@ function PrivilegeManager.GetPrivilegeOpenTip(privilegeType) local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1) -- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) -- return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2]) - return string.format("玩家等级达到 %s 级解锁",lvOpenTimeScaleConFig.Condition[1][1]) + return string.format(Language[11406],lvOpenTimeScaleConFig.Condition[1][1]) end -- end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index ec0bbfc163..b608c6d7da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -160,11 +160,11 @@ function RewardItemSingleShowPopup:BindEvent() elseif itemConfigData.ItemType == ItemType.Ride then local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) if PlayerManager.userMountList[itemConfigData.Id] then - MsgPanel.ShowTwo("当前已激活该坐骑,是否要重复使用?",nil,function() + MsgPanel.ShowTwo(Language[12254],nil,function() NetManager.ActiveUserMountRequest(itemSid,function (msg) PlayerManager.SetPlayerMountTime(itemSid,msg.validTime) self:ClosePanel() - PopupTipPanel.ShowTip("成功激活坐骑!") + PopupTipPanel.ShowTip(Language[12255]) this.WarPowerChange(oldPowerNum) end) end) @@ -172,7 +172,7 @@ function RewardItemSingleShowPopup:BindEvent() NetManager.ActiveUserMountRequest(itemSid,function (msg) PlayerManager.SetPlayerMountTime(itemSid,msg.validTime) self:ClosePanel() - PopupTipPanel.ShowTip("成功激活坐骑!") + PopupTipPanel.ShowTip(Language[12255]) this.WarPowerChange(oldPowerNum) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index faf5cc7131..cdd63eabd4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -214,8 +214,8 @@ function EveryDayGift:RefreshOneKeyShow() local now = 0 now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1004).Price) - self.oriPrice.text = string.format("原价:%s元",ori) - self.nowPrice.text = string.format("现价:%s元",now) + self.oriPrice.text = string.format(Language[12256],ori) + self.nowPrice.text = string.format(Language[12257],now) end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index cecdae03bc..b61e766b83 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -251,7 +251,7 @@ function GiftPre:SetContent1() self.upLayout.gameObject:SetActive(false) elseif self.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.VIP_GIFT then local str = "("..rechargeNum.."/"..self.data.data.shopItemData.BuyRule[2]..Language[11698] - self:SetType1("累计充值",self.data.data.shopItemData.BuyRule[2],str) + self:SetType1(Language[11377],self.data.data.shopItemData.BuyRule[2],str) elseif (self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.FINDTREASURE_GIFT) or (self.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.FINDTREASURE_GIFT) then self.tipRoot:SetActive(true) @@ -263,7 +263,7 @@ end function GiftPre:SetType1(type1Text1,num,type1Text3) self.type1.gameObject:SetActive(true) CreatNumberPrefab(tostring(num),self.numList) - self.type1Text1.text = "累计充值" + self.type1Text1.text = Language[11377] self.type1Text3.text = type1Text3 end @@ -319,10 +319,10 @@ function GiftPre:SetTip() end elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then self.tip5:SetActive(true) - self.tip5Text.text = "轩辕宝境必备特权!每天增加2次免费次数,6次额外购买次数!" + self.tip5Text.text = Language[12258] elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 7105 then self.tip5:SetActive(true) - self.tip5Text.text = "每日可额外增加3次免费的灵兽山招募机会,同时灵兽山妖晶招募价格变为8折!" + self.tip5Text.text = Language[12259] end end @@ -343,7 +343,7 @@ end function GiftPre:SetIcon() if self.isCanBuy == 2 then self.icon.gameObject:SetActive(false) - self.price.text = "已购买" + self.price.text = Language[10514] else if self.data.DataType == DataType.Shop then self.icon.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index fbeb18f1e7..c2c0b81cc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -143,8 +143,8 @@ function GiftView:RefreshOneKeyShow() -- self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori -- self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now - self.oriPrice.text = string.format("原价:%s元",ori) - self.nowPrice.text = string.format("现价:%s元",now) + self.oriPrice.text = string.format(Language[12256],ori) + self.nowPrice.text = string.format(Language[12257],now) end -- 刷新礼包的数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua index 774ff2a845..485e3d0303 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua @@ -522,7 +522,7 @@ function this.ResolveBtnClickEvent() local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isSoulPrintShowSure") local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) if (isPopUp ~= currentTime) then - MsgPanel.ShowTwo("分解的魂印中包含金色或金色以上魂印,确定进行分解?", nil, function(isShow) + MsgPanel.ShowTwo(Language[12260], nil, function(isShow) if (isShow) then local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .."isSoulPrintShowSure", currentTime) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index a741ef59d4..2cadcea127 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -158,7 +158,7 @@ function RoleEquipChangePopup:OnShow() this.equipPanel[2].curEquipText:SetActive(false) this.equipPanel[1].curEquipBtnDown:SetActive(false) this.equipPanel[2].curEquipBtnDown:SetActive(true) - this.equipPanel[2].curEquipBtnDownText.text = "替 换" + this.equipPanel[2].curEquipBtnDownText.text = Language[12261] --"替 换" this.ShowCurEquipData(2) this.NextCurEquipData() @@ -185,7 +185,7 @@ function this.SetEquipData(index,data,equipConfigData,itemConfigData) -- strPos= Language[11476] -- end -- this.equipPanel[index].curEquipPosText.text=string.format(strPos,GetJobStrByJobNum(equipConfigData.ProfessionLimit)) - this.equipPanel[index].curEquipPosText.text=string.format("道具种类:%s",GetEquipPosStrByEquipPosNum(equipConfigData.Position)) + this.equipPanel[index].curEquipPosText.text=string.format(Language[12262],GetEquipPosStrByEquipPosNum(equipConfigData.Position)) if not this.mainProList then this.mainProList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index c4e4368527..afab112ade 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -147,7 +147,7 @@ function RoleInfoPanel:BindEvent() --角色归元按钮 Util.AddClick(this.RecallBtn,function() if curHeroData.lv <= 1 then - PopupTipPanel.ShowTip("1级神将无法进行归元!") + PopupTipPanel.ShowTip(Language[12263]) return end if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then @@ -161,7 +161,7 @@ function RoleInfoPanel:BindEvent() end end if curHeroData.lockState == 1 then - PopupTipPanel.ShowTip("此神将已被锁定!") + PopupTipPanel.ShowTip(Language[12264]) -- MsgPanel.ShowTwo(Language[11740], nil, function() -- NetManager.HeroLockEvent(curHeroData.dynamicId,0,function () -- PopupTipPanel.ShowTip(Language[11741]) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua index 655211bc3f..1fb2f67503 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua @@ -91,7 +91,7 @@ function RoleTalismanPanelV2:BindEvent() --进阶按钮 Util.AddClick(this.RecallBtn, function() if curHeroData.talismanList and curHeroData.talismanList <= 1 then - PopupTipPanel.ShowTip("1级法宝无法进行归元!") + PopupTipPanel.ShowTip(Language[12265]) return end local selectHero = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua index e6a211e409..f4d66af86f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua @@ -5,9 +5,9 @@ local funIndex = 1 --Tab local TabBox = require("Modules/Common/TabBox") local _TabData={ - [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "信息" , rpType = RedPointType.Setting_Head}, + [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 = "称号" }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "坐骑" , rpType = RedPointType.Setting_Ride}, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12267] , rpType = RedPointType.Setting_Ride}, -- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "时装" }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index 7df512ac18..2d3a56c8be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -18,9 +18,9 @@ function SettingPlayerRide:InitComponent(gameObject) this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent") this.live2dRootParent2 = Util.GetGameObject(gameObject, "live2dRootParent2") this.name = Util.GetGameObject(gameObject, "name/Text"):GetComponent("Text") - Util.GetGameObject(gameObject, "skinProInfo/getInfoImage/Text"):GetComponent("Text").text = "获取途径" + Util.GetGameObject(gameObject, "skinProInfo/getInfoImage/Text"):GetComponent("Text").text = Language[11829] this.getInfo = Util.GetGameObject(gameObject, "skinProInfo/getInfo"):GetComponent("Text") - Util.GetGameObject(gameObject, "skinProInfo/proImage/Text"):GetComponent("Text").text = "属性加成" + Util.GetGameObject(gameObject, "skinProInfo/proImage/Text"):GetComponent("Text").text = Language[11965] this.goToBtn = Util.GetGameObject(gameObject, "goToBtn") this.goToBtnText = Util.GetGameObject(gameObject, "goToBtn/Text"):GetComponent("Text") this.stateImg = Util.GetGameObject(gameObject, "stateImg"):GetComponent("Image") @@ -98,8 +98,8 @@ function this.ShowRideInfo(go,data) local itemConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig,PlayerHeadIconConfig.ItemId) local PlayerRoleConFig = ConfigManager.GetConfigData(ConfigName.PlayerRole,PlayerHeadIconConfig.ItemId) Util.GetGameObject(go, "iconMask/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(PlayerRoleConFig.LargeIcon)) - Util.GetGameObject(go, "noGetImage/noGetImage/Text"):GetComponent("Text").text = "暂未解锁" - Util.GetGameObject(go, "GetImage/GetImage/Text"):GetComponent("Text").text = "使用中" + Util.GetGameObject(go, "noGetImage/noGetImage/Text"):GetComponent("Text").text = Language[12268] + Util.GetGameObject(go, "GetImage/GetImage/Text"):GetComponent("Text").text = Language[12269] local noGetImage = Util.GetGameObject(go, "noGetImage") local GetImage = Util.GetGameObject(go, "GetImage") this.setImage:SetActive(false) @@ -143,16 +143,16 @@ function this.SingleRideClickShowInfo(data,go) end, not false, not false) this.stateImgGo:SetActive(true) if not isGet and not isUser then - this.goToBtnText.text = "获取途径" + this.goToBtnText.text = Language[11829] this.stateImgGo:SetActive(false) elseif isGet and not isUser then - this.goToBtnText.text = "骑乘" + this.goToBtnText.text = Language[12270] elseif isGet and isUser then - this.goToBtnText.text ="取消骑乘" + this.goToBtnText.text =Language[12271] end local setateImageStr = curPlayerHeadIconConfig.Time == 0 and "c_zuoqi_yongjiu_zh" or "c_zuoqi_xianshi_zh" this.stateImg.sprite = Util.LoadSprite(setateImageStr) - this.lefeTime.text = curPlayerHeadIconConfig.Time == 0 and "" or "到期时间:"..TimeStampToDateStr(rideData.overTime) + this.lefeTime.text = curPlayerHeadIconConfig.Time == 0 and "" or Language[12173]..TimeStampToDateStr(rideData.overTime) if live2dRoot then live2dRoot:OnClose() end @@ -180,14 +180,14 @@ function this.SingleRideClickShowInfo(data,go) PlayerManager.SetPlayerRide(curPlayerHeadIconConfig.Id) this.ShowPanelData() PlayerManager.SetisRefreshMainPanelNpc(true) - PopupTipPanel.ShowTip("已骑乘坐骑!") + PopupTipPanel.ShowTip(Language[12272]) end) elseif isGet and isUser then NetManager.RequestChangeModifyDecoration(3,0,function() PlayerManager.SetPlayerRide(0) this.ShowPanelData() PlayerManager.SetisRefreshMainPanelNpc(true) - PopupTipPanel.ShowTip("已取消骑乘!") + PopupTipPanel.ShowTip(Language[12273]) end) end end) diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index a58109f28b..5e80364920 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -8,22 +8,22 @@ local redPointList = {} local TabBox = require("Modules/Common/TabBox") local tabs = { [1] = { --神将 - default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "神将篇", + default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274], rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh", }, [2] = { --魂印 - default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "魂印篇", + default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275], rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock }, [3] = { --灵兽 - default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "灵兽篇", + default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12276], rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu",zi = "t_tianshumijuan_lingshoupian_zi_zh", }, } local status = { - [0] = "全部", - [1] = "已激活", - [2] = "未激活", + [0] = Language[10175], + [1] = Language[11533], + [2] = Language[11947], } local curPage = 1 local data = {} diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua index 6a3662bb39..e3ee4b18a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua @@ -41,7 +41,7 @@ function this.CreatSingleConfigData(configData) data.name = GetLanguageStrById(configData.Name) data.teamers = configData.Teamers data.activePara = configData.ActivePara - data.activeParaTip = "激活属性:" + data.activeParaTip = Language[12277] for i = 1, #data.activePara do local config = propertyConfig[data.activePara[i][1]] local value= GetEquipPropertyFormatStr(config.Style,data.activePara[i][2]) diff --git a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua index d9433bca69..28b1329e4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua @@ -1,4 +1,4 @@ -require("Base/BasePanel") +require("Base/BasePanel") local TimeLimitSkin = Inherit(BasePanel) local this = TimeLimitSkin @@ -116,7 +116,7 @@ function TimeLimitSkin:SetAttri() local rg = ConfigManager.GetConfigDataByKey(ConfigName.ItemConfig,"Id",reward).RewardGroup local skins = ConfigManager.GetConfigDataByKey(ConfigName.RewardGroup,"Id",rg[1]).ShowItem local attris = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Id",skins[1][1]).MonomerProperty--所有皮肤加属性相同就用了第一个 - local str = "属性加成:" + local str = Language[11440] for i = 1, #attris do local attriData = ConfigManager.GetConfigData(ConfigName.PropertyConfig,attris[i][1]) local attriName = attriData.Info diff --git a/Assets/ManagedResources/~Lua/View/FetterItem.lua b/Assets/ManagedResources/~Lua/View/FetterItem.lua index e127e4d6b0..0be6338037 100644 --- a/Assets/ManagedResources/~Lua/View/FetterItem.lua +++ b/Assets/ManagedResources/~Lua/View/FetterItem.lua @@ -31,7 +31,7 @@ function FetterItem:BindEvent() NetManager.PokemonBookEnableRequest(self.itemData.id,function(msg) if msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then local item = msg.drop.itemlist[1] - PopupTipPanel.ShowTip(string.format("激活成功,获得%s%s",item.itemNum,ConfigManager.GetConfigData(ConfigName.ItemConfig,item.itemId).Name)) + PopupTipPanel.ShowTip(string.format(Language[12278],item.itemNum,ConfigManager.GetConfigData(ConfigName.ItemConfig,item.itemId).Name)) end TianShuMiJuanManger.UpdateFetterId({self.itemData.id}) local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index 86f070ea5f..2b0c3285f6 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -1,4 +1,4 @@ -PlayerInfoView = {} +PlayerInfoView = {} function PlayerInfoView:New(gameObject) local b = {} diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 4d537e7606..641beffc79 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -2233,3 +2233,46 @@ 12233,񽫣 12234,%dڱصýɫϻӡ 12235,ʧܣµ¼ +12236,Ƿǰ棿 +12237,30ֵ +12238,%s %s ļϢλð߼룡(ȼ %s )ϼ롿 +12239,%s %sѸǰ +12240,޿ɺϳɱ +12241,̽Ȩÿ8 +12242,̽Ȩÿ8 +12243,Ƿ񻨷%s%sдֵ +12244,ѳɹдֵ +12245, ֵ +12246,ʣʱ䣺%s +12247,һװ +12248,һ +12249,һӡ +12250,һ +12251, +12252,ɷ +12253, +12254,ǰѼǷҪظʹã +12255,ɹ +12256,ԭۣ%sԪ +12257,ּۣ%sԪ +12258,ԯرȨÿ2Ѵ6ζ⹺ +12259,ÿտɶ3ѵɽļᣬͬʱɽļ۸Ϊ8! +12260,ֽĻӡаɫɫϻӡȷзֽ⣿ +12261, +12262,ࣺ%s +12263,1޷йԪ +12264,ѱ +12265,1޷йԪ +12266,Ϣ +12267, +12268,δ +12269,ʹ +12270, +12271,ȡ +12272, +12273,ȡˣ +12274,ƪ +12275,ӡƪ +12276,ƪ +12277,ԣ +12278,ɹ%s%s diff --git a/data_execl/Language_data/LanguageText.csv b/data_execl/Language_data/LanguageText.csv index 26f356f659..4fca27ebc3 100644 --- a/data_execl/Language_data/LanguageText.csv +++ b/data_execl/Language_data/LanguageText.csv @@ -1371,7 +1371,7 @@ 11371, 11372,Ƿ 100000000 11373,\ 100ս -11374,"\""ÿÿÿÿÿÿ족" +11374,\"\"\"ÿÿÿÿÿÿ족\" 11375,13ֻƤƤϺ 11376,ѰԨ֮\Ȫˮ 11377,໴ħ @@ -1557,7 +1557,7 @@ 11557,ɽӰ 11558, 11559,ɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰ -11560," " +11560,\" \" 11561,츳 11562,ɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰɰ 11563,5ˣ0/5 @@ -1963,3 +1963,32 @@ 11963,ϷԴ... 11964,ս\n 11965,\n +11966,Ѫðµ˵λ˵ڰŶм¼ѣЧ +11967, ׷ ׷ +11968,648Ԫ +11969,328Ԫ +11970,طְҵطְҵطְҵطְҵطְҵطְҵ +11971,طְҵطְҵطְҵطְҵطְҵطְҵ +11972,ÿ\n\n\n\n\nֵ\n6\nԪ +11973,۳6Ԫ +11974,۳ֵ100Ԫ +11975, ֵ +11976,ʣʱ䣺511ʱ23 +11977,˼ +11978,ɰ +11979,ƲϷܾϷעұƭϵ\nʶϷԣϷʱ䣬ܽ\nϷʺ18ϵûʹãΪĽϷʱ䡣 +11980,³[2021]424 ISBN 978-7-498-08833-8\nȨˣʱƼ޹˾ 浥λʱ뼼޹˾ +11981, 񽫾 Ԫ ػӡ +11982,ȡѰ1 +11983,ʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵİʵʵ +11984,\"ÿÿÿÿÿÿ족 +11985, +11986,ףףףף +11987,ս+200 +11988,ʱ䣺 20221128 10:55 +11989,޷Ҫؾ +11990,ʣʱ䣺11Сʱ1 +11991,Ƥ: +11992,޹1 +11993, +11994,: From 54870cd6011c322554ca222179c70650540fd320 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 1 Apr 2021 18:41:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E5=A4=A9=E3=80=91=E5=8A=A8=E7=94=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6e62ebd50a129671fc76e82d15179816b2c496c2) --- .../Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index a1ccb45fee..0ec81941b5 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -99,12 +99,12 @@ function this.TabAdapter(tab, index, status) end --切换 -function this.SwitchView(index) +function this.SwitchView(index,bool) curPage = index rewardData = NiuQiChongTianManager.GetNeedRewardData(curPage) NiuQiChongTian:SetProgress() - NiuQiChongTian:SetReward() + NiuQiChongTian:SetReward(bool) end function NiuQiChongTian:SetProgress() @@ -136,11 +136,12 @@ function NiuQiChongTian:SetProgress() end end -function NiuQiChongTian:SetReward() +function NiuQiChongTian:SetReward(bool) + local anim = bool or false local data = {} self.ScrollView:SetData(rewardData, function (index, go) NiuQiChongTian:SingleDataShow(go,index,rewardData[index]) - end,false,false) + end,false,anim) end function NiuQiChongTian:SingleDataShow(go, index,data) @@ -195,7 +196,7 @@ function NiuQiChongTian:SingleDataShow(go, index,data) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () CheckRedPointStatus(RedPointType.NiuQiChongTian + curPage) CheckRedPointStatus(RedPointType.NiuQiChongTian_4) - this.SwitchView(curPage) + this.SwitchView(curPage,true) end) end) end