Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero

Assets/arts/animations/ui/talent.meta

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

Assets/arts/animations/ui/talent/talent.anim

@@ -0,0 +1,332 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: talent
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -1000
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 0
+        inSlope: 2990.986
+        outSlope: -3660.5305
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.0765346
+        outWeight: 0.07342985
+      - serializedVersion: 3
+        time: 0.16666667
+        value: -100
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0
+        inSlope: 1583.4486
+        outSlope: 0
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.10412692
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: match
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 304
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: match
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1000
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 0
+        inSlope: -5791.602
+        outSlope: 2741.5193
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.024755627
+        outWeight: 0.087923706
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 100
+        inSlope: -15.361156
+        outSlope: -15.361156
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.43411562
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0
+        inSlope: -1456.2904
+        outSlope: 0
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.06446868
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: self
+    classID: 224
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2052834565
+      attribute: 1460864421
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2068527459
+      attribute: 1460864421
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2052834565
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -1000
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 0
+        inSlope: 2990.986
+        outSlope: -3660.5305
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.0765346
+        outWeight: 0.07342985
+      - serializedVersion: 3
+        time: 0.16666667
+        value: -100
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0
+        inSlope: 1583.4486
+        outSlope: 0
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.10412692
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: match
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 304
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: match
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1000
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 0
+        inSlope: -5791.602
+        outSlope: 2741.5193
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.024755627
+        outWeight: 0.087923706
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 100
+        inSlope: -15.361156
+        outSlope: -15.361156
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.43411562
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0
+        inSlope: -1456.2904
+        outSlope: 0
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.06446868
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: self
+    classID: 224
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/arts/animations/ui/talent/talent.anim.meta

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

Assets/arts/animations/ui/talent/talent.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-2414691991970011120
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 220762235041923957}
+    m_Position: {x: 230, y: 60, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 60, z: 0}
+  m_ExitPosition: {x: 50, y: 100, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 220762235041923957}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: talent
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -2414691991970011120}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &220762235041923957
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: talent
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 882fa7cf16bdc4b43a619f3165359ef2, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/arts/animations/ui/talent/talent.controller.meta

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

Assets/arts/atlas/icon/buff.asset

@@ -54,4 +54,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 9509038978143b8419ef45aabc1145c9, type: 3}
   - {fileID: 21300000, guid: 86f4bf51405bce84381db4ad10b34d7d, type: 3}
   - {fileID: 21300000, guid: 5c4223ded9ac7e14b898bba98c40519f, type: 3}
-  spriteNameList: 3a9f9705cf512e00d7d7a3050de6ee3844d744fc9200aa050cc1401e05a627787a7e5d04e7415e8e5cfd091af5ec0eef143e942f9ed464f6a01289b4a2dd3000832c60b9cfbbd3ea8913ac1110d4ad7d2bc532008284f110e38ff110a74f646f086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0937ead4eacb792fef52ed0da0eb2d55b83c594c5c6f25f71
+  spriteNameList: 3a9f9705cf512e00d7d7a3050de6ee3844d744fc9200aa050cc1401e05a627787a7e5d04e7415e8e5cfd091af5ec0eef143e942f9ed464f6a01289b4a2dd3000832c60b9af57f9e68913ac1110d4ad7d2bc532008284f110e38ff110a74f646f086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0937ead4eacb792fef52ed0da0eb2d55b83c594c5c6f25f71

Assets/arts/atlas/icon/buff.spriteatlas

@@ -114,7 +114,7 @@ SpriteAtlas:
   - bleed
   - charm
   - weakness_blue_add
-  - Imprison
+  - imprison
   - ocean_shield1
   - poison
   - dec_dmg_purple_add

Assets/arts/atlas/icon/hero.asset

@@ -19,10 +19,15 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 89a047e7326d70042aacb397a171b4c4, type: 3}
   - {fileID: 21300000, guid: cf6e69e8ba2ed564b97e33559a9fcfab, type: 3}
   - {fileID: 21300000, guid: 424235597f0495f4082b28b051aa10df, type: 3}
+  - {fileID: 21300000, guid: 49ad45e33a7cb44c68f2ec2f2890adfa, type: 3}
   - {fileID: 21300000, guid: 643846a215ab336468ec5ce2377a6325, type: 3}
+  - {fileID: 21300000, guid: 8d3466a79de304d43ab76c69ce2dd8e3, type: 3}
   - {fileID: 21300000, guid: 34ee8d3898987554fa170f76b4f9a32a, type: 3}
+  - {fileID: 21300000, guid: 1442e5460c4234d04aa54248c576740a, type: 3}
+  - {fileID: 21300000, guid: d6ee49e1d576443ec9218196619c988f, type: 3}
   - {fileID: 21300000, guid: d787ecac73aac5b4a90deb7d7e500d22, type: 3}
   - {fileID: 21300000, guid: de280cbe7890e5a45802bd120a2b74f4, type: 3}
+  - {fileID: 21300000, guid: 03e0b428880bb408f88829395cfacba2, type: 3}
   - {fileID: 21300000, guid: 292c42b6b51485944a13a0d9e1a19a4e, type: 3}
   - {fileID: 21300000, guid: 2de7d35c927763b43af92db9befe80ec, type: 3}
   - {fileID: 21300000, guid: 38b35bbd2db7b5b46aee1494716c01ec, type: 3}
@@ -37,11 +42,16 @@ MonoBehaviour:
   - {fileID: 21300000, guid: c042c1c7c85392e449166b4197c07526, type: 3}
   - {fileID: 21300000, guid: d8738d1f5aae3014bb0710c44865f333, type: 3}
   - {fileID: 21300000, guid: 712663eb7cac1b64a9f8a319a719b9b3, type: 3}
+  - {fileID: 21300000, guid: 6def5a709fe3943ebb39de26980f2592, type: 3}
   - {fileID: 21300000, guid: dab912016d15a474bba88f941dbe15ee, type: 3}
+  - {fileID: 21300000, guid: 655531f939b1a457dab557f6369ed4fb, type: 3}
   - {fileID: 21300000, guid: ebf7e343b1d2b79428117236afdf64cc, type: 3}
   - {fileID: 21300000, guid: 062879952e89e4648bfd885bb931b006, type: 3}
+  - {fileID: 21300000, guid: b97bccd318fcc4745a62dda168d27ea3, type: 3}
+  - {fileID: 21300000, guid: 04cc664b389b547a0bb4c6ab218cdf92, type: 3}
   - {fileID: 21300000, guid: d012b6cc00c51734195445a3c6d15cf7, type: 3}
   - {fileID: 21300000, guid: b6ceb1260cf406e4e867ccd7088eb8cf, type: 3}
+  - {fileID: 21300000, guid: 1a151ba1bbcf04600b3b08c06ddc5c1d, type: 3}
   - {fileID: 21300000, guid: fda0b51f55b7e3747b0d57f8016ed335, type: 3}
   - {fileID: 21300000, guid: bd5b5da0992114943b34e1861598244f, type: 3}
   - {fileID: 21300000, guid: 7d9c79f30dcdc8247aab76baf0c2c6ba, type: 3}
@@ -51,12 +61,24 @@ MonoBehaviour:
   - {fileID: 21300000, guid: f1eb506cc169ae94da35933a571a9e24, type: 3}
   - {fileID: 21300000, guid: 3f007bc497b724f4c959944ef3ecf4ef, type: 3}
   - {fileID: 21300000, guid: 397fbe85e4725d444a9be3c60ff79387, type: 3}
+  - {fileID: 21300000, guid: c9c94a57639194a82af668801e8b0371, type: 3}
   - {fileID: 21300000, guid: 9b8fa80d083fdca4387cda551f2e14f1, type: 3}
+  - {fileID: 21300000, guid: c105ed7bffabb41d68628f1db90599e3, type: 3}
   - {fileID: 21300000, guid: 745401caea44d6a4695b3063fed8bc58, type: 3}
+  - {fileID: 21300000, guid: eccd95a16a0f944f195fd25b5be833f1, type: 3}
+  - {fileID: 21300000, guid: 8f715511a140940e481d2c3d17c1bbb6, type: 3}
   - {fileID: 21300000, guid: 9c32e986881e23942acd3c2aabeaeac3, type: 3}
   - {fileID: 21300000, guid: 8c7b75b71d6b7fc47acf21aa7b21f722, type: 3}
   - {fileID: 21300000, guid: 638ce4d0c24ad074789d94172ec0aab7, type: 3}
+  - {fileID: 21300000, guid: b54450c19dc35455d9518116520e2748, type: 3}
+  - {fileID: 21300000, guid: 83856ce6deb5f4b69aed315e4807849c, type: 3}
+  - {fileID: 21300000, guid: a05d601097baa49d0a61df64b81dae3a, type: 3}
+  - {fileID: 21300000, guid: c6702d87191014ec0975fb7ddfa10c7a, type: 3}
   - {fileID: 21300000, guid: 31d65db45a06f7b4f8e38cd94da730f9, type: 3}
+  - {fileID: 21300000, guid: 1dbac3b59ebf146d2967cbb72dc2823a, type: 3}
+  - {fileID: 21300000, guid: 5314f7732404d4eef826135330a8b53b, type: 3}
+  - {fileID: 21300000, guid: cbc024c36143042868db3c265d00dd76, type: 3}
+  - {fileID: 21300000, guid: 22f313a87abde42ab89c7af4ad019fd8, type: 3}
   - {fileID: 21300000, guid: f67782678a259484f9bbcc1fd47de7cb, type: 3}
   - {fileID: 21300000, guid: 25dfe02b2474b6b429a9405bfe8a4cbe, type: 3}
   - {fileID: 21300000, guid: dca94ed2aeae2d24eb4d4555da31abae, type: 3}
@@ -87,10 +109,11 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, type: 3}
   - {fileID: 21300000, guid: c1d35f3153f12a14c9c8957a905b0b28, type: 3}
   - {fileID: 21300000, guid: ebc7d1b99efb72e4f9bd40e27de0fef6, type: 3}
+  - {fileID: 21300000, guid: e623b6de58d7e4120ba19a9517c021ef, type: 3}
   - {fileID: 21300000, guid: 1fac7f85b1398064bb2fe6291b431566, type: 3}
   - {fileID: 21300000, guid: 088f38efb568c544099a97e96b72139d, type: 3}
   - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3}
   - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3}
   - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3}
   - {fileID: 21300000, guid: cec071c1b8a4b41b6a7f2921e42f4bef, type: 3}
-  spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000f6901700450600004606000047060000330000005d060000cfee17005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe30dcedbe40dcedbe31d440be41d440be51d440be61d440be71d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e323c881e32
+  spriteNameList: 310000001f06000011061700200600002106000022060000cf68ca02230600002eddca02240600008d51cb028e51cb0225060000971c1700ecc5cb02260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517005080d80242060000aff4d80243060000358d17000e69d9020f69d90244060000f69017006dddd902450600004606000047060000330000005d060000cfee17005e0600005f06000060060000d197e60261060000300ce702620600008f80e7029080e70263060000550518003400000052aff402b123f5021098f5021198f50235000000d3c60203323b030391af030392af0303360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe30dcedbe40dcedbe31d440be41d440be51d440be61d440be71d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec0633009f078dbf37881e3238881e3239881e323a881e323b881e323c881e32

Assets/arts/atlas/icon/hero.spriteatlas

@@ -63,12 +63,19 @@ SpriteAtlas:
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 5c6bf200d40af1645928a69f5be74689, type: 3}
+  - {fileID: 21300000, guid: a05d601097baa49d0a61df64b81dae3a, type: 3}
+  - {fileID: 21300000, guid: 6def5a709fe3943ebb39de26980f2592, type: 3}
   - {fileID: 21300000, guid: 176147803f6170a4ea4b1386b7fff51b, type: 3}
   - {fileID: 21300000, guid: bd5b5da0992114943b34e1861598244f, type: 3}
   - {fileID: 21300000, guid: 638ce4d0c24ad074789d94172ec0aab7, type: 3}
   - {fileID: 21300000, guid: dab912016d15a474bba88f941dbe15ee, type: 3}
+  - {fileID: 21300000, guid: 8f715511a140940e481d2c3d17c1bbb6, type: 3}
   - {fileID: 21300000, guid: c1d35f3153f12a14c9c8957a905b0b28, type: 3}
+  - {fileID: 21300000, guid: eccd95a16a0f944f195fd25b5be833f1, type: 3}
+  - {fileID: 21300000, guid: 1a151ba1bbcf04600b3b08c06ddc5c1d, type: 3}
+  - {fileID: 21300000, guid: b54450c19dc35455d9518116520e2748, type: 3}
   - {fileID: 21300000, guid: cec071c1b8a4b41b6a7f2921e42f4bef, type: 3}
+  - {fileID: 21300000, guid: d6ee49e1d576443ec9218196619c988f, type: 3}
   - {fileID: 21300000, guid: 08b6d902b86c0b34e92ab673197fb767, type: 3}
   - {fileID: 21300000, guid: 23f3ef320d7dba64796bf0abd2ecdb31, type: 3}
   - {fileID: 21300000, guid: f8571a4249dafd640b7e19c06f959315, type: 3}
@@ -76,8 +83,12 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 643846a215ab336468ec5ce2377a6325, type: 3}
   - {fileID: 21300000, guid: dca94ed2aeae2d24eb4d4555da31abae, type: 3}
   - {fileID: 21300000, guid: ebf7e343b1d2b79428117236afdf64cc, type: 3}
+  - {fileID: 21300000, guid: 5314f7732404d4eef826135330a8b53b, type: 3}
   - {fileID: 21300000, guid: a774ca83e74364fb4a72b0716cf125d9, type: 3}
+  - {fileID: 21300000, guid: cbc024c36143042868db3c265d00dd76, type: 3}
   - {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, type: 3}
+  - {fileID: 21300000, guid: b97bccd318fcc4745a62dda168d27ea3, type: 3}
+  - {fileID: 21300000, guid: 49ad45e33a7cb44c68f2ec2f2890adfa, type: 3}
   - {fileID: 21300000, guid: 7d9c79f30dcdc8247aab76baf0c2c6ba, type: 3}
   - {fileID: 21300000, guid: de757454ab9e6564c8a1244f5ea154d3, type: 3}
   - {fileID: 21300000, guid: 4f00316482eef8e4d8854d8d03b64ea4, type: 3}
@@ -88,22 +99,30 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 397fbe85e4725d444a9be3c60ff79387, type: 3}
   - {fileID: 21300000, guid: 1fac7f85b1398064bb2fe6291b431566, type: 3}
   - {fileID: 21300000, guid: 062879952e89e4648bfd885bb931b006, type: 3}
+  - {fileID: 21300000, guid: 1dbac3b59ebf146d2967cbb72dc2823a, type: 3}
   - {fileID: 21300000, guid: 8f0d52f5b73b61f4da2d353433c9a3eb, type: 3}
   - {fileID: 21300000, guid: b6ceb1260cf406e4e867ccd7088eb8cf, type: 3}
   - {fileID: 21300000, guid: 5f59eb2671e1f8047bb5c912ab31a4e9, type: 3}
+  - {fileID: 21300000, guid: 1442e5460c4234d04aa54248c576740a, type: 3}
   - {fileID: 21300000, guid: 9c32e986881e23942acd3c2aabeaeac3, type: 3}
   - {fileID: 21300000, guid: 3b1274a6d891cb545864f2d9c72f8dc1, type: 3}
   - {fileID: 21300000, guid: 292c42b6b51485944a13a0d9e1a19a4e, type: 3}
   - {fileID: 21300000, guid: ea4d65d6d3df27d46b554d322c49fd49, type: 3}
+  - {fileID: 21300000, guid: 83856ce6deb5f4b69aed315e4807849c, type: 3}
   - {fileID: 21300000, guid: d86f0a17c7ac418449c13c7630c24a6e, type: 3}
+  - {fileID: 21300000, guid: c9c94a57639194a82af668801e8b0371, type: 3}
   - {fileID: 21300000, guid: f67782678a259484f9bbcc1fd47de7cb, type: 3}
+  - {fileID: 21300000, guid: c6702d87191014ec0975fb7ddfa10c7a, type: 3}
+  - {fileID: 21300000, guid: 8d3466a79de304d43ab76c69ce2dd8e3, type: 3}
   - {fileID: 21300000, guid: cd1cb2b7e4fbee04ca040a123b1c81b1, type: 3}
   - {fileID: 21300000, guid: 8c7b75b71d6b7fc47acf21aa7b21f722, type: 3}
   - {fileID: 21300000, guid: c042c1c7c85392e449166b4197c07526, type: 3}
   - {fileID: 21300000, guid: 89a047e7326d70042aacb397a171b4c4, type: 3}
   - {fileID: 21300000, guid: bbc8a50823d61b64f8895fcd28ca1412, type: 3}
+  - {fileID: 21300000, guid: 03e0b428880bb408f88829395cfacba2, type: 3}
   - {fileID: 21300000, guid: 34ee8d3898987554fa170f76b4f9a32a, type: 3}
   - {fileID: 21300000, guid: 4904464892cc82b40b7ecb8d19777c89, type: 3}
+  - {fileID: 21300000, guid: 22f313a87abde42ab89c7af4ad019fd8, type: 3}
   - {fileID: 21300000, guid: 5ae3b4c8d1b2dc944968d2a268712728, type: 3}
   - {fileID: 21300000, guid: cf6e69e8ba2ed564b97e33559a9fcfab, type: 3}
   - {fileID: 21300000, guid: f7bf9cf88b7604b7e8116e480079eb91, type: 3}
@@ -111,6 +130,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3}
   - {fileID: 21300000, guid: ebc7d1b99efb72e4f9bd40e27de0fef6, type: 3}
   - {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, type: 3}
+  - {fileID: 21300000, guid: 655531f939b1a457dab557f6369ed4fb, type: 3}
   - {fileID: 21300000, guid: fbde37f960901114dbeb2096d660defe, type: 3}
   - {fileID: 21300000, guid: ed2b401a38a042e40837b9fa4f259266, type: 3}
   - {fileID: 21300000, guid: 745401caea44d6a4695b3063fed8bc58, type: 3}
@@ -118,6 +138,8 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3}
   - {fileID: 21300000, guid: db9fdfeabbb947b4491573fd3066a695, type: 3}
   - {fileID: 21300000, guid: 25dfe02b2474b6b429a9405bfe8a4cbe, type: 3}
+  - {fileID: 21300000, guid: 04cc664b389b547a0bb4c6ab218cdf92, type: 3}
+  - {fileID: 21300000, guid: c105ed7bffabb41d68628f1db90599e3, type: 3}
   - {fileID: 21300000, guid: c0749e7b392e1e044b5a7c8cbe3d1d2e, type: 3}
   - {fileID: 21300000, guid: 6a30f59b929a4b94fa05fd1d15e0c027, type: 3}
   - {fileID: 21300000, guid: 712663eb7cac1b64a9f8a319a719b9b3, type: 3}
@@ -145,12 +167,19 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 088f38efb568c544099a97e96b72139d, type: 3}
   m_PackedSpriteNamesToIndex:
   - 20
+  - 45001
+  - 23001
   - 1
   - 28
   - 4
   - 24
+  - 35002
   - hero_s
+  - 35001
+  - 26001
+  - 43001
   - match_6
+  - 15002
   - frame_dec_3
   - 30_1
   - 30
@@ -158,8 +187,12 @@ SpriteAtlas:
   - 14
   - 7_1
   - 25
+  - 54001
   - frame_dec_5
+  - 55001
   - hero_fragment
+  - 25001
+  - 13001
   - 29
   - frame_dec_4
   - 21
@@ -170,22 +203,30 @@ SpriteAtlas:
   - 33
   - match_1
   - 25_1
+  - 53001
   - frame_gray_4
   - 26_1
   - frame_2
+  - 15001
   - 36
   - avatar_1
   - 17
   - hero_arrow
+  - 44001
   - 18_1
+  - 33001
   - 6
+  - 45002
+  - 14001
   - 19_1
   - 36_1
   - 22
   - 11
   - frame_4
+  - 16001
   - 15
   - 2
+  - 55002
   - 3
   - 12
   - frame_6
@@ -193,6 +234,7 @@ SpriteAtlas:
   - match_4
   - mask
   - frame_3
+  - 24001
   - frame_dec_2
   - frame_small_3
   - 35
@@ -200,6 +242,8 @@ SpriteAtlas:
   - match_5
   - frame_gray_2
   - 7
+  - 25002
+  - 34001
   - frame_gray_3
   - 10
   - 23_1

Assets/arts/atlas/icon/hero_2.asset

@@ -19,10 +19,15 @@ MonoBehaviour:
   - {fileID: 21300000, guid: b970f2264d5d3474e81fae12f614b364, type: 3}
   - {fileID: 21300000, guid: 8905f5e482ea373429968d1d855c0cd7, type: 3}
   - {fileID: 21300000, guid: f334f6219a645ed4b9eae4189fe8a9f3, type: 3}
+  - {fileID: 21300000, guid: 54f1016045f8a464e9c7863e806df2c6, type: 3}
   - {fileID: 21300000, guid: 65c8c6f4f823a3843abdc978b0882f78, type: 3}
+  - {fileID: 21300000, guid: 4683a5a020af249b8bcf9fa7ba103592, type: 3}
   - {fileID: 21300000, guid: 46e5b8d421d35b544af8eb86918b50a3, type: 3}
+  - {fileID: 21300000, guid: f614d471d74524f39b9102c725d5130f, type: 3}
+  - {fileID: 21300000, guid: f378d8137059c43948961621a8cd0756, type: 3}
   - {fileID: 21300000, guid: 1e8c87190f00b6d46b87056c7a808d0f, type: 3}
   - {fileID: 21300000, guid: 445054f27efbba34ab5723e99d64d5c3, type: 3}
+  - {fileID: 21300000, guid: 6944d1ce1f7b047e99b626700f50a9b5, type: 3}
   - {fileID: 21300000, guid: 43df2ce8e9328824497e47808b03488f, type: 3}
   - {fileID: 21300000, guid: ea6b0e04f03136c4c969a612379a192d, type: 3}
   - {fileID: 21300000, guid: a3822fea44ebbf64697628713365c523, type: 3}
@@ -37,11 +42,16 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 1017ce1418f44884081066c1094a629d, type: 3}
   - {fileID: 21300000, guid: bb7ae063543bf0b4d90dd6d8d2c782de, type: 3}
   - {fileID: 21300000, guid: 04d6e47bf59d2b24e925e6f6246b3ca0, type: 3}
+  - {fileID: 21300000, guid: ca8db752c1e5441c2b13def896e397ba, type: 3}
   - {fileID: 21300000, guid: 3640eb55b93fad042a9ea520f1364a7b, type: 3}
+  - {fileID: 21300000, guid: b6ac22cc9c3304e15aa79927d2f5f1d5, type: 3}
   - {fileID: 21300000, guid: 48de69353846dea4a81cda84ed28bc51, type: 3}
   - {fileID: 21300000, guid: 0acfcf388dce9b444bc19e0f50c863b6, type: 3}
+  - {fileID: 21300000, guid: e1ca3cfe637a34b0e882a993ce365b37, type: 3}
+  - {fileID: 21300000, guid: 0bf8439640b204f7d9a3ed013694625e, type: 3}
   - {fileID: 21300000, guid: 7130e790e9393b74aa40cd0f1de9b2d3, type: 3}
   - {fileID: 21300000, guid: 619813fa1c7474744a61647f8e13a624, type: 3}
+  - {fileID: 21300000, guid: c53f7c8921ff94203b036710d2dba8ea, type: 3}
   - {fileID: 21300000, guid: 8125b9ddf6e08c043903a9fdaf26f7b1, type: 3}
   - {fileID: 21300000, guid: ceff0e178a3b50442854f23f561e7fed, type: 3}
   - {fileID: 21300000, guid: 83972b43f120c634090ba4b8a5b5921e, type: 3}
@@ -51,15 +61,27 @@ MonoBehaviour:
   - {fileID: 21300000, guid: d743dca3726b5ca4ea81a16c41925b66, type: 3}
   - {fileID: 21300000, guid: 606933e1bb811af49a66a661c3253bd6, type: 3}
   - {fileID: 21300000, guid: 50d0ead82680c654f8bc7ead466f74ad, type: 3}
+  - {fileID: 21300000, guid: a02bcc886273142e2ace62154ad9ee00, type: 3}
   - {fileID: 21300000, guid: e98cb4fcad1a23943aa88d92be8013dc, type: 3}
+  - {fileID: 21300000, guid: f6b6895112c81468ebfe616c7bb09d21, type: 3}
   - {fileID: 21300000, guid: ac5f8162e8085e74588f2d1158f0a39d, type: 3}
+  - {fileID: 21300000, guid: a519d9fd54b7449ea9fd2515334bcb15, type: 3}
+  - {fileID: 21300000, guid: c63e78d58e96949a4b3f53d2e22b80cf, type: 3}
   - {fileID: 21300000, guid: 03284313471a64145b9be008341fa9ab, type: 3}
   - {fileID: 21300000, guid: 1f7382df684c14e4b8ca1124ad991127, type: 3}
   - {fileID: 21300000, guid: a497ac305caf93842baa092025bdd71e, type: 3}
+  - {fileID: 21300000, guid: 5967f43069cac49198622993f8dca539, type: 3}
+  - {fileID: 21300000, guid: ee0dbb783d2b740fda1805ace0185721, type: 3}
+  - {fileID: 21300000, guid: 014f1485d41af48fca974691e4727499, type: 3}
+  - {fileID: 21300000, guid: 56308a261305e44908e051305f7a379c, type: 3}
   - {fileID: 21300000, guid: 90c97800de3e8d5428aa7906c15b7ba8, type: 3}
+  - {fileID: 21300000, guid: df6a7f92ddaf847bb9272e42bb2469ba, type: 3}
+  - {fileID: 21300000, guid: 4d0db0061c227449ea2f66029a22125f, type: 3}
+  - {fileID: 21300000, guid: 25da8e0a05ccd40c099345ad2c8bcf30, type: 3}
+  - {fileID: 21300000, guid: 669ded25b1a5e4eb88278b8b307fc4ff, type: 3}
   - {fileID: 21300000, guid: ce90e6b69f2fdcf408e7e2a8c29530b5, type: 3}
   - {fileID: 21300000, guid: 45ce406af6ae6e248a58693b5d4fedb1, type: 3}
   - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3}
   - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3}
   - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3}
-  spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000f6901700450600004606000047060000330000005d060000cfee17005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000
+  spriteNameList: 310000001f06000011061700200600002106000022060000cf68ca02230600002eddca02240600008d51cb028e51cb0225060000971c1700ecc5cb02260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517005080d80242060000aff4d80243060000358d17000e69d9020f69d90244060000f69017006dddd902450600004606000047060000330000005d060000cfee17005e0600005f06000060060000d197e60261060000300ce702620600008f80e7029080e70263060000550518003400000052aff402b123f5021098f5021198f50235000000d3c60203323b030391af030392af0303360000003700000029da00003800000039000000

Assets/arts/atlas/icon/hero_2.spriteatlas

@@ -63,16 +63,24 @@ SpriteAtlas:
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
   - {fileID: 21300000, guid: 90c97800de3e8d5428aa7906c15b7ba8, type: 3}
+  - {fileID: 21300000, guid: 5967f43069cac49198622993f8dca539, type: 3}
   - {fileID: 21300000, guid: a497ac305caf93842baa092025bdd71e, type: 3}
+  - {fileID: 21300000, guid: 54f1016045f8a464e9c7863e806df2c6, type: 3}
   - {fileID: 21300000, guid: b0fa3f60d34974540a238b8f2b49bd4c, type: 3}
   - {fileID: 21300000, guid: 38670590eda286f43ae4f04b2ce191ce, type: 3}
   - {fileID: 21300000, guid: 7130e790e9393b74aa40cd0f1de9b2d3, type: 3}
+  - {fileID: 21300000, guid: 4683a5a020af249b8bcf9fa7ba103592, type: 3}
   - {fileID: 21300000, guid: f334f6219a645ed4b9eae4189fe8a9f3, type: 3}
+  - {fileID: 21300000, guid: f6b6895112c81468ebfe616c7bb09d21, type: 3}
+  - {fileID: 21300000, guid: f614d471d74524f39b9102c725d5130f, type: 3}
   - {fileID: 21300000, guid: 606933e1bb811af49a66a661c3253bd6, type: 3}
   - {fileID: 21300000, guid: c9f3c32207520e541a405ef85de653c9, type: 3}
+  - {fileID: 21300000, guid: ca8db752c1e5441c2b13def896e397ba, type: 3}
   - {fileID: 21300000, guid: ac5f8162e8085e74588f2d1158f0a39d, type: 3}
+  - {fileID: 21300000, guid: df6a7f92ddaf847bb9272e42bb2469ba, type: 3}
   - {fileID: 21300000, guid: 445054f27efbba34ab5723e99d64d5c3, type: 3}
   - {fileID: 21300000, guid: 03284313471a64145b9be008341fa9ab, type: 3}
+  - {fileID: 21300000, guid: f378d8137059c43948961621a8cd0756, type: 3}
   - {fileID: 21300000, guid: 83972b43f120c634090ba4b8a5b5921e, type: 3}
   - {fileID: 21300000, guid: bb7ae063543bf0b4d90dd6d8d2c782de, type: 3}
   - {fileID: 21300000, guid: d743dca3726b5ca4ea81a16c41925b66, type: 3}
@@ -84,20 +92,30 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 569a7ae4f0309ce46a688882510a606f, type: 3}
   - {fileID: 21300000, guid: 65c8c6f4f823a3843abdc978b0882f78, type: 3}
   - {fileID: 21300000, guid: 22fd2b05e943c2f458395973fa43eacd, type: 3}
+  - {fileID: 21300000, guid: 669ded25b1a5e4eb88278b8b307fc4ff, type: 3}
   - {fileID: 21300000, guid: 48de69353846dea4a81cda84ed28bc51, type: 3}
   - {fileID: 21300000, guid: 3640eb55b93fad042a9ea520f1364a7b, type: 3}
   - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3}
+  - {fileID: 21300000, guid: 014f1485d41af48fca974691e4727499, type: 3}
+  - {fileID: 21300000, guid: c63e78d58e96949a4b3f53d2e22b80cf, type: 3}
+  - {fileID: 21300000, guid: 4d0db0061c227449ea2f66029a22125f, type: 3}
   - {fileID: 21300000, guid: b970f2264d5d3474e81fae12f614b364, type: 3}
+  - {fileID: 21300000, guid: 56308a261305e44908e051305f7a379c, type: 3}
+  - {fileID: 21300000, guid: 0bf8439640b204f7d9a3ed013694625e, type: 3}
   - {fileID: 21300000, guid: ce90e6b69f2fdcf408e7e2a8c29530b5, type: 3}
   - {fileID: 21300000, guid: a24da717dbd3832428a87a849b1b47cc, type: 3}
   - {fileID: 21300000, guid: ceff0e178a3b50442854f23f561e7fed, type: 3}
   - {fileID: 21300000, guid: 0acfcf388dce9b444bc19e0f50c863b6, type: 3}
   - {fileID: 21300000, guid: 83831e4876c42b246b8aa584a6a4ea02, type: 3}
+  - {fileID: 21300000, guid: ee0dbb783d2b740fda1805ace0185721, type: 3}
   - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3}
+  - {fileID: 21300000, guid: a02bcc886273142e2ace62154ad9ee00, type: 3}
   - {fileID: 21300000, guid: 50d0ead82680c654f8bc7ead466f74ad, type: 3}
   - {fileID: 21300000, guid: 9fde6fd89f5f157489577ca993023671, type: 3}
   - {fileID: 21300000, guid: 43df2ce8e9328824497e47808b03488f, type: 3}
   - {fileID: 21300000, guid: 1e8c87190f00b6d46b87056c7a808d0f, type: 3}
+  - {fileID: 21300000, guid: c53f7c8921ff94203b036710d2dba8ea, type: 3}
+  - {fileID: 21300000, guid: 25da8e0a05ccd40c099345ad2c8bcf30, type: 3}
   - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3}
   - {fileID: 21300000, guid: cdb1b44ac61889b41826aba17bfb5dc3, type: 3}
   - {fileID: 21300000, guid: 45ce406af6ae6e248a58693b5d4fedb1, type: 3}
@@ -105,24 +123,36 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 619813fa1c7474744a61647f8e13a624, type: 3}
   - {fileID: 21300000, guid: 5123256b8feda2145a9350bee87ad74f, type: 3}
   - {fileID: 21300000, guid: 04d6e47bf59d2b24e925e6f6246b3ca0, type: 3}
+  - {fileID: 21300000, guid: b6ac22cc9c3304e15aa79927d2f5f1d5, type: 3}
   - {fileID: 21300000, guid: e98cb4fcad1a23943aa88d92be8013dc, type: 3}
   - {fileID: 21300000, guid: a13c781de5ebc714a9277a90e4e0f987, type: 3}
   - {fileID: 21300000, guid: 555e90cd88de4b845a24bcdd997adc25, type: 3}
   - {fileID: 21300000, guid: 8125b9ddf6e08c043903a9fdaf26f7b1, type: 3}
+  - {fileID: 21300000, guid: a519d9fd54b7449ea9fd2515334bcb15, type: 3}
+  - {fileID: 21300000, guid: 6944d1ce1f7b047e99b626700f50a9b5, type: 3}
+  - {fileID: 21300000, guid: e1ca3cfe637a34b0e882a993ce365b37, type: 3}
   - {fileID: 21300000, guid: d2d69a1f962acb741b008d1289374b9a, type: 3}
   - {fileID: 21300000, guid: 1f7382df684c14e4b8ca1124ad991127, type: 3}
   m_PackedSpriteNamesToIndex:
   - 5
+  - 43001
   - 4
+  - 13001
   - 18_1
   - 18_2
   - 26
+  - 14001
   - 13
+  - 34001
+  - 15001
   - 32
   - 21
+  - 23001
   - 35
+  - 53001
   - 16_1
   - 36
+  - 15002
   - 29
   - 23
   - 31
@@ -134,20 +164,30 @@ SpriteAtlas:
   - 20
   - 14
   - 10_1
+  - 55002
   - 25
   - 24
   - 7_1
+  - 45001
+  - 35002
+  - 54001
   - 11
+  - 45002
+  - 25002
   - 6
   - 30_1
   - 28
   - 25_1
   - 3
+  - 44001
   - 8
+  - 33001
   - 33
   - 20_1
   - 17
   - 16
+  - 26001
+  - 55001
   - 9
   - 2
   - 7
@@ -155,10 +195,14 @@ SpriteAtlas:
   - 26_1
   - 19
   - 23_1
+  - 24001
   - 34
   - 30
   - 10
   - 27
+  - 35001
+  - 16001
+  - 25001
   - 1
   - 36_1
   m_RenderDataMap: {}

Assets/arts/atlas/icon/hero_summon.asset

@@ -14,6 +14,28 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   spriteList:
   - {fileID: 21300000, guid: 1865a7a5d62314a40a9426e87e31b2e4, type: 3}
+  - {fileID: 21300000, guid: db1d1c6844a1e45b18ee0c212a17565e, type: 3}
+  - {fileID: 21300000, guid: 9c9619471ad5b4f7186e2b6da48f355b, type: 3}
+  - {fileID: 21300000, guid: a5504051630044ab29221f80439c2555, type: 3}
+  - {fileID: 21300000, guid: 81bf4cb68f0d64f3b858e5ffe29af2e4, type: 3}
+  - {fileID: 21300000, guid: d20d912b262f342038a952277563cf42, type: 3}
+  - {fileID: 21300000, guid: f8af55228ed3e4ede969162ee35cbe0c, type: 3}
+  - {fileID: 21300000, guid: b5c430dc33dad4a13820713d16700c0a, type: 3}
+  - {fileID: 21300000, guid: 7b5460c9840394593984776a1f3aff9e, type: 3}
+  - {fileID: 21300000, guid: d7dc22ec3c7964b6c88a2ea772ab6764, type: 3}
+  - {fileID: 21300000, guid: 5156a736341b94abdbdd31c55a5c6979, type: 3}
+  - {fileID: 21300000, guid: bd55870ee8afc4b008a4be5eeef16eb3, type: 3}
+  - {fileID: 21300000, guid: 2f13a0437c78f4013ae40a344963332d, type: 3}
+  - {fileID: 21300000, guid: ee1e0f20b92e04bc0a6b5002fd7792b9, type: 3}
+  - {fileID: 21300000, guid: 561f92d2d085d46b7be884f582119e94, type: 3}
+  - {fileID: 21300000, guid: 78a71c46e103a4b2ab732082083d6b75, type: 3}
+  - {fileID: 21300000, guid: 6ac1ff0e54bf742a4a07f4100d91ad8c, type: 3}
+  - {fileID: 21300000, guid: 17d15ee65da5347448ef8d4c8567a84e, type: 3}
+  - {fileID: 21300000, guid: 9948d52ca0e6e45fb81da92e0376efcc, type: 3}
+  - {fileID: 21300000, guid: b0f4ac99ae4f44d499363c19f0acf021, type: 3}
+  - {fileID: 21300000, guid: 2dcf4a039df894dffaefdde316417adb, type: 3}
+  - {fileID: 21300000, guid: cc2e268c367bd40978bcf66158967361, type: 3}
+  - {fileID: 21300000, guid: 793911ac8152c42719dbcf9a114ff30d, type: 3}
   - {fileID: 21300000, guid: 23e547e1a85524241a65e62133e890e2, type: 3}
   - {fileID: 21300000, guid: d29c01e3fa86b4b11a8b0b27242d52e3, type: 3}
   - {fileID: 21300000, guid: a413c95bffd3b473a976716c40f3105a, type: 3}
@@ -25,4 +47,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 696a69094cbd149db8de36132c9e61ee, type: 3}
   - {fileID: 21300000, guid: 52e93a0a7eb2d40e280782aba32345e5, type: 3}
   - {fileID: 21300000, guid: cbf4d3d19584f463799132baaccd4b1b, type: 3}
-  spriteNameList: 31000000e12f0b4ee22f0b4ee32f0b4ee42f0b4ee52f0b4ef1d8c6def2d8c6def3d8c6def4d8c6def5d8c6deab312b59
+  spriteNameList: 31000000cf68ca022eddca028d51cb028e51cb02ecc5cb025080d802aff4d8020e69d9020f69d9026dddd902d197e602300ce7028f80e7029080e70252aff402b123f5021098f5021198f502d3c60203323b030391af030392af0303e12f0b4ee22f0b4ee32f0b4ee42f0b4ee52f0b4ef1d8c6def2d8c6def3d8c6def4d8c6def5d8c6deab312b59

Assets/arts/atlas/icon/hero_summon.spriteatlas

@@ -62,30 +62,74 @@ SpriteAtlas:
     cachedData: {fileID: 0}
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
+  - {fileID: 21300000, guid: ee1e0f20b92e04bc0a6b5002fd7792b9, type: 3}
+  - {fileID: 21300000, guid: a5504051630044ab29221f80439c2555, type: 3}
   - {fileID: 21300000, guid: cbf4d3d19584f463799132baaccd4b1b, type: 3}
   - {fileID: 21300000, guid: 23e547e1a85524241a65e62133e890e2, type: 3}
   - {fileID: 21300000, guid: bd8b800261cea42d9917b3a3bb2c94b2, type: 3}
+  - {fileID: 21300000, guid: f8af55228ed3e4ede969162ee35cbe0c, type: 3}
+  - {fileID: 21300000, guid: 561f92d2d085d46b7be884f582119e94, type: 3}
+  - {fileID: 21300000, guid: 2dcf4a039df894dffaefdde316417adb, type: 3}
+  - {fileID: 21300000, guid: 2f13a0437c78f4013ae40a344963332d, type: 3}
   - {fileID: 21300000, guid: d29c01e3fa86b4b11a8b0b27242d52e3, type: 3}
   - {fileID: 21300000, guid: 83100265fcf8e4c4e8183aa9fb339139, type: 3}
   - {fileID: 21300000, guid: 1865a7a5d62314a40a9426e87e31b2e4, type: 3}
+  - {fileID: 21300000, guid: 5156a736341b94abdbdd31c55a5c6979, type: 3}
+  - {fileID: 21300000, guid: 78a71c46e103a4b2ab732082083d6b75, type: 3}
+  - {fileID: 21300000, guid: 81bf4cb68f0d64f3b858e5ffe29af2e4, type: 3}
+  - {fileID: 21300000, guid: 17d15ee65da5347448ef8d4c8567a84e, type: 3}
+  - {fileID: 21300000, guid: 9c9619471ad5b4f7186e2b6da48f355b, type: 3}
   - {fileID: 21300000, guid: 746c90772f0c24f1dac4b76fd249cb45, type: 3}
+  - {fileID: 21300000, guid: db1d1c6844a1e45b18ee0c212a17565e, type: 3}
   - {fileID: 21300000, guid: 696a69094cbd149db8de36132c9e61ee, type: 3}
+  - {fileID: 21300000, guid: b0f4ac99ae4f44d499363c19f0acf021, type: 3}
+  - {fileID: 21300000, guid: 7b5460c9840394593984776a1f3aff9e, type: 3}
   - {fileID: 21300000, guid: 52e93a0a7eb2d40e280782aba32345e5, type: 3}
+  - {fileID: 21300000, guid: d20d912b262f342038a952277563cf42, type: 3}
   - {fileID: 21300000, guid: a413c95bffd3b473a976716c40f3105a, type: 3}
+  - {fileID: 21300000, guid: 9948d52ca0e6e45fb81da92e0376efcc, type: 3}
   - {fileID: 21300000, guid: 72eceb7cc01e34bec97689ffe9a89bd1, type: 3}
+  - {fileID: 21300000, guid: cc2e268c367bd40978bcf66158967361, type: 3}
+  - {fileID: 21300000, guid: 793911ac8152c42719dbcf9a114ff30d, type: 3}
+  - {fileID: 21300000, guid: b5c430dc33dad4a13820713d16700c0a, type: 3}
+  - {fileID: 21300000, guid: d7dc22ec3c7964b6c88a2ea772ab6764, type: 3}
+  - {fileID: 21300000, guid: bd55870ee8afc4b008a4be5eeef16eb3, type: 3}
+  - {fileID: 21300000, guid: 6ac1ff0e54bf742a4a07f4100d91ad8c, type: 3}
   - {fileID: 21300000, guid: d244108fb093548eeaaaa36f9d2f3b69, type: 3}
   m_PackedSpriteNamesToIndex:
+  - 35001
+  - 15001
   - summon_selected_1
   - summon_card_2
   - summon_card_mark_2
+  - 23001
+  - 35002
+  - 54001
+  - 34001
   - summon_card_3
   - summon_card_mark_3
   - 1
+  - 26001
+  - 43001
+  - 15002
+  - 45001
+  - 14001
   - summon_card_5
+  - 13001
   - summon_card_mark_5
+  - 53001
+  - 25001
   - summon_card_mark_6
+  - 16001
   - summon_card_4
+  - 45002
   - summon_card_mark_4
+  - 55001
+  - 55002
+  - 24001
+  - 25002
+  - 33001
+  - 44001
   - summon_card_6
   m_RenderDataMap: {}
   m_Tag: hero_summon

Assets/arts/atlas/icon/skill_boss.asset

@@ -0,0 +1,18 @@
+%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: 3a48bfa163a714a6d8469f9c542e223f, type: 3}
+  m_Name: skill_boss
+  m_EditorClassIdentifier: 
+  spriteList:
+  - {fileID: 21300000, guid: ad983d53f317f418eb2aa9999d3272ec, type: 3}
+  - {fileID: 21300000, guid: e15a60296ccf247b59bd911971c1285c, type: 3}
+  spriteNameList: 3100000032000000

Assets/arts/atlas/icon/skill_boss.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c99806828e2f03a4ba15821e5ab32eda
+guid: 7931150306fd44571aedc00a27c383ae
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/arts/atlas/icon/skill_boss.spriteatlas

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: skill_boss
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 0
+      compressionQuality: 0
+      maxTextureSize: 0
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 3
+      m_BuildTarget: Android
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 47
+      m_TextureCompression: 1
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 3
+      m_BuildTarget: iPhone
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 4
+      blockOffset: 0
+      allowAlphaSplitting: 0
+      enableRotation: 0
+      enableTightPacking: 0
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 102900000, guid: 9a76336e772294235b57456e18a7b531, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: ad983d53f317f418eb2aa9999d3272ec, type: 3}
+  - {fileID: 21300000, guid: e15a60296ccf247b59bd911971c1285c, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - 1
+  - 2
+  m_RenderDataMap: {}
+  m_Tag: skill_boss
+  m_IsVariant: 0

Assets/arts/atlas/icon/skill_boss.spriteatlas.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 144c0e256778e425f901612a9788fa4f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/arts/atlas/ui/battle.asset

@@ -22,6 +22,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 3420c1c78b5e240279b8ac4d097bccb5, type: 3}
   - {fileID: 21300000, guid: ff3920a27572b4e3d9b010273d99b859, type: 3}
   - {fileID: 21300000, guid: ad9edd77aac3648dab5eed7882235cb6, type: 3}
+  - {fileID: 21300000, guid: d333f998f12224caca70984f91e8e772, type: 3}
+  - {fileID: 21300000, guid: f84ffb5354dfd484aa016bd3077eabe1, type: 3}
   - {fileID: 21300000, guid: b4eb3a5ebff984c49ab18ba4a98799a5, type: 3}
   - {fileID: 21300000, guid: 36e2163b4404615408f9bb0bead26217, type: 3}
   - {fileID: 21300000, guid: 485c7b1fdae2748c8b89a806308350e2, type: 3}
@@ -44,6 +46,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 1f31323cbf345ae4cad8365553dafceb, type: 3}
   - {fileID: 21300000, guid: a4c621d9c5549134f9274c9f82ef2a01, type: 3}
   - {fileID: 21300000, guid: c2461f38eb50425419e412a32e1b2a64, type: 3}
+  - {fileID: 21300000, guid: 0bec767f9e1c74ebb96272639b9262bf, type: 3}
   - {fileID: 21300000, guid: f866c72d7ff31d84580d50b5b6cbb679, type: 3}
   - {fileID: 21300000, guid: ce312be249c677b43baef5d81513702c, type: 3}
   - {fileID: 21300000, guid: 506aeeb5cde260f42bd6d052bedea05a, type: 3}
@@ -185,4 +188,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3}
   - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3}
   - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3}
-  spriteNameList: 49a2b2e673ef7596be18769666b70a59de354ed312867896138678961486789615867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed3e5354ed3e6354ed37d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a01d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e696fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab9afa36db9bfa36db9cfa36db0196263e029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f90c7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c978c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6
+  spriteNameList: 49a2b2e673ef7596be18769666b70a59de354ed3128678961386789614867896158678961686789617867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed3e5354ed3e6354ed37d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e696fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab9afa36db9bfa36db9cfa36db0196263e029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f90c7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c978c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6

Assets/arts/atlas/ui/battle.spriteatlas

@@ -102,6 +102,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 992fea33b6dcd49eea68c4f018767315, type: 3}
   - {fileID: 21300000, guid: c5b2f243e6af18240b8f02297d60a98e, type: 3}
   - {fileID: 21300000, guid: de67ff43cf9c86c46be7127c2fb7cc84, type: 3}
+  - {fileID: 21300000, guid: f84ffb5354dfd484aa016bd3077eabe1, type: 3}
   - {fileID: 21300000, guid: afcf9e53b76eef44dba33da9caa87fc3, type: 3}
   - {fileID: 21300000, guid: beaaa8e349966d64292667db5f7b8c3a, type: 3}
   - {fileID: 21300000, guid: cf73870457f688f4ca0a68c8941d6ee3, type: 3}
@@ -149,6 +150,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: c2461f38eb50425419e412a32e1b2a64, type: 3}
   - {fileID: 21300000, guid: ceca9d48e25fcf640972cd6af9583693, type: 3}
   - {fileID: 21300000, guid: e7ffcd78718fb5144b3163b648107d1a, type: 3}
+  - {fileID: 21300000, guid: d333f998f12224caca70984f91e8e772, type: 3}
   - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3}
   - {fileID: 21300000, guid: 35091cc8f6c161543a1a0e29b05e2cf9, type: 3}
   - {fileID: 21300000, guid: 060ef8d8facbf4749a96f1caa7ef588f, type: 3}
@@ -226,6 +228,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 608df94fc480746cd8504c97a9431730, type: 3}
   - {fileID: 21300000, guid: 6220406f89e60aa4e9f08a64fc5db514, type: 3}
   - {fileID: 21300000, guid: a1c0506fd7243474bbb74aac6d127d35, type: 3}
+  - {fileID: 21300000, guid: 0bec767f9e1c74ebb96272639b9262bf, type: 3}
   - {fileID: 21300000, guid: 37d5c87f4216bfa43acb52a09dcf3a24, type: 3}
   - {fileID: 21300000, guid: 84a8e79f7596403459578a2297a00864, type: 3}
   - {fileID: 21300000, guid: e8a869bf5b5b1a2469b54cc718b6642e, type: 3}
@@ -275,6 +278,7 @@ SpriteAtlas:
   - battle_bg_lv
   - battle_obstacle_rocket_up
   - battle_star_2
+  - battle_bg_15
   - battle_pig
   - battle_hinder_33
   - battle_obstacle_leaf
@@ -322,6 +326,7 @@ SpriteAtlas:
   - battle_circle
   - battle_hinder_11
   - battle_obstacle_stick_3
+  - battle_bg_14
   - red_1
   - battle_bg_5
   - battle_bg_8
@@ -399,6 +404,7 @@ SpriteAtlas:
   - battle_bg_9
   - battle_obstacle_chest_2
   - battle_bar_1
+  - battle_combo
   - battle_hinder_19
   - battle_hinder_6
   - battle_skill_bg_1

Assets/arts/atlas/ui/common.asset

@@ -52,6 +52,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: f9043e169e5a34f9ab31a2ec7acbaf7f, type: 3}
   - {fileID: 21300000, guid: 864645145b73d4ab8a2444427acabf23, type: 3}
   - {fileID: 21300000, guid: 4adc98f87356148c59cef776847f9914, type: 3}
+  - {fileID: 21300000, guid: 769955952967445c4880e9db82df6b7d, type: 3}
   - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3}
   - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3}
   - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3}
@@ -198,6 +199,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 87e1b70e6b948a948b9342e7e131f80a, type: 3}
   - {fileID: 21300000, guid: ce3ecf0e5cac5d4489328b0b8e3b5123, type: 3}
   - {fileID: 21300000, guid: ef885e1efc66548f9955be4765ea37ab, type: 3}
+  - {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3}
   - {fileID: 21300000, guid: 8e9bdc8dcc160214b9f52e70bdfc7f23, type: 3}
   - {fileID: 21300000, guid: 11008148ed114a64bbaf5c838c7a122b, type: 3}
   - {fileID: 21300000, guid: 3758089ee0e9980469310bc78ea54659, type: 3}
@@ -206,6 +208,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 792ef1532be4a470aaf22dff9cde4e68, type: 3}
   - {fileID: 21300000, guid: f207b6a8a2b9544ba8cf83c4142496e3, type: 3}
   - {fileID: 21300000, guid: e8535639b62372944b836a75493ac3ae, type: 3}
+  - {fileID: 21300000, guid: aa11e23efd1274a919562b62bba4218a, type: 3}
   - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3}
   - {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3}
   - {fileID: 21300000, guid: b7ef85b6c0ed64dc5b499de328e705ed, type: 3}
@@ -286,4 +289,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
   - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
   - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
-  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e6922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158
+  spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

Assets/arts/atlas/ui/common.spriteatlas

@@ -313,6 +313,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 87e1b70e6b948a948b9342e7e131f80a, type: 3}
   - {fileID: 21300000, guid: ce3ecf0e5cac5d4489328b0b8e3b5123, type: 3}
   - {fileID: 21300000, guid: ef885e1efc66548f9955be4765ea37ab, type: 3}
+  - {fileID: 21300000, guid: aa11e23efd1274a919562b62bba4218a, type: 3}
   - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3}
   - {fileID: 21300000, guid: d19a454e30a654347bc427e316fa1cbf, type: 3}
   - {fileID: 21300000, guid: 2bf6cb4eb06aaee409099e3faaab97de, type: 3}
@@ -589,6 +590,7 @@ SpriteAtlas:
   - common_dec_8
   - common_dec_9
   - common_dec_power
+  - common_icon_tool
   - common_dec_4
   - common_title_7
   - common_dec_22

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

@@ -1,64 +1,63 @@
-arena_match_ui.png
+ui_arena_match.png
 size:2048,2048
 filter:Linear,Linear
 scale:1.7
 Simpl Cartoon Flash FX Elements Pack 20 Color_00000
-bounds:220,429,510,139
+bounds:1536,1096,510,139
 offsets:0,68,510,287
-rotate:90
 Simpl Cartoon Flash FX Elements Pack 20 Color_00001
-bounds:361,521,510,139
+bounds:1536,955,510,139
 offsets:0,68,510,287
-rotate:90
 Simpl Cartoon Flash FX Elements Pack 20 Color_00002
-bounds:1884,1533,510,158
+bounds:1024,1077,510,158
 offsets:0,56,510,287
-rotate:90
 Simpl Cartoon Flash FX Elements Pack 20 Color_00003
-bounds:860,1440,510,192
+bounds:1536,1237,510,192
 offsets:0,21,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00007
-bounds:786,1064,510,185
+bounds:2,194,510,185
 offsets:0,33,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00008
-bounds:2,429,510,216
+bounds:2,570,510,216
 offsets:0,22,510,287
-rotate:90
 Simpl Cartoon Flash FX Elements Pack 20 Color_00009
-bounds:274,1239,510,216
+bounds:1024,1830,510,216
 offsets:0,22,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00010
-bounds:1372,1452,510,187
+bounds:1024,1237,510,187
 offsets:0,56,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00011
-bounds:786,1251,510,187
+bounds:2,381,510,187
 offsets:0,56,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00012
-bounds:274,1033,510,204
+bounds:1536,1634,510,204
 offsets:0,48,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00013
-bounds:860,1837,510,206
+bounds:1536,1840,510,206
 offsets:0,42,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00014
-bounds:1372,1641,510,199
+bounds:1024,1426,510,199
 offsets:0,44,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00015
-bounds:860,1634,510,201
+bounds:1024,1627,510,201
 offsets:0,49,510,287
 Simpl Cartoon Flash FX Elements Pack 20 Color_00016
-bounds:1372,1842,510,201
+bounds:1536,1431,510,201
 offsets:0,49,510,287
-g2
-bounds:274,1457,584,586
-offsets:50,44,680,680
 g3
-bounds:2,2,425,271
+bounds:514,515,425,271
 offsets:5,84,435,435
-rotate:90
+gd-hbimg-05
+bounds:2,1060,1020,986
+offsets:163,122,1224,1224
 gg2
-bounds:2,941,270,1102
+bounds:2,788,270,1102
 offsets:143,294,547,1700
+rotate:90
 s
-bounds:502,548,158,221
+bounds:941,567,158,219
 v
-bounds:502,771,173,260
+bounds:514,255,172,258
+xx
+bounds:2,12,184,180
+offsets:5,10,199,199

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03f29b083ae631f4f9e5fc4ceb91cdf0
+guid: 63dcb96a3c3560f4ea5039d9d62343f6
 TextScriptImporter:
   externalObjects: {}
   userData: 

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2fb06227c5f734577a2bb75760580292
+guid: 18f07ea93081e22419ee82d32408dd4a
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -90,17 +90,17 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Server
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
     textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -114,17 +114,17 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 50
     textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a7e557fcbe72e34a9d494fc4f85a388
+guid: 9610bd88f4fd499478aad29fa3e24800
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset

@@ -10,10 +10,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: arena_match_ui_atlas
+  m_Name: ui_arena_match_atlas
   m_EditorClassIdentifier: 
   textureLoadingMode: 0
   onDemandTextureLoader: {fileID: 0}
-  atlasFile: {fileID: 4900000, guid: 0a7e557fcbe72e34a9d494fc4f85a388, type: 3}
+  atlasFile: {fileID: 4900000, guid: 63dcb96a3c3560f4ea5039d9d62343f6, type: 3}
   materials:
-  - {fileID: 2100000, guid: d73755b6d7ee35a4cb5eac6d6febd8c7, type: 2}
+  - {fileID: 2100000, guid: ed245144e5b03174894bd81f6a291d99, type: 2}

Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 231dfd11388d645128fffa1520358927
+guid: 953bb593ec85c674eb77251d01d7cf0e
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: arena_match_ui_material
+  m_Name: ui_arena_match_material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ValidKeywords:
   - _STRAIGHT_ALPHA_INPUT
@@ -23,7 +23,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 206eb88d891bc2c43b300ce5c1394f5a, type: 3}
+        m_Texture: {fileID: 2800000, guid: 18f07ea93081e22419ee82d32408dd4a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []

Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cdc0d0003273d42ea91db493b70f6c9e
+guid: ed245144e5b03174894bd81f6a291d99
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: arena_match_ui_skeletondata
+  m_Name: ui_arena_match_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: f601531d04e523b46bf20201fc0534f9, type: 2}
+  - {fileID: 11400000, guid: 953bb593ec85c674eb77251d01d7cf0e, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: 03f29b083ae631f4f9e5fc4ceb91cdf0, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 9610bd88f4fd499478aad29fa3e24800, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0

Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f601531d04e523b46bf20201fc0534f9
+guid: ad7ca7f318f2e5a42af8c4f28c988e44
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

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

@@ -2,17 +2,17 @@ ui_daily_challenge_buff.png
 size:1024,1024
 filter:Linear,Linear
 1
-bounds:600,467,129,290
-offsets:0,0,130,291
+bounds:1,175,244,357
+offsets:2,4,248,364
 2
-bounds:1,175,305,174
+bounds:456,794,339,193
 3
-bounds:600,759,305,174
-guang
-bounds:1,351,597,582
-offsets:26,31,658,658
-hong
-bounds:1,1,305,172
-lan
-bounds:308,44,305,172
+bounds:247,193,339,193
 rotate:90
+guang
+bounds:1,534,453,453
+offsets:31,21,505,505
+hong
+bounds:456,620,305,172
+lan
+bounds:1,1,305,172

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

@@ -0,0 +1,34 @@
+ui_main_btn_challenge.png
+size:256,256
+filter:Linear,Linear
+fang1
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang2
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang3
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang4
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang5
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang7
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang8
+bounds:98,196,6,6
+offsets:1,1,8,8
+fang6
+bounds:2,2,6,6
+offsets:1,1,8,8
+spine
+bounds:2,107,94,95
+offsets:1,1,96,97
+tiao
+bounds:98,188,5,6
+zhihui
+bounds:2,10,94,95

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bdfc8a7503b9c4c1ca8fc6518399de5d
+guid: 18f469229294556429dab4b696c88262
 TextScriptImporter:
   externalObjects: {}
   userData: 

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a4c64dcc52d544c2b8d010e7c0f6cb83
+guid: 2830f02eb602d7044be43a627b958946
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -90,17 +90,17 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Server
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
     textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -114,17 +114,17 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 50
     textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 825250f6ebb5d41a3be151f9f36f0a4f
+guid: ce2988b6f7d7ab2419bc9bc9e4619c99
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_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_main_btn_challenge_atlas
+  m_EditorClassIdentifier: 
+  textureLoadingMode: 0
+  onDemandTextureLoader: {fileID: 0}
+  atlasFile: {fileID: 4900000, guid: 18f469229294556429dab4b696c88262, type: 3}
+  materials:
+  - {fileID: 2100000, guid: 9ce38fbe6a4d6274abf5f6dbda379e10, type: 2}

Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 777f208010d4f4bd49ec1cf6335978db
+guid: da99de1dbab9f7a48a597d39660d94e7
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_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_main_btn_challenge_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: 2830f02eb602d7044be43a627b958946, 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_main_btn_challenge/ui_main_btn_challenge_material.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 196447820400a4e7db058835c53a6712
+guid: 9ce38fbe6a4d6274abf5f6dbda379e10
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: ui_mainbtn_challenge_skeletondata
+  m_Name: ui_main_btn_challenge_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: 231dfd11388d645128fffa1520358927, type: 2}
+  - {fileID: 11400000, guid: da99de1dbab9f7a48a597d39660d94e7, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: 825250f6ebb5d41a3be151f9f36f0a4f, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: ce2988b6f7d7ab2419bc9bc9e4619c99, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0
@@ -27,5 +27,5 @@ MonoBehaviour:
   fromAnimation: []
   toAnimation: []
   duration: []
-  defaultMix: 0.2
+  defaultMix: 0
   controller: {fileID: 0}

Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset.meta

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

Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt

@@ -1,7 +0,0 @@
-ui_mainbtn_challenge.png
-size:256,256
-filter:Linear,Linear
-yuan
-bounds:2,106,119,102
-zhihui
-bounds:2,2,119,102

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

@@ -0,0 +1,23 @@
+ui_main_btn_company.png
+size:256,256
+filter:Linear,Linear
+jz_1
+bounds:103,189,56,49
+offsets:1,1,58,51
+jz_2
+bounds:103,155,24,32
+offsets:1,1,26,34
+jz_3
+bounds:2,2,16,10
+offsets:1,1,18,12
+jz_4
+bounds:161,203,9,35
+offsets:1,1,11,37
+jz_5
+bounds:2,48,92,89
+offsets:1,1,94,91
+jz_6
+bounds:2,14,59,32
+offsets:1,1,61,34
+zhihui
+bounds:2,139,99,99

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

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

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 206eb88d891bc2c43b300ce5c1394f5a
+guid: 2bb83d63981c7f543863bed998c6b152
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

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

Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset

@@ -10,10 +10,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: ui_mainbtn_challenge_atlas
+  m_Name: ui_main_btn_company_atlas
   m_EditorClassIdentifier: 
   textureLoadingMode: 0
   onDemandTextureLoader: {fileID: 0}
-  atlasFile: {fileID: 4900000, guid: bdfc8a7503b9c4c1ca8fc6518399de5d, type: 3}
+  atlasFile: {fileID: 4900000, guid: 269206b062939284a9a0734a9eecae1e, type: 3}
   materials:
-  - {fileID: 2100000, guid: cdc0d0003273d42ea91db493b70f6c9e, type: 2}
+  - {fileID: 2100000, guid: 0f68eabf845f2ff4283d2c5e4b35e646, type: 2}

Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset.meta

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

Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat

@@ -7,9 +7,10 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: ui_mainbtn_challenge_material
+  m_Name: ui_main_btn_company_material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 4
@@ -22,7 +23,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 2fb06227c5f734577a2bb75760580292, type: 3}
+        m_Texture: {fileID: 2800000, guid: 2bb83d63981c7f543863bed998c6b152, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -36,7 +37,7 @@ Material:
     - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilRef: 1
-    - _StraightAlphaInput: 0
+    - _StraightAlphaInput: 1
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
     - _UseScreenSpaceOutlineWidth: 0

Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d73755b6d7ee35a4cb5eac6d6febd8c7
+guid: 0f68eabf845f2ff4283d2c5e4b35e646
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_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_main_btn_company_skeletondata
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: 273a07371a78f244d8bb081e932c9cc6, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: 8cdfa98732e62fd45be4aed091cd2f98, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 0
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0
+  controller: {fileID: 0}

Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset.meta

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

Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt

@@ -1,7 +0,0 @@
-ui_mainbtn_company.png
-size:256,256
-filter:Linear,Linear
-yuan
-bounds:2,117,107,113
-zhihui
-bounds:2,2,107,113

Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt.meta

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

Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes.meta

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

Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset.meta

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

Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset.meta

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

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

@@ -2,8 +2,8 @@ ui_main_btn_fight.png
 size:256,256
 filter:Linear,Linear
 jian_1
-bounds:2,13,109,110
+bounds:2,21,102,96
 jian_2
-bounds:127,125,108,110
+bounds:113,119,102,96
 zhihui
-bounds:2,125,123,110
+bounds:2,119,109,96

Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight_skeletondata.asset

@@ -27,5 +27,5 @@ MonoBehaviour:
   fromAnimation: []
   toAnimation: []
   duration: []
-  defaultMix: 0.2
+  defaultMix: 0
   controller: {fileID: 0}

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

@@ -1,7 +1,20 @@
 ui_main_btn_force.png
 size:256,256
 filter:Linear,Linear
-toukui
-bounds:2,115,95,111
+boli
+bounds:184,207,57,45
+offsets:1,1,59,47
+ding
+bounds:97,183,85,69
+offsets:1,1,87,71
+gg
+bounds:2,2,74,75
+offsets:1,1,76,77
+spine
+bounds:2,79,92,74
+offsets:1,1,94,76
 zhihui
-bounds:2,2,95,111
+bounds:2,155,93,97
+ziti1
+bounds:97,168,41,13
+offsets:1,1,43,15

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

@@ -90,17 +90,17 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Server
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
     textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -114,17 +114,17 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 50
     textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_material.mat

@@ -9,7 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: ui_main_btn_force_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

Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_skeletondata.asset

@@ -27,5 +27,5 @@ MonoBehaviour:
   fromAnimation: []
   toAnimation: []
   duration: []
-  defaultMix: 0.2
+  defaultMix: 0
   controller: {fileID: 0}

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

@@ -1,9 +1,20 @@
 ui_main_btn_shop.png
 size:256,256
 filter:Linear,Linear
-shangsheng_1
-bounds:98,158,94,46
-shangsheng_2
-bounds:2,2,88,100
+cp_1
+bounds:92,93,40,12
+offsets:1,1,42,14
+rotate:90
+cp_2
+bounds:110,147,41,21
+rotate:90
+cp_3
+bounds:2,2,43,27
+cp_4
+bounds:110,190,40,47
+shouqiang
+bounds:2,31,88,102
+offsets:1,1,90,104
 zhihui
-bounds:2,104,94,100
+bounds:2,135,106,102
+offsets:1,1,108,104

Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_skeletondata.asset

@@ -27,5 +27,5 @@ MonoBehaviour:
   fromAnimation: []
   toAnimation: []
   duration: []
-  defaultMix: 0.2
+  defaultMix: 0
   controller: {fileID: 0}

Assets/arts/spines/ui/ui_task_chest_1.meta

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

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

@@ -0,0 +1,10 @@
+ui_task_chest_1.png
+size:256,256
+filter:Linear,Linear
+1
+bounds:1,67,76,61
+2
+bounds:1,1,70,64
+xing
+bounds:79,95,33,33
+offsets:1,1,35,35

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

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

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

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: ad4cdc192d9df42ecbefe7e0564ea7b7
+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: 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: 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: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  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_task_chest_1/ui_task_chest_1.skel.bytes.meta

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

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset

@@ -10,10 +10,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: ui_mainbtn_company_atlas
+  m_Name: ui_task_chest_1_atlas
   m_EditorClassIdentifier: 
   textureLoadingMode: 0
   onDemandTextureLoader: {fileID: 0}
-  atlasFile: {fileID: 4900000, guid: 02cc0b307bb3d4973bf3364729bbbc9c, type: 3}
+  atlasFile: {fileID: 4900000, guid: b2a49dd36b9894c088d1c9c6e4b13721, type: 3}
   materials:
-  - {fileID: 2100000, guid: 196447820400a4e7db058835c53a6712, type: 2}
+  - {fileID: 2100000, guid: 7ccc19d04bffa4a58a3ef53478fee429, type: 2}

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_atlas.asset.meta

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

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: ui_mainbtn_company_material
+  m_Name: ui_task_chest_1_material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
@@ -22,7 +22,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: a4c64dcc52d544c2b8d010e7c0f6cb83, type: 3}
+        m_Texture: {fileID: 2800000, guid: ad4cdc192d9df42ecbefe7e0564ea7b7, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_material.mat.meta

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

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset

@@ -10,12 +10,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: ui_mainbtn_company_skeletondata
+  m_Name: ui_task_chest_1_skeletondata
   m_EditorClassIdentifier: 
   atlasAssets:
-  - {fileID: 11400000, guid: 420f1993c6a124ae19850f83e8c1fecf, type: 2}
+  - {fileID: 11400000, guid: 1ea8bea4179c5441d91c66d752ca0b8a, type: 2}
   scale: 0.01
-  skeletonJSON: {fileID: 4900000, guid: 497f02d55b4534010aa1fed6800c5402, type: 3}
+  skeletonJSON: {fileID: 4900000, guid: 9fb13ac0901cc450b96efd6517509d41, type: 3}
   isUpgradingBlendModeMaterials: 0
   blendModeMaterials:
     requiresBlendModeMaterials: 0

Assets/arts/spines/ui/ui_task_chest_1/ui_task_chest_1_skeletondata.asset.meta

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