Commit cea7a460 authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)

no message

parent 0400e5c5
......@@ -44,7 +44,7 @@ SpriteAtlas:
variantMultiplier: 1
packables:
- {fileID: 102900000, guid: ce3716dd5115b1147bd1b1c3ddf08d3d, type: 3}
totalSpriteSurfaceArea: 21790435
totalSpriteSurfaceArea: 21959779
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
......@@ -58,6 +58,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 54c27f30f523a5b46851a60d584eebd2, type: 3}
- {fileID: 21300000, guid: d15f44402d0b4704384b8d887dbf1406, type: 3}
- {fileID: 21300000, guid: e3fea4405f302ab4bb0fb1c469e23211, type: 3}
- {fileID: 21300000, guid: b1fae850884f1b743958870888a79666, type: 3}
- {fileID: 21300000, guid: d355bc8043d23eb4f877b5a7d395298c, type: 3}
- {fileID: 21300000, guid: a7a8e3900b1e1004c8d716a0206ef7f2, type: 3}
- {fileID: 21300000, guid: 83cc8c90d7e8e4346ae9195fc3e2ebff, type: 3}
......@@ -66,6 +67,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: d3d3f24122e9198418f9e20f71d3c615, type: 3}
- {fileID: 21300000, guid: 1ddcdc5116b0a474088ee39d52589685, type: 3}
- {fileID: 21300000, guid: cd804491df16f55419d2ed591ba5603d, type: 3}
- {fileID: 21300000, guid: 385164a187be35e42b1f850339c776f0, type: 3}
- {fileID: 21300000, guid: 5bc166a10b728bd45b53a7ba4b96a8ad, type: 3}
- {fileID: 21300000, guid: 67054da1e426c94489ecba3719185a98, type: 3}
- {fileID: 21300000, guid: 921c44b137f98ed4f9a883ada4cc3a6f, type: 3}
......@@ -108,6 +110,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: ebc8c494c60462542a1a4de139db4a9f, type: 3}
- {fileID: 21300000, guid: acea50c4aea0f814dadf3e45006af79b, type: 3}
- {fileID: 21300000, guid: 79c38dd4d85dece40ab43752aa3013dc, type: 3}
- {fileID: 21300000, guid: 4c68ede49dd5cb74bb3693c7892dea78, type: 3}
- {fileID: 21300000, guid: b5ed38f4edeaf084e9747a479383335f, type: 3}
- {fileID: 21300000, guid: 636feb152e6a64547b2711bc15eaf9b6, type: 3}
- {fileID: 21300000, guid: 432832255d5933f4785aedc8136818e1, type: 3}
......@@ -160,6 +163,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 7cddc668ac2b59040ae7b34236f28b49, type: 3}
- {fileID: 21300000, guid: 6527c398b5936ed4c8305544acc5989a, type: 3}
- {fileID: 21300000, guid: 7ff22fb87fb443644b460c57ae3ae2bb, type: 3}
- {fileID: 21300000, guid: b8a43ee82c1195240869eb41ec6519da, type: 3}
- {fileID: 21300000, guid: 78341a09be3bac841b4d8d73c9ba4153, type: 3}
- {fileID: 21300000, guid: edd86219d59b7f74da17ea4c681c6e1e, type: 3}
- {fileID: 21300000, guid: 29f8f219e311ab140bbe38d010f9c1b7, type: 3}
......@@ -185,6 +189,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: bd739f7abab365444ba59e48cb66b130, type: 3}
- {fileID: 21300000, guid: 1c70198ace4664d4e8809d5310d61715, type: 3}
- {fileID: 21300000, guid: 0a8d1a8a6e3e22c4ca6e35e06f8c070a, type: 3}
- {fileID: 21300000, guid: 8bb02e9a1c43c6f4f97997d2e8c205cb, type: 3}
- {fileID: 21300000, guid: 70ce71aa4fc7859479780830b76f3ef0, type: 3}
- {fileID: 21300000, guid: 9511e1aa3430c3746a1f947c1eac2d03, type: 3}
- {fileID: 21300000, guid: 3a8a501b601d76b459507d48045b5efc, type: 3}
......@@ -193,6 +198,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 0aec879b9371faf4e93dbda127a59948, type: 3}
- {fileID: 21300000, guid: c04a83cbf6fcda041bc90fb3d72b9b30, type: 3}
- {fileID: 21300000, guid: 6ff574fbaa4d63d419961fc360abc0b8, type: 3}
- {fileID: 21300000, guid: 495c981cf7def0547963b173bcba5aa6, type: 3}
- {fileID: 21300000, guid: 3607472c0d14e54409c81284ad42c007, type: 3}
- {fileID: 21300000, guid: ae0d0f4c03092ff4aaae3a14d15704dd, type: 3}
- {fileID: 21300000, guid: 8fa2ff5cb51ae0e409b54e598aacd415, type: 3}
......@@ -246,6 +252,7 @@ SpriteAtlas:
- Group 10 copy
- Warrant officer
- Layer 26
- Skill_10
- Group 5
- Layer 38
- Layer 60
......@@ -254,6 +261,7 @@ SpriteAtlas:
- Layer 1
- Shape 13 copy
- Group 1
- Skill_11
- congratulations
- Layer 29
- Layer 25
......@@ -296,6 +304,7 @@ SpriteAtlas:
- Shape 1 copy
- Layer 64
- Shape 25
- Skill_12
- Layer 87
- Layer 28 copy
- Layer 91
......@@ -348,6 +357,7 @@ SpriteAtlas:
- Shape 18
- Skill_01
- Shape 10
- Skill_08
- Shape 20
- Shape 23 copy
- Layer 45
......@@ -373,6 +383,7 @@ SpriteAtlas:
- Group 8
- Colonel
- Group 10 copy 2
- Skill_07
- X
- Group 8
- Colonel
......@@ -381,6 +392,7 @@ SpriteAtlas:
- Group 6 (merged)
- Admiral
- Shape 22
- Skill_09
- Shape 25
- Shape 3
- Shape 13
......
fileFormatVersion: 2
guid: 8bb02e9a1c43c6f4f97997d2e8c205cb
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b8a43ee82c1195240869eb41ec6519da
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 495c981cf7def0547963b173bcba5aa6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b1fae850884f1b743958870888a79666
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 385164a187be35e42b1f850339c776f0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4c68ede49dd5cb74bb3693c7892dea78
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -21,7 +21,7 @@ public class ExplosionCount : MonoBehaviour
public void IncreaseInitChildCount()
{
initChildCount += 2;
Interface.instance.healthPlanet.anim.DORestart();
Interface.instance.healthPlanet.Shake();
}
void Start()
{
......@@ -46,7 +46,7 @@ public class ExplosionCount : MonoBehaviour
if (lastAmount != amount)
{
float fractor = (1 - amount) * 3 + 1f;
Interface.instance.healthPlanet.anim.DORestart();
Interface.instance.healthPlanet.Shake();
planetOb.core.SetVector(coreMat, emissionColorValue * fractor);
defaultAtmosPhere -= 0.00006f;
atmosPhereMat.SetFloat("_Alpha", defaultAtmosPhere);
......
......@@ -11,4 +11,10 @@ public class PlanetHealth : MonoBehaviour
public DOTweenAnimation anim;
public Image fill;
public void Shake()
{
transform.DOKill();
transform.localScale = Vector3.one * 1.1f;
transform.DOScale(Vector3.one, 0.3f);
}
}
......@@ -9631,7 +9631,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: 87, y: -282}
m_AnchoredPosition: {x: 264, y: -282}
m_SizeDelta: {x: 168, y: 168}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &545963441
......@@ -10770,7 +10770,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: 265, y: -104}
m_AnchoredPosition: {x: 264, y: -104}
m_SizeDelta: {x: 168, y: 168}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &606323125
......@@ -11907,7 +11907,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: 621, y: -104}
m_AnchoredPosition: {x: 86, y: -282}
m_SizeDelta: {x: 168, y: 168}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &681525873
......@@ -27060,7 +27060,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -354, y: 108.998535}
m_SizeDelta: {x: 708, y: 359.1106}
m_SizeDelta: {x: 528, y: 359.1106}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1603178404
MonoBehaviour:
......@@ -27099,7 +27099,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.3882353}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
......@@ -27447,7 +27447,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: 265, y: -282}
m_AnchoredPosition: {x: 442, y: -282}
m_SizeDelta: {x: 168, y: 168}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1654799096
......@@ -29775,7 +29775,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: 87, y: -104}
m_AnchoredPosition: {x: 86, y: -104}
m_SizeDelta: {x: 168, y: 168}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1773817394
......@@ -31964,7 +31964,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: 443, y: -104}
m_AnchoredPosition: {x: 442, y: -104}
m_SizeDelta: {x: 168, y: 168}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1877728008
......@@ -37504,6 +37504,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504742970495377936, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504742970542838640, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: addonSkillTab
......@@ -37529,6 +37534,21 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 795148629}
- target: {fileID: 3504742970542838642, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 795148629}
- target: {fileID: 3504742970542838642, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: LoadNextLevel
objectReference: {fileID: 0}
- target: {fileID: 3504742970542838642, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: StarSystem, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3504742971198732980, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
......@@ -37549,6 +37569,11 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504742971484943690, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3504742971591567685, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
......@@ -38147,6 +38172,8 @@ MonoBehaviour:
- {fileID: 1654799096}
specialTab: {fileID: 1603178403}
selectionTab: {fileID: 1794728957}
noneIcon: {fileID: 0}
selectionBtn: {fileID: 0}
--- !u!224 &3504742970542838644 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1072213187, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
......@@ -9,6 +9,8 @@ public class SkillSelectionManager : MonoBehaviour
public List<SkillSelectionGUI> skills = new List<SkillSelectionGUI>();
public Transform specialTab;
public GameObject selectionTab;
public Sprite noneIcon;
public SkillSelectionGUI selectionBtn;
private void Start()
{
Interface.instance.skillSelectionManager = this;
......@@ -19,6 +21,17 @@ public class SkillSelectionManager : MonoBehaviour
public void UpdateSkillStatus()
{
skills.ForEach(a => a.UpdateSkillCount());
//if(SelectedID >= 7)
//{
// selectionBtn.icon.sprite = skills[SelectedID].icon.sprite;
// selectionBtn.countDown.fillAmount = skills[SelectedID].countDown.fillAmount;
// selectionBtn.selection.gameObject.SetActive(true);
//}
//else
//{
// selectionBtn.icon.sprite = noneIcon;
// selectionBtn.selection.gameObject.SetActive(false);
//}
}
public void Reload()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment