tcx_xiyou_yueNan
parent
9ec82c451a
commit
ebe1fe0912
|
|
@ -27,6 +27,7 @@ ServerConfigManager.SettingConfig = {
|
|||
IS_NULL = "IS_NULL", -- 使用C#判断物体是否销毁
|
||||
SHOW_EMAIL_SETTING = "SHOW_EMAIL_SETTING", -- 设置显示反馈邮箱
|
||||
SHOW_EMAIL_LOGIN = "SHOW_EMAIL_LOGIN", -- 登录显示反馈邮箱
|
||||
SHOW_PROTO_SETTING = "SHOW_PROTO_SETTING", -- 设置显示隐私协议
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -119,8 +119,8 @@ function DailyCarbonPanel:OnShow()
|
|||
if PlayerManager.maxForce < curFormationForce then
|
||||
PlayerManager.maxForce = curFormationForce
|
||||
end
|
||||
maxForce = PlayerManager.maxForce
|
||||
|
||||
--maxForce = PlayerManager.maxForce
|
||||
maxForce = curFormationForce
|
||||
if carbonIndex == 0 then carbonIndex = 1 end
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
this.TabCtrl:SetTabIsLockCheck(this.TabIsLockCheck)
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ end
|
|||
function this.GetOtherTeamAllHeroIds(_index)
|
||||
local ids = {}
|
||||
for key, value in pairs(allHeros) do
|
||||
if value.index ~= _index then
|
||||
if value.index ~= _index and this.IsAlreadyUp(value.index) then
|
||||
table.insert(ids, key)
|
||||
end
|
||||
end
|
||||
|
|
@ -331,7 +331,6 @@ function this.GetOtherTeamAllHeroStaticIds(_index)
|
|||
local data = HeroManager.GetSingleHeroData(key)
|
||||
local id = data.heroConfig.Id
|
||||
if not BattleUtil.ChecklistIsContainValue(ids, id) then
|
||||
LogError("id===============" .. id)
|
||||
table.insert(ids, id)
|
||||
end
|
||||
end
|
||||
|
|
@ -352,7 +351,6 @@ function this.On_Btn2_Click()
|
|||
LogError("点击保存按钮 allheros len==" .. #allHeros)
|
||||
for key, value in pairs(allHeros) do
|
||||
local newHero = {}
|
||||
LogError("++++++++++++++++++++++++++")
|
||||
newHero.heroId = value.Id
|
||||
newHero.position = value.pos
|
||||
|
||||
|
|
@ -518,22 +516,35 @@ function this.GetOneKeyUpHeroList()
|
|||
end
|
||||
return heros
|
||||
end
|
||||
|
||||
function this.IsAlreadyUp(team)
|
||||
if this.towerType == 31 then
|
||||
if team == FormationTypeDef.GodsWayTower_Two_1 or team == FormationTypeDef.GodsWayTower_Two_2 then
|
||||
return true
|
||||
end
|
||||
elseif this.towerType == 32 then
|
||||
if team == FormationTypeDef.GodsWayTower_Three_1 or team == FormationTypeDef.GodsWayTower_Three_2 or team == FormationTypeDef.GodsWayTower_Three_3 then
|
||||
return true
|
||||
end
|
||||
elseif this.towerType == 33 then
|
||||
if team == FormationTypeDef.BecomeAGod_1 or team == FormationTypeDef.BecomeAGod_2 or team == FormationTypeDef.BecomeAGod_3 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
function this.HeroUpDownCheck(params, checkFail, CheckSuccess)
|
||||
if params.action == FORMATION_ACTION.UP then
|
||||
local team = this.GetHeroTeam(params.heroData.dynamicId)
|
||||
if team then
|
||||
if team ~= this.GetFormationIndex() then
|
||||
MsgPanel.ShowTwo(Language[10923], nil, function()
|
||||
if params.position and params.position ~= 0 then
|
||||
--改变英雄队伍id改变
|
||||
this.ChangeHeroTeam(params.heroData.dynamicId, this.GetFormationIndex(), params.position)
|
||||
end
|
||||
if CheckSuccess then
|
||||
CheckSuccess(params)
|
||||
end
|
||||
end)
|
||||
end
|
||||
if team and this.IsAlreadyUp(team) then
|
||||
MsgPanel.ShowTwo(Language[10923], nil, function()
|
||||
if params.position and params.position ~= 0 then
|
||||
--改变英雄队伍id改变
|
||||
this.ChangeHeroTeam(params.heroData.dynamicId, this.GetFormationIndex(), params.position)
|
||||
end
|
||||
if CheckSuccess then
|
||||
CheckSuccess(params)
|
||||
end
|
||||
end)
|
||||
else
|
||||
--判断是否是相同英雄
|
||||
-- local ids=this.GetOtherTeamAllHeroStaticIds(this.GetFormationIndex())
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ function GodsWayTowerPanel:InitComponent()
|
|||
"Text")
|
||||
this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn")
|
||||
this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRankImg/btnRank")
|
||||
this.btnRankRoot = Util.GetGameObject(self.gameObject, "InfoRoot/btnRankImg")
|
||||
this.btnFormation = Util.GetGameObject(self.gameObject, "InfoRoot/btnFormationBg/btnFormation")
|
||||
this.btnHelpFightObj = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFightBg")
|
||||
this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFightBg/btnHelpFight")
|
||||
|
|
@ -239,6 +240,7 @@ function GodsWayTowerPanel:OnShow()
|
|||
this.btnRank.gameObject:SetActive(true)
|
||||
else
|
||||
this.btnRank.gameObject:SetActive(false)
|
||||
this.btnRankRoot.gameObject:SetActive(false)
|
||||
curId = 0
|
||||
this.becomeAGodText1.gameObject:SetActive(false)
|
||||
this.becomeAGodText.gameObject:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ function SettingInfo:InitComponent(gameObject, rootPanel)
|
|||
local fankuiText = this.fankui:GetComponent("Text")
|
||||
fankuiText.text = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.SHOW_EMAIL_SETTING) or ""
|
||||
end
|
||||
this.protos = Util.GetGameObject(gameObject, "other/protos")
|
||||
this.protos:SetActive(ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.SHOW_PROTO_SETTING))
|
||||
this.instructionsBtn = Util.GetGameObject(gameObject, "other/protos/instructionsBtn")
|
||||
this.privacyBtn = Util.GetGameObject(gameObject, "other/protos/privacyBtn")
|
||||
this.name = Util.GetGameObject(gameObject, "playerInfo/name/Text")
|
||||
|
|
|
|||
|
|
@ -38,11 +38,19 @@ function this.GetTowerDataByType(_type)
|
|||
local floor = this.GetTowerFloorByType(_type)
|
||||
local towerList = {}
|
||||
--ConfigManager.TryGetAllConfigsDataByDoubleKey(ConfigName.DuoDuiTower,"Type",_type,)
|
||||
local maxfloor = 300
|
||||
if _type == 1 then
|
||||
maxfloor = 350
|
||||
elseif _type == 2 then
|
||||
maxfloor = 300
|
||||
else
|
||||
maxfloor = 3000
|
||||
end
|
||||
if floor < 0 then
|
||||
floor = 0
|
||||
end
|
||||
if floor >= 300 - 10 then
|
||||
floor = 300 - 10
|
||||
if floor >= maxfloor - 10 then
|
||||
floor = maxfloor - 10
|
||||
end
|
||||
for i = floor + 1, floor + 10 do
|
||||
local data = this.GetFourMonsterInfoByWave(_type, i)
|
||||
|
|
|
|||
Loading…
Reference in New Issue