From b2a34825cb9aa64b924f974e5183ddc6dc9cfb0c Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Wed, 26 Apr 2023 10:37:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=AE=9D?=
 =?UTF-8?q?=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/prefabs/ui/main_city/main_comp.prefab | 726 +++++++++++++++++--
 1 file changed, 660 insertions(+), 66 deletions(-)

diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab
index 74e97fa39..22ea2641c 100644
--- a/Assets/prefabs/ui/main_city/main_comp.prefab
+++ b/Assets/prefabs/ui/main_city/main_comp.prefab
@@ -1,5 +1,80 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &406118400598004433
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4819823079683285776}
+  - component: {fileID: 7198398252258782693}
+  - component: {fileID: 39127525521111460}
+  m_Layer: 5
+  m_Name: box_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4819823079683285776
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 406118400598004433}
+  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: 1417932701361976021}
+  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: 59, y: 54}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7198398252258782693
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 406118400598004433}
+  m_CullTransparentMesh: 1
+--- !u!114 &39127525521111460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 406118400598004433}
+  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: a3e18e0ffb96a7249ac39a5edf69b469, 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 &486112345732151624
 GameObject:
   m_ObjectHideFlags: 0
@@ -10,8 +85,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1417932701361976021}
   - component: {fileID: 8823234576226998950}
-  - component: {fileID: 194869631566502908}
-  - component: {fileID: 6365156615703228710}
+  - component: {fileID: 6933618432813600778}
+  - component: {fileID: 2257361871954488787}
   m_Layer: 5
   m_Name: box_1
   m_TagString: Untagged
@@ -29,7 +104,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 4819823079683285776}
   m_Father: {fileID: 2727212828609168601}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -46,7 +122,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 486112345732151624}
   m_CullTransparentMesh: 1
---- !u!114 &194869631566502908
+--- !u!114 &6933618432813600778
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -55,10 +131,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 486112345732151624}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -66,17 +142,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, 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!114 &6365156615703228710
+--- !u!114 &2257361871954488787
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,6 +155,44 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   IsShowClickAnimation: 1
+--- !u!1 &864477271824040145
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8731064639689409438}
+  m_Layer: 5
+  m_Name: spine_node
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8731064639689409438
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 864477271824040145}
+  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: 8214664435081863851}
+  - {fileID: 3178344294329280471}
+  - {fileID: 1962521455536505752}
+  m_Father: {fileID: 2727212828609168601}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1319319466675763640
 GameObject:
   m_ObjectHideFlags: 0
@@ -261,6 +365,7 @@ RectTransform:
   - {fileID: 1079551976758563641}
   - {fileID: 5729740271580589585}
   - {fileID: 3263586337503566602}
+  - {fileID: 8731064639689409438}
   m_Father: {fileID: 525532066576820098}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -660,8 +765,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5883548000744873809}
   - component: {fileID: 406414493140495346}
-  - component: {fileID: 7064784389880516095}
-  - component: {fileID: 8073480400273109892}
+  - component: {fileID: 5531391297242737197}
+  - component: {fileID: 2851218323883812303}
   m_Layer: 5
   m_Name: box_2
   m_TagString: Untagged
@@ -679,7 +784,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 7701053779717160958}
   m_Father: {fileID: 2727212828609168601}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -696,7 +802,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2381245007196024946}
   m_CullTransparentMesh: 1
---- !u!114 &7064784389880516095
+--- !u!114 &5531391297242737197
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -705,10 +811,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 2381245007196024946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -716,17 +822,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, 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!114 &8073480400273109892
+--- !u!114 &2851218323883812303
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -781,6 +877,81 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &3357628491710705900
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6267355092284955352}
+  - component: {fileID: 5735454210644186872}
+  - component: {fileID: 322307506382617909}
+  m_Layer: 5
+  m_Name: box_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6267355092284955352
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3357628491710705900}
+  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: 1717654921133013361}
+  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: 59, y: 54}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5735454210644186872
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3357628491710705900}
+  m_CullTransparentMesh: 1
+--- !u!114 &322307506382617909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3357628491710705900}
+  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: a3e18e0ffb96a7249ac39a5edf69b469, 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 &3707635594199645405
 GameObject:
   m_ObjectHideFlags: 0
@@ -895,8 +1066,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1717654921133013361}
   - component: {fileID: 2653534978357253894}
-  - component: {fileID: 6723197209382399188}
-  - component: {fileID: 7735962003760499448}
+  - component: {fileID: 6206749163070710530}
+  - component: {fileID: 3045408647018073943}
   m_Layer: 5
   m_Name: box_3
   m_TagString: Untagged
@@ -914,7 +1085,8 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 6267355092284955352}
   m_Father: {fileID: 2727212828609168601}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -931,7 +1103,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3880313936113951246}
   m_CullTransparentMesh: 1
---- !u!114 &6723197209382399188
+--- !u!114 &6206749163070710530
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -940,10 +1112,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 3880313936113951246}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -951,17 +1123,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, 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!114 &7735962003760499448
+--- !u!114 &3045408647018073943
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1767,6 +1929,81 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &7560881191210497540
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7701053779717160958}
+  - component: {fileID: 6735985565299192339}
+  - component: {fileID: 6378692698942597207}
+  m_Layer: 5
+  m_Name: box_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7701053779717160958
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7560881191210497540}
+  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: 5883548000744873809}
+  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: 59, y: 54}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6735985565299192339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7560881191210497540}
+  m_CullTransparentMesh: 1
+--- !u!114 &6378692698942597207
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7560881191210497540}
+  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: a3e18e0ffb96a7249ac39a5edf69b469, 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 &7610464833581059204
 GameObject:
   m_ObjectHideFlags: 0
@@ -2374,6 +2611,30 @@ MonoBehaviour:
     hashName: 628414440
     objectType: 6
     gameObject: {fileID: 3842524640567971071}
+  - name: main_comp.chapter.progress_bg.spine_node.ui_spine_obj_1
+    hashName: 2428657057
+    objectType: 6
+    gameObject: {fileID: 4707283583799551053}
+  - name: main_comp.chapter.progress_bg.spine_node.ui_spine_obj_2
+    hashName: 2428657058
+    objectType: 6
+    gameObject: {fileID: 2254130738374009137}
+  - name: main_comp.chapter.progress_bg.spine_node.ui_spine_obj_3
+    hashName: 2428657059
+    objectType: 6
+    gameObject: {fileID: 2913756806983878014}
+  - name: main_comp.chapter.progress_bg.box_1.box_icon
+    hashName: 1907225263
+    objectType: 0
+    gameObject: {fileID: 406118400598004433}
+  - name: main_comp.chapter.progress_bg.box_2.box_icon
+    hashName: 1710711758
+    objectType: 0
+    gameObject: {fileID: 7560881191210497540}
+  - name: main_comp.chapter.progress_bg.box_3.box_icon
+    hashName: 1514198253
+    objectType: 0
+    gameObject: {fileID: 3357628491710705900}
 --- !u!114 &6214590949040345325
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2583,6 +2844,117 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
   m_PrefabInstance: {fileID: 288835874943334084}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &354835069707619401
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8731064639689409438}
+    m_Modifications:
+    - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_Name
+      value: ui_spine_obj_2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: skeletonDataAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 2ea3c64624636db448c8c0427bbda5f4, type: 2}
+    - 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
+      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
+      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: 59
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 54
+      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: 111
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -19
+      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 &2254130738374009137 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 354835069707619401}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &3178344294329280471 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 354835069707619401}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2921257277667212657
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2692,16 +3064,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
---- !u!1 &8480415467563264251 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
-  m_PrefabInstance: {fileID: 2921257277667212657}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &805175569456205093 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
   m_PrefabInstance: {fileID: 2921257277667212657}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8480415467563264251 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
+  m_PrefabInstance: {fileID: 2921257277667212657}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3384319494706504071
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2813,6 +3185,117 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
   m_PrefabInstance: {fileID: 3384319494706504071}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3732174623407794182
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8731064639689409438}
+    m_Modifications:
+    - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_Name
+      value: ui_spine_obj_3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: skeletonDataAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 2ea3c64624636db448c8c0427bbda5f4, type: 2}
+    - 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: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      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
+      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: 59
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 54
+      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: 111
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -19
+      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 &2913756806983878014 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 3732174623407794182}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1962521455536505752 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 3732174623407794182}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4913800057335080765
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2932,6 +3415,117 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
   m_PrefabInstance: {fileID: 4913800057335080765}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6554784824521001269
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8731064639689409438}
+    m_Modifications:
+    - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_Name
+      value: ui_spine_obj_1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: skeletonDataAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 2ea3c64624636db448c8c0427bbda5f4, type: 2}
+    - 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: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      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
+      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: 59
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 54
+      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: 111
+      objectReference: {fileID: 0}
+    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -19
+      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!224 &8214664435081863851 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 6554784824521001269}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4707283583799551053 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 6554784824521001269}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7435023522691564449
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3041,16 +3635,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
---- !u!1 &4185139740795901483 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
-  m_PrefabInstance: {fileID: 7435023522691564449}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4938311815031829493 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
   m_PrefabInstance: {fileID: 7435023522691564449}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4185139740795901483 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
+  m_PrefabInstance: {fileID: 7435023522691564449}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8704992128231832206
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3160,13 +3754,13 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
---- !u!1 &2734882152073309956 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
-  m_PrefabInstance: {fileID: 8704992128231832206}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6586711087699593946 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
   m_PrefabInstance: {fileID: 8704992128231832206}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2734882152073309956 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3}
+  m_PrefabInstance: {fileID: 8704992128231832206}
+  m_PrefabAsset: {fileID: 0}

From 131f058f60068d3ba39161ef788cf089a6c5a976 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Wed, 26 Apr 2023 10:37:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=AE=9D?=
 =?UTF-8?q?=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main_city/component/main_comp.lua.bytes   | Bin 8534 -> 9165 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
index 893e02da89f0ed9143dcc799405969a7875859c7..70b02facc951f8d40ba8b3beb80638b3c863cd08 100644
GIT binary patch
delta 5630
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

delta 4963
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
QhS}jj@`t@n!CA2U51AQ9%m4rY