Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

tcx_xiyou_yueNan
DESKTOP-MMO982B\User 2026-06-24 12:49:56 +08:00
commit ce7db01431
1 changed files with 159 additions and 68 deletions

View File

@ -592,7 +592,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7279\u8BAD"
m_Text: "\u89C9\u9192"
LanguageIndex: 0
--- !u!1 &622002765
GameObject:
@ -1249,8 +1249,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 104, y: 0}
m_SizeDelta: {x: 100, y: 0}
m_AnchoredPosition: {x: 95.850006, y: 0}
m_SizeDelta: {x: 83.7, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &365477818
MonoBehaviour:
@ -1279,7 +1279,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 277
m_Left: 270
m_Right: 0
m_Top: 63
m_Bottom: 0
@ -2184,8 +2184,8 @@ MonoBehaviour:
m_Padding:
m_Left: 204
m_Right: 0
m_Top: 13
m_Bottom: 0
m_Top: 0
m_Bottom: 20
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
@ -2534,7 +2534,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6674535297652902529}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -2894,9 +2894,9 @@ RectTransform:
m_Father: {fileID: 2997030700277455518}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39.923332, y: -31}
m_SizeDelta: {x: 40, y: 46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6232666570923579936
@ -3180,8 +3180,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: 3.3, y: -1.4}
m_SizeDelta: {x: 1019.7, y: 1824.6}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1000, y: 1760}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &233444293960343527
CanvasRenderer:
@ -3220,6 +3220,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2416629088041422605
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5230710258877691657}
- component: {fileID: 4195958441240577045}
- component: {fileID: 8011461220497330779}
m_Layer: 5
m_Name: titleBG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5230710258877691657
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416629088041422605}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 1}
m_Children: []
m_Father: {fileID: 6674535297652902529}
m_RootOrder: 2
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: 370, y: 131.7}
m_SizeDelta: {x: 800, y: 113.24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4195958441240577045
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416629088041422605}
m_CullTransparentMesh: 0
--- !u!114 &8011461220497330779
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2416629088041422605}
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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 06a0497c42a908b46a44ecec3d9ae603, 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 &2456542932676181977
GameObject:
m_ObjectHideFlags: 0
@ -3487,7 +3561,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: 864}
m_AnchoredPosition: {x: 0, y: 835.9}
m_SizeDelta: {x: 295.4, y: 58.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5413732181113475055
@ -3519,9 +3593,9 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 46
m_FontStyle: 0
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 52
@ -3531,7 +3605,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7279\u8BAD"
m_Text: "\u795E\u89C9"
LanguageIndex: 0
--- !u!1 &3252610313813676096
GameObject:
@ -3860,7 +3934,7 @@ RectTransform:
m_GameObject: {fileID: 5480243040718976108}
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_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children: []
m_Father: {fileID: 31242521730910685}
m_RootOrder: 1
@ -3868,7 +3942,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 461, y: 859}
m_SizeDelta: {x: 142, y: 131}
m_SizeDelta: {x: 154, y: 139}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3718970244135313906
CanvasRenderer:
@ -4239,9 +4313,9 @@ RectTransform:
m_Father: {fileID: 2997030700277455518}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 157.35667, y: -33.29}
m_SizeDelta: {x: 155.02, y: 50.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2918332741423966806
@ -4576,7 +4650,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 30d10fcfe7c8c504ab1f0c49ceef56b4, type: 3}
m_Sprite: {fileID: 21300000, guid: e0d983760b9ba9e41b22c1b5a2ec5759, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -4636,9 +4710,9 @@ RectTransform:
m_Father: {fileID: 6674535297821892818}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -120}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6674535296167222859
@ -4776,7 +4850,7 @@ RectTransform:
m_Children:
- {fileID: 6674535297518341896}
m_Father: {fileID: 6674535297652902529}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -4826,7 +4900,7 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: -22
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
@ -5018,7 +5092,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6674535296452004501
RectTransform:
m_ObjectHideFlags: 0
@ -5034,10 +5108,10 @@ RectTransform:
m_Father: {fileID: 6674535297544090741}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 462.45, y: 0}
m_SizeDelta: {x: 924.9, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 462.45, y: -204.1}
m_SizeDelta: {x: 924.9, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6674535296452004502
MonoBehaviour:
@ -5399,6 +5473,7 @@ GameObject:
- component: {fileID: 6674535296682107927}
- component: {fileID: 6674535296682107926}
- component: {fileID: 1705107811649284092}
- component: {fileID: 174594522057697598}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -5418,12 +5493,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6674535297652902529}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 212, y: 122}
m_SizeDelta: {x: 476.4, y: 34}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 368, y: 138}
m_SizeDelta: {x: 476.40002, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6674535296682107921
CanvasRenderer:
@ -5483,7 +5558,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9803922, g: 0.019607844, b: 0.019607844, a: 1}
m_Color: {r: 1, g: 0.5921569, b: 0.1254902, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5492,12 +5567,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_FontSize: 45
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -5505,6 +5580,21 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u7279\u8BAD\u6280\u80FD"
LanguageIndex: 0
--- !u!114 &174594522057697598
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6674535296682107924}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &6674535296717857651
GameObject:
m_ObjectHideFlags: 0
@ -5541,9 +5631,9 @@ RectTransform:
m_Father: {fileID: 6674535297821892818}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 450, y: -35}
m_SizeDelta: {x: 900, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6674535296717857663
@ -6046,7 +6136,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 44.539993, y: -45.570004}
m_AnchoredPosition: {x: 43, y: -45.570004}
m_SizeDelta: {x: 87.65, y: 87.65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6674535297022740155
@ -6195,8 +6285,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 412.7, y: 0}
m_SizeDelta: {x: 825.4, y: 0}
m_AnchoredPosition: {x: 462.45, y: 0}
m_SizeDelta: {x: 924.9, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7346170022788454816
MonoBehaviour:
@ -6227,7 +6317,7 @@ MonoBehaviour:
m_Padding:
m_Left: 54
m_Right: 0
m_Top: 63
m_Top: 110
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
@ -6731,10 +6821,10 @@ RectTransform:
m_Father: {fileID: 6674535296229178769}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 535.15, y: 22}
m_SizeDelta: {x: 670.3, y: 82}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 670.3, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6674535297518341898
CanvasRenderer:
@ -6820,7 +6910,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -3007, y: 12}
m_AnchoredPosition: {x: -1995, y: 12}
m_SizeDelta: {x: 924.9, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6674535297544090736
@ -6847,9 +6937,9 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 20
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: -5.9
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@ -6899,6 +6989,7 @@ RectTransform:
m_Children:
- {fileID: 6674535297022740153}
- {fileID: 6674535295941555060}
- {fileID: 5230710258877691657}
- {fileID: 6674535296682107925}
- {fileID: 6674535296229178769}
- {fileID: 4189421130390394065}
@ -7340,7 +7431,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6674535297821892818
RectTransform:
m_ObjectHideFlags: 0
@ -7357,10 +7448,10 @@ RectTransform:
m_Father: {fileID: 6674535297544090741}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 924.9, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -190}
m_SizeDelta: {x: 924.9, y: 190}
m_Pivot: {x: 0, y: 0}
--- !u!114 &2003090693943887253
MonoBehaviour:
@ -7431,8 +7522,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: -44.077}
m_SizeDelta: {x: 962.13, y: 1675.2}
m_AnchoredPosition: {x: 0, y: -40.35}
m_SizeDelta: {x: 950, y: 1611.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6674535297888432878
GameObject:
@ -7452,7 +7543,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6674535297888432879
RectTransform:
m_ObjectHideFlags: 0
@ -7681,9 +7772,9 @@ RectTransform:
m_Father: {fileID: 2997030700277455518}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 278.79, y: -32}
m_SizeDelta: {x: 48, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6360330089692946623
@ -7939,7 +8030,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: 216.2, y: 865}
m_AnchoredPosition: {x: 216.2, y: 833.9}
m_SizeDelta: {x: 71, y: 63}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1567975348574510155