Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-04-27 13:48:29 +08:00
commit eb7d89578a
5 changed files with 418 additions and 115 deletions

View File

@ -4816,7 +4816,7 @@ ParticleSystem:
--- !u!199 &87992400547130891
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9589,7 +9589,7 @@ ParticleSystem:
--- !u!199 &-3856357103111044387
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14701,7 +14701,7 @@ ParticleSystem:
--- !u!199 &4899634819696531688
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19457,7 +19457,7 @@ ParticleSystem:
--- !u!199 &4644274050042266027
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24570,7 +24570,7 @@ ParticleSystem:
--- !u!199 &-6568434204472551825
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24929,7 +24929,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6297374445036456370
RectTransform:
m_ObjectHideFlags: 0
@ -30402,7 +30402,7 @@ ParticleSystem:
--- !u!199 &4504004418399676027
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30777,8 +30777,9 @@ RectTransform:
- {fileID: -9049101653871286442}
- {fileID: 2956223626765890844}
- {fileID: 5251286333026968868}
- {fileID: 803833580}
m_Father: {fileID: -4381370023651553062}
m_RootOrder: 2
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -37191,7 +37192,7 @@ ParticleSystem:
--- !u!199 &-43774083811853307
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41862,7 +41863,7 @@ ParticleSystem:
--- !u!199 &-6320650307698832674
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42112,7 +42113,7 @@ RectTransform:
- {fileID: -7803108222865121850}
- {fileID: -8474452437207042981}
m_Father: {fileID: -4381370023651553062}
m_RootOrder: 4
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}
@ -44355,6 +44356,43 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &803833579
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 803833580}
m_Layer: 5
m_Name: boss
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &803833580
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803833579}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1032666927}
- {fileID: 1067819436}
m_Father: {fileID: 9064487652359765220}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &834692240
GameObject:
m_ObjectHideFlags: 0
@ -44764,6 +44802,66 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1032666926
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1032666927}
- component: {fileID: 1032666928}
m_Layer: 5
m_Name: buff
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1032666927
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1032666926}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 99.97783}
m_LocalScale: {x: 0.99882317, y: 0.99882317, z: 0.99882317}
m_Children: []
m_Father: {fileID: 803833580}
m_RootOrder: 0
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: 182.45378, y: -190.98093}
m_SizeDelta: {x: 364.9, y: 134.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1032666928
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1032666926}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 5
m_Bottom: 0
m_ChildAlignment: 2
m_StartCorner: 1
m_StartAxis: 0
m_CellSize: {x: 40, y: 40}
m_Spacing: {x: 5, y: 5}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &1044302834
GameObject:
m_ObjectHideFlags: 0
@ -44919,6 +45017,67 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1067819435
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1067819436}
- component: {fileID: 1067819437}
m_Layer: 5
m_Name: rage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1067819436
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067819435}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 99.97783}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1527551389}
m_Father: {fileID: 803833580}
m_RootOrder: 1
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: -181.86821, y: -190.98091}
m_SizeDelta: {x: 364.2, y: 134.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1067819437
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1067819435}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 10
m_Right: 0
m_Top: 10
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 23, y: 30}
m_Spacing: {x: 20, y: 20}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &1089584651
GameObject:
m_ObjectHideFlags: 0
@ -50353,7 +50512,7 @@ ParticleSystem:
--- !u!199 &1498398485
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -50488,6 +50647,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1527551388
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1527551389}
- component: {fileID: 1527551391}
- component: {fileID: 1527551390}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1527551389
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527551388}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1067819436}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 21.5, y: -25}
m_SizeDelta: {x: 23, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1527551391
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527551388}
m_CullTransparentMesh: 0
--- !u!114 &1527551390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527551388}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: a89854ca437b8e344b8c06f2c64d21e1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1556511315
GameObject:
m_ObjectHideFlags: 0
@ -55697,7 +55930,7 @@ ParticleSystem:
--- !u!199 &1734195439
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -57235,10 +57468,10 @@ RectTransform:
m_Children:
- {fileID: 1700014430546523632}
- {fileID: 9181304900197980290}
- {fileID: 9064487652359765220}
- {fileID: 4865351776209694286}
- {fileID: 4104790940082786943}
- {fileID: 8032969764776295951}
- {fileID: 9064487652359765220}
- {fileID: 4865351776209694286}
- {fileID: 1966515042}
- {fileID: 954781532}
- {fileID: 308563047}
@ -62502,7 +62735,7 @@ ParticleSystem:
--- !u!199 &7991294692409704612
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -67258,7 +67491,7 @@ ParticleSystem:
--- !u!199 &5218046717783627369
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -73046,7 +73279,7 @@ ParticleSystem:
--- !u!199 &2581804999609786167
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -78204,7 +78437,7 @@ ParticleSystem:
--- !u!199 &3991612333217115293
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -83388,7 +83621,7 @@ ParticleSystem:
--- !u!199 &4884976521430742359
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -88301,7 +88534,7 @@ ParticleSystem:
--- !u!199 &1307058920178531024
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -92927,7 +93160,7 @@ ParticleSystem:
--- !u!199 &5611766574741724938
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -98123,7 +98356,7 @@ ParticleSystem:
--- !u!199 &4241121121174202416
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -102902,7 +103135,7 @@ ParticleSystem:
--- !u!199 &681808072332339521
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -107602,7 +107835,7 @@ ParticleSystem:
--- !u!199 &5585073769953222622
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -114007,7 +114240,7 @@ ParticleSystem:
--- !u!199 &-4646563412136487132
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -118705,7 +118938,7 @@ ParticleSystem:
--- !u!199 &7126370773917093782
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -123466,7 +123699,7 @@ ParticleSystem:
--- !u!199 &-1472657892369082979
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -128502,7 +128735,7 @@ ParticleSystem:
--- !u!199 &7801904164857794020
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -133128,7 +133361,7 @@ ParticleSystem:
--- !u!199 &6491226494071429411
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -137831,7 +138064,7 @@ ParticleSystem:
--- !u!199 &6287885891967047331
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -142536,7 +142769,7 @@ ParticleSystem:
--- !u!199 &604782911683866591
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -142612,7 +142845,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5251286333026968868
RectTransform:
m_ObjectHideFlags: 0
@ -142698,7 +142931,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -79.75012, y: -290.99997}
m_AnchoredPosition: {x: -79.750244, y: -290.99997}
m_SizeDelta: {x: 100, y: 500}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2500240612335130857
@ -147393,7 +147626,7 @@ ParticleSystem:
--- !u!199 &3132530013120047754
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -152091,7 +152324,7 @@ ParticleSystem:
--- !u!199 &6584968196038281801
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -153386,7 +153619,7 @@ RectTransform:
- {fileID: 4024934114733561411}
- {fileID: 3135399791809543747}
m_Father: {fileID: -4381370023651553062}
m_RootOrder: 5
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -158137,7 +158370,7 @@ ParticleSystem:
--- !u!199 &5202982992287274591
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -163518,7 +163751,7 @@ ParticleSystem:
--- !u!199 &-6682608583335386412
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -168205,7 +168438,7 @@ ParticleSystem:
--- !u!199 &8520952210766438116
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -173030,7 +173263,7 @@ ParticleSystem:
--- !u!199 &-6104293520298689822
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -177852,7 +178085,7 @@ ParticleSystem:
--- !u!199 &398790018773452922
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -178102,7 +178335,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -238.26}
m_AnchoredPosition: {x: 0, y: -238.26025}
m_SizeDelta: {x: 0, y: 77.499}
m_Pivot: {x: 0.4690785, y: 0.5}
--- !u!222 &8358350029126832633
@ -182889,7 +183122,7 @@ ParticleSystem:
--- !u!199 &655762303599654871
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -188360,7 +188593,7 @@ ParticleSystem:
--- !u!199 &1181760000614059150
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -193256,7 +193489,7 @@ ParticleSystem:
--- !u!199 &5301765730158068765
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -198133,7 +198366,7 @@ ParticleSystem:
--- !u!199 &2541679245384586368
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -203913,7 +204146,7 @@ ParticleSystem:
--- !u!199 &9099225340042119239
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -208839,7 +209072,7 @@ ParticleSystem:
--- !u!199 &3915694397730101422
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -213470,7 +213703,7 @@ ParticleSystem:
--- !u!199 &6938747928837363804
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -218223,7 +218456,7 @@ ParticleSystem:
--- !u!199 &3521033589718901282
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -222979,7 +223212,7 @@ ParticleSystem:
--- !u!199 &7344298940656860261
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -223800,7 +224033,7 @@ RectTransform:
- {fileID: 6886308839022751603}
- {fileID: -3091634230616332059}
m_Father: {fileID: -4381370023651553062}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -228678,7 +228911,7 @@ ParticleSystem:
--- !u!199 &6245463154932388831
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -234121,7 +234354,7 @@ ParticleSystem:
--- !u!199 &8536783281818651702
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -235478,12 +235711,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -235508,7 +235736,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -235643,12 +235876,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -235673,7 +235901,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -235953,12 +236186,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -235983,7 +236211,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -236118,12 +236351,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -236148,7 +236376,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -236283,12 +236516,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -236313,7 +236541,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -236448,12 +236681,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -236478,7 +236706,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002

View File

@ -217,10 +217,17 @@ function this:OnSortingOrderChange()
BattleView:OnSortingOrderChange(this.sortingOrder)
end
function this:IsBossFight(fightType)
if fightType == BATTLE_TYPE.TASUILINGXIAO then
return true
end
return false
end
--界面打开时调用(用于子类重写)
function this:OnOpen(_fightData, _fightType, _endFunc, _guideType)
GuideBattleLogic:Init(_guideType)
BattleView:OnOpen(_fightData,_fightType)
BattleView:OnOpen(_fightData,_fightType, this:IsBossFight(_fightType))
endFunc = _endFunc
fightType = _fightType --判定战斗类型

View File

@ -85,6 +85,16 @@ local addDelayRecycleRes = function(path, go, recycleTime, delayFunc, delayTime)
end
end
function this:GetABossRage(i)
local rage = this.bossRageRoot.transform:Find("rage_"..i)
if not rage then
rage = newObjToParent(this.bossRage, this.bossRageRoot)
rage.transform.localScale = Vector3.one * 1.5
rage:SetActive(false)
rage.name = "rage_"..i
end
return rage
end
function this:InitComponent(root, go)
-- body
@ -114,6 +124,15 @@ function this:InitComponent(root, go)
this.EnemyDiffMonsterSlider = Util.GetGameObject(this.EnemyDiffMonster, "slider"):GetComponent("Image")
this.EnemyDiffMonsterIcon = Util.GetGameObject(this.EnemyDiffMonster, "icon"):GetComponent("Image")
this.bossRoot = Util.GetGameObject(this.UpRoot, "boss")
this.bossBuffRoot = Util.GetGameObject(this.bossRoot, "buff")
this.bossRageRoot = Util.GetGameObject(this.bossRoot, "rage")
this.bossRage = Util.GetGameObject(this.bossRoot, "rage/Image")
this.bossRageList = {}
for i = 1, 10 do
this.bossRageList[i] = this:GetABossRage(i)
end
Util.GetGameObject(this.UpRoot, "EnemyHP"):SetActive(false)
Util.GetGameObject(this.DownRoot, "PlayerHP"):SetActive(false)
this.EnemyHP = Util.GetGameObject(this.UpRoot, "EnemyHP/hp"):GetComponent("Image")
@ -167,11 +186,11 @@ function this:BindEvent()
end
-- 正常接口
function this:OnOpen(data,_fightType)
function this:OnOpen(data, _fightType, isBoss)
this.ElementalResonanceView:OnOpen({sortOrder = BattleManager.GetBattleSorting()})
this.ElementalResonanceView2:OnOpen({sortOrder = BattleManager.GetBattleSorting()})
this:Init()
this:SetData(data.fightData, data.fightSeed, data.fightType, data.maxRound, data.fightId)
this:SetData(data.fightData, data.fightSeed, data.fightType, data.maxRound, data.fightId, isBoss)
this.fightType = _fightType
end
@ -251,20 +270,21 @@ function this:Init()
local shadow = Util.GetGameObject(this.EnemyPanel, "live_"..i.."/shadow")
shadow:SetActive(false)
this.MonsterList[i]:SetActive(false)
this.MonsterList[6 + i]:SetActive(false)
end
end
-- 设置数据数据
function this:SetData(_fightData, _seed, _battleType, _maxRound, _fightId)
function this:SetData(_fightData, _seed, _battleType, _maxRound, _fightId, _isBoss)
-- body
this.fightData = _fightData
this.seed = _seed
this.battleType = _battleType or 0
this.maxRound = _maxRound
this.fightId = _fightId
this.isBoss = _isBoss
this.bossRoot:SetActive(_isBoss)
--
if not this.seed then
this.seed = math.random(0, 2147483647)
@ -377,7 +397,7 @@ function this.InitBattleData()
BattleLogic.Type = this.battleType
this.InitBattleEvent()
this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, posY)
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, posY)
end
-- 注册战斗事件
function this.InitBattleEvent()
@ -581,9 +601,15 @@ function this.BattleOrderChange(order)
end
--刷新敌军站位
local v3 = this.EnemyPanel:GetComponent("RectTransform").anchoredPosition
-- local v3 = this.EnemyPanel:GetComponent("RectTransform").anchoredPosition
this.EnemyPanel.transform.localScale = Vector3.one
this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(v3.x, posY)
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(v3.x, posY)
if this.isBoss then
-- boss位置修正
this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector3.New(73, 280, 0)
else
this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector3.New(0, 380, 0)
end
for i=1, 6 do
local enemyPos = Util.GetTransform(this.EnemyPanel, tostring(i))
@ -611,8 +637,11 @@ function this.OnAddRole(data)
go = BattlePool.GetItem(enemyPos, data.position <= 3 and BATTLE_POOL_TYPE.ENEMY_ROLE or BATTLE_POOL_TYPE.ENEMY_ROLE_2)
enemyHP = enemyHP + data:GetRoleData(RoleDataName.Hp)
enemyMaxHP = enemyMaxHP + data:GetRoleData(RoleDataName.MaxHp)
tbRole[data] = EnemyView.New(go, data, data.position, this)
local isBoss = false
if this.isBoss and data.position == 2 then
isBoss = true
end
tbRole[data] = EnemyView.New(go, data, data.position, this, isBoss)
end
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
@ -877,6 +906,21 @@ function this:SetShake(object, timeScale, dx, dy, callBack)
end)
end
-- 设置boss怒气显示
function this:SetBossRage(rage)
if rage <= #this.bossRageList then
for i = 1, #this.bossRageList do
this.bossRageList[i]:SetActive(i<=rage)
end
else
for i = 1, rage do
if not this.bossRageList[i] then
this.bossRageList[i] = this:GetABossRage(i)
end
this.bossRageList[i]:SetActive(i<=rage)
end
end
end
--界面关闭时调用(用于子类重写)

View File

@ -1,16 +1,16 @@
BattleUnit = {}
function BattleUnit.New(go, role, position, root)
function BattleUnit.New(go, role, position, root, isBoss)
local o = {}
setmetatable(o, {__index = BattleUnit})
return o
end
function BattleUnit:ctor(go, role, position, root)
function BattleUnit:ctor(go, role, position, root, isBoss)
self._DelayFuncList = {}
self._LoopFuncList = {}
if self.onCreate then
self:onCreate(go, role, position, root)
self:onCreate(go, role, position, root, isBoss)
end
end

View File

@ -6,20 +6,21 @@ local healEffect = "c_xy_0012_skeff_tapsk_healeff"
local rageEffect = "s_jieling_hs_3006_skeff_casting_buff_nuqi"
EnemyView = BattleUnit.New()
function EnemyView.New(go, role, position, root)
function EnemyView.New(go, role, position, root, isBoss)
local o = BattleUnit.New(go, role, position, root)
setmetatable(o, EnemyView)
EnemyView.__index = EnemyView
o:ctor(go, role, position, root)
o:ctor(go, role, position, root, isBoss)
return o
end
function EnemyView:onCreate(go, role, position, root)
function EnemyView:onCreate(go, role, position, root, isBoss)
self.RootPanel = root
self.GameObject = go
self.role = role
self.camp = role.camp
self.isBoss = isBoss
-- 创建技能播放器
self.castingEfectNode = self.RootPanel.enemySkillCast
@ -29,7 +30,6 @@ function EnemyView:onCreate(go, role, position, root)
self.nameText = Util.GetGameObject(go, "Name/Text"):GetComponent("Text")
self.level = Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
self.elementImg = Util.GetGameObject(go, "Pro/Image"):GetComponent("Image")
--
local roleId=role.roleData.roleId
local live=HeroConfig[role.roleData.roleId].Live
@ -75,6 +75,10 @@ function EnemyView:onCreate(go, role, position, root)
self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5
self.RoleLiveGO.transform.localScale = Vector3.one * self.enemy_liveScale --* 0.75
self.RoleLiveGO:SetActive(true)
Log("IsBoss: "..tostring(self.isBoss))
if self.isBoss then
self.RoleLiveGO.transform.localScale = self.RoleLiveGO.transform.localScale * 1.5 -- boss 放大1.5倍
end
-- casting技能立绘
@ -117,7 +121,11 @@ function EnemyView:onCreate(go, role, position, root)
-- 飘字管理
self.Floater = FloatNode.New(self, self.RootPanel, self.GameObject)
-- buff管理
self.BuffCtrl = BuffCtrl.New(self, Util.GetGameObject(go, "buff"))
if self.isBoss then
self.BuffCtrl = BuffCtrl.New(self, self.RootPanel.bossBuffRoot)
else
self.BuffCtrl = BuffCtrl.New(self, Util.GetGameObject(go, "buff"))
end
-- 创建技能播放器
self.SkillCaster = SkillCaster.New(self, self.spAtkTime, self.atkSoundTime, self.attackSound, self.castingEfectNode, self.castingNameNode)
@ -148,6 +156,13 @@ function EnemyView:onCreate(go, role, position, root)
end)
end
-- boss 不显示
self.hpPassSlider.transform.parent.gameObject:SetActive(not self.isBoss)
self.nameText.transform.parent.gameObject:SetActive(not self.isBoss)
self.level.transform.parent.gameObject:SetActive(not self.isBoss)
self.elementImg.transform.parent.gameObject:SetActive(not self.isBoss)
self.rageSlider.transform.parent.gameObject:SetActive(not self.isBoss)
end
--
@ -216,6 +231,10 @@ function EnemyView:Update()
self.rageSlider.fillAmount = self.rageCache
self.rageText.gameObject:SetActive(self.rageCache >= 1)
self.rageText.text = self.role.Rage
if self.isBoss then
self.RootPanel:SetBossRage(self.role.Rage)
end
end
if self.BuffCtrl and self.BuffCtrl.Update then