Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
521e317377
File diff suppressed because it is too large
Load Diff
|
|
@ -41,7 +41,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 563.0499, y: -45.050003}
|
||||
m_AnchoredPosition: {x: 563.0499, y: -45.05}
|
||||
m_SizeDelta: {x: 88.1, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222229770521615770
|
||||
|
|
@ -612,7 +612,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 328.24997, y: -45.050003}
|
||||
m_AnchoredPosition: {x: 328.24997, y: -45.05}
|
||||
m_SizeDelta: {x: 88.1, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222847014652085586
|
||||
|
|
@ -1285,7 +1285,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 93.44995, y: -45.050003}
|
||||
m_AnchoredPosition: {x: 93.44998, y: -45.05}
|
||||
m_SizeDelta: {x: 88.1, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222917638141494732
|
||||
|
|
@ -2236,12 +2236,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
m_RootOrder: 6
|
||||
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: 259.6, y: -66}
|
||||
m_AnchoredPosition: {x: 259.60007, y: -66}
|
||||
m_SizeDelta: {x: 73.9, y: 42.04}
|
||||
m_Pivot: {x: 0.36038244, y: 0.5}
|
||||
--- !u!222 &5221557223127298546
|
||||
|
|
@ -2540,12 +2540,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8192470711337515734}
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 685.4, y: -112.2999}
|
||||
m_AnchoredPosition: {x: 685.4001, y: -112.2999}
|
||||
m_SizeDelta: {x: 210.65, y: 77.61}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5544556297160053313
|
||||
|
|
@ -2675,7 +2675,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7081655482757342369}
|
||||
m_Father: {fileID: 993731393297786437}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
|
@ -3085,12 +3085,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8995802738978682241}
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -135.70001, y: -0.29989624}
|
||||
m_AnchoredPosition: {x: -135.69995, y: -0.29992676}
|
||||
m_SizeDelta: {x: 210.65002, y: 77.61}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6356434684782085281
|
||||
|
|
@ -3191,6 +3191,46 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &1454276763713780010
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 993731393297786437}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &993731393297786437
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1454276763713780010}
|
||||
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: 4238141339658570511}
|
||||
- {fileID: 1583377035289623720}
|
||||
- {fileID: 1377542536350534115}
|
||||
- {fileID: 7235002840401175143}
|
||||
- {fileID: 5927569354025994995}
|
||||
m_Father: {fileID: 7081655482757342369}
|
||||
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: 836.4, y: 142.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1455432226636305903
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3259,12 +3299,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
m_RootOrder: 5
|
||||
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: 268.3, y: -1.7999873}
|
||||
m_AnchoredPosition: {x: 268.30005, y: -1.7999873}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7399863649284779451
|
||||
|
|
@ -3684,7 +3724,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7081655482757342369}
|
||||
m_Father: {fileID: 993731393297786437}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
|
@ -3966,6 +4006,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1918779212295282661}
|
||||
- component: {fileID: 1918779212295282660}
|
||||
- component: {fileID: 977369845179561181}
|
||||
m_Layer: 5
|
||||
m_Name: itemPro
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3984,18 +4025,13 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1918779213160555210}
|
||||
- {fileID: 927593973145893372}
|
||||
- {fileID: 1918779213822170912}
|
||||
- {fileID: 468007378357944310}
|
||||
- {fileID: 3161722440037881863}
|
||||
- {fileID: 1918779213491360749}
|
||||
- {fileID: 4432934858545881586}
|
||||
m_Father: {fileID: 1918779212796953291}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -931.80005, y: -87}
|
||||
m_AnchoredPosition: {x: -1370, y: -80}
|
||||
m_SizeDelta: {x: 846, y: 127.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1918779212295282660
|
||||
|
|
@ -4006,6 +4042,35 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1918779212295282658}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &977369845179561181
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1918779212295282658}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 4432934858545881586}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &1918779212406558120
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4663,12 +4728,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1918779212295282661}
|
||||
m_Father: {fileID: 4432934858545881586}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 157, y: -64.95}
|
||||
m_AnchoredPosition: {x: 1511.8, y: -41.89995}
|
||||
m_SizeDelta: {x: 8, y: 110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1918779213160555212
|
||||
|
|
@ -4740,12 +4805,12 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2674429168067554592}
|
||||
- {fileID: 6964371350467663445}
|
||||
m_Father: {fileID: 1918779212295282661}
|
||||
m_Father: {fileID: 4432934858545881586}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 734.2, y: -64.94995}
|
||||
m_AnchoredPosition: {x: 732.8, y: -63.95}
|
||||
m_SizeDelta: {x: 190, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1918779213491360721
|
||||
|
|
@ -4984,12 +5049,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1918779212295282661}
|
||||
m_Father: {fileID: 4432934858545881586}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 78, y: -64.94995}
|
||||
m_AnchoredPosition: {x: 84.69, y: -62.45}
|
||||
m_SizeDelta: {x: 156, y: 125.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1918779213822170914
|
||||
|
|
@ -5289,16 +5354,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2639502772477440026}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 1918779212295282661}
|
||||
m_Father: {fileID: 4432934858545881586}
|
||||
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: -248.69995, y: 41.399933}
|
||||
m_AnchoredPosition: {x: -234.5, y: 57.05}
|
||||
m_SizeDelta: {x: 135, y: 100}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &462056855713613971
|
||||
|
|
@ -5387,12 +5452,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
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: -77, y: -30.345}
|
||||
m_AnchoredPosition: {x: -77, y: -30.34497}
|
||||
m_SizeDelta: {x: 565.5, y: 137.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1917475996570622930
|
||||
|
|
@ -5788,12 +5853,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2256917480139661916}
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 15.700012, y: -45.600067}
|
||||
m_AnchoredPosition: {x: 15.699707, y: -45.600098}
|
||||
m_SizeDelta: {x: 558, y: 44}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4545410394449060312
|
||||
|
|
@ -6182,7 +6247,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 4749439105399814342}
|
||||
- {fileID: 4427517356705230493}
|
||||
m_Father: {fileID: 7081655482757342369}
|
||||
m_Father: {fileID: 993731393297786437}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
|
@ -6545,12 +6610,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
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: -67.5, y: -31.399994}
|
||||
m_AnchoredPosition: {x: -67.49997, y: -31.399994}
|
||||
m_SizeDelta: {x: 565.5, y: 137.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4262336696161190878
|
||||
|
|
@ -6619,7 +6684,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -6702,7 +6767,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 3617902804248935102}
|
||||
- {fileID: 4078091677790062429}
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
|
|
@ -7383,12 +7448,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -135.70001, y: -1.7999873}
|
||||
m_AnchoredPosition: {x: -135.69995, y: -1.7999878}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4265660881893781513
|
||||
|
|
@ -8012,7 +8077,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7081655482757342369}
|
||||
m_Father: {fileID: 993731393297786437}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -8137,6 +8202,47 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A3\u59299\u5C0F\u65F6"
|
||||
LanguageIndex: 11708
|
||||
--- !u!1 &5630570085107683964
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4432934858545881586}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4432934858545881586
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5630570085107683964}
|
||||
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: 1918779213160555210}
|
||||
- {fileID: 927593973145893372}
|
||||
- {fileID: 1918779213822170912}
|
||||
- {fileID: 468007378357944310}
|
||||
- {fileID: 3161722440037881863}
|
||||
- {fileID: 1918779213491360749}
|
||||
m_Father: {fileID: 1918779212295282661}
|
||||
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: 846, y: 127.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5678061619903236431
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8166,12 +8272,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
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: 3.1125, y: 0.000030517578}
|
||||
m_AnchoredPosition: {x: 3.112561, y: 0.000030517578}
|
||||
m_SizeDelta: {x: 835.78, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3281865241834822005
|
||||
|
|
@ -8314,7 +8420,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7081655482757342369}
|
||||
m_Father: {fileID: 993731393297786437}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -8876,12 +8982,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
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.50097, y: 0.000030517578}
|
||||
m_AnchoredPosition: {x: -0.50097656, y: 0}
|
||||
m_SizeDelta: {x: 843, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9083293114866439135
|
||||
|
|
@ -9618,12 +9724,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1918779212295282661}
|
||||
m_Father: {fileID: 4432934858545881586}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 19.806, y: 0.000045776367}
|
||||
m_AnchoredPosition: {x: 1374.606, y: 23.050095}
|
||||
m_SizeDelta: {x: 808.714, y: 5}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &8002259910232126921
|
||||
|
|
@ -9689,16 +9795,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7256571258521888686}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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: 1918779212295282661}
|
||||
m_Father: {fileID: 4432934858545881586}
|
||||
m_RootOrder: 4
|
||||
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: 28.300049, y: 41.399933}
|
||||
m_AnchoredPosition: {x: 11.2, y: 57.05}
|
||||
m_SizeDelta: {x: 135, y: 100}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &327137578093138444
|
||||
|
|
@ -9767,6 +9873,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7081655482757342369}
|
||||
- component: {fileID: 1730709198781680954}
|
||||
m_Layer: 5
|
||||
m_Name: rewardPre
|
||||
m_TagString: Untagged
|
||||
|
|
@ -9785,11 +9892,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4238141339658570511}
|
||||
- {fileID: 1583377035289623720}
|
||||
- {fileID: 1377542536350534115}
|
||||
- {fileID: 7235002840401175143}
|
||||
- {fileID: 5927569354025994995}
|
||||
- {fileID: 993731393297786437}
|
||||
m_Father: {fileID: 956434821998691110}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -9798,6 +9901,35 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -1482.8, y: 181}
|
||||
m_SizeDelta: {x: 836.4, y: 142.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1730709198781680954
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7525919003205098400}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 993731393297786437}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &7661479520637418107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9807,13 +9939,14 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8916335988161755956}
|
||||
- component: {fileID: 8735531852488705892}
|
||||
m_Layer: 5
|
||||
m_Name: rewardPre
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8916335988161755956
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9825,21 +9958,44 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 5108555561980432324}
|
||||
- {fileID: 1826624492284208546}
|
||||
- {fileID: 6116840903932864969}
|
||||
- {fileID: 5701770522702771699}
|
||||
- {fileID: 1387418776256987101}
|
||||
- {fileID: 167398710455642014}
|
||||
- {fileID: 764550268028986825}
|
||||
- {fileID: 8346032574987793366}
|
||||
m_Father: {fileID: 3766131170455723064}
|
||||
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: -1939, y: 502}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 844, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8735531852488705892
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7661479520637418107}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 8346032574987793366}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &7680065280917945604
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10025,7 +10181,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 291.99997, y: -42}
|
||||
m_SizeDelta: {x: 318.565, y: 39.2}
|
||||
m_SizeDelta: {x: 325, y: 39.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7701535949295788202
|
||||
CanvasRenderer:
|
||||
|
|
@ -10171,6 +10327,48 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &7861869261474332378
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8346032574987793366}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8346032574987793366
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7861869261474332378}
|
||||
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: 5108555561980432324}
|
||||
- {fileID: 1826624492284208546}
|
||||
- {fileID: 6116840903932864969}
|
||||
- {fileID: 5701770522702771699}
|
||||
- {fileID: 1387418776256987101}
|
||||
- {fileID: 167398710455642014}
|
||||
- {fileID: 764550268028986825}
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
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: 844, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7933146419732503759
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10180,6 +10378,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2143589712445288076}
|
||||
- component: {fileID: 46216545580364385}
|
||||
m_Layer: 5
|
||||
m_Name: rewardPre
|
||||
m_TagString: Untagged
|
||||
|
|
@ -10198,13 +10397,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3975253686637887598}
|
||||
- {fileID: 6817648272337116398}
|
||||
- {fileID: 553958844504537425}
|
||||
- {fileID: 143539821124465396}
|
||||
- {fileID: 2711499078900022554}
|
||||
- {fileID: 1060898114474175826}
|
||||
- {fileID: 234640684961686008}
|
||||
- {fileID: 6506801113587302739}
|
||||
m_Father: {fileID: 5972105892328137991}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -10213,6 +10406,35 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -6.7749977, y: 139}
|
||||
m_SizeDelta: {x: 829.55, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &46216545580364385
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7933146419732503759}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 6506801113587302739}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &8000028089806339627
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10359,6 +10581,48 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8309808952089769363
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6506801113587302739}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6506801113587302739
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8309808952089769363}
|
||||
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: 3975253686637887598}
|
||||
- {fileID: 6817648272337116398}
|
||||
- {fileID: 553958844504537425}
|
||||
- {fileID: 143539821124465396}
|
||||
- {fileID: 2711499078900022554}
|
||||
- {fileID: 1060898114474175826}
|
||||
- {fileID: 234640684961686008}
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
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: 829.55, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8569537614482094977
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -11335,12 +11599,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7879523280515069667}
|
||||
m_Father: {fileID: 2143589712445288076}
|
||||
m_Father: {fileID: 6506801113587302739}
|
||||
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: -121, y: 66.39993}
|
||||
m_AnchoredPosition: {x: -120.99997, y: 66.39993}
|
||||
m_SizeDelta: {x: 558, y: 44}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2879753673189092438
|
||||
|
|
@ -11413,12 +11677,12 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6811996851877337003}
|
||||
- {fileID: 5048072846128891372}
|
||||
m_Father: {fileID: 8916335988161755956}
|
||||
m_Father: {fileID: 8346032574987793366}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -135.70001, y: -1.0999985}
|
||||
m_AnchoredPosition: {x: -135.69995, y: -1.0999756}
|
||||
m_SizeDelta: {x: 210.65002, y: 77.61}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2225116492002713069
|
||||
|
|
|
|||
|
|
@ -78,4 +78,20 @@ SoundConfig = {
|
|||
Ambient_Carbon = "Amb_02",
|
||||
Ambient_Login = "Amb_03",
|
||||
Sound_UnlockLevel ="UI_UnlockLevel_01",
|
||||
Sound_schl ="UI_schl",
|
||||
Sound_schl_loop ="UI_schl_loop",
|
||||
Sound_tsjl ="UI_tsjl",
|
||||
Sound_tsjl_loop ="UI_tsjl_loop",
|
||||
Sound_mrhl ="UI_mrhl",
|
||||
Sound_syz ="UI_syz",
|
||||
Sound_syz_loop ="UI_syz_loop",
|
||||
Sound_lhj ="UI_lhj",--福星高照
|
||||
Sound_xytb ="UI_xytb",--探宝
|
||||
Sound_hcs ="UI_hcs",
|
||||
Sound_zd ="UI_zd",
|
||||
Sound_zp ="UI_zp",-- 森罗幻境转盘
|
||||
Sound_xyc ="UI_xyc",-- 森罗幻境进入下一层
|
||||
Sound_tgxb_pq ="UI_tgxb_pq",
|
||||
Sound_dntg_qj ="UI_dntg_qj",
|
||||
Sound_dntg_cy ="UI_dntg_cy",
|
||||
}
|
||||
|
|
@ -0,0 +1,889 @@
|
|||
AllActivityManager = {};
|
||||
local this = AllActivityManager
|
||||
local ActivityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
||||
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
local giftData = {}
|
||||
function this.Initialize()
|
||||
end
|
||||
|
||||
-- 获取服务器活动领取进度数据
|
||||
function this.InitActivityServerData(msg, isUpdate)
|
||||
if not isUpdate then
|
||||
this.mission = {}
|
||||
end
|
||||
for i, v in ipairs(msg.activityInfo) do
|
||||
|
||||
this.CheckMoneyProgress(v)
|
||||
this.mission[v.activityId] = v
|
||||
LogRed("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
end
|
||||
end
|
||||
|
||||
function this.RefreshActivityData(respond)
|
||||
--closed
|
||||
if respond.closeActivityId then
|
||||
for i = 1, #respond.closeActivityId do
|
||||
if this.mission[respond.closeActivityId[i]] then
|
||||
LogRed(Language[10003] .. respond.closeActivityId[i])
|
||||
this.mission[respond.closeActivityId[i]] = nil
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, {
|
||||
type = activityType,
|
||||
status = 0 --关闭
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
--newOpen
|
||||
if respond.activityInfo then
|
||||
for i = 1, #respond.activityInfo do
|
||||
LogRed(Language[10004] .. respond.activityInfo[i].activityId)
|
||||
this.mission[respond.activityInfo[i].activityId] = respond.activityInfo[i]
|
||||
local activityType = this.GetActivityTypeFromId(respond.activityInfo[i].activityId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, {
|
||||
type = this.GetActivityTypeFromId(respond.activityInfo[i].activityId),
|
||||
status = 1 --开启
|
||||
})
|
||||
end
|
||||
end
|
||||
this.InitActivityServerData(respond, true)
|
||||
this.RefreshActivityRedPoint()
|
||||
end
|
||||
|
||||
--刷新某个活动的数据进度
|
||||
function this.RefreshActivityProgressData(msg)
|
||||
-- 检测
|
||||
this.CheckMoneyProgress(msg.activityInfo)
|
||||
LogRed("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value)
|
||||
if this.mission[msg.activityInfo.activityId] then
|
||||
this.mission[msg.activityInfo.activityId].value = msg.activityInfo.value
|
||||
for i = 1, #msg.activityInfo.mission do
|
||||
for _, missionInfo in pairs(this.mission[msg.activityInfo.activityId].mission) do
|
||||
if missionInfo.missionId == msg.activityInfo.mission[i].missionId then
|
||||
missionInfo.state = msg.activityInfo.mission[i].state
|
||||
missionInfo.progress = msg.activityInfo.mission[i].progress
|
||||
LogRed(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress)
|
||||
end
|
||||
end
|
||||
end
|
||||
this.RefreshActivityRedPoint()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityProgressStateChange)
|
||||
--断线重连时 在线奖励活动 数据刷新
|
||||
this.CutUpLineUpdateOnLineData(msg)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--断线重连时 在线奖励活动 数据刷新
|
||||
function this.CutUpLineUpdateOnLineData(msg)
|
||||
if (msg.activityInfo.activityId == ActivityTypeDef.OnlineGift) then
|
||||
for i = 1, #msg.activityInfo.mission do
|
||||
this.onlineOpen = true
|
||||
this.onlineGetRewardState[ msg.activityInfo.mission[i].missionId] = msg.activityInfo.mission[i].state
|
||||
this.haveOnlineTime = msg.activityInfo.mission[i].progress
|
||||
this.onlineTime= msg.activityInfo.mission[i].progress
|
||||
this.cuOnLineTimestamp = GetTimeStamp() - msg.activityInfo.mission[i].progress
|
||||
LogRed("------------------------------------后端刷新在线时长3 "..msg.activityInfo.mission[i].progress.." "..TimeToHMS(msg.activityInfo.mission[i].progress))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--五点凌晨刷新
|
||||
function this.FiveAMRefreshActivityProgress(msg)
|
||||
LogRed("5AM刷新活动数据")
|
||||
for i = 1, #msg.activityInfo do
|
||||
if not this.mission[msg.activityInfo[i].activityId] then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, {
|
||||
type = this.GetActivityTypeFromId(msg.activityInfo[i].activityId),
|
||||
status = 1 --开启
|
||||
})
|
||||
end
|
||||
-- 检测活动钱数
|
||||
this.CheckMoneyProgress(msg.activityInfo[i])
|
||||
this.mission[msg.activityInfo[i].activityId] = msg.activityInfo[i]
|
||||
LogRed("刷新活动数据activityId:" .. msg.activityInfo[i].activityId .. "value:" .. msg.activityInfo[i].value)
|
||||
end
|
||||
this.RefreshActivityRedPoint()
|
||||
end
|
||||
|
||||
-- 检测进度
|
||||
function this.CheckMoneyProgress(v)
|
||||
if v.activityId == ActivityTypeDef.FirstRecharge
|
||||
or v.activityId == ActivityTypeDef.LuckyCat
|
||||
or v.activityId == ActivityTypeDef.DailyRecharge
|
||||
-- or v.activityId == ActivityTypeDef.ContinuityRecharge
|
||||
or v.activityId == ActivityTypeDef.AccumulativeRechargeExper
|
||||
or v.activityId == ActivityTypeDef.DynamicAct_recharge
|
||||
or v.activityId == ActivityTypeDef.FindFairyCeremony then
|
||||
|
||||
for n, m in ipairs(v.mission) do
|
||||
m.progress = m.progress / 1000
|
||||
end
|
||||
v.value = v.value / 1000
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function this.RefreshActivityRedPoint()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionDailyChanged)
|
||||
CheckRedPointStatus(RedPointType.FirstRecharge)
|
||||
CheckRedPointStatus(RedPointType.ContinuityRecharge)
|
||||
CheckRedPointStatus(RedPointType.SevenDayCarnival)
|
||||
--限时活动
|
||||
CheckRedPointStatus(RedPointType.Expert_AdventureExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_AreaExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_UpStarExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_EquipExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_GoldExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_FightExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_EnergyExper)
|
||||
CheckRedPointStatus(RedPointType.Expert_Talisman)
|
||||
CheckRedPointStatus(RedPointType.Expert_SoulPrint)
|
||||
CheckRedPointStatus(RedPointType.Expert_AccumulativeRecharge)
|
||||
CheckRedPointStatus(RedPointType.CourtesyDress_SevenDay)
|
||||
CheckRedPointStatus(RedPointType.LuckyCat_GetReward)
|
||||
CheckRedPointStatus(RedPointType.Expert_LuckyTurn)
|
||||
CheckRedPointStatus(RedPointType.Expert_FindTreasure)
|
||||
CheckRedPointStatus(RedPointType.Expert_Recruit)
|
||||
CheckRedPointStatus(RedPointType.Expert_SecretBox)
|
||||
--战力排行
|
||||
CheckRedPointStatus(RedPointType.WarPowerSort_Sort)
|
||||
--东海寻仙
|
||||
CheckRedPointStatus(RedPointType.FindFairy_OneView)
|
||||
CheckRedPointStatus(RedPointType.FindFairy_ThreeView)
|
||||
CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
end
|
||||
|
||||
|
||||
--通过活动类型获取活动数据
|
||||
function this.GetActivityTypeInfo(type)
|
||||
local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type)
|
||||
local missionData = nil
|
||||
table.walk(globalActConfigs, function(actConfigInfo)
|
||||
if this.mission[actConfigInfo.Id] then
|
||||
missionData = this.mission[actConfigInfo.Id]
|
||||
end
|
||||
end)
|
||||
return missionData
|
||||
end
|
||||
|
||||
--通过活动类型获取活动id
|
||||
function this.GetActivityIdByType(type)
|
||||
local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type)
|
||||
local id = 0
|
||||
local missionData = nil
|
||||
table.walk(globalActConfigs, function(actConfigInfo)
|
||||
if this.mission[actConfigInfo.Id] then
|
||||
--LogError("actConfigInfo.Id "..actConfigInfo.Id)
|
||||
id = actConfigInfo.Id
|
||||
end
|
||||
end)
|
||||
return id
|
||||
end
|
||||
|
||||
function this.GetActivityValueInfo(type, Id)
|
||||
if this.mission[type] then
|
||||
-- LogBlue("this.mission[type].value:"..this.mission[type].value)
|
||||
return this.mission[type].value
|
||||
end
|
||||
end
|
||||
function this.GetActivityInfo(type, Id)
|
||||
if this.mission[type] then
|
||||
for _, missInfo in pairs(this.mission[type].mission) do
|
||||
if missInfo.missionId == Id then
|
||||
return missInfo
|
||||
end
|
||||
end
|
||||
else
|
||||
Log(string.format(Language[10001], type, Id))
|
||||
return nil,0
|
||||
end
|
||||
end
|
||||
|
||||
function this.GetActivityInfoByType(type)
|
||||
if this.mission[type] then
|
||||
return this.mission[type]
|
||||
end
|
||||
end
|
||||
function this.SetActivityInfo(type, Id, state)
|
||||
for _, missInfo in pairs(this.mission[type].mission) do
|
||||
if missInfo.missionId == Id then
|
||||
missInfo.state = state
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this.GetActivityOpenStatus(type)
|
||||
local id = this.GetActivityIdByType(type)
|
||||
if this.mission[id] then
|
||||
return this.mission[id].reallyOpen == 1
|
||||
else
|
||||
Log(string.format(Language[10002], type))
|
||||
return false
|
||||
end
|
||||
end
|
||||
function this.SetActivityOpenStatus(type)
|
||||
if this.mission[type] then
|
||||
this.mission[type].reallyOpen = 1
|
||||
else
|
||||
Log(string.format(Language[10002], type))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--获取活动结束时间
|
||||
function this.GetTaskEndTime(activityType)
|
||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(activityType)
|
||||
local endTime = 0
|
||||
if activityInfo then
|
||||
endTime = activityInfo.endTime
|
||||
end
|
||||
return endTime
|
||||
end
|
||||
|
||||
--获取活动开始时间
|
||||
function this.GetTaskStartTime(activityType)
|
||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(activityType)
|
||||
|
||||
local startTime = 0
|
||||
if activityInfo then
|
||||
startTime = activityInfo.startTime
|
||||
end
|
||||
return startTime
|
||||
end
|
||||
------------------------------------------------
|
||||
------------------------------------------------
|
||||
------------------------------------------------
|
||||
|
||||
|
||||
function this.GetActivityRewardRequest(type, index)
|
||||
--local rewardId=0
|
||||
--向服务器发送领取在线奖励请求
|
||||
NetManager.GetActivityRewardRequest(index, type, function(_drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1)
|
||||
if (type == ActivityTypeDef.OnlineGift) then
|
||||
this.onlineGetRewardState[index] = 1
|
||||
CheckRedPointStatus(RedPointType.CourtesyDress_Online)
|
||||
table.sort(this.onlineData, function(a, b)
|
||||
return a.Id < b.Id
|
||||
end)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.GetRewardRefresh, this.onlineData)
|
||||
elseif (type == ActivityTypeDef.EightDayGift) then
|
||||
this.sevenDayGetRewardState[index] = 1
|
||||
CheckRedPointStatus(RedPointType.CourtesyDress_SevenDay)
|
||||
table.sort(this.sevenDayData, function(a, b)
|
||||
if this.sevenDayGetRewardState[a.Id] == this.sevenDayGetRewardState[b.Id] then
|
||||
return a.Id < b.Id
|
||||
else
|
||||
return this.sevenDayGetRewardState[a.Id] < this.sevenDayGetRewardState[b.Id]
|
||||
end
|
||||
end)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.GetRewardRefresh, this.sevenDayData)
|
||||
elseif (type == ActivityTypeDef.ChapterAward) then
|
||||
this.chapterGetRewardState[index] = 1
|
||||
CheckRedPointStatus(RedPointType.CourtesyDress_Chapter)
|
||||
table.sort(this.chapterGiftData, function(a, b)
|
||||
if this.chapterGetRewardState[a.Id] == this.chapterGetRewardState[b.Id] then
|
||||
return a.Id < b.Id
|
||||
else
|
||||
return this.chapterGetRewardState[a.Id] < this.chapterGetRewardState[b.Id]
|
||||
end
|
||||
end)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.GetRewardRefresh, this.chapterGiftData)
|
||||
end
|
||||
--CheckRedPointStatus(RedPointType.SecretTer)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Adventure.OnRefreshRedShow)
|
||||
end)
|
||||
end
|
||||
-- 红点检测监听方法
|
||||
function this.CheckRedFunc(redType)
|
||||
if redType == RedPointType.CourtesyDress_SevenDay then
|
||||
if this.mission[ActivityTypeDef.EightDayGift] then
|
||||
local number = 0
|
||||
for i, v in pairs(this.sevenDayGetRewardState) do
|
||||
if (v == 1) then
|
||||
number = number + 1
|
||||
end
|
||||
end
|
||||
local curDay = math.ceil((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
|
||||
if (number < curDay) then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
else
|
||||
return false
|
||||
end
|
||||
elseif redType == RedPointType.CourtesyDress_Chapter then
|
||||
local isShowRed = false
|
||||
for i = 1, table.nums(this.chapterGetRewardState) do
|
||||
for j, v in pairs(this.chapterGiftData) do
|
||||
if (i == v.Sort) then
|
||||
if FightPointPassManager.GetFightStateById(v.Values[1][1]) == FIGHT_POINT_STATE.PASS and this.chapterGetRewardState[v.Id] == 0 then
|
||||
isShowRed = true
|
||||
return isShowRed
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return isShowRed
|
||||
elseif redType == RedPointType.CourtesyDress_Online then
|
||||
local number = 0
|
||||
for i, v in pairs(this.onlineGetRewardState) do
|
||||
if (v == 1) then
|
||||
number = number + 1
|
||||
end
|
||||
end
|
||||
|
||||
--当活动未开或奖励全部领取完毕
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.Online_Reward)==false then
|
||||
return false
|
||||
else--当活动开启或奖励未领取完毕
|
||||
local timeNum = GetTimeStamp() - this.cuOnLineTimestamp
|
||||
local currentTimeIndex = 0
|
||||
for i = 1, #this.onlineData do
|
||||
if this.onlineGetRewardState[this.onlineData[i].Id] == 0 then
|
||||
if (math.floor(timeNum)) >= (this.onlineData[i].Values[1][1]*60) then
|
||||
currentTimeIndex = this.onlineData[i].Sort
|
||||
end
|
||||
end
|
||||
end
|
||||
--Log("number < this.currentTimeIndex "..number .." "..currentTimeIndex)
|
||||
if (number < currentTimeIndex) then --当已领取数小于未领取数
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function this.GetActivityTypeFromId(activityId)
|
||||
local globalActConfig = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity, "Id", activityId)
|
||||
return globalActConfig.Type
|
||||
end
|
||||
|
||||
function this.IsActivityTypeOpen(type)
|
||||
local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type)
|
||||
local activityId = nil
|
||||
table.walk(globalActConfigs, function(actConfigInfo)
|
||||
if this.mission and this.mission[actConfigInfo.Id] then
|
||||
activityId = actConfigInfo.Id
|
||||
end
|
||||
end)
|
||||
return activityId
|
||||
end
|
||||
|
||||
function this.GetContinuityRechargeRedPoint()
|
||||
local redPoint = false
|
||||
if this.IsActivityTypeOpen(ActivityTypeDef.ContinuityRecharge) then
|
||||
local continuityRechargeList = this.GetActivityTypeInfo(ActivityTypeDef.ContinuityRecharge)
|
||||
for i = 1, #continuityRechargeList.mission do
|
||||
local rechargeInfo = continuityRechargeList.mission[i]
|
||||
redPoint = redPoint or (rechargeInfo.progress == 1 and rechargeInfo.state == 0)
|
||||
end
|
||||
end
|
||||
return redPoint
|
||||
end
|
||||
|
||||
function this.GetGrowthRechargeExist()
|
||||
if this.IsGetAllGrowthReward() or this.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) == nil then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
function this.IsGetAllGrowthReward()
|
||||
local isGetAll = true
|
||||
if this.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) then
|
||||
local activityInfo = this.GetActivityTypeInfo(ActivityTypeDef.GrowthReward)
|
||||
for i = 1, #activityInfo.mission do
|
||||
isGetAll = isGetAll and activityInfo.mission[i].state == 1
|
||||
end
|
||||
end
|
||||
return isGetAll
|
||||
end
|
||||
--检测限时活动红点
|
||||
function this.ExpterActivityIsShowRedPoint(activeIndex)
|
||||
local activeType = 0
|
||||
-- Log("activeIndex "..activeIndex)
|
||||
--注意 红点枚举id %100 就是按钮顺序
|
||||
activeType = numExChange[math.floor(activeIndex % 100)]
|
||||
-- Log("activeType "..activeType)
|
||||
local expertRewardTabs = this.GetActivityTypeInfo(activeType)
|
||||
if expertRewardTabs then
|
||||
for i = 1, #expertRewardTabs.mission do
|
||||
local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId)
|
||||
local value = 0
|
||||
--限时累计活动特殊数值读取处理
|
||||
if activeType == ActivityTypeDef.AccumulativeRechargeExper then
|
||||
value = conFigData.Values[1][1]
|
||||
else
|
||||
value = conFigData.Values[2][1]
|
||||
end
|
||||
if expertRewardTabs.mission[i].state == 0 then
|
||||
if activeType == ActivityTypeDef.UpStarExper or activeType == ActivityTypeDef.Talisman
|
||||
or activeType == ActivityTypeDef.SoulPrint or activeType == ActivityTypeDef.EquipExper
|
||||
or activeType == ActivityTypeDef.FindTreasureExper then
|
||||
--进阶因为每个都不一样 特殊判断
|
||||
if expertRewardTabs.mission[i].progress >= value then
|
||||
--Log("expertRewardTabs.mission[i].progress " .. expertRewardTabs.mission[i].progress)
|
||||
--Log("限时红点 --------------- true")
|
||||
return true
|
||||
end
|
||||
elseif activeType == ActivityTypeDef.UpLvAct then
|
||||
if expertRewardTabs.value >= value and expertRewardTabs.mission[i].progress >= 0 then
|
||||
return true
|
||||
end
|
||||
elseif activeType == ActivityTypeDef.FastExplore then
|
||||
if expertRewardTabs.value >= value then
|
||||
return true
|
||||
end
|
||||
else
|
||||
if expertRewardTabs.value >= value then
|
||||
--Log("限时红点 --------------- true")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--Log("限时红点 --------------- false")
|
||||
return false
|
||||
end
|
||||
--检测升级限时礼包活动红点
|
||||
function this.ExperyUpLvActivityIsShowRedPoint()
|
||||
local activeData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.UpLvAct)
|
||||
if activeData and activeData.mission then
|
||||
for i = 1, #activeData.mission do
|
||||
local curConfigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,activeData.mission[i].missionId)
|
||||
if curConfigData and activeData.mission[i].state == 0 and activeData.value >= curConfigData.Values[2][1] and activeData.mission[i].progress>0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
--检测周卡活动红点
|
||||
function this.WeedCardActivityIsShowRedPoint()
|
||||
local weekCardData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.WeekCard, 12)
|
||||
if weekCardData then
|
||||
--Log("weekCardData.buyTimes "..weekCardData.buyTimes.." "..PatFaceManager.isFirstLog.." "..tostring(this.isOpenWeekCard))
|
||||
if weekCardData.buyTimes <= 0 and PatFaceManager.isFirstLog == 0 and this.isOpenWeekCard == false then
|
||||
--Log("检测周卡活动红点 --------------- true")
|
||||
return true
|
||||
end
|
||||
end
|
||||
--Log("检测周卡活动红点 --------------- false")
|
||||
return false
|
||||
end
|
||||
--检测战力排行活动红点
|
||||
function this.WarPowerSortActivityIsShowRedPoint()
|
||||
local expertRewardTabs = this.GetActivityTypeInfo(ActivityTypeDef.WarPowerReach)
|
||||
if expertRewardTabs then
|
||||
for i = 1, #expertRewardTabs.mission do
|
||||
local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId)
|
||||
local value = conFigData.Values[1][1]
|
||||
if expertRewardTabs.mission[i].state == 0 then
|
||||
if expertRewardTabs.value >= value then
|
||||
--Log("红点红点 ")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
--限时活动里是否有活动开启 > 0 说明有开启的活动
|
||||
function this.GetExpertActiveisOpen()
|
||||
--所有达人
|
||||
for i, v in pairs(numExChange) do
|
||||
local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v)
|
||||
if curActiveData then
|
||||
if curActiveData.endTime - GetTimeStamp() > 0 then
|
||||
return i
|
||||
end
|
||||
end
|
||||
end
|
||||
local LimitExchange = this.GetActivityTypeInfo(ActivityTypeDef.LimitExchange)
|
||||
if LimitExchange then
|
||||
if LimitExchange.endTime - GetTimeStamp() > 0 then
|
||||
return ActivityTypeDef.LimitExchange
|
||||
end
|
||||
end
|
||||
|
||||
local weekCardData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.WeekCard, 12)
|
||||
if weekCardData then
|
||||
if weekCardData.endTime - GetTimeStamp() > 0 then
|
||||
return ExperType.WeekCard
|
||||
end
|
||||
end
|
||||
local patFaceAllData = nil--{ConfigManager.GetConfigData(ConfigName.LoginPosterConfig,1)}--PatFaceManager.GetPatFaceAllDataTabs()
|
||||
if RecruitManager.isTenRecruit == 0 then
|
||||
patFaceAllData = { ConfigManager.GetConfigData(ConfigName.LoginPosterConfig, 1) }
|
||||
end
|
||||
if patFaceAllData and #patFaceAllData > 0 then
|
||||
return ExperType.PatFace
|
||||
end
|
||||
--异妖直购
|
||||
for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.LoginPosterConfig)) do
|
||||
if v.Type == 2 then
|
||||
--异妖直购特殊处理
|
||||
if v.OpenRules[1] == 1 then
|
||||
if PlayerManager.level >= v.OpenRules[2] and PlayerManager.level <= v.CloseRules[2] then
|
||||
local conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, v.ShopId)
|
||||
local shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type, v.ShopId)
|
||||
if shopItemData then
|
||||
return ExperType.DiffMonster
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--幸运探宝
|
||||
--local curActiveData = not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One)
|
||||
--if curActiveData then
|
||||
-- return 6
|
||||
--end
|
||||
--福星高照
|
||||
local curActiveData = not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyCat)
|
||||
if curActiveData then
|
||||
return ExperType.LuckyCat
|
||||
end
|
||||
-- 七日
|
||||
local curActiveData = not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EightDayGift)
|
||||
if curActiveData then
|
||||
return ExperType.SevenDay
|
||||
end
|
||||
--星级成长礼
|
||||
if OperatingManager.IsHeroGiftActive() then
|
||||
return ExperType.StarGrowGift
|
||||
end
|
||||
return 0
|
||||
end
|
||||
--判断七日,在线,章节是否全部领取完了
|
||||
function this.ActivityIsHaveGetFinally(state)
|
||||
local isGetAllReward = true
|
||||
for i, v in pairs(state) do
|
||||
if (v == 0) then
|
||||
isGetAllReward = false
|
||||
end
|
||||
end
|
||||
return isGetAllReward
|
||||
end
|
||||
|
||||
|
||||
-- 获取所有开启的显示活动ID
|
||||
function this.GetExpertActiveisAllOpenIds()
|
||||
local activityIds = {}
|
||||
for i, v in pairs(numExChange) do
|
||||
local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v)
|
||||
if curActiveData then
|
||||
if curActiveData.endTime - GetTimeStamp() > 0 then
|
||||
--Log("开启活动id ======== " .. curActiveData.activityId)
|
||||
table.insert(activityIds,curActiveData.activityId)
|
||||
end
|
||||
end
|
||||
end
|
||||
local LimitExchange = this.GetActivityTypeInfo(ActivityTypeDef.LimitExchange)
|
||||
if LimitExchange then
|
||||
if LimitExchange.endTime - GetTimeStamp() > 0 then
|
||||
table.insert(activityIds,LimitExchange.activityId)
|
||||
end
|
||||
end
|
||||
local patFaceAllData = nil
|
||||
if RecruitManager.isTenRecruit == 0 then
|
||||
patFaceAllData = { ConfigManager.GetConfigData(ConfigName.LoginPosterConfig, 1) }
|
||||
end
|
||||
if patFaceAllData and #patFaceAllData > 0 then
|
||||
table.insert(activityIds,ActivityTypeDef.PatFace)
|
||||
end
|
||||
--幸运探宝
|
||||
local luckyTurnTable_One = 0
|
||||
luckyTurnTable_One = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One)
|
||||
local upper_Two = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_Two)
|
||||
if luckyTurnTable_One then
|
||||
if luckyTurnTable_One > 0 then
|
||||
table.insert(activityIds, luckyTurnTable_One)
|
||||
end
|
||||
end
|
||||
|
||||
if upper_Two then
|
||||
if upper_Two > 0 then
|
||||
table.insert(activityIds, upper_Two)
|
||||
end
|
||||
end
|
||||
|
||||
--福星高照
|
||||
local luckyCat = 0
|
||||
luckyCat = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyCat)
|
||||
if luckyCat then
|
||||
if luckyCat > 0 then
|
||||
table.insert(activityIds, luckyCat)
|
||||
end
|
||||
end
|
||||
-- 七日
|
||||
local sevenDay = 0
|
||||
sevenDay = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.EightDayGift)
|
||||
if sevenDay then
|
||||
if sevenDay > 0 then
|
||||
table.insert(activityIds, sevenDay)
|
||||
end
|
||||
end
|
||||
return activityIds
|
||||
end
|
||||
|
||||
---关卡通关豪礼相关---
|
||||
--根据当前关数 获取最近下一关卡橙色角色
|
||||
function this.GetNextHeroInfo()
|
||||
local allData={}
|
||||
local heroData={}
|
||||
--Log("当前通过关卡"..FightPointPassManager.lastPassFightId)
|
||||
local startIndex=5001
|
||||
local mainLevelEndId=ConfigManager.TryGetConfigDataByKey(ConfigName.MainLevelConfig,"NextLevel",-1).Id--最高关卡
|
||||
local endIndex=this.GetConfigForValues(ConfigName.ActivityRewardConfig,mainLevelEndId).Id
|
||||
|
||||
--活动表处于开始结束索引之间的全部数据
|
||||
for i = startIndex, endIndex do
|
||||
local reward = ConfigManager.TryGetConfigData(ConfigName.ActivityRewardConfig,i)
|
||||
if reward then
|
||||
table.insert(allData, reward)
|
||||
end
|
||||
end
|
||||
|
||||
--输出ActivityRewardConfig里下一关的索引
|
||||
local index
|
||||
for i = 1, #allData do
|
||||
if ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight).SortId-1 < ConfigManager.GetConfigData(ConfigName.MainLevelConfig,allData[i].Values[1][1]).SortId then
|
||||
index= this.GetConfigForValues(ConfigName.ActivityRewardConfig,allData[i].Values[1][1]).Id
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
--剩余数据
|
||||
local residueData={}
|
||||
for i = index, endIndex do
|
||||
local reward = ConfigManager.TryGetConfigData(ConfigName.ActivityRewardConfig,i)
|
||||
if reward then
|
||||
table.insert(residueData, reward)
|
||||
end
|
||||
end
|
||||
|
||||
--剩余数据中将立绘数据存入
|
||||
for i = 1, #residueData do
|
||||
local itemData=ConfigManager.GetConfigData(ConfigName.ItemConfig,residueData[i].Reward[1][1])
|
||||
if itemData.ItemType==1 and (itemData.Quantity==5 or itemData.Quantity==4)then --and allData[i].Reward[1][2]==1
|
||||
table.insert(heroData,residueData[i])
|
||||
end
|
||||
end
|
||||
|
||||
if #heroData>0 then --如果有数据
|
||||
return heroData[1].Reward[1][1],heroData[1].Values[1][1] --返回目标立绘id 关卡id
|
||||
else
|
||||
return #heroData,#heroData--如果没数据 返回0
|
||||
end
|
||||
end
|
||||
|
||||
--根据双重key的value锁定id value为2维数组(目前没有这种接口)
|
||||
function this.GetConfigForValues(configName,pointId)
|
||||
local data={}
|
||||
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(configName)) do
|
||||
if configInfo.ActivityId == 3 and configInfo.Values[1][1] == pointId then
|
||||
data = configInfo
|
||||
break
|
||||
end
|
||||
end
|
||||
return data
|
||||
end
|
||||
---------------------
|
||||
--- 根据活动ID获取表格中相同活动ID第一项的数据
|
||||
function this.GetActivityDataById(id)
|
||||
for k, v in ConfigPairs(ActivityRewardConfig) do
|
||||
if v and v.ActivityId == id then
|
||||
return v
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
---剑影仙踪相关---
|
||||
--获取剑影仙踪任务数据
|
||||
function this.GetTaskData()
|
||||
local taskList={}
|
||||
local taskValue=0
|
||||
|
||||
local data= this.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||
|
||||
if not data then
|
||||
return 0, taskList
|
||||
end
|
||||
|
||||
table.sort(data.mission,function(a,b)
|
||||
return a.missionId<b.missionId
|
||||
end)
|
||||
|
||||
for i = 1, #data.mission do
|
||||
table.insert(taskList,i, data.mission[i].state)
|
||||
if data.mission[i].state >= 1 then
|
||||
taskValue = taskValue + 1
|
||||
end
|
||||
end
|
||||
|
||||
return taskValue,taskList
|
||||
end
|
||||
|
||||
--剑影仙踪红点检测 差一个通关完毕 符合要求的红点检测 点击领取红点未检测
|
||||
function this.CheckSupremeHeroRedPoint()
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then
|
||||
return
|
||||
end
|
||||
local isOpen
|
||||
local num,list= this.GetTaskData()
|
||||
|
||||
local complete=0 --任务是否完成
|
||||
local receive=0 --任务是否领取
|
||||
for i = 1, #list do
|
||||
if list[i]>0 then
|
||||
complete=complete+1
|
||||
end
|
||||
if list[i]==2 then
|
||||
receive=receive+1
|
||||
end
|
||||
end
|
||||
|
||||
if complete<3 then--任务未完成
|
||||
isOpen=PatFaceManager.isFirstLog==0 and not this.isFirstForSupremeHero
|
||||
else
|
||||
isOpen=receive<3
|
||||
end
|
||||
|
||||
return isOpen
|
||||
end
|
||||
|
||||
|
||||
--获取活动剩余时间
|
||||
function this.GetTaskRemainTime(activityType)
|
||||
local remainTime = 0
|
||||
remainTime =this.GetTaskEndTime(activityType)- this.GetTaskEndTime(activityType)
|
||||
return remainTime
|
||||
end
|
||||
|
||||
function this.GetRewardState()
|
||||
local taskValue,missionData= this.GetTaskData()
|
||||
local doneNum = 0
|
||||
for i = 1, 3 do
|
||||
if missionData[i] == 2 then
|
||||
doneNum = doneNum + 1
|
||||
end
|
||||
end
|
||||
local state = doneNum == 3 and 3 or 2
|
||||
return state
|
||||
end
|
||||
|
||||
----------------
|
||||
-- 获取下一个每日奖励的时间
|
||||
function this.GetNextOnlineRewardData()
|
||||
for _, data in ipairs(this.onlineData) do
|
||||
local state = this.onlineGetRewardState[data.Id]
|
||||
if state ~= 1 then -- 如果不是已完成状态则返回数据
|
||||
if state == 0 then
|
||||
local curOnlineTime = GetTimeStamp() - ActivityGiftManager.cuOnLineTimestamp
|
||||
local needTime = data.Values[1][1]*60
|
||||
if curOnlineTime < needTime then
|
||||
state = -1
|
||||
end
|
||||
end
|
||||
return data, state
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--达人获取id
|
||||
function this.GetOpenExpertIdByActivityType(activityType)
|
||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(activityType)
|
||||
if activityInfo then
|
||||
return activityInfo.activityId
|
||||
end
|
||||
return 0
|
||||
end
|
||||
|
||||
--------------------------------------------
|
||||
--主动刷新 置本地数据
|
||||
function this.RefreshAcitvityData(acitvityIds,fun)
|
||||
NetManager.RefreshAcitvityData(acitvityIds,function (msg)
|
||||
for i = 1, #msg.activityInfo do
|
||||
if this.mission[msg.activityInfo[i].activityId] then
|
||||
this.mission[msg.activityInfo[i].activityId].value = msg.activityInfo[i].value
|
||||
for j = 1, #msg.activityInfo[i].mission do
|
||||
for _, missionInfo in pairs(this.mission[msg.activityInfo[i].activityId].mission) do
|
||||
if missionInfo.missionId == msg.activityInfo[i].mission[j].missionId then
|
||||
missionInfo.state = msg.activityInfo[i].mission[j].state
|
||||
missionInfo.progress = msg.activityInfo[i].mission[j].progress
|
||||
--LogError("msg.activityInfo[i].mission[j] "..msg.activityInfo[i].mission[j].missionId.." "..msg.activityInfo[i].mission[j].progress)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
if fun then fun() end
|
||||
CheckRedPointStatus(RedPointType.Expert_UpLv)
|
||||
end)
|
||||
end
|
||||
|
||||
--获取活动已开启的时间
|
||||
function this.GetCurrentDayNumber(type)
|
||||
local DayActInfo = ActivityGiftManager.GetActivityTypeInfo(type)
|
||||
local startTime = DayActInfo.startTime
|
||||
local needDayNumber = math.ceil((GetTimeStamp() - startTime) / 86400)
|
||||
return needDayNumber
|
||||
end
|
||||
|
||||
--章节检测距离下次领奖还有几关
|
||||
function this.GetRewardNeedLevel()
|
||||
for i = 1, table.nums(this.chapterGetRewardState) do
|
||||
for j, v in pairs(this.chapterGiftData) do
|
||||
if (i == v.Sort) then
|
||||
if FightPointPassManager.GetFightStateById(v.Values[1][1]) ~= FIGHT_POINT_STATE.PASS and this.chapterGetRewardState[v.Id] == 0 then
|
||||
return this.mainLevelConfig[v.Values[1][1]].SortId - this.mainLevelConfig[FightPointPassManager.curOpenFight].SortId + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return 0
|
||||
end
|
||||
--开服福利排序
|
||||
local OpenSeverWelfareSortTable = {
|
||||
[0] = 1,
|
||||
[1] = 0,
|
||||
}
|
||||
function this. OpenSeverWelfareRewardTabsSort(missions)
|
||||
table.sort(missions,function(a,b)
|
||||
if a.state == b.state then
|
||||
return a.missionId < b.missionId
|
||||
else
|
||||
return OpenSeverWelfareSortTable[a.state] > OpenSeverWelfareSortTable[b.state]
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
function this.GetTimeStartToEnd(type)
|
||||
local info= ActivityGiftManager.GetActivityTypeInfo(type)
|
||||
local startTime= this.GetTimeShow(info.startTime)
|
||||
local endtime= this.GetTimeShow(info.endTime)
|
||||
return startTime.."~"..endtime
|
||||
end
|
||||
|
||||
---时间格式化接口
|
||||
function this.GetTimeShow(data)
|
||||
local year = math.floor(os.date("%Y", data))
|
||||
local month = math.floor(os.date("%m", data))
|
||||
local day = math.floor(os.date("%d", data))
|
||||
local time = year .. "-" .. month .. "-" .. day
|
||||
return time
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e8da346c6a03e8942bad3261076b5575
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -39,6 +39,10 @@ local tabs = {
|
|||
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
|
||||
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop
|
||||
},
|
||||
[9] = { --限时兑换
|
||||
default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu",
|
||||
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange
|
||||
},
|
||||
}
|
||||
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
||||
[1] = 1,
|
||||
|
|
@ -49,6 +53,7 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
|||
[6] = 4,
|
||||
[7] = 5,
|
||||
[8] = 6,
|
||||
[9] = 7,
|
||||
}
|
||||
|
||||
local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall")
|
||||
|
|
@ -57,6 +62,7 @@ local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage")
|
|||
local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage")
|
||||
local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage")
|
||||
local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi")
|
||||
local XianShiDuiHuan=require("Modules/Expert/ExChange")
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function DynamicActivityPanel:InitComponent()
|
||||
|
|
@ -72,6 +78,7 @@ function DynamicActivityPanel:InitComponent()
|
|||
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
|
||||
[5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
|
||||
[6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
|
||||
[7] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")),
|
||||
}
|
||||
|
||||
-- 上部货币显示
|
||||
|
|
@ -142,9 +149,14 @@ function this.PageTabAdapter(tab, index, status)
|
|||
else
|
||||
tab.gameObject:SetActive(true)
|
||||
end
|
||||
|
||||
--限时兑换特殊处理
|
||||
if GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then
|
||||
tab.gameObject:SetActive(GlobalActConfig[id].ShowArt ~= 1)
|
||||
end
|
||||
else
|
||||
tab.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- tab可用性检测
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ local activityType = {
|
|||
},
|
||||
--叱咤风云 限时召唤
|
||||
[4303] = {
|
||||
bg = "Bg3",
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"},
|
||||
[2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"},
|
||||
|
|
|
|||
|
|
@ -121,10 +121,11 @@ function ExpeditionMainPanel:BindEvent()
|
|||
ExpeditionManager.expeditionLeve = shotTiemeLevel[1]
|
||||
self:RefreshManagerData()
|
||||
end
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.UI_dntg_cy)
|
||||
--LogGreen("ExpeditionManager.expeditionLeve "..ExpeditionManager.expeditionLeve)
|
||||
end)
|
||||
Util.AddClick(self.UI_Effect_ChuanSongMen_JinSeBtn, function()
|
||||
--LogGreen("UI_Effect_ChuanSongMen_JinSeBtn "..#shotTiemeLevel)
|
||||
if #shotTiemeLevel > 1 then
|
||||
MsgPanel.ShowTwo(Language[10497], function()
|
||||
end, function()
|
||||
|
|
@ -135,6 +136,8 @@ function ExpeditionMainPanel:BindEvent()
|
|||
ExpeditionManager.expeditionLeve = shotTiemeLevel[1]
|
||||
self:RefreshManagerData()
|
||||
end
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_dntg_cy)
|
||||
--LogGreen("ExpeditionManager.expeditionLeve "..ExpeditionManager.expeditionLeve)
|
||||
end)
|
||||
BindRedPointObject(RedPointType.Expedition_Treasure, self.redPoint)
|
||||
|
|
@ -655,7 +658,9 @@ function ExpeditionMainPanel:PlayerMoveFun()
|
|||
--self.mask:SetActive(isPlayerMove)
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "move2", true)
|
||||
local timeNum = math.abs(oldPos.y - targetPos.y)/350--350/1s
|
||||
--玩家行走
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_dntg_qj)
|
||||
--玩家行走
|
||||
self.liveNode.transform:DOLocalMove(targetPos, timeNum, false):OnStart(function ()
|
||||
end):OnComplete(function ()
|
||||
--Log("行走完毕")
|
||||
|
|
|
|||
|
|
@ -148,6 +148,14 @@ 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 = {}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ local GiftBuy = require("Modules/Expert/GiftBuy") --限时抢购
|
|||
|
||||
local diffMonsterBuyData = {}--异妖直购数据
|
||||
local rechargeCommodityConfig
|
||||
local GlobalActivityConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
|
||||
|
||||
local cursortingOrder
|
||||
|
|
@ -584,8 +585,12 @@ function ExpertPanel:SetOpenActiveBtn()
|
|||
end
|
||||
end
|
||||
--限时兑换
|
||||
local num = 1
|
||||
local LimitExchange = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LimitExchange)
|
||||
if LimitExchange then
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange) then
|
||||
num = GlobalActivityConfig[ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange)].ShowArt
|
||||
end
|
||||
if LimitExchange and num == 1 then
|
||||
if LimitExchange.endTime - GetTimeStamp() <= 0 then
|
||||
tabBtns[ExperType.ExChange]:SetActive(false)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ function FindTreasureDispatchPanel:BindEvent()
|
|||
--Log("curSelectHeroIdsTab "..curSelectHeroIdsTab[i])
|
||||
--end
|
||||
NetManager.FindTreasureMissingRoomSendHeroRequest(missionData.missionId,curSelectHeroIdsTab,function()
|
||||
SoundManager.PlaySound(SoundConfig.Sound_tgxb_pq)
|
||||
TaskManager.RefreshFindTreasureHerosData(missionData.missionId,curSelectHeroIdsTab,conFigData.WasteTime)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.FindTreasure.RefreshFindTreasure,false)
|
||||
self:ClosePanel()
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ end
|
|||
function FirstRechargePanel:BindEvent()
|
||||
Util.AddClick(self.closeBtn, function()
|
||||
self:ClosePanel()
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
end)
|
||||
Util.AddClick(self.reChargeBtn, function()
|
||||
self:OnRechargeBtnClicked()
|
||||
|
|
@ -107,6 +108,9 @@ function FirstRechargePanel:OnSortingOrderChange()
|
|||
end
|
||||
local fun = nil
|
||||
function FirstRechargePanel:OnOpen(context,_fun)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_schl)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_schl_loop)
|
||||
context = context and context or {}
|
||||
self.selectTabIndex = context.tabIndex and context.tabIndex or 1
|
||||
-- self:SetOncePart()
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@ function LuckyCat:BindEvent()
|
|||
UIManager.OpenPanel(UIName.MainRechargePanel, 1)
|
||||
else
|
||||
if (haveItemNum >= costItemNum) then
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_lhj)
|
||||
LuckyCatManager.GetLuckyCatRequest()
|
||||
else
|
||||
--PopupTipPanel.ShowTip("道具不足")
|
||||
|
|
|
|||
|
|
@ -546,6 +546,8 @@ function this.TurnEffectReset(turnSpeed,isStop,pos,func)
|
|||
end
|
||||
end
|
||||
end
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_xytb)
|
||||
this.itemEffectIcon[curTurnPos]:SetActive(true)
|
||||
curTurnPos=curTurnPos+1
|
||||
end,turnSpeed,-1,true)
|
||||
|
|
|
|||
|
|
@ -503,6 +503,8 @@ function this.OnMapOut(outType)
|
|||
-- this.BackToCarbonPanel()
|
||||
-- MapManager.Mapping = false
|
||||
else --换层或者换地图
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_xyc)
|
||||
this.ChangeMapByType()
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ end
|
|||
function this.Show()
|
||||
this.root:SetActive(true)
|
||||
Util.AddOnceClick(this.startDrawBtn,function()
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_lhj)
|
||||
this.startDrawBtn:GetComponent("Button").interactable = false
|
||||
this.OnRefreshItemNumShow(this.gameId)
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -113,6 +113,8 @@ function this.tableTurnEffect(speed,itemId)
|
|||
end
|
||||
local redNext = Util.GetGameObject(this.itemsList[index+1],"Red")
|
||||
redNext:SetActive(true)
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_zd)
|
||||
index = index + 1
|
||||
--检测最后的奖励
|
||||
if itemId and id == this.TrialGameConfig[this.list[index]].RewardID and num == this.TrialGameConfig[this.list[index]].Max then
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ local itemList = {}
|
|||
local curAllData = {}
|
||||
local achievementConfig = ConfigManager.GetConfig(ConfigName.AchievementConfig)
|
||||
local itemGrid = {}
|
||||
local isPlayAnim = true
|
||||
function this:InitComponent(gameObject)
|
||||
this.rewardPre = Util.GetGameObject(gameObject, "rewardPre")
|
||||
local v = Util.GetGameObject(gameObject, "rect"):GetComponent("RectTransform").rect
|
||||
|
|
@ -29,6 +30,7 @@ function this:RemoveListener()
|
|||
end
|
||||
|
||||
function this:OnShow(_parent,...)
|
||||
isPlayAnim = true
|
||||
parent=_parent
|
||||
sortingOrder = _parent.sortingOrder
|
||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||
|
|
@ -55,11 +57,20 @@ function this.OnShowPanelData()
|
|||
this.ScrollView:SetData(AllData, function (index, go)
|
||||
this.SingleDataShow(go, AllData[index])
|
||||
end)
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(this.ScrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
end
|
||||
|
||||
function this.SingleDataShow(go,rewardData)
|
||||
local activityRewardGo = go
|
||||
activityRewardGo:SetActive(true)
|
||||
if isPlayAnim then
|
||||
activityRewardGo:SetActive(false)
|
||||
else
|
||||
activityRewardGo:SetActive(true)
|
||||
end
|
||||
|
||||
local sConFigData = achievementConfig[rewardData.missionId]
|
||||
local titleText = Util.GetGameObject(activityRewardGo, "titleImage/titleText"):GetComponent("Text")
|
||||
titleText.text = sConFigData.ContentsShow
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ local allMissionDailyPres = {}
|
|||
local allMissionDailyItemPres = {}
|
||||
local allMissionDailyBoxItemPres = {}
|
||||
local myGo
|
||||
local isPlayAnim = true
|
||||
function this:InitComponent(gameObject)
|
||||
myGo = gameObject
|
||||
this.rectMask=Util.GetGameObject(gameObject,"rect"):GetComponent("Image")
|
||||
|
|
@ -69,6 +70,7 @@ function this:RemoveListener()
|
|||
end
|
||||
|
||||
function this:OnShow(_parent,...)
|
||||
isPlayAnim = true
|
||||
parent=_parent
|
||||
sortingOrder = _parent.sortingOrder
|
||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||
|
|
@ -94,13 +96,13 @@ function this.OnShowData()
|
|||
dailyTasksConfig=ConfigManager.GetConfig(ConfigName.DailyTasksConfig)
|
||||
curDailyMissionData = {}
|
||||
curDailyMissionBoxData = {}
|
||||
for i, v in pairs(TaskManager.GetTypeTaskList(TaskTypeDef.DayTask)) do
|
||||
for i, v in pairs(TaskManager.GetTypeTaskList(TaskTypeDef.DayTask)) do
|
||||
if v.missionId < 10000 then
|
||||
if dailyTasksConfig[v.missionId].OpenLevel or ActTimeCtrlManager.SingleFuncState(dailyTasksConfig[v.missionId].OpenLevel) then
|
||||
if dailyTasksConfig[v.missionId].OpenLevel then
|
||||
table.insert(curDailyMissionData,v)
|
||||
end
|
||||
else
|
||||
if dailyTasksConfig[v.missionId].OpenLevel or ActTimeCtrlManager.SingleFuncState(dailyTasksConfig[v.missionId].OpenLevel) then
|
||||
if dailyTasksConfig[v.missionId].OpenLevel then
|
||||
table.insert(curDailyMissionBoxData,v)
|
||||
end
|
||||
end
|
||||
|
|
@ -115,8 +117,13 @@ function this.OnShowData()
|
|||
local AllData = TaskManager.GetTypeTaskList(TaskTypeDef.Achievement)
|
||||
this.ScrollView:SetData(curDailyMissionData, function (index, go)
|
||||
this.SingleMissionDatasDataShow(go,curDailyMissionData[index])
|
||||
end)
|
||||
end)
|
||||
this.SetDailyMissionBox(curDailyMissionBoxData)
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(this.ScrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function this.SingleMissionDatasDataShow(_go,_missionData)
|
||||
|
|
@ -133,7 +140,11 @@ function this.SingleMissionDatasDataShow(_go,_missionData)
|
|||
table.insert(reward,{reward = {missionConfigData.MazePoint[i][1],missionConfigData.MazePoint[i][2]},type = 2})
|
||||
end
|
||||
end
|
||||
_go:SetActive(true)
|
||||
if isPlayAnim then
|
||||
_go:SetActive(false)
|
||||
else
|
||||
_go:SetActive(true)
|
||||
end
|
||||
local titleText = Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text")
|
||||
titleText.text =string.format(missionConfigData.Desc,missionConfigData.Values[2][1])
|
||||
local itemGroup = Util.GetGameObject(_go, "content")
|
||||
|
|
@ -146,7 +157,6 @@ function this.SingleMissionDatasDataShow(_go,_missionData)
|
|||
this.NoviceItemList[_go][i] = SubUIManager.Open(SubUIConfig.ItemView, itemGroup.transform)
|
||||
end
|
||||
this.NoviceItemList[_go][i].gameObject:SetActive(false)
|
||||
|
||||
end
|
||||
local show
|
||||
for i = 1, #reward do
|
||||
|
|
@ -207,12 +217,13 @@ function this.SetDailyMissionBox(_missionDatas)
|
|||
|
||||
|
||||
local curGetRewardNum=0
|
||||
for i, v in pairs(curDailyMissionBoxData) do
|
||||
for i, v in ipairs(curDailyMissionBoxData) do
|
||||
--LogGreen("v.missionId "..v.missionId.." "..v.progress)
|
||||
if v.progress > curGetRewardNum then
|
||||
curGetRewardNum = v.progress
|
||||
end
|
||||
end
|
||||
--LogGreen("#_missionDatas:"..#_missionDatas)
|
||||
this.progressBottom.fillAmount=curGetRewardNum/dailyTasksConfig[_missionDatas[#_missionDatas].missionId].Values[2][1]
|
||||
this.totalPro.text= Language[11361]..curGetRewardNum--.."/"..LengthOfTable(curDailyMissionData)
|
||||
for i, v in pairs(_missionDatas) do
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ local sortingOrder=0
|
|||
local curScore = 0--当前分数
|
||||
local treasureState = 0
|
||||
local itemsList={}
|
||||
local isPlayAnim = true
|
||||
function this:InitComponent(gameObject)
|
||||
--topBar/btnBack
|
||||
this.gameObject = gameObject
|
||||
|
|
@ -59,17 +60,18 @@ end
|
|||
function this:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.Closefunction)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh)
|
||||
end
|
||||
|
||||
function this:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.Closefunction)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh)
|
||||
end
|
||||
this.Closefunction = function()
|
||||
isPlayAnim = true
|
||||
Timer.New(function()
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
PopupTipPanel.ShowTip(Language[12320])
|
||||
|
|
@ -81,6 +83,7 @@ this.Closefunction = function()
|
|||
end,1):Start()
|
||||
end
|
||||
function this:OnShow(_parent,...)
|
||||
isPlayAnim = true
|
||||
parent=_parent
|
||||
sortingOrder = _parent.sortingOrder
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
|
|
@ -189,30 +192,20 @@ function this:showTaskList()
|
|||
this.ScrollView:SetData(rewardData,function(index, rewardItem)
|
||||
this:SingleTask(rewardItem, rewardData[index])
|
||||
end)
|
||||
|
||||
-- --定位打开界面时位置
|
||||
-- local t = 0
|
||||
-- if treasureState == 0 then
|
||||
-- for i = 1, #rewardStateData do
|
||||
-- if rewardStateData[i].state == 0 then
|
||||
-- t = i
|
||||
-- break
|
||||
-- end
|
||||
-- end
|
||||
-- elseif treasureState == 1 then
|
||||
-- for i = 1, #rewardStateData do
|
||||
-- if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then
|
||||
-- t = i
|
||||
-- breakPopupTipPanel
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
--this.ScrollView:SetIndex(t-2)
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(this.ScrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--单个任务
|
||||
function this:SingleTask(rewardItem, rewardSingleData)
|
||||
if isPlayAnim then
|
||||
rewardItem:SetActive(false)
|
||||
else
|
||||
rewardItem:SetActive(true)
|
||||
end
|
||||
local scoreLevel = Util.GetGameObject(rewardItem, "scoreLevel"):GetComponent("Text")
|
||||
local box1 = Util.GetGameObject(rewardItem, "box1")
|
||||
local box2 = Util.GetGameObject(rewardItem, "box2")
|
||||
|
|
@ -237,7 +230,7 @@ function this:SingleTask(rewardItem, rewardSingleData)
|
|||
else
|
||||
itemsList[rewardItem][i].gameObject.transform:SetParent(box2.transform)
|
||||
end
|
||||
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||
itemsList[rewardItem][i].gameObject:SetActive(true)
|
||||
itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8, false)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ local parent
|
|||
local sortingOrder=0
|
||||
local curType = 1
|
||||
local treasureState
|
||||
local isPlayAnim = true
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
function this:InitComponent(gameObject)
|
||||
this.gameObject = gameObject
|
||||
|
|
@ -98,6 +99,7 @@ this.Closefunction = function()
|
|||
end
|
||||
|
||||
function this:OnShow(_parent,...)
|
||||
isPlayAnim = true
|
||||
parent=_parent
|
||||
sortingOrder = _parent.sortingOrder
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
|
|
@ -190,6 +192,11 @@ function this:showTaskList(type)
|
|||
this.ScrollView:SetData(rewardData,function(index, rewardItem)
|
||||
this:SingleTask(rewardItem, rewardData[index])
|
||||
end)
|
||||
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(this.ScrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
end
|
||||
local type={
|
||||
[0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]},
|
||||
|
|
@ -199,7 +206,11 @@ local type={
|
|||
--单个任务
|
||||
function this:SingleTask(go, rewardSingleData)
|
||||
local activityRewardGo = go
|
||||
activityRewardGo:SetActive(true)
|
||||
if isPlayAnim then
|
||||
activityRewardGo:SetActive(false)
|
||||
else
|
||||
activityRewardGo:SetActive(true)
|
||||
end
|
||||
local sConFigData = rewardSingleData
|
||||
local strs = string.split(sConFigData.show)
|
||||
local titleText = Util.GetGameObject(activityRewardGo, "content"):GetComponent("Text")
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ function SupremeHeroPopup:BindEvent()
|
|||
Util.AddClick(this.backBtn,function()
|
||||
if not canClose then return end
|
||||
self:ClosePanel()
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
end)
|
||||
--完成按钮
|
||||
Util.AddClick(this.doneBtn,function()
|
||||
|
|
@ -162,6 +163,9 @@ end
|
|||
local fun = nil
|
||||
function SupremeHeroPopup:OnOpen(_fun)
|
||||
fun = _fun
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_tsjl)
|
||||
SoundManager.PlayMusic(SoundConfig.Sound_tsjl_loop)
|
||||
end
|
||||
|
||||
function SupremeHeroPopup:OnShow()
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ function this:BindEvent()
|
|||
else
|
||||
NetManager.RequestUseBomb(function (msg)--请求使用炸弹
|
||||
MapTrialManager.bombUsed = MapTrialManager.bombUsed + 1
|
||||
SoundManager.PlaySound(SoundConfig.Sound_zd)
|
||||
parent:ClosePanel()
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function()
|
||||
MapTrialManager.UpdatePowerValue(msg.essenceValue)
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ function this:BindEvent()
|
|||
return
|
||||
end
|
||||
NetManager.UseAddHpItemRequest(selectHeroDid,function()
|
||||
SoundManager.PlaySound(SoundConfig.Sound_hcs)
|
||||
PopupTipPanel.ShowTip(string.format(Language[11654],itemConfig[itemId].Name))
|
||||
MapManager.addHpCount=MapManager.addHpCount+1
|
||||
curHeroHp=curHeroHp+5000 --5000增加的血量也是要配表的
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -111,6 +111,8 @@ end
|
|||
--界面打开时调用(用于子类重写)
|
||||
function this:OnOpen(_fun)
|
||||
fun = _fun
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_mrhl)
|
||||
end
|
||||
|
||||
--获取(自己拼凑)礼包数据
|
||||
|
|
|
|||
Loading…
Reference in New Issue