tips等预制体修改

Assets/arts/textures/ui/main/main_btn_ligth.png.meta

@@ -47,7 +47,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 0, y: 0, z: 40, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

Assets/arts/textures/ui/main/main_btn_ringt.png.meta

@@ -47,7 +47,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 40, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

Assets/prefabs/ui/main_city/main_comp.prefab

@@ -34,8 +34,8 @@ RectTransform:
   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: -20}
+  m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 220, y: 40}
+  m_SizeDelta: {x: 220, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5931823550163875218
 CanvasRenderer:
@@ -92,10 +92,10 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
+  m_fontSize: 26
-  m_fontSizeBase: 24
+  m_fontSizeBase: 26
   m_fontWeight: 400
-  m_enableAutoSizing: 1
+  m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 30
   m_fontStyle: 0
@@ -167,6 +167,7 @@ RectTransform:
   - {fileID: 1977720900498427582}
   - {fileID: 8820620950456562659}
   - {fileID: 4218541309236846194}
+  - {fileID: 4823341342929098919}
   m_Father: {fileID: 4165930251451731960}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -325,15 +326,15 @@ RectTransform:
   m_GameObject: {fileID: 1795981038810573004}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3583616041468768222}
   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: 20}
+  m_AnchoredPosition: {x: 0, y: 35}
-  m_SizeDelta: {x: 178, y: 188}
+  m_SizeDelta: {x: 89.9292, y: 75.622}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &185068978493969815
 CanvasRenderer:
@@ -363,7 +364,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bbc8dc8d2ae3e364990b159c9a7ef3df, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -373,6 +374,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2833670430972826898
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4823341342929098919}
+  - component: {fileID: 5877988778890858947}
+  - component: {fileID: 8848489756538757843}
+  m_Layer: 5
+  m_Name: num_tx
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4823341342929098919
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2833670430972826898}
+  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: 6695163000850577717}
+  m_RootOrder: 3
+  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: 20}
+  m_SizeDelta: {x: 350, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5877988778890858947
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2833670430972826898}
+  m_CullTransparentMesh: 1
+--- !u!114 &8848489756538757843
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2833670430972826898}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\u4ECA\u65E5\u5269\u4F59\u6B21\u6570\uFF1A0000"
+  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: 24.67
+  m_fontSizeBase: 24.67
+  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: 1
+  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 &3995920760742853779
 GameObject:
   m_ObjectHideFlags: 0
@@ -491,7 +626,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 263}
-  m_SizeDelta: {x: 160, y: 100}
+  m_SizeDelta: {x: 158, y: 94}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2741045534911002026
 CanvasRenderer:
@@ -521,7 +656,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ae50aed0182729429de176b08707a75, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -787,8 +922,8 @@ RectTransform:
   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: -20}
+  m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 220, y: 40}
+  m_SizeDelta: {x: 220, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1602831332368765059
 CanvasRenderer:
@@ -845,10 +980,10 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
+  m_fontSize: 26
-  m_fontSizeBase: 24
+  m_fontSizeBase: 26
   m_fontWeight: 400
-  m_enableAutoSizing: 1
+  m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 30
   m_fontStyle: 0
@@ -925,7 +1060,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 263}
-  m_SizeDelta: {x: 160, y: 100}
+  m_SizeDelta: {x: 158, y: 94}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6370390820492705620
 CanvasRenderer:
@@ -955,7 +1090,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9801a63125a239349aa621a6aaf6b164, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1139,15 +1274,15 @@ RectTransform:
   m_GameObject: {fileID: 7141612024660261569}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6052349336422526591}
   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: 20}
+  m_AnchoredPosition: {x: 0, y: 35}
-  m_SizeDelta: {x: 178, y: 188}
+  m_SizeDelta: {x: 99, y: 88}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &333869225490913389
 CanvasRenderer:
@@ -1177,7 +1312,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 296a6182d7f78e94383c45f11c4c6fdb, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1308,6 +1443,10 @@ MonoBehaviour:
     hashName: 374302431
     objectType: 0
     gameObject: {fileID: 656146363767839819}
+  - name: main_comp.fight_btn.num_tx
+    hashName: 1059715127
+    objectType: 0
+    gameObject: {fileID: 2833670430972826898}
 --- !u!114 &6214590949040345325
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1643,6 +1782,22 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4165930251451731960}
     m_Modifications:
+    - target: {fileID: 1376706262518512188, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1376706262518512188, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1376706262518512188, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1376706262518512188, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2028446090651919181, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1729,7 +1884,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4097550255718150601, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -77
+      value: -55
       objectReference: {fileID: 0}
     - target: {fileID: 4097550255718150601, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1743,6 +1898,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4686454910438750398, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4686454910438750398, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4686454910438750398, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4686454910438750398, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5112429336731467793, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1763,6 +1934,42 @@ PrefabInstance:
       propertyPath: m_Name
       value: daily_challenge_comp
       objectReference: {fileID: 0}
+    - target: {fileID: 5710506377184905548, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5748812091185736248, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5748812091185736248, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5748812091185736248, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5748812091185736248, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6463091956731800722, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6463091956731800722, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6463091956731800722, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6463091956731800722, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8893122019703439847, guid: 5f98c4034e99af04d971fccd4cf52ed0, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2130,16 +2337,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
@@ -2249,13 +2456,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}