【限时祈愿】==祈愿活动提交

dev_chengFeng
wangzhenxing 2021-05-28 10:36:55 +08:00
parent ac0feb82be
commit 21574bebf1
40 changed files with 1588 additions and 41 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 2214a01c8e5b9274faa1051c9ea9f3a7
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 3e60348af37445e41b1d0ce645f2bcf9
vertices: []
indices:
edges: []
weights: []
spritePackingTag: AiYuanActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 949e5f27e96565f4b8db34f551bb0975
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 463e59e8c91aa5c408ef74adf3ceefd0
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TimeLimitUpHero
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: bcc35b40411e4bb4f8203102dbd15126
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0ed851fe65afa7c4ca3d3a0a2fcbeeaa
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TimeLimitUpHero
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: c50319e65ad9dcf49bdea89487013be3
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 40cef1b65ef17954e82b634d9b6cd536
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TimeLimitUpHero
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: bdebd07ca6696ca44b33c923120f7597
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8251c3a6c4665b648998e9654f4d9770
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TimeLimitUpHero
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: e2e78596785546642987de812a6a6604
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0ad7a3250b1c8ce4e99041804535d000
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TimeLimitUpHero
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 7b0b1066bb4df954fbba14db79379474
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
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 67ae8345015a88b4c97fd251fdb68808
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TimeLimitUpHero
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2065,11 +2065,15 @@ RecruitType = {
TimeLimitSingle = 44, --限时召唤单抽
TimeLimitTen = 45, --限时召唤十连
BaoGeSingle = 46, --灵兽宝阁单抽
BaoGeTen = 47, --灵兽宝阁十连
XiangYaoSingle = 48, --降妖夺宝单抽
XiangYaoTen = 49, --降妖夺宝十连
PrayerSingle = 44, --限时召唤单抽
PrayerTen = 45, --限时召唤十连
}
ItemBaseType = {
Special = 1, --特殊

View File

@ -1038,7 +1038,7 @@ Language = {
[11037] = GetLanguageStrById("发红包"),
[11038] = GetLanguageStrById("抢红包"),
[11039] = GetLanguageStrById("发红包榜"),
[11040] = GetLanguageStrById("</color>的红包"),
[11040] = GetLanguageStrById("的红包"),
[11041] = GetLanguageStrById("剩余个数:"),
[11042] = GetLanguageStrById("来自 <color=#FBC545>"),
[11043] = GetLanguageStrById("查看记录"),

View File

@ -198,6 +198,9 @@ ConfigName = {
HardStageReward = "HardStageReward",
XiuXianConfig = "XiuXian",
XiuXianSkillConfig = "XiuXianSkill",
WishActivitySetting = "WishActivitySetting",
WishActivityPool = "WishActivityPool",
WishActivityUp = "WishActivityUp",
}
require "Framework/GameDataBase"

View File

@ -436,7 +436,7 @@ SubUIConfig = {
[14] = {name = "ExChangePage",assetName = "ExChangePage",script = "Modules/NewActivity/ExChangePage"},--限时兑换界面预设
[15] = {name = "page2",assetName = "page2",script = "Modules/DynamicActivity/SheJiDaDian"}, --社稷大典
[16] = {name = "page3",assetName = "page3",script = "Modules/DynamicActivity/TimeLimitedCall"}, --限时召唤
[16] = {name = "TimeLimitUpHero",assetName = "TimeLimitUpHero",script = "Modules/DynamicActivity/TimeLimitUpHero"}, --限时召唤
[17] = {name = "page4",assetName = "page4",script = "Modules/DynamicActivity/QianKunBox"},--乾坤宝盒
[18] = {name = "page9",assetName = "page9",script = "Modules/DynamicActivity/YiJingBaoKu"},--易经宝库
[19] = {name = "page10",assetName = "page10",script = "Modules/DynamicActivity/ShengYiTianJiang"},--神衣天降
@ -447,4 +447,5 @@ SubUIConfig = {
[24] = { name = "ShopView", assetName = "ShopView", script = "View/ShopViewNew" },
[25] = { name = "FuXingGaoZhaoPanel", assetName = "FuXingGaoZhaoPanel", script = "Modules/FuXingGaoZhao/FuXingGaoZhaoPanel" },
[26] = { name = "NiuQiChongTianPanel", assetName = "NiuQiChongTianPanel", script = "Modules/NiuQiChongTian/NiuQiChongTianPanel" },
--[27] = {name = "TimeLimitUpHero",assetName = "TimeLimitUpHero",script = "Modules/DynamicActivity/TimeLimitUpHero"}, --限时英雄up界面
}

View File

@ -138,9 +138,9 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
this.onlineOpen = true
this.onlineGetRewardState[m.missionId] = m.state
@ -165,6 +165,9 @@ function this.InitActivityServerData(msg, isUpdate)
this.sevenDayTime = v.endTime - GetTimeStamp()
this.dayTime = GetTimeStamp() - v.startTime
end
if v.choiceRewardId then
this.choiceId=v.choiceRewardId
end
for m, n in ConfigPairs(luckyCatConfig) do
--Log(v.activityId.."活动ID")
if (v.activityId == n.ActivityId) then
@ -290,6 +293,15 @@ function this.SetActivityInfo(type, Id, state)
end
end
function this.SetActivityInfoProgress(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

View File

@ -86,7 +86,7 @@ local _ConditionConfig = {
return 0
end
for i = 1, #list do
local isHave=list[i]:CheckHavePassive(v1)
local isHave=list[i]:CheckHavePassiveId(v1)
if isHave then
return 1
end

View File

@ -144,7 +144,7 @@ function RoleLogic:CanCastSkill()
return self.sp >= self.spPass and not self.IsDebug
end
--检测是否有某被动
--检测是否有某被动类型
function RoleLogic:CheckHavePassive(id)
if self.passiveList then
for index, value in ipairs(self.passiveList) do
@ -157,6 +157,19 @@ function RoleLogic:CheckHavePassive(id)
return false
end
--检测是否有某被动
function RoleLogic:CheckHavePassiveId(id)
if self.passiveList then
for index, value in ipairs(self.passiveList) do
if value and value[3] and value[3]==id then
return true
end
end
return false
end
return false
end
-- 废弃的方法
function RoleLogic:GetSkillCD()
return max(self.spPass - self.sp, 0)

View File

@ -283,7 +283,7 @@ local _PageInfo = {--后期可以做成tableInserticon名字都去读表
local curActivityCount = {
[1] = require("Modules/DynamicActivity/DynamicTaskPage"),
[2] = require("Modules/DynamicActivity/SheJiDaDian"),
[3] = require("Modules/DynamicActivity/TimeLimitedCall"),
[3] = require("Modules/DynamicActivity/TimeLimitUpHero"),
[4] = require("Modules/DynamicActivity/QianKunBox"),
[5] = require("Modules/DynamicActivity/ZhenQiYiBaoPage"),
[6] = require("Modules/DynamicActivity/LeiJiChongZhiPage"),

View File

@ -16,6 +16,7 @@ local drawtType={
}
local orginLayer
local isLimitUpHero=false
--初始化组件(用于子类重写)
function QianKunBoxBuyOnePanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -37,6 +38,7 @@ function QianKunBoxBuyOnePanel:InitComponent()
this.detailText1 = Util.GetGameObject(this.detailImage1, "contentDetailText"):GetComponent("Text")
this.content3=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content3")
this.detailImage3=Util.GetGameObject(this.content3, "Tip")
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
@ -56,6 +58,12 @@ function QianKunBoxBuyOnePanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(this.openOneAgainButton, function ()
if isLimitUpHero then
if this.func then
this.func()
end
return
end
local d=RecruitManager.GetExpendData(this.recruitType)
local maxtimesId=lotterySetting[this.recruitType].MaxTimes
local freeTimesId=lotterySetting[this.recruitType].FreeTimes
@ -100,6 +108,7 @@ function QianKunBoxBuyOnePanel:OnSortingOrderChange()
this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder)
end
end
--界面打开时调用(用于子类重写)
function QianKunBoxBuyOnePanel:OnOpen(...)
SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen)
@ -108,6 +117,9 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
this.drop=args[1]
this.recruitType = args[2]
recType = args[3]
if not this.func then
this.func=args[4]
end
this.detailImage:SetActive(true)
this.content1:SetActive(false)
this.content2:SetActive(false)
@ -116,14 +128,23 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
d = RecruitManager.GetExpendData(this.recruitType)
local upConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType)
if upConfig then
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wish then
d = RecruitManager.GetExpendDataByCostItem(wish.CostItemSingle)
isLimitUpHero=true
end
else
d = RecruitManager.GetExpendData(this.recruitType)
end
itemId=d[1]
itemNum=d[2]
this.itemIcon3.sprite=this.spLoader:LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
this.itemNum3.text= tostring(itemNum)
this.detailText.text = Language[10498]
Util.ClearChild(Util.GetTransform(this.content, "itemContent1"))
this.itemDataList={}
this.itemDataList=BagManager.GetTableByBackDropData(this.drop)
@ -142,6 +163,10 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
end
end, 0.5)
time:Start()
if isLimitUpHero then
this.detailImage:SetActive(false)
this.detailImage3:SetActive(false)
end
end
--界面关闭时调用(用于子类重写)
function QianKunBoxBuyOnePanel:OnClose()

View File

@ -20,6 +20,7 @@ this.contentList={}
this.contentListParent={}
this.isElementDrawPanel=false
local orginLayer
local isLimitUpHero=false
--初始化组件(用于子类重写)
function QianKunBoxBuyTenPanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -40,6 +41,7 @@ function QianKunBoxBuyTenPanel:InitComponent()
this.detailText1 = Util.GetGameObject(this.detailImage1, "contentDetailText"):GetComponent("Text")
this.content3=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content3")
this.detailImage3=Util.GetGameObject(this.content3, "Tip")
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
@ -66,6 +68,12 @@ function QianKunBoxBuyTenPanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(this.openTenAgainButton, function ()
if isLimitUpHero then
if this.tenFunc then
this.tenFunc()
end
return
end
local d=RecruitManager.GetExpendData(this.recruitType)
local maxtimesId=lotterySetting[this.recruitType].MaxTimes
local freeTimesId=lotterySetting[this.recruitType].FreeTimes
@ -123,7 +131,9 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
this.drop=args[1]
this.recruitType = args[2]
recType = args[3]
if args[4] then
this.tenFunc=args[4]
end
this.detailImage:SetActive(true)
this.content1:SetActive(false)
this.content2:SetActive(false)
@ -133,14 +143,23 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
d=RecruitManager.GetExpendData(this.recruitType)
local upConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType)
if upConfig then
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wish then
isLimitUpHero=true
d = RecruitManager.GetExpendDataByCostItem(wish.CostItemMul)
end
else
d = RecruitManager.GetExpendData(this.recruitType)
end
itemId=d[1]
itemNum=d[2]
this.itemIcon3.sprite=this.spLoader:LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
this.itemNum3.text= tostring(itemNum)
this.detailText.text = Language[10499]
local itemDataList={}
itemDataList=BagManager.GetTableByBackDropData(this.drop)
this.openTenAgainButton:GetComponent("Button").enabled=false
@ -152,6 +171,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
end)
this.views = {}
this.itemDataList = itemDataList
LogError("item len=="..#itemDataList)
local dataNum = #itemDataList > 10 and 10 or #itemDataList
for i = dataNum, 1, -1 do
Util.ClearChild(this.contentList[i].transform)
@ -177,6 +197,10 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
end)
end
callList:Pop()()
if isLimitUpHero then
this.detailImage:SetActive(false)
this.detailImage3:SetActive(false)
end
end
--界面关闭时调用(用于子类重写)

View File

@ -0,0 +1,459 @@

local TimeLimitUpHero = {}
local sortingOrder = 0
local globalActive = ConfigManager.GetConfig(ConfigName.GlobalActivity)
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local wishConfig=nil
local heroLiveObj=nil
local curConfig=nil
local curHeroId=0
local activityData=nil
function TimeLimitUpHero:New(gameObject)
local b = {}
b.gameObject = gameObject
b.transform = gameObject.transform
setmetatable(b, { __index = TimeLimitUpHero })
return b
end
local Setting=nil
local oneFunc=nil
local tenFunc=nil
local oneFunc2=nil
--初始化组件(用于子类重写)
function TimeLimitUpHero:InitComponent()
self.spLoader = SpriteLoader.New()
self.helpBtn = Util.GetGameObject(self.gameObject,"help")
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.btnActivity = Util.GetGameObject(self.gameObject,"btngroup/btnActivity")
self.btnRewardBtn = Util.GetGameObject(self.gameObject,"btngroup/btnRewardBtn")
self.btnRewardBtn:SetActive(false)
self.btns = {}
self.bgs = {}
for i = 1 , 2 do
self.btns[i] = {}
self.btns[i].btn = Util.GetGameObject(self.gameObject,"btngroup/btn"..i)
self.btns[i].red = Util.GetGameObject(self.btns[i].btn.gameObject,"redPoint")
self.btns[i].info = Util.GetGameObject(self.btns[i].btn.gameObject,"layout/Text"):GetComponent("Text")
self.btns[i].icon = Util.GetGameObject(self.btns[i].btn.gameObject,"layout/icon"):GetComponent("Image")
self.btns[i].num = Util.GetGameObject(self.btns[i].btn.gameObject,"layout/num"):GetComponent("Text")
end
self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --免费次数剩余刷新时间
self.upper=Util.GetGameObject(self.gameObject,"maxtimes/times"):GetComponent("Text") ---召唤上限
self.recruitTimeUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text1") :GetComponent("Text") --活动剩余时间
self.recruitTimesUpdate = Util.GetGameObject(self.gameObject,"recruitTimesUpdate/Text") :GetComponent("Text") --保底剩余次数
self.getBtn=Util.GetGameObject(self.gameObject,"nextlevel")
self.slider = Util.GetGameObject(self.getBtn, "Slider"):GetComponent("Slider")
self.sliderText=Util.GetGameObject(self.getBtn,"Text"):GetComponent("Text")
self.sliderText2=Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text")
self.nextReward = Util.GetGameObject(self.getBtn, "reward")
self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong")
self.heroPar=Util.GetGameObject(self.gameObject,"Bg2/curObj")
self.dragView=Util.GetGameObject(self.gameObject,"Bg2/dragView")
self.btn_hero=Util.GetGameObject(self.gameObject,"btn_hero")
self.heroIcon=Util.GetGameObject(self.gameObject,"btn_hero/Icon"):GetComponent("Image")
self.textInfo1=Util.GetGameObject(self.gameObject,"btn_hero/Text"):GetComponent("Text")
self.textInfo1.text="选择神将"
self.titleImg=Util.GetGameObject(self.gameObject,"Bg2/Image (3)"):GetComponent("Image")
self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image")
self.callTimeImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_28zi")
self.callTimeTxt=Util.GetGameObject(self.gameObject,"callTimeImg/Text"):GetComponent("Text")
self.heroNameTxt=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Name/Text"):GetComponent("Text")
self.heroProImg=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
self.starPar=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
Util.AddClick(self.btn_hero.gameObject, function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChooseUpHero,self.actId,curHeroId)
end)
Util.AddClick(self.dragView.gameObject, function()
local SkeletonGraphic = heroLiveObj:GetComponent("SkeletonGraphic")
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
end)
end
--绑定事件(用于子类重写)
function TimeLimitUpHero:BindEvent()
Util.AddOnceClick(self.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y)
end)
Util.AddOnceClick(self.btnActivity, function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actId,PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP,PRE_REWARD_POOL_TYPE.TIME_LIMITED)
end)
end
--添加事件监听(用于子类重写)
function TimeLimitUpHero:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Activity.ContinueRechargeRefresh,self.OnUPHeroChange,self)
end
--移除事件监听(用于子类重写)
function TimeLimitUpHero:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.ContinueRechargeRefresh,self.OnUPHeroChange,self)
end
--up的英雄改变
function TimeLimitUpHero:OnUPHeroChange(id)
curHeroId=id
self:RefreshHeroData()
self:RefreshNextLevelReward()
end
--界面打开时调用(用于子类重写)
function TimeLimitUpHero:OnOpen(_activityConfig,_index,parent)
self.actConfig = _activityConfig
self.pageIndex = _index
self.parent = parent
end
-- 打开,重新打开时回调
function TimeLimitUpHero:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
sortingOrder = _sortingOrder
self.actId = self.actConfig.ActId
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
if self.actConfig.IfBack == 1 then
if self.actConfig.ActiveType > 0 then
local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType)
if id and id > 0 then
self.actId = id
local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id)
if config then
self.actConfig = config
end
end
end
end
for k,v in ipairs(self.bgs) do
v.bg.gameObject:SetActive(false)
end
LogError("actId "..self.actId)
wishConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",self.actId)
self.titleImg.sprite=self.spLoader:LoadSprite(self.actConfig.Icon[3])
Setting= ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
self.freeTimesId=Setting.FreeTimes
self.maxtimesId=Setting.MaxTimes
self.yaojingMaxTimeId =Setting.DiamondMaxTimes
activityData=ActivityGiftManager.GetActivityInfoByType(self.actId)
curHeroId=activityData.choiceRewardId
LogError("活动数据英雄id "..activityData.choiceRewardId)
self:RefreshHeroData()
self:RefreshGetHeroTimes()
self:TimeCountDown()
self:RefreshNextLevelReward()
end
local lastLiveName
function TimeLimitUpHero:RefreshHeroData()
curConfig=ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroId)
self.heroIcon.sprite=self.spLoader:LoadSprite(artResourcesConfig[curConfig.Icon].Name)
self.heroNameTxt.text=curConfig.ReadingName
self.heroProImg.sprite=self.spLoader:LoadSprite(GetProStrImageByProNum(curConfig.PropertyName))
if heroLiveObj then
poolManager:UnLoadLive(lastLiveName, heroLiveObj)
end
lastLiveName=GetResourcePath(curConfig.Live)
LogError("lastLiveName=="..lastLiveName)
heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar)
end
local isYaojing=false
local freeTime = 0
--刷新剩余次数
function TimeLimitUpHero:RefreshGetHeroTimes()
local curTimes = PrivilegeManager.GetPrivilegeUsedTimes(self.maxtimesId)
self.upper.text= "今日召唤上限:"..curTimes.."/"..privilegeConfig[self.maxtimesId].Condition[1][2]--特权上限
self.timeupdate.gameObject:SetActive(true)
if self.freeTimesId and self.freeTimesId > 0 then
freeTime = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)
LogError("self freetimes "..freeTime)
RecruitManager.freeUseTimeList[self.freeTimesId]=freeTime
end
--按钮赋值
for n, m in ipairs(self.btns) do
--存在免费次数 并且 免费>=1 并且是1按钮
local isFree = freeTime >= 1 and n == 1
m.red.gameObject:SetActive(isFree)
m.icon.gameObject:SetActive(not isFree)
m.num.gameObject:SetActive(not isFree)
local itemId=0
local itemNum=0
local type = 0
if n == 1 then
type = Setting.CostItemSingle
m.info.text = "1次"
else
type = Setting.CostItemMul
m.info.text = "10次"
end
local d = {}
if isFree then
self.timeupdate.gameObject:SetActive(false)
m.info.text="免费抽取"
else
local d = RecruitManager.GetExpendDataByCostItem(type)
itemId=d[1]
if itemId==16 then
isYaojing=true
end
itemNum=d[2]
m.icon.sprite=self.spLoader:LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
m.num.text= tostring(itemNum)
end
local sureFunc=function()
if not isFree then
if BagManager.GetItemCountById(itemId)<itemNum then
PopupTipPanel.ShowTip(itemConfig[itemId].Name.."数量不足!")
return
end
end
local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.PrayerTen)
--local recrutId = n == 1 and self.singleRecruit.Id or self.tenRecruit.Id
local recrutNum = n == 1 and 1 or 10
if state==0 and itemId == 16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,"timeLimitHero",function()
self:Recruit(self.actId,n)
end,n)
else
self:Recruit(self.actId,n)
end
end
if n==1 then
oneFunc=sureFunc
oneFunc2=sureFunc
else
tenFunc=sureFunc
end
Util.AddOnceClick(m.btn,sureFunc)
end
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
local totalTimes = 0
for i = 1, #wishConfig.UpList do
if wishConfig.UpList[i][1]==curHeroId then
totalTimes=wishConfig.UpList[i][4]
end
end
reMaintimes = totalTimes - reMaintimes
if reMaintimes == 0 then
reMaintimes = totalTimes
end
local num=PrivilegeManager.GetPrivilegeRemainValue(Setting.DiamondMaxTimes)
self.recruitTimesUpdate.text = string.format("今日剩余妖晶召唤次数:<color=#F27D0F>%s</color>",num)
self.callTimeTxt.text=reMaintimes
end
function TimeLimitUpHero:Recruit(actId,type)
local recrutType =type==1 and 1 or 10
if PrivilegeManager.GetPrivilegeUsedTimes(self.maxtimesId)+recrutType>privilegeConfig[self.maxtimesId].Condition[1][2] then
PopupTipPanel.ShowTip("无法超出每日召唤次数上限!")
return
end
NetManager.ChoiceDrawCardRequest(actId,type, function(msg)
if freeTime>=1 and type==1 then
PrivilegeManager.RefreshPrivilegeUsedTimes(self.freeTimesId,recrutType)--记录抽卡次数
end
PrivilegeManager.RefreshPrivilegeUsedTimes(self.maxtimesId,recrutType)--记录抽卡次数
-- if then
-- freeTime = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)
-- end
--记录妖晶抽卡
if isYaojing then
PrivilegeManager.RefreshPrivilegeUsedTimes(self.yaojingMaxTimeId,recrutType)--记录妖晶抽卡次数
end
if type == 1 then
LogError("len=="..LengthOfTable(msg.drop.Hero))
local data=msg.drop.Hero
if oneFunc then
LogError(" one func ==")
end
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc)
else
--UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,type,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc)
end
if msg.drop.Hero[1] then
if not oneFunc then
LogError(" one func ==nil")
end
-- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen},oneFunc2)
end
CheckRedPointStatus(RedPointType.TimeLimited)
end,self.freeTimesId)
end
--刷新时间
function TimeLimitUpHero:TimeCountDown()
if self.timer then
self.timer:Stop()
self.timer = nil
end
local timeDown=CalculateSecondsNowTo_N_OClock(0)--ActivityGiftManager.GetTaskRemainTime(ActivityTypeDef.FindFairy)
local endTime = ActivityGiftManager.GetTaskEndTime(self.actType) - PlayerManager.serverTime
self.recruitTimeUpdate.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime))
self.timeupdate.text = TimeToHMS(timeDown).."后刷新"
self.timer = Timer.New(function()
if timeDown < 1 then
self:RefreshGetHeroTimes()
return
else
self.timeupdate.text = TimeToHMS(timeDown).."后刷新"
end
if endTime < 1 then
self.timer:Stop()
self.timer = nil
self:OnShow(sortingOrder)
return
else
self.recruitTimeUpdate.text = string.format("活动剩余时间:"..self:TimeToDHMS(endTime))
end
endTime = endTime - 1
timeDown = timeDown - 1
end, 1, -1, true)
self.timer:Start()
end
function TimeLimitUpHero:RefreshNextLevelReward()
-- 0 无法领取 1已领取 2可领取 -1 全部领取完
local curState = 0
local data1 = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",self.actId) --通过活动id获取阶段任务
local rewardItem = nil
local mission = nil
local reward=nil
for i = 1,#wishConfig.UpList do
if wishConfig.UpList[i][1]==curHeroId then
reward=wishConfig.RewardList[i]
end
end
--替换奖励数据
for i = 1, #data1 do
data1[i].Reward[1][1]=reward[i]
end
for n,m in ipairs(data1) do
mission = ActivityGiftManager.GetActivityInfo(self.actId, m.Id)
if(mission.progress >= m.Values[1][1])then
if mission.state == 0 then
rewardItem = m
curState = 2
break
end
else
curState = 0
rewardItem = m
break
end
end
--所有任务都已完成
if not rewardItem then
curState = -1
rewardItem = data1[#data1]
end
OperatingManager.TimeLimitedTimes = mission.progress
if not self.itemView then
self.itemView = SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform)
end
self.itemView:OnOpen(false, {rewardItem.Reward[1][1],rewardItem.Reward[1][2]}, 0.73, false)
self.itemView.gameObject:SetActive(true)
Util.GetGameObject(self.itemView.gameObject,"item/frame"):GetComponent("Button").enabled=false
if (curState == 2) then
local temp = mission.progress <= rewardItem.Values[1][1] and mission.progress or rewardItem.Values[1][1]
self.sliderText2.text = temp.."/"..rewardItem.Values[1][1]
self.slider.value = temp /rewardItem.Values[1][1]
local vec=self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D
vec.y=22.4
self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D=vec
self.sliderText.text="奖励可领取"
self.sliderText.fontSize=26
Util.AddOnceClick(self.getBtn,function()
NetManager.GetActivityRewardRequest(mission.missionId, self.actId,
function(respond)
UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1)
ActivityGiftManager.SetActivityInfo(self.actId,mission.missionId,1)
self:RefreshGetHeroTimes()
self:RefreshNextLevelReward()
end)
end)
self.effect.gameObject:SetActive(true)
elseif (curState == -1) then
self.slider.value=1
Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text="300/300"
self.sliderText.text="奖励已全部领取"
Util.AddOnceClick(self.getBtn,function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecrutReward,self.actType,self.actId)
end)
else
self.slider.gameObject:SetActive(true)
Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text=mission.progress.."/"..rewardItem.Values[1][1]
local vec=self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D
vec.y=22.4
self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D = vec
self.sliderText.text="下一阶段:"..mission.progress.."/"..rewardItem.Values[1][1]
self.sliderText.fontSize=26
self.slider.value=mission.progress/rewardItem.Values[1][1]
self.effect.gameObject:SetActive(false)
Util.AddOnceClick(self.getBtn,function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecrutReward,self.actType,self.actId,curHeroId)
end)
end
end
--- 将一段时间转换为天时分秒
function TimeLimitUpHero:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = math.floor(second % 60)
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
if day <= 0 and hour <= 0 then
return string.format("%s分%s秒",minute, sec)
else
return string.format("%s天%s小时",day, hour)
end
end
--界面关闭时调用(用于子类重写)
function TimeLimitUpHero:OnClose()
self.gameObject:SetActive(false)
if self.timer then
self.timer:Stop()
self.timer = nil
end
end
--界面销毁时调用(用于子类重写)
function TimeLimitUpHero:OnDestroy()
self.spLoader:Destroy()
self.btns = {}
--SubUIManager.Close(self.itemView)
self.itemView = nil
heroLiveObj=nil
lastLiveName=nil
curHeroId=0
if oneFunc then
oneFunc=nil
end
if tenFunc then
tenFunc=nil
end
end
return TimeLimitUpHero

View File

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

View File

@ -223,10 +223,11 @@ function TimeLimitedCall:Recruit(recrutType,recrutId,bType)
end
RecruitManager.RecruitRequest(recrutId, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(self.maxtimesId,recrutType)--记录抽卡次数
if bType == 1 then
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.itemlist[1],recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
else
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.itemlist,recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
end
CheckRedPointStatus(RedPointType.TimeLimited)
end,self.freeTimesId)

View File

@ -51,6 +51,7 @@ function GuildCreatePopup:BindEvent()
end
GuildManager.RequestCreateGuild(name, announce, function()
this:ClosePanel()
NetManager.RequestWelfareRedPacket()
if this.successFunc then this.successFunc() end
UIManager.OpenPanel(UIName.GuildMainCityPanel)
PopupTipPanel.ShowTip(Language[10847])

View File

@ -259,6 +259,7 @@ function this.JoinGuildSuccess()
UIManager.OpenPanel(UIName.GuildMainCityPanel)
--
PopupTipPanel.ShowTip(Language[10377])
NetManager.RequestWelfareRedPacket()
MyGuildManager.ReuqsetRedPackage(function()
CheckRedPointStatus(RedPointType.Guid_GetPackage)
end)

View File

@ -17,7 +17,7 @@ function this.RegisterMessage(network)
--监听红点推送
socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint)
--福利红包推送
--socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
socket:RegistNetMessage(MessageTypeProto_pb.UPDATE_BAG_INDICATION, this.BackUpDataBagItemIdNumber)
socket:RegistNetMessage(MessageTypeProto_pb.SEND_CHAT_INFO_INDICATION, this.ReceiveFriendChat)

View File

@ -5195,18 +5195,20 @@ end)
end
--限时祈愿活动抽卡
function NetManager.ChoiceDrawCardRequest(actID,_type,func)
local data=ActivityProto_pb.ChoiceDrawCardRequest()
data.activityId=actID
data.type=_type
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.ChoiceDrawCardRequest, MessageTypeProto_pb.choiceDrawCardResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.choiceDrawCardResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
local data=ActivityProto_pb.choiceDrawCardRequest()
data.activityId=actID
data.type=_type
LogError("actid=="..actID.." type==".._type)
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.choiceDrawCardRequest, MessageTypeProto_pb.choiceDrawCardResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.choiceDrawCardResponse()
msg:ParseFromString(data)
--PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)
if func then
func(msg)
end
end)
end

View File

@ -77,6 +77,7 @@ function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五
local func1 = function ()
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.PrayerTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen,0)
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen,0)

View File

@ -67,6 +67,8 @@ local contentScripts = {
[32] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan",type=GENERAL_POPUP_TYPE.YunYouMan},
--招募奖励详情
[33] = {view = require("Modules/Popup/View/GeneralPopup_RecruitReward"), panelName = "GeneralPopup_RecruitReward",type=GENERAL_POPUP_TYPE.RecrutReward},
--限时抽卡选择up英雄
[34] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralPopup_ChooseUpHero",type=GENERAL_POPUP_TYPE.ChooseUpHero},
}
--子模块预设
local contentPrefabs={}

View File

@ -0,0 +1,119 @@
----- 送神弹窗 -----
local this = {}
--传入父脚本模块
local parent
--传入特效层级
local sortingOrder=0
local args=nil
local currHeroId=0
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
function this:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
this.FourStarUpTip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
this.FourStarUpTip.text = "长按头像可查看神将详情"
this.selectObj=Util.GetGameObject(gameObject,"choosed")
this.prefab=Util.GetGameObject(gameObject,"item")
--滚动条根节点
this.root = Util.GetGameObject(gameObject, "Root")
this.preList={}
end
function this:BindEvent()
Util.AddClick(this.cancelBtn,function()
parent:ClosePanel()
end)
Util.AddClick(this.confirmBtn,function()
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.ContinueRechargeRefresh,currHeroId)
parent:ClosePanel()
end)
end)
end
function this:AddListener()
end
function this:RemoveListener()
end
function this:OnShow(_parent,...)
parent=_parent
sortingOrder =_parent.sortingOrder
args = {...}
local upConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",args[1])
if not upConfig then
return
end
local str=upConfig.UpList
local heros={}
for i = 1, #str do
table.insert(heros,str[i][1])
end
local heroDatas={}
currHeroId=args[2]
for i = 1, #heros do
table.insert(heroDatas,heroConfig[heros[i]])
end
for i = 1, math.max(#this.preList,#heroDatas) do
local item=this.preList[i]
if not item then
item=newObject(this.prefab)
item.transform:SetParent(this.root.transform)
item.transform.localScale=Vector3.one
item.transform.localPosition=Vector3.zero
this.preList[i]=item
end
item.gameObject:SetActive(false)
end
for key, value in pairs(heroDatas) do
this.SingleHeroDataShow(this.preList[key],heroDatas[key])
end
end
--英雄单个数据展示
function this.SingleHeroDataShow(go,_heroData)
local heroData = _heroData
local _go = go
_go.gameObject:SetActive(true)
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
Util.GetGameObject(_go.transform, "Text"):GetComponent("Text").text = SubString2(GetLanguageStrById(heroData.ReadingName),8)
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(artResourcesConfig[_heroData.Icon].Name)
Util.GetGameObject(_go.transform, "posIcon"):SetActive(false)
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
local starGrid = Util.GetGameObject(_go.transform, "star")
LogError("_heroData.Id==".._heroData.Id.." currid="..currHeroId)
if _heroData.Id==currHeroId then
this.selectObj.transform:SetParent(_go.transform)
this.selectObj.transform.localScale=Vector3.one
this.selectObj.transform.localPosition=Vector3.New(0,30,0)
end
SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15)
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
Util.AddOnceClick(cardclickBtn, function()
this.selectObj.transform:SetParent(_go.transform)
this.selectObj.transform.localScale=Vector3.one
this.selectObj.transform.localPosition=Vector3.New(0,30,0)
currHeroId=_heroData.Id
end)
Util.AddLongPressClick(cardclickBtn, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroData.Id, heroData.Star)
end, 0.5)
end
function this:OnClose()
currHeroId=0
args=nil
end
function this:OnDestroy()
this.spLoader:Destroy()
end
return this

View File

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

View File

@ -61,6 +61,21 @@ function this:OnShow(_parent,...)
elseif _args[1] == RecruitType.LingShowTen then
var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen
this.rootText.text = string.format(Language[11595],_args[3])
elseif _args[1] =="timeLimitHero" then
local wishSettingConfig=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.PrayerTen
local d = 0
if _args[3]==1 then
d=RecruitManager.GetExpendDataByCostItem(wishSettingConfig.CostItemSingle)
elseif _args[3]==2 then
d=RecruitManager.GetExpendDataByCostItem(wishSettingConfig.CostItemMul)
end
if _args[3] == 1 then
this.rootText.text = string.format(Language[11596],d[2])
else
this.rootText.text = string.format(Language[11597],d[2])
end
else--在主题活动里面的抽卡
local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1])
local activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId)

View File

@ -37,14 +37,30 @@ function this:OnShow(_parent,...)
local _args = {...}
curActivityType = _args[1]
curActivityId = _args[2]
local heroId=_args[3]
--不知道干什么用的,下面没引用 注释了 by 王振兴 2021/5/27 心愿祈福活动修改
-- local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",curActivityId)
-- singleRecruit = array[1]
-- tenRecruit = array[2]
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",curActivityId)
singleRecruit = array[1]
tenRecruit = array[2]
local maxtimesId = lotterySetting[singleRecruit.Id].MaxTimes
-- local maxtimesId = lotterySetting[singleRecruit.Id].MaxTimes
curtimes = OperatingManager.TimeLimitedTimes
local wishConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId", curActivityId)
if not wishConfig then
LogError("")
return
end
local reward=nil
for i = 1,#wishConfig.UpList do
if wishConfig.UpList[i][1]==heroId then
reward=wishConfig.RewardList[i]
end
end
data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", curActivityId)
--替换奖励数据
for i = 1, #data do
data[i].Reward[1][1]=reward[i]
end
this:RefreshRewarid()
this.curtimes.text = "当前已招募次数:" .. curtimes
this.slider.fillAmount = this:CalculateInterval(curtimes)

View File

@ -327,4 +327,24 @@ function this.GetExpendData(type)
return d
end
function this.GetExpendDataByCostItem(str)
local d
local k=0
for i, v in ipairs(str) do
if BagManager.GetItemCountById(v[1])>=v[2] then
d=v
break
else
k=k+1
end
end
local l=#str
if k==l then
return str[l]
end
return d
end
return this

View File

@ -9,6 +9,7 @@ local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
local passiveSkillConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
local passiveSkillLogicConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig)
local heroRankupConfig=ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
local wishSettingConfig=ConfigManager.GetConfig(ConfigName.WishActivitySetting)
local isFirst=true--是否为第一次进入界面
local timeNum--第一个特效等待播放的时间
local timeNum2--第二个特效等待播放的时间
@ -23,6 +24,7 @@ local heroStaticData
local testLiveGO
local maxTimesId--特权id上限今日召唤上限
local _heroTable={} --符合4、5星的英雄容器
local func=nil
this.time = Timer.New()
this.time2 = Timer.New()
this.time3 = Timer.New()
@ -68,7 +70,7 @@ end
function SingleRecruitPanel:BindEvent()
Util.AddClick(self.sureBtn, function()
isFirst=true
if lotterySetting[type].LotteryType == 11 then
if lotterySetting[type] and lotterySetting[type].LotteryType == 11 then
isFirst=false
end
self:ClosePanel()
@ -78,6 +80,13 @@ function SingleRecruitPanel:BindEvent()
end
end)
Util.AddClick(self.againBtn, function()
if recruitType and recruitType[1]==RecruitType.PrayerSingle then
if func then
self:ClosePanel()
func()
end
return
end
local d=RecruitManager.GetExpendData(type)
if BagManager.GetItemCountById(d[1])<d[2] then
PopupTipPanel.ShowTip(GetLanguageStrById(itemConfig[d[1]].Name)..Language[10486])
@ -152,7 +161,7 @@ function SingleRecruitPanel:BindEvent()
elseif state==2 then
if index>=LengthOfTable(_heroTable) then
isFirst=true
if lotterySetting[type].LotteryType == 11 then
if lotterySetting[type] and lotterySetting[type].LotteryType == 11 then
isFirst=false
end
self:ClosePanel()
@ -196,10 +205,21 @@ function SingleRecruitPanel:OnOpen(...)
type=data[2]
state=data[3]
recruitType=data[4]
if not func then
func=data[5]
end
end
function SingleRecruitPanel:OnShow()
isFirst=true
maxTimesId=lotterySetting[type].MaxTimes --特权上限ID
if lotterySetting[type] then
maxTimesId=lotterySetting[type].MaxTimes --特权上限ID
else
local wishConfig=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wishConfig then
maxTimesId=wishConfig.MaxTimes
end
end
index=0
if recruitType[1] == RecruitType.XiangYaoSingle or recruitType[1] == RecruitType.XiangYaoTen then
this.jumpBtnGo:SetActive(false)
@ -207,14 +227,24 @@ function SingleRecruitPanel:OnShow()
this.jumpBtnGo:SetActive(true)
end
if state==1 then --单抽
if lotterySetting[type].LotteryType == 11 then
if lotterySetting[type] and lotterySetting[type].LotteryType == 11 then
isFirst=false
else
local config=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",type)
if config then
isFirst=false
end
end
self:TenOpenPanel()
elseif state==2 then
isFirst=true
if lotterySetting[type].LotteryType == 11 then
if lotterySetting[type] and lotterySetting[type].LotteryType == 11 then
isFirst=false
else
local config=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",type)
if config then
isFirst=false
end
end
_heroTable={}
--将符合条件的英雄插入容器中
@ -367,7 +397,12 @@ function SingleRecruitPanel:UpdataPanelData(_heroData)
self.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession))
self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation)
SetTextVerTial(self.posText.gameObject,Vector3.New(63.76,1.5,0),"MiddleLeft")
local d=RecruitManager.GetExpendData(type)
local d=nil
if recruitType and recruitType[1]==RecruitType.PrayerSingle then
d=RecruitManager.GetExpendDataByCostItem(wishSettingConfig[1].CostItemSingle)
else
d=RecruitManager.GetExpendData(type)
end
self.againIcon.sprite=this.spLoader:LoadSprite(artResourcesConfig[itemConfig[d[1]].ResourceID].Name)
self.againNum.text="×"..d[2]
this.rolePanel:SetActive(true)
@ -422,7 +457,9 @@ end
function SingleRecruitPanel:OnDestroy()
this.spLoader:Destroy()
if func then
func=nil
end
end
function this.CloseAllTimer()
if this.time then

View File

@ -110,7 +110,14 @@ function TenRecruitPanel:OnOpen(...)
HeroManager.DetectionOpenFiveStarActivity(heorConfig.Star)
end
end
local d=RecruitManager.GetExpendData(type)
local d=nil
local config=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",type)
if config then
local Setting= ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
d=RecruitManager.GetExpendDataByCostItem(Setting.CostItemMul)
else
d=RecruitManager.GetExpendData(type)
end
this.againIcon.sprite=this.spLoader:LoadSprite(artResourcesConfig[itemConfig[d[1]].ResourceID].Name)
this.againNum.text="×"..d[2]
maxTimesId=lotterySetting[type].MaxTimes --特权上限ID