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

xiyou_yueNanZhengshi
zhangjiannan 2024-11-28 10:31:44 +08:00
commit f9a1aecf71
11 changed files with 114 additions and 114 deletions

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 4, y: 39, z: 5, w: 40}
spriteBorder: {x: 4, y: 59, z: 5, w: 46}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1

View File

@ -1075,7 +1075,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: 10, y: 363}
m_AnchoredPosition: {x: 10, y: 276}
m_SizeDelta: {x: 771, y: 287}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &694938424

View File

@ -1791,8 +1791,8 @@ RectTransform:
- {fileID: 4269303393288223542}
- {fileID: 7365320709105385087}
- {fileID: 7119768974377897852}
- {fileID: 5454201514593373745}
- {fileID: 1432564788352834935}
- {fileID: 5454201514593373745}
- {fileID: 522265651818655610}
m_Father: {fileID: 3100635414053867749}
m_RootOrder: 1
@ -2549,18 +2549,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565931253627806369}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203}
m_Children:
- {fileID: 5252830086197940252}
m_Father: {fileID: 9208735843499298522}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -356, y: 277.5}
m_SizeDelta: {x: 90, y: 342.39}
m_AnchoredPosition: {x: 8, y: -128.1}
m_SizeDelta: {x: 90, y: 400}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &989008980080750225
CanvasRenderer:
@ -2944,7 +2944,7 @@ RectTransform:
- {fileID: 4767030315970853823}
- {fileID: 2272038587074511617}
m_Father: {fileID: 9208735843499298522}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -3936,8 +3936,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: -4.9, y: -36}
m_SizeDelta: {x: 64.57, y: 22.01}
m_AnchoredPosition: {x: 0.00000453, y: -56.709953}
m_SizeDelta: {x: 140, y: 25.63}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5249522615219112361
CanvasRenderer:
@ -3960,7 +3960,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7254902, g: 0.6745098, b: 0.5921569, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -3977,7 +3977,7 @@ MonoBehaviour:
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u971E\u5149"
@ -4463,7 +4463,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5435107760440187052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@ -4472,8 +4472,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.00001049, y: -27.5}
m_SizeDelta: {x: 42.44, y: 217.55}
m_AnchoredPosition: {x: -0.6, y: -4.69}
m_SizeDelta: {x: 334.35, y: 91.08}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6417838727945099559
CanvasRenderer:
@ -4510,7 +4510,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -4552,7 +4552,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: -2.73, y: 11.17}
m_AnchoredPosition: {x: -2.73, y: -7.7299514}
m_SizeDelta: {x: 77.76, y: 166.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5262743054186905554
@ -5359,7 +5359,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: -3.8, y: 20}
m_AnchoredPosition: {x: -3.8, y: 34.9}
m_SizeDelta: {x: 69, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3865184907186740080
@ -5853,7 +5853,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: -2.73, y: 11.17}
m_AnchoredPosition: {x: -2.73, y: 25.2}
m_SizeDelta: {x: 77.76, y: 166.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2135589109423993572
@ -6002,7 +6002,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: -3.8, y: 20}
m_AnchoredPosition: {x: -3.8, y: 1.1000485}
m_SizeDelta: {x: 69, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4313834099472813200
@ -6567,7 +6567,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: -29.1}
m_AnchoredPosition: {x: 0, y: -48}
m_SizeDelta: {x: 33.06, y: 33.06}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8525180792685457802
@ -6722,7 +6722,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: 349.08, y: -23}
m_AnchoredPosition: {x: 349.08, y: 44}
m_SizeDelta: {x: 140.15, y: 302.86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &448785580815254590
@ -7212,8 +7212,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: -4.9, y: -36}
m_SizeDelta: {x: 64.57, y: 22.01}
m_AnchoredPosition: {x: 0, y: -29.17}
m_SizeDelta: {x: 140, y: 47.77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5629361465742109342
CanvasRenderer:
@ -7236,7 +7236,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7254902, g: 0.6745098, b: 0.5921569, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -7253,7 +7253,7 @@ MonoBehaviour:
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u971E\u5149"

View File

@ -36,7 +36,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: 0}
m_AnchoredPosition: {x: -22, y: 0}
m_SizeDelta: {x: 534.47, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7002033658535722915
@ -65,7 +65,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 50
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -258,9 +258,9 @@ RectTransform:
m_Father: {fileID: 4102426034733266922}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 447.235, y: -47.1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 163.3, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3367264998638970422
@ -494,7 +494,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: 470.025, y: -47.1}
m_AnchoredPosition: {x: 455.025, y: -47.1}
m_SizeDelta: {x: 112.7, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1803534990402327839
@ -1161,7 +1161,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: 376.17, y: -0.000030518}
m_AnchoredPosition: {x: 328.17, y: -0.000030518}
m_SizeDelta: {x: 160, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6579535534789250383
@ -1317,7 +1317,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: -0.000030518}
m_AnchoredPosition: {x: -66, y: -0.000030518}
m_SizeDelta: {x: 534.47, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5717821184918441897
@ -1346,7 +1346,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 50
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -1385,8 +1385,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: 373.4, y: 0}
m_SizeDelta: {x: 160, y: 94.2}
m_AnchoredPosition: {x: 336.6, y: 0}
m_SizeDelta: {x: 233.7, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &699583724842077893
CanvasRenderer:
@ -1514,7 +1514,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: -20, y: 0}
m_AnchoredPosition: {x: -69, y: 0}
m_SizeDelta: {x: 534.47, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4813092285352941563
@ -1543,7 +1543,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 40
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -1731,7 +1731,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: 190.885, y: -47.1}
m_AnchoredPosition: {x: 205.885, y: -47.1}
m_SizeDelta: {x: 365.58, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5718212465335177630
@ -2032,9 +2032,9 @@ RectTransform:
m_Father: {fileID: 43283598409455616}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 475.025, y: -47.1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 112.7, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6797977827189806262
@ -2188,7 +2188,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: -2.2, y: 0.72}
m_AnchoredPosition: {x: -42, y: 0.72}
m_SizeDelta: {x: 578.9, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2169472794949864871
@ -2384,7 +2384,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 289.6, y: 46}
m_AnchoredPosition: {x: 241.6, y: 46}
m_SizeDelta: {x: 80, y: 4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3729174441718493571
@ -2661,9 +2661,9 @@ RectTransform:
m_Father: {fileID: 43283598409455616}
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: 185.885, y: -47.1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 365.58, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8197229901558156750
@ -3226,9 +3226,9 @@ RectTransform:
m_Father: {fileID: 4102426034733266922}
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: 160.58499, y: -47.1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 310, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7129089383934625793
@ -3821,8 +3821,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: 342, y: 0.000030517}
m_SizeDelta: {x: 160, y: 94.2}
m_AnchoredPosition: {x: 323.17, y: 0.000030517}
m_SizeDelta: {x: 243.86, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6119236962571409926
CanvasRenderer:

View File

@ -111,7 +111,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.000012218952, y: 521}
m_AnchoredPosition: {x: -0.000012218952, y: 507}
m_SizeDelta: {x: 897, y: 40.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7138066295411708012
@ -191,7 +191,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.000012218952, y: 1171}
m_AnchoredPosition: {x: -0.000012218952, y: 1157}
m_SizeDelta: {x: 1010, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3446764593967627788
@ -310,8 +310,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.00003624, y: -58}
m_SizeDelta: {x: 897, y: 1096.3}
m_AnchoredPosition: {x: -0.00003624, y: -54}
m_SizeDelta: {x: 897, y: 1059.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &817148689261127693
CanvasRenderer:
@ -1411,7 +1411,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: -636}
m_AnchoredPosition: {x: 0, y: -626}
m_SizeDelta: {x: 897, y: 70.475}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6142306008242586207
@ -1435,7 +1435,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.1792453, g: 0.1792453, b: 0.1792453, a: 1}
m_Color: {r: 0.2924528, g: 0.28831434, b: 0.28831434, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -256,7 +256,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: -19.499985, y: 92}
m_AnchoredPosition: {x: 62, y: 57}
m_SizeDelta: {x: 151.4, y: 47.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2980743523305506615
@ -341,8 +341,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: 519.7}
m_SizeDelta: {x: 800, y: 700}
m_AnchoredPosition: {x: 0, y: 633}
m_SizeDelta: {x: 800, y: 473.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5475156715767148022
CanvasRenderer:
@ -575,7 +575,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: 23, y: 182}
m_AnchoredPosition: {x: 23, y: 61}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2380982328895866829
@ -1242,7 +1242,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5549198226521472623
RectTransform:
m_ObjectHideFlags: 0
@ -1750,7 +1750,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: 241, y: -613}
m_AnchoredPosition: {x: 219, y: -353}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6374787610107455916
@ -1964,7 +1964,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1000258875902609876
RectTransform:
m_ObjectHideFlags: 0
@ -2044,7 +2044,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8368375225317432911
RectTransform:
m_ObjectHideFlags: 0
@ -2189,7 +2189,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: 59.200024, y: 88.1}
m_AnchoredPosition: {x: 59.200024, y: 55}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6136785199312557611
@ -2443,7 +2443,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7498108257538012307
RectTransform:
m_ObjectHideFlags: 0
@ -2603,7 +2603,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &824243234944541189
RectTransform:
m_ObjectHideFlags: 0
@ -2694,7 +2694,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: 16, y: 296}
m_AnchoredPosition: {x: 16, y: 202}
m_SizeDelta: {x: 331, y: 119}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4307351021706719171
@ -2848,7 +2848,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: 15, y: -260}
m_AnchoredPosition: {x: -20, y: -224}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &364036160513782008

View File

@ -1483,7 +1483,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1403753927918926205}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@ -1492,8 +1492,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: -2.7, y: 35}
m_SizeDelta: {x: 10, y: 0}
m_AnchoredPosition: {x: 0, y: 14.3}
m_SizeDelta: {x: 316.5, y: 66.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4357930264456814047
CanvasRenderer:
@ -1531,10 +1531,10 @@ MonoBehaviour:
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_AlignByGeometry: 1
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.3
m_Text: "\u51B0\u51E4"
LanguageIndex: 0
@ -2072,18 +2072,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4189088933509125808}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999203, y: 0.9999203, z: 0.9999203}
m_Children:
- {fileID: 7383804225615899479}
m_Father: {fileID: 1286417523841341701}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -382.25943, y: 282}
m_SizeDelta: {x: 74, y: 226}
m_AnchoredPosition: {x: 36.5, y: -171}
m_SizeDelta: {x: 74, y: 346.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &752871563006777882
CanvasRenderer:
@ -2738,8 +2738,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.19997442, y: -75}
m_SizeDelta: {x: 200, y: 31.18}
m_AnchoredPosition: {x: 0.19997442, y: -100.02}
m_SizeDelta: {x: 200, y: 101.24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2113712545837249420
CanvasRenderer:
@ -2779,7 +2779,7 @@ MonoBehaviour:
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "d\u7B49\u7EA71"

View File

@ -1915,8 +1915,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.5999999, y: -93.7}
m_SizeDelta: {x: 170, y: 31.18}
m_AnchoredPosition: {x: 0, y: -93.7}
m_SizeDelta: {x: 220, y: 31.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8355732653919759520
CanvasRenderer:
@ -2714,8 +2714,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.5999999, y: -88}
m_SizeDelta: {x: 81.99, y: 31.18}
m_AnchoredPosition: {x: 0, y: -88}
m_SizeDelta: {x: 220, y: 31.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &12772199742531326
CanvasRenderer:
@ -2986,8 +2986,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.5999999, y: -93.7}
m_SizeDelta: {x: 170, y: 31.18}
m_AnchoredPosition: {x: 0, y: -93.7}
m_SizeDelta: {x: 220, y: 31.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8657971899890022296
CanvasRenderer:
@ -3341,8 +3341,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.5999999, y: -88}
m_SizeDelta: {x: 170, y: 31.18}
m_AnchoredPosition: {x: 0, y: -88}
m_SizeDelta: {x: 220, y: 31.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8115985040223735316
CanvasRenderer:
@ -4018,8 +4018,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.5999999, y: -93.7}
m_SizeDelta: {x: 170, y: 31.18}
m_AnchoredPosition: {x: 0, y: -93.7}
m_SizeDelta: {x: 220, y: 31.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3646773399672605832
CanvasRenderer:
@ -4171,7 +4171,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: 127.5}
m_AnchoredPosition: {x: 0, y: 214.5}
m_SizeDelta: {x: 62, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3729686816201694357
@ -5222,8 +5222,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.5999999, y: -88}
m_SizeDelta: {x: 170, y: 31.18}
m_AnchoredPosition: {x: 0, y: -88}
m_SizeDelta: {x: 220, y: 31.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1891371567561976640
CanvasRenderer:
@ -5500,8 +5500,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: -393, y: 334}
m_SizeDelta: {x: 76, y: 317}
m_AnchoredPosition: {x: -393, y: 248.1}
m_SizeDelta: {x: 76, y: 488.81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2045152789844932229
CanvasRenderer:
@ -5532,7 +5532,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 160f9d20d35bf3c47937e17cd7060d09, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -5574,8 +5574,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: -12.275}
m_SizeDelta: {x: 46.01, y: 217.55}
m_AnchoredPosition: {x: 0, y: 67.64}
m_SizeDelta: {x: 46.01, y: 228.86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4824495337079565219
CanvasRenderer:
@ -5804,7 +5804,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 155.3, y: 0}
m_AnchoredPosition: {x: 141.3, y: 0}
m_SizeDelta: {x: 0, y: 100.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2932693287766199764
@ -6772,7 +6772,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: 229, y: 0}
m_AnchoredPosition: {x: 229, y: 15}
m_SizeDelta: {x: 458.1, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &3792512806959403022
@ -6834,7 +6834,7 @@ MonoBehaviour:
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 100, y: 100}
m_Spacing: {x: 100, y: 60}
m_Spacing: {x: 120, y: 100}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &7864247264475081235

View File

@ -2005,9 +2005,9 @@ MonoBehaviour:
m_Left: 30
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Bottom: 2
m_ChildAlignment: 0
m_Spacing: 0
m_Spacing: 2
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -3131,7 +3131,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 845, y: 133}
m_SizeDelta: {x: 845, y: 161}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4182130950397580521
CanvasRenderer:

View File

@ -68,7 +68,7 @@ end
function this.GetShowPanelData()
local pokemonSData = ConfigManager.GetConfigData(ConfigName.ShenBing, pokemonBackData.tempId)
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
SetTextVerTial(this.heroName, Vector3.New(96.87, 0, 0))
--SetTextVerTial(this.heroName, Vector3.New(96.87, 0, 0))
----this.ShowPokemonLive(pokemonSData)
this.liveRoot.sprite = this.spLoader:LoadSprite(GetResourcePath(pokemonSData.Icon))
--星级
@ -117,7 +117,7 @@ end
function this.NoGetShowPanelData()
local pokemonSData = ConfigManager.GetConfigData(ConfigName.ShenBing, pokemonSid)
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
SetTextVerTial(this.heroName, Vector3.New(96.87, 0, 0))
--SetTextVerTial(this.heroName, Vector3.New(96.87, 0, 0))
this.liveRoot.sprite = this.spLoader:LoadSprite(GetResourcePath(pokemonSData.Icon))
--星级
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, pokemonSData.MaxStar, 2, Vector2.New(60, 60))

View File

@ -64,7 +64,7 @@ end
function this.GetShowPanelData()
local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonBackData.tempId)
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
--SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
this.ShowPokemonLive(pokemonSData)
--星级
local starSize = Vector2.New(65,65)
@ -121,7 +121,7 @@ end
function this.NoGetShowPanelData()
local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonSid)
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
--SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
this.ShowPokemonLive(pokemonSData)
--星级
SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60))