遗漏同步提交

dev_chengFeng
JieLing 2020-09-27 18:27:20 +08:00
parent bf3641d6c3
commit 907d092c04
34 changed files with 1290 additions and 345 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

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

View File

@ -5,6 +5,7 @@
* @Created by MagicianJoker
--]]
SERVER_VERSION = 0
-- 启用功能引导
ENABLE_FUNC_GUIDE = 1 --0关闭1开启
RECHARGEABLE = true --false不可充值 true可充值
@ -617,7 +618,8 @@ RedPointType = {
DynamicAct = 2017,--破阵诛仙
DynamicActTask = 20171,--破阵诛仙任务
DynamicActRecharge = 20172,--破阵诛仙累充
WeekGiftPage = 2018, -- 每周礼包
MonthGiftPage = 2019, -- 每月礼包
---聊天相关-----
Chat = 207,
Chat_Friend = 2070,
@ -1043,6 +1045,7 @@ ActivityTypeDef = {
DynamicAct_TimeLimitShop = 20001,--主题活动限时商市
DynamicAct_Treasure = 20002,--主题活动珍奇宝阁
TreasureStore = 6000,--百宝商会
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {
@ -1192,6 +1195,7 @@ PRIVILEGE_TYPE = {
GUILDTRANSCRIPT_BATTLENUM = 3011, -- 公会副本挑战次数
GUILDTRANSCRIPT_BUY_BATTLENUM = 3012, -- 公会副本挑战购买次数
FINDTREASURE_EXPERT = 34, -- 活动寻宝达人寻宝消耗降低%s
HANG_ON_TIME = 2002, -- 挂机时长特权
}

View File

@ -318,7 +318,6 @@ local SetSortingOrder = function(uiConfig, panel, isStackPanel, ...)
end
function UIManager.GetPanel(id, isSync, func, ...)
Log("UIManager GetPanel id = "..id)
local uiConfig = UIConfig[id]
if(uiConfig == nil) then
LogError("UIManager====>没有找到UI的配置信息:"..id)
@ -332,19 +331,16 @@ function UIManager.GetPanel(id, isSync, func, ...)
panel = list[i]
--如果找到了,从桟中移除
table.remove(list, i)
Log("UIManager Stack Remove id = "..id)
break
end
end
local args = {...}
local action = function(panel)
Log("UIManager Action id = "..id)
if not panel then --在缓存里面找一找
panel = this.openedList[uiConfig.id]
end
if not panel then
Log("UIManager reimport id = "..id)
panel = reimport("Modules/"..uiConfig.script)
this.openedList[uiConfig.id] = panel
panel.uiConfig = uiConfig
@ -359,14 +355,11 @@ function UIManager.GetPanel(id, isSync, func, ...)
end
if isSync then
Log("UIManager CreateUI id = "..id)
local gameObject = this.CreatePanel(uiConfig, rootNode)
panel:CreateUI(gameObject)
else
Log("UIManager Async CreateUI id = "..id)
this.CreatePanelAsync(uiConfig, rootNode, function (gameObject)
panel:CreateUI(gameObject)
Log("UIManager Async SetSortingOrder id = "..id)
SetSortingOrder(uiConfig, panel, isStackPanel,unpack(args, 1, table.maxn(args)))
if func then
func(panel)
@ -375,7 +368,6 @@ function UIManager.GetPanel(id, isSync, func, ...)
end
end
Log("UIManager SetSortingOrder id = "..id)
if isSync then
SetSortingOrder(uiConfig, panel, isStackPanel,unpack(args, 1, table.maxn(args)))
return panel
@ -389,7 +381,6 @@ function UIManager.GetPanel(id, isSync, func, ...)
if isStackPanel and uiConfig.type == UIType.FullType then --如果栈界面有需要播放关闭动画的界面,则新打开的界面需要等到关闭动画播放完成以后
Log("UIManager Wait Anim Close id = "..id)
local closeNum = 0
local closeTotal = 0
for i = 1, #this.stackList do
@ -398,7 +389,6 @@ function UIManager.GetPanel(id, isSync, func, ...)
this.stackList[i]:OnCloseBefore(function()
closeNum = closeNum + 1
if closeNum == closeTotal then
Log("UIManager Close Done id = "..id)
this.eventSystem:SetActive(true)
return action(panel)
end
@ -406,7 +396,6 @@ function UIManager.GetPanel(id, isSync, func, ...)
end
end
if closeTotal == 0 then
Log("UIManager No Wait id = "..id)
return action(panel)
else
this.eventSystem:SetActive(false)

View File

@ -186,7 +186,7 @@ function Network:ReceiveErrorInfo(buffer)
RequestPanel.Hide()
-- 登录过程中报错
LoadingPanel.ErrorStep(msg)
--
LogError("Network ReceiveErrorInfo errCode"..msg.errCode)
--Log("msg.errCode:" .. msg.errCode)
--Log("msg.errMsg:" .. msg.errMsg)

View File

@ -64,10 +64,12 @@ TREASURESTATEINDICAION = protobuf.Descriptor();
TREASURESTATEINDICAION_SCORE_FIELD = protobuf.FieldDescriptor();
TREASURESTATEINDICAION_TREASUREREWARDSTATE_FIELD = protobuf.FieldDescriptor();
TREASURESTATEINDICAION_RESETTIME_FIELD = protobuf.FieldDescriptor();
TREASURESTATEINDICAION_ISBUY_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTREASUREINFORESPONSE = protobuf.Descriptor();
EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTREASUREINFORESPONSE_TREASUREREWARDSTATE_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD = protobuf.FieldDescriptor();
STORENODEREQUEST = protobuf.Descriptor();
STORENODEREQUEST_NODEID_FIELD = protobuf.FieldDescriptor();
STORENODERESPONSE = protobuf.Descriptor();
@ -630,11 +632,21 @@ TREASURESTATEINDICAION_RESETTIME_FIELD.default_value = 0
TREASURESTATEINDICAION_RESETTIME_FIELD.type = 5
TREASURESTATEINDICAION_RESETTIME_FIELD.cpp_type = 1
TREASURESTATEINDICAION_ISBUY_FIELD.name = "isBuy"
TREASURESTATEINDICAION_ISBUY_FIELD.full_name = ".com.ljsd.jieling.protocols.TreasureStateIndicaion.isBuy"
TREASURESTATEINDICAION_ISBUY_FIELD.number = 4
TREASURESTATEINDICAION_ISBUY_FIELD.index = 3
TREASURESTATEINDICAION_ISBUY_FIELD.label = 1
TREASURESTATEINDICAION_ISBUY_FIELD.has_default_value = false
TREASURESTATEINDICAION_ISBUY_FIELD.default_value = 0
TREASURESTATEINDICAION_ISBUY_FIELD.type = 5
TREASURESTATEINDICAION_ISBUY_FIELD.cpp_type = 1
TREASURESTATEINDICAION.name = "TreasureStateIndicaion"
TREASURESTATEINDICAION.full_name = ".com.ljsd.jieling.protocols.TreasureStateIndicaion"
TREASURESTATEINDICAION.nested_types = {}
TREASURESTATEINDICAION.enum_types = {}
TREASURESTATEINDICAION.fields = {TREASURESTATEINDICAION_SCORE_FIELD, TREASURESTATEINDICAION_TREASUREREWARDSTATE_FIELD, TREASURESTATEINDICAION_RESETTIME_FIELD}
TREASURESTATEINDICAION.fields = {TREASURESTATEINDICAION_SCORE_FIELD, TREASURESTATEINDICAION_TREASUREREWARDSTATE_FIELD, TREASURESTATEINDICAION_RESETTIME_FIELD, TREASURESTATEINDICAION_ISBUY_FIELD}
TREASURESTATEINDICAION.is_extendable = false
TREASURESTATEINDICAION.extensions = {}
EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD.name = "score"
@ -668,11 +680,21 @@ EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD.default_value = 0
EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD.type = 5
EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD.cpp_type = 1
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.name = "isBuy"
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.full_name = ".com.ljsd.jieling.protocols.ExpeditionTreasureInfoResponse.isBuy"
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.number = 4
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.index = 3
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.label = 1
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.has_default_value = false
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.default_value = 0
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.type = 5
EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.cpp_type = 1
EXPEDITIONTREASUREINFORESPONSE.name = "ExpeditionTreasureInfoResponse"
EXPEDITIONTREASUREINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.ExpeditionTreasureInfoResponse"
EXPEDITIONTREASUREINFORESPONSE.nested_types = {}
EXPEDITIONTREASUREINFORESPONSE.enum_types = {}
EXPEDITIONTREASUREINFORESPONSE.fields = {EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD, EXPEDITIONTREASUREINFORESPONSE_TREASUREREWARDSTATE_FIELD, EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD}
EXPEDITIONTREASUREINFORESPONSE.fields = {EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD, EXPEDITIONTREASUREINFORESPONSE_TREASUREREWARDSTATE_FIELD, EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD, EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD}
EXPEDITIONTREASUREINFORESPONSE.is_extendable = false
EXPEDITIONTREASUREINFORESPONSE.extensions = {}
STORENODEREQUEST_NODEID_FIELD.name = "nodeId"

File diff suppressed because one or more lines are too long

View File

@ -374,6 +374,7 @@ TREASUREREFRESHINDICATION = protobuf.Descriptor();
TREASUREREFRESHINDICATION_TASKS_FIELD = protobuf.FieldDescriptor();
TREASURELEVELUPINDICATION = protobuf.Descriptor();
TREASURELEVELUPINDICATION_LEVEL_FIELD = protobuf.FieldDescriptor();
TREASURELEVELUPINDICATION_HADBUY_FIELD = protobuf.FieldDescriptor();
MAILDELREQUEST = protobuf.Descriptor();
MAILDELREQUEST_MAILID_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFOREQUEST = protobuf.Descriptor();
@ -3867,11 +3868,21 @@ TREASURELEVELUPINDICATION_LEVEL_FIELD.default_value = 0
TREASURELEVELUPINDICATION_LEVEL_FIELD.type = 5
TREASURELEVELUPINDICATION_LEVEL_FIELD.cpp_type = 1
TREASURELEVELUPINDICATION_HADBUY_FIELD.name = "hadBuy"
TREASURELEVELUPINDICATION_HADBUY_FIELD.full_name = ".com.ljsd.jieling.protocols.TreasureLevelUpIndication.hadBuy"
TREASURELEVELUPINDICATION_HADBUY_FIELD.number = 2
TREASURELEVELUPINDICATION_HADBUY_FIELD.index = 1
TREASURELEVELUPINDICATION_HADBUY_FIELD.label = 1
TREASURELEVELUPINDICATION_HADBUY_FIELD.has_default_value = false
TREASURELEVELUPINDICATION_HADBUY_FIELD.default_value = 0
TREASURELEVELUPINDICATION_HADBUY_FIELD.type = 5
TREASURELEVELUPINDICATION_HADBUY_FIELD.cpp_type = 1
TREASURELEVELUPINDICATION.name = "TreasureLevelUpIndication"
TREASURELEVELUPINDICATION.full_name = ".com.ljsd.jieling.protocols.TreasureLevelUpIndication"
TREASURELEVELUPINDICATION.nested_types = {}
TREASURELEVELUPINDICATION.enum_types = {}
TREASURELEVELUPINDICATION.fields = {TREASURELEVELUPINDICATION_LEVEL_FIELD}
TREASURELEVELUPINDICATION.fields = {TREASURELEVELUPINDICATION_LEVEL_FIELD, TREASURELEVELUPINDICATION_HADBUY_FIELD}
TREASURELEVELUPINDICATION.is_extendable = false
TREASURELEVELUPINDICATION.extensions = {}
MAILDELREQUEST_MAILID_FIELD.name = "mailId"

View File

@ -679,8 +679,8 @@ function this.GetBattleBg(fightType)
local index = 1
if fightType == BATTLE_TYPE.STORY_FIGHT then
local curChapter = FightPointPassManager.GetCurChapterIndex()
index = math.floor((curChapter + 1) % 3 + 1)
elseif fightType == BATTLE_TYPE.BACK then
index = math.floor((curChapter - 1) % 5 + 1)
elseif fightType == BATTLE_TYPE.BACK or fightType == BATTLE_TYPE.ARENA then
index = 1001
elseif fightType == BATTLE_TYPE.EXECUTE_FIGHT then
index = 1002

View File

@ -2075,6 +2075,10 @@ local effectList = {
if ft < f2 then
isSecKill = BattleUtil.RandomAction(f3, function()
-- 秒杀
local isBoss=BattleUtil.CheckIsBoss(target)
if isBoss then
return
end
BattleUtil.Seckill(skill, caster, target)
end)
end

View File

@ -120,6 +120,8 @@ BattleEventName = {
SkillTargetCheck = indexAdd(),
DebugStop = indexAdd(),
--显示提示文字
ShowHintText = indexAdd(),
}
index = 0
@ -192,6 +194,13 @@ BattleSkillType = {
DeadSkill = 4,
}
--敌人类型
EnemyType={
--普通敌人
normal = 0,
--boss
Boss = 1,
}
CountTypeName = {
Add = 1,
AddPencent = 2,

View File

@ -86,7 +86,7 @@ function RoleLogic:Init(uid, data, position)
self.aiTempCount = 0
self.IsDebug = false
self.enemyType = EnemyType.normal
self.lockTarget = nil --嘲讽
self.ctrl_dizzy = false --眩晕 不能释放所有技能
self.ctrl_slient = false --沉默 只能1技能

View File

@ -57,6 +57,7 @@ function this.SetTurnRoundFunc(func)
this.TurnRoundFunc = func
end
function this.CheckTurnRound()
-- 如果正在释放技能
if this.IsSkilling then
return
end

View File

@ -83,7 +83,7 @@ function this:BindEvent()
local pauseTime = 31
Util.AddClick(this.BtnExit, function ()
if not BattleManager.IsUnlockBattlePass() then
PopupTipPanel.ShowTip(PrivilegeManager.GetPrivilegeOpenTip(isBack and PRIVILEGE_TYPE.SkipFight or PRIVILEGE_TYPE.ExitFight ))
PopupTipPanel.ShowTip(PrivilegeManager.GetPrivilegeOpenTip(PRIVILEGE_TYPE.SkipFight))
return
end
if BattleLogic.IsEnd or not BattleManager.IsCanOperate() then
@ -377,7 +377,7 @@ function this.ShowBattleResult(result, msg)
UIManager.ClosePanel(UIName.ElementPopup)
end
-- 回放直接关闭界面
if fightType == BATTLE_TYPE.BACK then
if fightType == BATTLE_TYPE.BACK or fightType == BATTLE_TYPE.ARENA then
this:ClosePanel()
return
end

View File

@ -16,6 +16,9 @@ end
-- 获取相应的金额
function this.GetMoney(rmbp)
if rmbp <= 0 then
return rmbp
end
if not this.RMB2O[rmbp] then
LogError("表 ExchangeRate 错误: 不包含档位:"..tostring(rmbp))
return 0

View File

@ -76,7 +76,7 @@ end
function TreasureOfHeavenPanel:refresh()
treasureState = TreasureOfHeavenManger.TreasrueState
rewardData = TreasureOfHeavenManger.rewardStateData
LogGreen("#rewardData长度"..#rewardData)
-- LogGreen("#rewardData长度"..#rewardData)
if #TreasureOfHeavenManger.rewardStateData <= 0 then
TreasureOfHeavenPanel:topBar()
TreasureOfHeavenPanel:showTaskList()
@ -245,7 +245,9 @@ function TreasureOfHeavenPanel:ShowTime()
time = 0
t = TreasureOfHeavenManger.resetTime
treasureState = nil
TreasureOfHeavenPanel:refresh()
this.ScrollView:SetIndex(1)
--TreasureOfHeavenPanel:refresh()--不刷新了,直接踢出去
ExpeditionManager.RefreshPanelShowByState()
end
this.time.text=TimeToDHMS(time)
end,1,-1,true)

View File

@ -141,7 +141,7 @@ function this:SetCurTypeAndIndex()
curIndex = OperatingManager.upGradePackagePanelIndex and OperatingManager.upGradePackagePanelIndex or 1
if curGiftList[curType] and #curGiftList[curType] > 0 and curGiftList[curType][curIndex] then
elseif curGiftList[curType] and #curGiftList[curType] > 0 and (not curGiftList[curType][curIndex]) then
curIndex = ##curGiftList[curType]
curIndex = #curGiftList[curType]
return curGiftList[curType][curIndex]
else
for k,v in pairs(curGiftList) do

View File

@ -16,6 +16,7 @@ local ReceiveTypeIconDef = {
"t_tequan_meirijiangli", --每日礼包
}
local orginLayer
local GameSetting = ConfigManager.GetConfig(ConfigName.GameSetting)
function VipPanelV2:InitComponent()
orginLayer = 0
@ -198,6 +199,10 @@ end
function VipPanelV2:OnDestroy()
SubUIManager.Close(this.UpView)
SubUIManager.Close(this.BtView)
SubUIManager.Close(this.playerHead)
this.playerHead = nil
this.UpView = nil
this.BtView = nil
end
function VipPanelV2:InitVipContext()
@ -309,10 +314,20 @@ function VipPanelV2:SetVipPrivileges(curVipLevel)
item:SetActive(false)
-- local str = "<size=45><color=#7bb15bFF> </color></size>"
-- str = string.format("<size=45><color=#7bb15bFF>%s</color></size>", privilegeInfo.value)
local colorStr = "<color=#7AB159><size=35>%s</size></color>"
local formatStr
if privilegeInfo.IfFloat == 2 then --特权关卡挂机加成百分比
Util.GetGameObject(item, "title"):GetComponent("Text").text = string.format(privilegeInfo.content, "<color=#7AB159><size=35>"..(privilegeInfo.value*100-100).."%</size></color>")
formatStr = string.format(colorStr, (privilegeInfo.value*100-100).."%")
else
Util.GetGameObject(item, "title"):GetComponent("Text").text = string.format(privilegeInfo.content, "<color=#7AB159><size=35>" .. privilegeInfo.value .. "</size></color>")
formatStr = string.format(colorStr, privilegeInfo.value)
end
local title = Util.GetGameObject(item, "title"):GetComponent("Text")
--
if privilegeInfo.id == PRIVILEGE_TYPE.HANG_ON_TIME then
-- 挂机时长特权特殊显示处理
title.text = string.format(privilegeInfo.content, string.format(colorStr, privilegeInfo.value + GameSetting[1].AdventureOffline), formatStr)
else
title.text = string.format(privilegeInfo.content, formatStr)
end
PlayUIAnim(Util.GetGameObject(item, "content"))
coroutine.wait(0.03)