Skip to content

Commit bfb05aa

Browse files
AlianBlankAlianBlank
committed
[修改] 修改UGUI的代码适配
1 parent c2515b9 commit bfb05aa

File tree

12 files changed

+406
-183
lines changed

12 files changed

+406
-183
lines changed

‎Assets/Bundles/UI/UILogin/UILogin.prefab‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 6495906129541639160}
34+
m_RootOrder: 4
3435
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3536
m_AnchorMin: {x: 0.5, y: 0.5}
3637
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -110,6 +111,7 @@ RectTransform:
110111
m_ConstrainProportionsScale: 0
111112
m_Children: []
112113
m_Father: {fileID: 6495906129541639160}
114+
m_RootOrder: 3
113115
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
114116
m_AnchorMin: {x: 0.5, y: 0.5}
115117
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -189,6 +191,7 @@ RectTransform:
189191
m_ConstrainProportionsScale: 0
190192
m_Children: []
191193
m_Father: {fileID: 9113172614068112471}
194+
m_RootOrder: 1
192195
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
193196
m_AnchorMin: {x: 0, y: 0}
194197
m_AnchorMax: {x: 1, y: 1}
@@ -268,6 +271,7 @@ RectTransform:
268271
m_ConstrainProportionsScale: 0
269272
m_Children: []
270273
m_Father: {fileID: 9113172614068112471}
274+
m_RootOrder: 0
271275
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
272276
m_AnchorMin: {x: 0, y: 0}
273277
m_AnchorMax: {x: 1, y: 1}
@@ -327,7 +331,6 @@ GameObject:
327331
- component: {fileID: 6495906129541639160}
328332
- component: {fileID: 4613360381633948882}
329333
- component: {fileID: 8839362463516073621}
330-
- component: {fileID: 2218462477645819103}
331334
m_Layer: 5
332335
m_Name: UILogin
333336
m_TagString: Untagged
@@ -353,6 +356,7 @@ RectTransform:
353356
- {fileID: 5780244028311068108}
354357
- {fileID: 1529636908}
355358
m_Father: {fileID: 0}
359+
m_RootOrder: 0
356360
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
357361
m_AnchorMin: {x: 0, y: 0}
358362
m_AnchorMax: {x: 1, y: 1}
@@ -397,28 +401,6 @@ MonoBehaviour:
397401
m_FillOrigin: 0
398402
m_UseSpriteMesh: 0
399403
m_PixelsPerUnitMultiplier: 1
400-
--- !u!114 &2218462477645819103
401-
MonoBehaviour:
402-
m_ObjectHideFlags: 0
403-
m_CorrespondingSourceObject: {fileID: 0}
404-
m_PrefabInstance: {fileID: 0}
405-
m_PrefabAsset: {fileID: 0}
406-
m_GameObject: {fileID: 3717230910800151908}
407-
m_Enabled: 1
408-
m_EditorHideFlags: 0
409-
m_Script: {fileID: 11500000, guid: 846434b62f389cb4a8d060dbb0e2e66e, type: 3}
410-
m_Name:
411-
m_EditorClassIdentifier:
412-
mUserName__Placeholder: {fileID: 5546185728079920783}
413-
mUserName__Text: {fileID: 2292713627810620296}
414-
mUserName: {fileID: 4555843164057052725}
415-
mPassword__Placeholder: {fileID: 967379718805668231}
416-
mPassword__Text: {fileID: 9038635317787761321}
417-
mPassword: {fileID: 8573712159762856585}
418-
menter__Text: {fileID: 1318175656029300258}
419-
menter: {fileID: 8766712165321420368}
420-
mErrorText: {fileID: 7984387176934010493}
421-
mTitleText: {fileID: 1529636909}
422404
--- !u!1 &5484277854968332070
423405
GameObject:
424406
m_ObjectHideFlags: 0
@@ -450,6 +432,7 @@ RectTransform:
450432
m_ConstrainProportionsScale: 0
451433
m_Children: []
452434
m_Father: {fileID: 4309198269312514102}
435+
m_RootOrder: 1
453436
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
454437
m_AnchorMin: {x: 0, y: 0}
455438
m_AnchorMax: {x: 1, y: 1}
@@ -532,6 +515,7 @@ RectTransform:
532515
- {fileID: 2830431439897108022}
533516
- {fileID: 8664606933270837399}
534517
m_Father: {fileID: 6495906129541639160}
518+
m_RootOrder: 0
535519
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
536520
m_AnchorMin: {x: 0.5, y: 0.5}
537521
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -678,6 +662,7 @@ RectTransform:
678662
- {fileID: 2804079040756857249}
679663
- {fileID: 1837286969459304466}
680664
m_Father: {fileID: 6495906129541639160}
665+
m_RootOrder: 1
681666
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
682667
m_AnchorMin: {x: 0.5, y: 0.5}
683668
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -821,6 +806,7 @@ RectTransform:
821806
m_ConstrainProportionsScale: 0
822807
m_Children: []
823808
m_Father: {fileID: 8692189567781611380}
809+
m_RootOrder: 0
824810
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
825811
m_AnchorMin: {x: 0, y: 0}
826812
m_AnchorMax: {x: 1, y: 1}
@@ -902,6 +888,7 @@ RectTransform:
902888
m_Children:
903889
- {fileID: 2562583946470222857}
904890
m_Father: {fileID: 6495906129541639160}
891+
m_RootOrder: 2
905892
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
906893
m_AnchorMin: {x: 0.5, y: 0.5}
907894
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1021,6 +1008,7 @@ RectTransform:
10211008
m_ConstrainProportionsScale: 0
10221009
m_Children: []
10231010
m_Father: {fileID: 4309198269312514102}
1011+
m_RootOrder: 0
10241012
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10251013
m_AnchorMin: {x: 0, y: 0}
10261014
m_AnchorMax: {x: 1, y: 1}

‎Assets/Bundles/UI/UILogin/UILogin_atlas0.png.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Bundles/UI/UILogin/UIPlayerCreate.prefab‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 2098744197}
34+
m_RootOrder: 0
3435
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3536
m_AnchorMin: {x: 0, y: 0}
3637
m_AnchorMax: {x: 1, y: 1}
@@ -112,6 +113,7 @@ RectTransform:
112113
m_Children:
113114
- {fileID: 1852236502}
114115
m_Father: {fileID: 6974171875898813332}
116+
m_RootOrder: 1
115117
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
116118
m_AnchorMin: {x: 0.5, y: 0.5}
117119
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -231,6 +233,7 @@ RectTransform:
231233
m_ConstrainProportionsScale: 0
232234
m_Children: []
233235
m_Father: {fileID: 1396575391}
236+
m_RootOrder: 0
234237
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
235238
m_AnchorMin: {x: 0, y: 0}
236239
m_AnchorMax: {x: 1, y: 1}
@@ -310,6 +313,7 @@ RectTransform:
310313
m_ConstrainProportionsScale: 0
311314
m_Children: []
312315
m_Father: {fileID: 2098744197}
316+
m_RootOrder: 1
313317
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
314318
m_AnchorMin: {x: 0, y: 0}
315319
m_AnchorMax: {x: 1, y: 1}
@@ -392,6 +396,7 @@ RectTransform:
392396
- {fileID: 952761294}
393397
- {fileID: 1915558860}
394398
m_Father: {fileID: 6974171875898813332}
399+
m_RootOrder: 0
395400
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
396401
m_AnchorMin: {x: 0.5, y: 0.5}
397402
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -535,6 +540,7 @@ RectTransform:
535540
m_ConstrainProportionsScale: 0
536541
m_Children: []
537542
m_Father: {fileID: 6974171875898813332}
543+
m_RootOrder: 3
538544
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
539545
m_AnchorMin: {x: 0.5, y: 0.5}
540546
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -614,6 +620,7 @@ RectTransform:
614620
m_ConstrainProportionsScale: 0
615621
m_Children: []
616622
m_Father: {fileID: 6974171875898813332}
623+
m_RootOrder: 2
617624
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
618625
m_AnchorMin: {x: 0.5, y: 0.5}
619626
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -673,7 +680,6 @@ GameObject:
673680
- component: {fileID: 6974171875898813332}
674681
- component: {fileID: 1871831433810119820}
675682
- component: {fileID: 221503345481422919}
676-
- component: {fileID: 8561428317555649077}
677683
m_Layer: 5
678684
m_Name: UIPlayerCreate
679685
m_TagString: Untagged
@@ -698,6 +704,7 @@ RectTransform:
698704
- {fileID: 1608644155162068917}
699705
- {fileID: 1932784661006176964}
700706
m_Father: {fileID: 0}
707+
m_RootOrder: 0
701708
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
702709
m_AnchorMin: {x: 0, y: 0}
703710
m_AnchorMax: {x: 1, y: 1}
@@ -742,22 +749,3 @@ MonoBehaviour:
742749
m_FillOrigin: 0
743750
m_UseSpriteMesh: 0
744751
m_PixelsPerUnitMultiplier: 1
745-
--- !u!114 &8561428317555649077
746-
MonoBehaviour:
747-
m_ObjectHideFlags: 0
748-
m_CorrespondingSourceObject: {fileID: 0}
749-
m_PrefabInstance: {fileID: 0}
750-
m_PrefabAsset: {fileID: 0}
751-
m_GameObject: {fileID: 8505004326850407100}
752-
m_Enabled: 1
753-
m_EditorHideFlags: 0
754-
m_Script: {fileID: 11500000, guid: 26261bf4bb1ab9945a88872cf1a17e5a, type: 3}
755-
m_Name:
756-
m_EditorClassIdentifier:
757-
mUserName__Placeholder: {fileID: 952761295}
758-
mUserName__Text: {fileID: 1915558861}
759-
mUserName: {fileID: 2098744198}
760-
menter__Text: {fileID: 1852236503}
761-
menter: {fileID: 1396575392}
762-
mErrorText: {fileID: 1460865224826972220}
763-
mUserNameText: {fileID: 6183821717496119194}

‎Assets/Bundles/UI/UILogin/UIPlayerList.prefab‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ GameObject:
1111
- component: {fileID: 154639098118050254}
1212
- component: {fileID: 4475720970114855202}
1313
- component: {fileID: 6834187986253424643}
14-
- component: {fileID: 7224851894620115801}
1514
m_Layer: 5
1615
m_Name: UIPlayerList
1716
m_TagString: Untagged
@@ -34,6 +33,7 @@ RectTransform:
3433
- {fileID: 2085689985132768796}
3534
- {fileID: 210480444752561334}
3635
m_Father: {fileID: 0}
36+
m_RootOrder: 0
3737
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3838
m_AnchorMin: {x: 0, y: 0}
3939
m_AnchorMax: {x: 1, y: 1}
@@ -78,31 +78,6 @@ MonoBehaviour:
7878
m_FillOrigin: 0
7979
m_UseSpriteMesh: 0
8080
m_PixelsPerUnitMultiplier: 1
81-
--- !u!114 &7224851894620115801
82-
MonoBehaviour:
83-
m_ObjectHideFlags: 0
84-
m_CorrespondingSourceObject: {fileID: 0}
85-
m_PrefabInstance: {fileID: 0}
86-
m_PrefabAsset: {fileID: 0}
87-
m_GameObject: {fileID: 549651788788559724}
88-
m_Enabled: 1
89-
m_EditorHideFlags: 0
90-
m_Script: {fileID: 11500000, guid: 2684c31495b7a9144b4bdbf63147581a, type: 3}
91-
m_Name:
92-
m_EditorClassIdentifier:
93-
mleft_Panel__ScrollView__Viewport__Content: {fileID: 4719756363520927840}
94-
mleft_Panel__ScrollView__Viewport: {fileID: 2810936600648198860}
95-
mleft_Panel__ScrollView__ScrollbarVertical__SlidingArea__Handle: {fileID: 4860815809108823193}
96-
mleft_Panel__ScrollView__ScrollbarVertical__SlidingArea: {fileID: 6567126738140765497}
97-
mleft_Panel__ScrollView__ScrollbarVertical: {fileID: 496777901357079672}
98-
mleft_Panel__ScrollView: {fileID: 4219988605654962417}
99-
mleft_Panel: {fileID: 377486107412945512}
100-
mright_Panel__selected_name: {fileID: 6124899194018379171}
101-
mright_Panel__selected_level: {fileID: 1267511026264251920}
102-
mright_Panel__selected_icon: {fileID: 2393226436000773801}
103-
mright_Panel__login_button__Text: {fileID: 4618924467333207349}
104-
mright_Panel__login_button: {fileID: 220711330221476991}
105-
mright_Panel: {fileID: 3403833902466623619}
10681
--- !u!1 &558148903261284630
10782
GameObject:
10883
m_ObjectHideFlags: 0
@@ -134,6 +109,7 @@ RectTransform:
134109
m_ConstrainProportionsScale: 0
135110
m_Children: []
136111
m_Father: {fileID: 210480444752561334}
112+
m_RootOrder: 0
137113
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
138114
m_AnchorMin: {x: 0.5, y: 0.5}
139115
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -213,6 +189,7 @@ RectTransform:
213189
m_ConstrainProportionsScale: 0
214190
m_Children: []
215191
m_Father: {fileID: 210480444752561334}
192+
m_RootOrder: 1
216193
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
217194
m_AnchorMin: {x: 0.5, y: 0.5}
218195
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -295,6 +272,7 @@ RectTransform:
295272
- {fileID: 4741443086026619021}
296273
- {fileID: 9056022447163094561}
297274
m_Father: {fileID: 2085689985132768796}
275+
m_RootOrder: 0
298276
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
299277
m_AnchorMin: {x: 0, y: 0}
300278
m_AnchorMax: {x: 1, y: 1}
@@ -404,6 +382,7 @@ RectTransform:
404382
- {fileID: 647033646573197629}
405383
- {fileID: 1587290306921034284}
406384
m_Father: {fileID: 154639098118050254}
385+
m_RootOrder: 1
407386
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
408387
m_AnchorMin: {x: 0.5, y: 0}
409388
m_AnchorMax: {x: 1, y: 1}
@@ -479,6 +458,7 @@ RectTransform:
479458
m_ConstrainProportionsScale: 0
480459
m_Children: []
481460
m_Father: {fileID: 6567126738140765497}
461+
m_RootOrder: 0
482462
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
483463
m_AnchorMin: {x: 0, y: 0}
484464
m_AnchorMax: {x: 0, y: 0}
@@ -556,6 +536,7 @@ RectTransform:
556536
m_Children:
557537
- {fileID: 8033074642203717111}
558538
m_Father: {fileID: 210480444752561334}
539+
m_RootOrder: 3
559540
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
560541
m_AnchorMin: {x: 0.5, y: 0.5}
561542
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -677,6 +658,7 @@ RectTransform:
677658
m_Children:
678659
- {fileID: 6567126738140765497}
679660
m_Father: {fileID: 6532977644519944362}
661+
m_RootOrder: 1
680662
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
681663
m_AnchorMin: {x: 1, y: 0}
682664
m_AnchorMax: {x: 1, y: 1}
@@ -802,6 +784,7 @@ RectTransform:
802784
m_Children:
803785
- {fileID: 6532977644519944362}
804786
m_Father: {fileID: 154639098118050254}
787+
m_RootOrder: 0
805788
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
806789
m_AnchorMin: {x: 0, y: 0}
807790
m_AnchorMax: {x: 0.5, y: 1}
@@ -876,6 +859,7 @@ RectTransform:
876859
m_Children:
877860
- {fileID: 1181825289009744054}
878861
m_Father: {fileID: 9056022447163094561}
862+
m_RootOrder: 0
879863
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
880864
m_AnchorMin: {x: 0, y: 0}
881865
m_AnchorMax: {x: 1, y: 1}
@@ -915,6 +899,7 @@ RectTransform:
915899
m_Children:
916900
- {fileID: 4719756363520927840}
917901
m_Father: {fileID: 6532977644519944362}
902+
m_RootOrder: 0
918903
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
919904
m_AnchorMin: {x: 0, y: 0}
920905
m_AnchorMax: {x: 0, y: 0}
@@ -1003,6 +988,7 @@ RectTransform:
1003988
m_ConstrainProportionsScale: 0
1004989
m_Children: []
1005990
m_Father: {fileID: 1587290306921034284}
991+
m_RootOrder: 0
1006992
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1007993
m_AnchorMin: {x: 0, y: 0}
1008994
m_AnchorMax: {x: 1, y: 1}
@@ -1082,6 +1068,7 @@ RectTransform:
10821068
m_ConstrainProportionsScale: 0
10831069
m_Children: []
10841070
m_Father: {fileID: 210480444752561334}
1071+
m_RootOrder: 2
10851072
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10861073
m_AnchorMin: {x: 0.5, y: 0.5}
10871074
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1157,6 +1144,7 @@ RectTransform:
11571144
m_ConstrainProportionsScale: 0
11581145
m_Children: []
11591146
m_Father: {fileID: 4741443086026619021}
1147+
m_RootOrder: 0
11601148
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11611149
m_AnchorMin: {x: 0, y: 0}
11621150
m_AnchorMax: {x: 1, y: 1}

0 commit comments

Comments
 (0)