Merge branch '0功能/增加一键上阵' into master_xma_local
commit
c5c4efef63
|
@ -15758,6 +15758,30 @@ MonoBehaviour:
|
||||||
extension: .mp3
|
extension: .mp3
|
||||||
resPathIndex: 103
|
resPathIndex: 103
|
||||||
resAbNameIndex: 434
|
resAbNameIndex: 434
|
||||||
|
- resName: Audio_dhdj_skin01_attack01
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 434
|
||||||
|
- resName: Audio_dhdj_skin01_attack02
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 434
|
||||||
|
- resName: Audio_dhdj_skin01_attack03
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 434
|
||||||
|
- resName: Audio_dhdj_skin01_exskill01
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 434
|
||||||
|
- resName: Audio_dhdj_skin01_exskill02
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 434
|
||||||
|
- resName: Audio_dhdj_skin01_exskill03
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 434
|
||||||
- resName: Audio_Effect_c_ab_00014_t3_attack01
|
- resName: Audio_Effect_c_ab_00014_t3_attack01
|
||||||
extension: .mp3
|
extension: .mp3
|
||||||
resPathIndex: 103
|
resPathIndex: 103
|
||||||
|
@ -16066,6 +16090,18 @@ MonoBehaviour:
|
||||||
extension: .mp3
|
extension: .mp3
|
||||||
resPathIndex: 103
|
resPathIndex: 103
|
||||||
resAbNameIndex: 494
|
resAbNameIndex: 494
|
||||||
|
- resName: Audio_swk_skin01_attack01
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 494
|
||||||
|
- resName: Audio_swk_skin01_attack02
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 494
|
||||||
|
- resName: Audio_swk_skin01_attack03
|
||||||
|
extension: .mp3
|
||||||
|
resPathIndex: 103
|
||||||
|
resAbNameIndex: 494
|
||||||
- resName: Audio_s_jieling_dlg_3010_attack_01
|
- resName: Audio_s_jieling_dlg_3010_attack_01
|
||||||
extension: .mp3
|
extension: .mp3
|
||||||
resPathIndex: 103
|
resPathIndex: 103
|
||||||
|
@ -30486,6 +30522,14 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 229
|
resPathIndex: 229
|
||||||
resAbNameIndex: 1847
|
resAbNameIndex: 1847
|
||||||
|
- resName: juexing
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 230
|
||||||
|
resAbNameIndex: 1848
|
||||||
|
- resName: lingshoushan
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 230
|
||||||
|
resAbNameIndex: 1848
|
||||||
- resName: r_guanka_sheji_bu_01
|
- resName: r_guanka_sheji_bu_01
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 230
|
resPathIndex: 230
|
||||||
|
@ -54788,7 +54832,6 @@ MonoBehaviour:
|
||||||
- lz4/atlas/tagbuttonatlas.unity3d
|
- lz4/atlas/tagbuttonatlas.unity3d
|
||||||
- lz4/bg/battle/r_zhandou_changjing_1.unity3d
|
- lz4/bg/battle/r_zhandou_changjing_1.unity3d
|
||||||
- lz4/bg/jl-jinengkuang.unity3d
|
- lz4/bg/jl-jinengkuang.unity3d
|
||||||
- lz4/bg/r_chouka_zhubeijing.unity3d
|
|
||||||
- lz4/dynamicatlas/artfont/r_zhandou_zuijiabiaoti.unity3d
|
- lz4/dynamicatlas/artfont/r_zhandou_zuijiabiaoti.unity3d
|
||||||
- lz4/dynamicatlas/card/t_biandui_hong.unity3d
|
- lz4/dynamicatlas/card/t_biandui_hong.unity3d
|
||||||
- lz4/dynamicatlas/card/t_zhandoukuang_hong.unity3d
|
- lz4/dynamicatlas/card/t_zhandoukuang_hong.unity3d
|
||||||
|
|
|
@ -15,7 +15,12 @@ function this.GetFormationIndex()
|
||||||
return FormationTypeDef.FORMATION_ARENA_DEFEND
|
return FormationTypeDef.FORMATION_ARENA_DEFEND
|
||||||
end
|
end
|
||||||
--- 提交按钮点击事件
|
--- 提交按钮点击事件
|
||||||
|
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.On_Btn2_Click()
|
||||||
local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND)
|
local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND)
|
||||||
if #formation.teamHeroInfos == 0 then
|
if #formation.teamHeroInfos == 0 then
|
||||||
PopupTipPanel.ShowTip(Language[10711])
|
PopupTipPanel.ShowTip(Language[10711])
|
||||||
|
@ -39,7 +44,9 @@ end
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.bg:SetActive(true)
|
this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10712]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_2_lab.text = Language[10712]
|
||||||
|
|
||||||
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Arena })
|
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Arena })
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,12 @@ function this.GetFormationIndex()
|
||||||
return FormationTypeDef.ARENA_TOM_MATCH
|
return FormationTypeDef.ARENA_TOM_MATCH
|
||||||
end
|
end
|
||||||
--- 提交按钮点击事件
|
--- 提交按钮点击事件
|
||||||
|
---
|
||||||
|
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
|
end
|
||||||
|
function this.On_Btn2_Click()
|
||||||
--保存编队
|
--保存编队
|
||||||
if not hadClick then
|
if not hadClick then
|
||||||
hadClick = true
|
hadClick = true
|
||||||
|
@ -53,7 +58,9 @@ end
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.bg:SetActive(true)
|
this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10508]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_2_lab.text = Language[10508]
|
||||||
hadClick = false
|
hadClick = false
|
||||||
-- 没开启或者开启没参赛都属于未参赛
|
-- 没开启或者开启没参赛都属于未参赛
|
||||||
local isOpen = ArenaTopMatchManager.IsTopMatchActive()
|
local isOpen = ArenaTopMatchManager.IsTopMatchActive()
|
||||||
|
|
|
@ -15,17 +15,13 @@ this.IsNeedChangeFormation = true
|
||||||
--- 逻辑初始化
|
--- 逻辑初始化
|
||||||
function this.Init(root, curMapId)
|
function this.Init(root, curMapId)
|
||||||
this.root = root
|
this.root = root
|
||||||
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
this.curMapId = EndLessMapManager.openMapId
|
||||||
this.curMapId = EndLessMapManager.openMapId
|
|
||||||
-- else
|
|
||||||
-- this.curMapId = curMapId
|
|
||||||
-- end
|
|
||||||
this.InitView()
|
this.InitView()
|
||||||
end
|
end
|
||||||
--- 获取需要显示的编队id
|
--- 获取需要显示的编队id
|
||||||
function this.GetFormationIndex()
|
function this.GetFormationIndex()
|
||||||
local index = 0
|
local index = 0
|
||||||
if CarbonManager.difficulty == 4 then
|
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||||
index = FormationTypeDef.FORMATION_ENDLESS_MAP
|
index = FormationTypeDef.FORMATION_ENDLESS_MAP
|
||||||
else
|
else
|
||||||
FormationManager.curFormationIndex = FormationTypeDef.FORMATION_NORMAL
|
FormationManager.curFormationIndex = FormationTypeDef.FORMATION_NORMAL
|
||||||
|
@ -37,131 +33,131 @@ end
|
||||||
-- 扫荡按钮
|
-- 扫荡按钮
|
||||||
--- btn1点击回调事件
|
--- btn1点击回调事件
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
if CarbonManager.difficulty == 4 and MapManager.Mapping then
|
this.root.SetOneKeyGo()
|
||||||
if this.root.order>=1 then
|
--以前的换成的一键上阵
|
||||||
--保存编队
|
|
||||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and MapManager.Mapping then
|
||||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
-- if this.root.order>=1 then
|
||||||
PopupTipPanel.ShowTip(Language[10713])
|
-- --保存编队
|
||||||
else
|
-- FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||||
PopupTipPanel.ShowTip(Language[10714])
|
-- FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||||
end
|
-- PopupTipPanel.ShowTip(Language[10713])
|
||||||
return
|
-- else
|
||||||
end
|
-- PopupTipPanel.ShowTip(Language[10714])
|
||||||
-- 刷新扫荡数据
|
-- end
|
||||||
this.root.ShowStartMopUpInfoData()
|
-- return
|
||||||
-- 显示扫荡界面
|
-- end
|
||||||
this.root.mopUpGo:SetActive(true)
|
-- 刷新扫荡数据--应该是没了
|
||||||
PlayUIAnim( this.root.mopUpGo)
|
-- this.root.ShowStartMopUpInfoData()
|
||||||
|
-- -- 显示扫荡界面
|
||||||
|
-- this.root.mopUpGo:SetActive(true)
|
||||||
|
-- PlayUIAnim( this.root.mopUpGo)
|
||||||
end
|
end
|
||||||
|
|
||||||
--- btn2点击回调事
|
--- btn2点击回调事
|
||||||
local itemType = {
|
-- local itemType = {
|
||||||
[1] = 27,
|
-- [1] = 27,
|
||||||
[3] = 28,
|
-- [3] = 28,
|
||||||
}
|
-- }
|
||||||
|
|
||||||
-- 进入地图
|
-- 进入地图
|
||||||
function this.On_Btn2_Click()
|
function this.On_Btn2_Click()
|
||||||
|
--保存编队
|
||||||
if this.root.order>=1 then
|
if this.root.order>=1 then
|
||||||
--保存编队
|
|
||||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||||
|
this.root:ClosePanel()
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(string.format(Language[10701], 1))
|
PopupTipPanel.ShowTip(Language[10714])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- 判断当前选择的副本类型
|
|
||||||
local itemId = itemType[CarbonManager.difficulty]
|
|
||||||
|
|
||||||
-- 无尽副本
|
|
||||||
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||||
if #FormationManager.GetFormationByID(401).teamHeroInfos == 0 then
|
if MapManager.Mapping then--在地图里
|
||||||
PopupTipPanel.ShowTip(Language[10714])
|
if this.root.order>=1 then
|
||||||
return
|
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||||
end
|
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||||
else
|
PopupTipPanel.ShowTip(Language[10713])
|
||||||
if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then
|
else
|
||||||
Log(Language[10715])
|
PopupTipPanel.ShowTip(Language[10714])
|
||||||
PopupTipPanel.ShowTip(Language[10714])
|
end
|
||||||
return
|
else
|
||||||
|
Log("进入的副本difficulty:"..CarbonManager.difficulty)
|
||||||
|
this.EnterMapbyType(CarbonManager.difficulty)--, itemId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--+=======================================
|
||||||
|
|
||||||
|
|
||||||
|
-- if this.root.order>=1 then
|
||||||
|
-- --保存编队
|
||||||
|
-- FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||||
|
-- FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||||
|
-- else
|
||||||
|
-- PopupTipPanel.ShowTip(string.format(Language[10701], 1))
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- -- 判断当前选择的副本类型
|
||||||
|
-- local itemId = itemType[CarbonManager.difficulty]
|
||||||
|
|
||||||
|
-- 无尽副本
|
||||||
|
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||||
|
-- if #FormationManager.GetFormationByID(401).teamHeroInfos == 0 then
|
||||||
|
-- PopupTipPanel.ShowTip(Language[10714])
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- else
|
||||||
|
-- if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then
|
||||||
|
-- Log(Language[10715])
|
||||||
|
-- PopupTipPanel.ShowTip(Language[10714])
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- 判断挑战次数
|
-- 判断挑战次数
|
||||||
if CarbonManager.difficulty == 1 then -- 普通副本
|
-- if CarbonManager.difficulty == CARBON_TYPE.NORMAL then -- 普通副本
|
||||||
if BagManager.GetItemCountById(itemId) <= 0 and CarbonManager.GetNormalState(this.curMapId)then
|
-- if BagManager.GetItemCountById(itemId) <= 0 and CarbonManager.GetNormalState(this.curMapId)then
|
||||||
PopupTipPanel.ShowTip(Language[10716])
|
-- PopupTipPanel.ShowTip(Language[10716])
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
elseif CarbonManager.difficulty == 3 then -- 英雄副本
|
-- elseif CarbonManager.difficulty == CARBON_TYPE.HERO then -- 英雄副本
|
||||||
if BagManager.GetItemCountById(itemId) <= 0 then
|
-- if BagManager.GetItemCountById(itemId) <= 0 then
|
||||||
PopupTipPanel.ShowTip(Language[10717])
|
-- PopupTipPanel.ShowTip(Language[10717])
|
||||||
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.EliteCarbonTicket })
|
-- UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.EliteCarbonTicket })
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
-- elseif CarbonManager.difficulty == 2 then -- 失恋副本
|
-- end
|
||||||
-- Log("即将进入试炼副本!")
|
-- if CarbonManager.difficulty == CARBON_TYPE.NORMAL or CarbonManager.difficulty == CARBON_TYPE.HERO then
|
||||||
end
|
-- -- 战斗力判断
|
||||||
if CarbonManager.difficulty == 1 or CarbonManager.difficulty == 3 then
|
-- if this.root.formationPower <CarbonManager.recommendFightAbility[this.curMapId] then
|
||||||
-- 战斗力判断
|
-- MsgPanel.ShowTwo(Language[10718], function()
|
||||||
if this.root.formationPower <CarbonManager.recommendFightAbility[this.curMapId] then
|
-- end, function()
|
||||||
MsgPanel.ShowTwo(Language[10718], function()
|
-- -- 开始挑战
|
||||||
end, function()
|
-- this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||||
-- 开始挑战
|
-- end, Language[10719], Language[10720]
|
||||||
this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
-- )
|
||||||
end, Language[10719], Language[10720]
|
-- else
|
||||||
)
|
-- this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||||
else
|
-- end
|
||||||
this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
-- else
|
||||||
end
|
-- LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId))
|
||||||
else
|
-- this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||||
LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId))
|
-- end
|
||||||
MapManager.endlessEnter = true
|
|
||||||
this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 根据不同的副本类型进入地图
|
-- 根据不同的副本类型进入地图
|
||||||
function this.EnterMapbyType(type, itemId)
|
function this.EnterMapbyType(type)--, itemId)
|
||||||
if type == 1 or type == 3 or type == 4 then
|
if type == CARBON_TYPE.NORMAL or type == CARBON_TYPE.HERO or type == CARBON_TYPE.ENDLESS then
|
||||||
MapManager.curMapId = this.curMapId
|
MapManager.curMapId = this.curMapId
|
||||||
-- elseif type == 2 then
|
|
||||||
-- MapManager.curMapId = trialMapData[MapTrialManager.curTowerLevel].MapId
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local index = CarbonManager.difficulty == 4 and 401 or FormationManager.curFormationIndex
|
local index = CarbonManager.difficulty == CARBON_TYPE.ENDLESS and FormationTypeDef.FORMATION_ENDLESS_MAP or FormationManager.curFormationIndex
|
||||||
NetManager.MapInfoRequest(MapManager.curCarbonType, function()
|
NetManager.MapInfoRequest(MapManager.curCarbonType, function()
|
||||||
MapManager.curAreaId = this.root.curFormationIndex
|
|
||||||
|
|
||||||
-- ======== 副本额外的设置 =================================
|
|
||||||
-- 普通副本解锁后第一次进图
|
|
||||||
if not CarbonManager.GetNormalState(MapManager.curMapId) and CarbonManager.difficulty == 1 then
|
|
||||||
-- 更新一次本地值
|
|
||||||
CarbonManager.playedMapId[MapManager.curMapId] = MapManager.curMapId
|
|
||||||
PopupTipPanel.ShowTip(Language[10721])
|
|
||||||
|
|
||||||
-- 普通、精英副本正常进图
|
|
||||||
elseif CarbonManager.difficulty == 3 or CarbonManager.difficulty == 1 then
|
|
||||||
--BagManager.UpdateItemsNum(itemId, 1)
|
|
||||||
--Log("扣除一次进入副本券, ID是 " .. itemId)
|
|
||||||
|
|
||||||
-- 试炼副本
|
|
||||||
-- elseif CarbonManager.difficulty == 2 then
|
|
||||||
-- MapTrialManager.firstEnter = true
|
|
||||||
elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
|
||||||
-- 是否已经开放
|
|
||||||
-- if not ActTimeCtrlManager.SingleFuncState(46) then
|
|
||||||
-- PopupTipPanel.ShowTip(Language[10722])
|
|
||||||
-- return
|
|
||||||
-- end
|
|
||||||
end
|
|
||||||
-- ===========================================================
|
|
||||||
MapManager.isReloadEnter = false
|
MapManager.isReloadEnter = false
|
||||||
|
|
||||||
SwitchPanel.OpenPanel(UIName.MapPanel)
|
SwitchPanel.OpenPanel(UIName.MapPanel)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
@ -173,52 +169,51 @@ end
|
||||||
|
|
||||||
-- 初始化界面显示
|
-- 初始化界面显示
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
if CarbonManager.difficulty == 2 then
|
if CarbonManager.difficulty == CARBON_TYPE.TRIAL then
|
||||||
this.TrialCarbon()
|
this.TrialCarbon()
|
||||||
elseif CarbonManager.difficulty == 1 or CarbonManager.difficulty == 3 then
|
-- elseif CarbonManager.difficulty == CARBON_TYPE.NORMAL or CarbonManager.difficulty == CARBON_TYPE.HERO then
|
||||||
this.NormalCarbon()
|
-- this.NormalCarbon()
|
||||||
elseif CarbonManager.difficulty == 4 then
|
elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||||
this.EndLessCarbon()
|
this.EndLessCarbon()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 初始化编队数据
|
-- 初始化编队数据
|
||||||
this.IniFormationSet(CarbonManager.difficulty)
|
this.IniFormationSet(CarbonManager.difficulty)
|
||||||
|
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})--_PanelType[CarbonManager.difficulty] })
|
||||||
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = _PanelType[CarbonManager.difficulty] })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
function this.IniFormationSet(type)
|
function this.IniFormationSet(type)
|
||||||
this.IsNeedChangeFormation = type ~= 4
|
this.IsNeedChangeFormation = type ~= CARBON_TYPE.ENDLESS
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
-- 普通,精英副本设置
|
-- 普通,精英副本设置
|
||||||
function this.NormalCarbon()
|
-- function this.NormalCarbon()
|
||||||
this.root.bg:SetActive(true)
|
-- this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(true)
|
-- this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_2:SetActive(true)
|
-- this.root.btn_2:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10723]
|
-- this.root.btn_1_lab.text = Language[10723]
|
||||||
this.root.btn_2_lab.text = Language[10724]
|
-- this.root.btn_2_lab.text = Language[10724]
|
||||||
-- 进入副本显示设置
|
-- -- 进入副本显示设置
|
||||||
MapManager.isCarbonEnter = true
|
-- MapManager.isCarbonEnter = true
|
||||||
|
|
||||||
-- 设置扫荡条件
|
-- -- 设置扫荡条件
|
||||||
local canSweep = CarbonManager.GetMapSweepState(this.curMapId)
|
-- local canSweep = CarbonManager.GetMapSweepState(this.curMapId)
|
||||||
local rgbValue = canSweep and 1 or 0.5
|
-- local rgbValue = canSweep and 1 or 0.5
|
||||||
Util.SetColor(this.root.btn_1, Color.New(rgbValue, rgbValue, rgbValue, 1))
|
-- Util.SetColor(this.root.btn_1, Color.New(rgbValue, rgbValue, rgbValue, 1))
|
||||||
this.root.btn_1:GetComponent("Button").enabled = canSweep
|
-- this.root.btn_1:GetComponent("Button").enabled = canSweep
|
||||||
this.SetTipShowByType(CarbonManager.difficulty, canSweep)
|
-- this.SetTipShowByType(CarbonManager.difficulty, canSweep)
|
||||||
end
|
-- end
|
||||||
|
|
||||||
-- 设置精英副本跟普通副本的提示显示
|
-- -- 设置精英副本跟普通副本的提示显示
|
||||||
function this.SetTipShowByType(type, canSweep)
|
-- function this.SetTipShowByType(type, canSweep)
|
||||||
local isEliteCarbon = type == 3
|
-- local isEliteCarbon = type == 3
|
||||||
this.root.mobTip:SetActive(not canSweep and not isEliteCarbon)
|
-- this.root.mobTip:SetActive(not canSweep and not isEliteCarbon)
|
||||||
this.root.eliteTip:SetActive(not canSweep and isEliteCarbon)
|
-- this.root.eliteTip:SetActive(not canSweep and isEliteCarbon)
|
||||||
-- 普通-精英副本得到的地图ID this.curMapId
|
-- -- 普通-精英副本得到的地图ID this.curMapId
|
||||||
this.root.eliteNumNeed.text = CarbonManager.EliteSweepCondition(this.curMapId)
|
-- this.root.eliteNumNeed.text = CarbonManager.EliteSweepCondition(this.curMapId)
|
||||||
end
|
-- end
|
||||||
|
|
||||||
-- 试炼副本设置
|
-- 试炼副本设置
|
||||||
function this.TrialCarbon()
|
function this.TrialCarbon()
|
||||||
|
@ -236,13 +231,14 @@ function this.EndLessCarbon()
|
||||||
if MapManager.Mapping then
|
if MapManager.Mapping then
|
||||||
this.root.bg:SetActive(true)
|
this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_2:SetActive(false)
|
this.root.btn_2:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10726]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2_lab.text = Language[10726]
|
||||||
else
|
else
|
||||||
this.root.bg:SetActive(true)
|
this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(false)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_2:SetActive(true)
|
this.root.btn_2:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10723]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
this.root.btn_2_lab.text = Language[10724]
|
this.root.btn_2_lab.text = Language[10724]
|
||||||
-- 进入副本显示设置
|
-- 进入副本显示设置
|
||||||
MapManager.isCarbonEnter = true
|
MapManager.isCarbonEnter = true
|
||||||
|
|
|
@ -18,7 +18,12 @@ function this.GetFormationIndex()
|
||||||
return FormationTypeDef.EXPEDITION
|
return FormationTypeDef.EXPEDITION
|
||||||
end
|
end
|
||||||
--- btn1点击回调事件
|
--- btn1点击回调事件
|
||||||
|
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.On_Btn2_Click()
|
||||||
if not hadClick then
|
if not hadClick then
|
||||||
hadClick = true
|
hadClick = true
|
||||||
if this.root.order>=1 then
|
if this.root.order>=1 then
|
||||||
|
@ -55,7 +60,9 @@ end
|
||||||
-- 初始化界面显示
|
-- 初始化界面显示
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10708]
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2_lab.text = Language[10708]
|
||||||
MapManager.isCarbonEnter = false
|
MapManager.isCarbonEnter = false
|
||||||
this.root.formTip:SetActive(true)
|
this.root.formTip:SetActive(true)
|
||||||
this.root.formTip:GetComponent("Text").text = Language[10727] ..20 .. Language[10728]
|
this.root.formTip:GetComponent("Text").text = Language[10727] ..20 .. Language[10728]
|
||||||
|
|
|
@ -14,7 +14,12 @@ function this.GetFormationIndex()
|
||||||
return FormationTypeDef.GUILD_CAR_DELEAY
|
return FormationTypeDef.GUILD_CAR_DELEAY
|
||||||
end
|
end
|
||||||
--- btn1点击回调事件
|
--- btn1点击回调事件
|
||||||
|
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.On_Btn2_Click()
|
||||||
if not hadClick then
|
if not hadClick then
|
||||||
hadClick = true
|
hadClick = true
|
||||||
if this.root.order>=1 then
|
if this.root.order>=1 then
|
||||||
|
@ -51,7 +56,9 @@ end
|
||||||
-- 初始化界面显示
|
-- 初始化界面显示
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10708]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_2_lab.text = Language[10708]
|
||||||
MapManager.isCarbonEnter = false
|
MapManager.isCarbonEnter = false
|
||||||
this.root.formTip:SetActive(false)
|
this.root.formTip:SetActive(false)
|
||||||
local costTip = this.root.costTip
|
local costTip = this.root.costTip
|
||||||
|
|
|
@ -26,10 +26,16 @@ end
|
||||||
|
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10512]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_2_lab.text = Language[10512]
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.On_Btn2_Click()
|
||||||
if this.root.order>=1 then
|
if this.root.order>=1 then
|
||||||
--保存编队
|
--保存编队
|
||||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||||
|
|
|
@ -17,7 +17,12 @@ function this.GetFormationIndex()
|
||||||
return FormationTypeDef.GUILD_TRANSCRIPT
|
return FormationTypeDef.GUILD_TRANSCRIPT
|
||||||
end
|
end
|
||||||
--- btn1点击回调事件
|
--- btn1点击回调事件
|
||||||
|
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.On_Btn2_Click()
|
||||||
if not hadClick then
|
if not hadClick then
|
||||||
hadClick = true
|
hadClick = true
|
||||||
if this.root.order>=1 then
|
if this.root.order>=1 then
|
||||||
|
@ -35,26 +40,16 @@ function this.On_Btn1_Click()
|
||||||
hadClick = false
|
hadClick = false
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
this.StartFight()
|
||||||
-- 战斗力判断
|
|
||||||
-- GetCurNodeInfo = ExpeditionManager.GetCurNodeInfo()
|
|
||||||
--if this.root.formationPower >= this.nodeData.bossTeaminfo.totalForce then
|
|
||||||
this.StartFight()
|
|
||||||
--else
|
|
||||||
-- MsgPanel.ShowTwo("当前队伍战力小于推荐战力,战斗可能会有失败风险。确定是否要继续战斗?", function()
|
|
||||||
-- hadClick = false
|
|
||||||
-- end, function()
|
|
||||||
-- this.StartFight()
|
|
||||||
-- end, "取消", "确定"
|
|
||||||
-- )
|
|
||||||
--end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 初始化界面显示
|
-- 初始化界面显示
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10708]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_2_lab.text = Language[10708]
|
||||||
MapManager.isCarbonEnter = false
|
MapManager.isCarbonEnter = false
|
||||||
this.root.formTip:SetActive(false)
|
this.root.formTip:SetActive(false)
|
||||||
local costTip = this.root.costTip
|
local costTip = this.root.costTip
|
||||||
|
|
|
@ -17,7 +17,7 @@ function this.GetFormationIndex()
|
||||||
end
|
end
|
||||||
|
|
||||||
--- btn1点击回调事件 -- lEFT
|
--- btn1点击回调事件 -- lEFT
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn2_Click()
|
||||||
if this.root.order>=1 then
|
if this.root.order>=1 then
|
||||||
--保存编队
|
--保存编队
|
||||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||||
|
@ -44,16 +44,17 @@ function this.On_Btn1_Click()
|
||||||
this.StraightBattle()
|
this.StraightBattle()
|
||||||
end
|
end
|
||||||
--- btn2点击回调事件 --RIGHT
|
--- btn2点击回调事件 --RIGHT
|
||||||
function this.On_Btn2_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.bg:SetActive(true)
|
this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(true)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_2:SetActive(false)
|
this.root.btn_2:SetActive(true)
|
||||||
-- this.root.failText:SetActive(true)
|
-- this.root.failText:SetActive(true)
|
||||||
this.root.btn_1_lab.text = Language[10709]
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
|
this.root.btn_2_lab.text = Language[10709]
|
||||||
this.root.passBattle0.gameObject:SetActive(false)
|
this.root.passBattle0.gameObject:SetActive(false)
|
||||||
this.root.passBattle1.gameObject:SetActive(false)
|
this.root.passBattle1.gameObject:SetActive(false)
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,9 @@ end
|
||||||
-- 初始化界面显示
|
-- 初始化界面显示
|
||||||
function this.InitView()
|
function this.InitView()
|
||||||
this.root.bg:SetActive(true)
|
this.root.bg:SetActive(true)
|
||||||
this.root.btn_1:SetActive(false)
|
this.root.btn_1:SetActive(true)
|
||||||
this.root.btn_2:SetActive(true)
|
this.root.btn_2:SetActive(true)
|
||||||
|
this.root.btn_1_lab.text = Language[10743]
|
||||||
this.root.btn_2_lab.text = Language[10709]
|
this.root.btn_2_lab.text = Language[10709]
|
||||||
this.root.tip:SetActive(true)
|
this.root.tip:SetActive(true)
|
||||||
this.root.exampleBtn:SetActive(false)
|
this.root.exampleBtn:SetActive(false)
|
||||||
|
@ -36,6 +37,7 @@ end
|
||||||
|
|
||||||
--- btn1点击回调事件
|
--- btn1点击回调事件
|
||||||
function this.On_Btn1_Click()
|
function this.On_Btn1_Click()
|
||||||
|
this.root.SetOneKeyGo()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 进入地图
|
-- 进入地图
|
||||||
|
|
|
@ -94,6 +94,7 @@ function this.SingleInfoDataShow(go,data)
|
||||||
sortNumTabs[i] = Util.GetGameObject(go, "SortNum/SortNum ("..i..")")
|
sortNumTabs[i] = Util.GetGameObject(go, "SortNum/SortNum ("..i..")")
|
||||||
sortNumTabs[i]:SetActive(false)
|
sortNumTabs[i]:SetActive(false)
|
||||||
end
|
end
|
||||||
|
LogRed("data.rank:"..data.rank)
|
||||||
if data.rank < 4 then
|
if data.rank < 4 then
|
||||||
sortNumTabs[data.rank]:SetActive(true)
|
sortNumTabs[data.rank]:SetActive(true)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue