Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

2023-06-01 11:14:37 +08:00 · 2023-06-01 11:14:37 +08:00 · ecbc9d514c
commit ecbc9d514c
parent 18bbe0108f 5727d67a28
20 changed files with 296 additions and 491 deletions
--- a/Assets/arts/atlas/ui/main.spriteatlas
+++ b/Assets/arts/atlas/ui/main.spriteatlas
@ -72,7 +72,6 @@ SpriteAtlas:
  - {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3}
  - {fileID: 21300000, guid: 97c8eba9132d32246ae08c3cbc05c7cb, type: 3}
  - {fileID: 21300000, guid: 6a471cbadff649e429c3ca4a54c0fd4b, type: 3}
-  - {fileID: 21300000, guid: 5962af8bc86575c459b454d2266f805a, type: 3}
  - {fileID: 21300000, guid: a11d2ecba6359b7449faa1c86929e65b, type: 3}
  - {fileID: 21300000, guid: d5338fcb9468f5d4fb50f0b3cb68be90, type: 3}
  - {fileID: 21300000, guid: ac95da3d35af16f42a23be26f95d5242, type: 3}
@ -92,7 +91,6 @@ SpriteAtlas:
  - main_dec_4
  - main_dec_2
  - main_bg_1
-  - main_btn_fund
  - main_btn_pig
  - main_btn_mail
  - main_btn_task
--- a/Assets/arts/spines/ui/ui_main_btn_growup.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a8dce182a930a14a84685252d433055
+guid: 4d9922bb1e03e48418de7c0be570f813
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt
@ -0,0 +1,31 @@
+ui_main_btn_growup.png
+size:128,128
+filter:Linear,Linear
+aixin
+bounds:75,49,33,31
+offsets:1,1,35,33
+hua
+bounds:2,55,71,71
+offsets:1,1,73,73
+lian
+bounds:75,82,49,44
+offsets:1,1,51,46
+xx1
+bounds:110,65,16,15
+offsets:1,1,18,17
+xx2
+bounds:85,27,17,20
+offsets:1,1,19,22
+xx3
+bounds:66,26,17,21
+offsets:1,1,19,23
+yan1
+bounds:110,54,9,16
+offsets:1,1,11,18
+rotate:90
+yan2
+bounds:110,44,8,16
+offsets:1,1,10,18
+rotate:90
+ye
+bounds:2,9,62,44
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.atlas.txt.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5fa297ff1a9c3d547a5efe99efc8c9ec
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5962af8bc86575c459b454d2266f805a
+guid: 28b9030f7b06f3e4f8205f848df76fb7
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
@ -41,7 +41,7 @@ TextureImporter:
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
@ -52,7 +52,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@ -99,25 +99,13 @@ TextureImporter:
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 12
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
    internalID: 0
    vertices: []
    indices: 
@ -128,5 +116,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: arts/textures/ui/main.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup.skel.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 133d1cc3091353a4997355106c92d961
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset
@ -0,0 +1,17 @@
+%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_growup_atlas
+  m_EditorClassIdentifier: 
+  atlasFile: {fileID: 4900000, guid: 5fa297ff1a9c3d547a5efe99efc8c9ec, type: 3}
+  materials:
+  - {fileID: 2100000, guid: fcd4c8a9a118ddf45abdb42492c6b50d, type: 2}
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_atlas.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 32a0e043d82c89944b4ff56bcb90189b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat
@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_main_btn_growup_material
+  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_ShaderKeywords: _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: 28b9030f7b06f3e4f8205f848df76fb7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 0
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_material.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fcd4c8a9a118ddf45abdb42492c6b50d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_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_growup_skeletondata
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: 32a0e043d82c89944b4ff56bcb90189b, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: 133d1cc3091353a4997355106c92d961, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 0
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}
--- a/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset.meta
+++ b/Assets/arts/spines/ui/ui_main_btn_growup/ui_main_btn_growup_skeletondata.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7241c9701e294754783fa2bb3ad3443e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/ui/main/main_btn_fund.png
+++ b/Assets/arts/textures/ui/main/main_btn_fund.png
--- a/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes
+++ b/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes
--- a/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes
+++ b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes
--- a/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab
+++ b/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab
@ -1,447 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1886348764626124569
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8032025172877121001}
-  - component: {fileID: 3400584062289878411}
-  - component: {fileID: 5879989463083505207}
-  - component: {fileID: 8872205515227162161}
-  - component: {fileID: 6323538229666421987}
-  m_Layer: 5
-  m_Name: side_bar_base_cell
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &8032025172877121001
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1886348764626124569}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1428946446916460209}
-  - {fileID: 5841790680202852062}
-  - {fileID: 69754800809698318}
-  - {fileID: 7796595949412098847}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -32}
-  m_SizeDelta: {x: 64, y: 64}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3400584062289878411
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1886348764626124569}
-  m_CullTransparentMesh: 1
--- !u!114 &5879989463083505207
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1886348764626124569}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
--- !u!114 &8872205515227162161
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1886348764626124569}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  IsShowClickAnimation: 1
--- !u!114 &6323538229666421987
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1886348764626124569}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  prefabList:
-  - name: side_bar_base_cell.icon
-    hashName: 3436508971
-    objectType: 0
-    gameObject: {fileID: 7664071059432299559}
-  - name: side_bar_base_cell.info
-    hashName: 3436519264
-    objectType: 0
-    gameObject: {fileID: 5235462503420730942}
-  - name: side_bar_base_cell.effect_node
-    hashName: 2116696318
-    objectType: 0
-    gameObject: {fileID: 0}
-  - name: side_bar_base_cell.rpRoot
-    hashName: 4219046514
-    objectType: 0
-    gameObject: {fileID: 2576462280328218393}
-  - name: side_bar_base_cell.bg
-    hashName: 1196870519
-    objectType: 0
-    gameObject: {fileID: 6644034033586198925}
--- !u!1 &2576462280328218393
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7796595949412098847}
-  - component: {fileID: 2132045105374938157}
-  m_Layer: 5
-  m_Name: rpRoot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &7796595949412098847
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2576462280328218393}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8032025172877121001}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2132045105374938157
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2576462280328218393}
-  m_CullTransparentMesh: 1
--- !u!1 &5235462503420730942
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 69754800809698318}
-  - component: {fileID: 2542523108924560882}
-  - component: {fileID: 5399492499202496278}
-  m_Layer: 5
-  m_Name: info
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &69754800809698318
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5235462503420730942}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8032025172877121001}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -40}
-  m_SizeDelta: {x: 72, y: 15}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2542523108924560882
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5235462503420730942}
-  m_CullTransparentMesh: 1
--- !u!114 &5399492499202496278
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5235462503420730942}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 20
-  m_fontSizeBase: 20
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6644034033586198925
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1428946446916460209}
-  - component: {fileID: 398465592708849108}
-  - component: {fileID: 6547105876192134503}
-  m_Layer: 5
-  m_Name: bg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1428946446916460209
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6644034033586198925}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8032025172877121001}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 64, y: 64}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &398465592708849108
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6644034033586198925}
-  m_CullTransparentMesh: 1
--- !u!114 &6547105876192134503
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6644034033586198925}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!1 &7664071059432299559
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5841790680202852062}
-  - component: {fileID: 2415521907619756768}
-  - component: {fileID: 4781327074947000708}
-  m_Layer: 5
-  m_Name: icon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &5841790680202852062
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7664071059432299559}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 8032025172877121001}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 64, y: 64}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2415521907619756768
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7664071059432299559}
-  m_CullTransparentMesh: 1
--- !u!114 &4781327074947000708
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7664071059432299559}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- a/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab.meta
+++ b/Assets/prefabs/ui/main_city/cell/side_bar_base_cell.prefab.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0a35b9989a9755e46a0bac6afac70d64
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: prefabs/ui/main_city/cell/side_bar_base_cell.prefab.ab
-  assetBundleVariant: 
--- a/Assets/prefabs/ui/main_city/main_ui.prefab
+++ b/Assets/prefabs/ui/main_city/main_ui.prefab
@ -1764,7 +1764,7 @@ RectTransform:
  m_Children:
  - {fileID: 6963299347440152119}
  m_Father: {fileID: 7703189336704565753}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -1916,7 +1916,7 @@ RectTransform:
  - {fileID: 3696961338274091344}
  - {fileID: 3949621824981300676}
  m_Father: {fileID: 7703189336704565753}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -3481,6 +3481,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5685856364196914479}
+  - {fileID: 7582710375693909186}
  - {fileID: 120835241197761831}
  - {fileID: 7228277265609253518}
  m_Father: {fileID: 7568320451737155576}
@ -3569,6 +3570,10 @@ MonoBehaviour:
    hashName: 2861009151
    objectType: 0
    gameObject: {fileID: 5385636119876016052}
+  - name: side_bar_cell.ui_spine_obj
+    hashName: 3379195432
+    objectType: 6
+    gameObject: {fileID: 6514679323496544804}
 --- !u!1 &7855773179402164867
 GameObject:
  m_ObjectHideFlags: 0
@ -4746,6 +4751,117 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
  m_PrefabInstance: {fileID: 1518043736896497656}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4741214256576567132
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7703189336704565753}
+    m_Modifications:
+    - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_Name
+      value: ui_spine_obj
+      objectReference: {fileID: 0}
+    - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -50
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+--- !u!1 &6514679323496544804 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 4741214256576567132}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &7582710375693909186 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 4741214256576567132}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4803769959397203555
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -5051,16 +5167,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3}
--- !u!1 &4175967731956866547 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3}
-  m_PrefabInstance: {fileID: 4803769959397203555}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8897476989028766107 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3}
  m_PrefabInstance: {fileID: 4803769959397203555}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4175967731956866547 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3}
+  m_PrefabInstance: {fileID: 4803769959397203555}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4995549557732434771
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -5162,16 +5278,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
--- !u!1 &6842980704613305899 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
-  m_PrefabInstance: {fileID: 4995549557732434771}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &7900683791719762125 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
  m_PrefabInstance: {fileID: 4995549557732434771}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6842980704613305899 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 4995549557732434771}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7717335971750466713
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -6436,13 +6552,13 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3}
--- !u!1 &2354727283849138858 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3}
-  m_PrefabInstance: {fileID: 8329023202578667452}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &502275081594006781 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3}
  m_PrefabInstance: {fileID: 8329023202578667452}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2354727283849138858 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3}
+  m_PrefabInstance: {fileID: 8329023202578667452}
+  m_PrefabAsset: {fileID: 0}