三界除魔功能添加

dev_chengFeng
ZhangBiao 2020-09-23 20:27:29 +08:00 committed by JieLing
parent c6391090f2
commit c4706208ef
20 changed files with 15106 additions and 15954 deletions

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 167c8b978d4f39b45b8e347d5de97e39
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: 67f7a432b6f223843a8e3869bb8abfb1
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DemonSlayerAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -7971,7 +7971,7 @@ ParticleSystem:
--- !u!199 &3612650515471756776
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15013,7 +15013,7 @@ ParticleSystem:
--- !u!199 &2077135144819501974
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15319,8 +15319,8 @@ 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: -86.2}
m_SizeDelta: {x: 180, y: 56}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 160, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3513380936818697795
CanvasRenderer:
@ -20719,7 +20719,7 @@ ParticleSystem:
--- !u!199 &5382233283546536858
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20852,6 +20852,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1923618606699664887
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 756963219257671327}
- component: {fileID: 386459563867247196}
- component: {fileID: 30871331887705220}
m_Layer: 5
m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &756963219257671327
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923618606699664887}
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: 4941688078859846456}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 191.9, y: 42.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &386459563867247196
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923618606699664887}
m_CullTransparentMesh: 0
--- !u!114 &30871331887705220
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923618606699664887}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 47
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 0.8
m_Text: 00:00:00
--- !u!1 &1930296161265385632
GameObject:
m_ObjectHideFlags: 0
@ -27286,7 +27365,7 @@ ParticleSystem:
--- !u!199 &2875445198819456316
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -34242,7 +34321,7 @@ ParticleSystem:
--- !u!199 &4678487443364567018
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -39299,7 +39378,7 @@ ParticleSystem:
--- !u!199 &3301434479282110283
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -45346,7 +45425,7 @@ ParticleSystem:
--- !u!199 &8426323061574149814
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -50638,7 +50717,7 @@ ParticleSystem:
--- !u!199 &3988090302360095373
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -56149,7 +56228,7 @@ ParticleSystem:
--- !u!199 &5461926455895321923
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -56627,6 +56706,138 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4403264710838146687
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4941688078859846456}
- component: {fileID: 4795482968323619546}
- component: {fileID: 4798502074882858975}
- component: {fileID: 1055389071202868832}
- component: {fileID: 4551296778482365587}
m_Layer: 5
m_Name: DemonSlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4941688078859846456
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4403264710838146687}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8613960832361507699}
- {fileID: 2362163651968229135}
- {fileID: 5768615503964661610}
- {fileID: 756963219257671327}
m_Father: {fileID: 1612271237950830011}
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4795482968323619546
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4403264710838146687}
m_CullTransparentMesh: 0
--- !u!114 &4798502074882858975
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4403264710838146687}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 4551296778482365587}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &1055389071202868832
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4403264710838146687}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &4551296778482365587
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4403264710838146687}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!1 &4404122449313052576
GameObject:
m_ObjectHideFlags: 0
@ -61357,7 +61568,7 @@ ParticleSystem:
--- !u!199 &6960492284779320589
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -62390,6 +62601,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &4729964416327839897
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8613960832361507699}
- component: {fileID: 7089103471902247777}
- component: {fileID: 7705433067048324625}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8613960832361507699
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4729964416327839897}
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: 4941688078859846456}
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: 148, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7089103471902247777
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4729964416327839897}
m_CullTransparentMesh: 0
--- !u!114 &7705433067048324625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4729964416327839897}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 0b4959d554c65da4d818d73ef4d2452d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4741694661802182381
GameObject:
m_ObjectHideFlags: 0
@ -67520,7 +67805,7 @@ ParticleSystem:
--- !u!199 &4261467272199160834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -68185,7 +68470,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: -85.7}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 191.9, y: 42.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7795030966618035774
@ -68690,6 +68975,7 @@ RectTransform:
- {fileID: 1284456144}
- {fileID: 4420810243047435922}
- {fileID: 4983623036232270673}
- {fileID: 4941688078859846456}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -70114,6 +70400,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5731153564343344286
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5768615503964661610}
- component: {fileID: 4737247056011195228}
- component: {fileID: 1407884939559816776}
m_Layer: 5
m_Name: Image_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5768615503964661610
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5731153564343344286}
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: 4941688078859846456}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 160, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4737247056011195228
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5731153564343344286}
m_CullTransparentMesh: 0
--- !u!114 &1407884939559816776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5731153564343344286}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d69429d22e71bbd439bbf280edeb3a71, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5751340798774141521
GameObject:
m_ObjectHideFlags: 0
@ -70929,7 +71289,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: -6.599975, y: -72.30002}
m_AnchoredPosition: {x: -6.599975, y: -76.6}
m_SizeDelta: {x: 191.9, y: 42.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &609058591288152431
@ -72216,8 +72576,8 @@ 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: -85.6}
m_SizeDelta: {x: 180, y: 56}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 160, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6131281959524532560
CanvasRenderer:
@ -77038,7 +77398,7 @@ ParticleSystem:
--- !u!199 &1408501988965295168
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -77661,7 +78021,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: -85}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 191.9, y: 42.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1382239236131096127
@ -79218,7 +79578,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: -6.6, y: -72.3}
m_AnchoredPosition: {x: -6.6, y: -76.6}
m_SizeDelta: {x: 160, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6999739175419749373
@ -84402,7 +84762,7 @@ ParticleSystem:
--- !u!199 &1706209193022837301
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -84461,6 +84821,80 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &7414484793321922636
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2362163651968229135}
- component: {fileID: 5340676709891031908}
- component: {fileID: 671919871729240594}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2362163651968229135
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7414484793321922636}
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: 4941688078859846456}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 32, y: 41}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5340676709891031908
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7414484793321922636}
m_CullTransparentMesh: 0
--- !u!114 &671919871729240594
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7414484793321922636}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7436173769026370154
GameObject:
m_ObjectHideFlags: 0
@ -90979,7 +91413,7 @@ ParticleSystem:
--- !u!199 &8234207848460451360
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -95810,7 +96244,7 @@ ParticleSystem:
--- !u!199 &3615746855071839570
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@ -1015,6 +1015,7 @@ ActivityTypeDef = {
EnergyExper = 22,--体力达人
ExpeditionExper = 26,--天宫达人
AccumulativeRechargeExper = 24,--限时累计充值
DemonSlayer = 25,--三界除魔
PatFace = 29,--神兵天降
LuckyTurnTable_One=30,--幸运探宝
LuckyTurnTable_Two=31,--高级探宝

View File

@ -333,7 +333,7 @@ UIName = {
GuildTranscriptMainPopup = 332,--公会副本
GuildTranscriptRewardSortPanel = 333,--公会副本奖励排行
GuideBattlePanel = 334, --引导战斗
DemonSlayer = 335,--三界除魔
DemonSlayerPanel = 335,--三界除魔
}
SubUIConfig = {

View File

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

View File

@ -0,0 +1,48 @@
require("Base/BasePanel")
DemonSlayerPanel = Inherit(BasePanel)
local this = DemonSlayerPanel
--初始化组件(用于子类重写)
function DemonSlayerPanel:InitComponent()
this.btnBack = Util.GetGameObject(self.gameObject,"BackBtn")
this.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn")
end
--绑定事件(用于子类重写)
function DemonSlayerPanel:BindEvent()
Util.AddClick(this.btnBack, function()
self:ClosePanel()
end)
Util.AddClick(this.helpBtn, function()
local pos = this.helpBtn.transform.localPosition
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Adventure, pos.x, pos.y)
end)
end
--添加事件监听(用于子类重写)
function DemonSlayerPanel:AddListener()
end
--移除事件监听(用于子类重写)
function DemonSlayerPanel:RemoveListener()
end
--界面打开时调用(用于子类重写)
function DemonSlayerPanel:OnOpen()
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function DemonSlayerPanel:OnShow()
end
--界面关闭时调用(用于子类重写)
function DemonSlayerPanel:OnClose()
end
--界面销毁时调用(用于子类重写)
function DemonSlayerPanel:OnDestroy()
end
return DemonSlayerPanel

View File

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

View File

@ -11,7 +11,7 @@ local this = MainPanel
-- [GUILD_FIGHT_STAGE.MATCHING] = "r_zjm_zhanpzz",
-- [GUILD_FIGHT_STAGE.COUNTING] = "r_zjm_zhanjjz",
-- }
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
--示意图轮回放
local imageList = {}
-- 主界面需要隐藏的功能
@ -28,6 +28,7 @@ local timePressStarted
local curMianTaskData = {}
local canGetMsg = true
local moveTranList
local isFirstOpen = 0
--local isCanDragMsg = true
local supremHadSet = false
local isUpperMonthCardTimeShow = true
@ -47,6 +48,12 @@ local lightList = {
[2] = { -1367, -950 },
[3] = { -2447, -2397 },
}
local mainDynamicActivityIcon = {
[1] = "r_zjm_huodongicon-pozhenzhuxian", --破阵诛仙
[2] = "r_zjm_huodongicon-yongguansanjun", -- 勇冠三军
[3] = "r_zjm_huodongicon-chichafenyun", --叱咤风云
}
function this:AddFuncItem(btnGO, pos)
return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}
end
@ -55,6 +62,7 @@ function this:InsertNewText(btn)
local xinText = Util.GetGameObject(btn, "new")
return xinText
end
local isRefeshIcon = true
--初始化组件(用于子类重写)
function this:InitComponent()
orginLayer = 0
@ -164,6 +172,7 @@ function this:InitComponent()
--东海寻仙
this.findFairyBtn=Util.GetGameObject(self.gameObject,"RightUp/findFairy")
this.findFairyRedPoint = Util.GetGameObject(this.findFairyBtn, "redPoint")
this.findFairyBtn:SetActive(false)
--幸运转盘
this.luckyTurnBtn=Util.GetGameObject(self.gameObject,"RightUp/luckyTurn")
@ -400,7 +409,6 @@ function this:InitComponent()
--this.horseRaceLamp = Util.GetGameObject(self.gameObject, "horseRaceLamp")
--this.titleInfo = Util.GetGameObject(self.gameObject, "horseRaceLamp/bgImage/mask/titleInfo")
--this.horseMask = Util.GetGameObject(self.gameObject, "horseRaceLamp/bgImage/mask")
this.animRoot = Util.GetGameObject(self.gameObject, "scene")
this.btnSupreme = Util.GetGameObject(self.gameObject, "RightUp/supreme")
@ -409,11 +417,19 @@ function this:InitComponent()
this.btnUpGradePackage = Util.GetGameObject(self.gameObject, "RightUp/upGradePackageBtn")--升级限时礼包
--主题活动
this.btnDynamicActivity = Util.GetGameObject(self.gameObject, "RightUp/dynamicActivity")
this.DynamicActivityRedPoint = Util.GetGameObject(this.btnDynamicActivity, "redPoint")
this.DynamicActivityTime = Util.GetGameObject(this.btnDynamicActivity, "time"):GetComponent("Text")--
this.DynamicActivityTime = Util.GetGameObject(this.btnDynamicActivity, "time"):GetComponent("Text")
--挑战关卡快速升级提示
this.battleUpLvTip = Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip")
Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[12390]
--三界除魔
this.isDemonSlayerShow = nil
this.btnDemonSlayer = Util.GetGameObject(self.gameObject, "RightUp/DemonSlayer")
this.DemonSlayerTime = Util.GetGameObject(this.btnDemonSlayer, "time"):GetComponent("Text")
end
function this:SetPosFunc(v2)
@ -808,11 +824,7 @@ function this:BindEvent()
end)
--破阵诛仙、限时召唤、乾坤宝盒
Util.AddClick(this.btnDynamicActivity, function ()
if ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.FindFairy) then
UIManager.OpenPanel(UIName.DynamicActivityPanel)
else
this.btnDynamicActivity.gameObject:SetActive(false)
end
UIManager.OpenPanel(UIName.DynamicActivityPanel)
end)
--神将合成、神将置换
@ -835,6 +847,11 @@ function this:BindEvent()
Util.AddClick(this.topMatchBtn, function()
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
end)
--三界除魔
Util.AddClick(this.btnDemonSlayer, function()
UIManager.OpenPanel(UIName.DemonSlayerPanel)
end)
this.BindRedPoint()
end
@ -1011,7 +1028,12 @@ end
--界面打开时调用(用于子类重写)
function this:OnShow()
-- 音效
if isFirstOpen >= 2 then
PlaySoundWithoutClick(SoundConfig.Sound_interface)
end
isFirstOpen = isFirstOpen + 1
isRefeshIcon = true
this.vipLevelText.sprite = VipManager.SetVipLevelImg()
timePressStarted = Time.realtimeSinceStartup
SoundManager.PlayMusic(SoundConfig.BGM_Main)
@ -1226,7 +1248,7 @@ function this.InitFuncShow(funcType)
if funcType then
if this.operateIcon[funcType] then
local isOpen = ActTimeCtrlManager.SingleFuncState(funcType)
if funcType == FUNCTION_OPEN_TYPE.TRIAL then
if funcType == FUNCTION_OPEN_TYPE.ENDLESS then
isOpen = ActTimeCtrlManager.IsQualifiled(funcType)
end
Util.SetColor(this.operateIcon[funcType].lock, Color.New(1, 1, 1, 0.59))
@ -1237,7 +1259,7 @@ function this.InitFuncShow(funcType)
else
for i, v in pairs(this.operateIcon) do
local isOpen = ActTimeCtrlManager.SingleFuncState(i)
if i == FUNCTION_OPEN_TYPE.TRIAL then
if i == FUNCTION_OPEN_TYPE.ENDLESS then
isOpen = ActTimeCtrlManager.IsQualifiled(i)
end
v.lock:SetActive(not isOpen)
@ -1376,9 +1398,14 @@ function this.TimeFormat()
end
--轮转活动,乾坤宝盒
local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
if dynamicAct then
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
if isRefeshIcon then
local curindex = GlobalActConfig[dynamicAct].ShowArt
Util.GetGameObject(this.btnDynamicActivity,"Image"):GetComponent("Image").sprite = Util.LoadSprite(mainDynamicActivityIcon[curindex])
isRefeshIcon = false
end
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DynamicAct)
local tempTime = info.endTime - PlayerManager.serverTime
if tempTime>= 86400 then
this.DynamicActivityTime.text = TimeToDH(tempTime)
@ -1386,7 +1413,7 @@ function this.TimeFormat()
this.DynamicActivityTime.text = TimeToHMS(tempTime)
end
else
this.btnDynamicActivity.gameObject:SetActive(false)
this.btnDynamicActivity:SetActive(false)
end
--青龙秘宝
local QingLong = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) and ActivityGiftManager.IsQualifiled(ActivityTypeDef.TreasureOfSomeBody)
@ -1452,7 +1479,7 @@ function this.TimeFormat()
end
local status = DeathPosManager.GetStatus()
local endTime = DeathPosManager.GetOverTime()
if not status or status == DeathPosStatus.Close or status == DeathPosStatus.Belated then
if not status or status == DeathPosStatus.Close or status == DeathPosStatus.Belated or status == DeathPosStatus.Reward then
SetDeathPosActive(false)
-- elseif baseInfo.battleStage == TOP_MATCH_STAGE.CLOSE then
-- SetTopMatchActive(true)
@ -1460,15 +1487,44 @@ function this.TimeFormat()
-- this.topMatchTime.text = "距开始"..TimeToHMS(tempTime)
else
if endTime then
SetDeathPosActive(true)
local tempTime = endTime - PlayerManager.serverTime
this.deathPosTime.text = "距闯阵结束\n"..TimeToHMS(tempTime)
if tempTime and tempTime > 0 then
this.deathPosTime.text = "距闯阵结束\n"..TimeToHMS(tempTime)
SetDeathPosActive(true)
else
SetDeathPosActive(false)
end
else
SetDeathPosActive(false)
end
end
-- 三界除魔
-- local function SetDemonSlayerActive(isActive)
-- if isActive ~= this.isDemonSlayerShow then
-- this.isDemonSlayerShow = isActive
-- this.btnDemonSlayer:SetActive(isActive)
-- end
-- end
-- local DemonSlayer = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DemonSlayer)
-- local DemonSlayerEndTime = nil
-- if not DemonSlayer then
-- LogGreen("三界除魔测试开启")
-- SetDemonSlayerActive(true)
-- -- SetDemonSlayerActive(false)
-- else
-- if DemonSlayerEndTime then
-- local tempTime = DemonSlayerEndTime - PlayerManager.serverTime
-- if tempTime and tempTime > 0 then
-- this.deathPosTime.text = "距闯阵结束\n"..TimeToHMS(tempTime)
-- SetDemonSlayerActive(true)
-- else
-- SetDemonSlayerActive(false)
-- end
-- else
-- SetDemonSlayerActive(false)
-- end
-- end
end
--为限时折扣写的
function this:GetInfoList()
@ -1598,14 +1654,15 @@ function this.RefreshActivityBtn(context)
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then
this.btnSupreme:SetActive(ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 and ActivityGiftManager.GetRewardState(42)~=3)
end
elseif context.type==ActivityTypeDef.FindFairy then
this.findFairyBtn:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy))
elseif context.type==ActivityTypeDef.DynamicAct then
isRefeshIcon = true
this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct))
end
if ActTimeCtrlManager.IsQualifiled(42) then
this.expert:SetActive(ActivityGiftManager.GetExpertActiveisOpen() > 0)
end
isRefeshIcon = true
end
--客户端自己Show刷新
function this.RefreshActivityShow()
@ -1667,7 +1724,7 @@ function this.RefreshActivityShow()
this.questionnaireBtn:SetActive(QuestionnaireManager.GetQuestionState() == 0)
--轮转活动 限时召唤 乾坤宝盒
this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy))
this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct))
end
function this.SetSevenDayCarnivalName()