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

111

Browse Source
This commit is contained in:
WIN-IEQ8U88PPRB\Administrator 2026-05-12 19:17:20 +08:00
parent cc9842fcf9
commit 45edd04cdc
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
yyzl/01Mergeorder/MainMergePanel.prefab
View File

@ -4013,12 +4013,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 33
m_fontSize: 36
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 33
m_fontSizeMax: 36
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -10993,10 +10993,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6234961392486171946}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -65}
m_SizeDelta: {x: -22, y: -156}
m_SizeDelta: {x: 174, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9045155365811461386
CanvasRenderer:
@ -11053,12 +11053,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28
m_fontSize: 36
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 28
m_fontSizeMax: 36
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -91595,7 +91595,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 45}
m_SizeDelta: {x: 100, y: 100}
m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7870343459328729029
CanvasRenderer:
@ -94451,10 +94451,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 945818165627092742}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -65}
m_SizeDelta: {x: -22, y: -156}
m_SizeDelta: {x: 174, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2167294135548040143
CanvasRenderer:
@ -94511,12 +94511,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28
m_fontSize: 36
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 28
m_fontSizeMax: 36
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -121073,8 +121073,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 90}
m_SizeDelta: {x: 130, y: 65}
m_AnchoredPosition: {x: 0, y: 93}
m_SizeDelta: {x: 170, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2936744626819723416
CanvasRenderer:
@ -121113,7 +121113,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 2.5
m_PixelsPerUnitMultiplier: 2
--- !u!225 &8607731806841974964
CanvasGroup:
m_ObjectHideFlags: 0
@ -122011,10 +122011,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2480345849618457203}
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_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6329327978491499495
CanvasRenderer:
@ -122071,12 +122071,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35
m_fontSize: 40
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 35
m_fontSizeMax: 40
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -125413,8 +125413,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: 2}
m_SizeDelta: {x: 150, y: 80}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7149129911878706715
CanvasRenderer:
@ -125471,12 +125471,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35
m_fontSize: 48
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 35
m_fontSizeMax: 48
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -128099,7 +128099,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 70, y: 120}
m_SizeDelta: {x: 50, y: 50}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1944244958625679375
CanvasRenderer:
@ -144898,10 +144898,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5528515473884753660}
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_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7952837658859120665
CanvasRenderer:
@ -144958,12 +144958,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35
m_fontSize: 40
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 35
m_fontSizeMax: 40
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512

24
yyzl/02MainHome/TopPanel.prefab
View File

@ -189,8 +189,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: 20, y: 4}
m_SizeDelta: {x: 130, y: 50}
m_AnchoredPosition: {x: 25, y: 4}
m_SizeDelta: {x: 130, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &505359542523839392
CanvasRenderer:
@ -247,12 +247,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSize: 48
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 36
m_fontSizeMax: 48
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -336,8 +336,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: -11, y: 3.5}
m_SizeDelta: {x: 140, y: 50}
m_AnchoredPosition: {x: -7, y: 4}
m_SizeDelta: {x: 140, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4535223139261292503
CanvasRenderer:
@ -394,12 +394,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSize: 48
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 36
m_fontSizeMax: 48
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -1235,8 +1235,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: 22, y: 4}
m_SizeDelta: {x: 130, y: 50}
m_AnchoredPosition: {x: 25, y: 4}
m_SizeDelta: {x: 130, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8798200068905893707
CanvasRenderer:
@ -1293,12 +1293,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSize: 48
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 36
m_fontSizeMax: 48
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512