Merge branch 'dev_hero' into dev_hero_2

Assets/arts/spines/ui/arena_dan_1_spine/arena_dan_1_spine.atlas.txt

@@ -1,21 +1,43 @@
 arena_dan_1_spine.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
 1
-bounds:2,2,113,74
+bounds:250,650,32,72
-offsets:1,1,115,76
 2
-bounds:126,85,77,74
+bounds:553,820,66,72
-offsets:1,1,79,76
 3
-bounds:226,227,42,74
+bounds:168,384,98,72
-offsets:1,1,44,76
+rotate:90
-4
+chi_l
-bounds:2,161,222,223
+bounds:795,932,86,90
-offsets:1,1,224,225
+offsets:1,1,88,92
-5
+chi_r
-bounds:2,78,122,81
+bounds:883,932,86,90
-offsets:1,1,124,83
+offsets:1,1,88,92
-6
+ggg
-bounds:226,303,122,81
+bounds:2,81,86,127
-offsets:1,1,124,83
+lanqiu
+bounds:683,912,110,110
+offsets:1,1,112,112
+quan1
+bounds:2,724,293,298
+offsets:0,0,293,299
+quan2
+bounds:2,484,246,238
+offsets:1,3,248,241
+tu1
+bounds:297,748,116,60
+offsets:1,1,118,62
+tu2
+bounds:2,210,148,106
+offsets:1,1,150,108
+xx1
+bounds:971,983,39,51
+offsets:2,3,42,57
+rotate:90
+yingzi
+bounds:297,810,254,212
+yuan
+bounds:2,318,164,164
+yuan1
+bounds:553,894,128,128

Assets/arts/spines/ui/arena_dan_2_spine/arena_dan_2_spine.atlas.txt

@@ -1,34 +1,44 @@
 arena_dan_2_spine.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
 1
-bounds:126,178,124,81
+bounds:114,158,32,72
-offsets:1,1,126,83
 2
-bounds:2,162,122,97
+bounds:297,712,66,72
-offsets:1,1,124,99
+rotate:90
 3
-bounds:2,45,103,115
+bounds:917,946,98,72
-offsets:1,1,105,117
 4
-bounds:351,402,124,82
+bounds:811,946,104,72
-offsets:1,1,126,84
+chi_l
-5
+bounds:168,370,97,134
-bounds:227,387,122,97
+offsets:1,0,98,134
-offsets:1,1,124,99
+chi_r
-6
+bounds:675,921,97,134
-bounds:227,270,103,115
+offsets:0,0,98,134
-offsets:1,1,105,117
-7
-bounds:2,261,223,223
-offsets:1,1,225,225
-LV1
-bounds:2,2,41,74
 rotate:90
-LV2
+ggg
-bounds:247,89,80,74
+bounds:545,802,86,127
-LV3
-bounds:126,102,119,74
-LV4
-bounds:252,165,103,75
 rotate:90
+lanqiu
+bounds:2,120,110,110
+quan1
+bounds:2,720,293,298
+offsets:0,0,293,299
+quan2
+bounds:297,780,246,238
+offsets:1,3,248,241
+tu1
+bounds:2,2,116,60
+rotate:90
+tu2
+bounds:2,232,148,106
+xx1
+bounds:64,67,39,51
+offsets:2,3,42,57
+yingzi
+bounds:2,506,276,212
+yuan
+bounds:2,340,164,164
+yuan1
+bounds:545,890,128,128

Assets/arts/spines/ui/arena_dan_3_spine/arena_dan_3_spine.atlas.txt

@@ -1,43 +1,47 @@
 arena_dan_3_spine.png
-size:512,512
+size:1024,1024
 filter:Linear,Linear
 1
-bounds:139,97,55,66
+bounds:132,259,32,72
-offsets:1,1,57,68
-rotate:90
 2
-bounds:203,385,135,121
+bounds:297,714,66,72
-offsets:1,1,137,123
+rotate:90
 3
-bounds:2,103,135,121
+bounds:880,948,98,72
-offsets:1,1,137,123
 4
-bounds:2,307,199,199
+bounds:657,827,104,72
-offsets:1,1,201,201
+rotate:90
 5
-bounds:203,310,73,101
+bounds:296,640,70,72
-offsets:1,1,75,103
+chi_l
+bounds:2,101,97,100
+offsets:1,0,98,100
+chi_r
+bounds:2,2,97,100
+offsets:0,0,98,100
 rotate:90
-6
+ggg
-bounds:340,405,73,101
+bounds:751,934,86,127
-offsets:1,1,75,103
-7
-bounds:2,226,187,79
-offsets:1,1,189,81
-LV1
-bounds:415,400,38,66
-offsets:1,1,40,68
 rotate:90
-LV2
+lanqiu
-bounds:139,154,70,66
+bounds:545,821,110,110
-offsets:1,1,72,68
+quan1
+bounds:2,722,293,298
+offsets:0,0,293,299
+quan2
+bounds:297,782,246,238
+offsets:1,3,248,241
+tu1
+bounds:545,933,204,87
+tu2
+bounds:168,349,148,106
 rotate:90
-LV3
+xx1
-bounds:2,35,102,66
+bounds:980,969,39,51
-offsets:1,1,104,68
+offsets:2,3,42,57
-LV4
+yingzi
-bounds:415,440,91,66
+bounds:2,499,292,221
-offsets:1,1,93,68
+yuan
-LV5
+bounds:2,333,164,164
-bounds:306,317,58,66
+yuan1
-offsets:1,1,60,68
+bounds:2,203,128,128

Assets/arts/spines/ui/ui_arena_pairing/ui_arena_pairing.atlas.txt

@@ -1,12 +1,44 @@
 ui_arena_pairing.png
-size:512,512
+size:2048,2048
 filter:Linear,Linear
-1
+fang
-bounds:2,185,146,145
+bounds:2,57,332,336
-2
+offsets:1,1,334,338
-bounds:2,38,146,145
+g1
+bounds:646,1595,414,414
+offsets:3,3,420,420
+hjying
+bounds:646,1263,171,156
+offsets:1,1,173,159
+hongg
+bounds:336,208,27,27
+offsets:1,1,28,28
+hongjian
+bounds:1062,1837,171,172
+offsets:1,1,173,175
+hongtiao
+bounds:2,1203,642,806
+offsets:1,1,644,808
+lang
+bounds:510,367,27,26
+offsets:0,1,27,28
+lanjian
+bounds:646,1421,172,172
+offsets:1,1,174,174
+lantiao
+bounds:2,395,642,806
+offsets:1,1,644,808
+ljying
+bounds:336,237,172,156
+offsets:1,1,174,158
 xx
-bounds:2,2,26,34
+bounds:1062,1798,37,37
-offsets:1,0,28,35
+xx1
+bounds:2,2,40,53
+offsets:1,1,42,55
 xx2
-bounds:150,286,33,44
+bounds:1235,1972,29,37
+offsets:1,1,31,39
+xx3
+bounds:820,1540,40,53
+offsets:1,1,42,55

Assets/arts/spines/ui/ui_arena_pairing_point.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ecf1ce1dff4310046abafa565d0a683c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point.atlas.txt

@@ -0,0 +1,5 @@
+ui_arena_pairing_point.png
+size:32,32
+filter:Linear,Linear
+dian
+bounds:2,2,18,19

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point.atlas.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4b6e5a66953475b4fae9a641cd2f23ec
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: de77d34db63fd3b439fd6942f8d4089a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: 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: 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: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point.skel.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 527098aafd9fd9a46917456bd9c49178
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point_atlas.asset

@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
+  m_Name: ui_arena_pairing_point_atlas
+  m_EditorClassIdentifier: 
+  textureLoadingMode: 0
+  onDemandTextureLoader: {fileID: 0}
+  atlasFile: {fileID: 4900000, guid: 4b6e5a66953475b4fae9a641cd2f23ec, type: 3}
+  materials:
+  - {fileID: 2100000, guid: 6e145941f17ff474f800a8dbf8a8201b, type: 2}

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point_atlas.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7332edf2af60af24abf8bc4403fa7f18
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point_material.mat

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_arena_pairing_point_material
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: de77d34db63fd3b439fd6942f8d4089a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Cutoff: 0.1
+    - _Fill: 0
+    - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point_material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6e145941f17ff474f800a8dbf8a8201b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point_skeletondata.asset

@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
+  m_Name: ui_arena_pairing_point_skeletondata
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: 7332edf2af60af24abf8bc4403fa7f18, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: 527098aafd9fd9a46917456bd9c49178, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 0
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}

Assets/arts/spines/ui/ui_arena_pairing_point/ui_arena_pairing_point_skeletondata.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2da43c14eea877440a76b61ff72286e9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.atlas.txt

@@ -1,14 +1,12 @@
 ui_battle_result_fail.png
 size:2048,2048
 filter:Linear,Linear
-battle_dec_1
-bounds:1885,2004,39,42
-g1
-bounds:2,1260,728,786
 g2
 bounds:732,1411,722,635
 g3
 bounds:2,606,722,652
+gg1
+bounds:2,1260,728,786
 lizi1
 bounds:42,2,37,37
 lizi2
@@ -18,7 +16,7 @@ bounds:1971,2014,32,32
 rx_10
 bounds:1926,2012,43,34
 rx_11
-bounds:1242,1367,39,42
+bounds:1885,2004,39,42
 rx_12
 bounds:350,538,50,49
 rx_13
@@ -31,7 +29,8 @@ bounds:1533,1856,22,19
 rx_16
 bounds:1578,1966,88,80
 rx_17
-bounds:1456,1552,29,52
+bounds:1242,1380,29,52
+rotate:90
 rx_18
 bounds:80,447,96,70
 rx_19
@@ -76,7 +75,8 @@ rotate:90
 xrk_11
 bounds:208,527,83,77
 xrk_12
-bounds:1283,1387,46,22
+bounds:1456,1558,46,22
+rotate:90
 xrk_13
 bounds:732,1260,28,46
 rotate:90
@@ -104,7 +104,8 @@ bounds:2,385,76,219
 xrk_7
 bounds:809,1267,27,21
 xrk_8
-bounds:1331,1388,28,21
+bounds:1456,1528,28,21
+rotate:90
 xrk_9
 bounds:732,1307,150,102
 xrz_1
@@ -127,7 +128,8 @@ bounds:780,1262,27,26
 xrz_3
 bounds:1714,1971,29,22
 xrz_4
-bounds:1456,1512,16,38
+bounds:1296,1393,16,38
+rotate:90
 xrz_5
 bounds:2005,2024,22,41
 rotate:90

Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.atlas.txt

@@ -3,12 +3,12 @@ size:2048,2048
 filter:Linear,Linear
 battle_dec_1
 bounds:1456,1636,39,42
-g1
-bounds:2,1259,728,786
 g2
 bounds:732,1410,722,635
 g3
 bounds:2,605,722,652
+gg1
+bounds:2,1259,728,786
 lh_1
 bounds:843,1337,138,71
 lh_2