Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
dev_chengFeng
ZhangBiao 2020-12-23 11:21:27 +08:00
commit e40364082c
38 changed files with 10701 additions and 57 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 814a374fa5248bc4f92e382b5827589b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 095aa8f76340f854aa387f03d93db7d7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9cb134e24edee994eba3589f249a134d
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: 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: 9dd5d21448f52ef49a02869ebd014d38
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: bab1dac9c73627d45977a00a6012edae
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: 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: ac2f8c419d67a8147aa3cd5759aa54c0
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 KiB

View File

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

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5982289411913821159
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3644406097787435293}
- component: {fileID: 214971614783951648}
- component: {fileID: 4683828369941970938}
m_Layer: 0
m_Name: live2d_xiaozhuanfeng
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3644406097787435293
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5982289411913821159}
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: 0}
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: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &214971614783951648
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5982289411913821159}
m_CullTransparentMesh: 0
--- !u!114 &4683828369941970938
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5982289411913821159}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
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
skeletonDataAsset: {fileID: 11400000, guid: b75ed5309b371764d9dcd5281c4ec26f, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle
startingLoop: 1
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eb9f3fea976f52d4e93be7e8c49e5e8c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,370 @@
xiaozhuanfeng.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
bangchui_54
rotate: true
xy: 500, 258
size: 52, 74
orig: 52, 74
offset: 0, 0
index: -1
beida_70
rotate: true
xy: 357, 435
size: 199, 181
orig: 199, 181
offset: 0, 0
index: -1
beilou_60
rotate: true
xy: 923, 494
size: 149, 89
orig: 149, 89
offset: 0, 0
index: -1
beilou_61
rotate: true
xy: 290, 385
size: 249, 65
orig: 249, 65
offset: 0, 0
index: -1
beilou_62
rotate: false
xy: 363, 744
size: 297, 278
orig: 297, 278
offset: 0, 0
index: -1
beilou_65
rotate: false
xy: 2, 86
size: 268, 166
orig: 268, 166
offset: 0, 0
index: -1
beilou_66
rotate: true
xy: 984, 965
size: 57, 38
orig: 57, 38
offset: 0, 0
index: -1
biyan_23
rotate: true
xy: 984, 881
size: 82, 24
orig: 82, 24
offset: 0, 0
index: -1
diaopai_33
rotate: false
xy: 844, 317
size: 20, 20
orig: 20, 20
offset: 0, 0
index: -1
diaopai_34
rotate: false
xy: 984, 820
size: 28, 59
orig: 28, 59
offset: 0, 0
index: -1
erduo_19
rotate: false
xy: 380, 202
size: 74, 42
orig: 74, 42
offset: 0, 0
index: -1
erduo_49
rotate: false
xy: 590, 643
size: 64, 46
orig: 64, 46
offset: 0, 0
index: -1
erhuan_17
rotate: true
xy: 875, 629
size: 14, 28
orig: 14, 28
offset: 0, 0
index: -1
erhuan_18
rotate: true
xy: 540, 435
size: 9, 22
orig: 9, 22
offset: 0, 0
index: -1
erhuan_20
rotate: true
xy: 707, 434
size: 10, 28
orig: 10, 28
offset: 0, 0
index: -1
erhuan_21
rotate: true
xy: 901, 342
size: 6, 21
orig: 6, 21
offset: 0, 0
index: -1
fuzhi_2
rotate: true
xy: 923, 433
size: 59, 96
orig: 59, 96
offset: 0, 0
index: -1
jiao_11
rotate: false
xy: 350, 17
size: 33, 55
orig: 33, 55
offset: 0, 0
index: -1
jiao_12
rotate: false
xy: 595, 330
size: 110, 114
orig: 110, 114
offset: 0, 0
index: -1
luo_8
rotate: false
xy: 813, 339
size: 86, 88
orig: 86, 88
offset: 0, 0
index: -1
luo_9
rotate: true
xy: 2, 2
size: 82, 85
orig: 82, 85
offset: 0, 0
index: -1
maimeng_68
rotate: false
xy: 540, 446
size: 199, 181
orig: 199, 181
offset: 0, 0
index: -1
qizhi_63
rotate: false
xy: 2, 636
size: 359, 386
orig: 359, 386
offset: 0, 0
index: -1
qizhi_67
rotate: true
xy: 2, 254
size: 380, 286
orig: 380, 286
offset: 0, 0
index: -1
tou_24
rotate: false
xy: 741, 429
size: 180, 198
orig: 180, 198
offset: 0, 0
index: -1
toufa_13
rotate: false
xy: 380, 133
size: 40, 67
orig: 40, 67
offset: 0, 0
index: -1
toufa_14
rotate: false
xy: 901, 350
size: 40, 77
orig: 40, 77
offset: 0, 0
index: -1
toufa_15
rotate: true
xy: 405, 246
size: 47, 93
orig: 47, 93
offset: 0, 0
index: -1
toufa_16
rotate: false
xy: 943, 357
size: 45, 74
orig: 45, 74
offset: 0, 0
index: -1
toufa_26
rotate: true
xy: 272, 74
size: 46, 102
orig: 46, 102
offset: 0, 0
index: -1
toufa_48
rotate: false
xy: 422, 138
size: 37, 62
orig: 37, 62
offset: 0, 0
index: -1
toufa_59
rotate: true
xy: 662, 629
size: 170, 211
orig: 170, 211
offset: 0, 0
index: -1
weijin_22
rotate: false
xy: 251, 21
size: 97, 51
orig: 97, 51
offset: 0, 0
index: -1
weijin_25
rotate: false
xy: 595, 299
size: 58, 29
orig: 58, 29
offset: 0, 0
index: -1
yaodai_36
rotate: true
xy: 662, 801
size: 221, 320
orig: 221, 320
offset: 0, 0
index: -1
yaodai_41
rotate: false
xy: 272, 122
size: 106, 124
orig: 106, 124
offset: 0, 0
index: -1
yifu_32
rotate: false
xy: 290, 248
size: 113, 135
orig: 113, 135
offset: 0, 0
index: -1
yifu_50
rotate: false
xy: 497, 312
size: 96, 121
orig: 96, 121
offset: 0, 0
index: -1
yifu_51
rotate: true
xy: 590, 691
size: 51, 70
orig: 51, 70
offset: 0, 0
index: -1
youshou_52
rotate: false
xy: 707, 323
size: 104, 104
orig: 104, 104
offset: 0, 0
index: -1
youshou_53
rotate: false
xy: 89, 2
size: 62, 82
orig: 62, 82
offset: 0, 0
index: -1
youshou_55
rotate: true
xy: 456, 202
size: 42, 40
orig: 42, 40
offset: 0, 0
index: -1
youshou_56
rotate: false
xy: 153, 20
size: 96, 64
orig: 96, 64
offset: 0, 0
index: -1
youshou_57
rotate: true
xy: 990, 353
size: 24, 32
orig: 24, 32
offset: 0, 0
index: -1
youshou_58
rotate: true
xy: 655, 301
size: 27, 40
orig: 27, 40
offset: 0, 0
index: -1
youtui_46
rotate: false
xy: 405, 295
size: 90, 138
orig: 90, 138
offset: 0, 0
index: -1
youtui_47
rotate: true
xy: 990, 379
size: 52, 32
orig: 52, 32
offset: 0, 0
index: -1
zuoshou_10
rotate: false
xy: 357, 388
size: 27, 45
orig: 27, 45
offset: 0, 0
index: -1
zuoshou_31
rotate: true
xy: 813, 313
size: 24, 29
orig: 24, 29
offset: 0, 0
index: -1
zuoshou_6
rotate: true
xy: 363, 638
size: 104, 225
orig: 104, 225
offset: 0, 0
index: -1
zuotui_44
rotate: false
xy: 875, 645
size: 117, 154
orig: 117, 154
offset: 0, 0
index: -1
zuotui_45
rotate: true
xy: 461, 144
size: 56, 41
orig: 56, 41
offset: 0, 0
index: -1

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: b50db9e87b291fa4db44a716a719f829
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: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 68c140e68c215b045a8863953487eab7
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6a75805188311914483cead3d3bcc5c5
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: xiaozhuanfeng_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: dd0ed7bee817bd1458e3d497381d31a3, type: 3}
materials:
- {fileID: 2100000, guid: 112136a8ab96ce14192d96e39142d3c2, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 852a028717a16ac4a90dfbebb4e8ef12
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: xiaozhuanfeng_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: b50db9e87b291fa4db44a716a719f829, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 112136a8ab96ce14192d96e39142d3c2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: xiaozhuanfeng_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: 852a028717a16ac4a90dfbebb4e8ef12, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 6a75805188311914483cead3d3bcc5c5, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b75ed5309b371764d9dcd5281c4ec26f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -472,6 +472,7 @@ PanelType = {
YiJingBaoKu = {14,16,1004},--易经宝库
LingShouBaoGe = {14,16,1204},--灵兽宝阁
XinJiangLaiXi = {14,16,1210},--新将来袭
XiangYaoDuoBao = {14,16,1220},--降妖夺宝
}
@ -530,6 +531,7 @@ UpViewRechargeType = {
XinJiangCoin = 1210,--新将来袭代币
YHMF= 21,--妖魂魔符
DingKunShenChu = 1004,-- 定卦神锄
YeQiuQuan = 1220,--野球拳法
}
SHOP_PAGE = {
@ -646,6 +648,7 @@ RedPointType = {
YiJingBaoKu = 2021,--易经宝库
LingShouBaoGe = 2022,--灵兽宝阁
XinJiangLaiXi = 2023,--新将来袭
XiangYaoDuoBao = 2024,--降妖夺宝
---聊天相关-----
Chat = 207,
Chat_Friend = 2070,
@ -1064,6 +1067,7 @@ ActivityTypeDef = {
PatFace = 29,--神兵天降
LuckyTurnTable_One=30,--幸运探宝
LuckyTurnTable_Two=31,--高级探宝
XiangYaoDuoBao=36,--降妖夺宝
Talisman=37,--法宝达人
SoulPrint=38,--魂印达人
SupremeHero = 42, -- 什么乱七八糟的奖励
@ -1498,6 +1502,7 @@ HELP_TYPE = {
YiJingBaoKu=77,--易经宝库
LingShouBaoGe=78,--灵兽宝阁
XinJiangLaiXi=81,--新将来袭
XiangYaoDuoBao=85,--降妖夺宝
}
NumToComplexFont = {
@ -1930,8 +1935,6 @@ RecruitType = {
LingShowSingle = 42, --零售单抽
LingShowTen = 43, --零售十连
-- FindFairySingle=13, --东海寻仙单抽
-- FindFairyTen=14, --东海寻仙十连
}
ItemBaseType = {
Special = 1, --特殊
@ -2063,6 +2066,7 @@ PRE_REWARD_POOL_TYPE = {
LOTTERY_SOUL_UP=11,--魂印抽取UP
LING_SHOU= 12,--灵兽
LING_SHOU_UP= 13,--灵兽抽取UP
XIANG_YAO_UP= 14,--降妖夺宝UP
}
DirectBuyType = {
XSHL = 11,--限时豪礼

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a59c532378302e1469d0feef9f512607
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4b65908381fc5a04f97cb2a3f6357620
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10,11 +10,16 @@ local listMonsterUpPre={} --灵兽
local monsterRate={}
local mainMonsterRate=0
local listNewHeroUpPre={} --降妖夺宝
local newHeroRate={}
local mainNewHeroRate=0
local panelType
local detailText={
[1] = HELP_TYPE.TimeLimitedCall,
[2] = HELP_TYPE.QianKunBox,
[3] = HELP_TYPE.LingShouBaoGe
[3] = HELP_TYPE.LingShouBaoGe,
[4] = HELP_TYPE.XiangYaoDuoBao,
}
function ActivityDetail:ctor(gameObject,type,effect)
@ -63,10 +68,90 @@ function ActivityDetail:OnShow()
self:ReFreshUpMonster()
self:RefreshMonsterRate()
str2=ActivityGiftManager.GetTimeStartToEnd(ActivityTypeDef.LingShouBaoGe)
elseif panelType==4 then--降妖夺宝
self:ReFreshUpNewHero()
self:RefreshNewHeroRate()
str2=ActivityGiftManager.GetTimeStartToEnd(ActivityTypeDef.XiangYaoDuoBao)
end
self.time.text=Language[12170]..str2
end
--============================降妖夺宝功能======================================
function ActivityDetail:ReFreshUpNewHero()
self.LookDetailBtn:SetActive(false)
local UpMonster=RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.XIANG_YAO_UP)
local rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData()
if(not listNewHeroUpPre) then
listNewHeroUpPre={}
end
if(not newHeroRate) then
newHeroRate={}
end
for n,m in ipairs(UpMonster) do
if m and m.Reward[1] == showData.monsterId then
if not listNewHeroUpPre[n] then
listNewHeroUpPre[n] = SubUIManager.Open(SubUIConfig.ItemView,self.itemGrid.transform)
end
listNewHeroUpPre[n]:OnOpen(false, {m.Reward[1], m.Reward[2]}, 1.1, true)
local weight = self:ReculateUpNewHeroRate(m.Reward[1])
local tempName = listNewHeroUpPre[n].name:GetComponent("Text").text
mainNewHeroRate = weight
listNewHeroUpPre[n].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (weight/100000)*100) .."%</color>"
listNewHeroUpPre[n].gameObject:SetActive(true)
table.insert(newHeroRate,{tag=Language[12223],name=tempName,value=weight})
end
end
end
--计算所有的比重
function ActivityDetail:ReculateUpNewHeroRate(id)
local UpMonster=RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.XIANG_YAO_UP)
for n,m in ipairs(UpMonster) do
if m and id==m.Reward[1] then
return m.Weight
end
end
return 0
end
function ActivityDetail:RefreshNewHeroRate()
local list1={}
local list2={}
local list3={}
local monsterRateList={}
local allValue
local UpMonster=RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.XIANG_YAO_UP)
for index, v in ipairs(UpMonster) do
if itemConfig[v.Reward[1]].HeroStar[2]==5 then
table.insert(list1,v)--五星应雄
elseif itemConfig[v.Reward[1]].HeroStar[2]==4 then
table.insert(list2,v)--四星应雄
elseif itemConfig[v.Reward[1]].HeroStar[2]==3 then
table.insert(list3,v)--三星应雄
end
end
-- LogGreen(self:ReculateRate(list1).." "..self:ReculateRate(list2).." "..self:ReculateRate(list3).." mainNewHeroRate:"..mainNewHeroRate)
table.insert(monsterRateList,{tag="五星",name="其他五星英雄",value=self:ReculateRate(list1)-mainNewHeroRate})
table.insert(monsterRateList,{tag="四星",name="四星英雄",value=self:ReculateRate(list2)})
table.insert(monsterRateList,{tag="三星",name="三星英雄",value=self:ReculateRate(list3)})
allValue = self:ReculateRate(list1) + self:ReculateRate(list2) + self:ReculateRate(list3)
for n,m in ipairs(monsterRateList) do
if m and m.value>0 then
local o=Util.GetGameObject(self.gameObject,"panel/rate/rate/rateprefab"..n)
if not o then
else
o.gameObject:SetActive(true)
Util.GetGameObject(o.gameObject,"star"):GetComponent("Text") .text=m.tag
Util.GetGameObject(o.gameObject,"name"):GetComponent("Text") .text=m.name
Util.GetGameObject(o.gameObject,"rate"):GetComponent("Text") .text=string.format("%.2f",(m.value/allValue)*100).."%"
end
end
end
end
--============================灵兽宝阁功能======================================
function ActivityDetail:ReFreshUpMonster()
self.LookDetailBtn:SetActive(false)
@ -352,6 +437,8 @@ function ActivityDetail:OnDestroy()
soulRate=nil
listMonsterUpPre=nil
monsterRate=nil
listNewHeroUpPre=nil
newHeroRate=nil
end
return ActivityDetail

View File

@ -258,8 +258,64 @@ function this.XinJiangBuildData()
local rewardGroupId = newHeroData.DropList[#newHeroData.DropList][2]
data.reward = ConfigManager.GetConfigData(ConfigName.RewardGroup,rewardGroupId).ShowItem
data.activityId = ActData.activityId
return data
end
function this.XiangYaoBuildData()
local rewardData={}
local showData={}
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.XiangYaoDuoBao)
local activityId = ActData.activityId
local LSrewardData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId)
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
local singleRecruit = array[1]
local tenRecruit = array[2]
local curScore = 0
--第一条为选择抽取的灵兽信息
for index, value in ipairs(ActData.mission) do
local v = ActData.mission[index]
if v.missionId == 0 then
if v.progress == 0 then
local mergePool = singleRecruit.MergePool
local poolId = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",mergePool).pool_id
local tempData = ConfigManager.GetConfigDataByKey(ConfigName.LotteryRewardConfig,"Pool",poolId)
showData.sasId = 0
showData.monsterId = tempData.Reward[1]
showData.iconId = LSrewardData[1].Reward[1][1]
else
local tempData = SpiritAnimalSummonConfig[v.progress]
showData.sasId = tempData.Id
showData.monsterId = tempData.FocusID
showData.iconId = tempData.TargetItemList[2]
end
end
end
--剩下的是奖励信息
for i = 1, #LSrewardData do
local v = LSrewardData[i]
for index, value in ipairs(ActData.mission) do
if v.Id == value.missionId then
local data = {}
data.missionId = value.missionId
data.reward = v.Reward
data.iconId = v.Reward[1][1]
data.num = v.Reward[1][2]
data.value = v.Values[1][1]
curScore = ActData.mission[index].progress
if curScore >= data.value then
if value.state == 0 then
data.state = 1--可领的
else
data.state = 2--领完的
end
else
data.state = 0--不可领的
end
table.insert(rewardData,data)
end
end
end
return rewardData,showData,curScore
end
return this

View File

@ -95,43 +95,47 @@ local tabs = {
default = "x_xiangjianglaixi_icon2", lock = "x_xiangjianglaixi_icon2", select = "x_xiangjianglaixi_icon1",
rpType = RedPointType.XinJiangLaiXi,panelType = PanelType.Main,ActType = ActivityTypeDef.XinJiangLaiXi
},
[23] = { --限时召唤
[23] = { --降妖夺宝
default = "x_xiangyaoduobao_icon2", lock = "x_xiangyaoduobao_icon2", select = "x_xiangyaoduobao_icon1",
rpType = RedPointType.XiangYaoDuoBao,panelType = PanelType.XiangYaoDuoBao,ActType = ActivityTypeDef.XiangYaoDuoBao
},
[24] = { --限时召唤
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy
},
[24] = { --乾坤宝盒
[25] = { --乾坤宝盒
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox
},
[25] = { --神医天降
[26] = { --神医天降
default = "s_shenyitianjiang_anniu_02", lock = "s_shenyitianjiang_anniu_02", select = "s_shenyitianjiang_anniu_01",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.ShenYiTianJiang
},
[26] = { --灵兽宝阁
[27] = { --灵兽宝阁
default = "l_lingshou_lingshoubaogeanniu02", lock = "l_lingshou_lingshoubaogeanniu02", select = "l_lingshou_lingshoubaogeanniu01",
rpType = RedPointType.LingShouBaoGe,panelType = PanelType.LingShouBaoGe,ActType = ActivityTypeDef.LingShouBaoGe
},
[27] = { --灵兽特惠
[28] = { --灵兽特惠
default = "l_lishoutehui_xianshibiao0", lock = "l_lishoutehui_xianshibiao0", select = "l_lishoutehui_anniu",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LingShowTeHui
},
[28] = { --珍奇礼包
[29] = { --珍奇礼包
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure
},
[29] = { --累计充值 一天一刷
[30] = { --累计充值 一天一刷
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.AccumulativeRechargeExper
},
[30] = { --累计充值 一周一刷
[31] = { --累计充值 一周一刷
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge
},
[31] = { --限时商市
[32] = { --限时商市
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop
},
[32] = { --限时兑换
[33] = { --限时兑换
default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu",
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange
},
@ -159,16 +163,17 @@ local _PageInfo = {--后期可以做成tableInserticon名字都去读表
[20] = 2,--社稷大典
[21] = 9,--易经宝库
[22] = 13,--新将来袭
[23] = 3,--限时召唤
[24] = 4,--乾坤宝盒
[25] = 10,--神衣天降
[26] = 12,--灵兽宝阁
[27] = 11,
[28] = 5,
[29] = 6,
[23] = 14,--降妖夺宝
[24] = 3,--限时召唤
[25] = 4,--乾坤宝盒
[26] = 10,--神衣天降
[27] = 12,--灵兽宝阁
[28] = 11,
[29] = 5,
[30] = 6,
[31] = 7,
[32] = 8,
[31] = 6,
[32] = 7,
[33] = 8,
}
local curActivityCount = {
[1] = require("Modules/DynamicActivity/DynamicTaskPage"),
@ -184,6 +189,7 @@ local curActivityCount = {
[11] = require("Modules/DynamicActivity/LingShowTeHui"),
[12] = require("Modules/DynamicActivity/LingShouBaoGe"),
[13] = require("Modules/DynamicActivity/XinJiangLaiXi"),
[14] = require("Modules/DynamicActivity/XiangYaoDuoBao"),
}
--初始化组件(用于子类重写)

View File

@ -0,0 +1,344 @@
local XiangYaoDuoBao= quick_class("XiangYaoDuoBao")
local this = XiangYaoDuoBao
local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
local SpiritAnimalConfig = ConfigManager.GetConfig(ConfigName.SpiritAnimal)
local activityId = 0
local singleRecruit = nil
local tenRecruit = nil
local sortingOrder = 0
local parent
local freeTime= 0 --免费抽取次数
local showData = {}
local rewardData = {}
local curScore = 0
local Live
local bgName
local RoleLiveGOGraphic
local ActData=nil
local LSrewardData=nil
--按钮类型
local bType={
Btn1=1,
Btn10=2
}
--type与lotterySetting表中的id对应
local btns={ [bType.Btn1]={name="Btn1",isInfo="1次"}, [bType.Btn10]={name="Btn10",isInfo="10次"}}
function XiangYaoDuoBao:ctor(mainPanel, gameObject)
this.mainPanel = mainPanel
this.gameObject = gameObject
this:InitComponent(gameObject)
this:BindEvent()
end
function XiangYaoDuoBao:InitComponent(gameObject)
this.helpBtn = Util.GetGameObject(this.gameObject,"help")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
this.detailBtn = Util.GetGameObject(this.gameObject,"rightUp/detailBtn")
this.btn = Util.GetGameObject(this.gameObject,"Btn")
this.upper=Util.GetGameObject(this.gameObject,"bottom/times"):GetComponent("Text") ---召唤上限
this.tip1=Util.GetGameObject(this.gameObject,"bottom/Tip1"):GetComponent("Text") ---刷新时间
this.tip2=Util.GetGameObject(this.gameObject,"bottom/Tip2"):GetComponent("Text") --妖晶限购
this.btnGroup=Util.GetGameObject(this.gameObject,"bottom/btngroup")
this.leftTime=Util.GetGameObject(this.gameObject,"time/lefttime"):GetComponent("Text")
this.detail= Util.GetGameObject(this.gameObject, "detail")
this.detail.gameObject:SetActive(false)
this.grid = Util.GetGameObject(this.gameObject, "aniRoot")
--mid
this.progressValue = Util.GetGameObject(this.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount
this.reward = Util.GetGameObject(this.gameObject, "mid/reward")
this.value = Util.GetGameObject(this.gameObject, "mid/value")
end
function XiangYaoDuoBao:BindEvent()
Util.AddClick(this.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.XiangYaoDuoBao,this.helpPosition.x,this.helpPosition.y)
end)
Util.AddClick(this.detailBtn, function()
ActivityDetail.new(this.detail,4)
end)
Util.AddClick(this.btn,function ()
local thread=coroutine.start(function()
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "shuajian", true)
this.btn:SetActive(false)
coroutine.wait(2.5)
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
this.btn:SetActive(true)
end)
end)
end
function XiangYaoDuoBao:OnShow(_sortingOrder,_parent)
parent = _parent
sortingOrder = _sortingOrder
this.gameObject:SetActive(true)
this:Refresh()
end
function XiangYaoDuoBao:Refresh()
ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.XiangYaoDuoBao)
activityId = ActData.activityId
LSrewardData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId)
local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId)
singleRecruit = array[1]
tenRecruit = array[2]
CheckRedPointStatus(RedPointType.XiangYaoDuoBao)
this:refreshBtnShow()--刷新按钮显示
this:TimeCountDown()--时间
this:SetData()--加载界面数据立绘+进度条
end
function XiangYaoDuoBao:SetData()
rewardData={}
showData={}
rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData()
--设置立绘
if Live then
poolManager:UnLoadLive(bgName, Live)
end
bgName = "live2d_xiaozhuanfeng"
Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.New(0.5,0.5,0.5), Vector2.New(0,-300))
RoleLiveGOGraphic = Live:GetComponent("SkeletonGraphic")
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
--设置奖励
this.progressValue.fillAmount = curScore/LSrewardData[#LSrewardData].Values[1][1]
Util.GetGameObject(this.value, "num"):GetComponent("Text").text = curScore
Util.GetGameObject(this.value, "tips"):GetComponent("Text").text = "宝阁值"
for i = 1, this.reward.transform.childCount do
local item = this.reward.transform:GetChild(i-1)
Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = LSrewardData[i].Reward[1][2]
Util.GetGameObject(item, "Text"):GetComponent("Text").text = LSrewardData[i].Values[1][1]
Util.GetGameObject(item, "icon"):GetComponent("Image").sprite = Util.LoadSprite(artConfig[itemConfig[rewardData[i].iconId].ResourceID].Name)
Util.GetGameObject(item, "red"):SetActive(rewardData[i].state == 1)
local btn = Util.GetGameObject(item, "icon")
Util.AddOnceClick(btn,function ()
if rewardData[i].state == 1 then
NetManager.GetActivityRewardRequest(rewardData[i].missionId,activityId,function (drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function ()
this:Refresh()
end)
end)
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,LSrewardData[i].Reward[1][1],nil)
end
end)
end
end
function XiangYaoDuoBao:refreshBtnShow()
--下方的数量显示
local maxtimesId=singleRecruit.MaxTimes
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
this.upper.text = Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--召唤上限
--下方的数量显示
local curMoneyTimes=PrivilegeManager.GetPrivilegeRemainValue(singleRecruit.MoneyTimes)
this.tip2.text = "妖晶限购"..curMoneyTimes..""
--是否是免费抽
local freeTimesId=singleRecruit.FreeTimes
if freeTimesId > 0 then
freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
RecruitManager.freeUseTimeList[freeTimesId] = freeTime
end
--按钮赋值
for n, m in ipairs(btns) do
local btn = Util.GetGameObject(this.btnGroup,m.name)
local redPot = Util.GetGameObject(btn.gameObject,"RedPoint")
local info = Util.GetGameObject(btn.gameObject,"Content/Info"):GetComponent("Text")
local icon = Util.GetGameObject(btn.gameObject,"Content/Icon"):GetComponent("Image")
local num = Util.GetGameObject(btn.gameObject,"Content/Num"):GetComponent("Text")
--存在免费次数 并且 免费>=1 并且是1按钮
local isFree = freeTime and freeTime >= 1 and n == bType.Btn1
redPot.gameObject:SetActive(isFree)
icon.gameObject:SetActive(not isFree)
num.gameObject:SetActive(not isFree)
this.tip1.gameObject:SetActive(freeTime == 0)
local itemId=0
local itemNum=0
local type = 0
type = n == bType.Btn1 and singleRecruit.Id or tenRecruit.Id
local d = RecruitManager.GetExpendData(type)
if isFree then
info.text=" "..Language[11759]
else
itemId = d[1]
itemNum = d[2]
icon.sprite = Util.LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
info.text = m.isInfo
num.text = "x"..itemNum
end
Util.AddOnceClick(btn,function()
if not isFree then
if BagManager.GetItemCountById(itemId)<d[2] then
PopupTipPanel.ShowTip(itemConfig[itemId].Name..Language[10492])
return
end
end
local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten)
if n==bType.Btn1 then
if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+1>privilegeConfig[maxtimesId].Condition[1][2] then
PopupTipPanel.ShowTip(Language[11760])
return
end
if d[1] == 16 and PrivilegeManager.GetPrivilegeUsedTimes(singleRecruit.MoneyTimes)+1>privilegeConfig[singleRecruit.MoneyTimes].Condition[1][2] and not isFree then
PopupTipPanel.ShowTip("今日妖晶召唤次数不足!")
return
end
local recruitOne = function()
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "hit1", true)
Timer.New(function ()
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
RecruitManager.RecruitRequest(singleRecruit.Id, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数
if not isFree and d[1] == 16 then
PrivilegeManager.RefreshPrivilegeUsedTimes(singleRecruit.MoneyTimes,1)--记录妖晶抽卡次数
end
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1)
CheckRedPointStatus(RedPointType.XiangYaoDuoBao)
end,freeTimesId)
end,1.2):Start()
end
if state==0 and d[1] == 16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne)
else
recruitOne()
end
elseif n==bType.Btn10 then
if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+10>privilegeConfig[maxtimesId].Condition[1][2] then
PopupTipPanel.ShowTip(Language[11760])
return
end
if d[1] == 16 and PrivilegeManager.GetPrivilegeUsedTimes(tenRecruit.MoneyTimes)+10>privilegeConfig[tenRecruit.MoneyTimes].Condition[1][2] then
PopupTipPanel.ShowTip("今日妖晶召唤次数不足!")
return
end
local recruitTen = function()
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "hit3", true)
Timer.New(function ()
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
RecruitManager.RecruitRequest(tenRecruit.Id, function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数
if d[1] == 16 then
PrivilegeManager.RefreshPrivilegeUsedTimes(singleRecruit.MoneyTimes,10)--记录妖晶抽卡次数
end
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,tenRecruit.Id,bType.Btn10)
CheckRedPointStatus(RedPointType.XiangYaoDuoBao)
end,freeTimesId)
end,1.2):Start()
end
if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen)
else
recruitTen()
end
end
end)
end
end
--- 将一段时间转换为天时分秒
function XiangYaoDuoBao: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(Language[12231],minute, sec)
else
return string.format(Language[12232],day, hour)
end
end
--刷新时间
function XiangYaoDuoBao:TimeCountDown()
if this.timer then
this.timer:Stop()
this.timer = nil
end
local timeDown=CalculateSecondsNowTo_N_OClock(5)
this.tip1.text = TimeToHMS(timeDown)..Language[12200]
local timeDown2 = ActData.endTime - GetTimeStamp()
this.leftTime.text = Language[10028]..TimeToFelaxible(timeDown2)
this.tip1.gameObject:SetActive( (freeTime == 0) and (timeDown < timeDown2))
this.timer = Timer.New(function()
if timeDown < 1 then
this.timer:Stop()
this.timer = nil
this:Refresh()
return
end
if timeDown2 < 1 then
this.timer:Stop()
this.timer = nil
parent:ClosePanel()
return
end
timeDown = timeDown - 1
timeDown2 = timeDown2 -1
this.tip1.text = TimeToHMS(timeDown)..Language[12200]
this.leftTime.text = Language[10028]..TimeToFelaxible(timeDown2)
end, 1, -1, true)
this.timer:Start()
end
function XiangYaoDuoBao:OnHide()
if Live then
poolManager:UnLoadLive(bgName, Live)
end
Live = nil
this.gameObject:SetActive(false)
this.detail.gameObject:SetActive(false)
if this.timer then
this.timer:Stop()
this.timer = nil
end
end
function XiangYaoDuoBao:OnDestroy()
if Live then
poolManager:UnLoadLive(bgName, Live)
end
Live = nil
ActivityDetail.OnDestroy()
end
--添加事件监听(用于子类重写)
function XiangYaoDuoBao:AddListener()
end
--移除事件监听(用于子类重写)
function XiangYaoDuoBao:RemoveListener()
end
return XiangYaoDuoBao

View File

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

View File

@ -59,10 +59,7 @@ function this:OnShow(_parent,...)
var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen
this.rootText.text = string.format("确认花费%s妖晶进行10次灵兽召唤",_args[3])
else
LogBlue("_args[1]:".._args[1])
local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1])
LogBlue("data.PerCount:"..data.PerCount)
LogBlue("data.ActivityId:"..data.ActivityId)
local activityData
if data.LotteryType == 3 then
activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId)

View File

@ -42,7 +42,7 @@ function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum)
NetManager.RecruitRequest(recruitType, function(msg)
local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType)
if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or (data.LotteryType == 3 and data.PerCount == 1) or(data.LotteryType == 9 and data.PerCount == 1) or
RecruitType.LingShowSingle== recruitType ) or (data.LotteryType == 10 and data.PerCount == 1) then --若某抽卡类型有免费次数
RecruitType.LingShowSingle== recruitType ) or (data.LotteryType == 10 and data.PerCount == 1) or (data.LotteryType == 11 and data.PerCount == 1)then --若某抽卡类型有免费次数
if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then
PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1)
this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId)
@ -100,12 +100,12 @@ function this.InitPreData()
this.previewNormalData={}
this.previewElementData={}
this.previewLuckData = {} --- 幸运探宝
this.previewGhostFindData = {}
this.previewTimeLimitedData = {}--限时招募
this.previewTimeLimitedUPData={}
this.previewLotterySoulData = {}--乾坤宝囊其他奖励
this.previewLotterySoulUPData={}--乾坤宝囊魂印up保底
this.previewLingShou={} --灵兽奖励数据
-- this.previewGhostFindData = {}
-- this.previewTimeLimitedData = {}--限时招募
-- this.previewTimeLimitedUPData={}
-- this.previewLotterySoulData = {}--乾坤宝囊其他奖励
-- this.previewLotterySoulUPData={}--乾坤宝囊魂印up保底
if(#this.previewHeroData>=1) then
return
end
@ -196,6 +196,7 @@ function this.InitPreData()
end)
--元素
LogPink("#this.previewElementData:"..#this.previewElementData)
table.sort(this.previewElementData, function(a, b)
if (itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity) then
if (a.Quality == b.Quality) then
@ -212,41 +213,44 @@ end
--获取抽卡奖励预览数据
function this.GetRewardPreviewData(type)
if type == PRE_REWARD_POOL_TYPE.RECRUIT then
if type == PRE_REWARD_POOL_TYPE.RECRUIT then--常驻
return this.previewHeroData
elseif type == PRE_REWARD_POOL_TYPE.ELEMENT_RECRUIT then
elseif type == PRE_REWARD_POOL_TYPE.ELEMENT_RECRUIT then--常驻
return this.previewElementData
elseif type == PRE_REWARD_POOL_TYPE.LUCK_FIND then
elseif type == PRE_REWARD_POOL_TYPE.LUCK_FIND then--常驻
return this.previewLuckData
elseif type == PRE_REWARD_POOL_TYPE.GHOST_FIND then
return this.previewGhostFindData
elseif type ==PRE_REWARD_POOL_TYPE.FRIEND then
-- elseif type == PRE_REWARD_POOL_TYPE.GHOST_FIND then--常驻
-- return this.previewGhostFindData
elseif type ==PRE_REWARD_POOL_TYPE.FRIEND then--常驻
return this.previewFriendData
elseif type==PRE_REWARD_POOL_TYPE.NORMAL then
elseif type==PRE_REWARD_POOL_TYPE.NORMAL then--常驻
return this.previewNormalData
elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP
or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP then
return this.GetActivityPreviewData(type)
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU then
return this.previewLingShou
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU then--常驻
return this.previewLingShou
elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED--限时招募--开启时间有限制的
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP--限时招募UP
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP--乾坤宝盒UP
or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP
or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP
return this.GetActivityPreviewData(type)--非常驻抽卡需要检测时间
end
end
function this.GetActivityPreviewData(type)
function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览
local previewData = {}
-- 根据当前期获取卡池信息
local curActivityId = nil
if type==PRE_REWARD_POOL_TYPE.TIME_LIMITED
or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP then
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL
or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP then
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LingShouBaoGe)
elseif type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then
curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao)
end
local data = nil
if curActivityId ~= nil then --活动招募
@ -257,14 +261,12 @@ function this.GetActivityPreviewData(type)
end
local poolId = nil
if data ~= nil then
if type == PRE_REWARD_POOL_TYPE.TIME_LIMITED
or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then
if type == PRE_REWARD_POOL_TYPE.TIME_LIMITED or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒
poolId = data.DiamondBoxContain[1][1]
elseif type == PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP
or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then
elseif type == PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP乾坤宝盒UP
data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool)
poolId = data.pool_id
elseif type == PRE_REWARD_POOL_TYPE.LING_SHOU_UP then
elseif type == PRE_REWARD_POOL_TYPE.LING_SHOU_UP or type == PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--灵兽宝阁,降妖夺宝
poolId = data.DiamondBoxContain[1][1]
end
else

View File

@ -71,12 +71,21 @@ function SingleRecruitPanel:BindEvent()
PopupTipPanel.ShowTip(Language[11760])
return
end
if d[1] == 16 then
if PrivilegeManager.GetPrivilegeRemainValue(lotterySetting[type].MoneyTimes) < 1 then
PopupTipPanel.ShowTip("今日妖晶召唤次数不足!")
return
end
end
RecruitManager.RecruitRequest(type,function(msg)
if lotterySetting[type].MoneyTimes and lotterySetting[type].MoneyTimes > 0 then
PrivilegeManager.RefreshPrivilegeUsedTimes(lotterySetting[type].MoneyTimes,1)--记录妖晶限购抽卡次数
end
PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,1)--记录抽卡次数
for i=1, #msg.drop.Hero do
heroData = msg.drop.Hero[i]
self:UpdataPanelData(heroData)
end
end
end,maxTimesId)
end)
Util.AddClick(this.dragView.gameObject, function ()

View File

@ -42,7 +42,16 @@ function TenRecruitPanel:BindEvent()
PopupTipPanel.ShowTip(Language[11760])
return
end
if d[1] == 16 then
if PrivilegeManager.GetPrivilegeRemainValue(lotterySetting[type].MoneyTimes) < 10 then
PopupTipPanel.ShowTip("今日妖晶召唤次数不足!")
return
end
end
RecruitManager.RecruitRequest(type, function(msg)
if lotterySetting[type].MoneyTimes and lotterySetting[type].MoneyTimes > 0 then
PrivilegeManager.RefreshPrivilegeUsedTimes(lotterySetting[type].MoneyTimes,10)--记录妖晶限购抽卡次数
end
PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, type,2)
end,maxTimesId)

View File

@ -50,6 +50,7 @@ local _ShowPlusType = {
UpViewRechargeType.YHMF,
UpViewRechargeType.QuLingBi,
UpViewRechargeType.DingKunShenChu,
UpViewRechargeType.YeQiuQuan,
}
-- 判断是否显示加号
@ -327,6 +328,8 @@ function UpView:RechargeType(_type)
end
UIManager.OpenPanel(UIName.MainRechargePanel, 1)
end
elseif _type == UpViewRechargeType.YeQiuQuan then
UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.DynamicAct_TimeLimitShop)
elseif _type == UpViewRechargeType.GrowthAmulet or
_type == UpViewRechargeType.Yaoh or
_type == UpViewRechargeType.Panacea or
@ -352,8 +355,7 @@ function UpView:RechargeType(_type)
_type==UpViewRechargeType.XianLingCao or
_type==UpViewRechargeType.YHMF or
_type==UpViewRechargeType.EndlessCoin or
_type==UpViewRechargeType.QuLingBi
then
_type==UpViewRechargeType.QuLingBi then
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
end
end