xuanyuan
parent
28fba64cce
commit
9f186311b3
|
@ -328,9 +328,10 @@ UIName = {
|
|||
CompoundHeroPanel = 327,--神将置换、合成界面
|
||||
CompoundHeroUpStarListPanel = 328,--角色合成操作弹窗
|
||||
CompoundHeroFirstUpStarListPanel = 329,--角色合成首位操作弹窗
|
||||
XuanYuanMirrorRankPopup = 330,--轩辕宝镜排行
|
||||
XuanYuanMirrorRewardSortPopup = 331,--轩辕宝镜奖励
|
||||
}
|
||||
|
||||
|
||||
SubUIConfig = {
|
||||
UpView = { name = "UpView", assetName = "UpView", script = "View/UpView" },
|
||||
BtView = { name = "BtView", assetName = "BtView", script = "View/BtView" },
|
||||
|
|
|
@ -58,10 +58,10 @@ function this:BindEvent()
|
|||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.XuanYuanMirror,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
Util.AddClick(this.btnRank, function()
|
||||
|
||||
UIManager.OpenPanel(UIName.XuanYuanMirrorRankPopup)
|
||||
end)
|
||||
Util.AddClick(this.btnReward, function()
|
||||
|
||||
UIManager.OpenPanel(UIName.XuanYuanMirrorRewardSortPopup)
|
||||
end)
|
||||
Util.AddClick(this.btnClose, function()
|
||||
this:OnClose()
|
||||
|
@ -97,7 +97,7 @@ function this:GetOpenTime(id)
|
|||
local str = nil
|
||||
LogBlue("id:"..id)
|
||||
local isFunction = false
|
||||
local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,68)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,70)
|
||||
if config then
|
||||
LogBlue(config.Value)
|
||||
for k,v in ipairs(string.split(config.Value,"|")) do
|
||||
|
|
|
@ -8,22 +8,22 @@ local mirrors = {
|
|||
[1] = {
|
||||
id = "人杰宝镜", --人杰
|
||||
bg = "x_xianyuan_renjietu01",
|
||||
tip = string.format("<color=#E5DDBF>%s</color>",specialConfig[69].Value),
|
||||
tip = string.format("<color=#E5DDBF>%s</color>",specialConfig[71].Value),
|
||||
},
|
||||
[2] = {
|
||||
id = "佛禅宝镜", --佛禅
|
||||
bg = "x_xianyuan_fochantu01",
|
||||
tip = string.format("<color=#FFE3C2>%s</color>",specialConfig[70].Value),
|
||||
tip = string.format("<color=#FFE3C2>%s</color>",specialConfig[72].Value),
|
||||
},
|
||||
[3] = {
|
||||
id = "妖灵宝镜", --妖灵
|
||||
bg = "x_xianyuan_yaolingtu01",
|
||||
tip = string.format("<color=#F3DBD5>%s</color>",specialConfig[71].Value),
|
||||
tip = string.format("<color=#F3DBD5>%s</color>",specialConfig[73].Value),
|
||||
},
|
||||
[4] = {
|
||||
id = "道玄宝镜", --道玄
|
||||
bg = "x_xianyuan_daoxuantu01",
|
||||
tip = string.format("<color=#FFD09D>%s</color>",specialConfig[72].Value),
|
||||
tip = string.format("<color=#FFD09D>%s</color>",specialConfig[74].Value),
|
||||
},
|
||||
}
|
||||
local curType = 0
|
||||
|
|
|
@ -42,18 +42,13 @@ end
|
|||
-- 进入地图
|
||||
function this.On_Btn2_Click()
|
||||
if index >= data.teamRules[1][2] then
|
||||
if this.root.order >= 1 then
|
||||
--保存编队
|
||||
FormationManager.RefreshFormation(
|
||||
this.root.curFormationIndex,
|
||||
this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos
|
||||
)
|
||||
--保存编队
|
||||
FormationManager.RefreshFormation(
|
||||
this.root.curFormationIndex,
|
||||
this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos
|
||||
)
|
||||
this.StartFight()
|
||||
else
|
||||
PopupTipPanel.ShowTip(data.condition)
|
||||
return
|
||||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(data.condition)
|
||||
end
|
||||
|
|
|
@ -4349,6 +4349,10 @@ function NetManager.StartSituationChallengeRequest(id,type,func)
|
|||
Network:SendMessageWithCallBack(MessageTypeProto_pb.SITUATION_CHALLENGE_REQUEST, MessageTypeProto_pb.SITUATION_CHALLENGE_RESPONSE, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = MapInfoProto_pb.SituationChallengeResponse()
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
--法宝归元
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue