限时召唤提交
|
Before Width: | Height: | Size: 382 KiB After Width: | Height: | Size: 382 KiB |
|
|
@ -102,7 +102,7 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
spritePackingTag:
|
spritePackingTag: DynamicActivityAtlas
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 222 KiB |
|
|
@ -102,7 +102,7 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
spritePackingTag:
|
spritePackingTag: DynamicActivityAtlas
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
|
Before Width: | Height: | Size: 201 KiB After Width: | Height: | Size: 201 KiB |
|
|
@ -102,7 +102,7 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
spritePackingTag:
|
spritePackingTag: DynamicActivityAtlas
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
|
After Width: | Height: | Size: 258 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 166c7af58ba61c049a3e4b5e93cefefb
|
||||||
|
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: 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: bcb708e64c04f594da83cb7190f76edd
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
After Width: | Height: | Size: 368 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f7c4c373366cc4d4c9eb7dfd39870703
|
||||||
|
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: 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: 86ba390c891f69f4cb3cc84058523ead
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
After Width: | Height: | Size: 195 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8f0538a1683fdc74a932b77b02fc19cb
|
||||||
|
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: 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: 0104d1e1ecedcbd48ab14db466315926
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
After Width: | Height: | Size: 250 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1376f5069fca0924693b2ac98a1fb046
|
||||||
|
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: 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: 03229648fa0b0dd439b6d489b94708de
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -5871,6 +5871,7 @@ RectTransform:
|
||||||
- {fileID: 8252778861248733457}
|
- {fileID: 8252778861248733457}
|
||||||
- {fileID: 1708598082656106510}
|
- {fileID: 1708598082656106510}
|
||||||
- {fileID: 7685616055290300879}
|
- {fileID: 7685616055290300879}
|
||||||
|
- {fileID: 2926523445335401132}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -90849,6 +90850,71 @@ ParticleSystemRenderer:
|
||||||
m_Mesh2: {fileID: 0}
|
m_Mesh2: {fileID: 0}
|
||||||
m_Mesh3: {fileID: 0}
|
m_Mesh3: {fileID: 0}
|
||||||
m_MaskInteraction: 0
|
m_MaskInteraction: 0
|
||||||
|
--- !u!1 &4952913595944623042
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2926523445335401132}
|
||||||
|
- component: {fileID: 3384906617467824093}
|
||||||
|
- component: {fileID: 713547358494534050}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: mask
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2926523445335401132
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4952913595944623042}
|
||||||
|
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: 224444569024407278}
|
||||||
|
m_RootOrder: 20
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3384906617467824093
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4952913595944623042}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &713547358494534050
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4952913595944623042}
|
||||||
|
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 &4973035429888691632
|
--- !u!1 &4973035429888691632
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -9788,6 +9788,71 @@ ParticleSystemRenderer:
|
||||||
m_Mesh2: {fileID: 0}
|
m_Mesh2: {fileID: 0}
|
||||||
m_Mesh3: {fileID: 0}
|
m_Mesh3: {fileID: 0}
|
||||||
m_MaskInteraction: 0
|
m_MaskInteraction: 0
|
||||||
|
--- !u!1 &754087800111071979
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7975739230649411088}
|
||||||
|
- component: {fileID: 8947567218219452350}
|
||||||
|
- component: {fileID: 29247144266372488}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: bgMask
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7975739230649411088
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 754087800111071979}
|
||||||
|
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: 3092733342819892257}
|
||||||
|
m_RootOrder: 15
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8947567218219452350
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 754087800111071979}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &29247144266372488
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 754087800111071979}
|
||||||
|
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 &767276440031166555
|
--- !u!1 &767276440031166555
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -9833,6 +9898,7 @@ RectTransform:
|
||||||
- {fileID: 5895840991951113012}
|
- {fileID: 5895840991951113012}
|
||||||
- {fileID: 9013823477121100013}
|
- {fileID: 9013823477121100013}
|
||||||
- {fileID: 8733423943458709009}
|
- {fileID: 8733423943458709009}
|
||||||
|
- {fileID: 7975739230649411088}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
||||||
|
|
@ -21,23 +21,23 @@ local tabs = {
|
||||||
},
|
},
|
||||||
[4] = { --限时召唤
|
[4] = { --限时召唤
|
||||||
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
|
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
|
||||||
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,
|
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy
|
||||||
},
|
},
|
||||||
[5] = { --乾坤宝盒
|
[5] = { --乾坤宝盒
|
||||||
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
||||||
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
|
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox
|
||||||
},
|
},
|
||||||
[6] = { --珍奇礼包
|
[6] = { --珍奇礼包
|
||||||
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
|
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
|
||||||
rpType = "",panelType = PanelType.Main,
|
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure
|
||||||
},
|
},
|
||||||
[7] = { --累计充值
|
[7] = { --累计充值
|
||||||
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
|
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
|
||||||
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,
|
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge
|
||||||
},
|
},
|
||||||
[8] = { --限时商市
|
[8] = { --限时商市
|
||||||
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
|
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
|
||||||
rpType = "",panelType = PanelType.Main,
|
rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
||||||
|
|
@ -84,7 +84,6 @@ function DynamicActivityPanel:BindEvent()
|
||||||
this.PageTabCtrl:SetTabAdapter(this.PageTabAdapter)
|
this.PageTabCtrl:SetTabAdapter(this.PageTabAdapter)
|
||||||
this.PageTabCtrl:SetTabIsLockCheck(this.PageTabIsLockCheck)
|
this.PageTabCtrl:SetTabIsLockCheck(this.PageTabIsLockCheck)
|
||||||
this.PageTabCtrl:SetChangeTabCallBack(this.OnPageTabChange)
|
this.PageTabCtrl:SetChangeTabCallBack(this.OnPageTabChange)
|
||||||
|
|
||||||
-- 关闭界面打开主城
|
-- 关闭界面打开主城
|
||||||
Util.AddClick(this.btnBack, function()
|
Util.AddClick(this.btnBack, function()
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
|
|
@ -133,9 +132,11 @@ function this.PageTabAdapter(tab, index, status)
|
||||||
this.ClearPageRedpot(index)
|
this.ClearPageRedpot(index)
|
||||||
this.BindPageRedpot(index, redpot)
|
this.BindPageRedpot(index, redpot)
|
||||||
end
|
end
|
||||||
if tabs[index].ActType then
|
|
||||||
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActType)
|
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActType)
|
||||||
|
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
|
||||||
tab:SetActive(GlobalActConfig[id].ShowArt == index)
|
tab:SetActive(GlobalActConfig[id].ShowArt == index)
|
||||||
|
else
|
||||||
|
tab.gameObject:SetActive(ActivityGiftManager.GetActivityOpenStatus(tabs[index].ActType))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@ function RewardPreview:InitComponent(gameObject)
|
||||||
self.closeBtn = Util.GetGameObject(self.gameObject, "close")
|
self.closeBtn = Util.GetGameObject(self.gameObject, "close")
|
||||||
self.itemGrid = Util.GetGameObject(self.gameObject, "itemGrid")
|
self.itemGrid = Util.GetGameObject(self.gameObject, "itemGrid")
|
||||||
self.itemPre = Util.GetGameObject(self.gameObject, "itemprefab")
|
self.itemPre = Util.GetGameObject(self.gameObject, "itemprefab")
|
||||||
self.curtimes = Util.GetGameObject(self.gameObject, "tip1"):GetComponent("Text")
|
|
||||||
self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x
|
self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x
|
||||||
self.slider = Util.GetGameObject(self.gameObject, "Background/Fill"):GetComponent("Image")
|
self.slider = Util.GetGameObject(self.gameObject, "Background/Fill"):GetComponent("Image")
|
||||||
|
self.curtimes = Util.GetGameObject(self.gameObject, "tip1"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
function RewardPreview:BindEvent()
|
function RewardPreview:BindEvent()
|
||||||
|
|
|
||||||
|
|
@ -29,9 +29,19 @@ local activityType = {
|
||||||
},
|
},
|
||||||
helptype = HELP_TYPE.TimeLimitedCall
|
helptype = HELP_TYPE.TimeLimitedCall
|
||||||
},
|
},
|
||||||
--叱咤风云 限时召唤
|
--勇冠三军 限时召唤
|
||||||
[4302] = {
|
[4302] = {
|
||||||
bg = "Bg2",
|
bg = "Bg2",
|
||||||
|
hero = {
|
||||||
|
[1]={name="Bg2/hero1",id=10009,hero="c_ygsj_kuang02"},
|
||||||
|
[2]={name="Bg2/hero3",id=10026,hero="c_ygsj_kuang03"},
|
||||||
|
[3]={name="Bg2/hero2",id=10040,hero="c_ygsj_kuang01"},
|
||||||
|
},
|
||||||
|
helptype = HELP_TYPE.TimeLimitedCall
|
||||||
|
},
|
||||||
|
--叱咤风云 限时召唤
|
||||||
|
[4303] = {
|
||||||
|
bg = "Bg3",
|
||||||
hero = {
|
hero = {
|
||||||
[1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"},
|
[1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"},
|
||||||
[2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"},
|
[2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"},
|
||||||
|
|
@ -119,7 +129,8 @@ function TimeLimitedCall:OnShow(_sortingOrder)
|
||||||
table.sort(UpHero,function(a,b) return a.Reward[1] < b.Reward[1] end)
|
table.sort(UpHero,function(a,b) return a.Reward[1] < b.Reward[1] end)
|
||||||
for n,m in ipairs(activityType[activityId].hero) do
|
for n,m in ipairs(activityType[activityId].hero) do
|
||||||
Util.GetGameObject(self.gameObject,m.name.."/hero"):GetComponent("Image").sprite=Util.LoadSprite(m.hero)
|
Util.GetGameObject(self.gameObject,m.name.."/hero"):GetComponent("Image").sprite=Util.LoadSprite(m.hero)
|
||||||
local configinfo= ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig, "Id", UpHero[n].Reward[1])
|
local configinfo= ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig, "Id", m.id)
|
||||||
|
LogGreen("configinfo.PropertyName:"..configinfo.PropertyName)
|
||||||
Util.GetGameObject(self.gameObject,m.name.."/icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName))
|
Util.GetGameObject(self.gameObject,m.name.."/icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName))
|
||||||
Util.GetGameObject(self.gameObject,m.name.."/name"):GetComponent("Text").text=configinfo.ReadingName
|
Util.GetGameObject(self.gameObject,m.name.."/name"):GetComponent("Text").text=configinfo.ReadingName
|
||||||
Util.AddOnceClick(Util.GetGameObject(self.gameObject,m.name), function()
|
Util.AddOnceClick(Util.GetGameObject(self.gameObject,m.name), function()
|
||||||
|
|
@ -134,7 +145,9 @@ end
|
||||||
|
|
||||||
function TimeLimitedCall:RefreshNextLevelReward()
|
function TimeLimitedCall:RefreshNextLevelReward()
|
||||||
local curLvstate = 0
|
local curLvstate = 0
|
||||||
local curTimes = ActivityGiftManager.GetActivityValueInfo(activityId)
|
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||||
|
LogGreen(info.value)
|
||||||
|
local curTimes = info.value
|
||||||
local data1 = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) --通过活动id获取阶段任务
|
local data1 = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) --通过活动id获取阶段任务
|
||||||
local rewarditem
|
local rewarditem
|
||||||
for n,m in ipairs(data1) do
|
for n,m in ipairs(data1) do
|
||||||
|
|
@ -207,10 +220,11 @@ function TimeLimitedCall:RefreshNextLevelReward()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
|
||||||
|
|
||||||
local reMaintimes = info.value
|
local reMaintimes = info.value
|
||||||
local totalTimes = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool)
|
LogGreen("singleRecruit.MergePool:"..singleRecruit.MergePool)
|
||||||
|
local totalTimes = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool).Count
|
||||||
reMaintimes = totalTimes - reMaintimes
|
reMaintimes = totalTimes - reMaintimes
|
||||||
if reMaintimes == 0 then
|
if reMaintimes == 0 then
|
||||||
reMaintimes = totalTimes
|
reMaintimes = totalTimes
|
||||||
|
|
@ -245,7 +259,6 @@ function TimeLimitedCall:RefreshGetHeroTimes()
|
||||||
local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes
|
local freeTimesId=lotterySetting[singleRecruit.Id].FreeTimes
|
||||||
local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
|
local maxtimesId=lotterySetting[singleRecruit.Id].MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id
|
||||||
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
|
local curTimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
|
||||||
self.curtext.text=curTimes
|
|
||||||
self.upper.text= Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限
|
self.upper.text= Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2]--特权上限
|
||||||
self.timeupdate.gameObject:SetActive(true)
|
self.timeupdate.gameObject:SetActive(true)
|
||||||
local freeTime= 0
|
local freeTime= 0
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ local currPageIndex = 0
|
||||||
local curEquipTreasureDatas = {}
|
local curEquipTreasureDatas = {}
|
||||||
local isCanUpEquipTreasure = false
|
local isCanUpEquipTreasure = false
|
||||||
local isPlayAnim = true
|
local isPlayAnim = true
|
||||||
|
local isFristOpenTime
|
||||||
--初始化组件(用于子类重写)RoleEquipChangePopup
|
--初始化组件(用于子类重写)RoleEquipChangePopup
|
||||||
function RoleEquipPanel:InitComponent()
|
function RoleEquipPanel:InitComponent()
|
||||||
orginLayer = 10
|
orginLayer = 10
|
||||||
|
|
@ -122,6 +123,7 @@ function RoleEquipPanel:InitComponent()
|
||||||
this.treasurePage2 = Util.GetGameObject(self.transform, "Tabs/Btn6")
|
this.treasurePage2 = Util.GetGameObject(self.transform, "Tabs/Btn6")
|
||||||
this.emptyObj = Util.GetGameObject(self.transform, "emptyObj")
|
this.emptyObj = Util.GetGameObject(self.transform, "emptyObj")
|
||||||
this.emptyObj.gameObject:SetActive(false)
|
this.emptyObj.gameObject:SetActive(false)
|
||||||
|
this.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
|
@ -743,6 +745,14 @@ function this:SetItemData(_itemDatas)
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
if isPlayAnim then
|
if isPlayAnim then
|
||||||
|
if isFristOpenTime then
|
||||||
|
isFristOpenTime:Stop()
|
||||||
|
isFristOpenTime = nil
|
||||||
|
end
|
||||||
|
isFristOpenTime = Timer.New(function()
|
||||||
|
this.mask:SetActive(false)
|
||||||
|
end, 1):Start()
|
||||||
|
this.mask:SetActive(true)
|
||||||
SecTorPlayAnimByScroll(this.ScrollView)
|
SecTorPlayAnimByScroll(this.ScrollView)
|
||||||
isPlayAnim = false
|
isPlayAnim = false
|
||||||
end
|
end
|
||||||
|
|
@ -1045,6 +1055,10 @@ function this.SelectImageSetParent(_objPoint)
|
||||||
end
|
end
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function RoleEquipPanel:OnClose()
|
function RoleEquipPanel:OnClose()
|
||||||
|
if isFristOpenTime then
|
||||||
|
isFristOpenTime:Stop()
|
||||||
|
isFristOpenTime = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
function this:AddRedPointVale(_equipDatas)
|
function this:AddRedPointVale(_equipDatas)
|
||||||
for j = 1, #_equipDatas do
|
for j = 1, #_equipDatas do
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ local isUpZhen = false
|
||||||
local list={}
|
local list={}
|
||||||
local teamHero = {}
|
local teamHero = {}
|
||||||
local isPlayAnim = true
|
local isPlayAnim = true
|
||||||
|
local isFristOpenTime
|
||||||
function SoulPrintPanel:InitComponent()
|
function SoulPrintPanel:InitComponent()
|
||||||
this.upView = SubUIManager.Open(SubUIConfig.UpView, this.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
|
this.upView = SubUIManager.Open(SubUIConfig.UpView, this.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
|
||||||
this.helpBtn= Util.GetGameObject(this.gameObject, "HelpBtn")
|
this.helpBtn= Util.GetGameObject(this.gameObject, "HelpBtn")
|
||||||
|
|
@ -69,6 +70,7 @@ function SoulPrintPanel:InitComponent()
|
||||||
this.scrollView.moveTween.MomentumAmount = 1
|
this.scrollView.moveTween.MomentumAmount = 1
|
||||||
this.scrollView.moveTween.Strength = 2
|
this.scrollView.moveTween.Strength = 2
|
||||||
this.SetIsShow()
|
this.SetIsShow()
|
||||||
|
this.BgMask = Util.GetGameObject(this.gameObject,"bgMask")
|
||||||
end
|
end
|
||||||
|
|
||||||
function SoulPrintPanel:BindEvent()
|
function SoulPrintPanel:BindEvent()
|
||||||
|
|
@ -160,6 +162,10 @@ function SoulPrintPanel:OnClose()
|
||||||
loopCount=0
|
loopCount=0
|
||||||
local var=isShow and 1 or 0
|
local var=isShow and 1 or 0
|
||||||
PlayerPrefs.SetInt(PlayerManager.uid .. "_SoulPrint_IsShow",var)
|
PlayerPrefs.SetInt(PlayerManager.uid .. "_SoulPrint_IsShow",var)
|
||||||
|
if isFristOpenTime then
|
||||||
|
isFristOpenTime:Stop()
|
||||||
|
isFristOpenTime = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function SoulPrintPanel:OnDestroy()
|
function SoulPrintPanel:OnDestroy()
|
||||||
|
|
@ -348,6 +354,14 @@ function this.SetScrollData()
|
||||||
table.insert(list,root)
|
table.insert(list,root)
|
||||||
end)
|
end)
|
||||||
if isPlayAnim then
|
if isPlayAnim then
|
||||||
|
if isFristOpenTime then
|
||||||
|
isFristOpenTime:Stop()
|
||||||
|
isFristOpenTime = nil
|
||||||
|
end
|
||||||
|
isFristOpenTime = Timer.New(function()
|
||||||
|
this.BgMask:SetActive(false)
|
||||||
|
end, 1):Start()
|
||||||
|
this.BgMask:SetActive(true)
|
||||||
SecTorPlayAnimByScroll(this.scrollView)
|
SecTorPlayAnimByScroll(this.scrollView)
|
||||||
isPlayAnim = false
|
isPlayAnim = false
|
||||||
end
|
end
|
||||||
|
|
|
||||||