Merge branch 'master_xma_local' into master_xma_test
After Width: | Height: | Size: 29 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f8f4b4b1059c973439f465f09bec1b8b
|
||||
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: aac2616c98e476944b4e06da0497b8be
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ad3d631c2c8ae9247acbb0e11be3cd18
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 778 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 38b2f2217caed8c419fec06ae1fb6481
|
||||
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: dfce241b75c5c8140bf956cb2ca62e6a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 33 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9c7a7be869c90fa4b9afadaa0e78207e
|
||||
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: 9e6c2b0edd440d749b8d6ea42cacfcb8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 32 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 57741ecc9d97b2541940b263232d517f
|
||||
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: 0c1a08ff62010664c8880e0f26d5a24f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 199 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 85e1cb71bcb33ad4499babb225bfc018
|
||||
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: bddc077c2da3a024fbe3506129043d2d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 350 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fdf6ef9ec12d04f4297b5901783463f8
|
||||
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: 9964ff444ebf1ab4f8f45ea5c8a96861
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 196 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5196b311575706a49847c40bcf39c7be
|
||||
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: 1a55cd8066220b840a4577fd89d29d1a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 154 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ee3c6da143dee0a4ebd78f229d076b26
|
||||
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: 7cde1e71a243c47478571d1dbdcaad26
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: DynamicActivityAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 41 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cc223d2ebfdf1704d8e338340225590a
|
||||
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: 9d5f6f6b1ccef6b46aa7b0a07a60cf37
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: MainAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,85 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &8467177394886075968
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5224608928413890377}
|
||||
- component: {fileID: 6496760879101675642}
|
||||
- component: {fileID: 6996006100066957039}
|
||||
m_Layer: 0
|
||||
m_Name: live2d_c_mjn_00063
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5224608928413890377
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8467177394886075968}
|
||||
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: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6496760879101675642
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8467177394886075968}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6996006100066957039
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8467177394886075968}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
|
||||
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
|
||||
skeletonDataAsset: {fileID: 11400000, guid: 0371bf0e9a0c6d04998dd20dbac79f18, type: 2}
|
||||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
startingAnimation: idle
|
||||
startingLoop: 1
|
||||
timeScale: 1
|
||||
freeze: 0
|
||||
unscaledTime: 0
|
||||
meshGenerator:
|
||||
settings:
|
||||
useClipping: 1
|
||||
zSpacing: 0
|
||||
pmaVertexColors: 1
|
||||
tintBlack: 0
|
||||
calculateTangents: 0
|
||||
addNormals: 0
|
||||
immutableTriangles: 0
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b502eae703fe4f04594698d3bd59a323
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -41,7 +41,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: 563.0499, y: -45.050003}
|
||||
m_AnchoredPosition: {x: 563.05, y: -45.050003}
|
||||
m_SizeDelta: {x: 88.1, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222229770521615770
|
||||
|
@ -612,7 +612,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: 328.24997, y: -45.050003}
|
||||
m_AnchoredPosition: {x: 350.64996, y: -45.050003}
|
||||
m_SizeDelta: {x: 88.1, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222847014652085586
|
||||
|
@ -1285,7 +1285,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: 93.44995, y: -45.050003}
|
||||
m_AnchoredPosition: {x: 138.24998, y: -45.050003}
|
||||
m_SizeDelta: {x: 88.1, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222917638141494732
|
||||
|
@ -1725,7 +1725,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -43.30002, y: -93.2}
|
||||
m_AnchoredPosition: {x: -31, y: -93.2}
|
||||
m_SizeDelta: {x: 635.1, y: 130.7}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!114 &114987565653667408
|
||||
|
@ -1746,7 +1746,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 2
|
||||
m_Spacing: 97.3
|
||||
m_Spacing: 30.1
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
|
@ -1895,7 +1895,7 @@ MonoBehaviour:
|
|||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 0
|
||||
m_FillAmount: 0
|
||||
m_FillAmount: 0.75
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
|
|
|
@ -15758,6 +15758,30 @@ MonoBehaviour:
|
|||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_dhdj_skin01_attack01
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_dhdj_skin01_attack02
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_dhdj_skin01_attack03
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_dhdj_skin01_exskill01
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_dhdj_skin01_exskill02
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_dhdj_skin01_exskill03
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 434
|
||||
- resName: Audio_Effect_c_ab_00014_t3_attack01
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
|
@ -16066,6 +16090,18 @@ MonoBehaviour:
|
|||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 494
|
||||
- resName: Audio_swk_skin01_attack01
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 494
|
||||
- resName: Audio_swk_skin01_attack02
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 494
|
||||
- resName: Audio_swk_skin01_attack03
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
resAbNameIndex: 494
|
||||
- resName: Audio_s_jieling_dlg_3010_attack_01
|
||||
extension: .mp3
|
||||
resPathIndex: 103
|
||||
|
@ -30486,6 +30522,14 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 229
|
||||
resAbNameIndex: 1847
|
||||
- resName: juexing
|
||||
extension: .png
|
||||
resPathIndex: 230
|
||||
resAbNameIndex: 1848
|
||||
- resName: lingshoushan
|
||||
extension: .png
|
||||
resPathIndex: 230
|
||||
resAbNameIndex: 1848
|
||||
- resName: r_guanka_sheji_bu_01
|
||||
extension: .png
|
||||
resPathIndex: 230
|
||||
|
@ -54788,7 +54832,6 @@ MonoBehaviour:
|
|||
- lz4/atlas/tagbuttonatlas.unity3d
|
||||
- lz4/bg/battle/r_zhandou_changjing_1.unity3d
|
||||
- lz4/bg/jl-jinengkuang.unity3d
|
||||
- lz4/bg/r_chouka_zhubeijing.unity3d
|
||||
- lz4/dynamicatlas/artfont/r_zhandou_zuijiabiaoti.unity3d
|
||||
- lz4/dynamicatlas/card/t_biandui_hong.unity3d
|
||||
- lz4/dynamicatlas/card/t_zhandoukuang_hong.unity3d
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7a50cd9f65e4a8641a38b4f42ed83ab9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,293 @@
|
|||
|
||||
c_mjn_00063.png
|
||||
size: 1024,1024
|
||||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
repeat: none
|
||||
biyan
|
||||
rotate: true
|
||||
xy: 981, 597
|
||||
size: 54, 33
|
||||
orig: 54, 33
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
ganga
|
||||
rotate: true
|
||||
xy: 519, 334
|
||||
size: 68, 79
|
||||
orig: 68, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
haixiu
|
||||
rotate: true
|
||||
xy: 623, 443
|
||||
size: 73, 79
|
||||
orig: 73, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
hua1
|
||||
rotate: true
|
||||
xy: 981, 653
|
||||
size: 39, 41
|
||||
orig: 39, 41
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
hua2
|
||||
rotate: false
|
||||
xy: 2, 2
|
||||
size: 95, 38
|
||||
orig: 95, 38
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
hua3
|
||||
rotate: true
|
||||
xy: 977, 694
|
||||
size: 67, 22
|
||||
orig: 67, 22
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jingya
|
||||
rotate: true
|
||||
xy: 535, 162
|
||||
size: 68, 79
|
||||
orig: 68, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
pifeng
|
||||
rotate: false
|
||||
xy: 242, 326
|
||||
size: 121, 342
|
||||
orig: 121, 342
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
pingjing
|
||||
rotate: true
|
||||
xy: 713, 488
|
||||
size: 68, 79
|
||||
orig: 68, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qiang
|
||||
rotate: true
|
||||
xy: 461, 704
|
||||
size: 182, 283
|
||||
orig: 182, 283
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi1
|
||||
rotate: true
|
||||
xy: 623, 518
|
||||
size: 184, 88
|
||||
orig: 184, 88
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi2
|
||||
rotate: false
|
||||
xy: 875, 480
|
||||
size: 43, 76
|
||||
orig: 43, 76
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi3
|
||||
rotate: true
|
||||
xy: 256, 141
|
||||
size: 183, 146
|
||||
orig: 183, 146
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi4
|
||||
rotate: true
|
||||
xy: 547, 76
|
||||
size: 84, 63
|
||||
orig: 84, 63
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi5
|
||||
rotate: false
|
||||
xy: 866, 413
|
||||
size: 50, 65
|
||||
orig: 50, 65
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi6
|
||||
rotate: false
|
||||
xy: 517, 404
|
||||
size: 86, 57
|
||||
orig: 86, 57
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi7
|
||||
rotate: true
|
||||
xy: 461, 888
|
||||
size: 126, 518
|
||||
orig: 126, 518
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shengqi
|
||||
rotate: true
|
||||
xy: 794, 488
|
||||
size: 68, 79
|
||||
orig: 68, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shengti1
|
||||
rotate: false
|
||||
xy: 103, 48
|
||||
size: 151, 209
|
||||
orig: 151, 209
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shengti2
|
||||
rotate: false
|
||||
xy: 920, 470
|
||||
size: 62, 73
|
||||
orig: 62, 73
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
texiao0
|
||||
rotate: false
|
||||
xy: 2, 670
|
||||
size: 457, 344
|
||||
orig: 457, 344
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
texiao13
|
||||
rotate: false
|
||||
xy: 981, 556
|
||||
size: 39, 39
|
||||
orig: 39, 39
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
tou
|
||||
rotate: true
|
||||
xy: 256, 6
|
||||
size: 133, 178
|
||||
orig: 133, 178
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa1
|
||||
rotate: false
|
||||
xy: 535, 232
|
||||
size: 77, 100
|
||||
orig: 77, 100
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa2
|
||||
rotate: true
|
||||
xy: 918, 413
|
||||
size: 55, 58
|
||||
orig: 55, 58
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa3
|
||||
rotate: false
|
||||
xy: 713, 558
|
||||
size: 205, 131
|
||||
orig: 205, 131
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa4
|
||||
rotate: false
|
||||
xy: 746, 691
|
||||
size: 229, 195
|
||||
orig: 229, 195
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
weixiao
|
||||
rotate: true
|
||||
xy: 704, 418
|
||||
size: 68, 79
|
||||
orig: 68, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
xianglian
|
||||
rotate: false
|
||||
xy: 436, 10
|
||||
size: 105, 33
|
||||
orig: 105, 33
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yansu
|
||||
rotate: true
|
||||
xy: 785, 418
|
||||
size: 68, 79
|
||||
orig: 68, 79
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youshou12
|
||||
rotate: false
|
||||
xy: 977, 763
|
||||
size: 45, 123
|
||||
orig: 45, 123
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youshou13
|
||||
rotate: false
|
||||
xy: 461, 679
|
||||
size: 26, 23
|
||||
orig: 26, 23
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youshou2
|
||||
rotate: true
|
||||
xy: 981, 894
|
||||
size: 120, 41
|
||||
orig: 120, 41
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youshou3
|
||||
rotate: false
|
||||
xy: 103, 259
|
||||
size: 137, 409
|
||||
orig: 137, 409
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youshou4
|
||||
rotate: false
|
||||
xy: 920, 545
|
||||
size: 59, 144
|
||||
orig: 59, 144
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youtui1
|
||||
rotate: true
|
||||
xy: 404, 158
|
||||
size: 171, 129
|
||||
orig: 171, 129
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youtui2
|
||||
rotate: false
|
||||
xy: 517, 463
|
||||
size: 104, 239
|
||||
orig: 104, 239
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
zuoshou1
|
||||
rotate: true
|
||||
xy: 436, 45
|
||||
size: 111, 109
|
||||
orig: 111, 109
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
zuoshou2
|
||||
rotate: false
|
||||
xy: 365, 331
|
||||
size: 152, 66
|
||||
orig: 152, 66
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
zuoshou3
|
||||
rotate: true
|
||||
xy: 365, 399
|
||||
size: 269, 150
|
||||
orig: 269, 150
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
zuotui1
|
||||
rotate: false
|
||||
xy: 2, 42
|
||||
size: 99, 626
|
||||
orig: 99, 626
|
||||
offset: 0, 0
|
||||
index: -1
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 190e029a4da93934ebb81d12090273b2
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 772 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ba2104ca27611f1469e111f01964174b
|
||||
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: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
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: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: c8777867a9bd67048bd9d0370c957b80
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7de069ac1aa9fbd44b81edabc5b5a131
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,17 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
|
||||
m_Name: c_mjn_00063_Atlas
|
||||
m_EditorClassIdentifier:
|
||||
atlasFile: {fileID: 4900000, guid: 190e029a4da93934ebb81d12090273b2, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: 24e893ca3d207d849ae43f6df191564f, type: 2}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 38715c14155f23e4692e983da816f75e
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,28 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: c_mjn_00063_Material
|
||||
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: ba2104ca27611f1469e111f01964174b, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _Cutoff: 0.1
|
||||
m_Colors: []
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 24e893ca3d207d849ae43f6df191564f
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,23 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
|
||||
m_Name: c_mjn_00063_SkeletonData
|
||||
m_EditorClassIdentifier:
|
||||
atlasAssets:
|
||||
- {fileID: 11400000, guid: 38715c14155f23e4692e983da816f75e, type: 2}
|
||||
scale: 0.01
|
||||
skeletonJSON: {fileID: 4900000, guid: 7de069ac1aa9fbd44b81edabc5b5a131, type: 3}
|
||||
fromAnimation: []
|
||||
toAnimation: []
|
||||
duration: []
|
||||
defaultMix: 0.2
|
||||
controller: {fileID: 0}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0371bf0e9a0c6d04998dd20dbac79f18
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1089,12 +1089,17 @@ end
|
|||
function this.IsQualifiled(type)
|
||||
-- 相同类型活动解锁类型相同,所以只判断第一个
|
||||
local data = ConfigManager.GetConfigDataByKey(ConfigName.GlobalActivity,"Type",type)
|
||||
if not data then return false end
|
||||
if not data then
|
||||
return false
|
||||
end
|
||||
|
||||
-- 当前玩家等级
|
||||
local qualifiled = false
|
||||
local playerLv = PlayerManager.level
|
||||
local openRule = data.OpenRules
|
||||
if not data.OpenRules or #data.OpenRules < 2 then
|
||||
return true
|
||||
end
|
||||
if openRule[1] == 1 then -- 关卡开启
|
||||
qualifiled = FightPointPassManager.IsFightPointPass(openRule[2])
|
||||
elseif openRule[1] == 2 then -- 等级开启
|
||||
|
|
|
@ -282,7 +282,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
|||
if tv then
|
||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
||||
|
||||
local sortingOrder = tv.role.camp == 0 and tv.GameObject:GetComponent("Canvas").sortingOrder + 21 or nil
|
||||
local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder
|
||||
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||
go2.transform:SetParent(tv.GameObject.transform.parent)
|
||||
-- 检测特效旋转
|
||||
|
@ -325,7 +325,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
|||
if tv then
|
||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
||||
|
||||
local sortingOrder = tv.role.camp == 0 and tv.GameObject:GetComponent("Canvas").sortingOrder + 21 or nil
|
||||
local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder
|
||||
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||
go2.transform:SetParent(tv.GameObject.transform.parent)
|
||||
-- 检测特效旋转
|
||||
|
@ -341,7 +341,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
|||
local targetPos = go2.transform.localPosition
|
||||
local startPos = targetPos + Vector3.New(0, 800, 0)
|
||||
go2.transform.localPosition = startPos
|
||||
go2.transform:DOLocalMove(targetPos, 1, false)
|
||||
go2.transform:DOLocalMove(targetPos, combat.KeyFrame/1000, false)
|
||||
|
||||
BattleManager.AddDelayRecycleRes(combat.Bullet, go2, combat.KeyFrame/1000)
|
||||
end
|
||||
|
@ -357,7 +357,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
|||
if tv then
|
||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
||||
|
||||
local sortingOrder = BattleManager.GetBattleSorting() + 40
|
||||
local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder
|
||||
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||
go2.transform:SetParent(self.owner.GameObject.transform.parent)
|
||||
|
||||
|
|
|
@ -181,6 +181,9 @@ function this.SetScroll(i)
|
|||
break
|
||||
end
|
||||
end
|
||||
if CarbonManager.IsDailyCarbonPass(curData[#curData].Id) then
|
||||
curMaxOpenId = #curData
|
||||
end
|
||||
this.scrollView:SetIndex(curMaxOpenId - 2 < 1 and 1 or (curMaxOpenId - 2))
|
||||
end
|
||||
|
||||
|
|
|
@ -43,8 +43,8 @@ local tabs = {
|
|||
default = "x_xuanjimiaosuan_icon2", lock = "x_xuanjimiaosuan_icon2", select = "x_xuanjimiaosuan_icon1",
|
||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||
},
|
||||
[10] = { --第十一周
|
||||
default = "s_shibukedang_bicon1", lock = "s_shibukedang_bicon1", select = "s_shibukedang_bicon2",
|
||||
[10] = { --第十一周 降龙伏虎
|
||||
default = "x_xianglongfuhu_icon2", lock = "x_xianglongfuhu_icon2", select = "x_xianglongfuhu_icon1",
|
||||
rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct
|
||||
},
|
||||
[11] = { --社稷大典
|
||||
|
@ -225,19 +225,16 @@ function this.PageTabAdapter(tab, index, status)
|
|||
end
|
||||
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActType)
|
||||
if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActType) then
|
||||
if GlobalActConfig[id].Type == ActivityTypeDef.DynamicAct then
|
||||
if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then
|
||||
tab:SetActive(GlobalActConfig[id].ShowArt == index)
|
||||
else
|
||||
tab.gameObject:SetActive(true)
|
||||
end
|
||||
|
||||
--限时兑换特殊处理
|
||||
if GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then
|
||||
elseif GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then
|
||||
tab.gameObject:SetActive(GlobalActConfig[id].ShowArt ~= 1)
|
||||
end
|
||||
|
||||
--累计充值特殊处理
|
||||
if GlobalActConfig[id].Type == ActivityTypeDef.AccumulativeRechargeExper then
|
||||
elseif GlobalActConfig[id].Type == ActivityTypeDef.AccumulativeRechargeExper then
|
||||
if GlobalActConfig[id] and GlobalActConfig[id].ShowArt ~= 1 then
|
||||
tab.gameObject:SetActive(true)
|
||||
else
|
||||
|
@ -245,6 +242,8 @@ function this.PageTabAdapter(tab, index, status)
|
|||
end
|
||||
elseif GlobalActConfig[id].Type == ActivityTypeDef.DynamicAct_recharge then
|
||||
tab.gameObject:SetActive(true)
|
||||
else
|
||||
tab.gameObject:SetActive(true)
|
||||
end
|
||||
else
|
||||
tab.gameObject:SetActive(false)
|
||||
|
|
|
@ -15,6 +15,7 @@ local bannerType = {
|
|||
[7] = {compent = "bg1",titilebg1 = "y_yunchouweiwo_banner"},
|
||||
[8] = {compent = "bg1",titilebg1 = "y_yishandaohai_banner"},
|
||||
[9] = {compent = "bg1",titilebg1 = "x_xuanjimiaosuan_banner"},
|
||||
[10] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner"},
|
||||
}
|
||||
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
function DynamicTaskPage:ctor(mainPanel, gameObject)
|
||||
|
|
|
@ -56,6 +56,7 @@ function LingShouBaoGe:InitComponent(gameObject)
|
|||
this.detail.gameObject:SetActive(false)
|
||||
|
||||
this.grid = Util.GetGameObject(this.gameObject, "aniRoot")
|
||||
this.title = Util.GetGameObject(this.gameObject, "Bg/title"):GetComponent("Image")
|
||||
|
||||
--mid
|
||||
this.progressValue = Util.GetGameObject(this.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount
|
||||
|
@ -118,11 +119,15 @@ function LingShouBaoGe:Refresh()
|
|||
this:SetData()--加载界面数据立绘+进度条
|
||||
end
|
||||
|
||||
local PositionList = {
|
||||
[20007] = {pos = 176,title = "l_lingshou_fenghuang"},
|
||||
[20006] = {pos = 70,title = "l_lingshou_baize"}
|
||||
}
|
||||
function LingShouBaoGe:SetData()
|
||||
rewardData={}
|
||||
showData={}
|
||||
rewardData,showData,curScore = DynamicActivityManager.LingShouBuildData()
|
||||
|
||||
this.title.sprite = Util.LoadSprite(PositionList[showData.monsterId].title)
|
||||
--设置立绘
|
||||
bgName = artConfig[SpiritAnimalConfig[showData.monsterId].Live].Name
|
||||
local pos = SpiritAnimalConfig[showData.monsterId].Position
|
||||
|
@ -130,7 +135,7 @@ function LingShouBaoGe:SetData()
|
|||
if Live then
|
||||
poolManager:UnLoadLive(bgName, Live)
|
||||
end
|
||||
Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale*0.8, Vector2.New(pos[1],pos[2]+176))
|
||||
Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale*0.8, Vector2.New(pos[1],pos[2]+PositionList[showData.monsterId].pos))
|
||||
local RoleLiveGOGraphic = Live:GetComponent("SkeletonGraphic")
|
||||
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
|
||||
|
|
|
@ -118,6 +118,17 @@ local activityType = {
|
|||
title = "x_xuanjimiaosuan_zi",
|
||||
helptype = HELP_TYPE.TimeLimitedCall
|
||||
},
|
||||
--降龙伏虎 限时召唤
|
||||
[4310] = {
|
||||
bg = "Bg2",
|
||||
hero = {
|
||||
[1]={name="Bg2/hero1",id=10012,hero="x_xianglongfuhu_shenjiang1"}, --降龙
|
||||
[2]={name="Bg2/hero2",id=10015,hero="x_xianglongfuhu_shenjiang2"}, --伏虎
|
||||
[3]={name="Bg2/hero3",id=10017,hero="x_xianglongfuhu_shenjiang3"}, --嫦娥
|
||||
},
|
||||
title = "x_xianglongfuhu_zi",
|
||||
helptype = HELP_TYPE.TimeLimitedCall
|
||||
},
|
||||
}
|
||||
--type与lotterySetting表中的id对应
|
||||
local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644]}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182]}}
|
||||
|
|
|
@ -514,6 +514,7 @@ function ExpeditionMainPanel:SingleLayNodeShow(go,layNodeListData)
|
|||
end
|
||||
--刷新倒计时显示
|
||||
function ExpeditionMainPanel:RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown)
|
||||
timeDown = timeDown - (ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.EXPEDITION).SeasonInterval*60)
|
||||
if timeDown > 0 then
|
||||
_timeTextExpertgo:SetActive(true)
|
||||
_timeTextExpert.text = Language[10028]..self:TimeStampToDateString(timeDown)
|
||||
|
|
|
@ -867,9 +867,6 @@ end
|
|||
function this.SetOneKeyGo()
|
||||
--获取需要上阵的位置
|
||||
local posArr=this.GetPosList()
|
||||
-- for i = 1, #posArr do
|
||||
-- Log("可上阵位置索引"..posArr[i])
|
||||
-- end
|
||||
if #posArr==0 then
|
||||
PopupTipPanel.ShowTip(Language[10692])
|
||||
return
|
||||
|
@ -878,32 +875,12 @@ function this.SetOneKeyGo()
|
|||
local heros = HeroManager.GetAllHeroDatas(limitLevel)
|
||||
--按战力从大到小排序
|
||||
table.sort(heros,function(a,b)
|
||||
-- local aWarPower = HeroManager.CalculateHeroAllProValList(1,a.dynamicId,false)[HeroProType.WarPower]
|
||||
-- local bWarPower = HeroManager.CalculateHeroAllProValList(1,b.dynamicId,false)[HeroProType.WarPower]
|
||||
-- if aWarPower==bWarPower then
|
||||
-- return a.id>b.id
|
||||
-- else
|
||||
-- return aWarPower>bWarPower
|
||||
-- end
|
||||
if a.warPower == b.warPower then
|
||||
return a.id>b.id
|
||||
else
|
||||
return a.warPower > b.warPower
|
||||
end
|
||||
end)
|
||||
--遍历英雄 去除已上阵英雄
|
||||
-- for j = 1, #this.choosedList do
|
||||
-- for k, v in ipairs(heros) do
|
||||
-- if HeroManager.GetSingleHeroData(v.dynamicId).id== HeroManager.GetSingleHeroData(this.choosedList[j].heroId).id then
|
||||
|
||||
-- table.remove(heros,k)
|
||||
-- break
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
-- if #heros == 0 then
|
||||
-- return
|
||||
-- end
|
||||
--修改 upHeroSidTable 静态id 存储 有则跳过
|
||||
local upHeroSidTable = {}
|
||||
this.order = 0
|
||||
|
@ -927,12 +904,72 @@ function this.SetOneKeyGo()
|
|||
end
|
||||
end
|
||||
end
|
||||
this.SetCardsData()
|
||||
this.OnClickTabBtn(proId)
|
||||
end
|
||||
|
||||
--缺几个空位 就上几个空位
|
||||
-- for n = 1, #posArr do
|
||||
-- table.insert(this.choosedList, {heroId = heros[n].dynamicId, position=posArr[n]})
|
||||
-- end
|
||||
-- this.order=this.order+#posArr
|
||||
--设置轩辕宝镜一键上阵
|
||||
function this.SetOneKeyGoWithCondition(Rules)
|
||||
local rulesType = Rules[1][1]
|
||||
local rulesNum = Rules[1][2]
|
||||
local curNum = 0
|
||||
--获取需要上阵的位置
|
||||
local posArr=this.GetPosList()
|
||||
if #posArr==0 then
|
||||
PopupTipPanel.ShowTip(Language[10692])
|
||||
return
|
||||
end
|
||||
|
||||
local heros = HeroManager.GetAllHeroDatas(limitLevel)
|
||||
--按战力从大到小排序
|
||||
table.sort(heros,function(a,b)
|
||||
if a.warPower == b.warPower then
|
||||
return a.id>b.id
|
||||
else
|
||||
return a.warPower > b.warPower
|
||||
end
|
||||
end)
|
||||
--修改 upHeroSidTable 静态id 存储 有则跳过
|
||||
local upHeroSidTable = {}
|
||||
this.order = 0
|
||||
this.choosedList = {}
|
||||
for j = 1, #this.choosedList do
|
||||
local curSingleherodata = HeroManager.GetSingleHeroData(this.choosedList[j].heroId)
|
||||
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
|
||||
end
|
||||
for k, v in ipairs(heros) do
|
||||
local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId)
|
||||
if not upHeroSidTable[curSingleherodata.id] then
|
||||
-- LogGreen("this.choosedList "..#this.choosedList)
|
||||
if #this.choosedList < 6 then
|
||||
for n = 1, #posArr do
|
||||
if rulesType == v.heroConfig.PropertyName and curNum < rulesNum then
|
||||
curNum = curNum + 1
|
||||
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
|
||||
table.insert(this.choosedList, {heroId = v.dynamicId, position=posArr[n]})
|
||||
table.remove(posArr,n)
|
||||
this.order = this.order + 1
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
for k, v in ipairs(heros) do
|
||||
local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId)
|
||||
if not upHeroSidTable[curSingleherodata.id] then
|
||||
-- LogGreen("this.choosedList "..#this.choosedList)
|
||||
if #this.choosedList < 6 then
|
||||
for n = 1, #posArr do
|
||||
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
|
||||
table.insert(this.choosedList, {heroId = v.dynamicId, position=posArr[n]})
|
||||
table.remove(posArr,n)
|
||||
this.order = this.order + 1
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
this.SetCardsData()
|
||||
this.OnClickTabBtn(proId)
|
||||
end
|
||||
|
|
|
@ -15,7 +15,12 @@ function this.GetFormationIndex()
|
|||
return FormationTypeDef.FORMATION_ARENA_DEFEND
|
||||
end
|
||||
--- 提交按钮点击事件
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
|
||||
function this.On_Btn2_Click()
|
||||
local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND)
|
||||
if #formation.teamHeroInfos == 0 then
|
||||
PopupTipPanel.ShowTip(Language[10711])
|
||||
|
@ -39,7 +44,9 @@ end
|
|||
function this.InitView()
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10712]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_2_lab.text = Language[10712]
|
||||
|
||||
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Arena })
|
||||
|
||||
|
|
|
@ -18,7 +18,12 @@ function this.GetFormationIndex()
|
|||
return FormationTypeDef.ARENA_TOM_MATCH
|
||||
end
|
||||
--- 提交按钮点击事件
|
||||
---
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
function this.On_Btn2_Click()
|
||||
--保存编队
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
|
@ -53,7 +58,9 @@ end
|
|||
function this.InitView()
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10508]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_2_lab.text = Language[10508]
|
||||
hadClick = false
|
||||
-- 没开启或者开启没参赛都属于未参赛
|
||||
local isOpen = ArenaTopMatchManager.IsTopMatchActive()
|
||||
|
|
|
@ -15,17 +15,13 @@ this.IsNeedChangeFormation = true
|
|||
--- 逻辑初始化
|
||||
function this.Init(root, curMapId)
|
||||
this.root = root
|
||||
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
this.curMapId = EndLessMapManager.openMapId
|
||||
-- else
|
||||
-- this.curMapId = curMapId
|
||||
-- end
|
||||
this.InitView()
|
||||
end
|
||||
--- 获取需要显示的编队id
|
||||
function this.GetFormationIndex()
|
||||
local index = 0
|
||||
if CarbonManager.difficulty == 4 then
|
||||
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
index = FormationTypeDef.FORMATION_ENDLESS_MAP
|
||||
else
|
||||
FormationManager.curFormationIndex = FormationTypeDef.FORMATION_NORMAL
|
||||
|
@ -37,131 +33,131 @@ end
|
|||
-- 扫荡按钮
|
||||
--- btn1点击回调事件
|
||||
function this.On_Btn1_Click()
|
||||
if CarbonManager.difficulty == 4 and MapManager.Mapping then
|
||||
if this.root.order>=1 then
|
||||
this.root.SetOneKeyGo()
|
||||
--以前的换成的一键上阵
|
||||
|
||||
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and MapManager.Mapping then
|
||||
-- if this.root.order>=1 then
|
||||
-- --保存编队
|
||||
-- FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
-- FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
-- PopupTipPanel.ShowTip(Language[10713])
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip(Language[10714])
|
||||
-- end
|
||||
-- return
|
||||
-- end
|
||||
-- 刷新扫荡数据--应该是没了
|
||||
-- this.root.ShowStartMopUpInfoData()
|
||||
-- -- 显示扫荡界面
|
||||
-- this.root.mopUpGo:SetActive(true)
|
||||
-- PlayUIAnim( this.root.mopUpGo)
|
||||
end
|
||||
|
||||
--- btn2点击回调事
|
||||
-- local itemType = {
|
||||
-- [1] = 27,
|
||||
-- [3] = 28,
|
||||
-- }
|
||||
|
||||
-- 进入地图
|
||||
function this.On_Btn2_Click()
|
||||
--保存编队
|
||||
if this.root.order>=1 then
|
||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
this.root:ClosePanel()
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[10714])
|
||||
return
|
||||
end
|
||||
|
||||
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
if MapManager.Mapping then--在地图里
|
||||
if this.root.order>=1 then
|
||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
PopupTipPanel.ShowTip(Language[10713])
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[10714])
|
||||
end
|
||||
return
|
||||
end
|
||||
-- 刷新扫荡数据
|
||||
this.root.ShowStartMopUpInfoData()
|
||||
-- 显示扫荡界面
|
||||
this.root.mopUpGo:SetActive(true)
|
||||
PlayUIAnim( this.root.mopUpGo)
|
||||
end
|
||||
|
||||
--- btn2点击回调事
|
||||
local itemType = {
|
||||
[1] = 27,
|
||||
[3] = 28,
|
||||
}
|
||||
|
||||
-- 进入地图
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
--保存编队
|
||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
else
|
||||
PopupTipPanel.ShowTip(string.format(Language[10701], 1))
|
||||
return
|
||||
Log("进入的副本difficulty:"..CarbonManager.difficulty)
|
||||
this.EnterMapbyType(CarbonManager.difficulty)--, itemId)
|
||||
end
|
||||
-- 判断当前选择的副本类型
|
||||
local itemId = itemType[CarbonManager.difficulty]
|
||||
end
|
||||
|
||||
--+=======================================
|
||||
|
||||
|
||||
-- if this.root.order>=1 then
|
||||
-- --保存编队
|
||||
-- FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
-- FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip(string.format(Language[10701], 1))
|
||||
-- return
|
||||
-- end
|
||||
-- -- 判断当前选择的副本类型
|
||||
-- local itemId = itemType[CarbonManager.difficulty]
|
||||
|
||||
-- 无尽副本
|
||||
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
if #FormationManager.GetFormationByID(401).teamHeroInfos == 0 then
|
||||
PopupTipPanel.ShowTip(Language[10714])
|
||||
return
|
||||
end
|
||||
else
|
||||
if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then
|
||||
Log(Language[10715])
|
||||
PopupTipPanel.ShowTip(Language[10714])
|
||||
return
|
||||
end
|
||||
end
|
||||
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
-- if #FormationManager.GetFormationByID(401).teamHeroInfos == 0 then
|
||||
-- PopupTipPanel.ShowTip(Language[10714])
|
||||
-- return
|
||||
-- end
|
||||
-- else
|
||||
-- if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then
|
||||
-- Log(Language[10715])
|
||||
-- PopupTipPanel.ShowTip(Language[10714])
|
||||
-- return
|
||||
-- end
|
||||
-- end
|
||||
|
||||
|
||||
|
||||
-- 判断挑战次数
|
||||
if CarbonManager.difficulty == 1 then -- 普通副本
|
||||
if BagManager.GetItemCountById(itemId) <= 0 and CarbonManager.GetNormalState(this.curMapId)then
|
||||
PopupTipPanel.ShowTip(Language[10716])
|
||||
return
|
||||
end
|
||||
elseif CarbonManager.difficulty == 3 then -- 英雄副本
|
||||
if BagManager.GetItemCountById(itemId) <= 0 then
|
||||
PopupTipPanel.ShowTip(Language[10717])
|
||||
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.EliteCarbonTicket })
|
||||
return
|
||||
end
|
||||
-- elseif CarbonManager.difficulty == 2 then -- 失恋副本
|
||||
-- Log("即将进入试炼副本!")
|
||||
end
|
||||
if CarbonManager.difficulty == 1 or CarbonManager.difficulty == 3 then
|
||||
-- 战斗力判断
|
||||
if this.root.formationPower <CarbonManager.recommendFightAbility[this.curMapId] then
|
||||
MsgPanel.ShowTwo(Language[10718], function()
|
||||
end, function()
|
||||
-- 开始挑战
|
||||
this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||
end, Language[10719], Language[10720]
|
||||
)
|
||||
else
|
||||
this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||
end
|
||||
else
|
||||
LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId))
|
||||
MapManager.endlessEnter = true
|
||||
this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||
end
|
||||
-- if CarbonManager.difficulty == CARBON_TYPE.NORMAL then -- 普通副本
|
||||
-- if BagManager.GetItemCountById(itemId) <= 0 and CarbonManager.GetNormalState(this.curMapId)then
|
||||
-- PopupTipPanel.ShowTip(Language[10716])
|
||||
-- return
|
||||
-- end
|
||||
-- elseif CarbonManager.difficulty == CARBON_TYPE.HERO then -- 英雄副本
|
||||
-- if BagManager.GetItemCountById(itemId) <= 0 then
|
||||
-- PopupTipPanel.ShowTip(Language[10717])
|
||||
-- UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.EliteCarbonTicket })
|
||||
-- return
|
||||
-- end
|
||||
-- end
|
||||
-- if CarbonManager.difficulty == CARBON_TYPE.NORMAL or CarbonManager.difficulty == CARBON_TYPE.HERO then
|
||||
-- -- 战斗力判断
|
||||
-- if this.root.formationPower <CarbonManager.recommendFightAbility[this.curMapId] then
|
||||
-- MsgPanel.ShowTwo(Language[10718], function()
|
||||
-- end, function()
|
||||
-- -- 开始挑战
|
||||
-- this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||
-- end, Language[10719], Language[10720]
|
||||
-- )
|
||||
-- else
|
||||
-- this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||
-- end
|
||||
-- else
|
||||
-- LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId))
|
||||
-- this.EnterMapbyType(CarbonManager.difficulty, itemId)
|
||||
-- end
|
||||
|
||||
end
|
||||
|
||||
-- 根据不同的副本类型进入地图
|
||||
function this.EnterMapbyType(type, itemId)
|
||||
if type == 1 or type == 3 or type == 4 then
|
||||
function this.EnterMapbyType(type)--, itemId)
|
||||
if type == CARBON_TYPE.NORMAL or type == CARBON_TYPE.HERO or type == CARBON_TYPE.ENDLESS then
|
||||
MapManager.curMapId = this.curMapId
|
||||
-- elseif type == 2 then
|
||||
-- MapManager.curMapId = trialMapData[MapTrialManager.curTowerLevel].MapId
|
||||
end
|
||||
|
||||
local index = CarbonManager.difficulty == 4 and 401 or FormationManager.curFormationIndex
|
||||
local index = CarbonManager.difficulty == CARBON_TYPE.ENDLESS and FormationTypeDef.FORMATION_ENDLESS_MAP or FormationManager.curFormationIndex
|
||||
NetManager.MapInfoRequest(MapManager.curCarbonType, function()
|
||||
MapManager.curAreaId = this.root.curFormationIndex
|
||||
|
||||
-- ======== 副本额外的设置 =================================
|
||||
-- 普通副本解锁后第一次进图
|
||||
if not CarbonManager.GetNormalState(MapManager.curMapId) and CarbonManager.difficulty == 1 then
|
||||
-- 更新一次本地值
|
||||
CarbonManager.playedMapId[MapManager.curMapId] = MapManager.curMapId
|
||||
PopupTipPanel.ShowTip(Language[10721])
|
||||
|
||||
-- 普通、精英副本正常进图
|
||||
elseif CarbonManager.difficulty == 3 or CarbonManager.difficulty == 1 then
|
||||
--BagManager.UpdateItemsNum(itemId, 1)
|
||||
--Log("扣除一次进入副本券, ID是 " .. itemId)
|
||||
|
||||
-- 试炼副本
|
||||
-- elseif CarbonManager.difficulty == 2 then
|
||||
-- MapTrialManager.firstEnter = true
|
||||
elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
-- 是否已经开放
|
||||
-- if not ActTimeCtrlManager.SingleFuncState(46) then
|
||||
-- PopupTipPanel.ShowTip(Language[10722])
|
||||
-- return
|
||||
-- end
|
||||
end
|
||||
-- ===========================================================
|
||||
MapManager.isReloadEnter = false
|
||||
|
||||
SwitchPanel.OpenPanel(UIName.MapPanel)
|
||||
end)
|
||||
end
|
||||
|
@ -173,52 +169,51 @@ end
|
|||
|
||||
-- 初始化界面显示
|
||||
function this.InitView()
|
||||
if CarbonManager.difficulty == 2 then
|
||||
if CarbonManager.difficulty == CARBON_TYPE.TRIAL then
|
||||
this.TrialCarbon()
|
||||
elseif CarbonManager.difficulty == 1 or CarbonManager.difficulty == 3 then
|
||||
this.NormalCarbon()
|
||||
elseif CarbonManager.difficulty == 4 then
|
||||
-- elseif CarbonManager.difficulty == CARBON_TYPE.NORMAL or CarbonManager.difficulty == CARBON_TYPE.HERO then
|
||||
-- this.NormalCarbon()
|
||||
elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
this.EndLessCarbon()
|
||||
end
|
||||
|
||||
-- 初始化编队数据
|
||||
this.IniFormationSet(CarbonManager.difficulty)
|
||||
|
||||
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = _PanelType[CarbonManager.difficulty] })
|
||||
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})--_PanelType[CarbonManager.difficulty] })
|
||||
end
|
||||
|
||||
--
|
||||
function this.IniFormationSet(type)
|
||||
this.IsNeedChangeFormation = type ~= 4
|
||||
this.IsNeedChangeFormation = type ~= CARBON_TYPE.ENDLESS
|
||||
end
|
||||
|
||||
|
||||
-- 普通,精英副本设置
|
||||
function this.NormalCarbon()
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10723]
|
||||
this.root.btn_2_lab.text = Language[10724]
|
||||
-- 进入副本显示设置
|
||||
MapManager.isCarbonEnter = true
|
||||
-- function this.NormalCarbon()
|
||||
-- this.root.bg:SetActive(true)
|
||||
-- this.root.btn_1:SetActive(true)
|
||||
-- this.root.btn_2:SetActive(true)
|
||||
-- this.root.btn_1_lab.text = Language[10723]
|
||||
-- this.root.btn_2_lab.text = Language[10724]
|
||||
-- -- 进入副本显示设置
|
||||
-- MapManager.isCarbonEnter = true
|
||||
|
||||
-- 设置扫荡条件
|
||||
local canSweep = CarbonManager.GetMapSweepState(this.curMapId)
|
||||
local rgbValue = canSweep and 1 or 0.5
|
||||
Util.SetColor(this.root.btn_1, Color.New(rgbValue, rgbValue, rgbValue, 1))
|
||||
this.root.btn_1:GetComponent("Button").enabled = canSweep
|
||||
this.SetTipShowByType(CarbonManager.difficulty, canSweep)
|
||||
end
|
||||
-- -- 设置扫荡条件
|
||||
-- local canSweep = CarbonManager.GetMapSweepState(this.curMapId)
|
||||
-- local rgbValue = canSweep and 1 or 0.5
|
||||
-- Util.SetColor(this.root.btn_1, Color.New(rgbValue, rgbValue, rgbValue, 1))
|
||||
-- this.root.btn_1:GetComponent("Button").enabled = canSweep
|
||||
-- this.SetTipShowByType(CarbonManager.difficulty, canSweep)
|
||||
-- end
|
||||
|
||||
-- 设置精英副本跟普通副本的提示显示
|
||||
function this.SetTipShowByType(type, canSweep)
|
||||
local isEliteCarbon = type == 3
|
||||
this.root.mobTip:SetActive(not canSweep and not isEliteCarbon)
|
||||
this.root.eliteTip:SetActive(not canSweep and isEliteCarbon)
|
||||
-- 普通-精英副本得到的地图ID this.curMapId
|
||||
this.root.eliteNumNeed.text = CarbonManager.EliteSweepCondition(this.curMapId)
|
||||
end
|
||||
-- -- 设置精英副本跟普通副本的提示显示
|
||||
-- function this.SetTipShowByType(type, canSweep)
|
||||
-- local isEliteCarbon = type == 3
|
||||
-- this.root.mobTip:SetActive(not canSweep and not isEliteCarbon)
|
||||
-- this.root.eliteTip:SetActive(not canSweep and isEliteCarbon)
|
||||
-- -- 普通-精英副本得到的地图ID this.curMapId
|
||||
-- this.root.eliteNumNeed.text = CarbonManager.EliteSweepCondition(this.curMapId)
|
||||
-- end
|
||||
|
||||
-- 试炼副本设置
|
||||
function this.TrialCarbon()
|
||||
|
@ -236,13 +231,14 @@ function this.EndLessCarbon()
|
|||
if MapManager.Mapping then
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_2:SetActive(false)
|
||||
this.root.btn_1_lab.text = Language[10726]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2_lab.text = Language[10726]
|
||||
else
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(false)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10723]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2_lab.text = Language[10724]
|
||||
-- 进入副本显示设置
|
||||
MapManager.isCarbonEnter = true
|
||||
|
|
|
@ -18,7 +18,12 @@ function this.GetFormationIndex()
|
|||
return FormationTypeDef.EXPEDITION
|
||||
end
|
||||
--- btn1点击回调事件
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
|
||||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
|
@ -55,7 +60,9 @@ end
|
|||
-- 初始化界面显示
|
||||
function this.InitView()
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10708]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2_lab.text = Language[10708]
|
||||
MapManager.isCarbonEnter = false
|
||||
this.root.formTip:SetActive(true)
|
||||
this.root.formTip:GetComponent("Text").text = Language[10727] ..20 .. Language[10728]
|
||||
|
|
|
@ -14,7 +14,12 @@ function this.GetFormationIndex()
|
|||
return FormationTypeDef.GUILD_CAR_DELEAY
|
||||
end
|
||||
--- btn1点击回调事件
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
|
||||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
|
@ -51,7 +56,9 @@ end
|
|||
-- 初始化界面显示
|
||||
function this.InitView()
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10708]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_2_lab.text = Language[10708]
|
||||
MapManager.isCarbonEnter = false
|
||||
this.root.formTip:SetActive(false)
|
||||
local costTip = this.root.costTip
|
||||
|
|
|
@ -26,10 +26,16 @@ end
|
|||
|
||||
function this.InitView()
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10512]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_2_lab.text = Language[10512]
|
||||
end
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
--保存编队
|
||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
|
|
|
@ -17,7 +17,12 @@ function this.GetFormationIndex()
|
|||
return FormationTypeDef.GUILD_TRANSCRIPT
|
||||
end
|
||||
--- btn1点击回调事件
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
|
||||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
|
@ -35,26 +40,16 @@ function this.On_Btn1_Click()
|
|||
hadClick = false
|
||||
return
|
||||
end
|
||||
|
||||
-- 战斗力判断
|
||||
-- GetCurNodeInfo = ExpeditionManager.GetCurNodeInfo()
|
||||
--if this.root.formationPower >= this.nodeData.bossTeaminfo.totalForce then
|
||||
this.StartFight()
|
||||
--else
|
||||
-- MsgPanel.ShowTwo("当前队伍战力小于推荐战力,战斗可能会有失败风险。确定是否要继续战斗?", function()
|
||||
-- hadClick = false
|
||||
-- end, function()
|
||||
-- this.StartFight()
|
||||
-- end, "取消", "确定"
|
||||
-- )
|
||||
--end
|
||||
end
|
||||
end
|
||||
|
||||
-- 初始化界面显示
|
||||
function this.InitView()
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10708]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_2_lab.text = Language[10708]
|
||||
MapManager.isCarbonEnter = false
|
||||
this.root.formTip:SetActive(false)
|
||||
local costTip = this.root.costTip
|
||||
|
|
|
@ -17,7 +17,7 @@ function this.GetFormationIndex()
|
|||
end
|
||||
|
||||
--- btn1点击回调事件 -- lEFT
|
||||
function this.On_Btn1_Click()
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
--保存编队
|
||||
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
|
@ -44,16 +44,17 @@ function this.On_Btn1_Click()
|
|||
this.StraightBattle()
|
||||
end
|
||||
--- btn2点击回调事件 --RIGHT
|
||||
function this.On_Btn2_Click()
|
||||
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGo()
|
||||
end
|
||||
|
||||
function this.InitView()
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_2:SetActive(false)
|
||||
this.root.btn_2:SetActive(true)
|
||||
-- this.root.failText:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10709]
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2_lab.text = Language[10709]
|
||||
this.root.passBattle0.gameObject:SetActive(false)
|
||||
this.root.passBattle1.gameObject:SetActive(false)
|
||||
|
||||
|
|
|
@ -21,8 +21,9 @@ end
|
|||
-- 初始化界面显示
|
||||
function this.InitView()
|
||||
this.root.bg:SetActive(true)
|
||||
this.root.btn_1:SetActive(false)
|
||||
this.root.btn_1:SetActive(true)
|
||||
this.root.btn_2:SetActive(true)
|
||||
this.root.btn_1_lab.text = Language[10743]
|
||||
this.root.btn_2_lab.text = Language[10709]
|
||||
this.root.tip:SetActive(true)
|
||||
this.root.exampleBtn:SetActive(false)
|
||||
|
@ -36,6 +37,7 @@ end
|
|||
|
||||
--- btn1点击回调事件
|
||||
function this.On_Btn1_Click()
|
||||
this.root.SetOneKeyGoWithCondition(data.teamRules)
|
||||
end
|
||||
|
||||
-- 进入地图
|
||||
|
|
|
@ -94,6 +94,7 @@ function this.SingleInfoDataShow(go,data)
|
|||
sortNumTabs[i] = Util.GetGameObject(go, "SortNum/SortNum ("..i..")")
|
||||
sortNumTabs[i]:SetActive(false)
|
||||
end
|
||||
LogRed("data.rank:"..data.rank)
|
||||
if data.rank < 4 then
|
||||
sortNumTabs[data.rank]:SetActive(true)
|
||||
else
|
||||
|
|
|
@ -159,6 +159,9 @@ function this.GetBlood()
|
|||
end
|
||||
return blood
|
||||
end
|
||||
function this.SetCanSweep1()
|
||||
canSweep = 0
|
||||
end
|
||||
function this.GetCanSweep()
|
||||
return canSweep
|
||||
end
|
||||
|
|
|
@ -59,6 +59,7 @@ local mainDynamicActivityIcon = {
|
|||
[7] = "r_zjm_huodongicon-yunchouweiwo", ----运筹帷幄
|
||||
[8] = "r_zjm_huodongicon-yishandaohai", ----移山倒海
|
||||
[9] = "r_zjm_huodongicon-xuanjimiaosuan", ----玄机妙算
|
||||
[10] = "r_zjm_huodongicon-xianglongfuhu", ----降龙伏虎
|
||||
}
|
||||
function this:AddFuncItem(btnGO, pos)
|
||||
return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}
|
||||
|
|
|
@ -188,12 +188,14 @@ function this.RefreshUpdateIndication(buffer)
|
|||
CheckRedPointStatus(RedPointType.Guild_AidMy)
|
||||
|
||||
LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
|
||||
CheckRedPointStatus(RedPointType.Arena_Free)
|
||||
--三个抽奖勾选重置
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0)
|
||||
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点
|
||||
GuildTranscriptManager.SetCanSweep1()
|
||||
end
|
||||
|
||||
--服务器推送红点信息
|
||||
|
|
|
@ -136,7 +136,17 @@ function this.GetGiftGoodsInfo(goodsType, Id)
|
|||
end
|
||||
|
||||
function this.GetGiftGoodsInfoList(type)
|
||||
return giftGoodsInfoList[type] and giftGoodsInfoList[type] or {}
|
||||
-- return giftGoodsInfoList[type] and giftGoodsInfoList[type] or {}
|
||||
if not giftGoodsInfoList[type] then
|
||||
return {}
|
||||
end
|
||||
local newGiftGoodsInfoList = {}
|
||||
for k,v in pairs(giftGoodsInfoList[type]) do
|
||||
if rechargeConfig[v.goodsId] and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] then
|
||||
table.insert(newGiftGoodsInfoList,v)
|
||||
end
|
||||
end
|
||||
return newGiftGoodsInfoList
|
||||
end
|
||||
|
||||
function this.RefreshGiftGoodsBuyTimes(goodsType, goodsId, buyTimes)
|
||||
|
|
|
@ -145,6 +145,7 @@ function this:BindEvent()
|
|||
this.isStartImage.sprite=Util.LoadSprite("x_xiaoyaoyou_tingzhi")
|
||||
isAutoRun=true
|
||||
end
|
||||
this.btnBack:GetComponent("Button").enabled = false
|
||||
XiaoYaoManager.StartXiaoYao()
|
||||
end)
|
||||
--开始游历
|
||||
|
@ -270,6 +271,7 @@ function this.MoveTT(targetIndex,_data)
|
|||
if isAutoRun then
|
||||
if costNum>BagManager.GetItemCountById(UpViewRechargeType.YunYouVle) then
|
||||
PopupTipPanel.ShowTip("云游值不足,休息一会吧!")
|
||||
this.btnBack:GetComponent("Button").enabled = true
|
||||
this.youliTag:SetActive(false)
|
||||
this.isStart:SetActive(false)
|
||||
this.startBtn:SetActive(true)
|
||||
|
@ -288,6 +290,7 @@ function this.MoveTT(targetIndex,_data)
|
|||
this.youliTag:SetActive(false)
|
||||
this.isStart:SetActive(false)
|
||||
this.startBtn:SetActive(true)
|
||||
this.btnBack:GetComponent("Button").enabled = true
|
||||
end
|
||||
else
|
||||
this.MoveTT(targetIndex,_data)
|
||||
|
|