Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei

Branch_DNA
zhangjiannan 2025-08-22 13:40:00 +08:00
commit 86b28e8a5e
2 changed files with 137 additions and 64 deletions

View File

@ -314,7 +314,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: 0, y: -71}
m_AnchoredPosition: {x: 0, y: 46}
m_SizeDelta: {x: 983, y: 876}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4046422386876619752
@ -686,9 +686,9 @@ RectTransform:
m_Father: {fileID: 4072935318317542415}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -244, y: -1734}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 296, y: 247.99976}
m_SizeDelta: {x: 422.81128, y: 237.63892}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9203457012568939700
@ -854,9 +854,9 @@ RectTransform:
m_Father: {fileID: 2155765969751685322}
m_RootOrder: 2
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: 761.4}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -178.59998}
m_SizeDelta: {x: 1080, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3060067227909623060
@ -5871,9 +5871,9 @@ RectTransform:
m_Father: {fileID: 2155765969751685322}
m_RootOrder: 5
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: -495}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 445}
m_SizeDelta: {x: 1080, y: 700}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1967979915737501300
@ -5967,9 +5967,9 @@ RectTransform:
m_Father: {fileID: 4072935318317542415}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -66, y: -133}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -66, y: 807}
m_SizeDelta: {x: 88, y: 72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4705537261379448976
@ -6083,7 +6083,7 @@ 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: 818}
m_AnchoredPosition: {x: 0, y: 756}
m_SizeDelta: {x: 800, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7824437057902464144
@ -6163,9 +6163,9 @@ RectTransform:
m_Father: {fileID: 2155765969751685322}
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: 760}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -180}
m_SizeDelta: {x: 1080, y: 212}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6168287311235063520
@ -6236,10 +6236,10 @@ RectTransform:
m_Father: {fileID: 2155765969751685322}
m_RootOrder: 4
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -60}
m_SizeDelta: {x: 1080, y: 1555.2}
m_SizeDelta: {x: 0, y: -324.80005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6646934886774772053
CanvasRenderer:
@ -6309,9 +6309,9 @@ RectTransform:
m_Father: {fileID: 5013438516309886473}
m_RootOrder: 2
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: 262, y: 95}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -119, y: 95}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &885414984294914557
@ -6347,7 +6347,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 105
m_Alignment: 4
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -6578,10 +6578,10 @@ RectTransform:
m_Father: {fileID: 4072935318317542415}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 239, y: -1724.9998}
m_SizeDelta: {x: 263.9, y: 100}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -301, y: 257}
m_SizeDelta: {x: 263.90002, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8681661694272815419
CanvasRenderer:
@ -7000,10 +7000,10 @@ RectTransform:
m_Father: {fileID: 508951510436007231}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1564}
m_SizeDelta: {x: 0, y: 8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7739039663011065314
CanvasRenderer:
@ -12530,10 +12530,10 @@ RectTransform:
m_Father: {fileID: 4072935318317542415}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 262.16998}
m_SizeDelta: {x: 0, y: 817.652}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 274.59998}
m_SizeDelta: {x: 0, y: -1087.1422}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8742551993581657983
CanvasRenderer:
@ -17695,9 +17695,9 @@ RectTransform:
m_Father: {fileID: 4072935318317542415}
m_RootOrder: 22
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: -442.9}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 497.1}
m_SizeDelta: {x: 470, y: 418.844}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4948073283412221761
@ -27985,9 +27985,9 @@ RectTransform:
m_Father: {fileID: 5013438516309886473}
m_RootOrder: 3
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: 677.6}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 83}
m_SizeDelta: {x: 1080, y: 161.95941}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3374133071828216380
@ -33550,8 +33550,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: 64.6, y: -570.34}
m_SizeDelta: {x: 853.3953, y: 500.68146}
m_AnchoredPosition: {x: -0, y: -417.9}
m_SizeDelta: {x: 853.3953, y: 392.48975}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4653632222553070112
CanvasRenderer:
@ -33729,7 +33729,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -43, y: 17}
m_AnchoredPosition: {x: -43, y: -433.3997}
m_SizeDelta: {x: 85, y: 193}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1620461548971506017
@ -38762,8 +38762,8 @@ RectTransform:
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: -100}
m_SizeDelta: {x: 0, y: -860}
m_AnchoredPosition: {x: 0, y: -53.69995}
m_SizeDelta: {x: 0, y: -425.88525}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5123099176902906659
CanvasRenderer:
@ -38786,7 +38786,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.84705883}
m_Color: {r: 0, g: 0, b: 0, a: 0.9647059}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -38905,9 +38905,9 @@ RectTransform:
m_Father: {fileID: 2155765969751685322}
m_RootOrder: 1
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: 310.3, y: 785}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -229.70001, y: -155}
m_SizeDelta: {x: 383.80005, y: 146}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5283799335148152035
@ -38943,7 +38943,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 105
m_Alignment: 7
m_Alignment: 8
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -39002,7 +39002,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 40.699707, y: 16.39978}
m_AnchoredPosition: {x: 40.699707, y: -434}
m_SizeDelta: {x: 85, y: 193}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5071970851670418419
@ -44349,9 +44349,9 @@ RectTransform:
m_Father: {fileID: 2155765969751685322}
m_RootOrder: 3
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: -331, y: 831}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 209, y: -109}
m_SizeDelta: {x: 417, y: 234}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4111753186594748698
@ -44572,7 +44572,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -79.799805, y: -258.2002}
m_AnchoredPosition: {x: -79.799805, y: -86.7}
m_SizeDelta: {x: 157, y: 147}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8647537278007762228

View File

@ -22003,6 +22003,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3747149738283380724}
- {fileID: 2840028758312766183}
m_Father: {fileID: 224215249341832938}
m_RootOrder: 11
@ -22010,7 +22011,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -385, y: -402}
m_SizeDelta: {x: 128, y: 117}
m_SizeDelta: {x: 176, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8735818871686092953
CanvasRenderer:
@ -22038,7 +22039,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3978cdc727540d3419da693011669de1, type: 3}
m_Sprite: {fileID: 21300000, guid: ed9f2818aff0433449c21e87c311e378, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -93073,6 +93074,78 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.78431374}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &2795459378874171990
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3747149738283380724}
- component: {fileID: 1376366316167951128}
- component: {fileID: 8995580067701769096}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3747149738283380724
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2795459378874171990}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 5006928117677066669}
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: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1376366316167951128
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2795459378874171990}
m_CullTransparentMesh: 0
--- !u!114 &8995580067701769096
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2795459378874171990}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63458123841242b4fa4064119a904e93, 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
--- !u!1 &2844433079032357192
GameObject:
m_ObjectHideFlags: 0
@ -119716,11 +119789,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5006928117677066669}
m_RootOrder: 0
m_RootOrder: 1
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: 5}
m_AnchoredPosition: {x: 1, y: 14.5399475}
m_SizeDelta: {x: 140, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3146083268182903300
@ -119754,15 +119827,15 @@ MonoBehaviour:
m_FontSize: 36
m_FontStyle: 3
m_BestFit: 1
m_MinSize: 28
m_MaxSize: 36
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u793C\u7269"
m_Text: "<color=#FF7D40><size=45>\u82F1\u96C4</size></color>\u793C\u7269"
LanguageIndex: 0
--- !u!114 &1390065422289645285
MonoBehaviour:
@ -121555,7 +121628,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -455.64996, y: 1.9000244}
m_AnchoredPosition: {x: -455.6499, y: 1.8999023}
m_SizeDelta: {x: -852.01, y: 425.1997}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &273162406131130758