1

lua_probject/base_project/Game/View/ResultView.lua

@@ -387,6 +387,10 @@ function M:InitBigResult(room, fontsize)
             else
                 item:GetController('self').selectedIndex = 0
             end
+
+            if item:GetChild('head') and item:GetChild('head')._iconObject then
+                ImageLoad.Load(player_info.head_url,item:GetChild('head')._iconObject)
+            end
         end
 
         local btn_continue_game = big_result:GetChild('btn_continue_game')

lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua

@@ -102,6 +102,15 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
             end
 
             obj:GetChild("score").text = jifen .. tili .. limit
+            if info.seat == room.self_player.seat then
+                if roundScore >= 0 then
+                    bgWindow.text = "胜利"
+                    bgWindow:GetController('bianhui').selectedIndex = 0
+                else
+                    bgWindow.text = "失败"
+                    bgWindow:GetController('bianhui').selectedIndex = 1
+                end
+            end
         else
             local jifen = ""
             if roundScore >= 0 then
@@ -128,12 +137,14 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
             obj:GetChild("score").text = jifen .. tili
         end
 
-        if info.seat == room.self_player.seat and roundScore>=0 then
-            bgWindow.text = "胜利"
-            bgWindow:GetController('bianhui').selectedIndex = 0
-        else
-            bgWindow.text = "失败"
-            bgWindow:GetController('bianhui').selectedIndex = 1
+        if info.seat == room.self_player.seat then
+            if roundScore >= 0 then
+                bgWindow.text = "胜利"
+                bgWindow:GetController('bianhui').selectedIndex = 0
+            else
+                bgWindow.text = "失败"
+                bgWindow:GetController('bianhui').selectedIndex = 1
+            end
         end
 
         local list_residue = obj:GetChild('list_residue')

lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua

@@ -40,6 +40,7 @@ function M:InitData(over, room, result, total_result, callback)
     local _sdkCtr = self._view:GetController('sdk')
     local _icon = self._view:GetChild('win_base')
     local btn_close = self._view:GetChild('btn_close')
+    local ctr_type = self._view:GetController('type')
     self._view:GetChild('tex_roomnum').text = room.room_id
     self._view:GetChild('tex_data').text = os.date('%Y-%m-%d         %H:%M', os.time())
 
@@ -68,7 +69,25 @@ function M:InitData(over, room, result, total_result, callback)
     if result and result.xipai_score then
         xipai.text = "洗牌 积分x" .. result.xipai_score
     end
-
+        if over ~= 2 then
+        if result.liuju then
+            ctr_type.selectedIndex = 2
+        else
+            local info_list = result.info_list
+            for i = 1, #info_list do
+                local is_win = info_list[i].is_win
+                if is_win then
+                    if info_list[i].seat == room.self_player.seat then
+                        ctr_type.selectedIndex = 1
+                    else
+                        ctr_type.selectedIndex = 0
+                    end
+                end
+            end
+        end
+    else
+        ctr_type.selectedIndex = 3
+    end
     if result ~= nil and result.liuju == true then
         _icon.icon = 'ui://Main_RunBeard/liuju'
         _btnCtr.selectedIndex = 0
@@ -108,6 +127,7 @@ function M:InitData(over, room, result, total_result, callback)
             self:AddClearItem(room, result, total_result.info_list, over)
         end
     end
+
     if over == 0 and result.liuju == false then
         --printlog("jiesuanjefeef efef ef1")
         _icon.icon = 'ui://Main_RunBeard/jiesuan'

wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info

@@ -1,19 +1,37 @@
 {
   "objectStatus": {
+    "n19_pt1r": {
+      "collapsed": true
+    },
     "n85_rbpg": {
       "hidden": true
     },
-    "n84_rbpg": {
-      "hidden": true
-    },
-    "n4_fux2": {
-      "hidden": true
+    "n64_pwj4": {
+      "collapsed": true
     },
     "n33_n1ry": {
       "locked": true
     },
+    "n84_rbpg": {
+      "hidden": true
+    },
     "n43_n1ry": {
       "hidden": true
+    },
+    "n45_n1ry": {
+      "collapsed": true
+    },
+    "n51_fmkv": {
+      "collapsed": true
+    },
+    "n55_rx2e": {
+      "collapsed": true
+    },
+    "n4_fux2": {
+      "hidden": true
+    },
+    "n44_n1ry": {
+      "collapsed": true
     }
   }
 }

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml

@@ -1,20 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="over" pages="0,,1,,2,,3," selected="3"/>
-  <controller name="button" pages="0,,1," selected="1"/>
+  <controller name="over" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="button" pages="0,,1," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="owner" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="qipai" pages="0,,1," selected="0"/>
   <controller name="xipai" pages="0,,1," selected="0"/>
   <controller name="hudianpao" pages="0,,1,,2," selected="2"/>
+  <controller name="type" pages="0,,1,,2,,3," selected="2"/>
   <displayList>
+    <image id="n97_o0c1" name="n97" src="o0c18z" fileName="images/clearing_bg1.png" xy="177,25" size="2178,1120"/>
+    <image id="n99_o0c1" name="n99" src="o0c190" fileName="images/clearing_bg2.png" xy="205,131" size="2122,994"/>
+    <image id="n74_p9qe" name="n74" src="ufu92n" fileName="component/clearing/image/aborted_game.png" xy="873,19" size="809,125">
+      <gearDisplay controller="type" pages="2"/>
+      <relation target="" sidePair="center-center"/>
+    </image>
+    <image id="n75_p9qe" name="show_win" src="ufu92o" fileName="component/Main/component/new_ui/niyimh.png" xy="881,19" size="809,125" aspect="true">
+      <gearDisplay controller="type" pages="1"/>
+      <relation target="" sidePair="center-center"/>
+    </image>
+    <image id="n76_p9qe" name="show_low" src="ufu92p" fileName="component/clearing/image/zjzlbt.png" xy="882,19" size="809,125" aspect="true">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="center-center"/>
+    </image>
+    <image id="n104_h22d" name="n104" src="ufu935" fileName="component/clearing/image/shengli_zipai.png" xy="881,19">
+      <gearDisplay controller="type" pages="3"/>
+    </image>
     <component id="n102_efhz" name="win_base" xy="469,1529" size="1334,750" group="n70_dunj"/>
     <group id="n70_dunj" name="n70" xy="-112,-660" size="4643,2939" advanced="true">
       <gearDisplay controller="over" pages="0,1,2"/>
     </group>
-    <image id="n97_o0c1" name="n97" src="o0c18z" fileName="images/clearing_bg1.png" xy="177,25" size="2178,1120" group="n70_dunj"/>
-    <image id="n99_o0c1" name="n99" src="o0c190" fileName="images/clearing_bg2.png" xy="205,131" size="2122,994" group="n70_dunj"/>
     <list id="n7_jt1k" name="player_list_2" xy="-112,-660" size="1300,428" group="n70_dunj" layout="row" colGap="51" defaultItem="ui://1utjt0r2ufu92a" align="center" vAlign="middle">
       <gearDisplay controller="over" pages="1,2"/>
       <item/>
@@ -30,7 +46,7 @@
     <text id="n49_g8y2" name="n49" xy="473,602" size="457,74" group="n70_dunj" visible="false" fontSize="18" color="#999999" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
       <gearDisplay controller="over" pages="1"/>
     </text>
-    <component id="n6_jt1k" name="btn_share_str" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="442,617" size="233,90" group="n51_fmkv">
+    <component id="n6_jt1k" name="btn_share_str" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="575,619" size="233,90" group="n51_fmkv">
       <gearDisplay controller="sdk" pages="0"/>
       <gearXY controller="button" pages="0,1" values="575,619|442,617"/>
       <Button icon="ui://1utjt0r2ufu91q"/>
@@ -39,31 +55,19 @@
       <gearDisplay controller="over" pages="1"/>
       <Button icon="ui://1utjt0r2ufu92m"/>
     </component>
-    <component id="n65_pwj4" name="btn_share" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="442,617" size="233,90" group="n51_fmkv" visible="false">
+    <component id="n65_pwj4" name="btn_share" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="346,619" size="233,90" group="n51_fmkv" visible="false">
       <gearDisplay controller="sdk" pages="0"/>
       <gearXY controller="button" pages="0,1" values="346,619|442,617"/>
       <Button icon="ui://1utjt0r2ufu91p"/>
     </component>
-    <group id="n51_fmkv" name="n51" xy="442,617" size="524,90" group="n70_dunj" advanced="true">
+    <group id="n51_fmkv" name="n51" xy="346,619" size="620,90" group="n70_dunj" advanced="true">
       <gearDisplay controller="over" pages="1"/>
     </group>
     <component id="n66_pwj4" name="btn_close" src="ufu98" fileName="buttons/Btn_close.xml" xy="1706,27" size="87,92" group="n70_dunj" controller="style,0">
       <gearDisplay controller="over" pages="1"/>
     </component>
-    <image id="n74_p9qe" name="n74" src="ufu92n" fileName="component/clearing/image/aborted_game.png" xy="873,19" size="809,125" group="n70_dunj">
-      <gearDisplay controller="over" pages="2"/>
-      <relation target="" sidePair="center-center"/>
-    </image>
     <image id="n84_rbpg" name="n84" src="ufu91s" fileName="component/clearing/images/banner1.png" xy="34,130" size="1260,279" group="n70_dunj" visible="false"/>
-    <image id="n75_p9qe" name="show_win" src="ufu92o" fileName="component/Main/component/new_ui/niyimh.png" xy="881,19" size="809,125" group="n70_dunj" aspect="true">
-      <gearDisplay controller="over" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-    </image>
     <image id="n85_rbpg" name="n85" src="ufu91t" fileName="component/clearing/images/banner2.png" xy="39,411" size="1247,283" group="n70_dunj" visible="false"/>
-    <image id="n76_p9qe" name="show_low" src="ufu92p" fileName="component/clearing/image/zjzlbt.png" xy="882,19" size="809,125" group="n70_dunj" aspect="true" visible="false">
-      <gearDisplay controller="over" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-    </image>
     <component id="n103_efhz" name="btn_showResult" src="efhz94" fileName="buttons/Btn_ShowResult.xml" xy="1919,946" group="n70_dunj">
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://1utjt0r2ufu92q"/>
@@ -132,12 +136,12 @@
     <image id="n86_rbpg" name="n86" src="ufu91v" fileName="component/clearing/images/hu.png" xy="1884,177" size="336,320" group="n70_dunj">
       <gearDisplay controller="hudianpao" pages="1,2"/>
     </image>
-    <image id="n87_rbpg" name="n87" src="ufu922" fileName="component/clearing/images/dianpao.png" xy="1754,703" size="157,97" group="n70_dunj">
+    <image id="n87_rbpg" name="n87" src="ufu922" fileName="component/clearing/images/dianpao.png" xy="1992,703" size="157,97" group="n70_dunj">
       <gearDisplay controller="hudianpao" pages="2"/>
     </image>
     <text id="n92_uw33" name="huxi_shu" xy="1349,791" size="257,49" group="n70_dunj" visible="false" font="Microsoft YaHei" fontSize="36" color="#43633d" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
     <text id="n93_uw33" name="score_shu" xy="1347,857" size="256,57" group="n70_dunj" font="Microsoft YaHei" fontSize="36" color="#43633d" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
-    <text id="n90_dbve" name="fangpaoscore" xy="1352,714" size="368,72" group="n70_dunj" font="Microsoft YaHei" fontSize="48" color="#43633d" vAlign="middle" autoSize="none" bold="true" text="放炮扣息：-30">
+    <text id="n90_dbve" name="fangpaoscore" xy="1590,714" size="368,72" group="n70_dunj" font="Microsoft YaHei" fontSize="48" color="#43633d" vAlign="middle" autoSize="none" bold="true" text="放炮扣息：-30">
       <gearDisplay controller="hudianpao" pages="2"/>
     </text>
     <list id="n52_rx2e" name="card_list_3" xy="4270,-501" size="261,198" group="n55_rx2e" layout="row" colGap="1" defaultItem="ui://1utjt0r2ufu929" vAlign="middle">

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml

@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" initName="big_result" designImageLayer="1">
   <controller name="result" pages="0,,1," selected="0"/>
-  <controller name="time" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="1"/>
   <controller name="share" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n52_o36r" name="n52" src="o0c18z" fileName="images/clearing_bg1.png" xy="117,25" size="2178,1120"/>
-    <image id="n53_o36r" name="n53" src="o0c190" fileName="images/clearing_bg2.png" xy="145,131" size="2122,994"/>
+    <image id="n56_h22d" name="n56" src="o0c18z" fileName="images/clearing_bg1.png" xy="177,25" size="2178,1120" visible="false"/>
+    <image id="n57_h22d" name="n57" src="o0c190" fileName="images/clearing_bg2.png" xy="205,131" size="2122,994" visible="false"/>
     <image id="n2_tjnv" name="n2" src="ufu932" fileName="component/clearing/image/sb.png" xy="798,27" group="n4_tjnv" visible="false">
       <gearDisplay controller="result" pages="0"/>
     </image>
     <image id="n3_tjnv" name="n3" src="ufu933" fileName="component/clearing/image/sl.png" xy="798,27" group="n4_tjnv" visible="false">
       <gearDisplay controller="result" pages="1"/>
     </image>
-    <image id="n37_aen8" name="n37" src="ufu934" fileName="component/clearing/image/shibai_zipai.png" xy="924,21" group="n4_tjnv">
+    <image id="n37_aen8" name="n37" src="ufu934" fileName="component/clearing/image/shibai_zipai.png" xy="924,21" group="n4_tjnv" visible="false">
       <gearDisplay controller="result" pages="0"/>
     </image>
-    <image id="n38_aen8" name="n38" src="ufu935" fileName="component/clearing/image/shengli_zipai.png" xy="924,21" group="n4_tjnv">
+    <image id="n38_aen8" name="n38" src="ufu935" fileName="component/clearing/image/shengli_zipai.png" xy="924,21" group="n4_tjnv" visible="false">
       <gearDisplay controller="result" pages="1"/>
     </image>
-    <group id="n4_tjnv" name="title" xy="798,21" size="935,139" group="n31_aen8" advanced="true">
+    <group id="n4_tjnv" name="title" xy="798,21" size="935,139" group="n31_aen8" visible="false" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n6_tjnv" name="btn_result_share1" src="ufu936" fileName="component/result/component/btn_result_share.xml" xy="87,959" size="233,91" group="n7_tjnv" visible="false">
+    <component id="n6_tjnv" name="btn_result_share1" src="ufu936" fileName="component/result/component/btn_result_share.xml" xy="87,999" size="233,91" group="n7_tjnv" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n5_tjnv" name="btn_result_confirm1" src="ufu938" fileName="component/result/component/btn_result_confirm.xml" xy="2205,960" size="239,97" group="n7_tjnv" visible="false">
+    <component id="n5_tjnv" name="btn_result_confirm1" src="ufu938" fileName="component/result/component/btn_result_confirm.xml" xy="2205,1000" size="239,97" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n41_aen8" name="btn_result_share" src="ufu93a" fileName="component/clearing/zipai_btn_result_share.xml" xy="634,900" size="400,169" group="n7_tjnv" touchable="false">
+    <component id="n41_aen8" name="btn_result_share" src="ufu93a" fileName="component/clearing/zipai_btn_result_share.xml" xy="634,940" size="400,169" group="n7_tjnv" touchable="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n45_mj9f" name="btn_result_confirm" src="ufu93c" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="1737,1250" size="244,124" group="n7_tjnv" visible="false">
+    <component id="n45_mj9f" name="btn_result_confirm" src="ufu93c" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="1737,1290" size="244,124" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n42_aen8" name="btn_continue_game" src="ufu93e" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1573,925" size="244,103" group="n7_tjnv" visible="false">
+    <component id="n42_aen8" name="btn_continue_game" src="ufu93e" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1573,965" size="244,103" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="87,900" size="2357,474" group="n31_aen8"/>
+    <group id="n7_tjnv" name="bottom" xy="87,940" size="2357,474" group="n31_aen8"/>
     <image id="n36_aen8" name="n36" src="ufu93i" fileName="component/clearing/image/zipai_shuoming_di.png" xy="490,1513" size="1221,141" group="n11_tjnv"/>
     <image id="n9_tjnv" name="n9" src="ufu93j" fileName="component/clearing/image/hd.png" xy="771,1537" size="749,92" group="n11_tjnv" visible="false"/>
     <text id="n10_tjnv" name="txt_play" xy="662,1542" size="875,88" group="n11_tjnv" font="Microsoft YaHei" fontSize="36" color="#ffdabb" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法 玩法说明玩法 玩法说明玩法法说明玩法 玩法说明玩法 法说明玩法 玩法说明玩法 明玩法"/>
@@ -46,10 +46,10 @@
     <text id="n28_tjnv" name="n28" xy="416,1443" size="1465,74" group="n31_aen8" visible="false" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n27_tjnv" name="txt_game_name" xy="161,58" size="214,57" group="n34_aen8" fontSize="42" color="#ffffff" align="center" vAlign="middle" text="娄底放炮罚"/>
-    <text id="n29_tjnv" name="txt_game_data" xy="1693,59" size="397,56" group="n34_aen8" fontSize="42" color="#ffffff" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
-    <text id="n15_tjnv" name="txt_room_id" xy="395,61" size="282,57" group="n34_aen8" fontSize="42" color="#ffffff" align="center" vAlign="middle" text="房间号:888888"/>
-    <group id="n34_aen8" name="n34" xy="161,58" size="1929,60" group="n31_aen8" advanced="true">
+    <text id="n27_tjnv" name="txt_game_name" xy="221,58" size="214,57" group="n34_aen8" fontSize="42" color="#ffffff" align="center" vAlign="middle" text="娄底放炮罚"/>
+    <text id="n29_tjnv" name="txt_game_data" xy="1753,59" size="397,56" group="n34_aen8" fontSize="42" color="#ffffff" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
+    <text id="n15_tjnv" name="txt_room_id" xy="455,61" size="282,57" group="n34_aen8" fontSize="42" color="#ffffff" align="center" vAlign="middle" text="房间号:888888"/>
+    <group id="n34_aen8" name="n34" xy="221,58" size="1929,60" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <list id="n26_tjnv" name="player_list" xy="6,192" size="2519,749" group="n31_aen8" touchable="false" layout="row" overflow="scroll" scroll="horizontal" colGap="369" defaultItem="ui://1utjt0r2ufu93k" align="center" vAlign="middle">
@@ -57,11 +57,11 @@
       <item/>
       <item/>
     </list>
-    <component id="n51_efhz" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="2175,11" group="n31_aen8"/>
-    <group id="n31_aen8" name="n31" xy="6,11" size="2519,1643" advanced="true"/>
-    <image id="n12_tjnv" name="n12" src="ufu93z" fileName="component/clearing/image/jfd.png" xy="139,207" size="194,85" group="n14_tjnv"/>
-    <text id="n13_tjnv" name="txt_time" xy="144,214" size="164,69" group="n14_tjnv" fontSize="36" color="#ffffff" vAlign="middle" autoSize="shrink" text="倍数：5"/>
-    <group id="n14_tjnv" name="group_times" xy="139,207" size="194,85" advanced="true">
+    <component id="n51_efhz" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="2234,10" group="n31_aen8"/>
+    <group id="n31_aen8" name="n31" xy="6,10" size="2519,1644" advanced="true"/>
+    <image id="n12_tjnv" name="n12" src="ufu93z" fileName="component/clearing/image/jfd.png" xy="206,207" size="194,85" group="n14_tjnv"/>
+    <text id="n13_tjnv" name="txt_time" xy="211,214" size="164,69" group="n14_tjnv" fontSize="36" color="#ffffff" vAlign="middle" autoSize="shrink" text="倍数：5"/>
+    <group id="n14_tjnv" name="group_times" xy="206,207" size="194,85" advanced="true">
       <gearDisplay controller="time" pages="1"/>
       <relation target="" sidePair="left-left,top-top"/>
     </group>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -87,7 +87,7 @@
     <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="0,0" group="n86_q50p"/>
     <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1059,10" group="n86_q50p" touchable="false"/>
     <component id="n84_q50p" name="btn_back_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="626,15" size="64,106" group="n86_q50p">
-      <gearDisplay controller="state" pages="0,3"/>
+      <gearDisplay controller="state" pages="0,1,2,3"/>
       <Button icon="ui://27vd145byffn7ip2"/>
     </component>
     <component id="n85_q50p" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="415,15" size="129,106" group="n86_q50p">
@@ -134,7 +134,7 @@
     <text id="n74_bzpj" name="round" xy="1404,2343" size="101,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text=" 1/10局">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <component id="n100_n6fs" name="btn_back_jiesan" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="595,15" size="128,106">
+    <component id="n100_n6fs" name="btn_back_jiesan" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="595,15" size="128,106" visible="false">
       <gearDisplay controller="state" pages="1"/>
       <Button icon="ui://27vd145byffn7ip6"/>
     </component>
@@ -234,7 +234,7 @@
     </component>
     <component id="n172_ukp7" name="comp_witness" src="yffn30" fileName="Main_New/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n187_qcrm" name="panel_record" src="qcrmcjs" fileName="Main_style_2/record/Record.xml" xy="967,457" size="757,165" group="n189_qcrm" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>

wb_new_ui/assets/Hotupdate/Version.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,,1," selected="1"/>
+  <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n31_ik9v" name="n31" src="ik9v7i58" fileName="images/bg_main.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
@@ -8,7 +8,7 @@
     <image id="n33_ik9v" name="n33" src="ik9v7i59" fileName="images/icon_changhong.png" xy="728,149">
       <relation target="" sidePair="top-top%"/>
     </image>
-    <text id="n2" name="tex_info" xy="1013,783" pivot="0.5,0.5" size="505,82" group="n8_rtsl" font="ui://27vd145bg2mo7ij0" fontSize="62" color="#ffffff" align="center" bold="true" text="正在更新资源包。"/>
+    <text id="n2" name="tex_info" xy="1013,783" pivot="0.5,0.5" size="505,81" group="n8_rtsl" font="ui://27vd145bg2mo7ij0" fontSize="62" color="#ffffff" align="center" bold="true" text="正在更新资源包。"/>
     <component id="n20_nld2" name="pb_progress" src="pcy012" fileName="commpoent/Slider1.xml" xy="391,899" group="n8_rtsl" aspect="true">
       <Slider value="100" max="100"/>
     </component>
@@ -16,7 +16,7 @@
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center%,bottom-bottom%"/>
     </group>
-    <text id="n36_ik9v" name="tex_tip" xy="1013,792" pivot="0.5,0.5" size="505,82" group="n35_ik9v" font="ui://27vd145bg2mo7ij0" fontSize="62" color="#ffffff" align="center" bold="true" text="正在更新资源包。"/>
+    <text id="n36_ik9v" name="tex_tip" xy="1013,792" pivot="0.5,0.5" size="505,81" group="n35_ik9v" font="ui://27vd145bg2mo7ij0" fontSize="62" color="#ffffff" align="center" bold="true" text="正在更新资源包。"/>
     <component id="n34_ik9v" name="btn_ok" src="ik9v7i5b" fileName="commpoent/Btn_Normol.xml" xy="1066,935" size="400,159" group="n35_ik9v">
       <Button icon="ui://0khx14arik9v7i5a"/>
     </component>
@@ -25,5 +25,10 @@
       <relation target="" sidePair="center-center,bottom-bottom%"/>
     </group>
   </displayList>
-  <transition name="t0" autoPlay="true"/>
+  <transition name="t0" autoPlay="true" frameRate="60">
+    <item time="0" type="Scale" target="n33_ik9v" tween="true" startValue="1,1" endValue="1.1,1.1" duration="60" ease="Linear"/>
+    <item time="60" type="Scale" target="n33_ik9v" tween="true" startValue="1.1,1.1" endValue="1,1" duration="60" ease="Linear"/>
+    <item time="120" type="Scale" target="n33_ik9v" tween="true" startValue="1,1" endValue="0.95,0.95" duration="30" ease="Linear"/>
+    <item time="150" type="Scale" target="n33_ik9v" tween="true" startValue="0.95,0.95" endValue="1,1" duration="30" ease="Linear"/>
+  </transition>
 </component>

wb_new_ui/assets/Login/Main.xml

@@ -1,44 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="0">
-  <controller name="wx" pages="0,,1," selected="0" />
-  <controller name="showLine" pages="0,,1," selected="0" />
+  <controller name="wx" pages="0,,1," selected="0"/>
+  <controller name="showLine" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n31_lwcl" name="n31" src="ik9v7i58" fileName="images/bg_main.png" pkg="0khx14ar" xy="0,0" size="2532,1170">
-      <relation target="" sidePair="width-width,height-height" />
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <loader id="n90_ik9v" name="n90" xy="728,149" size="1076,539" url="ui://0khx14arik9v7i59" align="center" vAlign="middle" fill="scale">
-      <relation target="" sidePair="width-width%,height-height%" />
+    <loader id="n90_ik9v" name="n90" xy="728,149" pivot="0.5,0.5" size="1076,539" url="ui://0khx14arik9v7i59" align="center" vAlign="middle" fill="scale">
+      <relation target="" sidePair="width-width%,height-height%"/>
     </loader>
     <component id="n87_ik9v" name="btn_phone" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="568,848" size="476,145" group="n27">
-      <Button icon="ui://2zlli80mik9v7ctj" />
+      <Button icon="ui://2zlli80mik9v7ctj"/>
     </component>
     <component id="n88_ik9v" name="btn_wx" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1488,848" size="476,145" group="n27">
-      <Button icon="ui://2zlli80mik9v7ctk" />
+      <Button icon="ui://2zlli80mik9v7ctk"/>
     </component>
     <group id="n27" name="loginType" xy="568,848" size="1396,145" advanced="true">
-      <relation target="" sidePair="bottom-bottom,center-center" />
+      <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <text id="n28" name="tex_version" xy="1114,1077" size="358,42" group="n73_ab5p" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" autoSize="none" text="版本号：1.0.0" bold="true" />
-    <text id="n61_nlwc" name="n61" xy="600,1122" size="1331,38" group="n73_ab5p" font="Microsoft YaHei" fontSize="20" color="#cccccc" align="center" vAlign="middle" autoSize="none" singleLine="true" text="抵制不良游戏 拒绝盗版游戏 注意自我保护 谨防受骗上当 适度游戏益脑 沉迷游戏伤身 合理安排时间 享受健康生活" bold="true" />
+    <text id="n28" name="tex_version" xy="1114,1077" size="358,42" group="n73_ab5p" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" autoSize="none" bold="true" text="版本号：1.0.0"/>
+    <text id="n61_nlwc" name="n61" xy="600,1122" size="1331,38" group="n73_ab5p" font="Microsoft YaHei" fontSize="20" color="#cccccc" align="center" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="抵制不良游戏 拒绝盗版游戏 注意自我保护 谨防受骗上当 适度游戏益脑 沉迷游戏伤身 合理安排时间 享受健康生活"/>
     <group id="n73_ab5p" name="version" xy="600,1077" size="1331,83" advanced="true">
-      <relation target="" sidePair="bottom-bottom,center-center" />
+      <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <component id="n89_ik9v" name="btn_ShowLine" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2306,82" size="165,135">
-      <Button icon="ui://2zlli80mik9v7cti" />
+      <Button icon="ui://2zlli80mik9v7cti"/>
     </component>
     <graph id="n83_mljn" name="n83" xy="2302,233" size="176,315" group="n84_mljn" type="rect" lineSize="0" fillColor="#7f000000" corner="10">
-      <relation target="n85_mljn" sidePair="height-height" />
+      <relation target="n85_mljn" sidePair="height-height"/>
     </graph>
     <group id="n84_mljn" name="showLine" xy="2302,233" size="176,315" advanced="true">
-      <gearDisplay controller="showLine" pages="1" />
-      <relation target="n85_mljn" sidePair="height-height" />
+      <gearDisplay controller="showLine" pages="1"/>
+      <relation target="n85_mljn" sidePair="height-height"/>
     </group>
     <list id="n85_mljn" name="list_show" xy="2302,233" size="176,315" overflow="scroll" defaultItem="ui://2zlli80mmljn7ctd" autoClearItems="true">
-      <gearDisplay controller="showLine" pages="1" />
-      <item title="线路1" />
-      <item />
-      <item />
+      <gearDisplay controller="showLine" pages="1"/>
+      <item title="线路1"/>
+      <item/>
+      <item/>
     </list>
   </displayList>
-  <transition name="t0" autoPlay="true" autoPlayRepeat="-1" />
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1" frameRate="60">
+    <item time="0" type="Scale" target="n90_ik9v" tween="true" startValue="1,1" endValue="1.1,1.1" duration="60" ease="Linear"/>
+    <item time="60" type="Scale" target="n90_ik9v" tween="true" startValue="1.1,1.1" endValue="1,1" duration="60" ease="Linear"/>
+    <item time="120" type="Scale" target="n90_ik9v" tween="true" startValue="1,1" endValue="0.95,0.95" duration="30" ease="Linear"/>
+    <item time="150" type="Scale" target="n90_ik9v" tween="true" startValue="0.95,0.95" endValue="1,1" duration="30" ease="Linear"/>
+  </transition>
 </component>

wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
   assetBundleVariant: