跳过战斗修改
parent
20e94b546f
commit
4ca7445e8b
|
@ -264,8 +264,8 @@ function this:OnOpen(_fightData, _fightType, _endFunc, _guideType,isChangeBGM)
|
||||||
fightType = _fightType --判定战斗类型
|
fightType = _fightType --判定战斗类型
|
||||||
isBack = _fightType == BATTLE_TYPE.BACK --判定是否是战斗回放
|
isBack = _fightType == BATTLE_TYPE.BACK --判定是否是战斗回放
|
||||||
hadCounted = 0
|
hadCounted = 0
|
||||||
--
|
-- _fightType ~= BATTLE_TYPE.BACK and _fightType ~= BATTLE_TYPE.BACK_BATTLE
|
||||||
if _fightType ~= BATTLE_TYPE.BACK and _fightType ~= BATTLE_TYPE.BACK_BATTLE and PlayerPrefs.GetInt(PlayerManager.uid.."isJumpFight")==1 then
|
if _fightType==BATTLE_TYPE.STORY_FIGHT and PlayerPrefs.GetInt(PlayerManager.uid.."isJumpFight")==1 then
|
||||||
|
|
||||||
local record = {
|
local record = {
|
||||||
fightData = _fightData.fightData,
|
fightData = _fightData.fightData,
|
||||||
|
@ -282,7 +282,7 @@ function this:OnOpen(_fightData, _fightType, _endFunc, _guideType,isChangeBGM)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
this.curRound = 1
|
this.curRound = 1
|
||||||
-- LogPink(fightType)
|
LogPink(fightType)
|
||||||
if _fightData.bg then
|
if _fightData.bg then
|
||||||
this.BG:GetComponent("Image").sprite = this.spLoader:LoadSprite(_fightData.bg)
|
this.BG:GetComponent("Image").sprite = this.spLoader:LoadSprite(_fightData.bg)
|
||||||
else
|
else
|
||||||
|
|
|
@ -179,7 +179,7 @@ function this:InitComponent()
|
||||||
this.fightlevelconditionBar = Util.GetGameObject(self.transform, "FightLevelConditionBar")
|
this.fightlevelconditionBar = Util.GetGameObject(self.transform, "FightLevelConditionBar")
|
||||||
this.fightlevelconditionBar:SetActive(false)
|
this.fightlevelconditionBar:SetActive(false)
|
||||||
this.jumpFightObj=Util.GetGameObject(self.transform, "jumpFight")
|
this.jumpFightObj=Util.GetGameObject(self.transform, "jumpFight")
|
||||||
this.jumpFightObj:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.FightJump))
|
|
||||||
this.jumpFightBtn=Util.GetGameObject(self.transform, "jumpFight/btn")
|
this.jumpFightBtn=Util.GetGameObject(self.transform, "jumpFight/btn")
|
||||||
this.jumpFightGou=Util.GetGameObject(self.transform, "jumpFight/Image")
|
this.jumpFightGou=Util.GetGameObject(self.transform, "jumpFight/Image")
|
||||||
end
|
end
|
||||||
|
@ -261,6 +261,7 @@ end
|
||||||
function this:OnOpen(_panelType,...)
|
function this:OnOpen(_panelType,...)
|
||||||
Log("panelType:".._panelType)
|
Log("panelType:".._panelType)
|
||||||
panelType = _panelType
|
panelType = _panelType
|
||||||
|
this.jumpFightObj:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.FightJump) and panelType==FORMATION_TYPE.STORY)
|
||||||
if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then
|
if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then
|
||||||
for k,v in pairs(bgListGo) do
|
for k,v in pairs(bgListGo) do
|
||||||
v:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan")
|
v:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan")
|
||||||
|
|
Loading…
Reference in New Issue