忽略。bytes文件冲突

wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="768,186" extention="Button">
   <controller name="button" pages="2,up,3,down" selected="0"/>
-  <controller name="lev" pages="0,群主,1,代理,2,普通" selected="1"/>
-  <controller name="ban" pages="0,,1," selected="1"/>
+  <controller name="lev" pages="0,群主,1,代理,2,普通" selected="0"/>
+  <controller name="ban" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n10_86ct" name="textBtn_detail" src="c8pn7cyz" fileName="NumberList/Image/hall_club_check3.png" xy="657,57" size="85,72"/>
     <image id="n1_86ct" name="n1" src="c8pn7cyy" fileName="NumberList/Image/Rectangle 2611.png" xy="-9,-3" size="779,198">
       <gearDisplay controller="ban" pages="0"/>
     </image>
@@ -14,12 +13,13 @@
     <image id="n14_qhq4" name="n14" src="qhq47d5p" fileName="NumberList/Image/Rectangle 259-1.png" xy="-6,0">
       <gearDisplay controller="lev" pages="0"/>
     </image>
+    <image id="n10_86ct" name="textBtn_detail" src="c8pn7cyz" fileName="NumberList/Image/hall_club_check3.png" xy="657,57" size="85,72"/>
     <component id="n3_86ct" name="btn_head" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="15,15" size="132,132"/>
-    <text id="n4_86ct" name="name" xy="178,33" size="355,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#ffffff" autoSize="none" text="用户名称1">
+    <text id="n4_86ct" name="name" xy="178,33" size="355,49" font="ui://27vd145bh35o7ilb" fontSize="36" autoSize="none" text="用户名称1">
       <gearColor controller="ban" pages="0,1" values="#000000,#000000|#ffffff,#000000"/>
       <relation target="" sidePair="left-left"/>
     </text>
-    <text id="n5_86ct" name="id" xy="13,147" size="146,38" font="ui://27vd145bh35o7ik0" fontSize="27" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="ID:12312311">
+    <text id="n5_86ct" name="id" xy="13,147" size="146,38" alpha="0.3" font="ui://27vd145bh35o7ik0" fontSize="27" color="#8e0305" align="center" vAlign="middle" bold="true" strokeColor="#8e0305" text="ID:12312311">
       <gearLook controller="ban" pages="1" values="1,0,0,0" default="0.3,0,0,0"/>
       <gearColor controller="ban" pages="0,1" values="#8e0305,#8e0305|#ffffff,#000000"/>
       <relation target="" sidePair="left-left"/>