Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
ZhangBiao 2021-02-24 20:25:08 +08:00
commit 180ad3ab31
7 changed files with 129 additions and 127 deletions

View File

@ -20523,7 +20523,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: -307.49, y: -610.85}
m_AnchoredPosition: {x: -8, y: -612}
m_SizeDelta: {x: 174.95, y: 60.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5790058971553328183
@ -21303,7 +21303,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: -130.2, y: -610.85}
m_AnchoredPosition: {x: 169.28996, y: -612}
m_SizeDelta: {x: 179.64, y: 47.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5724748639834269356
@ -22594,7 +22594,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: 364.1, y: -613.7}
m_AnchoredPosition: {x: 168, y: -649}
m_SizeDelta: {x: 179.64, y: 47.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &714262719346631100
@ -23274,7 +23274,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: 186.85, y: -612.6}
m_AnchoredPosition: {x: -9.2500305, y: -647.89996}
m_SizeDelta: {x: 174.87, y: 59.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7088705496420780131

View File

@ -341,7 +341,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: 297, y: 0}
m_AnchoredPosition: {x: 366, y: 0}
m_SizeDelta: {x: 229.75, y: 80.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &589911703
@ -421,7 +421,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: 124, y: 0}
m_AnchoredPosition: {x: 181, y: 0}
m_SizeDelta: {x: 229.75, y: 80.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &786543042
@ -1058,8 +1058,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: 48.1, y: -2.4}
m_SizeDelta: {x: 229.75, y: 80.7}
m_AnchoredPosition: {x: 288.86, y: 3.2}
m_SizeDelta: {x: 711.3, y: 114.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1653279849
CanvasRenderer:
@ -1099,8 +1099,8 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6781\u901F\u63A2\u7D22\u7279\u6743\uFF1A\u6BCF\u5929\u589E\u52A0\u514D\u8D392\u6B21\uFF0C\u589E\u52A0\u8D2D\u4E708\u6B21"
LanguageIndex: 0
@ -1294,7 +1294,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: -147, y: 170}
m_AnchoredPosition: {x: -223, y: 176}
m_SizeDelta: {x: 229.75, y: 80.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1899479600
@ -1332,7 +1332,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 49
m_Alignment: 4
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -1415,8 +1415,8 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\uFF08\u5269\u4F59\u4E09\u6B21\uFF09"
LanguageIndex: 0
@ -1600,13 +1600,13 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 49
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5269\u4F59:28\u5929"
@ -2068,13 +2068,13 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 49
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u53BB\u6FC0\u6D3B"
@ -13265,8 +13265,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 60
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 5
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 60
m_Alignment: 4
m_AlignByGeometry: 0

View File

@ -575,7 +575,7 @@ MonoBehaviour:
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u67E5\u770B\u9635\u5BB9"
LanguageIndex: 0
@ -1000,8 +1000,8 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 000
--- !u!114 &1437826904797940286

View File

@ -108,8 +108,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, y: 532}
m_SizeDelta: {x: 384.31, y: 64.41}
m_AnchoredPosition: {x: 0.0012207, y: 529.5}
m_SizeDelta: {x: 934.2, y: 69.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7397857948357516433
CanvasRenderer:
@ -149,7 +149,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u62A2\u593A\u5E76\u6218\u80DC\u5176\u4ED6\u516C\u4F1A\u73A9\u5BB6\u540E\u53EF\u593A\u53D6\u76EE\u680725%\u7684\u79EF\u5206"
@ -370,8 +370,8 @@ 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: 9.099998, y: 0}
m_SizeDelta: {x: 255.8, y: 110}
m_AnchoredPosition: {x: -59.4, y: 0}
m_SizeDelta: {x: 118.8, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8390064380008865295
CanvasRenderer:
@ -405,14 +405,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u79EF\u5206\uFF1A"
LanguageIndex: 0
@ -524,8 +524,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: -150.5, y: 149.6}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: -175.2, y: 131.60007}
m_SizeDelta: {x: 476.3, y: 78.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6515283594731994625
CanvasRenderer:
@ -559,14 +559,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 35
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u65E0\u62A2\u593A\u76EE\u6807\uFF01"
LanguageIndex: 0
@ -1098,8 +1098,8 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "3.65\u4EBF"
LanguageIndex: 0
@ -1137,8 +1137,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: 160, y: 30}
m_AnchoredPosition: {x: 2.9, y: -0.00012207}
m_SizeDelta: {x: 165.7, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2710607836532222016
CanvasRenderer:
@ -1172,14 +1172,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u62A2 \u593A"
LanguageIndex: 0
@ -1303,8 +1303,8 @@ 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: -90, y: 6}
m_SizeDelta: {x: 300.6, y: 110}
m_AnchoredPosition: {x: -70.149994, y: 6}
m_SizeDelta: {x: 340.3, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4426662633916955057
CanvasRenderer:
@ -1338,8 +1338,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -5113,8 +5113,8 @@ 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: 8, y: 0.000061035156}
m_SizeDelta: {x: 255.8, y: 110}
m_AnchoredPosition: {x: -67.3, y: 0.000061035156}
m_SizeDelta: {x: 134.7, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6909700729600544165
CanvasRenderer:
@ -5148,8 +5148,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
@ -5384,7 +5384,7 @@ MonoBehaviour:
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u9009\u62E9\u76EE\u6807"
LanguageIndex: 0

View File

@ -108,8 +108,8 @@ 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: -158.5, y: -4}
m_SizeDelta: {x: 174.2, y: 60}
m_AnchoredPosition: {x: -160.39001, y: -0.5}
m_SizeDelta: {x: 320.78, y: 77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8829824734715542583
CanvasRenderer:
@ -143,8 +143,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -1105,8 +1105,8 @@ 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: 920.7, y: -2.4}
m_SizeDelta: {x: 255.8, y: 110}
m_AnchoredPosition: {x: 919.12, y: -2.4}
m_SizeDelta: {x: 321.76, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1294848083568856036
CanvasRenderer:
@ -1266,8 +1266,8 @@ 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: 163.29999, y: -2.8}
m_SizeDelta: {x: 147.31, y: 81.56}
m_AnchoredPosition: {x: 159.5, y: -2.8}
m_SizeDelta: {x: 318.9, y: 81.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5297566930272573290
CanvasRenderer:
@ -1301,9 +1301,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -1845,8 +1845,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, y: 0.0000026226}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: 0, y: -1.255}
m_SizeDelta: {x: 229.5, y: 80.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5106516613446238423
CanvasRenderer:
@ -1880,14 +1880,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 44
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 44
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6311 \u6218"
LanguageIndex: 0
@ -2001,7 +2001,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: 152.3, y: -1.8}
m_AnchoredPosition: {x: 159, y: -0.000012159}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &441108315031332109
@ -2080,8 +2080,8 @@ 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: 46, y: -638}
m_SizeDelta: {x: 300.6, y: 110}
m_AnchoredPosition: {x: 48.2, y: -638}
m_SizeDelta: {x: 432.2, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2361070194939201357
CanvasRenderer:
@ -2115,8 +2115,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -2239,7 +2239,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: 152.3, y: -1.8}
m_AnchoredPosition: {x: 160.6, y: -0.000012159}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4129961899513844255
@ -3166,8 +3166,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.4, y: -4.2}
m_SizeDelta: {x: 186.7, y: 62.4}
m_AnchoredPosition: {x: -0.9, y: -2.35}
m_SizeDelta: {x: 440.3, y: 78.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7151072974091668893
CanvasRenderer:
@ -3201,8 +3201,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -3320,8 +3320,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, y: 0.0000026226}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: -0.000012398, y: -0.000017166}
m_SizeDelta: {x: 214.2, y: 82.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7083837332560154777
CanvasRenderer:
@ -3355,14 +3355,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 44
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 44
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u62A2 \u593A"
LanguageIndex: 0
@ -3400,8 +3400,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: -67.9}
m_SizeDelta: {x: 214.2, y: 30}
m_AnchoredPosition: {x: 0, y: -69.9}
m_SizeDelta: {x: 291, y: 33.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7083837332785674323
CanvasRenderer:
@ -3531,8 +3531,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 52
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 52
m_Alignment: 4
m_AlignByGeometry: 0
@ -4962,8 +4962,8 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u9F99\u5409\u516C\u4E3B"
LanguageIndex: 0
@ -5089,8 +5089,8 @@ 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: 430.78156, y: -638}
m_SizeDelta: {x: 255.8, y: 110}
m_AnchoredPosition: {x: 427.5, y: -638}
m_SizeDelta: {x: 326.4, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5826706354849993193
CanvasRenderer:
@ -5357,8 +5357,8 @@ 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: 542, y: -2.4}
m_SizeDelta: {x: 300.6, y: 110}
m_AnchoredPosition: {x: 539.6, y: -2.4}
m_SizeDelta: {x: 437.3, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3983948946844971071
CanvasRenderer:
@ -5392,8 +5392,8 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -5478,8 +5478,8 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u65E0\u4F24\u5BB3\u6392\u540D\uFF01"
LanguageIndex: 0

View File

@ -76,7 +76,7 @@ MonoBehaviour:
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6392\u884C\u5956\u52B1"
LanguageIndex: 0
@ -553,8 +553,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: -8.040001, y: -3.2000008}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: -10.375, y: -3.2000008}
m_SizeDelta: {x: -20.75, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8082520961542236668
CanvasRenderer:
@ -603,14 +603,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 52
m_BestFit: 1
m_MinSize: 30
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 0.8
m_Text: "\u516C\u4F1A\u6392\u884C"
LanguageIndex: 0
@ -1314,8 +1314,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: 205, y: 524.7}
m_SizeDelta: {x: 186.7, y: 62.4}
m_AnchoredPosition: {x: 84.126, y: 528.7399}
m_SizeDelta: {x: 742.35, y: 70.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5842510417692443359
CanvasRenderer:
@ -1349,14 +1349,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5956\u52B1\u9053\u5177"
LanguageIndex: 0
@ -1468,8 +1468,8 @@ 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: 106.399994, y: 523.2}
m_SizeDelta: {x: 147.31, y: 81.56}
m_AnchoredPosition: {x: 95.225006, y: 528.75006}
m_SizeDelta: {x: 169.6, y: 70.52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2521297214468645196
CanvasRenderer:
@ -1503,14 +1503,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6392 \u540D"
LanguageIndex: 0

View File

@ -64,6 +64,7 @@ function MsgPanel.ShowOne(msg, action, text, title)
MsgPanel.btn_Left.gameObject:SetActive(true)
MsgPanel.btn_Right.gameObject:SetActive(false)
MsgPanel._toggle.gameObject:SetActive(false)
LayoutRebuilder.ForceRebuildLayoutImmediate(MsgPanel._toggle.transform)
end
--展示两个按钮
@ -87,6 +88,7 @@ function MsgPanel.ShowTwo(msg, leftAction, rightAction, leftText, rightText, tit
else
MsgPanel._toggle.gameObject:SetActive(false)
end
LayoutRebuilder.ForceRebuildLayoutImmediate(MsgPanel._toggle.transform)
end
function MsgPanel.Hide()