Merge branch 'dev_spine' into dev_hero

This commit is contained in:
puxuan 2025-06-09 23:20:46 +08:00
commit 3aeae3c273
32 changed files with 270 additions and 197 deletions

View File

@ -1,42 +1,41 @@
m10001.png
size:256,256
size:1024,1024
filter:Linear,Linear
clothes_1
bounds:2,32,83,37
rotate:90
clothes_2
bounds:93,58,60,30
rotate:90
ear_r
bounds:240,349,93,87
offsets:2,1,97,89
era_l
bounds:351,643,83,88
offsets:2,1,86,90
eye
bounds:163,148,47,23
bounds:116,205,52,31
offsets:1,1,54,33
eye1
bounds:2,54,53,53
eye_yun
bounds:729,733,43,47
rotate:90
gutou
bounds:124,197,70,53
hair
bounds:196,191,59,54
rotate:90
head
bounds:2,181,120,69
hit_yan3
bounds:2,2,28,28
kulou
bounds:2,117,77,62
offsets:0,1,77,63
leg_L
bounds:93,19,33,37
leg_R
bounds:188,152,34,37
huo
bounds:2,109,112,127
offsets:1,1,114,129
quan1
bounds:351,622,11,19
offsets:1,1,13,21
quan2
bounds:240,329,14,18
offsets:1,1,16,20
quan3
bounds:436,712,11,19
offsets:1,1,13,21
quan4
bounds:335,418,14,18
offsets:1,1,16,20
spine
bounds:81,120,59,50
rotate:90
upperarm_l
bounds:133,148,28,47
upperarm_r
bounds:133,123,23,42
rotate:90
weapon
bounds:41,27,88,29
rotate:90
bounds:2,238,236,198
offsets:2,2,240,202
yingzi
bounds:72,32,83,19
rotate:90
bounds:351,733,376,43
offsets:1,1,378,45
zhaozi
bounds:2,438,347,338
offsets:1,2,349,341

View File

@ -3,5 +3,5 @@ guid: 085dc281434592c488fc86f25b37836b
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: arts/spines/characters/m10001.ab
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 81 KiB

View File

@ -63,7 +63,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 1
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -101,18 +101,6 @@ TextureImporter:
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
@ -125,6 +113,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -143,5 +143,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: arts/spines/characters/m10001.ab
assetBundleName:
assetBundleVariant:

View File

@ -3,5 +3,5 @@ guid: 87222f6091af4934ab7b249923462bbc
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: arts/spines/characters/m10001.ab
assetBundleName:
assetBundleVariant:

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName: arts/spines/characters/m10001.ab
assetBundleName:
assetBundleVariant:

View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: m10001_material
m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords:
@ -29,6 +29,7 @@ Material:
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _Fill: 0
- _OutlineMipLevel: 0
- _OutlineOpaqueAlpha: 1
- _OutlineReferenceTexWidth: 1024
@ -39,6 +40,7 @@ Material:
- _StraightAlphaInput: 1
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
- _UseScreenSpaceOutlineWidth: 0
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName: arts/spines/characters/m10001.ab
assetBundleName:
assetBundleVariant:

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName: arts/spines/characters/m10001.ab
assetBundleName:
assetBundleVariant:

View File

@ -1,39 +1,66 @@
m10002.png
size:256,256
size:1024,1024
filter:Linear,Linear
clothes_1
bounds:2,35,84,37
FX1/FX1_00000
bounds:2,463,300,169
rotate:90
clothes_2
bounds:86,61,61,30
FX1/FX1_00001
bounds:250,846,300,169
FX1/FX1_00002
bounds:2,161,300,169
rotate:90
FX1/FX1_00003
bounds:552,846,300,169
FX1/FX1_00004
bounds:250,675,300,169
FX2/FX2_00000
bounds:218,655,26,18
offsets:22,15,150,84
FX2/FX2_00001
bounds:67,16,49,39
offsets:27,15,150,84
FX2/FX2_00002
bounds:855,781,74,63
offsets:31,13,150,84
FX2/FX2_00003
bounds:854,846,84,65
offsets:32,12,150,84
FX2/FX2_00004
bounds:2,2,53,63
offsets:62,14,150,84
rotate:90
ear_l
bounds:679,761,86,83
offsets:1,2,88,86
ear_r
bounds:767,761,86,83
offsets:1,1,88,85
eye
bounds:2,10,47,23
gutou
bounds:123,201,70,53
hair
bounds:195,200,59,54
head
bounds:2,185,119,69
hit_yan3
bounds:188,131,28,28
kulou
bounds:2,121,77,62
offsets:0,1,77,63
leg_L
bounds:154,113,32,37
leg_R
bounds:184,161,35,37
bounds:552,739,125,105
offsets:1,1,127,107
eye_yun
bounds:552,690,43,47
hand_l_1
bounds:940,847,64,64
offsets:1,1,66,66
hand_l_2
bounds:2,57,154,102
offsets:1,2,156,105
hand_r
bounds:854,913,154,102
offsets:1,2,156,105
shanzi1
bounds:173,276,109,26
offsets:1,1,111,28
rotate:90
shanzi2
bounds:218,675,88,26
offsets:1,1,90,28
rotate:90
spine
bounds:81,124,59,50
rotate:90
upperarm_l
bounds:154,152,28,47
upperarm_r
bounds:221,156,22,42
weapon
bounds:41,52,67,43
rotate:90
bounds:2,765,246,250
offsets:2,2,250,254
yingzi
bounds:133,116,83,19
bounds:173,387,376,43
offsets:1,1,378,45
rotate:90

View File

@ -3,5 +3,5 @@ guid: 2347a9b423f128b43be267642300917f
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: arts/spines/characters/m10002.ab
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 90 KiB

View File

@ -63,7 +63,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 1
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -101,18 +101,6 @@ TextureImporter:
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
@ -125,6 +113,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -143,5 +143,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: arts/spines/characters/m10002.ab
assetBundleName:
assetBundleVariant:

View File

@ -3,5 +3,5 @@ guid: 097bf9b14e05bfe438319cc40e62cfde
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: arts/spines/characters/m10002.ab
assetBundleName:
assetBundleVariant:

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName: arts/spines/characters/m10002.ab
assetBundleName:
assetBundleVariant:

View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: m10002_material
m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords:
@ -29,6 +29,7 @@ Material:
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _Fill: 0
- _OutlineMipLevel: 0
- _OutlineOpaqueAlpha: 1
- _OutlineReferenceTexWidth: 1024
@ -39,6 +40,7 @@ Material:
- _StraightAlphaInput: 1
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
- _UseScreenSpaceOutlineWidth: 0
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName: arts/spines/characters/m10002.ab
assetBundleName:
assetBundleVariant:

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName: arts/spines/characters/m10002.ab
assetBundleName:
assetBundleVariant:

View File

@ -9,7 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: p0007_material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ValidKeywords: []
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords:
- _USE8NEIGHBOURHOOD_ON
m_LightmapFlags: 4
@ -36,7 +37,7 @@ Material:
- _OutlineWidth: 3
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 0
- _StraightAlphaInput: 1
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
- _UseScreenSpaceOutlineWidth: 0

View File

@ -1,57 +1,82 @@
p0009.png
size:512,512
size:1024,1024
filter:Linear,Linear
eye_L
bounds:91,207,10,23
offsets:1,1,12,25
eye_R
bounds:195,324,10,23
offsets:1,1,12,25
eye_xuanyun
bounds:110,235,22,22
gutou
bounds:29,93,70,53
cy1
bounds:2,530,444,492
offsets:1,3,446,496
cy2
bounds:448,650,532,372
offsets:1,0,534,372
eye_l
bounds:982,982,40,40
eye_r
bounds:982,940,40,40
eye_yun
bounds:646,491,51,51
guan
bounds:448,544,278,104
offsets:2,2,282,108
hand_l_1
bounds:305,261,95,83
offsets:1,2,98,87
rotate:90
hand_L
bounds:110,259,62,52
rotate:90
hand_R
bounds:389,457,52,64
hand_l_2
bounds:172,358,126,125
offsets:1,1,128,127
hand_l_3
bounds:2,4,80,94
offsets:1,1,82,96
rotate:90
hand_r_1
bounds:448,466,86,76
offsets:2,2,89,80
hand_r_2
bounds:728,529,120,119
offsets:2,1,124,121
hand_r_3
bounds:303,165,80,94
offsets:1,1,82,96
head
bounds:2,232,106,89
hit_yan1
bounds:240,393,16,18
hit_yan2
bounds:164,301,20,20
kulou
bounds:161,349,77,62
offsets:0,1,77,63
leg_L
bounds:258,444,60,65
leg_R
bounds:29,165,60,65
sipne_1
bounds:161,413,95,96
spine_2
bounds:2,31,56,38
bounds:2,293,168,190
huzi
bounds:850,512,102,42
jia
bounds:954,541,22,13
offsets:1,1,24,15
jianjia_l
bounds:850,556,126,92
offsets:2,2,130,95
jianjia_r
bounds:300,358,125,92
offsets:2,2,129,95
rotate:90
spine_3
bounds:258,404,63,38
spine_4
bounds:320,452,67,57
upperarm_L_1
bounds:455,462,46,47
upperarm_R_1
bounds:323,409,41,56
leg_l_1
bounds:172,268,88,131
rotate:90
xuying
bounds:2,323,157,186
yinying
bounds:2,89,141,25
leg_l_2
bounds:536,491,53,51
offsets:1,1,55,53
leg_l_3
bounds:978,569,79,44
offsets:1,1,81,46
rotate:90
zui
bounds:161,323,24,32
leg_r_1
bounds:145,135,88,131
leg_r_2
bounds:591,491,53,51
offsets:1,1,55,53
leg_r_3
bounds:978,488,79,44
offsets:1,1,81,46
rotate:90
zui1
bounds:2,2,29,27
spine
bounds:2,86,205,141
rotate:90
yao
bounds:145,78,87,55
yao1
bounds:235,158,108,66
rotate:90
yingzi
bounds:2,485,376,43
offsets:1,1,378,45

View File

@ -3,5 +3,5 @@ guid: ea0cdaddc6ae5ef479c5157fd139b202
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: arts/spines/characters/p0009.ab
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 979 KiB

View File

@ -36,9 +36,9 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
@ -63,20 +63,32 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 1
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
@ -89,6 +101,18 @@ TextureImporter:
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
@ -101,30 +125,6 @@ TextureImporter:
overridden: 1
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: Server
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: []
@ -143,5 +143,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: arts/spines/characters/p0009.ab
assetBundleName:
assetBundleVariant:

View File

@ -3,5 +3,5 @@ guid: 2590bd58bc474ac4fb15ae7196647f9e
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: arts/spines/characters/p0009.ab
assetBundleName:
assetBundleVariant:

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName: arts/spines/characters/p0009.ab
assetBundleName:
assetBundleVariant:

View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: p0009_material
m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords:
@ -29,6 +29,7 @@ Material:
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _Fill: 0
- _OutlineMipLevel: 0
- _OutlineOpaqueAlpha: 1
- _OutlineReferenceTexWidth: 1024
@ -39,6 +40,7 @@ Material:
- _StraightAlphaInput: 1
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
- _UseScreenSpaceOutlineWidth: 0
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName: arts/spines/characters/p0009.ab
assetBundleName:
assetBundleVariant:

View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName: arts/spines/characters/p0009.ab
assetBundleName:
assetBundleVariant:

View File

@ -27,6 +27,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2663275627370592771}
m_Father: {fileID: 0}
@ -81,6 +82,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 110436067314948100}
m_Father: {fileID: 2951863086470196126}
@ -119,6 +121,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2663275627370592771}
m_RootOrder: 0
@ -160,6 +163,7 @@ MonoBehaviour:
additiveMaterial: {fileID: 0}
multiplyMaterial: {fileID: 0}
screenMaterial: {fileID: 0}
m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1}
initialSkinName:
initialFlipX: 0
initialFlipY: 0
@ -167,6 +171,13 @@ MonoBehaviour:
startingLoop: 0
timeScale: 1
freeze: 0
layoutScaleMode: 0
referenceSize: {x: 0, y: 0}
pivotOffset: {x: 0, y: 0}
referenceScale: 1
layoutScale: 1
rectTransformSize: {x: 0, y: 0}
editReferenceRect: 0
updateWhenInvisible: 3
allowMultipleCanvasRenderers: 0
canvasRenderers: []
@ -174,16 +185,20 @@ MonoBehaviour:
enableSeparatorSlots: 0
separatorParts: []
updateSeparatorPartLocation: 1
updateSeparatorPartScale: 0
disableMeshAssignmentOnOverride: 1
physicsPositionInheritanceFactor: {x: 1, y: 1}
physicsRotationInheritanceFactor: 1
physicsMovementRelativeTo: {fileID: 0}
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
canvasGroupTintBlack: 0
calculateTangents: 0
canvasGroupCompatible: 0
pmaVertexColors: 1
addNormals: 0
calculateTangents: 0
immutableTriangles: 0
updateTiming: 1
unscaledTime: 0