Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-05-20 14:37:05 +08:00
commit 3007dafa27
58 changed files with 4042 additions and 900 deletions

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 2e243c1520978584a94621b7d9858743
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 856f00cae8c94d74a9b31b86c4247c04
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 48a3741b752a77a4c85e592af656d157
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 1a6c567ce8f9f84429d5df37a85da24a
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 7bf8cae9146f46f449a0de54f28cdde7
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 3baf806c877f61e468c531ab4dfe2f0d
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 96ef5aeb52451da4a8b1240073551192
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 69b14b5d29eb4dc419012c8c5b3453e7
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 6b2b848442e76344c8a40edc599be2cf
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 7e94192802b7f734899712f460c70e6d
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: c9531c1614bb4db4d82718e71afa284e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 7aa70ec354357da4e89ed6f5a771ed68
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 6cd7bf75933a53243816f8b377e592e1
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d6de001032106e44491fd283eb6916d6
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: beaaf214b67381c45bbe08955f9dca3e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0e317ac53d54369459c2f2bddf15d532
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PracticeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -80,6 +80,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -84,7 +84,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 58
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 KiB

View File

@ -0,0 +1,121 @@
fileFormatVersion: 2
guid: 62e89d1226df8a845bc0e79675ce9e40
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
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: cd7ba7ef59b284645abfc85512a4751a
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5303,7 +5303,7 @@ ParticleSystem:
--- !u!199 &1813239584360167584
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -6152,7 +6152,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 411.8, y: -33}
m_AnchoredPosition: {x: 393, y: -33}
m_SizeDelta: {x: 137.2, y: 52.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8833716866223761799

View File

@ -186,6 +186,66 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &516167916
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 516167917}
- component: {fileID: 516167918}
m_Layer: 5
m_Name: rewardGird
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &516167917
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 516167916}
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: 2689344221917881399}
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: 0, y: -132.9}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &516167918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 516167916}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 120, y: 120}
m_Spacing: {x: 18, y: 0}
m_Constraint: 2
m_ConstraintCount: 1
--- !u!1 &778117615
GameObject:
m_ObjectHideFlags: 0
@ -4938,7 +4998,7 @@ ParticleSystem:
--- !u!199 &778117617
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -5802,10 +5862,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 0
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 339.52002, y: -25}
m_SizeDelta: {x: 450, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1880789683
CanvasRenderer:
@ -6665,8 +6725,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000012744972}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 16, y: 0}
m_SizeDelta: {x: 0, y: 49}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2781897261202178156
MonoBehaviour:
@ -6686,7 +6746,7 @@ MonoBehaviour:
m_Top: 8
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 10
m_Spacing: 8
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -7377,6 +7437,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1568188932064588420
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 391382487732334168}
- component: {fileID: 560702202387987777}
- component: {fileID: 6361295810665436008}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &391382487732334168
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568188932064588420}
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: 7180603819662835566}
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.35, y: -0.35}
m_SizeDelta: {x: 188.87, y: 57.46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &560702202387987777
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568188932064588420}
m_CullTransparentMesh: 0
--- !u!114 &6361295810665436008
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568188932064588420}
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: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9886 \u53D6"
--- !u!1 &1596477477619195818
GameObject:
m_ObjectHideFlags: 0
@ -12377,7 +12516,7 @@ ParticleSystem:
--- !u!199 &2633245403047036707
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -13173,10 +13312,10 @@ RectTransform:
m_Father: {fileID: 1140878141797173410}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 13, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 13, y: -28.5}
m_SizeDelta: {x: 0, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5307027406452831801
MonoBehaviour:
@ -13293,8 +13432,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: 26}
m_SizeDelta: {x: 234, y: 156}
m_AnchoredPosition: {x: 0, y: 53.57}
m_SizeDelta: {x: 217.3, y: 144.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2691883694018328297
CanvasRenderer:
@ -13477,7 +13616,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: 420}
m_AnchoredPosition: {x: 0, y: 354}
m_SizeDelta: {x: 1080, y: 286}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2547512158218570705
@ -18132,7 +18271,7 @@ ParticleSystem:
--- !u!199 &2633049357205832411
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -22923,7 +23062,7 @@ ParticleSystem:
--- !u!199 &2633928263147721625
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23137,7 +23276,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2689423902480354873
RectTransform:
m_ObjectHideFlags: 0
@ -27853,7 +27992,7 @@ ParticleSystem:
--- !u!199 &2633446429921629247
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -32860,7 +32999,7 @@ ParticleSystem:
--- !u!199 &2632993390116622243
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -37563,7 +37702,7 @@ ParticleSystem:
--- !u!199 &2633019293885752909
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -37825,6 +37964,8 @@ RectTransform:
- {fileID: 2689587531223887917}
- {fileID: 2688862197989829245}
- {fileID: 2688905534178211547}
- {fileID: 516167917}
- {fileID: 7180603819662835566}
m_Father: {fileID: 2689364971332473045}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -42878,7 +43019,7 @@ ParticleSystem:
--- !u!199 &2633372072888551629
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -44179,10 +44320,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 2
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 339.52002, y: -75}
m_SizeDelta: {x: 450, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3240506387495551981
CanvasRenderer:
@ -44261,8 +44402,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: 28.3, y: -58}
m_SizeDelta: {x: 1080, y: 286}
m_AnchoredPosition: {x: 28.3, y: -58.4}
m_SizeDelta: {x: 1080, y: 287}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5473933493711570507
CanvasRenderer:
@ -49146,7 +49287,7 @@ ParticleSystem:
--- !u!199 &5363572301551820110
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -49315,7 +49456,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: -5.8, y: -119.9}
m_AnchoredPosition: {x: -5.8, y: -92.4}
m_SizeDelta: {x: 160, y: 61.84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5458184823102600010
@ -49389,7 +49530,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6FC0\u6D3B\u8FDB\u5EA6"
m_Text: "\u7B49\u7EA7\u5956\u52B1"
LanguageIndex: 0
--- !u!1 &5236599552931609370
GameObject:
@ -49503,9 +49644,9 @@ RectTransform:
m_Father: {fileID: 2688828308012583799}
m_RootOrder: 0
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20.5, y: -20.5}
m_SizeDelta: {x: 41, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5457461477382774726
@ -49812,10 +49953,10 @@ RectTransform:
m_Father: {fileID: 2688828308012583799}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 325.515, y: 0}
m_SizeDelta: {x: 569.03, y: 0}
m_SizeDelta: {x: 569.03, y: 38}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5454571531986427168
CanvasRenderer:
@ -50165,10 +50306,10 @@ RectTransform:
m_Father: {fileID: 5455457837940663430}
m_RootOrder: 0
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: 569.03, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 284.515, y: 0}
m_SizeDelta: {x: 569.03, y: 38}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5458361211353407146
CanvasRenderer:
@ -50381,7 +50522,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5455443410731749816
RectTransform:
m_ObjectHideFlags: 0
@ -51341,7 +51482,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -51951,10 +52092,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 1
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 819.52, y: -25}
m_SizeDelta: {x: 450, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5525565508332388175
CanvasRenderer:
@ -52967,10 +53108,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 3
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_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 819.52, y: -75}
m_SizeDelta: {x: 450, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &596483134041477348
CanvasRenderer:
@ -53675,6 +53816,144 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &9045434862985277048
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7180603819662835566}
- component: {fileID: 7254379801479004477}
- component: {fileID: 3032550000553781643}
- component: {fileID: 859132468250516740}
- component: {fileID: 3886435906199779461}
m_Layer: 5
m_Name: getReawardBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7180603819662835566
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9045434862985277048}
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: 391382487732334168}
m_Father: {fileID: 2689344221917881399}
m_RootOrder: 4
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: -245}
m_SizeDelta: {x: 200, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7254379801479004477
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9045434862985277048}
m_CullTransparentMesh: 0
--- !u!114 &3032550000553781643
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9045434862985277048}
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: 98b646746e686b6438555ec8552ecc60, 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!114 &859132468250516740
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9045434862985277048}
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: 3032550000553781643}
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 &3886435906199779461
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9045434862985277048}
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!1 &9130463259899987643
GameObject:
m_ObjectHideFlags: 0

View File

@ -77,6 +77,7 @@ HERO_LOCKSTATE_FIELD = protobuf.FieldDescriptor();
HERO_JEWELS_FIELD = protobuf.FieldDescriptor();
HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor();
HERO_CHANGEID_FIELD = protobuf.FieldDescriptor();
HERO_SEALIDLIST_FIELD = protobuf.FieldDescriptor();
POKEMONINFO = protobuf.Descriptor();
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
@ -441,10 +442,6 @@ EXPERTINFO_SEX_FIELD = protobuf.FieldDescriptor();
SIGNININFO = protobuf.Descriptor();
SIGNININFO_DAYS_FIELD = protobuf.FieldDescriptor();
SIGNININFO_STATE_FIELD = protobuf.FieldDescriptor();
PURPLESEALSHOWINFO = protobuf.Descriptor();
PURPLESEALSHOWINFO_ID_FIELD = protobuf.FieldDescriptor();
PURPLESEALSHOWINFO_TYPE_FIELD = protobuf.FieldDescriptor();
PURPLESEALSHOWINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO = protobuf.Descriptor();
TEAMSIMPLEINFO_HEROID_FIELD = protobuf.FieldDescriptor();
TEAMSIMPLEINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
@ -457,7 +454,6 @@ TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO = protobuf.Descriptor();
TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor();
TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
@ -688,6 +684,9 @@ PURPLEMANSIONSEAL_ID_FIELD = protobuf.FieldDescriptor();
PURPLEMANSIONSEAL_TYPE_FIELD = protobuf.FieldDescriptor();
PURPLEMANSIONSEAL_SUBID_FIELD = protobuf.FieldDescriptor();
PURPLEMANSIONSEAL_STATE_FIELD = protobuf.FieldDescriptor();
KEYVAL = protobuf.Descriptor();
KEYVAL_KEY_FIELD = protobuf.FieldDescriptor();
KEYVAL_VAL_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
@ -1398,11 +1397,21 @@ HERO_CHANGEID_FIELD.default_value = 0
HERO_CHANGEID_FIELD.type = 5
HERO_CHANGEID_FIELD.cpp_type = 1
HERO_SEALIDLIST_FIELD.name = "sealIdList"
HERO_SEALIDLIST_FIELD.full_name = ".rpc.protocols.Hero.sealIdList"
HERO_SEALIDLIST_FIELD.number = 17
HERO_SEALIDLIST_FIELD.index = 15
HERO_SEALIDLIST_FIELD.label = 3
HERO_SEALIDLIST_FIELD.has_default_value = false
HERO_SEALIDLIST_FIELD.default_value = {}
HERO_SEALIDLIST_FIELD.type = 5
HERO_SEALIDLIST_FIELD.cpp_type = 1
HERO.name = "Hero"
HERO.full_name = ".rpc.protocols.Hero"
HERO.nested_types = {}
HERO.enum_types = {}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD}
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_SEALIDLIST_FIELD}
HERO.is_extendable = false
HERO.extensions = {}
POKEMONINFO_TEMPID_FIELD.name = "tempId"
@ -4878,43 +4887,6 @@ SIGNININFO.enum_types = {}
SIGNININFO.fields = {SIGNININFO_DAYS_FIELD, SIGNININFO_STATE_FIELD}
SIGNININFO.is_extendable = false
SIGNININFO.extensions = {}
PURPLESEALSHOWINFO_ID_FIELD.name = "id"
PURPLESEALSHOWINFO_ID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.id"
PURPLESEALSHOWINFO_ID_FIELD.number = 1
PURPLESEALSHOWINFO_ID_FIELD.index = 0
PURPLESEALSHOWINFO_ID_FIELD.label = 1
PURPLESEALSHOWINFO_ID_FIELD.has_default_value = false
PURPLESEALSHOWINFO_ID_FIELD.default_value = 0
PURPLESEALSHOWINFO_ID_FIELD.type = 5
PURPLESEALSHOWINFO_ID_FIELD.cpp_type = 1
PURPLESEALSHOWINFO_TYPE_FIELD.name = "type"
PURPLESEALSHOWINFO_TYPE_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.type"
PURPLESEALSHOWINFO_TYPE_FIELD.number = 2
PURPLESEALSHOWINFO_TYPE_FIELD.index = 1
PURPLESEALSHOWINFO_TYPE_FIELD.label = 1
PURPLESEALSHOWINFO_TYPE_FIELD.has_default_value = false
PURPLESEALSHOWINFO_TYPE_FIELD.default_value = 0
PURPLESEALSHOWINFO_TYPE_FIELD.type = 5
PURPLESEALSHOWINFO_TYPE_FIELD.cpp_type = 1
PURPLESEALSHOWINFO_HEROTID_FIELD.name = "heroTId"
PURPLESEALSHOWINFO_HEROTID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.heroTId"
PURPLESEALSHOWINFO_HEROTID_FIELD.number = 3
PURPLESEALSHOWINFO_HEROTID_FIELD.index = 2
PURPLESEALSHOWINFO_HEROTID_FIELD.label = 1
PURPLESEALSHOWINFO_HEROTID_FIELD.has_default_value = false
PURPLESEALSHOWINFO_HEROTID_FIELD.default_value = 0
PURPLESEALSHOWINFO_HEROTID_FIELD.type = 5
PURPLESEALSHOWINFO_HEROTID_FIELD.cpp_type = 1
PURPLESEALSHOWINFO.name = "PurpleSealShowInfo"
PURPLESEALSHOWINFO.full_name = ".rpc.protocols.PurpleSealShowInfo"
PURPLESEALSHOWINFO.nested_types = {}
PURPLESEALSHOWINFO.enum_types = {}
PURPLESEALSHOWINFO.fields = {PURPLESEALSHOWINFO_ID_FIELD, PURPLESEALSHOWINFO_TYPE_FIELD, PURPLESEALSHOWINFO_HEROTID_FIELD}
PURPLESEALSHOWINFO.is_extendable = false
PURPLESEALSHOWINFO.extensions = {}
TEAMSIMPLEINFO_HEROID_FIELD.name = "heroid"
TEAMSIMPLEINFO_HEROID_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.heroid"
TEAMSIMPLEINFO_HEROID_FIELD.number = 1
@ -5024,22 +4996,11 @@ TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
TEAMONETEAMINFO_REMAINHP_FIELD.type = 3
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow"
TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow"
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4
TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3
TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false
TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {}
TEAMONETEAMINFO_SEALSHOW_FIELD.message_type = PURPLESEALSHOWINFO
TEAMONETEAMINFO_SEALSHOW_FIELD.type = 11
TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10
TEAMONETEAMINFO.name = "TeamOneTeamInfo"
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
TEAMONETEAMINFO.nested_types = {}
TEAMONETEAMINFO.enum_types = {}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD}
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD}
TEAMONETEAMINFO.is_extendable = false
TEAMONETEAMINFO.extensions = {}
TEAMONEINFO_UID_FIELD.name = "uid"
@ -7229,6 +7190,33 @@ PURPLEMANSIONSEAL.enum_types = {}
PURPLEMANSIONSEAL.fields = {PURPLEMANSIONSEAL_ID_FIELD, PURPLEMANSIONSEAL_TYPE_FIELD, PURPLEMANSIONSEAL_SUBID_FIELD, PURPLEMANSIONSEAL_STATE_FIELD}
PURPLEMANSIONSEAL.is_extendable = false
PURPLEMANSIONSEAL.extensions = {}
KEYVAL_KEY_FIELD.name = "key"
KEYVAL_KEY_FIELD.full_name = ".rpc.protocols.KeyVal.key"
KEYVAL_KEY_FIELD.number = 1
KEYVAL_KEY_FIELD.index = 0
KEYVAL_KEY_FIELD.label = 1
KEYVAL_KEY_FIELD.has_default_value = false
KEYVAL_KEY_FIELD.default_value = 0
KEYVAL_KEY_FIELD.type = 5
KEYVAL_KEY_FIELD.cpp_type = 1
KEYVAL_VAL_FIELD.name = "val"
KEYVAL_VAL_FIELD.full_name = ".rpc.protocols.KeyVal.val"
KEYVAL_VAL_FIELD.number = 2
KEYVAL_VAL_FIELD.index = 1
KEYVAL_VAL_FIELD.label = 1
KEYVAL_VAL_FIELD.has_default_value = false
KEYVAL_VAL_FIELD.default_value = 0
KEYVAL_VAL_FIELD.type = 5
KEYVAL_VAL_FIELD.cpp_type = 1
KEYVAL.name = "KeyVal"
KEYVAL.full_name = ".rpc.protocols.KeyVal"
KEYVAL.nested_types = {}
KEYVAL.enum_types = {}
KEYVAL.fields = {KEYVAL_KEY_FIELD, KEYVAL_VAL_FIELD}
KEYVAL.is_extendable = false
KEYVAL.extensions = {}
ActivityInfo = protobuf.Message(ACTIVITYINFO)
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
@ -7291,6 +7279,7 @@ JourneyCell = protobuf.Message(JOURNEYCELL)
JourneyGoodsInfo = protobuf.Message(JOURNEYGOODSINFO)
JourneyInfo = protobuf.Message(JOURNEYINFO)
JourneyMonsterInfo = protobuf.Message(JOURNEYMONSTERINFO)
KeyVal = protobuf.Message(KEYVAL)
LevelDifficulty = protobuf.Message(LEVELDIFFICULTY)
LevelDifficultyInfos = protobuf.Message(LEVELDIFFICULTYINFOS)
LuckWheelRewardPosInfo = protobuf.Message(LUCKWHEELREWARDPOSINFO)
@ -7308,7 +7297,6 @@ Pokemoncomonpent = protobuf.Message(POKEMONCOMONPENT)
PosMineral = protobuf.Message(POSMINERAL)
Privilege = protobuf.Message(PRIVILEGE)
PurpleMansionSeal = protobuf.Message(PURPLEMANSIONSEAL)
PurpleSealShowInfo = protobuf.Message(PURPLESEALSHOWINFO)
QuestionOptions = protobuf.Message(QUESTIONOPTIONS)
RankInfo = protobuf.Message(RANKINFO)
RedOneDetail = protobuf.Message(REDONEDETAIL)

File diff suppressed because one or more lines are too long

View File

@ -525,6 +525,13 @@ HARDSTAGEREPORTREQUSET = protobuf.Descriptor();
HARDSTAGEREPORTREQUSET_HARDSTAGEID_FIELD = protobuf.FieldDescriptor();
HARDSTAGEREPORTRESPONSE = protobuf.Descriptor();
HARDSTAGEREPORTRESPONSE_PLAYER_FIELD = protobuf.FieldDescriptor();
VIPLEVELSTATEREQUSET = protobuf.Descriptor();
VIPLEVELSTATERESPONSE = protobuf.Descriptor();
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD = protobuf.FieldDescriptor();
VIPLEVELSTATEREWARDREQUSET = protobuf.Descriptor();
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD = protobuf.FieldDescriptor();
VIPLEVELSTATEREWARDRESPONSE = protobuf.Descriptor();
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
@ -5316,6 +5323,66 @@ HARDSTAGEREPORTRESPONSE.enum_types = {}
HARDSTAGEREPORTRESPONSE.fields = {HARDSTAGEREPORTRESPONSE_PLAYER_FIELD}
HARDSTAGEREPORTRESPONSE.is_extendable = false
HARDSTAGEREPORTRESPONSE.extensions = {}
VIPLEVELSTATEREQUSET.name = "VipLevelStateRequset"
VIPLEVELSTATEREQUSET.full_name = ".rpc.protocols.VipLevelStateRequset"
VIPLEVELSTATEREQUSET.nested_types = {}
VIPLEVELSTATEREQUSET.enum_types = {}
VIPLEVELSTATEREQUSET.fields = {}
VIPLEVELSTATEREQUSET.is_extendable = false
VIPLEVELSTATEREQUSET.extensions = {}
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.name = "vipState"
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.full_name = ".rpc.protocols.VipLevelStateResponse.vipState"
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.number = 1
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.index = 0
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.label = 3
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.has_default_value = false
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.default_value = {}
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.message_type = CommonProto_pb.KEYVAL
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.type = 11
VIPLEVELSTATERESPONSE_VIPSTATE_FIELD.cpp_type = 10
VIPLEVELSTATERESPONSE.name = "VipLevelStateResponse"
VIPLEVELSTATERESPONSE.full_name = ".rpc.protocols.VipLevelStateResponse"
VIPLEVELSTATERESPONSE.nested_types = {}
VIPLEVELSTATERESPONSE.enum_types = {}
VIPLEVELSTATERESPONSE.fields = {VIPLEVELSTATERESPONSE_VIPSTATE_FIELD}
VIPLEVELSTATERESPONSE.is_extendable = false
VIPLEVELSTATERESPONSE.extensions = {}
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.name = "vipLevelId"
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.full_name = ".rpc.protocols.VipLevelStateRewardRequset.vipLevelId"
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.number = 1
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.index = 0
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.label = 1
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.has_default_value = false
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.default_value = 0
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.type = 5
VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD.cpp_type = 1
VIPLEVELSTATEREWARDREQUSET.name = "VipLevelStateRewardRequset"
VIPLEVELSTATEREWARDREQUSET.full_name = ".rpc.protocols.VipLevelStateRewardRequset"
VIPLEVELSTATEREWARDREQUSET.nested_types = {}
VIPLEVELSTATEREWARDREQUSET.enum_types = {}
VIPLEVELSTATEREWARDREQUSET.fields = {VIPLEVELSTATEREWARDREQUSET_VIPLEVELID_FIELD}
VIPLEVELSTATEREWARDREQUSET.is_extendable = false
VIPLEVELSTATEREWARDREQUSET.extensions = {}
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.name = "drop"
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.VipLevelStateRewardResponse.drop"
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.number = 1
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.index = 0
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.label = 1
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.has_default_value = false
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.default_value = nil
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.type = 11
VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD.cpp_type = 10
VIPLEVELSTATEREWARDRESPONSE.name = "VipLevelStateRewardResponse"
VIPLEVELSTATEREWARDRESPONSE.full_name = ".rpc.protocols.VipLevelStateRewardResponse"
VIPLEVELSTATEREWARDRESPONSE.nested_types = {}
VIPLEVELSTATEREWARDRESPONSE.enum_types = {}
VIPLEVELSTATEREWARDRESPONSE.fields = {VIPLEVELSTATEREWARDRESPONSE_DROP_FIELD}
VIPLEVELSTATEREWARDRESPONSE.is_extendable = false
VIPLEVELSTATEREWARDRESPONSE.extensions = {}
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
@ -5468,6 +5535,10 @@ UseHeadFrameResponse = protobuf.Message(USEHEADFRAMERESPONSE)
UserForceChangeRequest = protobuf.Message(USERFORCECHANGEREQUEST)
ViewHeroInfoRequest = protobuf.Message(VIEWHEROINFOREQUEST)
ViewHeroInfoResponse = protobuf.Message(VIEWHEROINFORESPONSE)
VipLevelStateRequset = protobuf.Message(VIPLEVELSTATEREQUSET)
VipLevelStateResponse = protobuf.Message(VIPLEVELSTATERESPONSE)
VipLevelStateRewardRequset = protobuf.Message(VIPLEVELSTATEREWARDREQUSET)
VipLevelStateRewardResponse = protobuf.Message(VIPLEVELSTATEREWARDRESPONSE)
VipLevelUpResponse = protobuf.Message(VIPLEVELUPRESPONSE)
VipTakeBoxRequest = protobuf.Message(VIPTAKEBOXREQUEST)
VipTakeBoxResponse = protobuf.Message(VIPTAKEBOXRESPONSE)

View File

@ -465,6 +465,7 @@ function this.ExecuteLoading()
function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end,
function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end,
function() NetManager.HardStageRequest(LoadingPanel.OnStep) end,
-- function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end,
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

View File

@ -130,6 +130,8 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, this.HardStageResponse)
-- 神印信息推送
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
-- Vip等级奖励信息推送
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
end
function this.OpenHongMengTowerGuideIndication(buffer)
local data = buffer:DataByte()
@ -915,4 +917,12 @@ function this.PracticeImprintData(buffer)
msg:ParseFromString(data)
PracticeManager.UpdataImprintDataFromServer(msg.sealList)
end
--Vip等级奖励推送
function this.RefreshLevleRewardDatas(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.VipLevelStateRewardResponse()
msg:ParseFromString(data)
VipManager.InitLevleRewardDatas(msg)
end
return this

View File

@ -5093,4 +5093,32 @@ function NetManager.GetHardStageChapterReward(_chapterId,_rewradId,func)
end
end)
end
--vip特权奖励初始化
function NetManager.VipLevelStateRequset(func)
local data = PlayerInfoProto_pb.VipLevelStateRequset()
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.VIP_LEVEL_STATE_REQUEST, MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.VipLevelStateResponse()
msg:ParseFromString(data)
VipManager.InitLevleRewardDatas(msg)
if func then
func(msg)
end
end)
end
--vip特权奖励领取
function NetManager.VipLevelStateRewardRequset(vipLevelId,func)
local data = PlayerInfoProto_pb.VipLevelStateRewardRequset()
data.vipLevelId = vipLevelId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.VIP_LEVEL_STATE_REWARD_REQUEST, MessageTypeProto_pb.VIP_LEVEL_STATE_REWARD_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.VipLevelStateRewardResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -4,18 +4,20 @@ local curImprintData={}
function PracticeImprint:InitComponent()
self.spLoader = SpriteLoader.New()
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
self.backBtn = Util.GetGameObject(self.gameObject, "backBtn")
self.Scroll = Util.GetGameObject(self.gameObject, "Scroll")
self.Scrollgrid = Util.GetGameObject(self.gameObject, "Scroll/grid")
self.ImprintPre = Util.GetGameObject(self.gameObject, "ImprintPre")
self.ImprintInfo = Util.GetGameObject(self.gameObject, "ImprintInfo")
self.ImprintInfoBack = Util.GetGameObject(self.ImprintInfo, "close")
self.Name = Util.GetGameObject(self.ImprintInfo, "Content/Name"):GetComponent("Text")
self.leftInfo = Util.GetGameObject(self.ImprintInfo, "Content/Layout/Left")
self.leftTitle = Util.GetGameObject(self.leftInfo, "Title/Text"):GetComponent("Text")
self.leftDetail = Util.GetGameObject(self.leftInfo, "TextArena/Text"):GetComponent("Text")
self.rightInfo = Util.GetGameObject(self.ImprintInfo, "Content/Layout/Right")
self.tightTitle = Util.GetGameObject(self.rightInfo, "Title/Text"):GetComponent("Text")
self.Add = Util.GetGameObject(self.rightInfo, "AddBtn")
self.Hero = Util.GetGameObject(self.rightInfo, "Hero")
self.itemPre = Util.GetGameObject(self.Hero, "itemPre")
@ -24,12 +26,11 @@ function PracticeImprint:InitComponent()
self.doBtn = Util.GetGameObject(self.ImprintInfo, "Content/Btn")
self.doBtnText = Util.GetGameObject(self.doBtn, "Text"):GetComponent("Text")
local rootHight = self.Scroll.transform.rect.height
local width = self.Scroll.transform.rect.width
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform,
self.ImprintPre, nil,Vector2.New(width, rootHight), 1, 1,Vector2.New(15, 0))
self.ScrollView.moveTween.MomentumAmount = 1
self.ScrollView.moveTween.Strength = 2
self.sizeDelta = {
[1] = Vector2.New(0,0),
[2] = Vector2.New(0,-608),
}
self.ImprintList = {}
end
function PracticeImprint:BindEvent()
@ -38,6 +39,7 @@ function PracticeImprint:BindEvent()
end)
Util.AddClick(self.ImprintInfoBack, function()
self.ImprintInfo:SetActive(false)
self.Scroll:GetComponent("RectTransform").sizeDelta = self.sizeDelta[1]
end)
end
@ -49,6 +51,7 @@ end
--待功能扩展(试图打开某个状态)
function PracticeImprint:OnOpen()
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
end
function PracticeImprint:OnSortingOrderChange()
@ -61,9 +64,25 @@ end
function PracticeImprint:Refresh(isTop,isAni,func)
self.allImprintData = PracticeManager.GetAllImprintData()
self.ImprintInfo:SetActive(false)
self.ScrollView:SetData(self.allImprintData, function(index, go)
self:SetPre(index,go,self.allImprintData[index])
end,isTop,isAni)
self.Scroll:GetComponent("RectTransform").sizeDelta = self.sizeDelta[1]
if not self.ImprintList then
self.ImprintList = {}
end
for k,v in ipairs(self.ImprintList) do
v.gameObject:SetActive(false)
end
for i = 1, #self.allImprintData do
local data = self.allImprintData[i]
if not self.ImprintList[i] then
self.ImprintList[i] = newObject(self.ImprintPre)
self.ImprintList[i].transform:SetParent(self.Scrollgrid.transform)
self.ImprintList[i].transform.localScale = Vector3.one
self.ImprintList[i].transform.localPosition = Vector3.zero
end
self.ImprintList[i]:SetActive(true)
self:SetPre(i,self.ImprintList[i],self.allImprintData[i])
end
if func then
func()
end
@ -71,8 +90,8 @@ end
--设置每一期的三个神印
function PracticeImprint:SetPre(index,_go,_data)
local title = Util.GetGameObject(_go, "title/Text"):GetComponent("Text")
title.text = string.format("%s期",_data.RealmName)
local title = Util.GetGameObject(_go, "title/Image"):GetComponent("Image")
title.sprite = self.spLoader:LoadSprite(_data.NamePic1)
for i = 1, 3 do
local Imprint = Util.GetGameObject(_go, "Content/Imprint"..i)
self:SetSingleImprint(Imprint,_data.TeamSkill[i])
@ -86,16 +105,19 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId)
local stateImg = Util.GetGameObject(_go, "state"):GetComponent("Image")
local heroImg = Util.GetGameObject(_go, "hero"):GetComponent("Image")
local icon = Util.GetGameObject(_go, "icon"):GetComponent("Image")
local maskBlack = Util.GetGameObject(_go, "maskblack")
local name = Util.GetGameObject(_go, "name/Text"):GetComponent("Text")
if not serverData then--未解锁
stateImg.gameObject:SetActive(true)
stateImg.sprite = self.spLoader:LoadSprite("r_Dungeon_lockon")
heroImg.gameObject:SetActive(false)
maskBlack:SetActive(true)
else--已解锁
-- LogGreen(" _imprintId:"..tostring(_imprintId).." serverData.state:"..tostring(serverData.state))
maskBlack:SetActive(false)
if serverData.state == 0 then--未使用
stateImg.gameObject:SetActive(false)
-- heroImg.gameObject:SetActive(false)
elseif serverData.state == 1 then--已使用
stateImg.gameObject:SetActive(true)
stateImg.sprite = self.spLoader:LoadSprite("t_tianshumijuan_yijihuo_zh")
@ -108,10 +130,11 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId)
end
end
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(configData.Icon))
name.text = configData.Name
Util.AddOnceClick(maskBtn,function ()
self.ImprintInfo:SetActive(true)
self.Scroll:GetComponent("RectTransform").sizeDelta = self.sizeDelta[2]
self:ShowSingleImprintInfoLayout(serverData,configData)
end)
end
@ -119,10 +142,11 @@ end
--设置下方神印信息界面
function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
--title显示
self.Name.text = _configData.Name
if _configData.Type == 0 then
self.leftTitle.text = string.format("通用神印·%s",_configData.Name)
self.leftTitle.text = "通用神印"
elseif _configData.Type == 1 then
self.leftTitle.text = string.format("附身神印·%s",_configData.Name)
self.leftTitle.text = "附身神印"
end
--右侧部分状态和按钮显示
if not _serverData then
@ -160,6 +184,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
NetManager.PracticeImprintRequest(old,new,tostring(sub),function ()
self:Refresh(true,true,function ()
self.ImprintInfo:SetActive(true)
self.Scroll:GetComponent("RectTransform").sizeDelta = self.sizeDelta[2]
self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(new))
end)
end)
@ -193,29 +218,19 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
Util.AddOnceClick(self.MaskBtn,function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.XiuXingSelectHero,_configData,function (_heroData)
--发送请求
-- local funcNet = function ()
NetManager.PracticeImprintRequest(_configData.Id,_configData.Id,tostring(_heroData.dynamicId),function ()
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(_heroData.heroConfig.Quality,_heroData.star))
icon.sprite = self.spLoader:LoadSprite(_heroData.icon)
lv.text = _heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName))
SetHeroStars(starGrid, _heroData.star)
--刷新
self:Refresh(true,true,function ()
self.ImprintInfo:SetActive(true)
self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(_configData.Id))
end)
NetManager.PracticeImprintRequest(_configData.Id,_configData.Id,tostring(_heroData.dynamicId),function ()
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(_heroData.heroConfig.Quality,_heroData.star))
icon.sprite = self.spLoader:LoadSprite(_heroData.icon)
lv.text = _heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName))
SetHeroStars(starGrid, _heroData.star)
--刷新
self:Refresh(true,true,function ()
self.ImprintInfo:SetActive(true)
self.Scroll:GetComponent("RectTransform").sizeDelta = self.sizeDelta[2]
self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(_configData.Id))
end)
-- end
--检测该英雄已附身神印
-- if PracticeManager.CheckHeroWearImprint(_heroData.dynamicId) then
-- MsgPanel.ShowTwo("该神将已附身其他神印,是否替换?", nil, function()
-- funcNet()
-- end)
-- else
-- funcNet()
-- end
end)
end)
end)
end
@ -228,6 +243,9 @@ end
function PracticeImprint:OnDestroy()
self.spLoader:Destroy()
SubUIManager.Close(self.UpView)
self.UpView = nil
self.ImprintList = {}
end
return PracticeImprint

View File

@ -21,7 +21,7 @@ function this.UpdataFromServer(_level)
this.PracticeLevel = _level
this.PracticeLevel = this.PracticeLevel > 0 and this.PracticeLevel or 1
this.PracticeBigLevel = XiuXianConfig[this.PracticeLevel].RealmId
this.StarNum = PlayerManager.level-- FightLevelManager.GetAllChapterStars()
this.StarNum = FightLevelManager.GetAllChapterStars()
end
--获取当前等级表数据

View File

@ -61,7 +61,7 @@ function this.ReceiveNextRankingData(msg,fun)
--滚动数据
local length=#this.curRankingData
for i, rank in ipairs(msg.ranks) do
--LogGreen("UserRank "..rank.rankInfo.rank)
-- LogGreen("UserRank "..rank.rankInfo.rank.." userName "..rank.userName.." rank.rankInfo.param1 "..rank.rankInfo.param1.." practiceLevel:"..rank.practiceLevel)
rank.userName = PracticeManager.SetNameColor(rank.userName,rank.practiceLevel)
this.curRankingData[length+i]=rank
end

View File

@ -18,7 +18,7 @@ local maxLevel = 0
local m_chargedNum = 0
local m_rewardLeve = 0
local lastCharged = 0
local levleRewardDatas = {}
function this.Initialize()
--累充金额,由服务器返回
-- 设置最高等级
@ -395,7 +395,17 @@ end
-- 检测新vip红点
function this.CheckNewVipRP()
if VipManager.GetVipLevel() >= VipManager.GetMaxVipLevel() then
--等级奖励红点
local vipCurLevel = VipManager.GetVipLevel()
-- if levleRewardDatas then
-- for i = 0, #levleRewardDatas do
-- if levleRewardDatas[i].val and levleRewardDatas[i].val == 1 then
-- return true
-- end
-- end
-- end
if vipCurLevel >= VipManager.GetMaxVipLevel() then
return false
end
local isFinish = true
@ -465,5 +475,25 @@ function this.GetAddPro()
end
return proList
end
--levleRewardDatas vip特权等级奖励初始化
function this.InitLevleRewardDatas(msg)
LogError("----------------------------------")
for i = 1, #msg.vipState do
LogError("msg.vipState[i].key "..msg.vipState[i].key.." val "..msg.vipState[i].val)
levleRewardDatas[msg.vipState[i].key] = msg.vipState[i].val--val 0 不可领取 1 可领取 2已领取
end
end
function this.SetLevleRewardDatas(key,val)
if levleRewardDatas[key] then
levleRewardDatas[key] = val
end
end
function this.GetLevleRewardDatas(key)
if levleRewardDatas[key] then
return levleRewardDatas[key]
else
return 0
end
end
return this

View File

@ -18,6 +18,7 @@ local ReceiveTypeIconDef = {
local orginLayer
local GameSetting = ConfigManager.GetConfig(ConfigName.GameSetting)
local allRewardItemPres = {}
function VipPanelV2:InitComponent()
this.spLoader = SpriteLoader.New()
orginLayer = 0
@ -81,6 +82,9 @@ function VipPanelV2:InitComponent()
for i = 1, self.taskList.transform.childCount do
self.taskItemList[i] = self.taskList.transform:GetChild(i - 1)
end
self.allRewardItemParent = Util.GetGameObject(self.transform, "frame/topPart/stateRoot/rewardGird")
self.getReawardBtn = Util.GetGameObject(self.transform, "frame/topPart/stateRoot/getReawardBtn")
self.getReawardBtnText = Util.GetGameObject(self.transform, "frame/topPart/stateRoot/getReawardBtn/Text"):GetComponent("Text")
end
function VipPanelV2:BindEvent()
@ -109,6 +113,9 @@ function VipPanelV2:BindEvent()
Util.AddClick(self.btnLvUp, function()
self:OnBtnLvUpClicked()
end)
Util.AddClick(self.getReawardBtn, function()
self:OnGetReawardBtnClicked(self.curShowLevel)
end)
end
@ -182,6 +189,7 @@ function VipPanelV2:OnDestroy()
SubUIManager.Close(this.playerInfoView)
this.playerInfoView = nil
end
allRewardItemPres = {}
end
function VipPanelV2:InitVipContext()
@ -472,6 +480,7 @@ end
function VipPanelV2:OnBtnLvUpClicked()
local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
NetManager.RequestVipLevelUp(function(respond)
-- VipManager.SetLevleRewardDatas(self.curShowLevel,1)
self:OnShow()
SoundManager.PlaySound(SoundConfig.Sound_VipUpLevel)
local newPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
@ -487,6 +496,7 @@ function VipPanelV2:RefreshPanelStatus(level)
self.currentLvNum.text = level
self:SetVipPrivileges(level)
self:SetRewardList(level)
self:ShowRewardInfo(level)
end
--特权任务发生变化
@ -529,5 +539,49 @@ function this.CheckVipLvPos(tarObj,lv)
tarObj.transform:DOAnchorPosX(0,0)
end
end
--奖励
function VipPanelV2:ShowRewardInfo(level)
LogYellow("level "..level)
local state = VipManager.GetLevleRewardDatas(level)--0 未领取 1 已领取
local vipCurLevel = VipManager.GetVipLevel()
if state == 0 or state == 1 then
self.getReawardBtnText.text = Language[10018]
elseif state == 2 then
self.getReawardBtnText.text = Language[10101]
end
local curConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, level)
local reward = curConfig.Reward
if reward then
for i = 1, math.max(#allRewardItemPres, #reward) do
local go = allRewardItemPres[i]
if not go then
go = SubUIManager.Open(SubUIConfig.ItemView, self.allRewardItemParent.transform)
go.gameObject.name = "frame"..i
allRewardItemPres[i] = go
end
go.gameObject:SetActive(false)
end
for i = 1, #reward do
allRewardItemPres[i].gameObject:SetActive(true)
allRewardItemPres[i]:OnOpen(false,reward[i],0.9)
end
end
end
function VipPanelV2:OnGetReawardBtnClicked(level)
local state = VipManager.GetLevleRewardDatas(level)--0 不可领取 1 可领取 2已领取
local vipCurLevel = VipManager.GetVipLevel()
LogYellow("state "..state)
if state == 0 then
PopupTipPanel.ShowTip(string.format( "特权%s级后可领取",level))
elseif state == 1 then
NetManager.VipLevelStateRewardRequset(level,function(msg)
VipManager.SetLevleRewardDatas(level,2)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
VipPanelV2:ShowRewardInfo(level)
end)
end)
elseif state == 2 then
PopupTipPanel.ShowTip(Language[10101])
end
end
return VipPanelV2