Merge branch '0活动开发聚集地/周卡' into china/dev

# Conflicts:
#	Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
dev_chengFeng
gaoxin 2021-11-03 16:09:31 +08:00
commit 24c550cee5
42 changed files with 5368 additions and 55 deletions

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: c2e64bdfb2fcf6f47995cb439b6a09e4
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: 7fb3853b0811aa245be59c8d52c5235f
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WeekCardAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: dff8f719d1a72de4a9faee7ea33960d3
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: 3339ca48ea0db814f8a166c3c25e49ab
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WeekCardAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 69c1ec885d923414c86160e6da840142
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: bf91663d25ba59a48832b3c9d3ff4303
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WeekCardAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 4b865ac60a26fe144822fb80415f5cfa
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: 29311d250c15d2f4fac9e8916ba2728e
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WeekCardAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 2582f484e972ada42874681df25631f9
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: e1ee94dc7d69e2a41b2635d2c693e504
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WeekCardAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 54b2ec9f1651a3d4c919104e40173f6a
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: 95cc1b13b0e36864891367be7f2c5c40
vertices: []
indices:
edges: []
weights: []
spritePackingTag: WeekCardAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 736 KiB

View File

@ -0,0 +1,142 @@
fileFormatVersion: 2
guid: 56c2a91dc4a555e4a82af782e0fb531e
TextureImporter:
fileIDToRecycleName:
21300000: z_zhouka_chengzhanghufuditu
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- 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:
- serializedVersion: 2
name: z_zhouka_chengzhanghufuditu
rect:
serializedVersion: 2
x: 0
y: 0
width: 1049
height: 769
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 005ecb252d59f48409bbb79f1e0cadb0
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 197e24699873bc8418a8ba6579209be0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 KiB

View File

@ -0,0 +1,142 @@
fileFormatVersion: 2
guid: 0e3aa9b1d1fd5cf40ad01d2b1e5dcd79
TextureImporter:
fileIDToRecycleName:
21300000: z_zhouka_jinbiditu
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- 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:
- serializedVersion: 2
name: z_zhouka_jinbiditu
rect:
serializedVersion: 2
x: 0
y: 0
width: 1040
height: 769
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 785e3abc08aad3744b04ec648c252271
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 63601f45f0ceff341bb19519d1f1a204
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 KiB

View File

@ -0,0 +1,142 @@
fileFormatVersion: 2
guid: ac2d58cd8ed6cbc41b5a7bd8bdb33e56
TextureImporter:
fileIDToRecycleName:
21300000: z_zhouka_jiuzhuanjindanditu
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- 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:
- serializedVersion: 2
name: z_zhouka_jiuzhuanjindanditu
rect:
serializedVersion: 2
x: 0
y: 0
width: 1049
height: 769
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 0f87df8d069e27544aa2ec9748b0bb9a
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 90a8af81cf8ccff449f32ef6431e82d9
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 KiB

View File

@ -0,0 +1,142 @@
fileFormatVersion: 2
guid: 4c62f2d38169cb142bc5393c4328f4ce
TextureImporter:
fileIDToRecycleName:
21300000: z_zhouka_yuntieditu
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- 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:
- serializedVersion: 2
name: z_zhouka_yuntieditu
rect:
serializedVersion: 2
x: 0
y: 0
width: 1040
height: 769
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 5e3b221402cd11d449f480ae0651c809
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5d7811485a32c444cab804977c7fdeb4
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -709,6 +709,9 @@ RedPointType = {
FifteenDayGift = 2028,--十五日登录
FifteenDayGift_1 = 20281,--十五日登录领取按钮
XunBaoMiZong = 2029,--寻宝迷踪
WeekCard = 2030,
WeekCardOpen = 20301,
WeekCardReward = 20302,
---聊天相关-----
Chat = 207,
Chat_Friend = 2070,
@ -1565,6 +1568,7 @@ FUNCTION_OPEN_TYPE = {
QIJIESHILIAN = 112,--七界试炼
FOURQUADRANT=113,--四象心法
PLAYER_SKILL = 115, --主角技能
WEEK_CARD = 117, -- 周卡
}
TaskGetBtnIconDef = {

View File

@ -232,7 +232,7 @@ ConfigName = {
RidingSwardConfig = "RidingSwardConfig",
RidingSwardResult = "RidingSwardResult",
RidingSwardSence = "RidingSwardSence",
WeekcardConfig = "WeekcardConfig",
}
require "Framework/GameDataBase"

View File

@ -497,4 +497,5 @@ SubUIConfig = {
[31] = {name = "RecruitPanelNew",assetName = "RecruitPanelNew",script = "Modules/Recruit/RecruitPanelNew"},--
[32] = {name = "ElementDrawCardPanelNew",assetName = "ElementDrawCardPanelNew",script = "Modules/Recruit/ElementDrawCardPanelNew"},--升星有礼
[33] = {name = "XunBaoMiZongPanel",assetName = "XunBaoMiZongPanel",script = "Modules/XunBaoMiZong/XunBaoMiZongPanel"},--寻宝迷踪
[34] = {name = "WeekCardPage",assetName = "WeekCardPage",script = "Modules/Operating/WeekCardPage"},
}

View File

@ -397,6 +397,9 @@ GameEvent = {
MonthCard={
OnMonthCardUpdate = "MonthCard.OnMonthCardUpdate",
},
WeekCard={
OnWeekCardUpdate = "WeekCard.OnWeekCardUpdate",
},
BugCoin={ --点金
OnBuyCoinUpdate="BugCoin.OnBuyCoinUpdate"
},

View File

@ -83,6 +83,15 @@ RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDINFORESPONSE_BETLIST_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDINFORESPONSE_LASTRANK_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor();
WEEKCARDINFOREQUEST = protobuf.Descriptor();
WEEKCARDINFORESPONSE = protobuf.Descriptor();
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD = protobuf.FieldDescriptor();
WEEKCARDREWARDREQUEST = protobuf.Descriptor();
WEEKCARDREWARDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
WEEKCARDREWARDRESPONSE = protobuf.Descriptor();
WEEKCARDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
WEEKCARDINDICATIONINFORESPONSE = protobuf.Descriptor();
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD = protobuf.FieldDescriptor();
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
@ -795,6 +804,84 @@ RIDINGSWARDINFORESPONSE.enum_types = {}
RIDINGSWARDINFORESPONSE.fields = {RIDINGSWARDINFORESPONSE_RECORDLSIT_FIELD, RIDINGSWARDINFORESPONSE_BETLIST_FIELD, RIDINGSWARDINFORESPONSE_LASTRANK_FIELD, RIDINGSWARDINFORESPONSE_BETCOUNT_FIELD}
RIDINGSWARDINFORESPONSE.is_extendable = false
RIDINGSWARDINFORESPONSE.extensions = {}
WEEKCARDINFOREQUEST.name = "WeekCardInfoRequest"
WEEKCARDINFOREQUEST.full_name = ".rpc.protocols.WeekCardInfoRequest"
WEEKCARDINFOREQUEST.nested_types = {}
WEEKCARDINFOREQUEST.enum_types = {}
WEEKCARDINFOREQUEST.fields = {}
WEEKCARDINFOREQUEST.is_extendable = false
WEEKCARDINFOREQUEST.extensions = {}
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.name = "allWeekCardInfo"
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.full_name = ".rpc.protocols.WeekCardInfoResponse.allWeekCardInfo"
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.number = 1
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.index = 0
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.label = 3
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.has_default_value = false
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.default_value = {}
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.message_type = CommonProto_pb.WEEKCARD
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.type = 11
WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD.cpp_type = 10
WEEKCARDINFORESPONSE.name = "WeekCardInfoResponse"
WEEKCARDINFORESPONSE.full_name = ".rpc.protocols.WeekCardInfoResponse"
WEEKCARDINFORESPONSE.nested_types = {}
WEEKCARDINFORESPONSE.enum_types = {}
WEEKCARDINFORESPONSE.fields = {WEEKCARDINFORESPONSE_ALLWEEKCARDINFO_FIELD}
WEEKCARDINFORESPONSE.is_extendable = false
WEEKCARDINFORESPONSE.extensions = {}
WEEKCARDREWARDREQUEST_ID_FIELD.name = "id"
WEEKCARDREWARDREQUEST_ID_FIELD.full_name = ".rpc.protocols.WeekCardRewardRequest.id"
WEEKCARDREWARDREQUEST_ID_FIELD.number = 1
WEEKCARDREWARDREQUEST_ID_FIELD.index = 0
WEEKCARDREWARDREQUEST_ID_FIELD.label = 1
WEEKCARDREWARDREQUEST_ID_FIELD.has_default_value = false
WEEKCARDREWARDREQUEST_ID_FIELD.default_value = 0
WEEKCARDREWARDREQUEST_ID_FIELD.type = 5
WEEKCARDREWARDREQUEST_ID_FIELD.cpp_type = 1
WEEKCARDREWARDREQUEST.name = "WeekCardRewardRequest"
WEEKCARDREWARDREQUEST.full_name = ".rpc.protocols.WeekCardRewardRequest"
WEEKCARDREWARDREQUEST.nested_types = {}
WEEKCARDREWARDREQUEST.enum_types = {}
WEEKCARDREWARDREQUEST.fields = {WEEKCARDREWARDREQUEST_ID_FIELD}
WEEKCARDREWARDREQUEST.is_extendable = false
WEEKCARDREWARDREQUEST.extensions = {}
WEEKCARDREWARDRESPONSE_DROP_FIELD.name = "drop"
WEEKCARDREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.WeekCardRewardResponse.drop"
WEEKCARDREWARDRESPONSE_DROP_FIELD.number = 1
WEEKCARDREWARDRESPONSE_DROP_FIELD.index = 0
WEEKCARDREWARDRESPONSE_DROP_FIELD.label = 1
WEEKCARDREWARDRESPONSE_DROP_FIELD.has_default_value = false
WEEKCARDREWARDRESPONSE_DROP_FIELD.default_value = nil
WEEKCARDREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
WEEKCARDREWARDRESPONSE_DROP_FIELD.type = 11
WEEKCARDREWARDRESPONSE_DROP_FIELD.cpp_type = 10
WEEKCARDREWARDRESPONSE.name = "WeekCardRewardResponse"
WEEKCARDREWARDRESPONSE.full_name = ".rpc.protocols.WeekCardRewardResponse"
WEEKCARDREWARDRESPONSE.nested_types = {}
WEEKCARDREWARDRESPONSE.enum_types = {}
WEEKCARDREWARDRESPONSE.fields = {WEEKCARDREWARDRESPONSE_DROP_FIELD}
WEEKCARDREWARDRESPONSE.is_extendable = false
WEEKCARDREWARDRESPONSE.extensions = {}
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.name = "allWeekCardInfo"
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.full_name = ".rpc.protocols.WeekCardIndicationInfoResponse.allWeekCardInfo"
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.number = 1
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.index = 0
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.label = 3
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.has_default_value = false
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.default_value = {}
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.message_type = CommonProto_pb.WEEKCARD
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.type = 11
WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD.cpp_type = 10
WEEKCARDINDICATIONINFORESPONSE.name = "WeekCardIndicationInfoResponse"
WEEKCARDINDICATIONINFORESPONSE.full_name = ".rpc.protocols.WeekCardIndicationInfoResponse"
WEEKCARDINDICATIONINFORESPONSE.nested_types = {}
WEEKCARDINDICATIONINFORESPONSE.enum_types = {}
WEEKCARDINDICATIONINFORESPONSE.fields = {WEEKCARDINDICATIONINFORESPONSE_ALLWEEKCARDINFO_FIELD}
WEEKCARDINDICATIONINFORESPONSE.is_extendable = false
WEEKCARDINDICATIONINFORESPONSE.extensions = {}
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
@ -819,6 +906,11 @@ TasuilingxiaoRequest = protobuf.Message(TASUILINGXIAOREQUEST)
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
WeekCardIndicationInfoResponse = protobuf.Message(WEEKCARDINDICATIONINFORESPONSE)
WeekCardInfoRequest = protobuf.Message(WEEKCARDINFOREQUEST)
WeekCardInfoResponse = protobuf.Message(WEEKCARDINFORESPONSE)
WeekCardRewardRequest = protobuf.Message(WEEKCARDREWARDREQUEST)
WeekCardRewardResponse = protobuf.Message(WEEKCARDREWARDRESPONSE)
choiceDrawCardRequest = protobuf.Message(CHOICEDRAWCARDREQUEST)
choiceDrawCardResponse = protobuf.Message(CHOICEDRAWCARDRESPONSE)
choiceHeroRewardRequest = protobuf.Message(CHOICEHEROREWARDREQUEST)

View File

@ -797,6 +797,10 @@ EQUIPBOOKINFO_NUM_FIELD = protobuf.FieldDescriptor();
PRACTICESKILLINFO = protobuf.Descriptor();
PRACTICESKILLINFO_SKILLID_FIELD = protobuf.FieldDescriptor();
PRACTICESKILLINFO_SKILLLV_FIELD = protobuf.FieldDescriptor();
WEEKCARD = protobuf.Descriptor();
WEEKCARD_ID_FIELD = protobuf.FieldDescriptor();
WEEKCARD_ISBUY_FIELD = protobuf.FieldDescriptor();
WEEKCARD_LEAVEGETREWARDDAYS_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
@ -8381,6 +8385,43 @@ PRACTICESKILLINFO.enum_types = {}
PRACTICESKILLINFO.fields = {PRACTICESKILLINFO_SKILLID_FIELD, PRACTICESKILLINFO_SKILLLV_FIELD}
PRACTICESKILLINFO.is_extendable = false
PRACTICESKILLINFO.extensions = {}
WEEKCARD_ID_FIELD.name = "id"
WEEKCARD_ID_FIELD.full_name = ".rpc.protocols.WeekCard.id"
WEEKCARD_ID_FIELD.number = 1
WEEKCARD_ID_FIELD.index = 0
WEEKCARD_ID_FIELD.label = 1
WEEKCARD_ID_FIELD.has_default_value = false
WEEKCARD_ID_FIELD.default_value = 0
WEEKCARD_ID_FIELD.type = 5
WEEKCARD_ID_FIELD.cpp_type = 1
WEEKCARD_ISBUY_FIELD.name = "isBuy"
WEEKCARD_ISBUY_FIELD.full_name = ".rpc.protocols.WeekCard.isBuy"
WEEKCARD_ISBUY_FIELD.number = 2
WEEKCARD_ISBUY_FIELD.index = 1
WEEKCARD_ISBUY_FIELD.label = 1
WEEKCARD_ISBUY_FIELD.has_default_value = false
WEEKCARD_ISBUY_FIELD.default_value = false
WEEKCARD_ISBUY_FIELD.type = 8
WEEKCARD_ISBUY_FIELD.cpp_type = 7
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.name = "leaveGetRewardDays"
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.full_name = ".rpc.protocols.WeekCard.leaveGetRewardDays"
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.number = 3
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.index = 2
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.label = 1
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.has_default_value = false
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.default_value = 0
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.type = 5
WEEKCARD_LEAVEGETREWARDDAYS_FIELD.cpp_type = 1
WEEKCARD.name = "WeekCard"
WEEKCARD.full_name = ".rpc.protocols.WeekCard"
WEEKCARD.nested_types = {}
WEEKCARD.enum_types = {}
WEEKCARD.fields = {WEEKCARD_ID_FIELD, WEEKCARD_ISBUY_FIELD, WEEKCARD_LEAVEGETREWARDDAYS_FIELD}
WEEKCARD.is_extendable = false
WEEKCARD.extensions = {}
ActivityInfo = protobuf.Message(ACTIVITYINFO)
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
@ -8508,6 +8549,7 @@ UserSkinInfo = protobuf.Message(USERSKININFO)
UserTitleInfo = protobuf.Message(USERTITLEINFO)
ViewHeroInfo = protobuf.Message(VIEWHEROINFO)
VipBaseInfo = protobuf.Message(VIPBASEINFO)
WeekCard = protobuf.Message(WEEKCARD)
WelfareRedPacket = protobuf.Message(WELFAREREDPACKET)
WorkShopBaseInfo = protobuf.Message(WORKSHOPBASEINFO)
WorkShopUnLockInfo = protobuf.Message(WORKSHOPUNLOCKINFO)

View File

@ -1272,8 +1272,8 @@ FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.index = 0
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.label = 1
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.has_default_value = false
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.default_value = 0
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.type = 5
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.cpp_type = 1
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.type = 3
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD.cpp_type = 2
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.name = "hurt"
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.full_name = ".rpc.protocols.FastFightChallengeResponse.hurt"
@ -1282,8 +1282,8 @@ FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.index = 1
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.label = 1
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.has_default_value = false
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.default_value = 0
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.type = 5
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.cpp_type = 1
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.type = 3
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD.cpp_type = 2
FASTFIGHTCHALLENGERESPONSE_FIGHTDATA_FIELD.name = "fightData"
FASTFIGHTCHALLENGERESPONSE_FIGHTDATA_FIELD.full_name = ".rpc.protocols.FastFightChallengeResponse.fightData"

File diff suppressed because one or more lines are too long

View File

@ -135,7 +135,7 @@ function this.RegisterMessage(network)
-- 神印信息推送
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
-- Vip等级奖励信息推送
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
-- socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
-- --心愿抽卡信息推送
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
-- --心愿抽卡信息推送
@ -147,6 +147,8 @@ function this.RegisterMessage(network)
--七界试炼推送
socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication)
socket:RegistNetMessage(MessageTypeProto_pb.EQUIP_BOOK_INDICATION, this.EquipBookInfoIndication)
-- 周卡推送
socket:RegistNetMessage(MessageTypeProto_pb.WeekCardIndicationInfoResponse, this.WeekCardIndication)
end
function this.EquipBookInfoIndication(buff)
@ -1043,4 +1045,12 @@ function this.SevenWorldInfoIndication(buffer)
end)
end
-- 周卡推送
function this.WeekCardIndication(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.WeekCardIndicationInfoResponse()
msg:ParseFromString(data)
WeekCardManager.UpdateAllWeekCard(msg)
end
return this

View File

@ -200,8 +200,10 @@ function this.PlayerInfoRequest(func)
MonsterCampManager. SetFriendHelpHero(msg.helpFightList)
OperatingManager.SetSignInData(msg.SignInInfo)
--月卡初始化数据
-- 月卡初始化数据
MonthCardManager.InitMonthCardData(msg.monthinfos)
-- 周卡数据初始化
WeekCardManager.InitWeekCardData()
--每日副本数据
CarbonManager.dailyChallengeInfo=msg.dailyChallengeInfo
@ -6018,4 +6020,33 @@ function NetManager.PlayerCultivationRequest(func)
end)
end
-- 周卡初始化数据
function NetManager.GetWeekCardData(func)
local data = ActivityProto_pb.WeekCardInfoRequest()
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.WeekCardInfoRequest, MessageTypeProto_pb.WeekCardInfoResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.WeekCardInfoResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
-- 请求领取周卡奖励
function NetManager.GetWeekCardReward(id, func)
local data = ActivityProto_pb.WeekCardRewardRequest()
data.id = id
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.WeekCardRewardRequest, MessageTypeProto_pb.WeekCardRewardResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.WeekCardRewardResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -170,4 +170,4 @@ function this.GetMonthCardIsOpen(type)
end
end
return false
end
end

View File

@ -6,6 +6,7 @@
* @Copyright Copyright (c) 2019, MagicianJoker
--]]
require("Modules.Operating.MonthCardManager")
require("Modules.Operating.WeekCardManager")
OperatingManager = {}
local this = OperatingManager

View File

@ -0,0 +1,94 @@
WeekCardManager = {}
local this = WeekCardManager
--初始化月卡数据
local _WeekCardData = {}
function this.InitWeekCardData()
NetManager.GetWeekCardData(function(msg)
this.UpdateAllWeekCard(msg)
end)
end
-- 更新所有周卡数据
function this.UpdateAllWeekCard(msg)
_WeekCardData = {}
LogRed("周卡信息初始化 "..#msg.allWeekCardInfo)
for i, data in ipairs(msg.allWeekCardInfo) do
this.UpdateWeekCardData(data)
end
-- 发送事件
Game.GlobalEvent:DispatchEvent(GameEvent.WeekCard.OnWeekCardUpdate)
end
-- 更新月卡数据
function this.UpdateWeekCardData(data)
LogRed("月卡信息更新 "..data.id.." "..tostring(data.isBuy).." "..data.leaveGetRewardDays)
local week = {}
week.id = data.id
week.isBuy = data.isBuy
week.leaveGetRewardDays = data.leaveGetRewardDays
_WeekCardData[data.id] = week
-- 检测红点显示
CheckRedPointStatus(RedPointType.WeekCardReward)
end
-- 请求获取周卡数据
function this.GetWeekCardData(id)
return _WeekCardData[id]
end
-- 获取周卡数据,以数组的形式
function this.GetWeekCardDataArray()
local list = {}
if _WeekCardData then
for id, data in pairs(_WeekCardData) do
table.insert(list, data)
end
end
table.sort(list, function(a, b)
return a.id < b.id
end)
return list
end
-- 请求领取周卡奖励
function this.RequestGetWeekCardReward(id, func)
local data = this.GetWeekCardData(id)
if not data then
LogRed("未找到周卡数据:"..id)
return
end
if not data.isBuy then
LogRed("尚未购买周卡:"..id)
return
end
-- 请求领取
NetManager.GetWeekCardReward(id, function(msg)
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
-- 累计时间归0
data.leaveGetRewardDays = 0
this.UpdateWeekCardData(data)
--
if func then
func()
end
end)
end
-- 检测是否进入过周卡界面
function this.CheckRedOpen()
local isCheck = PlayerPrefs.GetInt("IsCheckWeekCard_"..PlayerManager.uid, 0)
if isCheck == 1 then
return false
end
return true
end
-- 是否有可以领取的红点
function this.CheckRedReward()
if _WeekCardData then
for id, data in pairs(_WeekCardData) do
if data.isBuy and data.leaveGetRewardDays > 0 then
return true
end
end
end
return false
end

View File

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

View File

@ -0,0 +1,180 @@
local WeekCardPage = {}
local sortingOrder = 0
local _WeekcardConfig = ConfigManager.GetConfig(ConfigName.WeekcardConfig)
local _ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local _RechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
function WeekCardPage:New(gameObject)
local b = {}
b.gameObject = gameObject
b.transform = gameObject.transform
setmetatable(b, { __index = WeekCardPage })
return b
end
--初始化组件(用于子类重写)
function WeekCardPage:InitComponent()
self.spLoader = SpriteLoader.New()
self.grid = Util.GetGameObject(self.gameObject, "grid")
self.cardPres = {}
self.timerList = {}
for i= 1 ,self.grid.transform.childCount do
self.cardPres[i] = {}
self.cardPres[i].go = self.grid.transform:GetChild(i - 1).gameObject
self.cardPres[i].bg = self.cardPres[i].go:GetComponent("Image")
self.cardPres[i].name = Util.GetGameObject(self.cardPres[i].go, "nameBg/name"):GetComponent("Image")
self.cardPres[i].icon = Util.GetGameObject(self.cardPres[i].go, "icon"):GetComponent("Image")
self.cardPres[i].icon1 = Util.GetGameObject(self.cardPres[i].go, "tip1/icon"):GetComponent("Image")
self.cardPres[i].icon2 = Util.GetGameObject(self.cardPres[i].go, "tip2/icon"):GetComponent("Image")
self.cardPres[i].icon3 = Util.GetGameObject(self.cardPres[i].go, "Image/icon"):GetComponent("Image")
self.cardPres[i].dayNum = Util.GetGameObject(self.cardPres[i].go, "tip1/num"):GetComponent("Text")
self.cardPres[i].curNum = Util.GetGameObject(self.cardPres[i].go, "tip2/num"):GetComponent("Text")
self.cardPres[i].allNum = Util.GetGameObject(self.cardPres[i].go, "Image/Text"):GetComponent("Text")
self.cardPres[i].btn = Util.GetGameObject(self.cardPres[i].go, "btn")
self.cardPres[i].btnText = Util.GetGameObject(self.cardPres[i].go, "btn/Text"):GetComponent("Text")
self.cardPres[i].red = Util.GetGameObject(self.cardPres[i].go, "btn/redPoint")
end
end
--绑定事件(用于子类重写)
function WeekCardPage:BindEvent()
Game.GlobalEvent:AddEvent(GameEvent.WeekCard.OnWeekCardUpdate, self.RefreshShow, self)
end
--添加事件监听(用于子类重写)
function WeekCardPage:AddListener()
Game.GlobalEvent:RemoveEvent(GameEvent.WeekCard.OnWeekCardUpdate, self.RefreshShow, self)
end
--移除事件监听(用于子类重写)
function WeekCardPage:RemoveListener()
end
--界面打开时调用(用于子类重写)
function WeekCardPage:OnOpen(_activityConfig,_index,parent)
self.actConfig = _activityConfig
self.pageIndex = _index
self.parent = parent
end
function WeekCardPage:OnSortingOrderChange()
end
-- 打开,重新打开时回调
function WeekCardPage:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
sortingOrder = _sortingOrder
-- 刷新显示
self:RefreshShow()
-- 查看周卡界面刷新红点
PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 1)
CheckRedPointStatus(RedPointType.WeekCardOpen)
end
-- 妖晶数量显示
function WeekCardPage:RefreshShow()
local allData = WeekCardManager.GetWeekCardDataArray()
--月卡
for i = 1, #self.cardPres do
if allData[i] then
self:SetCardShow(i, allData[i])
end
end
end
function WeekCardPage:SetCardShow(index, data)
local pre = self.cardPres[index]
if not pre then
return
end
local config = _WeekcardConfig[data.id]
if not config then
return
end
-- 背景
pre.bg.sprite = self.spLoader:LoadSprite(config.BgImage)
-- 物品名称
pre.name.sprite = self.spLoader:LoadSprite(config.TypeImage)
pre.name:SetNativeSize()
-- 每日奖励数量
local itemId = 0
local dayNum = 0
if config.BaseReward and config.BaseReward[1] then
itemId = config.BaseReward[1][1]
dayNum = config.BaseReward[1][2]
end
pre.dayNum.text = dayNum
-- 当前累计奖励数量
local curNum = dayNum * data.leaveGetRewardDays or 0
pre.curNum.text = curNum
-- 总奖励数量
local continueDay = config.ContiueDays or 0
local allNum = dayNum * continueDay
pre.allNum.text = allNum
-- 设置物品图片显示
local sprite = SetIcon(self.spLoader, itemId)
pre.icon.sprite = sprite
pre.icon1.sprite = sprite
pre.icon2.sprite = sprite
pre.icon3.sprite = sprite
local rechargeCfg = _RechargeCommodityConfig[data.id]
if not rechargeCfg then
return
end
-- 按钮状态
if data.isBuy then
if data.leaveGetRewardDays > 0 then
-- 领取奖励
pre.btnText.text = "领取"
pre.red:SetActive(true)
Util.SetGray(pre.btn, false)
Util.AddOnceClick(pre.btn, function()
WeekCardManager.RequestGetWeekCardReward(data.id, function()
-- 刷新显示
self:RefreshShow()
end)
end)
else
-- 已领取
pre.btnText.text = "已领取"
pre.red:SetActive(false)
Util.SetGray(pre.btn, true)
Util.AddOnceClick(pre.btn, function()
PopupTipPanel.ShowTip("您已领取该奖励")
end)
end
else
-- 购买周卡
pre.btnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(rechargeCfg.Price)
pre.red:SetActive(true)
Util.SetGray(pre.btn, false)
Util.AddOnceClick(pre.btn, function()
PayManager.Pay(data.id, function(id)
-- 前端修改购买状态
data.isBuy = true
WeekCardManager.UpdateWeekCardData(data)
-- 刷新显示
self:RefreshShow()
end)
end)
end
end
--界面关闭时调用(用于子类重写)
function WeekCardPage:OnClose()
self.gameObject:SetActive(false)
end
--界面销毁时调用(用于子类重写)
function WeekCardPage:OnDestroy()
self.spLoader:Destroy()
self.cardPres = {}
end
return WeekCardPage

View File

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

View File

@ -319,6 +319,12 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.playerSkill2,RedPointType.Practice)
RPData:SetParent(RedPointType.playerSkill3,RedPointType.Practice)
RPData:SetParent(RedPointType.playerSkill4,RedPointType.Practice)
-- 周卡
RPData:SetParent(RedPointType.WeekCardOpen,RedPointType.WeekCard)
RPData:SetParent(RedPointType.WeekCardReward,RedPointType.WeekCard)
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
if v.RpType > 0 and v.RpTypeParent > 0 then
RPData:SetParent(v.RpType,v.RpTypeParent)
@ -602,6 +608,10 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.playerSkill4, PracticeManager.CheckPlayerSkillRed)
--三界降魔
RPData:AddCheckFunc(RedPointType.DemonSlayerNew, CommonActPageManager.DemonSlayerNewRedCheck)
-- 周卡
RPData:AddCheckFunc(RedPointType.WeekCardOpen, WeekCardManager.CheckRedOpen, FUNCTION_OPEN_TYPE.WEEK_CARD)
RPData:AddCheckFunc(RedPointType.WeekCardReward, WeekCardManager.CheckRedReward, FUNCTION_OPEN_TYPE.WEEK_CARD)
end
-- 向红点绑定物体