Merge branch 'master' of http://8.138.192.83:39639/robot/robot_client

fk101/lua_probject/extend_project/extend/majiang/changsha/EXGameInfo.lua

@@ -144,15 +144,19 @@ function M:SelectedConfigData()
     local four_win = _config:GetChild("btn_four_win").selected
     local native_hu = _config:GetChild("btn_native_hu").selected
     local queyimen = _config:GetChild("btn_queyimen").selected 
-    local fengding = _config:GetChild("btn_fengding").selected 
-    local banyiquan = _config:GetChild("btn_banyiquan").selected
-    local menqing = _config:GetChild("btn_menqing").selected
 
-	local fengding_score=0
-	if _config:GetController("fengding")  then
+    --获取封顶控制器状态
+	local fengding_score = 0
+	local fengding = false
+
+	if _config:GetController("fengding") then
 		fengding_score=_config:GetController("fengding").selectedIndex
+		-- 判断：0 为 false，1/2/3 等为 true
+		fengding = (fengding_score > 0)
 	end
 
+    local banyiquan = _config:GetChild("btn_banyiquan").selected
+    local menqing = _config:GetChild("btn_menqing").selected
 	local piao_niao1=0
 	if _config:GetController('piao') then
 		piao_niao1=_config:GetController('piao').selectedIndex

fk101/wb_new_ui/.objs/workspace.json

@@ -1,15 +1,27 @@
 {
-  "libview.firstColumnWidth": 413,
+  "libview.firstColumnWidth": 356,
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://m7iejg46jgh8hwv",
+    "ui://1hl55dqmc4r115",
+    "ui://yzaioi79f55qwa",
+    "ui://5cdldr01qaqf9c",
+    "ui://5cdldr01qaqf6x",
+    "ui://5cdldr01qaqf7q",
+    "ui://yzaioi79f55qw4",
+    "ui://yzaioi79f55qw7",
+    "ui://yzaioi79fgao1dk",
+    "ui://27vd145bh1uu3f",
+    "ui://1hl55dqmp6vl1d",
+    "ui://d1qrzqprc4r116",
+    "ui://qubt49z8c4r116",
     "ui://m7iejg46f6brhww",
     "ui://m7iejg46j1207i2r"
   ],
   "test.device": "Xiaomi 9",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46jgh8hwv",
+  "doc.activeDoc": "ui://5cdldr01qaqf9c",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
@@ -35,6 +47,8 @@
     "5cdldr01",
     "/component/Main/images/",
     "5cdldr01",
+    "/component/Main/new_ui/",
+    "5cdldr01",
     "/component/game/",
     "yzaioi79",
     "/",

fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,300" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" pages="0,,1," selected="1"/>
-  <controller name="read" pages="0,,1," selected="1"/>
-  <controller name="offline" pages="0,,1," selected="1"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
-  <controller name="dismiss_room" pages="0,,1," selected="1"/>
-  <controller name="time" pages="0,,1," selected="1"/>
+  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="read" pages="0,,1," selected="0"/>
+  <controller name="offline" pages="0,,1," selected="0"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
+  <controller name="dismiss_room" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="0"/>
   <controller name="huxi" pages="0,,1," selected="1"/>
-  <controller name="tuo" pages="0,,1," selected="1"/>
-  <controller name="piao" pages="0,,1," selected="1"/>
-  <controller name="jushou" pages="0,,1," selected="1"/>
-  <controller name="chui" pages="0,,1,,2," selected="2"/>
-  <controller name="sishou" pages="0,,1," selected="1"/>
+  <controller name="tuo" pages="0,,1," selected="0"/>
+  <controller name="piao" pages="0,,1," selected="0"/>
+  <controller name="jushou" pages="0,,1," selected="0"/>
+  <controller name="chui" pages="0,,1,,2," selected="0"/>
+  <controller name="sishou" pages="0,,1," selected="0"/>
   <controller name="zhanji" pages="0,,1," selected="1"/>
-  <controller name="niao" pages="0,,1," selected="1"/>
+  <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n96_fw1u" name="n96" src="qaqf6y" fileName="images/btn_head_test.png" xy="32,60"/>
     <image id="n97_fw1u" name="n97" src="qaqf6z" fileName="images/Rectangle 574.png" xy="-10,197" size="223,139"/>
@@ -56,7 +56,6 @@
     <component id="n41_jali" name="n41" pkg="lkq9ne9s" src="peuq66" fileName="component/VoiceMask(1).xml" xy="34,63" size="133,125">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
-    <text id="n49_m25s" name="huxi" xy="1,269" size="191,30" visible="false" font="ui://5cdldr01qaqf72" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/>
     <component id="n78_fgao" name="info" src="qaqf7g" fileName="component/Main/component/HeadNameBG.xml" xy="-5,203"/>
     <image id="n52_nu0l" name="n52" src="qaqf6u" fileName="component/Main/images/c00.png" xy="35,133" size="130,61" aspect="true" visible="false">
       <gearDisplay controller="tuo" pages="1"/>
@@ -77,10 +76,16 @@
     <image id="n71_o49p" name="n71" src="qaqf7i" fileName="font/images/game/game_new_fonts_01.png" xy="171,155">
       <gearDisplay controller="read" pages="1"/>
     </image>
-    <image id="n74_o49p" name="n74" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-31,335" size="276,61" group="n76_o49p"/>
-    <text id="n60_seby" name="tex_jifen" xy="82,335" size="165,59" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="22222"/>
-    <text id="n75_o49p" name="tex_jifen_text" xy="-37,341" size="102,49" group="n76_o49p" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="战绩"/>
-    <group id="n76_o49p" name="n76" xy="-37,335" size="284,61" advanced="true">
+    <text id="n49_m25s" name="huxi" xy="82,314" size="165,59" group="n101_nqul" font="ui://27vd145bpxed7ik2" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/>
+    <image id="n99_nqul" name="n99" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-31,314" size="276,61" group="n101_nqul"/>
+    <text id="n103_nqul" name="n103" xy="-37,314" size="102,61" group="n101_nqul" font="ui://27vd145bpxed7ik2" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" text="胡息"/>
+    <group id="n101_nqul" name="m49" xy="-37,314" size="284,61" advanced="true">
+      <gearDisplay controller="huxi" pages="1"/>
+    </group>
+    <image id="n74_o49p" name="n74" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-31,379" size="276,61" group="n76_o49p"/>
+    <text id="n60_seby" name="tex_jifen" xy="82,379" size="165,59" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="22222"/>
+    <text id="n75_o49p" name="tex_jifen_text" xy="-37,385" size="102,49" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" text="战绩"/>
+    <group id="n76_o49p" name="n76" xy="-37,379" size="284,61" advanced="true">
       <gearDisplay controller="zhanji" pages="1"/>
     </group>
     <text id="n84_nkur" name="tuoguanTips" xy="183,23" size="302,48" visible="false" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间"/>

fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,300" opaque="false" initName="gcm_info" designImageLayer="1">
-  <controller name="room_owner" pages="0,,1," selected="1"/>
-  <controller name="bank" pages="0,,1," selected="1"/>
-  <controller name="read" pages="0,,1," selected="1"/>
-  <controller name="offline" pages="0,,1," selected="1"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
-  <controller name="time" pages="0,,1," selected="1"/>
+  <controller name="room_owner" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="read" pages="0,,1," selected="0"/>
+  <controller name="offline" pages="0,,1," selected="0"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="0"/>
   <controller name="huxi" pages="0,,1," selected="1"/>
-  <controller name="tuo" pages="0,,1," selected="1"/>
-  <controller name="piao" pages="0,,1," selected="1"/>
-  <controller name="jushou" pages="0,,1," selected="1"/>
-  <controller name="chui" pages="0,,1,,2," selected="2"/>
-  <controller name="sishou" pages="0,,1," selected="1"/>
+  <controller name="tuo" pages="0,,1," selected="0"/>
+  <controller name="piao" pages="0,,1," selected="0"/>
+  <controller name="jushou" pages="0,,1," selected="0"/>
+  <controller name="chui" pages="0,,1,,2," selected="0"/>
+  <controller name="sishou" pages="0,,1," selected="0"/>
   <controller name="zhanji" pages="0,,1," selected="1"/>
-  <controller name="niao" pages="0,,1," selected="1"/>
+  <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n97_fw1u" name="n97" src="qaqf6y" fileName="images/btn_head_test.png" xy="35,88"/>
     <image id="n98_fw1u" name="n98" src="qaqf6z" fileName="images/Rectangle 574.png" xy="-11,226" size="223,130"/>
@@ -60,10 +60,10 @@
     <component id="n45_jali" name="n45" pkg="lkq9ne9s" src="peuq66" fileName="component/VoiceMask(1).xml" xy="53,-11">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
-    <image id="n95_o0c1" name="n95" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-15,323" size="276,61" group="n49_lr5d"/>
-    <text id="n48_lr5d" name="huxi" xy="98,324" size="163,58" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="11111"/>
-    <text id="n53_m25s" name="n53" xy="-15,329" size="88,49" group="n49_lr5d" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" bold="true" text="胡息&#xA;"/>
-    <group id="n49_lr5d" name="n49" xy="-15,323" size="276,61" visible="false" advanced="true">
+    <image id="n95_o0c1" name="n95" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-37,320" size="276,61" group="n49_lr5d"/>
+    <text id="n48_lr5d" name="huxi" xy="76,321" size="163,58" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="11111"/>
+    <text id="n53_m25s" name="n53" xy="-37,326" size="88,49" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="36" color="#8c3312" align="center" vAlign="middle" autoSize="none" text="胡息&#xA;"/>
+    <group id="n49_lr5d" name="n49" xy="-37,320" size="276,61" advanced="true">
       <gearDisplay controller="huxi" pages="1"/>
     </group>
     <image id="n54_nu0l" name="n54" src="qaqf6u" fileName="component/Main/images/c00.png" xy="202,83" visible="false">
@@ -77,10 +77,10 @@
     <image id="n60_enxu" name="n60" src="qaqf7h" fileName="images/jiachui.png" xy="156,79">
       <gearDisplay controller="chui" pages="1,2"/>
     </image>
-    <image id="n71_o49p" name="n71" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-36,335" size="276,61" group="n74_o49p"/>
-    <text id="n72_o49p" name="tex_jifen" xy="77,336" size="160,57" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="22222"/>
-    <text id="n73_o49p" name="tex_jifen_text" xy="-32,343" size="84,49" group="n74_o49p" fontSize="36" color="#8c3312" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="战绩"/>
-    <group id="n74_o49p" name="n74" xy="-36,335" size="276,61" advanced="true">
+    <image id="n71_o49p" name="n71" src="qaqf7j" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-37,384" size="276,61" group="n74_o49p"/>
+    <text id="n72_o49p" name="tex_jifen" xy="76,385" size="160,57" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="22222"/>
+    <text id="n73_o49p" name="tex_jifen_text" xy="-33,392" size="84,49" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="36" color="#8c3312" align="center" vAlign="middle" leading="0" autoSize="none" text="战绩"/>
+    <group id="n74_o49p" name="n74" xy="-37,384" size="276,61" advanced="true">
       <gearDisplay controller="zhanji" pages="1"/>
     </group>
     <text id="n82_nkur" name="tuoguanTips" xy="202,75" size="533,49" visible="false" fontSize="36" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml

@@ -2,7 +2,7 @@
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
   <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,洗牌" selected="2"/>
+  <controller name="action" pages="2,空,0,准备,1,洗牌" selected="0"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
@@ -31,7 +31,7 @@
       <relation target="" sidePair="width-width"/>
     </component>
     <component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="63,114" size="200,355">
-      <relation target="" sidePair="right-right"/>
+      <relation target="" sidePair="left-left"/>
     </component>
     <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="49,767" size="200,336">
       <gearXY controller="state" pages="0,1,2,3" values="69,662|49,767|54,675|48,570"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml

@@ -2,19 +2,19 @@
 <component size="200,300" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
-  <controller name="read" pages="0,,1," selected="1"/>
-  <controller name="offline" pages="0,,1," selected="1"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
-  <controller name="dismiss_room" pages="0,,1," selected="1"/>
-  <controller name="time" pages="0,,1," selected="1"/>
+  <controller name="read" pages="0,,1," selected="0"/>
+  <controller name="offline" pages="0,,1," selected="0"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
+  <controller name="dismiss_room" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="0"/>
   <controller name="huxi" pages="0,,1," selected="1"/>
   <controller name="tuo" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1," selected="0"/>
   <controller name="jushou" pages="0,,1," selected="0"/>
-  <controller name="chui" pages="0,,1,,2," selected="2"/>
+  <controller name="chui" pages="0,,1,,2," selected="0"/>
   <controller name="sishou" pages="0,,1," selected="0"/>
   <controller name="zhanji" pages="0,,1," selected="1"/>
-  <controller name="tuoguan" pages="0,,1," selected="1"/>
+  <controller name="tuoguan" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n77_o49p" name="n77" src="o49p1cj" fileName="component/Main/component/new_ui/touxiang_img.png" xy="0,0" size="201,306"/>
     <image id="n28_e54q" name="n28" src="lwcl2m" fileName="font/images/head/index_bg_01.png" pkg="27vd145b" xy="-2,-68" size="100,98" group="n33_e7qn" aspect="true" visible="false"/>
@@ -63,10 +63,10 @@
     <component id="n41_jali" name="n41" src="h1uu2j" fileName="component/VoiceMask(1).xml" pkg="l0ds4ys6" xy="31,3">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
-    <image id="n73_o49p" name="n73" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="1,360" size="199,53" group="n51_m25s" aspect="true"/>
-    <text id="n49_m25s" name="huxi" xy="112,360" size="89,49" group="n51_m25s" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="1111111"/>
-    <text id="n50_m25s" name="n50" xy="5,360" size="75,49" group="n51_m25s" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" autoSize="none" singleLine="true" text="胡息&#xA;"/>
-    <group id="n51_m25s" name="n51" xy="1,360" size="200,53" advanced="true">
+    <image id="n73_o49p" name="n73" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-1,303" size="199,53" group="n51_m25s" aspect="true"/>
+    <text id="n49_m25s" name="huxi" xy="110,303" size="89,49" group="n51_m25s" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="1111111"/>
+    <text id="n50_m25s" name="n50" xy="3,303" size="75,49" group="n51_m25s" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" autoSize="none" singleLine="true" text="胡息&#xA;"/>
+    <group id="n51_m25s" name="n51" xy="-1,303" size="200,53" advanced="true">
       <gearDisplay controller="huxi" pages="1"/>
     </group>
     <image id="n52_nu0l" name="n52" src="f55qw3" fileName="component/Main/images/c00.png" xy="-2,4" visible="false">
@@ -94,10 +94,10 @@
     <image id="n71_o49p" name="n71" src="f7zuchj" fileName="font/images/game/game_new_fonts_01.png" pkg="27vd145b" xy="202,194">
       <gearDisplay controller="read" pages="1"/>
     </image>
-    <image id="n74_o49p" name="n74" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="0,305" size="199,53" group="n76_o49p"/>
-    <text id="n60_seby" name="tex_jifen" xy="113,306" size="87,49" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="22222"/>
-    <text id="n75_o49p" name="tex_jifen_text" xy="6,305" size="77,49" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" autoSize="none" text="战绩"/>
-    <group id="n76_o49p" name="n76" xy="0,305" size="200,53" advanced="true">
+    <image id="n74_o49p" name="n74" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-1,358" size="199,53" group="n76_o49p"/>
+    <text id="n60_seby" name="tex_jifen" xy="112,359" size="87,49" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="22222"/>
+    <text id="n75_o49p" name="tex_jifen_text" xy="5,358" size="77,49" group="n76_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" autoSize="none" text="战绩"/>
+    <group id="n76_o49p" name="n76" xy="-1,358" size="200,53" advanced="true">
       <gearDisplay controller="zhanji" pages="1"/>
     </group>
     <text id="n84_nkur" name="tuoguanTips" xy="0,-53" size="302,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,300" opaque="false" initName="gcm_info" designImageLayer="1">
-  <controller name="room_owner" pages="0,,1," selected="1"/>
-  <controller name="bank" pages="0,,1," selected="1"/>
+  <controller name="room_owner" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
-  <controller name="offline" pages="0,,1," selected="1"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
-  <controller name="time" pages="0,,1," selected="1"/>
+  <controller name="offline" pages="0,,1," selected="0"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="0"/>
   <controller name="huxi" pages="0,,1," selected="1"/>
   <controller name="tuo" pages="0,,1," selected="0"/>
-  <controller name="piao" pages="0,,1," selected="1"/>
-  <controller name="jushou" pages="0,,1," selected="1"/>
-  <controller name="chui" pages="0,,1,,2," selected="2"/>
-  <controller name="sishou" pages="0,,1," selected="1"/>
+  <controller name="piao" pages="0,,1," selected="0"/>
+  <controller name="jushou" pages="0,,1," selected="0"/>
+  <controller name="chui" pages="0,,1,,2," selected="0"/>
+  <controller name="sishou" pages="0,,1," selected="0"/>
   <controller name="zhanji" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n76_o49p" name="n76" src="o49p1cj" fileName="component/Main/component/new_ui/touxiang_img.png" xy="0,0" size="201,306"/>
@@ -68,10 +68,10 @@
     <component id="n45_jali" name="n45" src="h1uu2j" fileName="component/VoiceMask(1).xml" pkg="l0ds4ys6" xy="31,3">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
-    <image id="n75_o49p" name="n75" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="0,358" size="195,53" group="n49_lr5d" aspect="true"/>
-    <text id="n48_lr5d" name="huxi" xy="107,359" size="92,47" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" singleLine="true" text="11111"/>
-    <text id="n53_m25s" name="n53" xy="-1,358" size="80,48" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" autoSize="none" singleLine="true" text="胡息&#xA;"/>
-    <group id="n49_lr5d" name="n49" xy="-1,358" size="200,53" advanced="true">
+    <image id="n75_o49p" name="n75" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="0,303" size="195,53" group="n49_lr5d" aspect="true"/>
+    <text id="n48_lr5d" name="huxi" xy="107,304" size="92,47" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" singleLine="true" text="11111"/>
+    <text id="n53_m25s" name="n53" xy="-1,303" size="80,48" group="n49_lr5d" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" autoSize="none" singleLine="true" text="胡息&#xA;"/>
+    <group id="n49_lr5d" name="n49" xy="-1,303" size="200,53" advanced="true">
       <gearDisplay controller="huxi" pages="1"/>
     </group>
     <image id="n54_nu0l" name="n54" src="f55qw3" fileName="component/Main/images/c00.png" xy="-122,3" visible="false">
@@ -92,10 +92,10 @@
     <image id="n60_enxu" name="n60" src="enxu14r" fileName="images/jiachui.png" xy="201,76">
       <gearDisplay controller="chui" pages="1,2"/>
     </image>
-    <image id="n71_o49p" name="n71" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-1,303" size="199,53" group="n74_o49p" aspect="true"/>
-    <text id="n72_o49p" name="tex_jifen" xy="109,303" size="90,49" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="22222"/>
-    <text id="n73_o49p" name="tex_jifen_text" xy="0,304" size="79,47" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" leading="0" autoSize="none" text="战绩"/>
-    <group id="n74_o49p" name="n74" xy="-1,303" size="200,53" advanced="true">
+    <image id="n71_o49p" name="n71" src="o49p1cw" fileName="component/Main/new_ui/jifen_bg_img.png" xy="-1,358" size="199,53" group="n74_o49p" aspect="true"/>
+    <text id="n72_o49p" name="tex_jifen" xy="109,358" size="90,49" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="22222"/>
+    <text id="n73_o49p" name="tex_jifen_text" xy="0,359" size="79,47" group="n74_o49p" font="ui://27vd145bpxed7ik2" fontSize="30" color="#512e06" align="center" vAlign="middle" leading="0" autoSize="none" text="战绩"/>
+    <group id="n74_o49p" name="n74" xy="-1,358" size="200,53" advanced="true">
       <gearDisplay controller="zhanji" pages="1"/>
     </group>
     <text id="n82_nkur" name="tuoguanTips" xy="0,-55" size="237,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>