Merge branch 'dev_spine' into dev_hero
@ -2,41 +2,41 @@ ui_battle_goldpig.png
|
||||
size:512,512
|
||||
filter:Linear,Linear
|
||||
bizi
|
||||
bounds:1,151,59,50
|
||||
bounds:2,152,59,50
|
||||
chui
|
||||
bounds:1,95,43,54
|
||||
bounds:2,96,43,54
|
||||
offsets:1,1,45,56
|
||||
er1
|
||||
bounds:312,386,39,34
|
||||
bounds:313,387,39,34
|
||||
qipao
|
||||
bounds:1,203,153,84
|
||||
bounds:2,204,153,84
|
||||
rotate:90
|
||||
shenti
|
||||
bounds:139,373,120,101
|
||||
bounds:140,374,120,101
|
||||
tou
|
||||
bounds:1,358,136,116
|
||||
bounds:2,359,136,116
|
||||
tui1
|
||||
bounds:1,42,34,51
|
||||
bounds:2,43,34,51
|
||||
tui2
|
||||
bounds:311,422,40,52
|
||||
bounds:312,423,40,52
|
||||
tui3
|
||||
bounds:353,429,37,45
|
||||
bounds:354,430,37,45
|
||||
wei
|
||||
bounds:261,422,48,52
|
||||
bounds:262,423,48,52
|
||||
xx1
|
||||
bounds:392,434,40,40
|
||||
bounds:393,435,40,40
|
||||
xx2
|
||||
bounds:434,434,40,40
|
||||
bounds:435,435,40,40
|
||||
xx3
|
||||
bounds:87,255,25,25
|
||||
bounds:88,256,25,25
|
||||
yan1
|
||||
bounds:139,362,9,20
|
||||
bounds:140,363,9,20
|
||||
rotate:90
|
||||
yan2
|
||||
bounds:62,181,9,20
|
||||
bounds:63,182,9,20
|
||||
zuanshi
|
||||
bounds:261,377,43,49
|
||||
bounds:262,378,43,49
|
||||
rotate:90
|
||||
zui
|
||||
bounds:87,282,74,31
|
||||
bounds:88,283,74,31
|
||||
rotate:90
|
||||
|
||||
@ -3,5 +3,5 @@ guid: bbd090e42178485458a1aad86710af9a
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_goldpig.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
@ -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/ui/ui_battle_goldpig.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -3,5 +3,5 @@ guid: fcc111d525268e04b99c9f03e3b7fe17
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_goldpig.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_goldpig.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -8,7 +8,7 @@ Material:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: ui_battle_goldpig_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: []
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_goldpig.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_goldpig.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -2,134 +2,155 @@ ui_battle_result_1.png
|
||||
size:1024,1024
|
||||
filter:Linear,Linear
|
||||
dunpaige_1
|
||||
bounds:863,421,69,75
|
||||
bounds:442,4,69,75
|
||||
dunpaige_10
|
||||
bounds:224,53,140,145
|
||||
bounds:377,465,140,145
|
||||
dunpaige_11
|
||||
bounds:796,297,67,93
|
||||
bounds:838,223,67,93
|
||||
rotate:90
|
||||
dunpaige_12
|
||||
bounds:813,202,67,93
|
||||
bounds:513,28,67,93
|
||||
dunpaige_13
|
||||
bounds:864,786,27,17
|
||||
bounds:645,72,27,17
|
||||
offsets:0,0,27,18
|
||||
dunpaige_2
|
||||
bounds:689,105,100,94
|
||||
bounds:880,671,100,94
|
||||
offsets:1,1,102,96
|
||||
dunpaige_3
|
||||
bounds:366,80,86,115
|
||||
bounds:490,226,86,115
|
||||
offsets:1,1,88,117
|
||||
dunpaige_4
|
||||
bounds:894,786,128,66
|
||||
bounds:442,81,128,66
|
||||
rotate:90
|
||||
dunpaige_5
|
||||
bounds:882,166,61,61
|
||||
bounds:582,28,61,61
|
||||
offsets:1,1,63,63
|
||||
dunpaige_6
|
||||
bounds:839,406,91,22
|
||||
bounds:519,519,91,22
|
||||
offsets:1,1,93,24
|
||||
rotate:90
|
||||
dunpaige_7
|
||||
bounds:454,327,78,87
|
||||
rotate:90
|
||||
bounds:583,150,78,87
|
||||
dunpaige_8
|
||||
bounds:2,9,220,189
|
||||
offsets:1,1,222,191
|
||||
dunpaige_9
|
||||
bounds:674,499,187,168
|
||||
bounds:224,11,187,168
|
||||
rotate:90
|
||||
fashi_1
|
||||
bounds:950,501,37,37
|
||||
bounds:656,91,37,37
|
||||
offsets:1,1,39,39
|
||||
fashi_10
|
||||
bounds:1004,750,18,34
|
||||
bounds:513,8,18,33
|
||||
offsets:1,1,20,35
|
||||
rotate:90
|
||||
fashi_11
|
||||
bounds:454,189,136,117
|
||||
bounds:377,211,130,111
|
||||
offsets:1,1,132,113
|
||||
rotate:90
|
||||
fashi_12
|
||||
bounds:762,2,101,66
|
||||
bounds:942,448,95,62
|
||||
offsets:1,1,97,64
|
||||
rotate:90
|
||||
fashi_13
|
||||
bounds:506,419,35,44
|
||||
offsets:1,1,37,46
|
||||
fashi_14
|
||||
bounds:366,26,52,67
|
||||
rotate:90
|
||||
bounds:886,783,54,69
|
||||
fashi_15
|
||||
bounds:573,195,131,112
|
||||
rotate:90
|
||||
bounds:377,343,127,120
|
||||
fashi_16
|
||||
bounds:503,13,65,64
|
||||
bounds:663,176,50,61
|
||||
fashi_17
|
||||
bounds:954,633,55,58
|
||||
bounds:933,232,56,71
|
||||
fashi_18
|
||||
bounds:882,229,59,69
|
||||
fashi_19
|
||||
bounds:674,840,218,182
|
||||
fashi_2
|
||||
bounds:950,540,40,35
|
||||
fashi_3
|
||||
bounds:377,407,203,156
|
||||
offsets:1,0,204,156
|
||||
bounds:583,91,57,71
|
||||
rotate:90
|
||||
fashi_19
|
||||
bounds:660,671,218,170
|
||||
fashi_2
|
||||
bounds:506,381,36,35
|
||||
offsets:1,1,38,37
|
||||
rotate:90
|
||||
fashi_3
|
||||
bounds:660,843,224,179
|
||||
offsets:1,1,226,184
|
||||
fashi_4
|
||||
bounds:865,300,51,44
|
||||
bounds:663,130,51,44
|
||||
offsets:1,1,53,46
|
||||
fashi_5
|
||||
bounds:377,197,208,75
|
||||
bounds:850,544,125,80
|
||||
offsets:1,1,127,82
|
||||
rotate:90
|
||||
fashi_6
|
||||
bounds:674,392,163,105
|
||||
bounds:982,677,88,36
|
||||
offsets:1,1,90,38
|
||||
rotate:90
|
||||
fashi_7
|
||||
bounds:864,693,138,91
|
||||
bounds:660,355,170,143
|
||||
fashi_8
|
||||
bounds:1004,714,18,34
|
||||
bounds:999,988,18,34
|
||||
offsets:1,1,20,36
|
||||
fashi_9
|
||||
bounds:839,392,16,12
|
||||
bounds:525,367,16,12
|
||||
offsets:1,1,18,14
|
||||
guang1
|
||||
bounds:2,200,373,410
|
||||
guang2
|
||||
bounds:2,612,539,410
|
||||
heimei_1
|
||||
bounds:687,201,124,79
|
||||
bounds:932,545,124,79
|
||||
offsets:1,1,126,81
|
||||
rotate:90
|
||||
heimei_10
|
||||
bounds:894,854,168,111
|
||||
bounds:886,854,168,111
|
||||
offsets:1,1,170,113
|
||||
rotate:90
|
||||
heimei_11
|
||||
bounds:224,10,115,41
|
||||
bounds:795,238,115,41
|
||||
offsets:1,1,117,43
|
||||
rotate:90
|
||||
heimei_12
|
||||
bounds:581,80,113,106
|
||||
bounds:578,239,113,106
|
||||
rotate:90
|
||||
heimei_13
|
||||
bounds:689,2,71,101
|
||||
bounds:510,123,71,101
|
||||
heimei_14
|
||||
bounds:687,282,107,108
|
||||
bounds:686,245,107,108
|
||||
heimei_15
|
||||
bounds:863,579,85,80
|
||||
bounds:942,767,85,80
|
||||
rotate:90
|
||||
heimei_16
|
||||
bounds:863,498,85,79
|
||||
bounds:838,292,85,79
|
||||
heimei_2
|
||||
bounds:674,669,188,169
|
||||
bounds:660,500,188,169
|
||||
heimei_3
|
||||
bounds:864,805,17,33
|
||||
bounds:519,484,17,33
|
||||
offsets:1,1,19,35
|
||||
heimei_4
|
||||
bounds:1007,1005,17,13
|
||||
rotate:90
|
||||
bounds:490,211,17,13
|
||||
heimei_5
|
||||
bounds:341,19,17,32
|
||||
bounds:506,347,17,32
|
||||
offsets:1,1,19,34
|
||||
heimei_6
|
||||
bounds:454,79,125,108
|
||||
bounds:832,373,125,108
|
||||
offsets:1,1,127,110
|
||||
rotate:90
|
||||
heimei_7
|
||||
bounds:864,661,30,88
|
||||
bounds:850,512,30,88
|
||||
rotate:90
|
||||
heimei_8
|
||||
bounds:865,346,73,62
|
||||
bounds:942,373,73,62
|
||||
rotate:90
|
||||
heimei_9
|
||||
bounds:435,13,64,66
|
||||
rotate:90
|
||||
bounds:925,305,64,66
|
||||
tf
|
||||
bounds:543,328,694,129
|
||||
bounds:543,354,668,115
|
||||
rotate:90
|
||||
win
|
||||
bounds:394,17,192,46
|
||||
offsets:1,1,194,48
|
||||
rotate:90
|
||||
xx
|
||||
bounds:950,577,54,54
|
||||
bounds:715,189,54,54
|
||||
offsets:1,1,56,56
|
||||
|
||||
@ -3,5 +3,5 @@ guid: c06b87accd24217419ec5200a72a8935
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_result_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 235 KiB |
@ -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/ui/ui_battle_result_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -3,5 +3,5 @@ guid: 417ccb114e1ce4c4b8cf0dd9019610e0
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_result_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_result_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -8,7 +8,7 @@ Material:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: ui_battle_result_1_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: []
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_result_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_battle_result_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -2,187 +2,156 @@ ui_battle_result_2.png
|
||||
size:1024,1024
|
||||
filter:Linear,Linear
|
||||
dunpaige_1
|
||||
bounds:540,328,73,27
|
||||
bounds:268,23,68,64
|
||||
dunpaige_10
|
||||
bounds:727,561,83,39
|
||||
offsets:1,1,85,41
|
||||
bounds:780,806,85,41
|
||||
rotate:90
|
||||
dunpaige_11
|
||||
bounds:1,53,168,152
|
||||
offsets:1,1,170,154
|
||||
bounds:1,51,170,154
|
||||
dunpaige_12
|
||||
bounds:360,75,50,42
|
||||
offsets:1,1,52,44
|
||||
bounds:780,752,52,44
|
||||
rotate:90
|
||||
dunpaige_13
|
||||
bounds:471,227,61,60
|
||||
offsets:1,1,63,62
|
||||
bounds:936,829,63,62
|
||||
dunpaige_14
|
||||
bounds:1,2,115,49
|
||||
offsets:1,1,117,51
|
||||
bounds:457,432,117,51
|
||||
rotate:90
|
||||
dunpaige_15
|
||||
bounds:655,646,103,76
|
||||
offsets:1,1,105,78
|
||||
bounds:374,314,105,78
|
||||
rotate:90
|
||||
dunpaige_16
|
||||
bounds:422,146,44,40
|
||||
offsets:1,1,46,42
|
||||
bounds:456,289,46,42
|
||||
rotate:90
|
||||
dunpaige_17
|
||||
bounds:534,231,55,45
|
||||
offsets:1,1,57,47
|
||||
bounds:767,637,57,47
|
||||
dunpaige_18
|
||||
bounds:171,1,123,134
|
||||
rotate:90
|
||||
bounds:655,757,123,134
|
||||
dunpaige_19
|
||||
bounds:655,353,63,87
|
||||
bounds:723,382,63,87
|
||||
dunpaige_2
|
||||
bounds:374,306,100,94
|
||||
offsets:1,1,102,96
|
||||
bounds:655,561,102,96
|
||||
dunpaige_20
|
||||
bounds:765,727,91,52
|
||||
offsets:1,1,93,54
|
||||
rotate:90
|
||||
bounds:173,33,93,54
|
||||
dunpaige_21
|
||||
bounds:944,962,61,79
|
||||
offsets:1,1,63,81
|
||||
bounds:457,551,63,81
|
||||
rotate:90
|
||||
dunpaige_3
|
||||
bounds:892,743,35,36
|
||||
offsets:1,1,37,38
|
||||
bounds:826,551,37,38
|
||||
dunpaige_4
|
||||
bounds:360,28,44,45
|
||||
offsets:1,1,46,47
|
||||
bounds:454,337,46,47
|
||||
dunpaige_5
|
||||
bounds:171,126,79,191
|
||||
offsets:1,1,82,193
|
||||
rotate:90
|
||||
bounds:374,421,81,193
|
||||
offsets:0,0,82,193
|
||||
dunpaige_6
|
||||
bounds:429,114,30,33
|
||||
offsets:1,2,32,36
|
||||
bounds:500,270,32,35
|
||||
offsets:0,1,32,36
|
||||
rotate:90
|
||||
dunpaige_7
|
||||
bounds:903,781,37,42
|
||||
offsets:1,1,39,44
|
||||
rotate:90
|
||||
bounds:817,591,39,44
|
||||
dunpaige_8
|
||||
bounds:819,733,51,71
|
||||
offsets:1,1,53,73
|
||||
rotate:90
|
||||
bounds:338,24,53,73
|
||||
dunpaige_9
|
||||
bounds:944,909,51,75
|
||||
offsets:1,1,53,77
|
||||
rotate:90
|
||||
bounds:823,827,53,77
|
||||
fashi_1
|
||||
bounds:700,322,29,29
|
||||
bounds:498,237,31,31
|
||||
fashi_10
|
||||
bounds:918,862,24,63
|
||||
offsets:1,1,26,65
|
||||
fashi_11
|
||||
bounds:655,724,108,94
|
||||
fashi_12
|
||||
bounds:829,868,87,57
|
||||
fashi_14
|
||||
bounds:829,927,113,96
|
||||
fashi_15
|
||||
bounds:727,528,31,36
|
||||
bounds:759,563,26,65
|
||||
rotate:90
|
||||
fashi_11
|
||||
bounds:655,659,110,96
|
||||
fashi_12
|
||||
bounds:878,830,74,56
|
||||
rotate:90
|
||||
fashi_13
|
||||
bounds:500,304,31,38
|
||||
rotate:90
|
||||
fashi_14
|
||||
bounds:655,471,101,88
|
||||
fashi_15
|
||||
bounds:582,317,33,38
|
||||
fashi_16
|
||||
bounds:947,774,50,29
|
||||
bounds:655,334,52,31
|
||||
fashi_17
|
||||
bounds:718,490,31,36
|
||||
bounds:617,317,33,38
|
||||
fashi_18
|
||||
bounds:718,452,27,36
|
||||
bounds:443,132,29,38
|
||||
rotate:90
|
||||
fashi_19
|
||||
bounds:604,280,34,36
|
||||
bounds:502,346,36,38
|
||||
fashi_2
|
||||
bounds:364,119,25,63
|
||||
offsets:1,1,27,65
|
||||
bounds:378,102,27,65
|
||||
rotate:90
|
||||
fashi_20
|
||||
bounds:615,318,38,37
|
||||
bounds:456,248,40,39
|
||||
fashi_21
|
||||
bounds:655,879,172,144
|
||||
bounds:173,89,148,116
|
||||
fashi_22
|
||||
bounds:118,7,51,44
|
||||
bounds:457,386,51,44
|
||||
fashi_3
|
||||
bounds:476,289,62,45
|
||||
fashi_4
|
||||
bounds:655,820,160,57
|
||||
fashi_5
|
||||
bounds:374,402,125,80
|
||||
fashi_6
|
||||
bounds:655,539,105,70
|
||||
bounds:826,761,64,46
|
||||
rotate:90
|
||||
fashi_4
|
||||
bounds:655,367,102,66
|
||||
rotate:90
|
||||
fashi_5
|
||||
bounds:937,893,72,31
|
||||
fashi_6
|
||||
bounds:803,906,132,117
|
||||
fashi_7
|
||||
bounds:1011,888,19,12
|
||||
offsets:1,1,21,14
|
||||
bounds:157,28,21,14
|
||||
rotate:90
|
||||
fashi_8
|
||||
bounds:1011,867,19,12
|
||||
offsets:1,1,21,14
|
||||
rotate:90
|
||||
bounds:510,401,21,14
|
||||
fashi_9
|
||||
bounds:720,421,29,29
|
||||
bounds:652,301,31,31
|
||||
fashi_sui1
|
||||
bounds:655,323,28,43
|
||||
rotate:90
|
||||
bounds:510,506,28,43
|
||||
fashi_sui2
|
||||
bounds:903,820,40,39
|
||||
rotate:90
|
||||
bounds:540,316,40,39
|
||||
guang1
|
||||
bounds:1,207,371,407
|
||||
guang2
|
||||
bounds:1,616,537,407
|
||||
heimei_1
|
||||
bounds:540,278,62,48
|
||||
bounds:1,1,62,48
|
||||
heimei_10
|
||||
bounds:364,146,56,44
|
||||
bounds:759,591,56,44
|
||||
offsets:0,1,57,45
|
||||
heimei_11
|
||||
bounds:501,392,90,37
|
||||
rotate:90
|
||||
bounds:65,12,90,37
|
||||
heimei_12
|
||||
bounds:307,20,104,51
|
||||
offsets:2,1,107,53
|
||||
bounds:323,99,106,53
|
||||
offsets:1,0,107,53
|
||||
rotate:90
|
||||
heimei_13
|
||||
bounds:819,786,82,80
|
||||
bounds:374,230,82,80
|
||||
offsets:1,0,83,80
|
||||
rotate:90
|
||||
heimei_14
|
||||
bounds:476,336,54,62
|
||||
offsets:1,1,56,64
|
||||
rotate:90
|
||||
bounds:767,686,56,64
|
||||
heimei_15
|
||||
bounds:944,855,52,65
|
||||
offsets:1,1,54,67
|
||||
rotate:90
|
||||
bounds:393,33,54,67
|
||||
heimei_2
|
||||
bounds:944,830,23,63
|
||||
offsets:1,1,25,65
|
||||
bounds:723,355,25,65
|
||||
rotate:90
|
||||
heimei_3
|
||||
bounds:947,805,23,63
|
||||
offsets:1,1,25,65
|
||||
rotate:90
|
||||
bounds:443,163,25,65
|
||||
heimei_4
|
||||
bounds:655,442,95,61
|
||||
offsets:1,1,97,63
|
||||
bounds:378,131,97,63
|
||||
rotate:90
|
||||
heimei_5
|
||||
bounds:374,484,146,130
|
||||
bounds:655,893,146,130
|
||||
heimei_6
|
||||
bounds:412,97,20,15
|
||||
offsets:1,2,23,18
|
||||
rotate:90
|
||||
bounds:1001,874,22,17
|
||||
offsets:0,1,23,18
|
||||
heimei_7
|
||||
bounds:444,192,26,15
|
||||
offsets:2,1,29,18
|
||||
rotate:90
|
||||
bounds:510,417,28,17
|
||||
offsets:1,0,29,18
|
||||
heimei_8
|
||||
bounds:374,220,95,84
|
||||
offsets:1,1,97,86
|
||||
heimei_9
|
||||
bounds:374,192,26,68
|
||||
bounds:937,926,97,86
|
||||
rotate:90
|
||||
heimei_9
|
||||
bounds:510,436,26,68
|
||||
tf
|
||||
bounds:540,357,666,113
|
||||
rotate:90
|
||||
|
||||
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 202 KiB |
@ -2,17 +2,24 @@ ui_reward_1.png
|
||||
size:2048,2048
|
||||
filter:Linear,Linear
|
||||
16
|
||||
bounds:543,737,104,120
|
||||
bounds:543,972,104,120
|
||||
offsets:12,0,128,128
|
||||
17
|
||||
bounds:2,534,539,566
|
||||
bounds:2,769,539,566
|
||||
g
|
||||
bounds:2,2,293,28
|
||||
bounds:504,474,293,28
|
||||
offsets:18,2,327,32
|
||||
rotate:90
|
||||
g31
|
||||
bounds:543,859,256,241
|
||||
bounds:543,1094,256,241
|
||||
offsets:22,30,300,300
|
||||
guangdian
|
||||
bounds:2,2,14,19
|
||||
offsets:0,0,15,20
|
||||
guanghuan
|
||||
bounds:2,23,253,242
|
||||
offsets:1,3,256,256
|
||||
quan
|
||||
bounds:2,32,500,500
|
||||
bounds:2,267,500,500
|
||||
xx1
|
||||
bounds:504,509,17,23
|
||||
bounds:801,1312,17,23
|
||||
|
||||
@ -3,5 +3,5 @@ guid: fb10ad354b569cb44be8f2623d065085
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_reward_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
|
Before Width: | Height: | Size: 294 KiB After Width: | Height: | Size: 363 KiB |
@ -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/ui/ui_reward_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -3,5 +3,5 @@ guid: 8cac7db95ede93d4f90862f270340dbb
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_reward_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_reward_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -8,7 +8,7 @@ Material:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: ui_reward_1_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: []
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_reward_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName: arts/spines/ui/ui_reward_1.ab
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||