Merge branch '0活动/新大圣升星' into china/dev
commit
5d2838554d
Binary file not shown.
After Width: | Height: | Size: 420 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aa26f111a40607e4ca5bcc36c8bb6a82
|
||||
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: 57
|
||||
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: f0844dd873ea4d84885acc158c6a935f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 201 KiB |
|
@ -0,0 +1,131 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 36493be3c8f5a2b4db0dadc4aafb36f1
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: d_dengfengzaoji_dazi_1_zh
|
||||
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: 2
|
||||
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: 57
|
||||
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:
|
||||
- serializedVersion: 2
|
||||
name: d_dengfengzaoji_dazi_1_zh
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 501
|
||||
height: 382
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 9a9766de0b1b1084e972718e048b4e6c
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5910708250d2aba44adc73c33ff94fd8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 196 KiB |
|
@ -1,7 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 16bad693b02a46a429a2bb08a7e44335
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
fileIDToRecycleName:
|
||||
21300000: d_dengfengzaoji_dazi_zh
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
|
@ -40,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
@ -93,7 +94,27 @@ TextureImporter:
|
|||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: d_dengfengzaoji_dazi_zh
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 501
|
||||
height: 382
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: f24f1adb0a2860c4280c8b2c46d0b540
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: eb1de0514f514df4d9199b8c4c6b6aa0
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -35,7 +35,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -359.1, y: -10.675}
|
||||
m_AnchoredPosition: {x: -333, y: -10.675}
|
||||
m_SizeDelta: {x: 9.69, y: 135.15}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6084161442811714284
|
||||
|
@ -129,7 +129,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -195.20065, y: 71.95}
|
||||
m_AnchoredPosition: {x: -195.20024, y: 71.95}
|
||||
m_SizeDelta: {x: 0, y: 144}
|
||||
m_Pivot: {x: 0, y: 1.0000001}
|
||||
--- !u!114 &8585533787268794185
|
||||
|
@ -287,7 +287,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 4, y: 7}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7080327840937121481
|
||||
|
@ -362,7 +362,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 140, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 61.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &170924767488423321
|
||||
|
@ -5493,7 +5493,7 @@ ParticleSystem:
|
|||
--- !u!199 &4744428277161816857
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -10216,7 +10216,7 @@ ParticleSystem:
|
|||
--- !u!199 &4744428277762312994
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -14971,7 +14971,7 @@ ParticleSystem:
|
|||
--- !u!199 &4744428278443683618
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -15513,7 +15513,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -480.5, y: 68.5}
|
||||
m_AnchoredPosition: {x: -468, y: 68.5}
|
||||
m_SizeDelta: {x: 0, y: 144}
|
||||
m_Pivot: {x: 0, y: 1.0000001}
|
||||
--- !u!114 &8120024466581524718
|
||||
|
|
|
@ -991,6 +991,7 @@ RedPointType = {
|
|||
wujinTreasure = 8501,
|
||||
wujinBianDui = 8502,
|
||||
chaofanrushengRed = 8503,
|
||||
UpStarGift = 8504,
|
||||
|
||||
jijin128 = 78,
|
||||
jijin328 = 79,
|
||||
|
@ -1396,6 +1397,7 @@ ActivityTypeDef = {
|
|||
MeiRiLiBao = 10004,
|
||||
lingLongBaoJing = 67,
|
||||
ChaoFanRuSheng = 500, --超凡入圣
|
||||
UpStarGift = 94, --升星有礼(新超凡入圣)
|
||||
JourneyWithWind = 72, --缥缈之旅
|
||||
FifteenDayGiftNotice = 80,--15日登陆预告
|
||||
DynamicActShop = 81,--主题活动商店
|
||||
|
|
|
@ -526,4 +526,5 @@ SubUIConfig = {
|
|||
[35] = {name = "page16",assetName = "page16",script = "Modules/TailsManSoul/TailsmanSoulChipLottery"},
|
||||
[36] = {name = "page17",assetName = "page17",script = "Modules/Incarnation/IncarnationLottery"},
|
||||
[37] = {name = "RecruitTreasurePanel",assetName = "RecruitTreasurePanel",script = "Modules/TreasureOfHeaven/RecruitTreasurePanel"},
|
||||
[38] = {name = "UpStarGift",assetName = "UpStarGift",script = "Modules/DynamicActivity/UpStarGift"},
|
||||
}
|
|
@ -103,6 +103,9 @@ BUYGOODSTOITEMREQUEST_GOODID_FIELD = protobuf.FieldDescriptor();
|
|||
BUYGOODSTOITEMREQUEST_GOODSNUM_FIELD = protobuf.FieldDescriptor();
|
||||
BUYGOODSTOITEMRESPONSE = protobuf.Descriptor();
|
||||
BUYGOODSTOITEMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
UPSTARACTIVITYSELECTREQUEST = protobuf.Descriptor();
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
|
||||
|
@ -989,6 +992,33 @@ BUYGOODSTOITEMRESPONSE.enum_types = {}
|
|||
BUYGOODSTOITEMRESPONSE.fields = {BUYGOODSTOITEMRESPONSE_DROP_FIELD}
|
||||
BUYGOODSTOITEMRESPONSE.is_extendable = false
|
||||
BUYGOODSTOITEMRESPONSE.extensions = {}
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.UpStarActivitySelectRequest.activityId"
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.number = 1
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.index = 0
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.label = 1
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.has_default_value = false
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.default_value = 0
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.type = 5
|
||||
UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD.cpp_type = 1
|
||||
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.name = "selectId"
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.full_name = ".rpc.protocols.UpStarActivitySelectRequest.selectId"
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.number = 2
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.index = 1
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.label = 1
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.has_default_value = false
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.default_value = 0
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.type = 5
|
||||
UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD.cpp_type = 1
|
||||
|
||||
UPSTARACTIVITYSELECTREQUEST.name = "UpStarActivitySelectRequest"
|
||||
UPSTARACTIVITYSELECTREQUEST.full_name = ".rpc.protocols.UpStarActivitySelectRequest"
|
||||
UPSTARACTIVITYSELECTREQUEST.nested_types = {}
|
||||
UPSTARACTIVITYSELECTREQUEST.enum_types = {}
|
||||
UPSTARACTIVITYSELECTREQUEST.fields = {UPSTARACTIVITYSELECTREQUEST_ACTIVITYID_FIELD, UPSTARACTIVITYSELECTREQUEST_SELECTID_FIELD}
|
||||
UPSTARACTIVITYSELECTREQUEST.is_extendable = false
|
||||
UPSTARACTIVITYSELECTREQUEST.extensions = {}
|
||||
|
||||
BuyGoodsToItemRequest = protobuf.Message(BUYGOODSTOITEMREQUEST)
|
||||
BuyGoodsToItemResponse = protobuf.Message(BUYGOODSTOITEMRESPONSE)
|
||||
|
@ -1016,6 +1046,7 @@ SpecicalMonsterChooseRequest = protobuf.Message(SPECICALMONSTERCHOOSEREQUEST)
|
|||
TasuilingxiaoRequest = protobuf.Message(TASUILINGXIAOREQUEST)
|
||||
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
|
||||
TrumpGachaSelectItemRequest = protobuf.Message(TRUMPGACHASELECTITEMREQUEST)
|
||||
UpStarActivitySelectRequest = protobuf.Message(UPSTARACTIVITYSELECTREQUEST)
|
||||
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
|
||||
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
|
||||
WeekCardIndicationInfoResponse = protobuf.Message(WEEKCARDINDICATIONINFORESPONSE)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -579,6 +579,7 @@ function this.RefreshActivityRedPoint()
|
|||
-- CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
CheckRedPointStatus(RedPointType.chaofanrushengRed)
|
||||
CheckRedPointStatus(RedPointType.UpStarGift)
|
||||
CheckRedPointStatus(RedPointType.jijin128)
|
||||
CheckRedPointStatus(RedPointType.jijin328)
|
||||
CheckRedPointStatus(RedPointType.SupremeHero)
|
||||
|
@ -1187,6 +1188,24 @@ function this.CheckRedPointChaofanRuSheng()
|
|||
end
|
||||
return false
|
||||
end
|
||||
--限时升星红点检查
|
||||
function this.CheckRedPointUpStarGift()
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.UpStarGift) then
|
||||
return false
|
||||
end
|
||||
local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.UpStarGift)
|
||||
if data and data.mission and #data.mission > 0 then
|
||||
if not data.value or data.value == 0 then
|
||||
return true
|
||||
end
|
||||
for i = 1, #data.mission do
|
||||
if data.mission[i].state == 1 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
--右侧伸缩条大小检测
|
||||
function this.CheckRightUpArenaSize()
|
||||
|
|
|
@ -84,7 +84,23 @@ function TimeLimitUpHero:BindEvent()
|
|||
-- JumpManager.GoJump(40014)
|
||||
-- end)
|
||||
Util.AddClick(self.btn_hero.gameObject, function()
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero,self.actId,curHeroId)
|
||||
-- 制作数据
|
||||
local upConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId", self.actId)
|
||||
if not upConfig then
|
||||
return
|
||||
end
|
||||
local str=upConfig.UpList
|
||||
local heros={}
|
||||
for i = 1, #str do
|
||||
table.insert(heros,str[i][1])
|
||||
end
|
||||
-- 打开选择界面
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero,heros, curHeroId, function(chooseId)
|
||||
NetManager.ChoiceHeroRewardRequest(self.actId,chooseId,function()
|
||||
ActivityGiftManager.SetActivityInfoRewardId(self.actId,chooseId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,chooseId)
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
Util.AddClick(self.dragView.gameObject, function()
|
||||
local SkeletonGraphic = heroLiveObj:GetComponent("SkeletonGraphic")
|
||||
|
|
|
@ -0,0 +1,397 @@
|
|||
local UpStarGift = {}
|
||||
local rechargeNum = 0
|
||||
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
function UpStarGift:New(gameObject)
|
||||
local b = {}
|
||||
b.gameObject = gameObject
|
||||
b.transform = gameObject.transform
|
||||
setmetatable(b, { __index = UpStarGift })
|
||||
return b
|
||||
end
|
||||
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function UpStarGift:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, self.EventRefreshData, self)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, self.EventRefreshData, self)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange, self.EventRefreshData, self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function UpStarGift:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, self.EventRefreshData, self)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, self.EventRefreshData,self)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange, self.EventRefreshData,self)
|
||||
end
|
||||
|
||||
function UpStarGift:EventRefreshData()
|
||||
self:RefreshData(true,false,false)
|
||||
end
|
||||
|
||||
function UpStarGift:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.bg = Util.GetGameObject(self.gameObject, "Bg/banner")
|
||||
self.titleBgIma = self.bg:GetComponent("Image")
|
||||
self.titleIma = Util.GetGameObject(self.bg,"titleIma"):GetComponent("Image")
|
||||
self.titleTipBg = Util.GetGameObject(self.bg,"titleTipBg"):GetComponent("Image")
|
||||
self.titleTip = Util.GetGameObject(self.bg,"titleTip"):GetComponent("Text")
|
||||
|
||||
self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem")
|
||||
self.scrollItemPos = self.scrollItem.transform.localPosition
|
||||
self.scrollItemRect = self.scrollItem.transform.rect
|
||||
self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp")
|
||||
self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition
|
||||
self.itemPre = Util.GetGameObject(self.gameObject, "ItemPre")
|
||||
self.sortingOrder = 0
|
||||
|
||||
self.time = Util.GetGameObject(self.gameObject, "Bg/banner/time")
|
||||
self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text")
|
||||
self.ItemList = {}
|
||||
|
||||
|
||||
self.btnAdd = Util.GetGameObject(self.gameObject, "Bg/banner/btnAdd")
|
||||
self.btnChoose = Util.GetGameObject(self.gameObject, "Bg/banner/btnChoose")
|
||||
self.btnLock = Util.GetGameObject(self.gameObject, "Bg/banner/btnLock")
|
||||
self.liveRoot = Util.GetGameObject(self.gameObject, "Bg/banner/live/liveRoot")
|
||||
|
||||
end
|
||||
|
||||
function UpStarGift:BindEvent()
|
||||
Util.AddClick(self.btnHelp,function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y)
|
||||
end)
|
||||
Util.AddClick(self.btnAdd,function()
|
||||
local choose, isTemp = self:GetCurChooseHero()
|
||||
if not isTemp then
|
||||
PopupTipPanel.ShowTip("当前已处于锁定状态")
|
||||
return
|
||||
end
|
||||
local heroList = self:GetHeroList()
|
||||
if not heroList or #heroList <= 0 then
|
||||
PopupTipPanel.ShowTip("未找到本期活动的神将信息")
|
||||
return
|
||||
end
|
||||
-- 打开选择界面
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero, heroList, choose, function(chooseId)
|
||||
self.tempChoose = chooseId
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."_UpStarGift_TempChoose", chooseId)
|
||||
-- 刷新界面限显示
|
||||
self:RefreshData(true,true,true)
|
||||
end, "选择神将")
|
||||
|
||||
|
||||
end)
|
||||
Util.AddClick(self.btnChoose,function()
|
||||
local choose, isTemp = self:GetCurChooseHero()
|
||||
if not isTemp then
|
||||
PopupTipPanel.ShowTip("当前已处于锁定状态")
|
||||
return
|
||||
end
|
||||
local heroList = self:GetHeroList()
|
||||
if not heroList or #heroList <= 0 then
|
||||
PopupTipPanel.ShowTip("未找到本期活动的神将信息")
|
||||
return
|
||||
end
|
||||
|
||||
-- 打开选择界面
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero, heroList, choose, function(chooseId)
|
||||
self.tempChoose = chooseId
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."_UpStarGift_TempChoose", chooseId)
|
||||
-- 刷新界面限显示
|
||||
self:RefreshData(true,true,true)
|
||||
end, "选择神将")
|
||||
|
||||
end)
|
||||
Util.AddClick(self.btnLock,function()
|
||||
local choose, isTemp = self:GetCurChooseHero()
|
||||
if not choose or choose == 0 then
|
||||
PopupTipPanel.ShowTip("请先选择一个神将")
|
||||
return
|
||||
end
|
||||
if not isTemp then
|
||||
PopupTipPanel.ShowTip("当前已处于锁定状态")
|
||||
return
|
||||
end
|
||||
|
||||
local con = ConfigManager.TryGetConfigData(ConfigName.HeroConfig, choose)
|
||||
if not con then
|
||||
LogError("未找到神将:"..tostring(choose))
|
||||
return
|
||||
end
|
||||
local msg = string.format("<color=#da9648>%s</color>将锁定为本次活动的指定神将,锁定后无法修改。", con.ReadingName)
|
||||
MsgPanel.ShowTwo(msg, nil, function()
|
||||
NetManager.UpStarActivitySelectRequest(self.actId, choose, function()
|
||||
PopupTipPanel.ShowTip("锁定成功")
|
||||
end)
|
||||
end, nil, "锁 定")
|
||||
end)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function UpStarGift:OnOpen(_activityConfig,_index,parent)
|
||||
self.actConfig = _activityConfig
|
||||
self.pageIndex = _index
|
||||
self.parent = parent
|
||||
self.gameObject.name = "CommonActPage"..self.actConfig.Id
|
||||
|
||||
self.tempChoose = PlayerPrefs.GetInt(PlayerManager.uid.."_UpStarGift_TempChoose", 0)
|
||||
end
|
||||
|
||||
function UpStarGift:OnSortingOrderChange()
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
function UpStarGift:OnShow(_sortingOrder)
|
||||
self.gameObject:SetActive(true)
|
||||
self.sortingOrder = _sortingOrder or self.sortingOrder
|
||||
self.actId = self.actConfig.ActId
|
||||
self.actType = self.actConfig.ActiveType
|
||||
|
||||
|
||||
if self.actConfig.IfBack == 1 then
|
||||
if self.actType > 0 then
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(self.actType)
|
||||
if id and id > 0 then
|
||||
self.actId = id
|
||||
local actConfig
|
||||
local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType)
|
||||
if not actConfig then
|
||||
actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType)
|
||||
end
|
||||
if actConfig then
|
||||
self.actConfig = actConfig
|
||||
end
|
||||
else
|
||||
LogRed("活动类型:"..tostring(self.actType).."的活动未开启")
|
||||
end
|
||||
end
|
||||
end
|
||||
if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then
|
||||
self.titleBgIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[3])
|
||||
self.titleBgIma:SetNativeSize()
|
||||
end
|
||||
if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then
|
||||
self.titleIma.gameObject:SetActive(true)
|
||||
self.titleIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[4])
|
||||
self.titleIma:SetNativeSize()
|
||||
self.titleIma.transform.localPosition = Vector3.New(self.actConfig.TitleImapos[1],self.actConfig.TitleImapos[2],self.actConfig.TitleImapos[3])
|
||||
else
|
||||
self.titleIma.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
if self.actConfig.Icon[5] and self.actConfig.Icon[5] ~= "" then
|
||||
self.titleTipBg.gameObject:SetActive(true)
|
||||
else
|
||||
self.titleTipBg.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then
|
||||
local str = string.split(GetLanguageStrById(self.actConfig.TitleText),"|")
|
||||
self.titleTip.text = str[1]
|
||||
self.titleTip.transform.localPosition = Vector3.New((str[2] or 0),(str[3] or 0),(str[4] or 0))
|
||||
self.titleTip.gameObject:SetActive(true)
|
||||
else
|
||||
self.titleTip.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
self.parent.tabbox.gameObject:SetActive(false)
|
||||
|
||||
if not self.scrollView then
|
||||
local rootHight = self.scrollItemRect.height
|
||||
local width = self.scrollItemRect.width
|
||||
self.itemPre:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,162)
|
||||
local vec = self.scrollItem.transform.localPosition
|
||||
vec.y = self.scrollItemPos.y - 100
|
||||
self.scrollItem.transform.localPosition = vec
|
||||
|
||||
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 10))
|
||||
self.scrollView.moveTween.MomentumAmount = 1
|
||||
self.scrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
||||
if self.actConfig.HelpId and self.actConfig.HelpId > 0 then
|
||||
self.btnHelp.gameObject:SetActive(true)
|
||||
else
|
||||
self.btnHelp.gameObject:SetActive(false)
|
||||
end
|
||||
--拿取数据
|
||||
self:RefreshData(true,true,true)
|
||||
end
|
||||
--刷新数据
|
||||
function UpStarGift:RefreshData(isUpdata,isTop,isAni)
|
||||
self.ActData = CommonActPageManager.GetData(self.actType)
|
||||
if self.actConfig.RpType > 0 then
|
||||
CheckRedPointStatus(self.actConfig.RpType)
|
||||
end
|
||||
|
||||
-- 按钮显示
|
||||
local choose, isTemp = self:GetCurChooseHero()
|
||||
self.btnAdd:SetActive(choose == 0 and isTemp)
|
||||
self.btnChoose:SetActive(isTemp)
|
||||
self.btnLock:SetActive(isTemp)
|
||||
|
||||
self:RefreshActData(isTop,isAni)
|
||||
self:RefreshTime()
|
||||
self:RefreshLive()
|
||||
end
|
||||
|
||||
-- 获取本期活动的神将列表
|
||||
function UpStarGift:GetHeroList()
|
||||
local heroList = {}
|
||||
-- 显示列表
|
||||
for k, v in ipairs(self.ActData.rewards) do
|
||||
heroList[v.targetId] = 1
|
||||
end
|
||||
local heros = {}
|
||||
for heroId, _ in pairs(heroList) do
|
||||
table.insert(heros, heroId)
|
||||
end
|
||||
return heros
|
||||
end
|
||||
|
||||
-- 获取当前选择的人(临时/锁定)
|
||||
function UpStarGift:GetCurChooseHero()
|
||||
local choose = 0
|
||||
local isTemp = true
|
||||
if self.ActData.value and self.ActData.value ~= 0 then
|
||||
choose = self.ActData.value
|
||||
isTemp = false
|
||||
end
|
||||
if choose == 0 and self.tempChoose and self.tempChoose ~= 0 then
|
||||
-- 检测一遍临时选择的正确性,选择的人物保存到本地,这里是为了防止两期活动数据冲突
|
||||
local heroList = self:GetHeroList()
|
||||
if not table.indexof(heroList, self.tempChoose) then
|
||||
self.tempChoose = 0
|
||||
end
|
||||
--
|
||||
choose = self.tempChoose
|
||||
isTemp = true
|
||||
end
|
||||
return choose, isTemp
|
||||
end
|
||||
|
||||
-- 获取奖励列表
|
||||
function UpStarGift:GetRewardDataList()
|
||||
local choose = self:GetCurChooseHero()
|
||||
|
||||
-- 没有的话就选第一个人作为默认显示的奖励
|
||||
if choose == 0 then
|
||||
choose = self.ActData.rewards[1].targetId
|
||||
end
|
||||
|
||||
-- 显示列表
|
||||
local dataList = {}
|
||||
for k, v in ipairs(self.ActData.rewards) do
|
||||
if v.targetId == choose then
|
||||
table.insert(dataList, v)
|
||||
end
|
||||
end
|
||||
table.sort(dataList, function(a, b)
|
||||
return a.missionId < b.missionId
|
||||
end)
|
||||
return dataList
|
||||
end
|
||||
|
||||
--刷新活动数据
|
||||
function UpStarGift:RefreshActData(isTop,isAni)
|
||||
self.scrollView:ForeachItemGO(function(index, go)
|
||||
go.gameObject:SetActive(false)
|
||||
end)
|
||||
local dataList = self:GetRewardDataList()
|
||||
self.scrollView:SetData(dataList, function (index, item)
|
||||
self:ShowSingleData(item, dataList[index],index)
|
||||
end,not isTop,not isAni)
|
||||
end
|
||||
|
||||
function UpStarGift:ShowSingleData(item,sdata,index)
|
||||
if not self.ItemList then
|
||||
self.ItemList = {}
|
||||
end
|
||||
if not self.ItemList[item] then
|
||||
local subConfig = SubUIConfig[self.actConfig.UIName[2]]
|
||||
self.ItemList[item] = SubUIManager.Open(subConfig,item.transform)
|
||||
end
|
||||
if not sdata then
|
||||
item.gameObject:SetActive(false)
|
||||
return
|
||||
end
|
||||
item.gameObject:SetActive(true)
|
||||
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig)
|
||||
end
|
||||
|
||||
function UpStarGift:RefreshTime()
|
||||
if self.actConfig.ShowTime == 0 then
|
||||
self.time:SetActive(false)
|
||||
return
|
||||
end
|
||||
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
local freshTime = self.ActData.endTime - GetTimeStamp()
|
||||
|
||||
local update = function()
|
||||
if self.actConfig.ShowTime == 1 then
|
||||
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
|
||||
elseif self.actConfig.ShowTime == 2 then
|
||||
self.timeText.text = Language[10023]..TimeToDHMS(freshTime)
|
||||
elseif self.actConfig.ShowTime == 3 then
|
||||
self.timeText.text = Language[10023]..TimeToHMS(freshTime)
|
||||
end
|
||||
end
|
||||
update()
|
||||
self.localTimer = Timer.New(function ()
|
||||
freshTime = freshTime - 1
|
||||
update()
|
||||
if freshTime <= 0 then
|
||||
self.parent:ClosePanel()
|
||||
end
|
||||
end, 1, -1, true)
|
||||
self.localTimer:Start()
|
||||
end
|
||||
|
||||
|
||||
function UpStarGift:RefreshLive()
|
||||
ClearChild(self.liveRoot)
|
||||
local choose = self:GetCurChooseHero()
|
||||
if choose and choose ~= 0 then
|
||||
local data= ConfigManager.GetConfigData(ConfigName.HeroConfig, choose)
|
||||
if not data then
|
||||
return
|
||||
end
|
||||
local live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform,
|
||||
Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0))
|
||||
live:GetComponent("SkeletonGraphic").AnimationState:SetAnimation(0, "idle", true)
|
||||
live.transform.sizeDelta = Vector2.New(10000, 10000)
|
||||
end
|
||||
end
|
||||
|
||||
function UpStarGift:OnClose()
|
||||
self.parent.tabbox.gameObject:SetActive(true)
|
||||
self.gameObject:SetActive(false)
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
end
|
||||
|
||||
function UpStarGift:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
for k,v in pairs(self.ItemList) do
|
||||
SubUIManager.Close(v)
|
||||
end
|
||||
self.ItemList = {}
|
||||
if self.scrollView then
|
||||
SubUIManager.Close(self.scrollView)
|
||||
end
|
||||
self.scrollView=nil
|
||||
self.scrollItem.transform.localPosition = self.scrollItemPos
|
||||
end
|
||||
|
||||
return UpStarGift
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d70546dccb08ca04a9ddb0d08a43569f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1070,6 +1070,8 @@ function this:TabBtnAction(id,actType,data)
|
|||
UIManager.OpenPanel(UIName.SurpriseBoxPanel)
|
||||
elseif id == ActivityTypeDef.ChaoFanRuSheng then
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,id)
|
||||
elseif id == ActivityTypeDef.UpStarGift then
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,id)
|
||||
elseif id == ActivityTypeDef.TeHuiShenZhuang then
|
||||
-- UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel)
|
||||
UIManager.OpenPanel(UIName.ContinuePackagePanel,8601)
|
||||
|
|
|
@ -6509,4 +6509,18 @@ function NetManager.EquipIntensifyRequset(_type,func)
|
|||
end)
|
||||
end
|
||||
|
||||
-- 限时升星活动选择升星英雄
|
||||
function NetManager.UpStarActivitySelectRequest(actId, heroId, func)
|
||||
local data = ActivityProto_pb.UpStarActivitySelectRequest()
|
||||
data.activityId = actId
|
||||
data.selectId = heroId
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.UP_STAR_ACTIVITY_SELECT_REQUEST, MessageTypeProto_pb.UP_STAR_ACTIVITY_SELECT_RESPONSE, msg, function(buffer)
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
return this
|
|
@ -130,6 +130,10 @@ local TypeUpdateFunc = {
|
|||
local curData = dataList[ActivityTypeDef.ChaoFanRuSheng]
|
||||
this.InitMissionDdataUpStar(curData)
|
||||
end,
|
||||
[ActivityTypeDef.UpStarGift] = function ()--超凡入圣
|
||||
local curData = dataList[ActivityTypeDef.UpStarGift]
|
||||
this.InitMissionDdataUpStar(curData)
|
||||
end,
|
||||
|
||||
[ActivityTypeDef.SurpriseBox] = function ()--惊喜礼盒
|
||||
local curData = dataList[ActivityTypeDef.SurpriseBox]
|
||||
|
|
|
@ -602,6 +602,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.Practice_fourQua,PracticeManager.CheckFourQuadrantRed,FUNCTION_OPEN_TYPE.PRACTICE)
|
||||
RPData:AddCheckFunc(RedPointType.Practice_Cultivation,PracticeManager.CheckPlayerCultivetionRed,FUNCTION_OPEN_TYPE.PRACTICE)
|
||||
RPData:AddCheckFunc(RedPointType.chaofanrushengRed,ActivityGiftManager.CheckRedPointChaofanRuSheng)
|
||||
RPData:AddCheckFunc(RedPointType.UpStarGift,ActivityGiftManager.CheckRedPointUpStarGift)
|
||||
--山河试炼
|
||||
RPData:AddCheckFunc(RedPointType.FightLevelTrial,FightLevelManager.CheckTrialRedPoint)
|
||||
|
||||
|
|
|
@ -4,7 +4,8 @@ local this = {}
|
|||
local parent
|
||||
--传入特效层级
|
||||
local sortingOrder=0
|
||||
local args=nil
|
||||
local heros=nil
|
||||
local confirmFunc=nil
|
||||
local currHeroId=0
|
||||
local curPage = 1
|
||||
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
|
@ -13,7 +14,6 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
|||
function this:InitComponent(gameObject)
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||
this.titleText.text="许愿神将"
|
||||
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
|
||||
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
|
||||
this.FourStarUpTip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
||||
|
@ -47,12 +47,11 @@ function this:BindEvent()
|
|||
parent:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.confirmBtn,function()
|
||||
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
|
||||
ActivityGiftManager.SetActivityInfoRewardId(args[1],currHeroId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId)
|
||||
if confirmFunc then
|
||||
confirmFunc(currHeroId)
|
||||
end
|
||||
parent:ClosePanel()
|
||||
end)
|
||||
end)
|
||||
for i = 1, 4 do
|
||||
Util.AddClick(this.btnList[i],function()
|
||||
if curPage ~= i then
|
||||
|
@ -69,26 +68,27 @@ function this:RemoveListener()
|
|||
end
|
||||
|
||||
function this:OnShow(_parent,_args)
|
||||
args = _args
|
||||
heros = _args[1]
|
||||
currHeroId=_args[2]
|
||||
confirmFunc=_args[3]
|
||||
-- 标题修改
|
||||
local title =_args[4]
|
||||
this.titleText.text = title or "许愿神将"
|
||||
|
||||
parent=_parent
|
||||
sortingOrder =_parent.sortingOrder
|
||||
this:Refresh(heroConfig[args[2]].PropertyName)
|
||||
local default = 1
|
||||
if currHeroId and currHeroId ~= 0 then
|
||||
default = heroConfig[currHeroId].PropertyName
|
||||
end
|
||||
this:Refresh(default)
|
||||
end
|
||||
function this:Refresh(_page)
|
||||
curPage = _page
|
||||
this.light.transform:SetParent(this.btnList[_page].transform)
|
||||
this.light.transform.localPosition = Vector3.zero
|
||||
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
|
||||
if _page == heroConfig[heros[i]].PropertyName then
|
||||
table.insert(heroDatas,heroConfig[heros[i]])
|
||||
|
@ -130,7 +130,7 @@ end
|
|||
|
||||
function this:OnClose()
|
||||
currHeroId=0
|
||||
args=nil
|
||||
heros=nil
|
||||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
|
|
|
@ -31,6 +31,10 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function UpStarPre:BindEvent()
|
||||
Util.AddOnceClick(self.btnBuy.gameObject, function()
|
||||
if self.isTemp then
|
||||
PopupTipPanel.ShowTip("请先选择并锁定一个神将")
|
||||
return
|
||||
end
|
||||
if self.data.state == 0 then
|
||||
PopupTipPanel.ShowTip("神将达指定星级后解锁")
|
||||
return
|
||||
|
@ -42,6 +46,10 @@ function UpStarPre:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddOnceClick(self.GetBtn, function()
|
||||
if self.isTemp then
|
||||
PopupTipPanel.ShowTip("请先选择并锁定一个神将")
|
||||
return
|
||||
end
|
||||
NetManager.GetActivityRewardRequest(self.data.missionId,self.actData.activityId,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1)
|
||||
self.data.state = 2
|
||||
|
@ -82,7 +90,7 @@ function UpStarPre:SetShows(key,shows,parent)
|
|||
end
|
||||
for i = 1, math.max(#shows,#self.itemList[key]) do
|
||||
if not shows[i] then
|
||||
self.itemList[key][i].gameObject:SetActive(false)
|
||||
self.itemList[key][i].go.gameObject:SetActive(false)
|
||||
else
|
||||
if not self.itemList[key][i] then
|
||||
self.itemList[key][i] = {}
|
||||
|
@ -104,6 +112,31 @@ function UpStarPre:SetShows(key,shows,parent)
|
|||
end
|
||||
self.itemList[key][i].go.gameObject:SetActive(true)
|
||||
self.itemList[key][i].item:OnOpen(false, {shows[i][1],shows[i][2],shows[i][3],shows[i][4]}, 0.85,false,false,false,self.sortingOrder)
|
||||
-- 定制显示
|
||||
if self.parent.GetCurChooseHero then
|
||||
self.choose, self.isTemp = self.parent:GetCurChooseHero()
|
||||
-- 临时状态不再显示锁头
|
||||
if self.data.state == 0 and not self.isTemp then
|
||||
self.itemList[key][i].lock.gameObject:SetActive(true)
|
||||
else
|
||||
self.itemList[key][i].lock.gameObject:SetActive(false)
|
||||
end
|
||||
-- 未选择时角色和角色碎片显示问号
|
||||
if self.choose == 0 then
|
||||
local con = itemConfig[shows[i][1]]
|
||||
if con and (con.ItemType == ItemType.Hero or con.ItemType == ItemType.HeroDebris) then
|
||||
-- 不显示阵营
|
||||
self.itemList[key][i].item.proImage.gameObject:SetActive(false)
|
||||
self.itemList[key][i].item.fragmentIcon.gameObject:SetActive(false)
|
||||
-- 显示问号
|
||||
self.itemList[key][i].item.icon.sprite = self.spLoader:LoadSprite("y_yosr_wenhao")
|
||||
self.itemList[key][i].item.icon:SetNativeSize()
|
||||
-- 屏蔽按钮事件
|
||||
Util.AddOnceClick(self.itemList[key][i].item.frameBtn, function() end)
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -116,7 +149,8 @@ function UpStarPre:SetBtn1()
|
|||
self.itemList[2][i].Get.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
if self.data.state == 1 then
|
||||
-- 只有在锁定状态才显示可领取
|
||||
if self.data.state == 1 and not self.isTemp then
|
||||
self.GetBtn.gameObject:SetActive(true)
|
||||
self.redPoint.gameObject:SetActive(true)
|
||||
else
|
||||
|
@ -145,7 +179,8 @@ function UpStarPre:SetBtn()
|
|||
self.btnBuy.enabled = false
|
||||
self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[2].sprte)
|
||||
else
|
||||
if self.data.state == 0 then
|
||||
-- 未选择神将时显示未购买
|
||||
if self.data.state == 0 or self.isTemp then
|
||||
self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[0].sprte)
|
||||
else
|
||||
self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[1].sprte)
|
||||
|
|
|
@ -112,6 +112,8 @@ function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, i
|
|||
elseif isGet == false and itemDatas then
|
||||
self:NoGetRewardShow(itemDatas, effectLayer, isShowAddImage)
|
||||
end
|
||||
-- 重置icon大小
|
||||
self.icon.transform.sizeDelta = Vector2.New(120, 120)
|
||||
end
|
||||
function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||
self.rightUplv.gameObject:SetActive(false)
|
||||
|
|
Loading…
Reference in New Issue