修复新玩家登陆卡在登陆100%
parent
46a9536c19
commit
783c61eed8
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/atlas/demonslayeratlas
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 80ada0e23a757a24983c45edefa558a5
|
||||
guid: 4e190e857e00b844da2e87d5a820a21e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 90842bf6181eecd4e868f53635fe780a
|
||||
guid: 8c2776f71219b4e4591c31c1948fbd90
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
|
|
@ -106,5 +106,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/artfont/g_gonghui_banner
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -3,5 +3,5 @@ guid: 6dcb3f66449ec9f43b3deaefbc284c4a
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/prefabs/effect/headframe/ui_effect_touxiang_baihu
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -3,5 +3,5 @@ guid: 62d69c237cf900e4f97baca73c337230
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/prefabs/effect/headframe/ui_effect_touxiang_lanlong
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -3,5 +3,5 @@ guid: 548aa4ec6330c3c4f981cc9d3c326b94
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/prefabs/effect/headframe/ui_effect_touxiang_qinglong
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/prefabs/ui/demonslayer
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
@ -1294,6 +1294,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &19561593485225732
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5435175203738280712}
|
||||
- component: {fileID: 2685114971760340788}
|
||||
- component: {fileID: 1146668397942847107}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5435175203738280712
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 19561593485225732}
|
||||
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: 3949487347773389800}
|
||||
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: 32, y: 41}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2685114971760340788
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 19561593485225732}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1146668397942847107
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 19561593485225732}
|
||||
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &44739859208395413
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7971,7 +8045,7 @@ ParticleSystem:
|
|||
--- !u!199 &3612650515471756776
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -15013,7 +15087,7 @@ ParticleSystem:
|
|||
--- !u!199 &2077135144819501974
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -15319,8 +15393,8 @@ RectTransform:
|
|||
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: -6.6, y: -76.6}
|
||||
m_SizeDelta: {x: 160, y: 28}
|
||||
m_AnchoredPosition: {x: -6.6, y: -83}
|
||||
m_SizeDelta: {x: 160, y: 51.84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3513380936818697795
|
||||
CanvasRenderer:
|
||||
|
@ -15773,6 +15847,85 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1757111352371401940
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9138815418365406904}
|
||||
- component: {fileID: 1980790012356233290}
|
||||
- component: {fileID: 7445209820748840222}
|
||||
m_Layer: 5
|
||||
m_Name: time
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9138815418365406904
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1757111352371401940}
|
||||
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: 3949487347773389800}
|
||||
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}
|
||||
m_AnchoredPosition: {x: -3.0999756, y: -72.5}
|
||||
m_SizeDelta: {x: 191.9, y: 42.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1980790012356233290
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1757111352371401940}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7445209820748840222
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1757111352371401940}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 28
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 47
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "17\uFF1A06"
|
||||
--- !u!1 &1760057952424833087
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -15847,6 +16000,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1765330020465121400
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3190459935930276301}
|
||||
- component: {fileID: 726574532882820434}
|
||||
- component: {fileID: 4421679803668247309}
|
||||
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 &3190459935930276301
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1765330020465121400}
|
||||
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: 3949487347773389800}
|
||||
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: -6, y: -72.5}
|
||||
m_SizeDelta: {x: 160, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &726574532882820434
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1765330020465121400}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4421679803668247309
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1765330020465121400}
|
||||
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: d69429d22e71bbd439bbf280edeb3a71, 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 &1777940744394471679
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -20719,7 +20946,7 @@ ParticleSystem:
|
|||
--- !u!199 &5382233283546536858
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -21343,144 +21570,6 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -9.3, y: 9.7}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2136776905113770620
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5118051604763109940}
|
||||
- component: {fileID: 4854863467253973492}
|
||||
- component: {fileID: 2162128609586602301}
|
||||
- component: {fileID: 7600273242676742789}
|
||||
- component: {fileID: 2042200215857321848}
|
||||
m_Layer: 5
|
||||
m_Name: treasureStoreBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5118051604763109940
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2136776905113770620}
|
||||
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: 8460479809796838342}
|
||||
m_Father: {fileID: 1612271237950830011}
|
||||
m_RootOrder: 19
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -270, y: -345}
|
||||
m_SizeDelta: {x: 148, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4854863467253973492
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2136776905113770620}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2162128609586602301
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2136776905113770620}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2042200215857321848}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &7600273242676742789
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2136776905113770620}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!114 &2042200215857321848
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2136776905113770620}
|
||||
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: 1b98f39b51ec1c64b9cd623a1c606726, 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 &2146490309819608022
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -27365,7 +27454,7 @@ ParticleSystem:
|
|||
--- !u!199 &2875445198819456316
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -28514,6 +28603,80 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &2839994369573060603
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2513503616466442681}
|
||||
- component: {fileID: 3700079071040446200}
|
||||
- component: {fileID: 208846759659016561}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2513503616466442681
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2839994369573060603}
|
||||
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: 3949487347773389800}
|
||||
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, y: 0}
|
||||
m_SizeDelta: {x: 148, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3700079071040446200
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2839994369573060603}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &208846759659016561
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2839994369573060603}
|
||||
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: 1b98f39b51ec1c64b9cd623a1c606726, 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 &2854648508018721289
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -34321,7 +34484,7 @@ ParticleSystem:
|
|||
--- !u!199 &4678487443364567018
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -39378,7 +39541,7 @@ ParticleSystem:
|
|||
--- !u!199 &3301434479282110283
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -45425,7 +45588,7 @@ ParticleSystem:
|
|||
--- !u!199 &8426323061574149814
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -50717,7 +50880,7 @@ ParticleSystem:
|
|||
--- !u!199 &3988090302360095373
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -56228,7 +56391,7 @@ ParticleSystem:
|
|||
--- !u!199 &5461926455895321923
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -61568,7 +61731,7 @@ ParticleSystem:
|
|||
--- !u!199 &6960492284779320589
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -67805,7 +67968,7 @@ ParticleSystem:
|
|||
--- !u!199 &4261467272199160834
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -68470,7 +68633,7 @@ RectTransform:
|
|||
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: -6.6, y: -76.6}
|
||||
m_AnchoredPosition: {x: -6.6, y: -83}
|
||||
m_SizeDelta: {x: 191.9, y: 42.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7795030966618035774
|
||||
|
@ -68971,7 +69134,7 @@ RectTransform:
|
|||
- {fileID: 6037573607238918216}
|
||||
- {fileID: 2551141485308354454}
|
||||
- {fileID: 9193860963406042167}
|
||||
- {fileID: 5118051604763109940}
|
||||
- {fileID: 3949487347773389800}
|
||||
- {fileID: 1284456144}
|
||||
- {fileID: 4420810243047435922}
|
||||
- {fileID: 4983623036232270673}
|
||||
|
@ -71956,6 +72119,7 @@ GameObject:
|
|||
- component: {fileID: 7754725958776047094}
|
||||
- component: {fileID: 738290502969369036}
|
||||
- component: {fileID: 1990200174122147187}
|
||||
- component: {fileID: 8140399955604703378}
|
||||
m_Layer: 5
|
||||
m_Name: battleUpLvTip
|
||||
m_TagString: Untagged
|
||||
|
@ -72020,6 +72184,27 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!223 &8140399955604703378
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6278373347935340855}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 2
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 1
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!1 &6293395449357706096
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -72576,8 +72761,8 @@ RectTransform:
|
|||
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: -6.6, y: -76.6}
|
||||
m_SizeDelta: {x: 160, y: 28}
|
||||
m_AnchoredPosition: {x: -6.6, y: -82.99999}
|
||||
m_SizeDelta: {x: 160, y: 51.84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6131281959524532560
|
||||
CanvasRenderer:
|
||||
|
@ -77398,7 +77583,7 @@ ParticleSystem:
|
|||
--- !u!199 &1408501988965295168
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -78021,7 +78206,7 @@ RectTransform:
|
|||
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: -6.6, y: -76.6}
|
||||
m_AnchoredPosition: {x: -6.6, y: -82.99999}
|
||||
m_SizeDelta: {x: 191.9, y: 42.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1382239236131096127
|
||||
|
@ -78758,80 +78943,6 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &6920573833417863761
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8460479809796838342}
|
||||
- component: {fileID: 4487707567810251251}
|
||||
- component: {fileID: 542772590207513422}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8460479809796838342
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6920573833417863761}
|
||||
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: 5118051604763109940}
|
||||
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: 32, y: 41}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4487707567810251251
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6920573833417863761}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &542772590207513422
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6920573833417863761}
|
||||
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &6988653667512423270
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -84762,7 +84873,7 @@ ParticleSystem:
|
|||
--- !u!199 &1706209193022837301
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -86411,6 +86522,117 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8011565624450160374
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3949487347773389800}
|
||||
- component: {fileID: 5853232199602849243}
|
||||
- component: {fileID: 3465737898103675473}
|
||||
- component: {fileID: 789352472823284092}
|
||||
m_Layer: 5
|
||||
m_Name: treasureStoreBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3949487347773389800
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8011565624450160374}
|
||||
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: 2513503616466442681}
|
||||
- {fileID: 5435175203738280712}
|
||||
- {fileID: 3190459935930276301}
|
||||
- {fileID: 9138815418365406904}
|
||||
m_Father: {fileID: 1612271237950830011}
|
||||
m_RootOrder: 19
|
||||
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_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5853232199602849243
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8011565624450160374}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3465737898103675473
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8011565624450160374}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &789352472823284092
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8011565624450160374}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &8028640991689297192
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -91413,7 +91635,7 @@ ParticleSystem:
|
|||
--- !u!199 &8234207848460451360
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -96244,7 +96466,7 @@ ParticleSystem:
|
|||
--- !u!199 &3615746855071839570
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -295,6 +295,30 @@ function PlayUIAnim(gameObject, callback)
|
|||
end
|
||||
end
|
||||
|
||||
function SecTorPlayAnim(prefabList,_scale)
|
||||
local scale = 0.05
|
||||
if _scale then
|
||||
scale = _scale
|
||||
end
|
||||
for i, node in ipairs(prefabList) do
|
||||
Timer.New(function ()
|
||||
node.gameObject:SetActive(true)
|
||||
PlayUIAnim(node.gameObject)
|
||||
end,scale*(i-1)):Start()
|
||||
end
|
||||
end
|
||||
function SecTorPlayAnimByScroll(scroll,_scale)
|
||||
local scale = 0.05
|
||||
if _scale then
|
||||
scale = _scale
|
||||
end
|
||||
scroll:ForeachItemGO(function (index, go)
|
||||
Timer.New(function ()
|
||||
go.gameObject:SetActive(true)
|
||||
PlayUIAnim(go.gameObject)
|
||||
end, scale*(index-1)):Start()
|
||||
end)
|
||||
end
|
||||
function PlayUIAnimBack(gameObject, callback)
|
||||
--local anim = gameObject:GetComponent(typeof(PlayFlyAnim))
|
||||
local anim = gameObject:GetComponent("PlayFlyAnim")
|
||||
|
|
|
@ -1,248 +0,0 @@
|
|||
local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage")
|
||||
local allData={}
|
||||
local itemsGrid = {}--item重复利用
|
||||
local singleTaskPre = {}
|
||||
local this=PoZhenZhuXianPage
|
||||
local parent
|
||||
local endtime = 0
|
||||
function PoZhenZhuXianPage:ctor(mainPanel, gameObject)
|
||||
self.mainPanel = mainPanel
|
||||
self.gameObject = gameObject
|
||||
self:InitComponent(gameObject)
|
||||
self:BindEvent()
|
||||
end
|
||||
|
||||
function PoZhenZhuXianPage:InitComponent(gameObject)
|
||||
itemsGrid = {}--item重复利用
|
||||
singleTaskPre = {}
|
||||
this.time = Util.GetGameObject(gameObject, "content/tiao/time"):GetComponent("Text")
|
||||
this.itemPre = Util.GetGameObject(gameObject, "content/itempre")
|
||||
this.scrollItem = Util.GetGameObject(gameObject, "content/grid")
|
||||
local rootHight = this.scrollItem.transform.rect.height
|
||||
local width = this.scrollItem.transform.rect.width
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform,
|
||||
this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 30))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function PoZhenZhuXianPage:BindEvent()
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function PoZhenZhuXianPage:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.Refresh)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function PoZhenZhuXianPage:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.Refresh)
|
||||
end
|
||||
local sortingOrder = 0
|
||||
--界面打开时调用(用于子类重写)
|
||||
function PoZhenZhuXianPage:OnOpen()
|
||||
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function PoZhenZhuXianPage:OnShow(_sortingOrder,_parent)
|
||||
sortingOrder = _sortingOrder
|
||||
parent = _parent
|
||||
this.Refresh()
|
||||
end
|
||||
|
||||
function this.Refresh()
|
||||
allData = OperatingManager:InitPoZhenZhuXianData()
|
||||
this:OnShowData()
|
||||
this:SetTime()
|
||||
end
|
||||
|
||||
function PoZhenZhuXianPage:SetTime()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
local five_timeDown
|
||||
local week_timeDown
|
||||
five_timeDown = CalculateSecondsNowTo_N_OClock(5)
|
||||
week_timeDown = endtime - GetTimeStamp()
|
||||
for k,v in pairs(singleTaskPre) do
|
||||
-- v.com.gameObject:SetActive(true)
|
||||
if v and v.data.type == 1 then
|
||||
v.com:GetComponent("Text").text = Language[10561]..TimeToH(five_timeDown)
|
||||
else
|
||||
v.com:GetComponent("Text").text = Language[10561]..TimeToDH(week_timeDown)
|
||||
end
|
||||
end
|
||||
this.time.text = Language[12321]..TimeToDHMS(week_timeDown)
|
||||
self.timer = Timer.New(function()
|
||||
five_timeDown = five_timeDown - 1
|
||||
week_timeDown = week_timeDown - 1
|
||||
if five_timeDown <= 0 then
|
||||
this.Refresh()
|
||||
return
|
||||
end
|
||||
if week_timeDown <= 0 then
|
||||
parent:ClosePanel()
|
||||
return
|
||||
end
|
||||
for k,v in pairs(singleTaskPre) do
|
||||
-- v.com.gameObject:SetActive(true)
|
||||
if v and v.data.type == 1 then
|
||||
v.com:GetComponent("Text").text = Language[10561]..TimeToH(five_timeDown)
|
||||
else
|
||||
v.com:GetComponent("Text").text = Language[10561]..TimeToDH(week_timeDown)
|
||||
end
|
||||
end
|
||||
this.time.text = Language[12321]..TimeToDHMS(week_timeDown)
|
||||
end, 1, -1, true)
|
||||
self.timer:Start()
|
||||
end
|
||||
|
||||
function PoZhenZhuXianPage:OnShowData()
|
||||
if allData then
|
||||
endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task)
|
||||
this.SortData(allData)
|
||||
this.ScrollView:SetData(allData, function (index, go)
|
||||
this.SingleDataShow(go, allData[index])
|
||||
if not singleTaskPre[go] then
|
||||
singleTaskPre[go] = {}
|
||||
end
|
||||
singleTaskPre[go].com = Util.GetGameObject(go,"btn/Text")
|
||||
singleTaskPre[go].data = allData[index]
|
||||
end)
|
||||
else
|
||||
parent.OnPageTabChange(1)
|
||||
PopupTipPanel.ShowTip(Language[12320])
|
||||
return
|
||||
end
|
||||
|
||||
end
|
||||
local typeIndex = {
|
||||
[0] = 1,
|
||||
[1] = 0,
|
||||
[2] = 2,
|
||||
}
|
||||
function PoZhenZhuXianPage:SortData()
|
||||
if allData==nil then
|
||||
return
|
||||
end
|
||||
table.sort(allData, function(a,b)
|
||||
if typeIndex[a.state] == typeIndex[b.state] then
|
||||
if a.type == b.type then
|
||||
return a.id < b.id
|
||||
else
|
||||
return a.type < b.type
|
||||
end
|
||||
else
|
||||
return typeIndex[a.state] < typeIndex[b.state]
|
||||
end
|
||||
end)
|
||||
end
|
||||
local type={
|
||||
[0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]},
|
||||
[1]={sprite = "s_slbz_1anniuongse",text = Language[10022]},
|
||||
[2]={sprite = "s_slbz_1anniuhuise",text = Language[10350]},
|
||||
|
||||
}
|
||||
--刷新每一条的显示数据
|
||||
function this.SingleDataShow(pre,value)
|
||||
if pre==nil or value==nil then
|
||||
return
|
||||
end
|
||||
--绑定组件
|
||||
local activityRewardGo = pre
|
||||
activityRewardGo:SetActive(true)
|
||||
local sConFigData = value
|
||||
|
||||
local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text")
|
||||
titleText.text = sConFigData.title .."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")"
|
||||
local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text")
|
||||
missionText.text = sConFigData.content
|
||||
local timeText = Util.GetGameObject(activityRewardGo, "btn/Text")
|
||||
|
||||
local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward")
|
||||
if (not itemsGrid) then
|
||||
itemsGrid = {}
|
||||
end
|
||||
if not itemsGrid[pre] then
|
||||
itemsGrid[pre] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform)
|
||||
end
|
||||
itemsGrid[pre]:OnOpen(false, sConFigData.reward, 0.9, false)
|
||||
|
||||
local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn")
|
||||
--0-未完成,1-完成未领取 2-已领取
|
||||
local state = sConFigData.state
|
||||
timeText:SetActive(state == 0)
|
||||
|
||||
local red = Util.GetGameObject(lingquButton.gameObject, "redPoint")
|
||||
red:SetActive(state == 1)
|
||||
|
||||
Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text
|
||||
Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite)
|
||||
Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 2)
|
||||
Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 2)
|
||||
|
||||
Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function()
|
||||
if state == 1 then
|
||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.PoZhenZhuXianTask,sConFigData.id, function(respond)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function ()
|
||||
this.Refresh()
|
||||
CheckRedPointStatus(RedPointType.PoZhenZhuXianTask)
|
||||
end)
|
||||
end)
|
||||
elseif state == 0 then
|
||||
if sConFigData.jump then
|
||||
JumpManager.GoJump(sConFigData.jump)
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function PoZhenZhuXianPage:OnOpen()
|
||||
|
||||
end
|
||||
|
||||
function this.RechargeSuccessFunc(id)
|
||||
FirstRechargeManager.RefreshAccumRechargeValue(id)
|
||||
--OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id)
|
||||
this.Refresh()
|
||||
end
|
||||
|
||||
function PoZhenZhuXianPage:OnClose()
|
||||
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function PoZhenZhuXianPage:OnDestroy()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
sortingOrder = 0
|
||||
singleTaskPre = {}
|
||||
itemsGrid = {}
|
||||
end
|
||||
|
||||
function PoZhenZhuXianPage:OnHide()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
end
|
||||
--- 将一段时间转换为天时分秒
|
||||
function PoZhenZhuXianPage:TimeToDHMS(second)
|
||||
local day = math.floor(second / (24 * 3600))
|
||||
local minute = math.floor(second / 60) % 60
|
||||
local sec = second % 60
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
if day <= 0 and hour <= 0 then
|
||||
return string.format(Language[12231],minute, sec)
|
||||
else
|
||||
return string.format(Language[12232],day, hour)
|
||||
end
|
||||
end
|
||||
|
||||
return PoZhenZhuXianPage
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f7558d53f2271bf4093977fc259fdeff
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -57,7 +57,7 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ExChange:OnOpen(...)
|
||||
|
||||
itemList = {}
|
||||
end
|
||||
local sortingOrder = 0
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
|
@ -79,7 +79,7 @@ function ExChange:ExChangeShow()
|
|||
local LimitExchange = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LimitExchange)
|
||||
if LimitExchange then
|
||||
local str = Language[11496]
|
||||
Log("LimitExchange "..LimitExchange.endTime)
|
||||
-- Log("LimitExchange "..LimitExchange.endTime)
|
||||
PatFaceManager.RemainTimeDown(this.timeTextExChangeGo,this.timeTextExChange,LimitExchange.endTime - GetTimeStamp(),str)
|
||||
else
|
||||
this.timeTextExChangeGo:SetActive(false)
|
||||
|
@ -148,6 +148,13 @@ function ExChange:OnClose()
|
|||
end
|
||||
end
|
||||
|
||||
function ExChange:OnHide()
|
||||
if this.liveNode then
|
||||
poolManager:UnLoadLive(this.liveName, this.liveNode)
|
||||
this.liveNode = nil
|
||||
this.liveName = nil
|
||||
end
|
||||
end
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function ExChange:OnDestroy()
|
||||
itemList = {}
|
||||
|
|
|
@ -6,7 +6,7 @@ this.LoginWay = { Account = 0, WeChat = 1 }
|
|||
|
||||
|
||||
local ServerVersion = SERVER_VERSION
|
||||
local IsShowNotice = false
|
||||
local IsShowNotice = true
|
||||
|
||||
local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin
|
||||
local IsDevelopLogin = true
|
||||
|
@ -472,13 +472,15 @@ function this.ExecuteLoading()
|
|||
if AppConst.isGuide then
|
||||
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then
|
||||
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
|
||||
StoryManager.EventTrigger(300001)
|
||||
else
|
||||
PatFaceManager.isLogin = true
|
||||
-- UIManager.OpenPanelAsync(UIName.MainPanel, function ()
|
||||
StoryManager.EventTrigger(100001, function()
|
||||
PatFaceManager.isLogin = true
|
||||
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
|
||||
LoadingPanel.End()
|
||||
-- end)
|
||||
end)
|
||||
else
|
||||
PatFaceManager.isLogin = true
|
||||
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
|
||||
LoadingPanel.End()
|
||||
end
|
||||
else
|
||||
UIManager.OpenPanelAsync(UIName.MainPanel, function()
|
||||
|
@ -515,7 +517,6 @@ end
|
|||
|
||||
this.isLoginClick = false
|
||||
function this.OnLoginClick()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_login)
|
||||
if LoginManager.state == 0 or LoginManager.state == 1 then
|
||||
local function reServerCallback(str)
|
||||
if str == nil then
|
||||
|
|
|
@ -1036,7 +1036,7 @@ end
|
|||
function this:OnShow()
|
||||
-- 音效
|
||||
if isFirstOpen >= 2 then
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_interface)
|
||||
-- PlaySoundWithoutClick(SoundConfig.Sound_interface)
|
||||
end
|
||||
isFirstOpen = isFirstOpen + 1
|
||||
isRefeshIcon = true
|
||||
|
|
|
@ -17,7 +17,7 @@ local curIndex = 0
|
|||
local lerp = 0
|
||||
local maxIndex = 0
|
||||
local function update()
|
||||
if this.Slider then
|
||||
if this.Slider and this.SliderText then
|
||||
lerp = math.clamp(lerp + Time.fixedDeltaTime * 15,0,1)
|
||||
local curValue = this.Slider.value * (1-lerp) + curIndex * lerp
|
||||
this.Slider.value = curValue
|
||||
|
|
|
@ -727,7 +727,12 @@ end
|
|||
|
||||
function this.GetTimeLimitRedPointStatus()
|
||||
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local freeTimesId=lotterySetting[RecruitType.TimeLimitSingle].FreeTimes
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
if not activityId then
|
||||
return false
|
||||
end
|
||||
local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1)
|
||||
local freeTimesId=lotterySetting[array.Id].FreeTimes
|
||||
local freeTime= 0
|
||||
if freeTimesId>0 then
|
||||
freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||
|
@ -738,7 +743,12 @@ end
|
|||
|
||||
function this.GetQiankunBoxRedPointStatus()
|
||||
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||
if not activityId then
|
||||
return false
|
||||
end
|
||||
local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1)
|
||||
local freeTimesId=lotterySetting[array.Id].FreeTimes
|
||||
local freeTime= 0
|
||||
if freeTimesId>0 then
|
||||
freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||
|
@ -749,29 +759,37 @@ end
|
|||
|
||||
this.TimeLimitedTimes = 0
|
||||
this.allData = {}
|
||||
function this.InitPoZhenZhuXianData()
|
||||
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task)
|
||||
if (not id) or id == 0 then
|
||||
return nil
|
||||
end
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_task) then
|
||||
function this.InitDynamicActData()
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
|
||||
if (not id) or id < 1 then
|
||||
return nil
|
||||
end
|
||||
LogGreen("ActivityId:"..id)
|
||||
this.allData = {}
|
||||
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id)
|
||||
local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.PoZhenZhuXianTask)
|
||||
local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.DynamicActTask)
|
||||
LogGreen("allMissionData:"..#allMissionData)
|
||||
for i=1,#allListData do
|
||||
for j=1,#allMissionData do
|
||||
if allListData[i].Id == allMissionData[j].missionId then
|
||||
local data = {}
|
||||
data.id = allMissionData[j].missionId
|
||||
data.progress = allMissionData[j].progress
|
||||
data.state = allMissionData[j].state
|
||||
data.type = allListData[i].Type
|
||||
local strs = string.split(allListData[i].Show,"#")
|
||||
data.title = strs[1]
|
||||
data.content = strs[2]
|
||||
data.value = allListData[i].TaskValue[2][1]
|
||||
data.state = allMissionData[j].state
|
||||
-- if allMissionData[j].state == 2 then
|
||||
-- data.state = allMissionData[j].state
|
||||
-- else
|
||||
-- if data.progress >= data.value then
|
||||
-- data.state = 1
|
||||
-- else
|
||||
-- data.state = 0
|
||||
-- end
|
||||
-- end
|
||||
data.type = allListData[i].Type
|
||||
data.reward = {allListData[i].Integral[1][1],allListData[i].Integral[1][2]}
|
||||
data.jump = allListData[i].Jump[1]
|
||||
table.insert(this.allData,data)
|
||||
|
@ -780,8 +798,8 @@ function this.InitPoZhenZhuXianData()
|
|||
end
|
||||
return this.allData
|
||||
end
|
||||
function this.CheckPoZhenZhuXianTaskRed()
|
||||
this.InitPoZhenZhuXianData()
|
||||
function this.CheckDynamicActTaskRed()
|
||||
this.InitDynamicActData()
|
||||
if not this.allData then
|
||||
return false
|
||||
end
|
||||
|
@ -793,16 +811,13 @@ function this.CheckPoZhenZhuXianTaskRed()
|
|||
return false
|
||||
end
|
||||
function this.InitLeiJiChongZhiData()
|
||||
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_recharge)
|
||||
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct_recharge)
|
||||
if (not id) or id == 0 then
|
||||
return nil
|
||||
end
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_recharge) then
|
||||
return nil
|
||||
end
|
||||
this.LeiJiChongZhiData = {}
|
||||
local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id)
|
||||
local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_recharge)
|
||||
local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DynamicAct_recharge)
|
||||
for i=1,#allListData do
|
||||
for j=1,#allMissionData.mission do
|
||||
if allListData[i].Id == allMissionData.mission[j].missionId then
|
||||
|
@ -825,10 +840,43 @@ function this.CheckLeiJiChongZhiRedData()
|
|||
return false
|
||||
end
|
||||
for j = 1,#mission do
|
||||
if mission.state == 2 then
|
||||
LogGreen(mission[j].id..":"..mission[j].state)
|
||||
if mission[j].state == 2 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
function this.CheckWeekGiftPageRedPoint()
|
||||
local boughtNum = 0
|
||||
local limitNum = 0
|
||||
local shopData = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift)
|
||||
for i = 1, #shopData do
|
||||
if rechargeConfig[shopData[i].goodsId].ShowType == DirectBuyType.WEEK_GIFT then
|
||||
boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, shopData[i].goodsId)
|
||||
limitNum = rechargeConfig[shopData[i].goodsId].Limit
|
||||
local isCanBuy = limitNum - boughtNum >0
|
||||
if isCanBuy and rechargeConfig[shopData[i].goodsId].Price <= 0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
function this.CheckMonthGiftPageRedPoint()
|
||||
local boughtNum = 0
|
||||
local limitNum = 0
|
||||
local shopData = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift)
|
||||
for i = 1, #shopData do
|
||||
if rechargeConfig[shopData[i].goodsId].ShowType == DirectBuyType.MONTH_GIFT then
|
||||
boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, shopData[i].goodsId)
|
||||
limitNum = rechargeConfig[shopData[i].goodsId].Limit
|
||||
local isCanBuy = limitNum - boughtNum >0
|
||||
if isCanBuy and rechargeConfig[shopData[i].goodsId].Price <= 0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
return this
|
|
@ -66,7 +66,8 @@ function OperatingPanel:InitComponent()
|
|||
end)
|
||||
|
||||
BindRedPointObject(RedPointType.CumulativeSignIn, Util.GetGameObject(self.operateTabs[1], "redPoint"))
|
||||
BindRedPointObject(RedPointType.GiftPage, Util.GetGameObject(self.operateTabs[5], "redPoint"))
|
||||
BindRedPointObject(RedPointType.WeekGiftPage, Util.GetGameObject(self.operateTabs[5], "redPoint"))
|
||||
BindRedPointObject(RedPointType.MonthGiftPage, Util.GetGameObject(self.operateTabs[6], "redPoint"))
|
||||
BindRedPointObject(RedPointType.MonthCard, Util.GetGameObject(self.operateTabs[2], "redPoint"))
|
||||
BindRedPointObject(RedPointType.GrowthGift, Util.GetGameObject(self.operateTabs[3], "redPoint"))
|
||||
-- BindRedPointObject(RedPointType.ContinuityRecharge, Util.GetGameObject(self.operateTabs[4], "redPoint"))
|
||||
|
@ -140,9 +141,9 @@ function OperatingPanel:OnDestroy()
|
|||
SubUIManager.Close(self.UpView)
|
||||
ClearRedPointObject(RedPointType.CumulativeSignIn)
|
||||
ClearRedPointObject(RedPointType.GrowthGift)
|
||||
ClearRedPointObject(RedPointType.GiftPage)
|
||||
ClearRedPointObject(RedPointType.MonthCard)
|
||||
|
||||
ClearRedPointObject(RedPointType.WeekGiftPage)
|
||||
ClearRedPointObject(RedPointType.MonthGiftPage)
|
||||
self.operatingContents[1]:OnDestroy()
|
||||
self.operatingContents[5]:OnDestroy()
|
||||
end
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||
local sortingOrder = 0
|
||||
local extra=nil--判断周、月礼包
|
||||
|
||||
local isPlayAnim = true
|
||||
local data = {
|
||||
[1]={picture = "m_meiyuelibao_banner1",picture2 = "m_meiyuelibao_banner11",}, --周礼包
|
||||
[2]={picture = "m_meiyuelibao_banner2",picture2 = "m_meiyuelibao_banner22",}, --月礼包
|
||||
|
@ -23,7 +23,6 @@ function WeekMonthGiftPackPage:InitComponent(gameObject)
|
|||
self.bg = Util.GetGameObject(gameObject, "rzyBg")
|
||||
self.titleBg = Util.GetGameObject(gameObject, "rzyBg/bg"):GetComponent("Image")
|
||||
self.bgTextImage = Util.GetGameObject(gameObject, "rzyBg/bg/bgTextImage")
|
||||
self.redPoint=Util.GetGameObject(gameObject,"rzyBg/freeBtn/redPoint")
|
||||
self.endTime = Util.GetGameObject(gameObject, "rzyBg/endTime"):GetComponent("Text")
|
||||
self.endTimeBg = Util.GetGameObject(gameObject, "rzyBg/Image")
|
||||
self.scrollItem = Util.GetGameObject(gameObject, "rzyBg/scrollItem")
|
||||
|
@ -44,6 +43,7 @@ function WeekMonthGiftPackPage:BindEvent()
|
|||
end
|
||||
|
||||
function WeekMonthGiftPackPage:OnShow(_sortingOrder,extraTab)
|
||||
isPlayAnim = true
|
||||
sortingOrder = _sortingOrder
|
||||
extra=extraTab
|
||||
self:RefreshData()
|
||||
|
@ -79,7 +79,7 @@ function WeekMonthGiftPackPage:RefreshGiftData()
|
|||
--#OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift == 27
|
||||
table.sort(shopData,function(a,b)
|
||||
if a.sortId == b.sortId then
|
||||
return a.data.goodsId < b.data.goodsId
|
||||
return rechargeCommodityConfig[a.data.goodsId].Price < rechargeCommodityConfig[b.data.goodsId].Price
|
||||
else
|
||||
return a.sortId > b.sortId
|
||||
end
|
||||
|
@ -89,6 +89,10 @@ function WeekMonthGiftPackPage:RefreshGiftData()
|
|||
self:RefreshShowData(item, shopData[index].data)
|
||||
end
|
||||
self.scrollView:SetData(shopData, callBack)
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(self.scrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
@ -116,6 +120,11 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
|
|||
--limitNum = OperatingManager.GetLeftBuyTime(GoodsTypeDef.DirectPurchaseGift,data.goodsId)
|
||||
costId, finalNum, oriCostNum = nil,shopItemData.Price,nil
|
||||
|
||||
if isPlayAnim then
|
||||
item:SetActive(false)
|
||||
else
|
||||
item:SetActive(true)
|
||||
end
|
||||
|
||||
--滚动条复用重设itemview
|
||||
if self.ItemList[item] then
|
||||
|
@ -152,9 +161,15 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
|
|||
Util.SetGray(btnBuy,not isCanBuy)
|
||||
icon:GetComponent("Image").enabled=isCanBuy
|
||||
if isCanBuy then
|
||||
if shopItemData.Price <= 0 then
|
||||
redPoint.gameObject:SetActive(true)
|
||||
else
|
||||
redPoint.gameObject:SetActive(false)
|
||||
end
|
||||
price.text = string.format(MoneyUtil.GetMoneyUnitName(), MoneyUtil.GetMoney(finalNum))--..MoneyUtil.GetMoneyUnitName()
|
||||
buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum
|
||||
else
|
||||
redPoint.gameObject:SetActive(false)
|
||||
price.alignment="MiddleCenter"
|
||||
price.text=Language[10526]
|
||||
buyInfo.text=Language[11498].."<color=red>"..limitNum - boughtNum.."</color>".. "/" .. limitNum..Language[11455]
|
||||
|
@ -169,6 +184,8 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
|
|||
FirstRechargeManager.RefreshAccumRechargeValue(data.goodsId)
|
||||
self:RefreshGiftData()
|
||||
CheckRedPointStatus(RedPointType.DailyGift)
|
||||
CheckRedPointStatus(RedPointType.WeekGiftPage)
|
||||
CheckRedPointStatus(RedPointType.MonthGiftPage)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
|
|
@ -184,13 +184,14 @@ function this.InitRedPointAllRelate()
|
|||
--运营红点
|
||||
RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.GiftPage, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.WeekGiftPage, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.MonthGiftPage, RedPointType.Operating)
|
||||
--RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
|
||||
--(24暂时关闭)放开这里就行
|
||||
RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity)
|
||||
RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity)
|
||||
RPData:SetParent(RedPointType.PoZhenZhuXianTask, RedPointType.DynamicActivity)
|
||||
RPData:SetParent(RedPointType.PoZhenZhuXianRecharge, RedPointType.DynamicActivity)
|
||||
RPData:SetParent(RedPointType.DynamicActTask, RedPointType.DynamicActivity)
|
||||
RPData:SetParent(RedPointType.DynamicActRecharge, RedPointType.DynamicActivity)
|
||||
|
||||
-- 好友红点
|
||||
RPData:SetParent(RedPointType.Friend_GetAllReward, RedPointType.Friend_Reward)
|
||||
|
@ -401,8 +402,8 @@ function this.RegisterRedCheckFunc()
|
|||
--限时招募
|
||||
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
|
||||
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
|
||||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
|
||||
RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
||||
RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed)
|
||||
RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck)
|
||||
|
@ -417,6 +418,8 @@ function this.RegisterRedCheckFunc()
|
|||
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasureTrail, QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot)
|
||||
RPData:AddCheckFunc(RedPointType.WeekGiftPage,OperatingManager.CheckWeekGiftPageRedPoint)
|
||||
RPData:AddCheckFunc(RedPointType.MonthGiftPage,OperatingManager.CheckMonthGiftPageRedPoint)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -148,6 +148,9 @@ function ElementDrawCardPanel:BindEvent()
|
|||
-- this.getCardPanel5:SetActive(false)
|
||||
this.getCardPanel1:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
this.effect:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_syz)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_syz_loop)
|
||||
end)
|
||||
Util.AddClick(this.itemBtn2, function ()
|
||||
this.getCardPanel1:SetActive(false)
|
||||
|
@ -157,6 +160,9 @@ function ElementDrawCardPanel:BindEvent()
|
|||
-- this.getCardPanel5:SetActive(false)
|
||||
this.getCardPanel2:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
this.effect:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_syz)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_syz_loop)
|
||||
end)
|
||||
Util.AddClick(this.itemBtn3, function ()
|
||||
this.getCardPanel1:SetActive(false)
|
||||
|
@ -166,6 +172,9 @@ function ElementDrawCardPanel:BindEvent()
|
|||
-- this.getCardPanel5:SetActive(false)
|
||||
this.getCardPanel3:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
this.effect:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_syz)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_syz_loop)
|
||||
end)
|
||||
Util.AddClick(this.itemBtn4, function ()
|
||||
this.getCardPanel1:SetActive(false)
|
||||
|
@ -175,6 +184,9 @@ function ElementDrawCardPanel:BindEvent()
|
|||
-- this.getCardPanel5:SetActive(false)
|
||||
this.getCardPanel4:GetComponent("PlayFlyAnim"):PlayAnim(true)
|
||||
this.effect:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_syz)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_syz_loop)
|
||||
end)
|
||||
-- Util.AddClick(this.itemBtn5, function ()
|
||||
-- this.getCardPanel1:SetActive(false)
|
||||
|
@ -189,18 +201,22 @@ function ElementDrawCardPanel:BindEvent()
|
|||
Util.AddClick(this.getCardPanelBtnBack1, function ()
|
||||
this.getCardPanel1:SetActive(false)
|
||||
this.effect:SetActive(false)
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
end)
|
||||
Util.AddClick(this.getCardPanelBtnBack2, function ()
|
||||
this.getCardPanel2:SetActive(false)
|
||||
this.effect:SetActive(false)
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
end)
|
||||
Util.AddClick(this.getCardPanelBtnBack3, function ()
|
||||
this.getCardPanel3:SetActive(false)
|
||||
this.effect:SetActive(false)
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
end)
|
||||
Util.AddClick(this.getCardPanelBtnBack4, function ()
|
||||
this.getCardPanel4:SetActive(false)
|
||||
this.effect:SetActive(false)
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
end)
|
||||
-- Util.AddClick(this.getCardPanelBtnBack5, function ()
|
||||
-- this.getCardPanel5:SetActive(false)
|
||||
|
|
|
@ -32,8 +32,8 @@ function this.RecruitRequest(recruitType, func, privilegeId)
|
|||
--Log(tostring(this.freeUseTimeList[privilegeId]))
|
||||
if BagManager.GetItemCountById(itemId) >= itemNum or (this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1) or isFindFairyFree then
|
||||
NetManager.RecruitRequest(recruitType, function(msg)
|
||||
local lotteryType=ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType).LotteryType --若是活动招募,目前活动招募是东海寻仙,分多期
|
||||
if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or RecruitType.TimeLimitSingle==recruitType or RecruitType.QianKunBoxSingle==recruitType) then --若某抽卡类型有免费次数
|
||||
local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType)
|
||||
if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or (data.LotteryType == 3 and data.PerCount == 1)) then --若某抽卡类型有免费次数
|
||||
if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1)
|
||||
this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId)
|
||||
|
@ -84,15 +84,6 @@ function this.CheckRecuritNormalPoint()
|
|||
end
|
||||
end
|
||||
|
||||
--刷新限时招募红点
|
||||
-- function this.CheckRecuritNormalPoint()
|
||||
-- if (this.freeUseTimeList[32] >= 1) then
|
||||
-- return true
|
||||
-- else
|
||||
-- return false
|
||||
-- end
|
||||
-- end
|
||||
|
||||
function this.InitPreData()
|
||||
this.previewHeroData = {}
|
||||
this.previewFriendData={}
|
||||
|
@ -108,49 +99,16 @@ function this.InitPreData()
|
|||
return
|
||||
end
|
||||
|
||||
-- 根据当前期获取卡池信息
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
local data=nil
|
||||
if curActivityId~=nil then --活动招募
|
||||
data= ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",curActivityId,"LotteryType",3)
|
||||
end
|
||||
for i, v in ConfigPairs(lotteryRewardConfig) do
|
||||
if(v.Pool==1) then--钻石招募
|
||||
table.insert(this.previewHeroData, v)
|
||||
end
|
||||
|
||||
if v.Pool==2 then--友情
|
||||
elseif v.Pool==2 then--友情
|
||||
table.insert(this.previewFriendData,v)
|
||||
end
|
||||
|
||||
if v.Pool==3 then --普抽
|
||||
elseif v.Pool==3 then --普抽
|
||||
table.insert(this.previewNormalData,v)
|
||||
end
|
||||
|
||||
if(v.Pool==11 or v.Pool==12 or v.Pool==13 or v.Pool==14) then-- or v.Pool==15 光暗被移除
|
||||
elseif(v.Pool==11 or v.Pool==12 or v.Pool==13 or v.Pool==14) then-- or v.Pool==15 光暗被移除
|
||||
table.insert(this.previewElementData, v)
|
||||
end
|
||||
|
||||
if(v.Pool==101) then--限时招募
|
||||
table.insert(this.previewTimeLimitedData, v)
|
||||
end
|
||||
|
||||
if(v.Pool==1011) then--限时招募up英雄
|
||||
table.insert(this.previewTimeLimitedUPData, v)
|
||||
end
|
||||
if(v.Pool==4401) then--乾坤宝囊其他奖励
|
||||
table.insert(this.previewLotterySoulData, v)
|
||||
end
|
||||
|
||||
if(v.Pool==1021) then--乾坤宝囊魂印up保底
|
||||
table.insert(this.previewLotterySoulUPData, v)
|
||||
end
|
||||
|
||||
if data~=nil then
|
||||
if(v.Pool == data.DiamondBoxContain[1][1]) then
|
||||
table.insert(this.previewGhostFindData, v)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
for key, value in ConfigPairs(dailyRewardConfig) do
|
||||
|
@ -216,43 +174,6 @@ function this.InitPreData()
|
|||
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
|
||||
end
|
||||
end)
|
||||
|
||||
-- 东海找鬼
|
||||
table.sort(this.previewGhostFindData, function(a, b)
|
||||
if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then
|
||||
return a.Weight > b.Weight
|
||||
else
|
||||
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
|
||||
end
|
||||
end)
|
||||
|
||||
-- 限时招募
|
||||
table.sort(this.previewTimeLimitedData, function(a, b)
|
||||
if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then
|
||||
return a.Weight > b.Weight
|
||||
else
|
||||
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
|
||||
end
|
||||
end)
|
||||
|
||||
--乾坤宝囊其他奖励
|
||||
table.sort(this.previewLotterySoulData, function(a, b)
|
||||
if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then
|
||||
return a.Weight > b.Weight
|
||||
else
|
||||
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
|
||||
end
|
||||
end)
|
||||
|
||||
--乾坤宝囊魂印Up保底
|
||||
table.sort(this.previewLotterySoulUPData, function(a, b)
|
||||
if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then
|
||||
return a.Weight > b.Weight
|
||||
else
|
||||
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
|
||||
end
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
@ -270,17 +191,60 @@ function this.GetRewardPreviewData(type)
|
|||
return this.previewFriendData
|
||||
elseif type==PRE_REWARD_POOL_TYPE.NORMAL then
|
||||
return this.previewNormalData
|
||||
elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED then
|
||||
return this.previewTimeLimitedData
|
||||
elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP then
|
||||
return this.previewTimeLimitedUPData
|
||||
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--乾坤宝囊其他奖励
|
||||
return this.previewLotterySoulData
|
||||
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--乾坤宝囊魂印Up保底
|
||||
return this.previewLotterySoulUPData
|
||||
elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED
|
||||
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP
|
||||
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
|
||||
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
|
||||
return this.GetActivityPreviewData(type)
|
||||
end
|
||||
end
|
||||
|
||||
function this.GetActivityPreviewData(type)
|
||||
local previewData = {}
|
||||
-- 根据当前期获取卡池信息
|
||||
local curActivityId = nil
|
||||
if type==PRE_REWARD_POOL_TYPE.TIME_LIMITED
|
||||
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP then
|
||||
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
|
||||
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
|
||||
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||
end
|
||||
local data = nil
|
||||
if curActivityId ~= nil then --活动招募
|
||||
--LogGreen("curActivityId:"..curActivityId)
|
||||
data = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",curActivityId,"PerCount",1)
|
||||
else
|
||||
LogRed("活动没开,你不应该看到这儿"..curActivityId)
|
||||
end
|
||||
local poolId = nil
|
||||
if data ~= nil then
|
||||
if type == PRE_REWARD_POOL_TYPE.TIME_LIMITED
|
||||
or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then
|
||||
poolId = data.DiamondBoxContain[1][1]
|
||||
elseif type == PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP
|
||||
or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
|
||||
data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool)
|
||||
poolId = data.pool_id
|
||||
end
|
||||
else
|
||||
LogRed("lotterySetting表里没有这个活动:"..curActivityId)
|
||||
end
|
||||
for i, v in ConfigPairs(lotteryRewardConfig) do
|
||||
if(v.Pool == poolId) then
|
||||
table.insert(previewData, v)
|
||||
end
|
||||
end
|
||||
table.sort(previewData, function(a, b)
|
||||
if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then
|
||||
return a.Weight > b.Weight
|
||||
else
|
||||
return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
|
||||
end
|
||||
end)
|
||||
return previewData
|
||||
end
|
||||
|
||||
--获取英雄星级数据的最大长度(动态) type 数据类型 star 星级
|
||||
function this.GetHeroMaxLengthByStar_Dynamic(type,star)
|
||||
local d={}
|
||||
|
|
|
@ -11,6 +11,7 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
|||
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
|
||||
local orginLayer = 0
|
||||
local isPlayAnim = true
|
||||
|
||||
--抽卡类型
|
||||
local rType={
|
||||
|
@ -105,6 +106,7 @@ function RecruitPanel:OnSortingOrderChange()
|
|||
end
|
||||
|
||||
function RecruitPanel:OnShow(...)
|
||||
isPlayAnim = true
|
||||
this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit })
|
||||
|
||||
this.UpdatePanelData()
|
||||
|
@ -144,6 +146,7 @@ function this.UpdatePanelData()
|
|||
o.name="Pre"..i
|
||||
preList[i]=o
|
||||
end
|
||||
preList[i]:SetActive(false)
|
||||
local bg=Util.GetGameObject(preList[i],"Bg"):GetComponent("Image")
|
||||
local time=Util.GetGameObject(preList[i],"Time"):GetComponent("Text")
|
||||
|
||||
|
@ -240,8 +243,9 @@ function this.UpdatePanelData()
|
|||
end
|
||||
end
|
||||
|
||||
this.TimeCountDown()
|
||||
SecTorPlayAnim(preList)
|
||||
|
||||
this.TimeCountDown()
|
||||
local num=BagManager.GetItemCountById(lotterySetting[RecruitType.RecruitBox].CostItem[1][1])
|
||||
RecruitManager.isCanOpenBox=num>=lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
|
||||
this.slider.fillAmount =num/lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
|
||||
|
|
|
@ -60,8 +60,12 @@ function TenRecruitPanel:RemoveListener()
|
|||
end
|
||||
function TenRecruitPanel:OnSortingOrderChange()
|
||||
Util.AddParticleSortLayer(self.effect, self.sortingOrder - orginLayer)
|
||||
for i = 1, this.grid.transform.childCount do
|
||||
Util.AddParticleSortLayer(this.grid.transform:GetChild(i-1).gameObject, self.sortingOrder - orginLayer)
|
||||
-- for i = 1, this.grid.transform.childCount do
|
||||
-- Util.AddParticleSortLayer(this.grid.transform:GetChild(i-1).gameObject, self.sortingOrder - orginLayer)
|
||||
-- end
|
||||
|
||||
for i = 1, 10 do
|
||||
cardList[i]:SetEffectLayer(self.sortingOrder)
|
||||
end
|
||||
orginLayer = self.sortingOrder
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue