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

onepiece_demo_arena
xiejun 2024-01-31 18:46:30 +08:00
commit 8a56550be1
20 changed files with 28324 additions and 532 deletions

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 3fd1c060dc782ed4381471f7523846f4
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_1
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: 12
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: gh_tt_1
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 0de6fe36887096848969a3ca4a365b34
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: e61d827940f3bbc46b5d834c9869b32f
spriteID: 7df3d4af8cab4c94a8e2b595ee8c5f4e
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 0174d3fe4d1676e42af81fdeee4945e7
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_2
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: 12
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: gh_tt_2
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 79ade59fb34a2064c84c34ce35411122
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9125a18c3278d514681f5ed007912c2b
spriteID: e5c2585af9843af4fbf667a38140cf5d
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: ec9b846c512243b4b89ba3fbcc77e739
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_3
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: 12
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: gh_tt_3
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 2c58c8135235ca64b98603195247de2b
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5ae72851a5db48445ae9f7ad2778acb7
spriteID: 81be40aebff79344e983c7a49cb4e6ed
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: d1ce048ef0cd5fd48801e36dbbb65ed2
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_4
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: 12
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: gh_tt_4
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 2a8ee70952beb2c46b880679c095cf4d
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 375bb5bdab73cf5488f1da8af251fa29
spriteID: 52d0277f93880ef4b83407db2ea13577
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 0a876f51633b45a4f8cab57b3cdb48fb
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_5
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: 12
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: gh_tt_5
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: c559cd31f1cb2cb43ac9a8aeb2698184
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 27a62e30a1754434cb8d78af5a20eaa2
spriteID: 9d0a067ca5d6c704a967f83a90429d0c
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 903f544134b53ab468e1de012afd2d43
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_6
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: 12
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: gh_tt_6
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 21b37eb7fbb31c541abe4c2b47e1245a
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c544dc72ca6fa654594cf78b13ce967c
spriteID: fdde89f5fcccf2548a8e0067ac0c2ec1
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 48a35dd046f6c7640be5850fcf96a871
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_7
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: 12
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: gh_tt_7
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 097ee5790fdf03045a4b53e5f5b8f37b
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 308ddb68a54a0534a88761b80fe9569b
spriteID: acc6280e5aaa40545a3c7d05f85346f6
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 91ed785e564bee441a6093075898d89d
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_8
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: 12
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: gh_tt_8
rect:
serializedVersion: 2
x: 0
y: 0
width: 162
height: 158
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 53aa5c99ab6a91040a35d2c9e2ece64d
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6d70c076fc7f13144b572722e65806e9
spriteID: aa7285876debd5c4a91050255e758649
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: ff20eafad5f020042b72709640432d68
TextureImporter:
fileIDToRecycleName:
21300000: gh_tt_9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -32,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
@ -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
@ -59,39 +58,6 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
@ -105,31 +71,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: gh_tt_9
rect:
serializedVersion: 2
x: 0
y: 0
width: 106
height: 117
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 66e39b4014604464c84cb6c18c98f9fc
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ffac56d45ce38654aa8fec6b4b499703
spriteID: 3117002ebccf57d4ba19a1f3297903f2
vertices: []
indices:
edges: []