Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
dev_chengFeng
jiaoyangna 2021-04-01 18:52:58 +08:00
commit a81c48c533
40 changed files with 238 additions and 118 deletions

View File

@ -2380,4 +2380,4 @@ PlayerTitleRideSkinRedPointTypeStr = {
Skin = "PlayerSkin", Skin = "PlayerSkin",
Ride = "PlayerRide", Ride = "PlayerRide",
Title = "PlayerTitle", Title = "PlayerTitle",
} }

View File

@ -2234,6 +2234,47 @@
[12233] = GetLanguageStrById("核心神将:"), [12233] = GetLanguageStrById("核心神将:"),
[12234] = GetLanguageStrById("%d次内必得金色及以上魂印"), [12234] = GetLanguageStrById("%d次内必得金色及以上魂印"),
[12235] = GetLanguageStrById("重连失败,请重新登录"), [12235] = GetLanguageStrById("重连失败,请重新登录"),
[12236] = GetLanguageStrById("破盾"), [12236] = GetLanguageStrById("是否前往坐骑界面?"),
[12237] = GetLanguageStrById("清除"), [12237] = GetLanguageStrById("30级或充值任意金额后解锁"),
[12238] = GetLanguageStrById("<color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>"),
[12239] = GetLanguageStrById("%s 发送了%s请迅速前往抢夺红包"),
[12240] = GetLanguageStrById("无可合成宝物!"),
[12241] = GetLanguageStrById("<color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>"),
[12242] = GetLanguageStrById("极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>"),
[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"),
} }

View File

@ -765,7 +765,7 @@ function this.ShowGuideGo()
end end
function this.ShowWarPowerChange() function this.ShowWarPowerChange()
Timer.New(function() Timer.New(function()
MsgPanel.ShowTwo("是否前往坐骑界面?",nil,function() MsgPanel.ShowTwo(Language[12236],nil,function()
UIManager.OpenPanel(UIName.SettingPanel,2) UIManager.OpenPanel(UIName.SettingPanel,2)
end) end)
end, 1):Start() end, 1):Start()

View File

@ -3464,10 +3464,14 @@ local passivityList = {
list[i]:AddBuff(Buff.Create(role, BuffName.Shield, i1, ShieldTypeName.AllReduce, 0.25, 0)) list[i]:AddBuff(Buff.Create(role, BuffName.Shield, i1, ShieldTypeName.AllReduce, 0.25, 0))
end end
end end
--如果只有一个人,这个人第一次上无敌盾就返回
if index==1 and #list==1 then
return
end
--如果场上能加无敌盾的不足两个,就给上过无敌盾的在上一个无敌盾 by: wangzhenxing 2021/3/30 --如果场上能加无敌盾的不足两个,就给上过无敌盾的在上一个无敌盾 by: wangzhenxing 2021/3/30
if index<2 then if index<2 then
for i = 1,2-index do for i = 1,2-index do
if not list[i]:IsRealDead() then if list[i] and not list[i]:IsRealDead() then
-- 吸血率%25 策划说写死 -- 吸血率%25 策划说写死
list[i]:AddBuff(Buff.Create(role, BuffName.Shield, i1, ShieldTypeName.AllReduce, 0.25, 0)) list[i]:AddBuff(Buff.Create(role, BuffName.Shield, i1, ShieldTypeName.AllReduce, 0.25, 0))
end end
@ -5675,7 +5679,7 @@ local passivityList = {
BattleUtil.RandomAction(pro, function() BattleUtil.RandomAction(pro, function()
BattleLogic.BuffMgr:ClearBuff(defRole, function(buff) BattleLogic.BuffMgr:ClearBuff(defRole, function(buff)
if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then 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 return true
end end
return false return false

View File

@ -90,7 +90,7 @@ function this:BindEvent()
end) end)
Util.AddClick(this.ButtonLock, function () Util.AddClick(this.ButtonLock, function ()
PopupTipPanel.ShowTip("30级或充值任意金额后解锁") PopupTipPanel.ShowTip(Language[12237])
end) end)
local pauseTime = 31 local pauseTime = 31

View File

@ -1,4 +1,4 @@
local GuideBattleLogic = {} local GuideBattleLogic = {}
-- 引导节点配置 -- 引导节点配置
local _GuideConfig = { local _GuideConfig = {

View File

@ -453,7 +453,7 @@ function this.RequestSendGuildTranscript(func)
local channel = CHAT_CHANNEL.FAMILY local channel = CHAT_CHANNEL.FAMILY
local guildData = MyGuildManager.GetMyGuildInfo() local guildData = MyGuildManager.GetMyGuildInfo()
local content = string.format( local content = string.format(
GetLanguageStrById("%s发起了集结号角请全体公会成员前往挑战副本首领"), GetLanguageStrById(Language[10314]),
PlayerManager.nickName) PlayerManager.nickName)
this.RequestSendChatMsg(channel, content, function() this.RequestSendChatMsg(channel, content, function()
end) end)
@ -499,7 +499,7 @@ function this.AnalysisGlobalChat(msg)
chat.gLimitLv = tonumber(headList[5]) chat.gLimitLv = tonumber(headList[5])
chat.joinType = tonumber(headList[6]) chat.joinType = tonumber(headList[6])
chat.content = string.format( chat.content = string.format(
GetLanguageStrById("<color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>"), GetLanguageStrById(Language[12238]),
chat.gLv, chat.gLv,
chat.gName, chat.gName,
chat.gLimitLv) chat.gLimitLv)
@ -507,7 +507,7 @@ function this.AnalysisGlobalChat(msg)
chat.nickName=headList[2] chat.nickName=headList[2]
chat.redpackName=GetLanguageStrById(headList[3]) chat.redpackName=GetLanguageStrById(headList[3])
chat.content = string.format( chat.content = string.format(
GetLanguageStrById("%s 发送了%s请迅速前往抢夺红包"), GetLanguageStrById(Language[12239]),
chat.nickName, chat.nickName,
chat.redpackName) chat.redpackName)
elseif chat.type==GLOBAL_CHAT_TYPE.GUILD_AID then elseif chat.type==GLOBAL_CHAT_TYPE.GUILD_AID then

View File

@ -330,7 +330,7 @@ function this.AutoCompound(_position)
PopupTipPanel.ShowTip(Language[10400]) PopupTipPanel.ShowTip(Language[10400])
return return
elseif LengthOfTable(endReward) < 1 then elseif LengthOfTable(endReward) < 1 then
PopupTipPanel.ShowTip("无可合成宝物!") PopupTipPanel.ShowTip(Language[12240])
return return
end end
--BagManager.GetItemCountById(14) - --BagManager.GetItemCountById(14) -

View File

@ -578,7 +578,7 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType)
else else
return nil return nil
end end
data.buyInfo = "剩余:"..data.limitNum - data.boughtNum.."" data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
_data.data = data _data.data = data
_data.DataType = DataTypeIndex _data.DataType = DataTypeIndex
_data.sortId = curSortId _data.sortId = curSortId
@ -617,7 +617,7 @@ function this.CreatSingleMissionData(missionData,havaBought)
data.missionId = missionData.missionId data.missionId = missionData.missionId
data.shows = actRewardConfig[missionData.missionId].Reward data.shows = actRewardConfig[missionData.missionId].Reward
data.itemName = itemConfig[data.shows[1][1]].Name 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] data.isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2]
--0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取 --0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取
if missionData.state == 0 then if missionData.state == 0 then

View File

@ -179,9 +179,9 @@ function this.RefreshItemNum()
this.effect:SetActive(not isActive) this.effect:SetActive(not isActive)
this.privilegeEffect:SetActive(isActive) this.privilegeEffect:SetActive(isActive)
if isActive then if isActive then
this.privilegeContent.text = "<color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>" this.privilegeContent.text = Language[12241]
else else
this.privilegeContent.text = "极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>" this.privilegeContent.text = Language[12242]
end end
if isActive then if isActive then
local leftTime = PrivilegeManager.GetPrivilegeLeftTimeById(33) local leftTime = PrivilegeManager.GetPrivilegeLeftTimeById(33)

View File

@ -326,6 +326,7 @@ function FightPointPassMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint) Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint)
Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare) Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
end end
--移除事件监听(用于子类重写) --移除事件监听(用于子类重写)
@ -338,6 +339,7 @@ function FightPointPassMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint) Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint)
Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare) Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
end end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)

View File

@ -1,4 +1,4 @@
FuXingGaoZhaoManager = {} FuXingGaoZhaoManager = {}
local this = FuXingGaoZhaoManager local this = FuXingGaoZhaoManager
local Data = {} local Data = {}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel") require("Base/BasePanel")
local FuXingGaoZhao = Inherit(BasePanel) local FuXingGaoZhao = Inherit(BasePanel)
local this = FuXingGaoZhao local this = FuXingGaoZhao
local sortingOrder = 0 local sortingOrder = 0
@ -39,9 +39,9 @@ function FuXingGaoZhao:BindEvent()
JumpManager.GoJump(36003) JumpManager.GoJump(36003)
else else
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name 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 () NetManager.FuXingStoreBuyRequest(data.activityId,function ()
PopupTipPanel.ShowTip("您已成功进行储值!") PopupTipPanel.ShowTip(Language[12244])
FuXingGaoZhao:Refresh() FuXingGaoZhao:Refresh()
end) end)
end) end)
@ -98,7 +98,7 @@ function FuXingGaoZhao:SetBtn()
local text = Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text") local text = Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text")
local redPoint = Util.GetGameObject(self.getBtn,"redPoint") local redPoint = Util.GetGameObject(self.getBtn,"redPoint")
if data.ActState == 0 then if data.ActState == 0 then
text.text = "储 值" text.text = Language[12245]
self.getBtn:SetActive(true) self.getBtn:SetActive(true)
redPoint:SetActive(false) redPoint:SetActive(false)
elseif data.ActState == 1 then elseif data.ActState == 1 then
@ -117,7 +117,7 @@ function FuXingGaoZhao:SetTime()
self.timer = nil self.timer = nil
end end
local time = data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp() 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() self.timer = Timer.New(function()
time = time - 1 time = time - 1
if time < 1 then if time < 1 then
@ -125,7 +125,7 @@ function FuXingGaoZhao:SetTime()
self.timer = nil self.timer = nil
self:ClosePanel() self:ClosePanel()
end end
self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) self.time.text = string.format(Language[12246],TimeToFelaxible(time))
end, 1, -1, true) end, 1, -1, true)
self.timer:Start() self.timer:Start()
end end
@ -134,7 +134,7 @@ function FuXingGaoZhao:SetSingleReward(go,sdata,index)
local reward = Util.GetGameObject(go,"GameObject") local reward = Util.GetGameObject(go,"GameObject")
local mask = Util.GetGameObject(go,"mask") local mask = Util.GetGameObject(go,"mask")
-- LogBlue("index:"..index.." go:"..tostring(go.name).." 天数:"..tostring(NumToSimplenessFont[index])) -- 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 if not itemPreList[index] then
itemPreList[index] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) itemPreList[index] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform)
end end

View File

@ -155,7 +155,7 @@ function GMPanel:BindEvent()
end end
function this.GetManyItems(text) function this.GetManyItems(text)
if text == "一键装备" then if text == Language[12247] then
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig))
local cor = coroutine.start(function() local cor = coroutine.start(function()
for k,v in (config) do for k,v in (config) do
@ -168,7 +168,7 @@ function this.GetManyItems(text)
end) end)
return return
end end
if text == "一键宝器" then if text == Language[12248] then
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig))
local cor = coroutine.start(function() local cor = coroutine.start(function()
for k,v in (config) do for k,v in (config) do
@ -179,7 +179,7 @@ function this.GetManyItems(text)
end) end)
return return
end end
if text == "一键魂印" then if text == Language[12249] then
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig))
local cor = coroutine.start(function() local cor = coroutine.start(function()
for k,v in (config) do for k,v in (config) do
@ -192,7 +192,7 @@ function this.GetManyItems(text)
end) end)
return return
end end
if text == "一键灵兽" then if text == Language[12250] then
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimal)) local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimal))
local cor = coroutine.start(function() local cor = coroutine.start(function()
for k,v in (config) do for k,v in (config) do

View File

@ -1059,13 +1059,13 @@ function this.TimeFormat()
-- 当日五点开始显示 -- 当日五点开始显示
if tempTime > 0 and tempTime < 16 * 60 * 60 then if tempTime > 0 and tempTime < 16 * 60 * 60 then
activityTabs[k].go.gameObject:SetActive(true) activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = "距开始\n"..TimeToHMS(tempTime) activityTabs[k].timeText.text = Language[11211]..TimeToHMS(tempTime)
else else
activityTabs[k].go.gameObject:SetActive(false) activityTabs[k].go.gameObject:SetActive(false)
end end
else else
activityTabs[k].go.gameObject:SetActive(true) activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = "鏖战中" activityTabs[k].timeText.text = Language[11212]
end end
elseif v.FunType == 72 then elseif v.FunType == 72 then
local status = DeathPosManager.GetStatus() local status = DeathPosManager.GetStatus()
@ -1076,7 +1076,7 @@ function this.TimeFormat()
if endTime then if endTime then
local tempTime = endTime - PlayerManager.serverTime local tempTime = endTime - PlayerManager.serverTime
if tempTime and tempTime > 0 then 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) activityTabs[k].go.gameObject:SetActive(true)
else else
activityTabs[k].go.gameObject:SetActive(false) activityTabs[k].go.gameObject:SetActive(false)

View File

@ -1,4 +1,4 @@
NiuQiChongTianManager = {} NiuQiChongTianManager = {}
local this = NiuQiChongTianManager local this = NiuQiChongTianManager
this.rewardData = {} this.rewardData = {}
this.configData = {} this.configData = {}
@ -165,4 +165,4 @@ function this.NiuQiCheckRedPoint4()
return false return false
end end
return this return this

View File

@ -1,4 +1,4 @@
require("Base/BasePanel") require("Base/BasePanel")
local NiuQiChongTian = Inherit(BasePanel) local NiuQiChongTian = Inherit(BasePanel)
local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
@ -13,9 +13,9 @@ local curPage = 1
local redPointList = {} local redPointList = {}
local TabBox = require("Modules/Common/TabBox") local TabBox = require("Modules/Common/TabBox")
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "诸神" ,rpType = RedPointType.NiuQiChongTian_1}, 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 = "地煞" ,rpType = RedPointType.NiuQiChongTian_2}, [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 = "天罡" ,rpType = RedPointType.NiuQiChongTian_3},} [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), local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
local curIndex = 1 local curIndex = 1
@ -99,12 +99,12 @@ function this.TabAdapter(tab, index, status)
end end
--切换 --切换
function this.SwitchView(index) function this.SwitchView(index,bool)
curPage = index curPage = index
rewardData = NiuQiChongTianManager.GetNeedRewardData(curPage) rewardData = NiuQiChongTianManager.GetNeedRewardData(curPage)
NiuQiChongTian:SetProgress() NiuQiChongTian:SetProgress()
NiuQiChongTian:SetReward() NiuQiChongTian:SetReward(bool)
end end
function NiuQiChongTian:SetProgress() function NiuQiChongTian:SetProgress()
@ -136,11 +136,12 @@ function NiuQiChongTian:SetProgress()
end end
end end
function NiuQiChongTian:SetReward() function NiuQiChongTian:SetReward(bool)
local anim = bool or false
local data = {} local data = {}
self.ScrollView:SetData(rewardData, function (index, go) self.ScrollView:SetData(rewardData, function (index, go)
NiuQiChongTian:SingleDataShow(go,index,rewardData[index]) NiuQiChongTian:SingleDataShow(go,index,rewardData[index])
end,false,false) end,false,anim)
end end
function NiuQiChongTian:SingleDataShow(go, index,data) function NiuQiChongTian:SingleDataShow(go, index,data)
@ -195,7 +196,7 @@ function NiuQiChongTian:SingleDataShow(go, index,data)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
CheckRedPointStatus(RedPointType.NiuQiChongTian + curPage) CheckRedPointStatus(RedPointType.NiuQiChongTian + curPage)
CheckRedPointStatus(RedPointType.NiuQiChongTian_4) CheckRedPointStatus(RedPointType.NiuQiChongTian_4)
this.SwitchView(curPage) this.SwitchView(curPage,true)
end) end)
end) end)
end end

View File

@ -58,7 +58,7 @@ function CumulativeSignInPage:BindEvent()
if data.value < SignRewardConfig[i].Values[1][1] then if data.value < SignRewardConfig[i].Values[1][1] then
local rewardData = {} local rewardData = {}
rewardData.title = "奖励预览" rewardData.title = "奖励预览"
rewardData.content = "连续签到"..SignRewardConfig[i].Values[1][1].."天获得:" rewardData.content = Language[11350]..SignRewardConfig[i].Values[1][1]..Language[11351]
rewardData.shows = SignRewardConfig[i].Reward rewardData.shows = SignRewardConfig[i].Reward
rewardData.pos = pos[i] rewardData.pos = pos[i]
if not self.rewardPanel then if not self.rewardPanel then
@ -181,7 +181,7 @@ end
--点击事件 --点击事件
function CumulativeSignInPage:OnSignInClicked(Id, index) function CumulativeSignInPage:OnSignInClicked(Id, index)
if index < SignData.days then if index < SignData.days then
PopupTipPanel.ShowTip("已领取") PopupTipPanel.ShowTip(Language[10101])
elseif index == SignData.days then elseif index == SignData.days then
if receiveNum>0 then if receiveNum>0 then
NetManager.RequestSignIn(Id, function(respond) NetManager.RequestSignIn(Id, function(respond)
@ -201,15 +201,15 @@ function CumulativeSignInPage:OnSignInClicked(Id, index)
CheckRedPointStatus(RedPointType.CumulativeSignIn) CheckRedPointStatus(RedPointType.CumulativeSignIn)
end) end)
elseif receiveNum==0 and rechargeNum==1 then elseif receiveNum==0 and rechargeNum==1 then
MsgPanel.ShowTwo("今日充值任意金额后可再次领取签到奖励,是否前往充值?", function() MsgPanel.ShowTwo(Language[11352], function()
end, function() end, function()
JumpManager.GoJump(27001) JumpManager.GoJump(27001)
end, "取消", "前往",nil, false) end, Language[10731], Language[10019],nil, false)
else else
PopupTipPanel.ShowTip("已领取") PopupTipPanel.ShowTip(Language[10101])
end end
else else
PopupTipPanel.ShowTip("未达到签到天数") PopupTipPanel.ShowTip(Language[11353])
end end
end end
@ -239,7 +239,7 @@ function CumulativeSignInPage:RefreshBox()
data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SignInfo) data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SignInfo)
local curDay = data.value local curDay = data.value
self.progressBottom.fillAmount = curDay/7 self.progressBottom.fillAmount = curDay/7
self.dayText.text = curDay.."" self.dayText.text = curDay..Language[10017]
if self.rewardPanel then if self.rewardPanel then
self.rewardPanel.gameObject:SetActive(false) self.rewardPanel.gameObject:SetActive(false)
end end

View File

@ -129,7 +129,7 @@ function GrowthGiftPage:SetBtnInvestState()
Util.SetGray(self.btnInvest, false) Util.SetGray(self.btnInvest, false)
else else
self.btnInvest:GetComponent("Button").enabled = false self.btnInvest:GetComponent("Button").enabled = false
self.btnInvestText.text = "已购买" self.btnInvestText.text = Language[10514]
Util.SetGray(self.btnInvest, true) Util.SetGray(self.btnInvest, true)
end end
end end
@ -172,7 +172,7 @@ function GrowthGiftPage:CheckAllGet(curActiId,missionId)
end end
function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId,self) function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId,self)
if data.state == -1 then if data.state == -1 then
PopupTipPanel.ShowTip("未达到等级要求~~~") PopupTipPanel.ShowTip(Language[11372])
elseif data.state == 2 then elseif data.state == 2 then
NetManager.GetActivityRewardRequest(data.missionId,curActiId, function(drop) NetManager.GetActivityRewardRequest(data.missionId,curActiId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1) UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
@ -183,15 +183,15 @@ function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId,self)
return return
end end
if(curActiId == 16)then--16是最后一个礼包的ActivityId if(curActiId == 16)then--16是最后一个礼包的ActivityId
MsgPanel.ShowOne("恭喜!您已领取全部成长基金!") MsgPanel.ShowOne(Language[11370])
self:RefreshGiftData(true) self:RefreshGiftData(true)
else else
MsgPanel.ShowOne("恭喜!您已激活更高等级成长基金,大量妖晶福利等您领取,快来激活吧!") MsgPanel.ShowOne(Language[11371])
self:OnShow(sortingOrder) self:OnShow(sortingOrder)
end end
end) end)
elseif data.state ~= 1 then elseif data.state ~= 1 then
PopupTipPanel.ShowTip("请购买基金后领取") PopupTipPanel.ShowTip(Language[11369])
end end
end end

View File

@ -126,18 +126,18 @@ function MissionPre:SetIcon(_itemdata)
self.btnGet:GetComponent("Button").enabled = true self.btnGet:GetComponent("Button").enabled = true
if self.data.state == -1 then if self.data.state == -1 then
Util.SetGray(self.btnGet,true) Util.SetGray(self.btnGet,true)
self.btnGetText.text = "领取" self.btnGetText.text = Language[10018]
elseif self.data.state == 2 then elseif self.data.state == 2 then
self.redPoint.gameObject:SetActive(true) self.redPoint.gameObject:SetActive(true)
self.btnGetText.text = "领取" self.btnGetText.text = Language[10018]
elseif self.data.state == 1 then elseif self.data.state == 1 then
self.redPoint.gameObject:SetActive(false) self.redPoint.gameObject:SetActive(false)
self.btnGetText.text = "已领取" self.btnGetText.text = Language[10101]
self.btnGet:GetComponent("Button").enabled = false self.btnGet:GetComponent("Button").enabled = false
Util.SetGray(self.btnGet,true) Util.SetGray(self.btnGet,true)
elseif self.data.state == 0 then elseif self.data.state == 0 then
self.redPoint.gameObject:SetActive(true) self.redPoint.gameObject:SetActive(true)
self.btnGetText.text = "领取" self.btnGetText.text = Language[10018]
end end
end end

View File

@ -94,15 +94,15 @@ end
function MonthCardPage:SetCardShow(i) function MonthCardPage:SetCardShow(i)
cardData[i].curState = self.curAllMonthCardData[cardData[i].cardType] and self.curAllMonthCardData[cardData[i].cardType].endingTime ~= 0 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) .."即可<color=#C94943>激活30天月卡</color>"--"元即可<color=#C94943>激活30天月卡</color>" 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 = "激活后每日<color=#C94943>可领 "..monthCardConFig[cardData[i].cardType].BaseReward[1][2] .."</color>" self.cardPres[i].day2.text = Language[11380]..monthCardConFig[cardData[i].cardType].BaseReward[1][2] .."</color>"
self.cardPres[i].icon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[cardData[i].cardType].BaseReward[1][1]).ResourceID)) 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:SetActive(not cardData[i].curState)
self.cardPres[i].progress:GetComponent("Text").text = "("..OperatingManager.GetmonthSaveAmt(i).."/"..monthCardConFig[cardData[i].cardType].Price..")" 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].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].dayRightUpIcon = SetIcon(monthCardConFig[cardData[i].cardType].BaseReward[1][1])
self.cardPres[i].monthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(cardData[i].cardType)) 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 if not cardData[i].curState then
self.cardPres[i].time:SetActive(false) self.cardPres[i].time:SetActive(false)
Util.SetGray(self.cardPres[i].month,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 residueTimeNum = self.curAllMonthCardData[cardData[i].cardType].endingTime + addTimeNum - GetTimeStamp()
local dayNum = math.floor(residueTimeNum / (24 * 3600)) local dayNum = math.floor(residueTimeNum / (24 * 3600))
if dayNum > 0 then 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 else
self:SetMonthCardTimes(residueTimeNum,cardData[i].time,self.cardPres[i].time,i) self:SetMonthCardTimes(residueTimeNum,cardData[i].time,self.cardPres[i].time,i)
end end
if self.curAllMonthCardData[cardData[i].cardType].state == 0 then if self.curAllMonthCardData[cardData[i].cardType].state == 0 then
Util.SetGray(self.cardPres[i].month,false) Util.SetGray(self.cardPres[i].month,false)
self.cardPres[i].month:GetComponent("Button").enabled = true 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 elseif self.curAllMonthCardData[cardData[i].cardType].state == 1 then
Util.SetGray(self.cardPres[i].month,true) Util.SetGray(self.cardPres[i].month,true)
self.cardPres[i].month:GetComponent("Button").enabled = false 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 end
end end
@ -134,7 +134,7 @@ function MonthCardPage:SetMonthCardTimes(timeNums,timer,timeCom,index)
timer = nil timer = nil
end end
timer = Timer.New(function() timer = Timer.New(function()
timeCom:GetComponent("Text").text = "剩余时间:"..TimeStampToDateStr3(timeNums) timeCom:GetComponent("Text").text = Language[10023]..TimeStampToDateStr3(timeNums)
if timeNums < 0 then if timeNums < 0 then
OperatingManager.RefreshMonthCardEnd() OperatingManager.RefreshMonthCardEnd()
self.curAllMonthCardData = OperatingManager.GetMonthCardData() self.curAllMonthCardData = OperatingManager.GetMonthCardData()

View File

@ -79,10 +79,10 @@ function UpperMonthCard:BindEvent()
Util.AddClick(self.btnBuy, function() Util.AddClick(self.btnBuy, function()
local isActive = VipManager.GetMonthCardOpenState() local isActive = VipManager.GetMonthCardOpenState()
if not isActive then if not isActive then
MsgPanel.ShowTwo("请先激活豪华月卡", function() MsgPanel.ShowTwo(Language[11387], function()
end, function(isShow) end, function(isShow)
JumpManager.GoJump(36004) JumpManager.GoJump(36004)
end, "取消", "前往",nil, false) end, Language[10731], Language[10019],nil, false)
else else
PayManager.Pay(self.baseType, function(id) PayManager.Pay(self.baseType, function(id)
self:RechargeSuccessFunc(id) self:RechargeSuccessFunc(id)
@ -205,7 +205,7 @@ function UpperMonthCard:SetBuyPanelInfo()
end end
end, 1, -1, true) end, 1, -1, true)
self.buyTimer:Start() self.buyTimer:Start()
self.actLeftTime.text = "剩余时间: " .. self:TimeFormat(endTime - PlayerManager.serverTime) self.actLeftTime.text = Language[10573] .. self:TimeFormat(endTime - PlayerManager.serverTime)
end end
else else
self.actLeftTime.gameObject:SetActive(false) self.actLeftTime.gameObject:SetActive(false)
@ -215,9 +215,9 @@ end
function UpperMonthCard:SetBoughtPanelInfo() function UpperMonthCard:SetBoughtPanelInfo()
local endTime = OperatingManager.GetGoodsEndTime(self.chargerBaseType) 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) local startStr, endStr = OperatingManager.GetShowTime(endTime)
self.boughtLeftTime.text = "领取时间:" ..startStr .. "".. endStr self.boughtLeftTime.text = Language[11389] ..startStr .. "".. endStr
--- 购买后倒计时显示 --- 购买后倒计时显示
self.timer = nil self.timer = nil
@ -229,7 +229,7 @@ function UpperMonthCard:SetBoughtPanelInfo()
self.timer:Stop() self.timer:Stop()
else else
OperatingManager.SetSerData(self.chargerBaseType) OperatingManager.SetSerData(self.chargerBaseType)
self.totalLoginday.text = "当前天数:" .. OperatingManager.GetRewardDay(self.chargerBaseType) .. "" self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017]
end end
end, 1, -1, true) end, 1, -1, true)
self.timer:Start() self.timer:Start()
@ -253,9 +253,9 @@ end
function UpperMonthCard:FreshBoughtShow() function UpperMonthCard:FreshBoughtShow()
self.boughtPanel:SetActive(true) self.boughtPanel:SetActive(true)
self.buyPanel:SetActive(false) 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)) local startStr, endStr = OperatingManager.GetShowTime(OperatingManager.GetGoodsEndTime(self.chargerBaseType))
self.boughtLeftTime.text = "领取时间:" ..startStr .. "".. endStr self.boughtLeftTime.text = Language[11389] ..startStr .. "".. endStr
end end
@ -264,7 +264,7 @@ function UpperMonthCard:TimeFormat(second)
local minute = math.floor(second / 60) % 60 local minute = math.floor(second / 60) % 60
local sec = second % 60 local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) 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 end
--界面关闭时调用(用于子类重写) --界面关闭时调用(用于子类重写)

View File

@ -257,7 +257,7 @@ function PrivilegeManager.GetPrivilegeOpenTip(privilegeType)
local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1) local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1)
-- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) -- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1])
-- return string.format(Language[11402],GetLanguageStrById(fightConfig.Name),infoList[2]) -- 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
-- end -- end

View File

@ -160,11 +160,11 @@ function RewardItemSingleShowPopup:BindEvent()
elseif itemConfigData.ItemType == ItemType.Ride then elseif itemConfigData.ItemType == ItemType.Ride then
local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
if PlayerManager.userMountList[itemConfigData.Id] then if PlayerManager.userMountList[itemConfigData.Id] then
MsgPanel.ShowTwo("当前已激活该坐骑,是否要重复使用?",nil,function() MsgPanel.ShowTwo(Language[12254],nil,function()
NetManager.ActiveUserMountRequest(itemSid,function (msg) NetManager.ActiveUserMountRequest(itemSid,function (msg)
PlayerManager.SetPlayerMountTime(itemSid,msg.validTime) PlayerManager.SetPlayerMountTime(itemSid,msg.validTime)
self:ClosePanel() self:ClosePanel()
PopupTipPanel.ShowTip("成功激活坐骑!") PopupTipPanel.ShowTip(Language[12255])
this.WarPowerChange(oldPowerNum) this.WarPowerChange(oldPowerNum)
end) end)
end) end)
@ -172,7 +172,7 @@ function RewardItemSingleShowPopup:BindEvent()
NetManager.ActiveUserMountRequest(itemSid,function (msg) NetManager.ActiveUserMountRequest(itemSid,function (msg)
PlayerManager.SetPlayerMountTime(itemSid,msg.validTime) PlayerManager.SetPlayerMountTime(itemSid,msg.validTime)
self:ClosePanel() self:ClosePanel()
PopupTipPanel.ShowTip("成功激活坐骑!") PopupTipPanel.ShowTip(Language[12255])
this.WarPowerChange(oldPowerNum) this.WarPowerChange(oldPowerNum)
end) end)
end end

View File

@ -214,8 +214,8 @@ function EveryDayGift:RefreshOneKeyShow()
local now = 0 local now = 0
now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1004).Price) now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1004).Price)
self.oriPrice.text = string.format("原价:%s元",ori) self.oriPrice.text = string.format(Language[12256],ori)
self.nowPrice.text = string.format("现价:%s元",now) self.nowPrice.text = string.format(Language[12257],now)
end end

View File

@ -251,7 +251,7 @@ function GiftPre:SetContent1()
self.upLayout.gameObject:SetActive(false) self.upLayout.gameObject:SetActive(false)
elseif self.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.VIP_GIFT then 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] 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 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.data.DataType == DataType.Shop and self.data.buyType == SHOP_TYPE.FINDTREASURE_GIFT) then
self.tipRoot:SetActive(true) self.tipRoot:SetActive(true)
@ -263,7 +263,7 @@ end
function GiftPre:SetType1(type1Text1,num,type1Text3) function GiftPre:SetType1(type1Text1,num,type1Text3)
self.type1.gameObject:SetActive(true) self.type1.gameObject:SetActive(true)
CreatNumberPrefab(tostring(num),self.numList) CreatNumberPrefab(tostring(num),self.numList)
self.type1Text1.text = "累计充值" self.type1Text1.text = Language[11377]
self.type1Text3.text = type1Text3 self.type1Text3.text = type1Text3
end end
@ -319,10 +319,10 @@ function GiftPre:SetTip()
end end
elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then
self.tip5:SetActive(true) 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 elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 7105 then
self.tip5:SetActive(true) self.tip5:SetActive(true)
self.tip5Text.text = "每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!" self.tip5Text.text = Language[12259]
end end
end end
@ -343,7 +343,7 @@ end
function GiftPre:SetIcon() function GiftPre:SetIcon()
if self.isCanBuy == 2 then if self.isCanBuy == 2 then
self.icon.gameObject:SetActive(false) self.icon.gameObject:SetActive(false)
self.price.text = "已购买" self.price.text = Language[10514]
else else
if self.data.DataType == DataType.Shop then if self.data.DataType == DataType.Shop then
self.icon.gameObject:SetActive(true) self.icon.gameObject:SetActive(true)

View File

@ -143,8 +143,8 @@ function GiftView:RefreshOneKeyShow()
-- self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori -- self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori
-- self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now -- self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now
self.oriPrice.text = string.format("原价:%s元",ori) self.oriPrice.text = string.format(Language[12256],ori)
self.nowPrice.text = string.format("现价:%s元",now) self.nowPrice.text = string.format(Language[12257],now)
end end
-- 刷新礼包的数据 -- 刷新礼包的数据

View File

@ -522,7 +522,7 @@ function this.ResolveBtnClickEvent()
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isSoulPrintShowSure") local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isSoulPrintShowSure")
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
if (isPopUp ~= currentTime) then if (isPopUp ~= currentTime) then
MsgPanel.ShowTwo("分解的魂印中包含金色或金色以上魂印,确定进行分解?", nil, function(isShow) MsgPanel.ShowTwo(Language[12260], nil, function(isShow)
if (isShow) then if (isShow) then
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .."isSoulPrintShowSure", currentTime) RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .."isSoulPrintShowSure", currentTime)

View File

@ -158,7 +158,7 @@ function RoleEquipChangePopup:OnShow()
this.equipPanel[2].curEquipText:SetActive(false) this.equipPanel[2].curEquipText:SetActive(false)
this.equipPanel[1].curEquipBtnDown:SetActive(false) this.equipPanel[1].curEquipBtnDown:SetActive(false)
this.equipPanel[2].curEquipBtnDown:SetActive(true) this.equipPanel[2].curEquipBtnDown:SetActive(true)
this.equipPanel[2].curEquipBtnDownText.text = "替 换" this.equipPanel[2].curEquipBtnDownText.text = Language[12261]
--"替 换" --"替 换"
this.ShowCurEquipData(2) this.ShowCurEquipData(2)
this.NextCurEquipData() this.NextCurEquipData()
@ -185,7 +185,7 @@ function this.SetEquipData(index,data,equipConfigData,itemConfigData)
-- strPos= Language[11476] -- strPos= Language[11476]
-- end -- end
-- this.equipPanel[index].curEquipPosText.text=string.format(strPos,GetJobStrByJobNum(equipConfigData.ProfessionLimit)) -- 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 if not this.mainProList then
this.mainProList = {} this.mainProList = {}

View File

@ -147,7 +147,7 @@ function RoleInfoPanel:BindEvent()
--角色归元按钮 --角色归元按钮
Util.AddClick(this.RecallBtn,function() Util.AddClick(this.RecallBtn,function()
if curHeroData.lv <= 1 then if curHeroData.lv <= 1 then
PopupTipPanel.ShowTip("1级神将无法进行归元") PopupTipPanel.ShowTip(Language[12263])
return return
end end
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
@ -161,7 +161,7 @@ function RoleInfoPanel:BindEvent()
end end
end end
if curHeroData.lockState == 1 then if curHeroData.lockState == 1 then
PopupTipPanel.ShowTip("此神将已被锁定!") PopupTipPanel.ShowTip(Language[12264])
-- MsgPanel.ShowTwo(Language[11740], nil, function() -- MsgPanel.ShowTwo(Language[11740], nil, function()
-- NetManager.HeroLockEvent(curHeroData.dynamicId,0,function () -- NetManager.HeroLockEvent(curHeroData.dynamicId,0,function ()
-- PopupTipPanel.ShowTip(Language[11741]) -- PopupTipPanel.ShowTip(Language[11741])

View File

@ -91,7 +91,7 @@ function RoleTalismanPanelV2:BindEvent()
--进阶按钮 --进阶按钮
Util.AddClick(this.RecallBtn, function() Util.AddClick(this.RecallBtn, function()
if curHeroData.talismanList and curHeroData.talismanList <= 1 then if curHeroData.talismanList and curHeroData.talismanList <= 1 then
PopupTipPanel.ShowTip("1级法宝无法进行归元") PopupTipPanel.ShowTip(Language[12265])
return return
end end
local selectHero = {} local selectHero = {}

View File

@ -5,9 +5,9 @@ local funIndex = 1
--Tab --Tab
local TabBox = require("Modules/Common/TabBox") local TabBox = require("Modules/Common/TabBox")
local _TabData={ 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 = "称号" },
[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 = "时装" }, -- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "时装" },
} }
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),

View File

@ -18,9 +18,9 @@ function SettingPlayerRide:InitComponent(gameObject)
this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent") this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent")
this.live2dRootParent2 = Util.GetGameObject(gameObject, "live2dRootParent2") this.live2dRootParent2 = Util.GetGameObject(gameObject, "live2dRootParent2")
this.name = Util.GetGameObject(gameObject, "name/Text"):GetComponent("Text") 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") 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.goToBtn = Util.GetGameObject(gameObject, "goToBtn")
this.goToBtnText = Util.GetGameObject(gameObject, "goToBtn/Text"):GetComponent("Text") this.goToBtnText = Util.GetGameObject(gameObject, "goToBtn/Text"):GetComponent("Text")
this.stateImg = Util.GetGameObject(gameObject, "stateImg"):GetComponent("Image") 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 itemConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig,PlayerHeadIconConfig.ItemId)
local PlayerRoleConFig = ConfigManager.GetConfigData(ConfigName.PlayerRole,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, "iconMask/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(PlayerRoleConFig.LargeIcon))
Util.GetGameObject(go, "noGetImage/noGetImage/Text"):GetComponent("Text").text = "暂未解锁" Util.GetGameObject(go, "noGetImage/noGetImage/Text"):GetComponent("Text").text = Language[12268]
Util.GetGameObject(go, "GetImage/GetImage/Text"):GetComponent("Text").text = "使用中" Util.GetGameObject(go, "GetImage/GetImage/Text"):GetComponent("Text").text = Language[12269]
local noGetImage = Util.GetGameObject(go, "noGetImage") local noGetImage = Util.GetGameObject(go, "noGetImage")
local GetImage = Util.GetGameObject(go, "GetImage") local GetImage = Util.GetGameObject(go, "GetImage")
this.setImage:SetActive(false) this.setImage:SetActive(false)
@ -143,16 +143,16 @@ function this.SingleRideClickShowInfo(data,go)
end, not false, not false) end, not false, not false)
this.stateImgGo:SetActive(true) this.stateImgGo:SetActive(true)
if not isGet and not isUser then if not isGet and not isUser then
this.goToBtnText.text = "获取途径" this.goToBtnText.text = Language[11829]
this.stateImgGo:SetActive(false) this.stateImgGo:SetActive(false)
elseif isGet and not isUser then elseif isGet and not isUser then
this.goToBtnText.text = "骑乘" this.goToBtnText.text = Language[12270]
elseif isGet and isUser then elseif isGet and isUser then
this.goToBtnText.text ="取消骑乘" this.goToBtnText.text =Language[12271]
end end
local setateImageStr = curPlayerHeadIconConfig.Time == 0 and "c_zuoqi_yongjiu_zh" or "c_zuoqi_xianshi_zh" local setateImageStr = curPlayerHeadIconConfig.Time == 0 and "c_zuoqi_yongjiu_zh" or "c_zuoqi_xianshi_zh"
this.stateImg.sprite = Util.LoadSprite(setateImageStr) 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 if live2dRoot then
live2dRoot:OnClose() live2dRoot:OnClose()
end end
@ -180,14 +180,14 @@ function this.SingleRideClickShowInfo(data,go)
PlayerManager.SetPlayerRide(curPlayerHeadIconConfig.Id) PlayerManager.SetPlayerRide(curPlayerHeadIconConfig.Id)
this.ShowPanelData() this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true) PlayerManager.SetisRefreshMainPanelNpc(true)
PopupTipPanel.ShowTip("已骑乘坐骑!") PopupTipPanel.ShowTip(Language[12272])
end) end)
elseif isGet and isUser then elseif isGet and isUser then
NetManager.RequestChangeModifyDecoration(3,0,function() NetManager.RequestChangeModifyDecoration(3,0,function()
PlayerManager.SetPlayerRide(0) PlayerManager.SetPlayerRide(0)
this.ShowPanelData() this.ShowPanelData()
PlayerManager.SetisRefreshMainPanelNpc(true) PlayerManager.SetisRefreshMainPanelNpc(true)
PopupTipPanel.ShowTip("已取消骑乘!") PopupTipPanel.ShowTip(Language[12273])
end) end)
end end
end) end)

View File

@ -8,22 +8,22 @@ local redPointList = {}
local TabBox = require("Modules/Common/TabBox") local TabBox = require("Modules/Common/TabBox")
local tabs = { local tabs = {
[1] = { --神将 [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", rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
}, },
[2] = { --魂印 [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 rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
}, },
[3] = { --灵兽 [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", rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu",zi = "t_tianshumijuan_lingshoupian_zi_zh",
}, },
} }
local status = { local status = {
[0] = "全部", [0] = Language[10175],
[1] = "已激活", [1] = Language[11533],
[2] = "未激活", [2] = Language[11947],
} }
local curPage = 1 local curPage = 1
local data = {} local data = {}

View File

@ -41,7 +41,7 @@ function this.CreatSingleConfigData(configData)
data.name = GetLanguageStrById(configData.Name) data.name = GetLanguageStrById(configData.Name)
data.teamers = configData.Teamers data.teamers = configData.Teamers
data.activePara = configData.ActivePara data.activePara = configData.ActivePara
data.activeParaTip = "激活属性:" data.activeParaTip = Language[12277]
for i = 1, #data.activePara do for i = 1, #data.activePara do
local config = propertyConfig[data.activePara[i][1]] local config = propertyConfig[data.activePara[i][1]]
local value= GetEquipPropertyFormatStr(config.Style,data.activePara[i][2]) local value= GetEquipPropertyFormatStr(config.Style,data.activePara[i][2])

View File

@ -1,4 +1,4 @@
require("Base/BasePanel") require("Base/BasePanel")
local TimeLimitSkin = Inherit(BasePanel) local TimeLimitSkin = Inherit(BasePanel)
local this = TimeLimitSkin local this = TimeLimitSkin
@ -116,7 +116,7 @@ function TimeLimitSkin:SetAttri()
local rg = ConfigManager.GetConfigDataByKey(ConfigName.ItemConfig,"Id",reward).RewardGroup local rg = ConfigManager.GetConfigDataByKey(ConfigName.ItemConfig,"Id",reward).RewardGroup
local skins = ConfigManager.GetConfigDataByKey(ConfigName.RewardGroup,"Id",rg[1]).ShowItem local skins = ConfigManager.GetConfigDataByKey(ConfigName.RewardGroup,"Id",rg[1]).ShowItem
local attris = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Id",skins[1][1]).MonomerProperty--所有皮肤加属性相同就用了第一个 local attris = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Id",skins[1][1]).MonomerProperty--所有皮肤加属性相同就用了第一个
local str = "属性加成:" local str = Language[11440]
for i = 1, #attris do for i = 1, #attris do
local attriData = ConfigManager.GetConfigData(ConfigName.PropertyConfig,attris[i][1]) local attriData = ConfigManager.GetConfigData(ConfigName.PropertyConfig,attris[i][1])
local attriName = attriData.Info local attriName = attriData.Info

View File

@ -31,7 +31,7 @@ function FetterItem:BindEvent()
NetManager.PokemonBookEnableRequest(self.itemData.id,function(msg) NetManager.PokemonBookEnableRequest(self.itemData.id,function(msg)
if msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then if msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then
local item = msg.drop.itemlist[1] 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 end
TianShuMiJuanManger.UpdateFetterId({self.itemData.id}) TianShuMiJuanManger.UpdateFetterId({self.itemData.id})
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)

View File

@ -1,4 +1,4 @@
PlayerInfoView = {} PlayerInfoView = {}
function PlayerInfoView:New(gameObject) function PlayerInfoView:New(gameObject)
local b = {} local b = {}

View File

@ -2233,3 +2233,46 @@
12233,核心神将: 12233,核心神将:
12234,%d次内必得金色及以上魂印 12234,%d次内必得金色及以上魂印
12235,重连失败,请重新登录 12235,重连失败,请重新登录
12236,是否前往坐骑界面?
12237,30级或充值任意金额后解锁
12238,<color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>
12239,%s 发送了%s请迅速前往抢夺红包
12240,无可合成宝物!
12241,<color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>
12242,极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>
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

1 10001
2233 12233 核心神将:
2234 12234 %d次内必得金色及以上魂印
2235 12235 重连失败,请重新登录
2236 12236 是否前往坐骑界面?
2237 12237 30级或充值任意金额后解锁
2238 12238 <color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>
2239 12239 %s 发送了%s,请迅速前往抢夺红包!
2240 12240 无可合成宝物!
2241 12241 <color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>
2242 12242 极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>
2243 12243 是否花费%s%s进行储值?
2244 12244 您已成功进行储值!
2245 12245 储 值
2246 12246 剩余结束时间:%s
2247 12247 一键装备
2248 12248 一键宝器
2249 12249 一键魂印
2250 12250 一键灵兽
2251 12251 诸神
2252 12252 地煞
2253 12253 天罡
2254 12254 当前已激活该坐骑,是否要重复使用?
2255 12255 成功激活坐骑!
2256 12256 原价:%s元
2257 12257 现价:%s元
2258 12258 轩辕宝境必备特权!每天增加2次免费次数,6次额外购买次数!
2259 12259 每日可额外增加3次免费的灵兽山招募机会,同时灵兽山妖晶招募价格变为8折!
2260 12260 分解的魂印中包含金色或金色以上魂印,确定进行分解?
2261 12261 替 换
2262 12262 道具种类:%s
2263 12263 1级神将无法进行归元!
2264 12264 此神将已被锁定!
2265 12265 1级法宝无法进行归元!
2266 12266 信息
2267 12267 坐骑
2268 12268 暂未解锁
2269 12269 使用中
2270 12270 骑乘
2271 12271 取消骑乘
2272 12272 已骑乘坐骑!
2273 12273 已取消骑乘!
2274 12274 神将篇
2275 12275 魂印篇
2276 12276 灵兽篇
2277 12277 激活属性:
2278 12278 激活成功,获得%s%s

View File

@ -1371,7 +1371,7 @@
11371,购买次数 11371,购买次数
11372,是否消耗 100000000 11372,是否消耗 100000000
11373,\ 购买100次挑战次数 11373,\ 购买100次挑战次数
11374,"\""每天每天每天每天每天每天”" 11374,\"\"\"每天每天每天每天每天每天”\"
11375,击败13只皮皮虾 11375,击败13只皮皮虾
11376,寻找深渊之井\,获得泉水 11376,寻找深渊之井\,获得泉水
11377,打败嗷嗷大魔王 11377,打败嗷嗷大魔王
@ -1557,7 +1557,7 @@
11557,清山影 11557,清山影
11558,核心特性 11558,核心特性
11559,<color=#D48A07>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧 11559,<color=#D48A07>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧
11560," 攻击" 11560,\" 攻击\"
11561,法宝天赋 11561,法宝天赋
11562,<color=#D89623>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧 11562,<color=#D89623>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧
11563,击败5名敌人0/5 11563,击败5名敌人0/5
@ -1963,3 +1963,32 @@
11963,检测更新游戏资源... 11963,检测更新游戏资源...
11964,战斗\n编队 11964,战斗\n编队
11965,防守\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,剩余接受时间5天11时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,到期时间: 2022年11月28日 10:55
11989,无符合要求的秘卷!
11990,剩余时间1天1小时1分钟
11991,皮肤的属性:巴拉巴拉的
11992,限购1次
11993,激活
11994,奖励:

Can't render this file because it contains an unexpected character in line 1374 and column 8.