战斗回放类型修改
parent
c21789b509
commit
6d1d7c7996
|
|
@ -565,6 +565,7 @@ RectTransform:
|
|||
- {fileID: 224470783071692698}
|
||||
- {fileID: 1453093607371724100}
|
||||
- {fileID: 6102789982632470732}
|
||||
- {fileID: 991435276353422924}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -711,7 +712,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &224436599584278754
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -950,6 +951,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &752178680335767152
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7337545165340584477}
|
||||
- component: {fileID: 2832356372009821458}
|
||||
- component: {fileID: 7130970716700069908}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7337545165340584477
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 752178680335767152}
|
||||
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: []
|
||||
m_Father: {fileID: 747662470459059582}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 1.1, y: -212.2}
|
||||
m_SizeDelta: {x: 1075.6, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2832356372009821458
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 752178680335767152}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7130970716700069908
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 752178680335767152}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.93725497, g: 0.7411765, b: 0.39607847, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u4F24\u5BB3\u52A0\u6210"
|
||||
--- !u!1 &1104437359377835466
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3538,6 +3618,107 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2129947283443916144
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 747662470459059582}
|
||||
- component: {fileID: 6795488729976896090}
|
||||
- component: {fileID: 8845798855134667914}
|
||||
- component: {fileID: 4566460578755136936}
|
||||
m_Layer: 5
|
||||
m_Name: bg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &747662470459059582
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129947283443916144}
|
||||
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: 2568858106238507015}
|
||||
- {fileID: 8663869486714336591}
|
||||
- {fileID: 3284195044857711653}
|
||||
- {fileID: 9211274598957139755}
|
||||
- {fileID: 6558076928173008734}
|
||||
- {fileID: 7337545165340584477}
|
||||
m_Father: {fileID: 1829431663761482630}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0.8000488, y: -9.6}
|
||||
m_SizeDelta: {x: 221.7, y: 245.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6795488729976896090
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129947283443916144}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8845798855134667914
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129947283443916144}
|
||||
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: 0
|
||||
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: 3ddf57e863f9779499219883f26c457c, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &4566460578755136936
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2129947283443916144}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &2145166458003505310
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3675,6 +3856,114 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &2551472230653896466
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 991435276353422924}
|
||||
- component: {fileID: 7956561201846978089}
|
||||
- component: {fileID: 8802937476738223569}
|
||||
- component: {fileID: 8482678215790746036}
|
||||
m_Layer: 5
|
||||
m_Name: shenying
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &991435276353422924
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2551472230653896466}
|
||||
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: 1829431663761482630}
|
||||
m_Father: {fileID: 224542417292367980}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7956561201846978089
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2551472230653896466}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Content: {fileID: 1829431663761482630}
|
||||
m_Horizontal: 1
|
||||
m_Vertical: 1
|
||||
m_MovementType: 1
|
||||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_Viewport: {fileID: 0}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_HorizontalScrollbarVisibility: 0
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: 0
|
||||
m_VerticalScrollbarSpacing: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!222 &8802937476738223569
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2551472230653896466}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8482678215790746036
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2551472230653896466}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
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: 0}
|
||||
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 &2701654361869863534
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3723,6 +4012,80 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2701654361869863534}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &3103878680047353706
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2568858106238507015}
|
||||
- component: {fileID: 7391120739260522672}
|
||||
- component: {fileID: 2001088932258742807}
|
||||
m_Layer: 5
|
||||
m_Name: Image (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2568858106238507015
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3103878680047353706}
|
||||
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: []
|
||||
m_Father: {fileID: 747662470459059582}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -341.20004, y: 9}
|
||||
m_SizeDelta: {x: 391, y: 83}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7391120739260522672
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3103878680047353706}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2001088932258742807
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3103878680047353706}
|
||||
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: 0
|
||||
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: b412cdd35b24b424290c719209962f15, 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 &3224863978984502752
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3883,6 +4246,80 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &3532197403039691369
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9211274598957139755}
|
||||
- component: {fileID: 3021687089952170120}
|
||||
- component: {fileID: 4995284922020500661}
|
||||
m_Layer: 5
|
||||
m_Name: Image2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9211274598957139755
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3532197403039691369}
|
||||
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: []
|
||||
m_Father: {fileID: 747662470459059582}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -45, y: 23}
|
||||
m_SizeDelta: {x: 805, y: 225}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3021687089952170120
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3532197403039691369}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4995284922020500661
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3532197403039691369}
|
||||
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: 0
|
||||
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: d5d353f7a9fe75848bfe7ce3e8d6ba00, 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 &3840223534178053104
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4173,6 +4610,110 @@ MonoBehaviour:
|
|||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 1
|
||||
--- !u!1 &4763902895977738376
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3284195044857711653}
|
||||
- component: {fileID: 661068922399180403}
|
||||
- component: {fileID: 29433668867953480}
|
||||
- component: {fileID: 8952010546155535107}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3284195044857711653
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4763902895977738376}
|
||||
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: []
|
||||
m_Father: {fileID: 747662470459059582}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 3.2999773, y: 18}
|
||||
m_SizeDelta: {x: 346, y: 123}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &661068922399180403
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4763902895977738376}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &29433668867953480
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4763902895977738376}
|
||||
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: 0
|
||||
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: 68b0233fbe21e6646ad33ae3cf1b72e7, 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!114 &8952010546155535107
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4763902895977738376}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 4, y: 4, z: 4}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 1, y: 1, z: 1}
|
||||
changeFloat: 0
|
||||
duration: 0.2
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 3284195044857711653}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 1
|
||||
--- !u!1 &5436943061675877397
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4268,6 +4809,82 @@ MonoBehaviour:
|
|||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &5486449146524950078
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1829431663761482630}
|
||||
- component: {fileID: 1830750886860075910}
|
||||
- component: {fileID: 6445780107455798432}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1829431663761482630
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5486449146524950078}
|
||||
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: 747662470459059582}
|
||||
m_Father: {fileID: 991435276353422924}
|
||||
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: -0.000020980835, y: 173.7}
|
||||
m_SizeDelta: {x: 856.10004, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1830750886860075910
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5486449146524950078}
|
||||
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: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 154.1, y: 159.8}
|
||||
m_Spacing: {x: 21.4, y: 56.68}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 5
|
||||
--- !u!114 &6445780107455798432
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5486449146524950078}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &5509823109903761650
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4625,6 +5242,110 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u672C\u6B21\u4F24\u5BB3\uFF1A"
|
||||
LanguageIndex: 11331
|
||||
--- !u!1 &5735295498452641385
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6558076928173008734}
|
||||
- component: {fileID: 2337280799831769867}
|
||||
- component: {fileID: 5395234019369874387}
|
||||
- component: {fileID: 4112539070094047308}
|
||||
m_Layer: 5
|
||||
m_Name: Image (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6558076928173008734
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5735295498452641385}
|
||||
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: []
|
||||
m_Father: {fileID: 747662470459059582}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -0.00001049, y: -120}
|
||||
m_SizeDelta: {x: 153, y: 153}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2337280799831769867
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5735295498452641385}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5395234019369874387
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5735295498452641385}
|
||||
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: 0
|
||||
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: 0afcaaf43a0c4744bb8b70d268045136, 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!114 &4112539070094047308
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5735295498452641385}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 4, y: 4, z: 4}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 1, y: 1, z: 1}
|
||||
changeFloat: 0
|
||||
duration: 0.2
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 6558076928173008734}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 1
|
||||
--- !u!1 &5782765299229169742
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6134,6 +6855,80 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &7608527994790258308
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8663869486714336591}
|
||||
- component: {fileID: 4747678616920103090}
|
||||
- component: {fileID: 2658055511462861049}
|
||||
m_Layer: 5
|
||||
m_Name: Image (5)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8663869486714336591
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7608527994790258308}
|
||||
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 747662470459059582}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 350.3, y: 5}
|
||||
m_SizeDelta: {x: 391, y: 83}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4747678616920103090
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7608527994790258308}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2658055511462861049
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7608527994790258308}
|
||||
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: 0
|
||||
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: b412cdd35b24b424290c719209962f15, 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 &8379416790443897616
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -2191,6 +2191,7 @@ BATTLE_TYPE = {
|
|||
ARENA = 15, -- 竞技场
|
||||
XINJIANG = 16, --新将来袭
|
||||
XIAOYAOYOU = 17, --逍遥游战斗
|
||||
FOURELEMENT = 20 , --四灵试炼
|
||||
BACK_BATTLE = 1000, -- 系统战斗回放
|
||||
}
|
||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
|
|
|
|||
|
|
@ -340,6 +340,7 @@ function this.SwitchTimeScale()
|
|||
end
|
||||
|
||||
function this.BattleEnd(result)
|
||||
LogGreen(tostring(result))
|
||||
BattleManager.PauseBattle()
|
||||
-- 强制停止倍速
|
||||
Time.timeScale = 1
|
||||
|
|
@ -411,7 +412,6 @@ function this.BattleEnd(result)
|
|||
Util.GetGameObject(boxList[i], "effect"):SetActive(false)
|
||||
end
|
||||
end,1.3):Start()
|
||||
|
||||
else
|
||||
-- 判断是否需要进行结果检测
|
||||
if this.fightResult then
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ function this.StartFight()
|
|||
else
|
||||
local result = {}
|
||||
result.drop = msg.enventDrop
|
||||
LogGreen("11111111111111111111111111111111111111111111111111111111111111111111111111")
|
||||
UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, 5, result, true, true)
|
||||
MonsterCampManager.monsterWave = MonsterCampManager.monsterWave + 1
|
||||
end
|
||||
|
|
|
|||
|
|
@ -157,34 +157,34 @@ function this.GetMonsterTeamInfo(monsterGroupId)
|
|||
end
|
||||
end
|
||||
|
||||
--开始战斗
|
||||
function this.ExecuteFightBattle(id,type,func,curType)
|
||||
function this.StraightBattle(id,type,func,curType)
|
||||
this.curType = curType
|
||||
local fightId = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"FloorId",id,"CampId",curType).Id
|
||||
NetManager.FourChallengeDoRequest(fightId,type,function(msg)
|
||||
if type == 0 then
|
||||
local fightData = BattleManager.GetBattleServerData(msg,0)
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE,function(result)
|
||||
local fightData = BattleManager.GetBattleServerData(msg,0)
|
||||
this.drop = msg.drop
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.FOURELEMENT,function(result)
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
if result.result == 0 then
|
||||
if this.fourMonsterData[curType].openState ~= 0 then
|
||||
UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,curType)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.MonsterCampMainPanel)
|
||||
end
|
||||
if result.result == 0 then
|
||||
LogGreen(Language[10741])
|
||||
elseif result.result == 1 then
|
||||
LogGreen(tostring(this.fourMonsterData[curType].monsterWave))
|
||||
this.fourMonsterData[curType].monsterWave = id
|
||||
this.fourMonsterData[curType].canFightTime = this.fourMonsterData[curType].canFightTime - 1
|
||||
this.SaveFormation(curType)
|
||||
if this.fourMonsterData[curType].openState ~= 0 then
|
||||
UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,curType)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.MonsterCampMainPanel)
|
||||
end
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
|
||||
end)
|
||||
this.SaveFormation(curType)
|
||||
-- UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.MONSTER_CAMP, result, true, true,function()
|
||||
-- if this.fourMonsterData[curType].openState ~= 0 then
|
||||
-- UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,curType)
|
||||
-- else
|
||||
-- UIManager.OpenPanel(UIName.MonsterCampMainPanel)
|
||||
-- end
|
||||
-- end)
|
||||
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
|
||||
|
||||
-- end)
|
||||
end
|
||||
end)
|
||||
else
|
||||
|
|
@ -197,6 +197,22 @@ function this.ExecuteFightBattle(id,type,func,curType)
|
|||
end)
|
||||
end
|
||||
|
||||
--开始战斗
|
||||
function this.ExecuteFightBattle(id,type,func,curType)
|
||||
this.StraightBattle(id,type,func,curType)
|
||||
-- -- 请求战斗结果
|
||||
-- NetManager.GetMonsterFightResult(MonsterCampManager.monsterWave, FormationTypeDef.FORMATION_NORMAL, function (msg)
|
||||
-- if msg.result == 0 then
|
||||
-- UIManager.OpenPanel(UIName.BattleFailPopup, nil, false, UIName.MonsterCampPanel)
|
||||
-- else
|
||||
-- local result = {}
|
||||
-- result.drop = msg.enventDrop
|
||||
-- UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.FOURELEMENT, result, true, true)
|
||||
-- MonsterCampManager.monsterWave = MonsterCampManager.monsterWave + 1
|
||||
-- end
|
||||
-- end)
|
||||
end
|
||||
|
||||
function this.SaveFormation(curType)
|
||||
local curFormation = FormationManager.GetFormationByID(1700 + curType)
|
||||
local data = this.GetFriendHelpHero(curType)
|
||||
|
|
|
|||
|
|
@ -119,12 +119,16 @@ function this.ClosePanelRefreshData()
|
|||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
elseif fightType == BATTLE_TYPE.XIAOYAOYOU then--逍遥游
|
||||
this.ShowBattleResultByXYY()
|
||||
elseif fightType == BATTLE_TYPE.FOURELEMENT then--四灵
|
||||
this.ShowBattleResultByFOURELEMENT()
|
||||
--新回放功能
|
||||
elseif fightType == BATTLE_TYPE.BACK_BATTLE then
|
||||
if BattleManager.GetLastBattleType() == BATTLE_TYPE.EXECUTE_FIGHT then-- 猎妖之路
|
||||
this.ShowBattleResultByExpedition()
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.XIAOYAOYOU then-- 逍遥游
|
||||
this.ShowBattleResultByXYY()
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.FOURELEMENT then--四灵
|
||||
this.ShowBattleResultByFOURELEMENT()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -158,6 +162,14 @@ function this.ShowBattleResultByExpedition()
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this.ShowBattleResultByFOURELEMENT()
|
||||
if MonsterCampManager.fourMonsterData[MonsterCampManager.curType].openState ~= 0 then
|
||||
UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,MonsterCampManager.curType)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.MonsterCampMainPanel)
|
||||
end
|
||||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function BattleFailPopup:OnClose()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.MaskState,0)
|
||||
|
|
|
|||
|
|
@ -72,6 +72,8 @@ function BattleWinPopup:NextStep()
|
|||
this.ShowBattleResultByMonsterCamp(m_battleResult.drop)
|
||||
elseif m_fightType == BATTLE_TYPE.STORY_FIGHT then -- 新关卡的战斗
|
||||
this.ShowBattleResultByStoryFight(m_battleResult.drop)
|
||||
elseif m_fightType == BATTLE_TYPE.FOURELEMENT then -- 四灵
|
||||
this.ShowBattleResultByFourElement(m_battleResult.drop)
|
||||
elseif m_fightType == BATTLE_TYPE.EXECUTE_FIGHT then -- 猎妖之路
|
||||
this.ShowBattleResultByExpedition(m_battleResult.drop)
|
||||
elseif m_fightType == BATTLE_TYPE.DAILY_CHALLENGE then -- 日常副本
|
||||
|
|
@ -84,6 +86,8 @@ function BattleWinPopup:NextStep()
|
|||
elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then
|
||||
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗
|
||||
this.ShowBattleResultByStoryFight(BattleManager.GetLastBattleResult().drop)
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.FOURELEMENT then -- 新关卡的战斗
|
||||
this.ShowBattleResultByFourElement(BattleManager.GetLastBattleResult().drop)
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.EXECUTE_FIGHT then--猎妖之路
|
||||
this.ShowBattleResultByExpedition(BattleManager.GetLastBattleResult().drop)
|
||||
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟
|
||||
|
|
@ -103,10 +107,11 @@ function this.ShowBattleResultByMonsterCamp(drop)
|
|||
end
|
||||
this:ClosePanel()
|
||||
if m_backPanel then
|
||||
LogGreen("333333333333333333333333333333:"..tostring(m_backPanel) )
|
||||
UIManager.OpenPanel(m_backPanel)
|
||||
end
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
|
||||
LogPink("isBackBattle "..tostring(isBackBattle))
|
||||
LogPink("isBackBattle "..tostring(isBackBattle))
|
||||
if not isBackBattle then
|
||||
if m_callBack then m_callBack() end
|
||||
--内容优化 心魔试炼推送
|
||||
|
|
@ -148,6 +153,53 @@ function this.ShowBattleResultByStoryFight(drop)
|
|||
end, 1, true)
|
||||
end
|
||||
end
|
||||
--四灵
|
||||
function this.ShowBattleResultByFourElement(drop)
|
||||
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
if bestData then
|
||||
-- 胜利显示本场比赛的表现最好的英雄
|
||||
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||
-- 打开关卡奖励界面
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, MonsterCampManager.drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
|
||||
LogPink("isBackBattle "..tostring(isBackBattle))
|
||||
if not isBackBattle then
|
||||
local waves = MonsterCampManager.GetFourElementTotalWave()
|
||||
if not PlayerPrefs.HasKey("FourElement"..PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,-1)
|
||||
end
|
||||
if waves ~= PlayerPrefs.GetInt("FourElement"..PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves)
|
||||
local propertyId = SacredTreeManager.GetUnLockNewProperty(waves)
|
||||
if propertyId > 0 then
|
||||
UIManager.OpenPanel(UIName.UnlockExtraRewardPanel,propertyId,function()
|
||||
if MonsterCampManager.fourMonsterData[MonsterCampManager.curType].openState ~= 0 then
|
||||
UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,MonsterCampManager.curType)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.MonsterCampMainPanel)
|
||||
end
|
||||
end)
|
||||
end
|
||||
end
|
||||
if _BattleBestPopup then
|
||||
_BattleBestPopup:ClosePanel()
|
||||
end
|
||||
if m_battlePanel then
|
||||
m_battlePanel:ClosePanel()
|
||||
end
|
||||
this:ClosePanel()
|
||||
end
|
||||
end, 0, true, true)
|
||||
end)
|
||||
else
|
||||
-- 打开关卡奖励界面
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function()
|
||||
if m_battlePanel then
|
||||
m_battlePanel:ClosePanel()
|
||||
end
|
||||
this:ClosePanel()
|
||||
end, 1, true)
|
||||
end
|
||||
end
|
||||
-- 车迟斗法结算界面特殊显示
|
||||
function this.ShowBattleResultByCarDeleayType(drop)
|
||||
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
|
|
|
|||
|
|
@ -85,6 +85,9 @@ function RewardItemPopup:InitComponent()
|
|||
--公会副本
|
||||
this.guildTranscript=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/guildTranscript")
|
||||
this.guildTranscript_CurScore=Util.GetGameObject(this.guildTranscript,"curScore/num"):GetComponent("Text")
|
||||
|
||||
local shenying = Util.GetGameObject(self.gameObject, "shenying")
|
||||
shenying.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -500,6 +503,7 @@ function RewardItemPopup:ItemDataListSort(itemDataList)
|
|||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function RewardItemPopup:OnClose()
|
||||
LogGreen("222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222")
|
||||
BagManager.SetDropIsSHowEquipPrint(true)
|
||||
local fightConFigData = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight)
|
||||
if compShowType == 1 then
|
||||
|
|
|
|||
|
|
@ -0,0 +1,150 @@
|
|||
require("Base/BasePanel")
|
||||
UnLockNewFunctionPanel = Inherit(BasePanel)
|
||||
local this = UnLockNewFunctionPanel
|
||||
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
local itemListPrefab
|
||||
local itemListPrefabMax
|
||||
local func
|
||||
local bagType=0 --1 正常背包 2 临时背包 3 公会车迟显示
|
||||
--需要显示的小组件类型
|
||||
-- 1 -- > 界面显示升级
|
||||
-- 2 -- > 显示地图自由探索按钮
|
||||
local compShowType = 0
|
||||
local sortingOrderNum = 0
|
||||
local callList = Stack.New()
|
||||
local isPopGetSSR = false
|
||||
local isOpenGeiSSRAvtivity = 0--五星成长礼拍脸
|
||||
local isOpenGeiSSRAvtivityTime
|
||||
local isPlayerAniEnd = true
|
||||
local itemDataList
|
||||
local showHero = 1
|
||||
local isBackBattle = false
|
||||
--初始化组件(用于子类重写)
|
||||
--此界面无奈做了两套显示逻辑一个是掉落小于等于25时背景根据元素数量做拉伸状态 另一个是元素大于25做界面做可滑动
|
||||
function UnLockNewFunctionPanel:InitComponent()
|
||||
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
--第一种显示
|
||||
this.ScrollView = Util.GetGameObject(self.gameObject, "ScrollView")
|
||||
this.ScrollView.gameObject:SetActive(false)
|
||||
-- this.dropGrid= Util.GetGameObject(self.gameObject, "ScrollView/Content")
|
||||
-- itemListPrefab = {}
|
||||
-- for i = 1, 10 do --初始缓存10个
|
||||
-- local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform)
|
||||
-- view.gameObject.name = "frame"..i
|
||||
-- itemListPrefab[i] = view
|
||||
-- end
|
||||
-- --关卡等级经验
|
||||
-- this.lvAndExpGo=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo")
|
||||
-- this.lv=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/lv"):GetComponent("Text")
|
||||
-- this.exp=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/exp"):GetComponent("Slider")
|
||||
-- this.expText=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/exp/Text"):GetComponent("Text")
|
||||
-- this.lvUpImage=Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/lvAndExpGo/lvUpImage")
|
||||
-- -- 地图探索按钮
|
||||
-- this.btnMapBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBack")
|
||||
-- -- 战斗结果按钮
|
||||
-- this.btnResult = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnResult")
|
||||
-- this.btnBattleBack = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/btnBattleBack")
|
||||
-- -- 战斗回放按钮
|
||||
-- 任意位置继续
|
||||
this.btnGoOn = Util.GetGameObject(self.gameObject, "btnBack/Image")
|
||||
|
||||
-- --第二种显示当超过25个元素时
|
||||
-- this.ScrollView2 = Util.GetGameObject(self.gameObject, "bg")
|
||||
-- this.dropGridMax= Util.GetGameObject(self.gameObject, "bg/ScrollView2/ScrollView2/Content")
|
||||
|
||||
-- itemListPrefabMax = {}
|
||||
-- for i = 1, 25 do --初始缓存10个
|
||||
-- local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGridMax.transform)
|
||||
-- view.gameObject.name = "frame"..i
|
||||
-- itemListPrefabMax[i] = view
|
||||
-- end
|
||||
local bg = Util.GetGameObject(self.gameObject, "bg")
|
||||
bg.gameObject:SetActive(false)
|
||||
local star = Util.GetGameObject(self.gameObject, "star")
|
||||
star.gameObject:SetActive(false)
|
||||
local shenying = Util.GetGameObject(self.gameObject, "shenying")
|
||||
shenying.gameObject:SetActive(true)
|
||||
this.shenyingText = Util.GetGameObject(shenying, "shenying/Content/bg/Text"):GetComponent("Text")
|
||||
-- this.lvAndExpGoMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo")
|
||||
-- this.lvMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/lv"):GetComponent("Text")
|
||||
-- this.expMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/exp"):GetComponent("Slider")
|
||||
-- this.expTextMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/exp/Text"):GetComponent("Text")
|
||||
-- this.lvUpImageMax=Util.GetGameObject(self.gameObject, "bg/lvAndExpGo/lvUpImage")
|
||||
-- -- 战斗结果按钮
|
||||
-- this.btnResultMax = Util.GetGameObject(self.gameObject, "bg/btnResult")
|
||||
-- this.btnMapBackMax = Util.GetGameObject(self.gameObject, "bg/btnBack")
|
||||
-- -- this.btnBattleBackMax = Util.GetGameObject(self.gameObject, "bg/btnBattleBack")
|
||||
|
||||
-- --车迟斗法 显示
|
||||
-- this.guildCarDelay = Util.GetGameObject(self.gameObject, "ScrollView/Content/bg/guildCarDelay")
|
||||
-- this.guildCarDelaysoreNum = Util.GetGameObject(this.guildCarDelay.gameObject, "soreNum"):GetComponent("Text")
|
||||
-- this.guildCarDelayhurtNum = Util.GetGameObject(this.guildCarDelay.gameObject, "hurtNum"):GetComponent("Text")
|
||||
|
||||
-- --公会十绝阵显示
|
||||
-- this.guildDeathPos=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/guildDeathPos")
|
||||
-- this.guildDeathPos_CurScore=Util.GetGameObject(this.guildDeathPos,"curScore/num"):GetComponent("Text")
|
||||
-- this.guildDeathPos_State=Util.GetGameObject(this.guildDeathPos,"curScore/state"):GetComponent("Image")
|
||||
-- this.guildDeathPos_MaxScore=Util.GetGameObject(this.guildDeathPos,"maxScore/num"):GetComponent("Text")
|
||||
-- --大闹天功显示
|
||||
-- this.expeditionGo=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/expeditionGo")
|
||||
-- --公会副本
|
||||
-- this.guildTranscript=Util.GetGameObject(self.gameObject,"ScrollView/Content/bg/guildTranscript")
|
||||
-- this.guildTranscript_CurScore=Util.GetGameObject(this.guildTranscript,"curScore/num"):GetComponent("Text")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function UnLockNewFunctionPanel:BindEvent()
|
||||
|
||||
Util.AddClick(this.btnBack, function()
|
||||
if isPlayerAniEnd then
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
self:ClosePanel()
|
||||
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
|
||||
PlayerManager.IsGetFiveStarHero = false
|
||||
end
|
||||
end
|
||||
end)
|
||||
-- Util.AddClick(this.btnMapBack, function ()
|
||||
-- self:ClosePanel()
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnMapBackMax, function ()
|
||||
-- self:ClosePanel()
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnResult, function ()
|
||||
-- UIManager.OpenPanel(UIName.DamageResultPanel, 1)
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnResultMax, function ()
|
||||
-- UIManager.OpenPanel(UIName.DamageResultPanel, 1)
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnBattleBack, function ()
|
||||
-- LogGreen("isBackBattle = true")
|
||||
-- isBackBattle = true
|
||||
-- BattleManager.BattleBackFun()
|
||||
-- end)
|
||||
end
|
||||
--界面打开时调用(用于子类重写)
|
||||
--bagType 1 正常背包 2 地图临时背包
|
||||
--drop 后端掉落原始数据
|
||||
--func 回调
|
||||
|
||||
function UnLockNewFunctionPanel:OnOpen(_id,func)
|
||||
local id = _id
|
||||
this.shenyingText.text = propertyConfig[id].Info
|
||||
if func then func() end
|
||||
end
|
||||
|
||||
function UnLockNewFunctionPanel:OnSortingOrderChange()
|
||||
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function UnLockNewFunctionPanel:OnClose()
|
||||
|
||||
end
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function UnLockNewFunctionPanel:OnDestroy()
|
||||
itemListPrefab = {}
|
||||
end
|
||||
return UnLockNewFunctionPanel
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d180f4e35d19f954c9ca5300cffe2d92
|
||||
timeCreated: 1551694390
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -46,6 +46,19 @@ function this.getGodHoodTreeSettingData()
|
|||
end
|
||||
end
|
||||
|
||||
function this.GetUnLockNewProperty(trailWaves)
|
||||
local data = treeSetting[0].PropertyUnlcokLevelForClient
|
||||
for i = 1, #data do
|
||||
local tempTable = {}
|
||||
if data[i][2] == trailWaves then
|
||||
return data[i][1]
|
||||
elseif data[i][2] > trailWaves then
|
||||
return 0
|
||||
end
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
--计算神应等级
|
||||
function this.CulAttri()
|
||||
local wave = this.GetTowerLevel()
|
||||
|
|
|
|||
Loading…
Reference in New Issue