Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
2833c3a269
|
@ -396,6 +396,7 @@ function this.BtnClick(id)
|
||||||
end
|
end
|
||||||
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
|
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||||
|
MapManager.SetViewSize(3)--设置视野范围(明雷形式)
|
||||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -127,11 +127,11 @@ end
|
||||||
function this.InitActPowerShow()
|
function this.InitActPowerShow()
|
||||||
local total = EndLessMapManager.GetTotalEnergy()
|
local total = EndLessMapManager.GetTotalEnergy()
|
||||||
local curEnergy = 0
|
local curEnergy = 0
|
||||||
if MapManager.isInMap then
|
-- if MapManager.isInMap then
|
||||||
curEnergy = EndLessMapManager.leftEnergy
|
-- curEnergy = EndLessMapManager.leftEnergy
|
||||||
else
|
-- else
|
||||||
curEnergy = BagManager.GetItemCountById(1)
|
curEnergy = BagManager.GetItemCountById(1)
|
||||||
end
|
-- end
|
||||||
|
|
||||||
local color = curEnergy <= 5 and "FF0014FF" or "A0B2B2FF"
|
local color = curEnergy <= 5 and "FF0014FF" or "A0B2B2FF"
|
||||||
local str = string.format("<color=#%s>%s</color>", color, tostring(curEnergy))
|
local str = string.format("<color=#%s>%s</color>", color, tostring(curEnergy))
|
||||||
|
|
|
@ -179,6 +179,7 @@ function this:GetMapData(u, v)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:UpdateFogArea(u, v, rad)
|
function this:UpdateFogArea(u, v, rad)
|
||||||
|
Log("位置和迷雾范围: "..u.."|"..v.."|"..rad)
|
||||||
for i = math.max(u-rad, 1), math.min(u+rad, self.uLen) do
|
for i = math.max(u-rad, 1), math.min(u+rad, self.uLen) do
|
||||||
for j = math.max(v-rad, 1), math.min(v+rad, self.vLen) do
|
for j = math.max(v-rad, 1), math.min(v+rad, self.vLen) do
|
||||||
if math.abs(i-u) + math.abs(j-v) <= rad then
|
if math.abs(i-u) + math.abs(j-v) <= rad then
|
||||||
|
|
|
@ -134,8 +134,8 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION)
|
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
||||||
JumpManager.GoJump(8001)
|
JumpManager.GoJump(8001)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
-- elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||||
JumpManager.GoJump(57001)
|
-- JumpManager.GoJump(57001)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
||||||
-- JumpManager.GoJump(57001)
|
-- JumpManager.GoJump(57001)
|
||||||
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
|
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
|
||||||
|
|
|
@ -215,8 +215,8 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION)
|
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
||||||
JumpManager.GoJump(8001)
|
JumpManager.GoJump(8001)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
-- elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||||
JumpManager.GoJump(57001)
|
-- JumpManager.GoJump(57001)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.EXPEDITION then
|
elseif heroData.isFormations[1] == FormationTypeDef.EXPEDITION then
|
||||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION,FormationTypeDef.EXPEDITION)
|
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION,FormationTypeDef.EXPEDITION)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
||||||
|
|
|
@ -154,8 +154,8 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION)
|
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
||||||
JumpManager.GoJump(8001)
|
JumpManager.GoJump(8001)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
-- elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||||
JumpManager.GoJump(57001)
|
-- JumpManager.GoJump(57001)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.EXPEDITION then
|
elseif heroData.isFormations[1] == FormationTypeDef.EXPEDITION then
|
||||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION,FormationTypeDef.EXPEDITION)
|
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION,FormationTypeDef.EXPEDITION)
|
||||||
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
||||||
|
|
Loading…
Reference in New Issue