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

11

Browse Source
This commit is contained in:
WIN-IEQ8U88PPRB\Administrator 2026-05-13 15:07:47 +08:00
parent 35b6ab201f
commit 6285d0c228
2 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
yyzl/01Mergeorder/MainMergePanel.prefab
View File

@ -1577,7 +1577,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 90, y: 170}
m_SizeDelta: {x: 55, y: 58}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &738426795839656979
CanvasRenderer:
@ -4013,12 +4013,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSize: 32
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 36
m_fontSizeMax: 32
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -6368,7 +6368,7 @@ RectTransform:
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: 60, y: 60}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7185627984913999336
CanvasRenderer:
@ -6425,12 +6425,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 40
m_fontSize: 35
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 40
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -11053,12 +11053,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSize: 32
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 36
m_fontSizeMax: 32
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -28906,12 +28906,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 33
m_fontSize: 32
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 33
m_fontSizeMax: 32
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -29285,7 +29285,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -8}
m_SizeDelta: {x: 150, y: 50}
m_SizeDelta: {x: 170, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4980882759004266291
CanvasRenderer:
@ -29342,7 +29342,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 41.65
m_fontSize: 42
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 1
@ -90853,7 +90853,7 @@ 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: 75, y: 75}
m_AnchoredPosition: {x: 70, y: 75}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133463639637172490
@ -90884,7 +90884,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 24501424a2847f846b843d538ab477fc, type: 3}
m_Sprite: {fileID: 21300000, guid: 19f75ad3876aee74799630fd68c0580e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -94511,12 +94511,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSize: 32
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 36
m_fontSizeMax: 32
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -101572,7 +101572,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 23}
m_SizeDelta: {x: 150, y: 50}
m_SizeDelta: {x: 170, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5162391179558860597
CanvasRenderer:
@ -101629,7 +101629,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 41.65
m_fontSize: 42
m_fontSizeBase: 32
m_fontWeight: 400
m_enableAutoSizing: 1
@ -118203,7 +118203,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 65, y: 140}
m_SizeDelta: {x: 55.2, y: 58.4}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &388511056997932444
CanvasRenderer:
@ -122014,7 +122014,7 @@ RectTransform:
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_SizeDelta: {x: 45, y: 45}
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: 40
m_fontSize: 35
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 40
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -122606,8 +122606,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: -30}
m_SizeDelta: {x: 80, y: 40}
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 100, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1173965197315465993
CanvasRenderer:
@ -122637,7 +122637,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: +10
m_text: +300
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: b690b61cad7efe64591a11841d01e076, type: 2}
@ -122664,12 +122664,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSize: 35
m_fontSizeBase: 55
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 30
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -125414,7 +125414,7 @@ RectTransform:
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: 150, y: 60}
m_SizeDelta: {x: 150, y: 55}
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: 48
m_fontSize: 42
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 48
m_fontSizeMax: 42
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -127345,10 +127345,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2757432060181013434}
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: 2.5}
m_SizeDelta: {x: 0, y: -5}
m_SizeDelta: {x: 45, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7357909976707001122
CanvasRenderer:
@ -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: 60, y: 60}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1944244958625679375
CanvasRenderer:
@ -132891,7 +132891,7 @@ 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: 70, y: 80}
m_AnchoredPosition: {x: 70, y: 75}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5809653415984676678
@ -132922,7 +132922,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 24501424a2847f846b843d538ab477fc, type: 3}
m_Sprite: {fileID: 21300000, guid: 19f75ad3876aee74799630fd68c0580e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -141228,7 +141228,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: 60, y: 60}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7202988519594455927
CanvasRenderer:
@ -144811,12 +144811,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 33
m_fontSize: 32
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 33
m_fontSizeMax: 32
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -144901,7 +144901,7 @@ RectTransform:
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_SizeDelta: {x: 45, y: 45}
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: 40
m_fontSize: 35
m_fontSizeBase: 35
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 40
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -147072,10 +147072,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5615432755507130062}
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: 4}
m_SizeDelta: {x: 0, y: -8}
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: 45, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6117614826955089203
CanvasRenderer:
@ -147108,7 +147108,7 @@ MonoBehaviour:
m_text: 3
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 9590211d1ac2e904988c83a15ebf6554, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 4447d4b9c22100b47a5d2c42bce3eff7, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -147132,12 +147132,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 40
m_fontSize: 35
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 40
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -148230,8 +148230,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: -30}
m_SizeDelta: {x: 80, y: 40}
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 100, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7807783270695812932
CanvasRenderer:
@ -148261,7 +148261,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: +10
m_text: +1099
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 99e5f1d2cedf01f42ba3aec5c898e4f8, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: b690b61cad7efe64591a11841d01e076, type: 2}
@ -148288,12 +148288,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSize: 35
m_fontSizeBase: 55
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 30
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -157815,8 +157815,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: 0}
m_SizeDelta: {x: 100, y: 60}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 45, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7927085272716352744
CanvasRenderer:
@ -157873,12 +157873,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 42
m_fontSize: 35
m_fontSizeBase: 42
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 40
m_fontSizeMax: 35
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512

22
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: 25, y: 4}
m_SizeDelta: {x: 130, y: 60}
m_AnchoredPosition: {x: 22, y: 4}
m_SizeDelta: {x: 120, y: 55}
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: 48
m_fontSize: 42
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 48
m_fontSizeMax: 42
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -337,7 +337,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -7, y: 4}
m_SizeDelta: {x: 140, y: 60}
m_SizeDelta: {x: 140, y: 55}
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: 48
m_fontSize: 42
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 48
m_fontSizeMax: 42
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: 25, y: 4}
m_SizeDelta: {x: 130, y: 60}
m_AnchoredPosition: {x: 22, y: 4}
m_SizeDelta: {x: 120, y: 55}
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: 48
m_fontSize: 42
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 2
m_fontSizeMax: 48
m_fontSizeMax: 42
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512