挂机界面修改,战斗流程修改
parent
871e7eecba
commit
4a684042f4
|
@ -10784,7 +10784,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 133.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 68.95}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1240811747
|
||||
|
@ -11109,7 +11109,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 293.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 68.95}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1596169479
|
||||
|
@ -26219,7 +26219,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 53865032783717943}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.67333126, y: 0.6794785, z: 0.67385}
|
||||
m_LocalScale: {x: 3, y: 3, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 53865032682844964}
|
||||
m_RootOrder: 2
|
||||
|
@ -26227,7 +26227,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 100, y: -169}
|
||||
m_SizeDelta: {x: 1024, y: 512}
|
||||
m_SizeDelta: {x: 156, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &53865032783717936
|
||||
CanvasRenderer:
|
||||
|
@ -26257,7 +26257,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: bffd4395ed689df429e9cf3f35d0a7d5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: fff898ad0bab68948a6227dced69a7e5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -40630,7 +40630,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &53865033709871340
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -41081,7 +41081,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7613519088502374952
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -41099,9 +41099,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3952385394978222417}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -30.74}
|
||||
m_SizeDelta: {x: 100, y: 61.48}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7481411220995830971
|
||||
|
@ -41913,7 +41913,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1742237803807469844
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -41931,9 +41931,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3952385394978222417}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -108.75}
|
||||
m_SizeDelta: {x: 100, y: 217.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1473222624206509369
|
||||
|
@ -76395,7 +76395,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4113268208886061241
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -86516,15 +86516,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 4464147961695801504}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.4226993, y: 1.4226993, z: 1.4226993}
|
||||
m_LocalScale: {x: 2, y: 2, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4464147961326781875}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 38, y: -269}
|
||||
m_SizeDelta: {x: 1024, y: 512}
|
||||
m_AnchoredPosition: {x: -110, y: -269}
|
||||
m_SizeDelta: {x: 308, y: 261}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4464147961695801511
|
||||
CanvasRenderer:
|
||||
|
@ -86554,7 +86554,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: fa6b02122acde064bbd248824d6800dc, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: f23578b1f7952b3479dda668f984b817, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -96118,7 +96118,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4464147962361910907
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -127801,7 +127801,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &696069980414600585
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -127820,9 +127820,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3952385394978222417}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -50}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &109213283015355470
|
||||
|
@ -133122,15 +133122,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 6542693245457751346}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.03, y: 1.03, z: 1.03}
|
||||
m_LocalScale: {x: 2, y: 2, z: 1.03}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6542693246405151611}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 114, y: -208}
|
||||
m_SizeDelta: {x: 1024, y: 512}
|
||||
m_AnchoredPosition: {x: 30, y: -208}
|
||||
m_SizeDelta: {x: 216, y: 134}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6542693245457751349
|
||||
CanvasRenderer:
|
||||
|
@ -133160,7 +133160,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: bc2db87f93c13dd43b4f6670517a1859, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 6d376836cf9def548a5d9302bcd4e5aa, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -137981,7 +137981,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6542693245716389709
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -139577,7 +139577,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7203306409298755909
|
||||
|
|
|
@ -837,7 +837,12 @@ function this.ExcuteBattle()
|
|||
else
|
||||
-- 检测是否有前置引导
|
||||
GuideManager.BeforeFightCheck(curFightId, function()
|
||||
this.SetInitAnim()
|
||||
--屏蔽弹怪追认的动画
|
||||
--this.SetInitAnim()
|
||||
local isBoss = FightPointPassManager.IsFightBoss()
|
||||
local sound = isBoss and SoundConfig.Sound_FightArea_Boss or SoundConfig.Sound_FightArea_Monster
|
||||
SoundManager.PlaySound(sound, AUDIO_FADE_TYPE.FADE_OUT_NOT_IN, AUDIO_RUN_TYPE.CONC, nil, 20)
|
||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.STORY, FightPointPassManager.curOpenFight)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue