update 6.13

lua_probject/base_project/Game/View/Common/MsgWindow.lua

@@ -45,12 +45,13 @@ function M:init(url)
     if (self._tip) then tex_message.text = self._tip end
     
     local btn_close = view:GetChild('btn_close1')
+    btn_close.visible = false
     if (btn_close~=nil) then
         btn_close.onClick:Add(
             function()
                 self:CloseEvent()
             end
-            
+            --self:Destroy()
         )
     end
     self.btnCheck = view:GetChild("btnCheck")

lua_probject/base_project/Game/View/MainView.lua

@@ -1000,12 +1000,7 @@ function M:OnUpdate()
 			if pcall(func) then
 				
 			else
-                 local success, result = pcall(func)
-                if success then
               
-                else
-                    error(result)
-                end
 				self._gamectr = ControllerManager.GetController(GameController)
 				if self._gamectr then
 					self._gamectr:ResetConnect()

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

@@ -1036,12 +1036,12 @@ function M:OnFangziAction(...)
         end
         printlog("jefe self RB_FZType 5=======")
         effect.touchable = false
-        effect.x, effect.y = 0, 0
+        effect.x, effect.y = -250, -200
         effect:GetTransition('t0'):Play()
         pNode:AddChild(effect)
         coroutine.start(
             function()
-                coroutine.wait(1)
+                coroutine.wait(3)
                 effect:Dispose()
             end
         )

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

@@ -633,10 +633,13 @@ function M:OnUpdate()
     if self._play then
         if (self._currentStep == #self.cmdList and self._playFoward) then
             self:ChangePlayState(false)
+            --显示结算
+            self:ShowBackResult(1)
             ViewUtil.ErrorTip(nil, '当前已是录像结尾了，再次点击播放按钮可重新播放')
             return
         elseif (self._currentStep == 0 and not self._playFoward) then
             self:ChangePlayState(false)
+
             ViewUtil.ErrorTip(nil, '当前已是录像开头了，再次点击播放按钮可重新播放')
             return
         end
@@ -650,6 +653,11 @@ function M:OnUpdate()
     end
 end
 
+function M:ShowBackResult(datas)
+    self._view:GetController("state").selectedIndex = 4
+
+end
+
 function M:Destroy()
     UpdateBeat:Remove(self.OnUpdate, self)
     PlayBackView.Destroy(self)

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

@@ -272,8 +272,16 @@ function M:FillLiuJuItemData(room, data,item)
                     for j = 1, 3 do
                         cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
                     end
+                elseif fztype == RB_FZType.Wei or fztype == RB_FZType.ChouWei then
+                    local cards = card_list:AddItemFromPool()
+                    cards:GetController('c1').selectedIndex = 2
+                    cards:GetChild('card_type').text = '畏'
+                    cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
+                    for j = 1, 3 do
+                        cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
                     end
-                if fztype == RB_FZType.Ti then
+                
+                elseif fztype == RB_FZType.Ti then
                     local cards = card_list:AddItemFromPool()
                     cards:GetController('c1').selectedIndex = 2
                     cards:GetChild('card_type').text = '提'
@@ -281,8 +289,8 @@ function M:FillLiuJuItemData(room, data,item)
                     for j = 1, 4 do
                         cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
                     end
-                end
+                
-                if fztype == RB_FZType.Pao then
+                elseif fztype == RB_FZType.Pao then
                     local cards = card_list:AddItemFromPool()
                     cards:GetController('c1').selectedIndex = 2
                     cards:GetChild('card_type').text = '跑'
@@ -290,29 +298,55 @@ function M:FillLiuJuItemData(room, data,item)
                     for j = 1, 4 do
                         cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
                     end
-                end
+            
-                if fztype == RB_FZType.Chi then
+                elseif fztype == RB_FZType.Chi then
                     local cards = card_list:AddItemFromPool()
-                    cards:GetController('c1').selectedIndex = 2
+                    cards:GetController('c1').selectedIndex = 1
                     cards:GetChild('card_type').text = '顺'
                     cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
-                    for j = 1, 3 do
+                
-                        cards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
+                    cards:GetChild('card_1').icon =
-                    end
+                        self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
+                    cards:GetChild('card_2').icon =
+                        self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card2)
+                    cards:GetChild('card_3').icon =
+                        self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card3)
+                else
+                    
+                    local cards = card_list:AddItemFromPool()
+                     cards:GetController('c1').selectedIndex = 1
+                     cards:GetChild('card_type').text = '将'
+                    cards:GetChild('card_huxi').text = data.info_list[i].opCardList[k].hu_xi
+                    cards:GetChild('card_1').icon =
+                        self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card1)
+                    cards:GetChild('card_2').icon =
+                        self:getCardItem('ui://Main_RunBeard/202_', data.info_list[i].opCardList[k].card2)
                 end
             end
 
-            local hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3)
+            local hand_card = {}
-           
+            if #data.info_list[i].hand_card>2 then
+                hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3)
                 for k = 1, #hand_card do
+                    local cards = card_list:AddItemFromPool()
+                     cards:GetController('c1').selectedIndex = 2
+                    cards:GetChild('card_huxi').text = hand_card[k].hu_xi
+                    for j = 1, #hand_card[k] do
+                        cards:GetChild('card_' .. (j)).icon =
+                            self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j])
+                    end
+                end
+            else
+                hand_card = data.info_list[i].hand_card
+
                 local item = card_list:AddItemFromPool()
                 item:GetController('c1').selectedIndex = 2
-                 item:GetChild('card_huxi').text = hand_card[k].hu_xi
+                for j = 1, #hand_card do
-                for j = 1, #hand_card[k] do
+                    item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[j])
-                    item:GetChild('card_' .. (j)).icon = self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j])
                 end
             end
             
+
         end
     end
 
@@ -421,14 +455,39 @@ function M:FillLiuJuItemData(room, data,item)
                 end
             end
             if #info_list[i].hand_card > 0 then
-                local hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3)
+                
+                --local hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3)
+                local hand_card
+                if #info_list[i].hand_card>2 then
+                    hand_card = PendulumRule.GetHandCard(info_list[i].hand_card, 3)
+
                     for k = 1, #hand_card do
                         local cards = card_list:AddItemFromPool()
+                        cards:GetController('c1').selectedIndex = 2
+                        cards:GetChild('card_huxi').text = hand_card[k].hu_xi
                         for j = 1, #hand_card[k] do
                             cards:GetChild('card_' .. (j)).icon =
                                 self:getCardItem('ui://Main_RunBeard/202_', hand_card[k][j])
                         end
                     end
+                
+                else
+                    hand_card = info_list[i].hand_card
+                    local cards = card_list:AddItemFromPool()
+                    cards:GetController('c1').selectedIndex = 2
+                    for j = 1, #hand_card do
+                        cards:GetChild('card_' .. (j)).icon =
+                            self:getCardItem('ui://Main_RunBeard/202_', hand_card[j])
+                    end
+                   
+                end
+                
+               
+                
+              
+                
+                
+                
             end
         end
     end

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua

@@ -770,7 +770,7 @@ function M:GetHandCardPos(cards_view, cards)
     if self:getCardSize() == 1 then
         y = 90 - (85 * cards_view.index_Y)
     elseif self:getCardSize() == 1.2 then
-        y = 70 - (110 * cards_view.index_Y)
+        y = 90 - (110 * cards_view.index_Y)
     elseif self:getCardSize() == 0.8 then
         y = 100 - (65 * cards_view.index_Y)
     end

wb_new_ui/.objs/metas/v0j9abjy/gq7med.info

@@ -1,13 +1,10 @@
 {
   "objectStatus": {
-    "n40_ona1": {
-      "hidden": true
-    },
-    "n31_piv9": {
-      "hidden": true
-    },
     "n79_uwvl": {
       "collapsed": true
+    },
+    "n40_ona1": {
+      "hidden": true
     }
   }
 }

wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info

@@ -7,14 +7,24 @@
       "hidden": true
     },
     "n163_o49p": {
-      "hidden": true
+      "hidden": true,
+      "collapsed": true
+    },
+    "n154_r1mo": {
+      "collapsed": true
     },
     "n152_8th3": {
       "hidden": true
     },
+    "n150_8th3": {
+      "collapsed": true
+    },
     "n170_o49p": {
       "hidden": true
     },
+    "n183_yfzf": {
+      "collapsed": true
+    },
     "n35_k3io": {
       "hidden": true
     }

wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 522,
+  "libview.firstColumnWidth": 297,
   "expanded_nodes": [
     "27vd145b",
     "/",
@@ -26,8 +26,12 @@
     "ui://m7iejg46ilon7ibc",
     "ui://m7iejg46imp57ihp",
     "ui://9n9stu2eprgzf0",
-    "ui://v0j9abjygq7ms2",
+    "ui://v0j9abjygq7m8f",
+    "ui://v0j9abjygq7m6a",
+    "ui://v0j9abjygq7m8u",
+    "ui://v0j9abjygq7m6c",
     "ui://v0j9abjyp0aisn",
+    "ui://v0j9abjygq7med",
     "ui://v0j9abjyp0aism",
     "ui://v0j9abjygq7mgx",
     "ui://v0j9abjygq7mh1",
@@ -48,16 +52,22 @@
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://v0j9abjygq7ms2",
+  "doc.activeDoc": "ui://v0j9abjygq7m8u",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "s63l0suw",
-    "/",
     "v0j9abjy",
     "/",
     "v0j9abjy",
+    "/Main_style_2/",
+    "v0j9abjy",
     "/component/",
     "v0j9abjy",
+    "/component/clearing/",
+    "v0j9abjy",
+    "/component/clearing/clearing1/",
+    "v0j9abjy",
+    "/component/clearing/room/",
+    "v0j9abjy",
     "/images/"
   ],
   "auxline1": true,

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750">
-  <controller name="over" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="over" pages="0,,1,,2,,3," selected="2"/>
   <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="1"/>
+  <controller name="hudianpao" pages="0,,1,,2," selected="0"/>
   <displayList>
     <component id="n20_pt1r" name="win_base" pkg="27vd145b" src="e6awcd0" fileName="Win_Frame_Old.xml" xy="-5,860" size="1334,750" group="n70_dunj"/>
     <list id="n7_jt1k" name="player_list_2" xy="17,126" size="1300,428" group="n70_dunj" layout="row" colGap="51" defaultItem="ui://ppu1wv76j4mf9f" align="center" vAlign="middle">
@@ -90,7 +90,7 @@
     <text id="n31_n1ry" name="111" xy="45,66" size="115,53" group="n45_n1ry" font="Microsoft YaHei" fontSize="32" color="#ffffcc" vAlign="middle" autoSize="none" text="底牌："/>
     <list id="n32_n1ry" name="dipai_list" xy="171,66" size="1101,64" group="n45_n1ry" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://v6yvqp7wyfzf1h4" vAlign="middle"/>
     <text id="n39_n1ry" name="huxi" xy="989,319" size="257,41" group="n45_n1ry" fontSize="28" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
-    <list id="n46_n1ry" name="fullname_list" xy="224,136" size="143,260" group="n45_n1ry" selectionMode="none" lineGap="5" colGap="-10" defaultItem="ui://ppu1wv76j4mf9n" autoClearItems="true">
+    <list id="n46_n1ry" name="fullname_list" xy="826,148" size="166,260" group="n45_n1ry" selectionMode="none" lineGap="5" colGap="-10" defaultItem="ui://ppu1wv76j4mf9n" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -98,7 +98,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n41_n1ry" name="card_list" xy="374,130" pivot="0.5,0.5" size="605,276" group="n45_n1ry" rotation="180" layout="row" selectionMode="none" colGap="5" defaultItem="ui://ppu1wv76j4mf9k" align="center" vAlign="bottom" autoClearItems="true">
+    <list id="n41_n1ry" name="card_list" xy="208,131" pivot="0.5,0.5" size="605,276" group="n45_n1ry" rotation="180" layout="row" selectionMode="none" colGap="5" defaultItem="ui://ppu1wv76j4mf9k" align="center" vAlign="bottom" autoClearItems="true">
       <item/>
       <item/>
     </list>
@@ -144,12 +144,12 @@
     <text id="n90_dbve" name="fangpaoscore" xy="960,545" size="310,72" group="n70_dunj" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" autoSize="none" text="放炮扣息：-30">
       <gearDisplay controller="hudianpao" pages="2"/>
     </text>
-    <list id="n52_rx2e" name="card_list_3" xy="137,179" size="261,177" group="n55_rx2e" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
+    <list id="n52_rx2e" name="card_list_3" xy="137,179" size="261,198" group="n55_rx2e" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n53_rx2e" name="card_list_2" xy="537,179" pivot="0.5,0.5" size="261,177" group="n55_rx2e" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
+    <list id="n53_rx2e" name="card_list_2" xy="537,179" pivot="0.5,0.5" size="261,198" group="n55_rx2e" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
       <item/>
       <item/>
@@ -158,7 +158,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n54_rx2e" name="card_list_1" xy="936,179" size="261,177" group="n55_rx2e" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
+    <list id="n54_rx2e" name="card_list_1" xy="936,179" size="261,198" group="n55_rx2e" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
       <item/>
       <item/>
@@ -167,8 +167,8 @@
       <item url="ui://ppu1wv76j4mf9l"/>
       <item url="ui://ppu1wv76j4mf9l"/>
     </list>
-    <text id="n59_fnpw" name="222ll" xy="113,139" size="103,33" group="n61_fnpw" fontSize="26" color="#b25116" vAlign="middle" autoSize="none" text="弃牌："/>
+    <text id="n59_fnpw" name="222ll" xy="113,139" size="103,54" group="n61_fnpw" fontSize="26" color="#b25116" vAlign="middle" autoSize="none" text="弃牌："/>
-    <list id="n63_fnpw" name="qipai_listl" xy="138,181" size="298,157" group="n61_fnpw" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
+    <list id="n63_fnpw" name="qipai_listl" xy="138,181" size="298,178" group="n61_fnpw" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
       <item/>
       <item/>
@@ -177,10 +177,10 @@
       <item/>
       <item/>
     </list>
-    <group id="n61_fnpw" name="n61" xy="113,139" size="323,199" group="n55_rx2e" advanced="true">
+    <group id="n61_fnpw" name="n61" xy="113,139" size="323,220" group="n55_rx2e" advanced="true">
       <gearDisplay controller="qipai" pages="1"/>
     </group>
-    <group id="n55_rx2e" name="n55" xy="113,139" size="1084,217" group="n70_dunj" advanced="true">
+    <group id="n55_rx2e" name="n55" xy="113,139" size="1084,238" group="n70_dunj" advanced="true">
       <gearDisplay controller="over" pages="2"/>
     </group>
     <text id="n91_n7o4" name="n91" xy="915,291" size="345,91" group="n70_dunj" font="Microsoft YaHei" fontSize="40" color="#000066" align="center" vAlign="middle" autoSize="none" bold="true" text="荒庄 :  -10 胡息">

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -90,28 +90,27 @@
     <component id="n7" name="player_info1" src="gq7m8u" fileName="Main_style_2/PlayerHead_1_s2(1).xml" xy="17,365" size="100,172">
       <relation target="" sidePair="left-left,bottom-bottom,left-left,bottom-bottom"/>
     </component>
-    <component id="n34_k3io" name="btn_ready" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="305,446" size="240,90" group="n36_k3io">
+    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="281,548" group="n36_k3io" visible="false">
-      <gearDisplay controller="action" pages="0,1"/>
-      <Button icon="ui://v0j9abjygq7m48"/>
-    </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="293,545" group="n36_k3io" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n110_a81d" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="800,446" size="240,90" group="n36_k3io">
+    <component id="n110_a81d" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="811,452" size="240,90" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="293,446" size="747,184" advanced="true">
+    <component id="n111_nlef" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="328,452" group="n36_k3io">
+      <gearDisplay controller="action" pages="0,1"/>
+    </component>
+    <group id="n36_k3io" name="n36" xy="281,452" size="770,181" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
-    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="408,434" group="n59_v38k" alpha="0.5">
+    <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="229,434" size="757,165" group="n59_v38k" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="691,479" group="n59_v38k">
+    <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="512,479" size="190,8" group="n59_v38k">
       <relation target="" sidePair="center-center"/>
     </component>
-    <group id="n59_v38k" name="n59" xy="408,434" size="575,165"/>
+    <group id="n59_v38k" name="n59" xy="320,434" size="757,165"/>
     <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1239,417">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1036,5 +1036,5 @@
     <image id="a81dsq" name="Group 646.png" path="/buttons/"/>
     <component id="nlefsr" name="btn_xp.xml" path="/buttons/" exported="true"/>
   </resources>
-  <publish name="main_majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
+  <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,回放小结" selected="3"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <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"/>
+  <controller name="bg_state" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <text id="n176_fgao" name="di_text" xy="442,10" size="450,51" font="Microsoft YaHei" fontSize="32" color="#330000" align="center" vAlign="middle" autoSize="none" strokeColor="#296137" text="123456789">
+    <text id="n176_fgao" name="di_text" xy="442,10" size="450,51" font="Microsoft YaHei" fontSize="32" color="#367c7d" align="center" vAlign="middle" autoSize="none" strokeColor="#235557" text="123456789">
       <gearDisplay controller="state" pages="0,1,2"/>
       <gearColor controller="bg_state" pages="0,1" values="#330000,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
       <relation target="" sidePair="center-center"/>
@@ -16,19 +16,19 @@
       <relation target="" sidePair="center-center"/>
     </image>
     <loader id="n156_mk2u" name="jiang" xy="456,85" size="65,75" fill="scaleFree"/>
-    <component id="n151_8th3" name="player_card_info2" src="f55qw5" fileName="component/Main/component/Player_card_info_2.xml" xy="143,52" size="447,369">
+    <component id="n151_8th3" name="player_card_info2" src="f55qw5" fileName="component/Main/component/Player_card_info_2.xml" xy="143,52" size="343,304">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n147_nu0l" sidePair="left-left"/>
     </component>
-    <component id="n61_jali" name="player_card_info1" src="f55qvx" fileName="component/Main/component/Player_card_info_1.xml" xy="136,517" size="1193,228">
+    <component id="n61_jali" name="player_card_info1" src="f55qvx" fileName="component/Main/component/Player_card_info_1.xml" xy="136,521" size="1193,228">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="width-width,bottom-bottom"/>
     </component>
     <component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="11,71">
       <relation target="" sidePair="left-left,leftext-left"/>
     </component>
-    <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="20,524" size="189,67">
+    <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="8,570" size="189,67">
-      <gearXY controller="state" pages="0,1,2,3" values="20,524|22,548|8,570|8,570"/>
+      <gearXY controller="state" pages="0,1,2,3" values="20,524|22,548|8,570|8,570" default="20,524"/>
       <relation target="" sidePair="left-left,leftext-left"/>
     </component>
     <component id="n32_h1uu" name="gcm_chat" src="h1uu2p" fileName="Gcm_chat.xml" pkg="l0ds4ys6" xy="1243,342">
@@ -71,10 +71,10 @@
       <gearDisplay controller="state" pages="0,1,2,3"/>
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n37_kba2" name="roominfo_panel1" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="848,-46" size="279,43" group="n150_8th3" visible="false" touchable="false"/>
+    <component id="n37_kba2" name="roominfo_panel1" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="875,-13" size="279,43" group="n150_8th3" visible="false" touchable="false"/>
-    <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="866,-28" size="461,97" group="n150_8th3" touchable="false"/>
+    <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="810,-129" size="461,97" group="n150_8th3" touchable="false"/>
     <component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="562,-92" size="157,4" group="n150_8th3" visible="false"/>
-    <group id="n150_8th3" name="n150" xy="0,-92" size="1327,163" advanced="true">
+    <group id="n150_8th3" name="n150" xy="0,-129" size="1271,200" advanced="true">
       <relation target="" sidePair="left-left"/>
     </group>
     <image id="n152_8th3" name="n152" src="f55qvu" fileName="component/Main/images/di00.png" xy="377,-91" size="580,86" visible="false">
@@ -133,6 +133,12 @@
     <group id="n183_yfzf" name="n183" xy="1199,3" size="137,168" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
+    <component id="n185_hwlt" name="showresultview" src="hwlt1hh" fileName="component/Main/backresult.xml" xy="0,0">
+      <gearDisplay controller="state" pages="4"/>
+    </component>
+    <component id="n186_hwlt" name="n186" src="hwlt1hs" fileName="component/option/btn_backdetail.xml" xy="1267,12">
+      <gearDisplay controller="state" pages="3"/>
+    </component>
   </displayList>
   <transition name="outcard1">
     <item time="0" type="XY" target="n153_8th3" tween="true" startValue="625.3,86.3" endValue="494.58,177.69" duration="4"/>

wb_new_ui/assets/Main_RunBeard/component/Main/backresult.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1334,750">
+  <controller name="over" pages="0,,1,,2," selected="0"/>
+  <displayList>
+    <graph id="n68_hwlt" name="n68" xy="-427,-182" size="2189,1114" alpha="0.65" type="rect" fillColor="#ff000000"/>
+    <image id="n64_hwlt" name="n64" src="o49p1d3" fileName="component/Main/component/new_ui/di_kuang.png" xy="0,0" size="1334,750"/>
+    <image id="n65_hwlt" name="n65" src="hwlt1hj" fileName="component/images/banner1.png" xy="14,111"/>
+    <image id="n66_hwlt" name="n66" src="hwlt1hk" fileName="component/images/banner2.png" xy="14,385"/>
+    <image id="n70_hwlt" name="n70" src="hwlt1hr" fileName="component/Main/images/1_05.png" xy="1277,17"/>
+  </displayList>
+</component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml

@@ -3,9 +3,9 @@
   <controller name="chupai" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,3,,4," selected="0"/>
   <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
-  <controller name="niao" pages="0,,1," selected="1"/>
+  <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
-    <list id="n36_lr5d" name="windcard_list" xy="1331,217" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wlr5d31">
+    <list id="n36_lr5d" name="windcard_list" xy="1331,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wlr5d31">
       <relation target="" sidePair="right-right"/>
     </list>
     <list id="n35_lr5d" name="area_fz_list" xy="787,-169" size="242,135" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="5" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" renderOrder="descent">
@@ -14,10 +14,10 @@
       <item url="ui://v6yvqp7wcyprww"/>
       <item url="ui://v6yvqp7wcyprwy"/>
     </list>
-    <component id="n25" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="147,85" size="1039,131">
+    <component id="n25" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="127,98" size="1039,118">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n37_n1ry" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="600,-250" size="5,5"/>
+    <component id="n37_n1ry" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="869,-250" size="5,5"/>
     <component id="n38_ey1o" name="n38" src="f55qvy" fileName="component/Main/component/PromptOutCard.xml" xy="116,-158">
       <gearDisplay controller="chupai" pages="1"/>
     </component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml

@@ -3,7 +3,7 @@
   <displayList>
     <list id="n47_lr5d" name="area_fz_list" xy="16,2" pivot="0.5,0.5" size="315,173" rotation="180" layout="row" scroll="horizontal" colGap="5" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="bottom"/>
     <list id="n48_lr5d" name="windcard_list" xy="16,196" size="280,78" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
-    <component id="n50_n1ry" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="200,150" size="5,5"/>
+    <component id="n50_n1ry" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="200,83" size="5,5"/>
     <component id="n25" name="area_outcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="322,19" size="67,182" touchable="false"/>
     <component id="n51_n7o4" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="176,86" size="300,175" touchable="false"/>
   </displayList>

wb_new_ui/assets/Main_RunBeard/component/option/btn_backdetail.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="61,61" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_hwlt" name="n3" src="o49p1cb" fileName="component/Main/component/new_ui/shezhi_img.png" xy="0,0"/>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Main_RunBeard/component/option/hideback.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="42,42" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_hwlt" name="n3" src="hwlt1hr" fileName="component/Main/images/1_05.png" xy="0,0"/>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Main_RunBeard/package.xml

@@ -866,6 +866,18 @@
     <image id="xrdz1he" name="tuoguan.png" path="/component/" exported="true"/>
     <image id="a81d1hf" name="xipai.png" path="/component/Main/images/"/>
     <component id="a81d1hg" name="btn_xipai.xml" path="/component/Main/component/" exported="true"/>
+    <component id="hwlt1hh" name="backresult.xml" path="/component/Main/" exported="true"/>
+    <image id="hwlt1hj" name="banner1.png" path="/component/images/"/>
+    <image id="hwlt1hk" name="banner2.png" path="/component/images/"/>
+    <image id="hwlt1hl" name="defi.png" path="/component/images/"/>
+    <image id="hwlt1hm" name="dianpao.png" path="/component/images/"/>
+    <image id="hwlt1hn" name="hu.png" path="/component/images/"/>
+    <image id="hwlt1ho" name="niyimh.png" path="/component/images/"/>
+    <image id="hwlt1hp" name="victer.png" path="/component/images/"/>
+    <image id="hwlt1hq" name="zhuang_img.png" path="/component/images/"/>
+    <image id="hwlt1hr" name="1_05.png" path="/component/Main/images/"/>
+    <component id="hwlt1hs" name="btn_backdetail.xml" path="/component/option/" exported="true"/>
+    <component id="hwlt1ht" name="hideback.xml" path="/component/option/"/>
   </resources>
   <publish name="Main_RunBeard" path="..\wb_unity_pro\Assets\ART\base\main_zipai\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro_2/Library/CurrentLayout-default.dwlt

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: -27.333334
+    x: 7.3333335
-    y: 51.333336
+    y: 50
     width: 906
     height: 854.6667
   m_ShowMode: 4
@@ -40,9 +40,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 383
+    y: 399
     width: 906
-    height: 422
+    height: 406
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 9}
@@ -186,7 +186,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 906
-    height: 383
+    height: 399
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 12}
@@ -211,15 +211,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Console
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -27.333334
+    x: 7.3333335
-    y: 464.6667
+    y: 479.33334
     width: 906
-    height: 401
+    height: 385
   m_ViewDataDictionary: {fileID: 0}
 --- !u!114 &10
 MonoBehaviour:
@@ -237,7 +237,7 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
@@ -292,7 +292,7 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
@@ -427,15 +427,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -27.333334
+    x: 7.3333335
-    y: 81.333336
+    y: 80
     width: 906
-    height: 362
+    height: 378
   m_ViewDataDictionary: {fileID: 0}
   m_SerializedViewNames: []
   m_SerializedViewValues: []
@@ -482,22 +482,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 906
-      height: 341
+      height: 357
-    m_Scale: {x: 0.47361112, y: 0.47361112}
+    m_Scale: {x: 0.49583334, y: 0.49583334}
-    m_Translation: {x: 453, y: 170.5}
+    m_Translation: {x: 453, y: 178.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -956.48096
+      x: -913.61346
       y: -360
-      width: 1912.9619
+      width: 1827.2269
       height: 720
     m_MinimalGUI: 1
-  m_defaultScale: 0.47361112
+  m_defaultScale: 0.49583334
-  m_LastWindowPixelSize: {x: 1359, y: 543}
+  m_LastWindowPixelSize: {x: 1359, y: 567}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000001000000000000
@@ -519,15 +519,15 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000,
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000,
       type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -8.666667
+    x: -24.666668
-    y: 88
+    y: 80.66667
     width: 906
-    height: 362
+    height: 378
   m_ViewDataDictionary: {fileID: 0}
   m_ShowContextualTools: 0
   m_WindowGUID: f873ccafec97ed441a3bee2c6f85cf99

wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json

@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1198],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log

@@ -1,2 +0,0 @@
-Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
-Cmd: initializeCompiler