挂机战斗修改提交

dev_chengFeng
yuanshuai 2022-11-25 15:43:42 +08:00
parent a18efd9a1f
commit 828e56c6be
3 changed files with 19 additions and 13 deletions

View File

@ -10814,7 +10814,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 159, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 68.95} m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747 --- !u!222 &1240811747
@ -11139,7 +11139,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 301.5, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 68.95} m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479 --- !u!222 &1596169479
@ -41131,7 +41131,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 61.48} m_SizeDelta: {x: 100, y: 61.48}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7481411220995830971 --- !u!114 &7481411220995830971
@ -41963,7 +41963,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 217.5} m_SizeDelta: {x: 100, y: 217.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369 --- !u!222 &1473222624206509369
@ -97089,7 +97089,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1685841925491652605 --- !u!224 &1685841925491652605
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -127679,7 +127679,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &109213283015355470 --- !u!114 &109213283015355470
@ -139435,7 +139435,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 69.49} m_SizeDelta: {x: 0, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7203306409298755909 --- !u!222 &7203306409298755909

View File

@ -115,7 +115,7 @@ function FightPointPassMainPanel:InitComponent()
this.red_light:SetActive(false) this.red_light:SetActive(false)
this.red_wei = Util.GetGameObject(self.gameObject, "Bg/red_light/wei") this.red_wei = Util.GetGameObject(self.gameObject, "Bg/red_light/wei")
this.hookSkillBtn=Util.GetGameObject(self.gameObject, "Bg/red_light/skillBtn") this.hookSkillBtn=Util.GetGameObject(self.gameObject, "Bg/red_light/skillBtn")
this.hookSkillBtn.gameObject:SetActive(false)
if not this.playerInfoView then if not this.playerInfoView then
this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform) this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform)
@ -573,7 +573,10 @@ function FightPointPassMainPanel:OnShow()
-- --
this.battleUpLvTip:SetActive(false) this.battleUpLvTip:SetActive(false)
this.RefreshBattleUpLvTip(true) this.RefreshBattleUpLvTip(true)
if fightLevelConfig[curFightId].Hang>0 then this.hookSkillBtn.gameObject:SetActive(false)
local hangArr= fightLevelConfig[curFightId].Hang
if hangArr and hangArr[1]>0 then
maxKillNum=hangArr[2]
this.btnFight.gameObject:SetActive(false) this.btnFight.gameObject:SetActive(false)
this.hookKill.gameObject:SetActive(true) this.hookKill.gameObject:SetActive(true)
curKillNum=0 curKillNum=0
@ -835,13 +838,12 @@ function this.ExcuteBattle()
this.SetInitAnim() this.SetInitAnim()
end) end)
end end
end end
function this.RefreshFightBtnShow() function this.RefreshFightBtnShow()
local curFightId = FightPointPassManager.curOpenFight local curFightId = FightPointPassManager.curOpenFight
if fightLevelConfig[curFightId].Hang > 0 then local hangArr=fightLevelConfig[curFightId].Hang
if hangArr and hangArr[1]> 0 then
curKillNum=curKillNum+1 curKillNum=curKillNum+1
this.hookKillText.text=string.format("%s/%s",curKillNum,maxKillNum) this.hookKillText.text=string.format("%s/%s",curKillNum,maxKillNum)
if curKillNum>=maxKillNum then if curKillNum>=maxKillNum then

View File

@ -97,7 +97,11 @@ end
function this:Init() function this:Init()
this.isClose = false this.isClose = false
this.isCanUseIconList = 0 this.isCanUseIconList = 0
this.fightType= ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight).Hang this.fightType= 0
local hangArr=ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight).Hang
if hangArr then
this.fightType=hangArr[1]
end
-- 初始化加载地图块数据 -- 初始化加载地图块数据
this:LoadMapData() this:LoadMapData()
-- 加载一个小人 -- 加载一个小人