【活动】连续礼包,添加

gaoxin 2021-12-02 01:44:29 +08:00
parent 28538e89b0
commit 0d1c025624
15 changed files with 3025 additions and 24 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: c442deb28ec49054c81a10ef86ac1a6e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 84832b108077e9d4ca727062f22d06ed
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagButtonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 3866e2cbb0b224144b418317138593a3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6eff3f5ea969f024db3cacf388d5dc37
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TeHuiShenZhuangAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -252,6 +252,7 @@ RectTransform:
m_Children:
- {fileID: 3650931296287365445}
- {fileID: 208247563920512486}
- {fileID: 1478133659566952327}
- {fileID: 6979685406578874528}
- {fileID: 2043961333174016206}
- {fileID: 2052763838201650754}
@ -323,7 +324,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: 83, y: -427}
m_AnchoredPosition: {x: 83, y: -420}
m_SizeDelta: {x: 128, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6020975154716938251
@ -5652,7 +5653,7 @@ ParticleSystem:
--- !u!199 &1754123301688988242
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10377,7 +10378,7 @@ ParticleSystem:
--- !u!199 &1383619556352192386
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10472,7 +10473,7 @@ RectTransform:
- {fileID: 1971531226912261817}
- {fileID: 2634665790303701291}
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -15270,7 +15271,7 @@ ParticleSystem:
--- !u!199 &6611920073900363280
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20031,7 +20032,7 @@ ParticleSystem:
--- !u!199 &8482867470909435893
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24859,7 +24860,7 @@ ParticleSystem:
--- !u!199 &5222821022761404881
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29631,7 +29632,7 @@ ParticleSystem:
--- !u!199 &7694058163904522821
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29724,7 +29725,7 @@ RectTransform:
- {fileID: 1808235633478006095}
- {fileID: 184284645826008713}
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -30475,7 +30476,7 @@ RectTransform:
- {fileID: 4452344794313098835}
- {fileID: 8329855622185798631}
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -35786,7 +35787,7 @@ ParticleSystem:
--- !u!199 &451042870845818512
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -40547,7 +40548,7 @@ ParticleSystem:
--- !u!199 &2064105613712751710
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -45466,7 +45467,7 @@ ParticleSystem:
--- !u!199 &4242355673473395786
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -50443,7 +50444,7 @@ ParticleSystem:
--- !u!199 &8631777570215250582
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -55146,7 +55147,7 @@ ParticleSystem:
--- !u!199 &6664654258915651096
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -55300,6 +55301,143 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &5951264760532382814
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1478133659566952327}
- component: {fileID: 3921455369004149686}
- component: {fileID: 3392146986436220068}
- component: {fileID: 5802194934209519600}
- component: {fileID: 1592715990141813970}
m_Layer: 5
m_Name: gift
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1478133659566952327
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5951264760532382814}
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: 7581135397323237180}
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: 83, y: -560}
m_SizeDelta: {x: 127, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3921455369004149686
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5951264760532382814}
m_CullTransparentMesh: 0
--- !u!114 &3392146986436220068
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5951264760532382814}
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: c442deb28ec49054c81a10ef86ac1a6e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5802194934209519600
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5951264760532382814}
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: 3392146986436220068}
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 &1592715990141813970
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5951264760532382814}
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 &6049974795344699715
GameObject:
m_ObjectHideFlags: 0
@ -60422,7 +60560,7 @@ ParticleSystem:
--- !u!199 &9196881470734699167
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -60645,7 +60783,7 @@ RectTransform:
- {fileID: 5439423017807525752}
- {fileID: 2092466590503268333}
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -65433,7 +65571,7 @@ ParticleSystem:
--- !u!199 &8110470422241918513
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -70136,7 +70274,7 @@ ParticleSystem:
--- !u!199 &3092412880440674471
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -75242,7 +75380,7 @@ ParticleSystem:
--- !u!199 &4000834218797470971
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -80493,7 +80631,7 @@ ParticleSystem:
--- !u!199 &3274827052990924621
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 50d516bce2924e64cace96efabc2fdc3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -315,6 +315,7 @@ RectTransform:
m_Children:
- {fileID: 579564260368216746}
- {fileID: 3033313662888219956}
- {fileID: 5476746069256386947}
m_Father: {fileID: 2670508066893046162}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1934,6 +1935,143 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8226047251144139458
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5476746069256386947}
- component: {fileID: 6612592589655890980}
- component: {fileID: 1759418136519200982}
- component: {fileID: 5804712400799051237}
- component: {fileID: 5576021471446951270}
m_Layer: 5
m_Name: btnGift
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5476746069256386947
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8226047251144139458}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -102.33894}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6182593647608308403}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6612592589655890980
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8226047251144139458}
m_CullTransparentMesh: 0
--- !u!114 &1759418136519200982
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8226047251144139458}
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: c442deb28ec49054c81a10ef86ac1a6e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &5804712400799051237
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8226047251144139458}
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: 1759418136519200982}
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 &5576021471446951270
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8226047251144139458}
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 &8354368336256223909
GameObject:
m_ObjectHideFlags: 0

View File

@ -1360,6 +1360,8 @@ ActivityTypeDef = {
linglongshangshi = 20005,--玲珑商市
YuJianXing = 84, --御剑行
tiandihonglu = 74,
ContinueGift = 85, -- 连续礼包
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {

View File

@ -431,7 +431,8 @@ UIName = {
TailsmanSoulMainPanel = 439,
IncarnationPanel = 438,
LingMaiMiJingPanel = 436,--灵脉秘境
RewardTailsmanChipShowPopup = 440
RewardTailsmanChipShowPopup = 440,
ContinueGiftPanel = 441, -- 连续礼包
}
SubUIConfig = {

View File

@ -179,6 +179,27 @@ local TypeUpdateFunc = {
return a.missionId < b.missionId
end)
end,
[ActivityTypeDef.ContinueGift] = function ()--特惠神装
local curData = dataList[ActivityTypeDef.ContinueGift]
local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.SurpriseBoxConfig,"ActivityId",curData.activityId)
local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
for i = 1, #curData.rewards do
for j = 1, #configData do
if curData.rewards[i].missionId == configData[j].Id then
curData.rewards[i].otherData.PackId = configData[j].PackId
curData.rewards[i].otherData.Name = rechargeConfig[configData[j].PackId].Name
curData.rewards[i].otherData.Reward = rechargeConfig[configData[j].PackId].RewardShow
curData.rewards[i].otherData.Price = rechargeConfig[configData[j].PackId].Price
curData.rewards[i].otherData.skinArtId = tonumber(configData[1].Warning)
curData.rewards[i].otherData.canBuyDay = configData[j].BuyDay - curData.value
curData.rewards[i].otherData.LinkActivityId = configData[j].LinkActivityId
end
end
end
table.sort(curData.rewards,function (a,b)
return a.missionId < b.missionId
end)
end,
--山河试炼
[ActivityTypeDef.ShanHeShiLian] = function ()--山河试炼
local curData = dataList[ActivityTypeDef.ShanHeShiLian]
@ -590,4 +611,25 @@ function this.DemonSlayerNewRedCheck()
return false
end
-- 判断是否有连续充值的礼包
function this.HasContinueGift(linkActId)
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ContinueGift)
if not activityId then
return false
end
local actData = this.GetData(ActivityTypeDef.ContinueGift)
if not actData then
return false
end
if not actData.rewards or #actData.rewards == 0 then
return false
end
for _, r in ipairs(actData.rewards) do
if r.otherData.LinkActivityId == linkActId then
return true
end
end
return false
end
return CommonActPageManager

View File

@ -27,6 +27,7 @@ function TailsmanSoulChipLottery:InitComponent()
self.rightUp = Util.GetGameObject(self.gameObject,"rightUp")
self.btnReward = Util.GetGameObject(self.rightUp,"reward")
self.btnStore = Util.GetGameObject(self.rightUp,"store")
self.btnGift = Util.GetGameObject(self.rightUp,"gift")
self.zhenqibaogeBtn = Util.GetGameObject(self.rightUp,"zqbg")
self.zqbgEffect = Util.GetGameObject(self.zhenqibaogeBtn,"Fx_Circle 1")
self.btn_soul = Util.GetGameObject(self.rightUp, "btn_hero")
@ -79,6 +80,13 @@ function TailsmanSoulChipLottery:BindEvent()
Util.AddOnceClick(self.btn_soul, function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.chooseTailsManSoul)
end)
Util.AddOnceClick(self.btnGift,function ()
if not self.actData then
return
end
UIManager.OpenPanel(UIName.ContinueGiftPanel, self.actData.activityId)
end)
end
--添加事件监听(用于子类重写)
@ -103,6 +111,7 @@ function TailsmanSoulChipLottery:OnOpen(_activityConfig,_index,parent)
self.actConfig = _activityConfig
self.pageIndex = _index
self.parent = parent
end
function TailsmanSoulChipLottery:OnSortingOrderChange(_sortingOrder)
@ -145,9 +154,13 @@ function TailsmanSoulChipLottery:OnShow(_sortingOrder)
end
function TailsmanSoulChipLottery:refreshMagicNum()
local actData = ActivityGiftManager.GetActivityTypeInfo(self.actType)
self.actData = ActivityGiftManager.GetActivityTypeInfo(self.actType)
local isActive = CommonActPageManager.HasContinueGift(self.actData.activityId)
self.btnGift:SetActive(isActive)
local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",self.singleRecruit.MergePool)
self.updateTimesTip.text = string.format("召唤<color=#%s>%s</color>次必得红色碎片","A55A13",d[1].Count - actData.value)
self.updateTimesTip.text = string.format("召唤<color=#%s>%s</color>次必得红色碎片","A55A13",d[1].Count - self.actData.value)
local endTime = ActivityGiftManager.GetTaskEndTime(self.actType) - PlayerManager.serverTime
self.updateTimesTip1.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime))
local timeDown=CalculateSecondsNowTo_N_OClock(0)

View File

@ -0,0 +1,223 @@
require("Base/BasePanel")
local ContinueGiftPanel = Inherit(BasePanel)
local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local textName = {
[1100023] = "t_tehuishenzhuang_suiwukong_zh",--孙悟空
[1100026] = "t_tehuishenzhuang_suiwukong_zh",--青阳先知
[1100003] = "t_tehuishenzhuang_zhubajie_zh",--猪八戒
[1100041] = "t_tehuishenzhuang_tongtian_zh",--通天
[1110026] = "t_tehuishenzhuang_yuhuangdadi_zh",--玉皇大帝
}
function ContinueGiftPanel:InitComponent()
self.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
self.mask = Util.GetGameObject(self.gameObject, "Bg/mask")
self.scrollItem = Util.GetGameObject(self.gameObject, "panel/scroll")
self.itemPre = Util.GetGameObject(self.gameObject, "ItemPre")
local rootHight = self.scrollItem.transform.rect.height
local width = self.scrollItem.transform.rect.width
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
self.leftTime = Util.GetGameObject(self.gameObject, "panel/leftTime"):GetComponent("Text")
self.liveRoot = Util.GetGameObject(self.gameObject, "live/liveRoot")
self.liveText = Util.GetGameObject(self.gameObject, "live/Image"):GetComponent("Image")
self.effect = Util.GetGameObject(self.gameObject,"UI_Effect_ShenYiTianJiang")
self.itemViewList = {}
self.sortingOrder = 0
end
--绑定事件(用于子类重写)
function ContinueGiftPanel:BindEvent()
Util.AddClick(self.mask, function()
self:ClosePanel()
end)
Util.AddClick(self.btnBack, function()
self:ClosePanel()
end)
end
--添加事件监听(用于子类重写)
function ContinueGiftPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self)
end
--移除事件监听(用于子类重写)
function ContinueGiftPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self)
end
function ContinueGiftPanel:OnSortingOrderChange()
Util.SetParticleSortLayer(self.effect,self.sortingOrder + 1)
end
local fun
--界面打开时调用(用于子类重写)
function ContinueGiftPanel:OnOpen(_linkActId, _fun)
self.linkActId = _linkActId
fun = _fun
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function ContinueGiftPanel:OnShow()
ContinueGiftPanel:Refresh(true,true)
end
function ContinueGiftPanel:Refresh(isTop,isAni)
self.actData = CommonActPageManager.GetData(ActivityTypeDef.ContinueGift)
self:SetRewardShow(isTop,isAni)
-- self:SetLiveShow()
self:SetTime()
end
function ContinueGiftPanel:SetLiveShow()
local skinId = self.actData.rewards[1].otherData.skinArtId
self.rootName = artResourcesConfig[skinId].Name
if self.Live then
poolManager:UnLoadLive(self.rootName, self.Live)
end
local data = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Live",skinId)
local pos = data.PositionView
local scale = data.Scale
self.Live = poolManager:LoadLive(self.rootName, self.liveRoot.transform, Vector3.one*scale, Vector2.New(pos[1],pos[2]))
-- self.liveText.sprite = self.spLoader:LoadSprite(textName[skinId])
end
function ContinueGiftPanel:SetRewardShow(isTop,isAni)
-- 拿到对应活动的数据
local rewards = {}
for _, r in ipairs(self.actData.rewards) do
if r.otherData.LinkActivityId == self.linkActId then
table.insert(rewards, r)
end
end
-- 显示
self.scrollView:SetData(rewards, function (index, item)
self:ShowSingleHero(item, rewards[index],index)
end,not isTop,not isAni)
for i = 1, #rewards do
if rewards[i].progress == 1 then
local num = i - 1 > 0 and i - 1 or 1
self.scrollView:SetIndex(num)
break
end
end
end
function ContinueGiftPanel:ShowSingleHero(go,data,index)
local grid = Util.GetGameObject(go, "Grid")
local btnGet = Util.GetGameObject(go, "btnGet")
local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text")
local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image")
local buyDayImg = Util.GetGameObject(go, "bugDay")
local buyDayText = Util.GetGameObject(buyDayImg, "Text"):GetComponent("Text")
if not self.itemViewList[go] then
self.itemViewList[go] = {}
end
for k,v in ipairs(self.itemViewList[go]) do
v.gameObject:SetActive(false)
end
for i = 1, #data.otherData.Reward do
local rewardData = data.otherData.Reward[i]
if not self.itemViewList[go][i] then
self.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform)
end
self.itemViewList[go][i]:OnOpen(false, rewardData, 0.9,false,false,false,self.sortingOrder)
self.itemViewList[go][i].gameObject:SetActive(true)
end
-- LogBlue("data.progress:"..tostring(data.progress))
Util.SetGray(btnGet,false)
btnText.text = string.format("%s 元",data.otherData.Price)
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuangse")
buyDayImg:SetActive(false)
if data.progress == 8 then
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise")
btnText.text = Language[10514]
elseif data.progress == 3 then
Util.SetGray(btnGet,true)
elseif data.progress == 2 then
Util.SetGray(btnGet,true)
buyDayImg:SetActive(true)
buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay)
end
-- LogYellow("PackId:"..tostring(data.otherData.PackId).." progress:"..tostring(data.progress))
Util.AddOnceClick(btnGet,function ()
if data.progress == 1 then
PayManager.Pay(data.otherData.PackId, function(id)
FirstRechargeManager.RefreshAccumRechargeValue(data.otherData.PackId)
OperatingManager.SetHadBuyGoodsId({data.otherData.PackId})
OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.PackId)
self:Refresh(false,false)
end)
elseif data.progress == 3 then
PopupTipPanel.ShowTip("请先购买上一礼包,即可解锁此礼包")
elseif data.progress == 2 then
PopupTipPanel.ShowTip("礼包尚未开启,请耐心等待")
end
end)
end
function ContinueGiftPanel:SetTime()
local time = self.actData.endTime - GetTimeStamp()
local func = function ()
if time <= 0 then
self:ClosePanel()
end
self.leftTime.text = Language[10512]..TimeToFelaxible(time)
time = time -1
end
func()
if self.timer then
self.timer:Stop()
self.timer = nil
end
self.timer = Timer.New(function ()
func()
end, 1, -1, true)
self.timer:Start()
end
function ContinueGiftPanel:OnClose()
if self.timer then
self.timer:Stop()
self.timer = nil
end
-- if self.Live then
-- poolManager:UnLoadLive(self.rootName, self.Live)
-- end
self.Live = nil
PatFaceManager.RefreshPatface()
self.sortingOrder = 0
if fun then
fun()
fun = nil
end
end
--界面销毁时调用(用于子类重写)
function ContinueGiftPanel:OnDestroy()
if self.Live then
poolManager:UnLoadLive(self.rootName, self.Live)
end
self.Live = nil
self.spLoader:Destroy()
-- self.viewList = {}
-- self.itemList = {}
-- self.lightList = {}
-- self.jiantouList = {}
self.itemViewList = {}
end
return ContinueGiftPanel

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 160633882d8648847b0566b7febfe654
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -25,6 +25,7 @@ function XunBaoMiZong:InitComponent()
self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition
self.btnReward = Util.GetGameObject(self.gameObject,"Btns/btnReward")
self.btnShop = Util.GetGameObject(self.gameObject,"Btns/btnShop")
self.btnGift = Util.GetGameObject(self.gameObject,"Btns/btnGift")
self.btnGO = Util.GetGameObject(self.gameObject,"btnGO")
self.effect = Util.GetGameObject(self.gameObject,"fx_xunbaomizong_ditujiesuo")
self.effect:SetActive(false)
@ -43,6 +44,13 @@ function XunBaoMiZong:BindEvent()
Util.AddOnceClick(self.btnShop,function ()
JumpManager.GoJump(40025)
end)
Util.AddOnceClick(self.btnGift,function ()
if not self.actData then
return
end
UIManager.OpenPanel(UIName.ContinueGiftPanel, self.actData.activityId)
end)
Util.AddOnceClick(self.btnGO,function ()
NetManager.XunBaoMiZongEnterMap(function (msg)
@ -90,6 +98,7 @@ function XunBaoMiZong:OnOpen(_activityConfig,_index,parent)
self.actConfig = _activityConfig
self.pageIndex = _index
self.parent = parent
end
-- 打开,重新打开时回调
@ -105,6 +114,10 @@ end
function XunBaoMiZong:Refresh()
self.actData = CommonActPageManager.GetData(ActivityTypeDef.XunBaoMiZong)
if self.actData.endTime - GetTimeStamp() <= 0 then self.parent:ClosePanel() end
local isActive = CommonActPageManager.HasContinueGift(self.actData.activityId)
self.btnGift:SetActive(isActive)
CompleteMap = self.actData.value == 1
CheckRedPointStatus(RedPointType.XunBaoMiZong)
local configData = ConfigManager.GetConfigDataByKey(ConfigName.LotterySetting,"ActivityId",self.actData.activityId)