zhanghongbo/Art_SubModule
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mainmergePanel调整

Browse Source
This commit is contained in:
zhang hongbo 2026-04-24 10:44:04 +08:00
parent fcfea6786f
commit c1beae9349
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
yyzl/01Mergeorder/MainMergePanel.prefab
View File

@ -477,7 +477,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8115277404206038471
CanvasRenderer:
@ -534,12 +534,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -1049,7 +1049,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8482266092768501988
CanvasRenderer:
@ -1106,12 +1106,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -3005,7 +3005,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &366312075157586610
CanvasRenderer:
@ -3062,12 +3062,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -3187,7 +3187,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &949149631611977828
CanvasRenderer:
@ -3244,12 +3244,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -7321,7 +7321,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2963222347474505159
CanvasRenderer:
@ -7378,12 +7378,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -9007,7 +9007,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5121934039656725219
CanvasRenderer:
@ -12496,7 +12496,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6779026729191822990
CanvasRenderer:
@ -26418,7 +26418,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5800677084191496381
CanvasRenderer:
@ -27091,7 +27091,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9032692656250900162
CanvasRenderer:
@ -27699,7 +27699,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
skeletonDataAsset: {fileID: 11400000, guid: 30328eaf1f00b1e4490edcaef48d814f, type: 2}
skeletonDataAsset: {fileID: 11400000, guid: 67d24de60eb257140a4714c2b1814641, type: 2}
initialSkinName:
initialFlipX: 0
initialFlipY: 0
@ -29898,7 +29898,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2501053159230627367
CanvasRenderer:
@ -29955,12 +29955,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -85093,12 +85093,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSize: 28
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 30
m_fontSizeMax: 28
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -95260,7 +95260,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -1.5}
m_SizeDelta: {x: -8, y: -9}
m_SizeDelta: {x: 0, y: -9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8687655797668188022
CanvasRenderer:
@ -101294,7 +101294,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1881644812032682598
CanvasRenderer:
@ -108591,7 +108591,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -143, y: -30.5}
m_SizeDelta: {x: 240, y: 50}
m_SizeDelta: {x: 2, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &115245004003237390
CanvasRenderer:
@ -119211,8 +119211,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: 1.3904, y: 2}
m_SizeDelta: {x: 329.7808, y: 107}
m_AnchoredPosition: {x: 0, y: 2}
m_SizeDelta: {x: 327, y: 107}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &988102322065696232
CanvasRenderer:
@ -119582,7 +119582,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4753071624577854850
CanvasRenderer:
@ -119639,12 +119639,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -120520,7 +120520,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &304164110335426959
CanvasRenderer:
@ -123293,12 +123293,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 55
m_fontSize: 35
m_fontSizeBase: 55
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 55
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -123386,7 +123386,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2970975020446754892
CanvasRenderer:
@ -125985,7 +125985,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8202611872717715730
CanvasRenderer:
@ -129309,7 +129309,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5153938166772678943
CanvasRenderer:
@ -130111,7 +130111,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3131551214085201394
CanvasRenderer:
@ -130168,12 +130168,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -131074,7 +131074,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 2}
m_SizeDelta: {x: 150, y: 45}
m_SizeDelta: {x: 138, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6464405222446192288
MonoBehaviour:
@ -131115,7 +131115,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_Interactable: 0
m_TargetGraphic: {fileID: 0}
m_FillRect: {fileID: 3833759587451980160}
m_HandleRect: {fileID: 0}
@ -141164,7 +141164,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 26.6}
m_SizeDelta: {x: 180, y: 100}
m_SizeDelta: {x: 230, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1412032712282855031
CanvasRenderer:
@ -141998,7 +141998,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5776845324244202302
CanvasRenderer:
@ -142055,12 +142055,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -142638,8 +142638,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: 1.6001, y: 2}
m_SizeDelta: {x: 330.2004, y: 107}
m_AnchoredPosition: {x: 0, y: 2}
m_SizeDelta: {x: 327, y: 107}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5270797971957313845
CanvasRenderer:
@ -157536,7 +157536,7 @@ RectTransform:
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_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6699944659050499723
CanvasRenderer:
@ -157593,12 +157593,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSize: 38
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 45
m_fontSizeMax: 38
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512