Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

onepiece_demo_arena
wangzhenxing 2024-01-26 11:22:42 +08:00
commit b6928b51a3
25 changed files with 32 additions and 412 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 13af0179bb45d2a46935098b191b3e26
guid: a27dfc75bf50efd4da779ec28138cfa3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -69,35 +69,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: f547de7338a03f54284050e039fba159
spriteID: 48b25e390570bf64eba9c1f691e69f81
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: c0ba78b8346fb6e45a7dd9cbac3cbfc2
guid: 1145dbd473ff1fb4c873c3bd0d07dfa1
TextureImporter:
fileIDToRecycleName:
21300000: i_s_1220_ls
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -41,9 +40,9 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,66 +69,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: i_s_1220_ls
rect:
serializedVersion: 2
x: 0
y: 0
width: 150
height: 150
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 4bf1d15456640a442bdf60fd72caf4e2
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: daa1b08f772337c45b0b2cf18a25cfce
spriteID: e7e614e3ac44956448da55e1c50d521e
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 75f5f55384729634988f720fc5c65957
guid: 292a4d72a19a56846bb5dda5fb159816
TextureImporter:
fileIDToRecycleName:
21300000: i_s_2550_yy
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -41,9 +40,9 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,66 +69,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: i_s_2550_yy
rect:
serializedVersion: 2
x: 0
y: 0
width: 150
height: 150
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 5ed70dc87ea55d247ae566160c4b199d
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d22afb233824db44a8b2f80323e37cfb
spriteID: cb7d501c053b3ba4f83d3834dc2608aa
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: ba1eb47463d07724a983cf794056ad23
guid: 9daa43d78edb2f24f8f571269c2ba70f
TextureImporter:
fileIDToRecycleName:
21300000: i_s_3020_gy
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -41,9 +40,9 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,66 +69,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: i_s_3020_gy
rect:
serializedVersion: 2
x: 0
y: 0
width: 150
height: 150
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: ed21433bbe874cc4980ef538a7290804
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c851e5321561f834e8aceab3c10c6c10
spriteID: 85a10b8b1bf2ada4e81cd53c813b78be
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: c255a75503630b5499c8eeba8cb4413a
guid: 6d25914a302c3e543867363e90b87d65
TextureImporter:
fileIDToRecycleName:
21300000: i_s_tybd_08
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -41,9 +40,9 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,66 +69,13 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: i_s_tybd_08
rect:
serializedVersion: 2
x: 0
y: 0
width: 150
height: 150
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 8d15dc2ecf834704cbb6163c615d6b0f
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 78c2ebe9996d68f4fb922bf3d2faca35
spriteID: 8199a3cfb916e1b459f81615f3913697
vertices: []
indices:
edges: []

View File

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b61930f53205f67499711af0ce8dc0b2
guid: 0e8128ce35d63e548a45844dd68ee725
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 1d99e7b0cb2ee804694ade878ffa91d0
spriteID: a2acaaa49c458c343a21af3afcd19434
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 85cd767f723136842b24ba5e6a055b89
guid: 28e2198b15ec571428ddb6f8bbad44e4
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: e3deee4aa687f9f4db510737646413a8
spriteID: 4b7b40cde261fc04ab03d6817f6948da
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fe5eae36f7f2b80499f219427ff9b726
guid: d6ff90aebe822394288cce1dc8a9dd83
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 33dc42ec9bdf5704d90a56defaa1fd37
spriteID: 36dbd7dbd5532cf4fb0fd971a9ccfdcc
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

View File

@ -1,142 +0,0 @@
fileFormatVersion: 2
guid: 5b2c10e554d8fa342843ea3e2b45ba05
TextureImporter:
fileIDToRecycleName:
21300000: i_s_2000610_bw
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: 2
spriteExtrude: 1
spriteMeshType: 0
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
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: i_s_2000610_bw
rect:
serializedVersion: 2
x: 0
y: 0
width: 150
height: 150
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 9469fdd191b9ce347b48bf995f935df1
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 4aec7fb3a1621ee4ab2afbc31872f2ee
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB