外圈和游戏观战完成

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua

@@ -175,6 +175,7 @@ function M:FillView()
         self.tongji:initData()
         self.tongji:Show()
     end)
+    self._view:GetChild('btn_tongji').visible = group.lev < 3 or group.partnerLev > 0
     self:GetMemberData(0)
 end
 

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

@@ -17,8 +17,7 @@ local RunFast_Record_Event = {
     Evt_Pass = 'pass',
     Evt_NewRound = 'newindex',
     Evt_result = 'result',
-    Evt_Result = 'Result',
+    Evt_Result = 'Result'
-    Evt_Opt = 'prompt'
 }
 
 local default_bg = 1
@@ -82,8 +81,6 @@ function M:InitView(url)
     else
         self._view:GetChild('roominfo_panel1'):GetChild('tex_beishu').text = ''
     end
-    self._ctr_inClear = self._view:GetController('Inclear')
-
 
     self._cardCheck = RunFast_CardCheck:InitFlag()
     self._gamectr._cardCheck = self._cardCheck
@@ -94,7 +91,7 @@ function M:InitView(url)
     self._cmdmap[RunFast_Record_Event.Evt_Pass] = self.CmdPass
     self._cmdmap[RunFast_Record_Event.Evt_NewRound] = self.CmdNewRound
     self._cmdmap[RunFast_Record_Event.Evt_result] = self.Cmdresult
-    self._cmdmap[RunFast_Record_Event.Evt_Opt] = self.CmdOpt
+    self._cmdmap[RunFast_Record_Event.Evt_Result] = self.CmdResult
 end
 
 function M:NewPlayerPokerInfoView(view, index)
@@ -108,11 +105,10 @@ function M:FillRoomData(data)
     -- print("hidezhanji 1111")
 
     self._currentStep = 1
+    DataManager.CurrenRoom.pai = 0
     local room = DataManager.CurrenRoom
-    self._room = DataManager.CurrenRoom
     local _player_card_info = self._player_card_info
     local roominfo_panel = self._view:GetChild('roominfo_panel1')
-    self._room.pai = 0
 
     roominfo_panel:GetChild('tex_roomid').text = data.info.roomid
     roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName()
@@ -129,6 +125,7 @@ function M:FillRoomData(data)
 
             if room.hpOnOff == 1 or room:checkHpNonnegative() then
                 head_info._view:GetChild('zhanji').visible = true
+                head_info._view:GetChild('text_jifen').text = d2ad(p.total_hp)
             end
         end
         head_info:FillData(p)
@@ -140,36 +137,10 @@ function M:FillRoomData(data)
         head_info:UpdatePiao(p.piao)
     end
 
-    self:UpdateRound(self._room.curren_round)
+    self:UpdateRound()
 
     self:GenerateAllStepData(data)
     self:ShowStep(1)
-    self:Play()
-end
-
-function M:ChangePlayState(state)
-    self._play = state
-    self:ChangeTextSpeed()
-    local btn_play = self._view:GetChild("panel_record"):GetChild("btn_play")
-    if self._play then
-        btn_play:GetController("state").selectedIndex = 1
-    else
-        btn_play:GetController("state").selectedIndex = 0
-    end
-    --开始时，隐藏显示结算界面
-    if state then
-        if self.destory_win ~= nil then
-            coroutine.stop(self.destory_win)
-        end
-
-        self.destory_win = nil
-        if self.result_view then
-            self.result_view._root_view:RemoveFromParent()
-            self.result_view:Destroy()
-            self._ctr_inClear.selectedIndex = 0
-        end
-        self.result_view = nil
-    end
 end
 
 function M:ShowStep(index)
@@ -185,19 +156,13 @@ function M:ShowStep(index)
         p.out_card_list = step.player_card_data[i].out_card_list
         p.hand_left_count = #p.hand_list
 
-        if step.cmd == RunFast_Record_Event.Evt_Opt and step.seat == p.seat then
-            info._view:GetController('out_card_option2').selectedIndex = 1
-        else
-            info._view:GetController('out_card_option2').selectedIndex = 0
-        end
-
         if p.seat ~= self._room.self_player.seat then
             info:UpdateHandPoker(p.hand_list, false, true)
         else
             info:InitPoker(p.hand_list, false)
         end
-        info:SetOutCardInfo(nil, false)
     end
+
     if step.cmd == RunFast_Record_Event.Evt_OutCard then
         local seat = step.current_out_seat
         local p = self._room:GetPlayerBySeat(seat)
@@ -230,91 +195,16 @@ function M:ShowStep(index)
         end
     end
     if step.cmd == RunFast_Record_Event.Evt_result then
-        local data = step.data
+        local result = step.result
-        local over = 0
+        for i = 1, #result do
-        local info = data.win.info
+            local card_info = self._player_card_info[self:GetPos(result[i].seat)]
-        local win_seat = data.win.winseat
-        local remaincards = {}
-        -- local energyTab = arg[5]
-        local otherpoker_list = self._view:GetChild("otherpoker_list")
-        local card_info = self._player_card_info[self:GetPos(self._room.self_player.seat)]
-        if self.dismissWin ~= nil then
-            self.dismissWin:Destroy()
-        end
-        self.dismissWin = nil
-        if self.MypokerList ~= nil then
-            -- body
-            card_info:Clear()
-            card_info:InitPoker(self.MypokerList, false)
-            self.MypokerList = nil
-        end
-        if otherpoker_list ~= nil then
-            -- body
-            otherpoker_list:RemoveChildrenToPool()
-            otherpoker_list.visible = true
-        end
 
-        if self.destory_win ~= nil then
+            if result[i].entrust ~= nil and result[i].entrust == true then
-            coroutine.stop(self.destory_win)
+                local head_info = self._player_info[self:GetPos(result[i].seat)]
-        end
+                head_info:MarkTuoguan()
-
-        self.destory_win = nil
-        self.destory_win = coroutine.start(function()
-            if win_seat == self._room.self_player.seat then
-                ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
-            else
-                ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/lose_music.mp3")
             end
-            coroutine.stop(self._leftClock_continue)
+            --  head_info:UpdateScore(result[i].score)
-            for i = 1, #self._player_card_info do
+            card_info:PlayScore(result[i].score, false, step.win_seat == result[i].seat)
-                local card_info = self._player_card_info[i]
-                card_info._ctr_time_clock.selectedIndex = 0
-                self._left_time = 0
-            end
-
-            for i = 1, #info do
-                local player = info[i]
-                local p = self._room:GetPlayerBySeat(player.seat)
-                local head_info = self._player_info[self:GetPos(player.seat)]
-
-            end
-
-            coroutine.wait(2)
-
-            self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, win_seat, 0,
-                remaincards)
-            self.result_view:SetDestroryCallback(function()
-                for i = 1, #self._player_card_info do
-                    local card_info = self._player_card_info[i]
-                    card_info.ctr_outpoker.selectedIndex = 0
-                    if card_info._ctr_resultOut then
-                        card_info._ctr_resultOut.selectedIndex = 0
-                    end
-                end
-            end)
-            self.result_view:Show()
-            self.result_view._root_view:RemoveFromParent()
-            self._view:AddChildAt(self.result_view._root_view,
-                self._view:GetChildIndex(self._view:GetChild('mask_tips')) - 1)
-            if self.WinItem_view ~= nil then
-                self.WinItem_view:Dispose()
-                self.WinItem_view = nil
-            end
-            if self.rank_view ~= nil then
-                self.rank_view:Dispose()
-                self.rank_view = nil
-            end
-
-            if self._room.self_player.entrust == true then
-                local btn_confirm = self.result_view._view:GetChild("btn_confirm")
-                btn_confirm.onClick:Call()
-            end
-            ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
-        end)
-        if over == 1 then
-            -- body
-            self:UnmarkSelfTuoguan()
-            ControllerManager.ChangeController(LoddyController)
         end
     end
     if step.cmd == RunFast_Record_Event.Evt_Result then
@@ -324,9 +214,9 @@ function M:ShowStep(index)
         local num = self._view:GetChildIndex(self._view:GetChild("panel_record"))
         self._view:AddChildAt(self.result_view._view, num)
     else
-        -- if self.result_view then
+        if self.result_view then
-        --     self.result_view:Dispose()
+            self.result_view:Dispose()
-        -- end
+        end
     end
 end
 
@@ -387,7 +277,8 @@ end
 function M:Cmdresult(cmd, index)
     local data = self:CopyLastStep(index)
     data.cmd = cmd.cmd
-    data.data = cmd.data
+    data.result = cmd.data.result
+    data.win_seat = cmd.seat
 end
 
 function M:CmdResult(cmd, index)
@@ -400,12 +291,6 @@ function M:CmdResult(cmd, index)
     end
 end
 
-function M:CmdOpt(cmd, index)
-    local data = self:CopyLastStep(index)
-    data.cmd = cmd.cmd
-    data.seat = cmd.seat
-end
-
 function M:CopyLastStep(index)
     local step = {}
     local last_step = self._step[index]
@@ -433,17 +318,9 @@ function M:ClearNextSeatOutCard(currenOutCardSeat)
     card_info:SetOutCardInfo(nil, false)
 end
 
-function M:UpdateRound(round)
+function M:UpdateRound()
-    local total_round = self._room.room_config.Times
+    local round = self._room.curren_round
-    -- self._text_round.text = string.format("%d / %d 局", round, total_round)
+    self._tex_round.text = string.format('第 %d 局', round)
-    if not self._text_currenRound then
-        self._text_currenRound = self._view:GetChild('Text_CurrenRound')
-    end
-    if not self._text_maxRound then
-        self._text_maxRound = self._view:GetChild('Text_MaxMaxRound')
-    end
-    self._text_currenRound.text = round
-    self._text_maxRound.text = string.format("/%s局", total_round)
 end
 
 function M:NextRecordPlay()
@@ -456,10 +333,10 @@ function M:NextRecordPlay()
     self._speed = 1
     self._playFoward = true
     self:ChangeTextSpeed()
-    -- if self.result_view then
+    if self.result_view then
-    --     self.result_view:Dispose()
+        self.result_view:Dispose()
-    --     self.result_view = nil
+        self.result_view = nil
-    -- end
+    end
 end
 
 function M:LastRecordPlay()
@@ -471,10 +348,70 @@ function M:LastRecordPlay()
     self._speed = 1
     self._playFoward = true
     self:ChangeTextSpeed()
-    -- if self.result_view then
+    if self.result_view then
-    --     self.result_view:Dispose()
+        self.result_view:Dispose()
-    --     self.result_view = nil
+        self.result_view = nil
-    -- end
+    end
+end
+
+function M:Play()
+    self:ChangeAlpha()
+    self:ChangePlayState(not self._play)
+    if not self._play then
+        return
+    end
+    if (self._currentStep == #self.cmdList and self._playFoward) or (self._currentStep == 0 and not self._playFoward) then
+        self._currentStep = 0
+        self._speed = 1
+        self._playFoward = true
+        self:ChangeTextSpeed()
+    end
+end
+
+function M:ChangeTextSpeed()
+    local str1 = self._play and self._speed or ''
+    self._view:GetChild('panel_record'):GetChild('tex_speed').text = str1
+    local str2 =
+        not self._play and (self._playFoward and '播放暂停' or '回退暂停') or
+        self._playFoward and (self._speed == 1 and '播放' or '快进') or
+        (self._speed == 1 and '回退' or '快退')
+    self._view:GetChild('panel_record'):GetChild('tex_2').text = str2
+    local str3 = self._play and '倍速度' or ''
+    self._view:GetChild('panel_record'):GetChild('tex_1').text = str3
+end
+
+function M:CmdLeftArrows()
+    self:ChangeAlpha()
+    self:ChangePlayState(true)
+    if not self._playFoward then
+        if self._speed < 16 then
+            self._speed = self._speed * 2
+        else
+            self._speed = 1
+        end
+        self:ChangeTextSpeed()
+    else
+        self._speed = 1
+        self._playFoward = false
+        self:ChangeTextSpeed()
+    end
+end
+
+function M:CmdRightArrows()
+    self:ChangeAlpha()
+    self:ChangePlayState(true)
+    if self._playFoward then
+        if self._speed < 16 then
+            self._speed = self._speed * 2
+        else
+            self._speed = 1
+        end
+        self:ChangeTextSpeed()
+    else
+        self._speed = 1
+        self._playFoward = true
+        self:ChangeTextSpeed()
+    end
 end
 
 function M:_Effect(type1, player)

wb_new_ui/.objs/metas/8wph7p8n/yffncb.info

@@ -1,7 +1 @@
-{
+{}
-  "objectStatus": {
-    "n47_kx91": {
-      "hidden": true
-    }
-  }
-}

wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info

@@ -12,16 +12,9 @@
     "n131_ckvb": {
       "hidden": true
     },
-    "n164_ukp7": {
-      "locked": true,
-      "collapsed": true
-    },
     "n166_ukp7": {
       "hidden": true
     },
-    "n163_ukp7": {
-      "collapsed": true
-    },
     "n93_eclw": {
       "collapsed": true
     }

wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info

@@ -0,0 +1 @@
+{}

wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info

@@ -3,14 +3,14 @@
     "n85_l2u4": {
       "collapsed": true
     },
-    "n108_go7q": {
-      "hidden": true
-    },
     "n107_go7q": {
       "hidden": true
     },
-    "n82_l2u4": {
+    "n108_go7q": {
-      "collapsed": true
+      "hidden": true
+    },
+    "n59_v38k": {
+      "locked": true
     }
   }
 }

wb_new_ui/assets/Common/package.xml

@@ -1354,6 +1354,7 @@
     <image id="qcrm7ivu" name="81 - 合.png" path="/font/fontTitle/"/>
     <image id="qcrm7ivv" name="82 - 伙.png" path="/font/fontTitle/"/>
     <image id="qcrm7ivw" name="btn_showPartner.png" path="/images/" exported="true"/>
+    <image id="qcrm7ivx" name="bg_game_战绩.png" path="/images/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml

@@ -60,7 +60,16 @@
     <component id="n64_n9qr" name="Comp_Clock" src="yffn1j" fileName="Main_New/Component/Comp_Clock.xml" xy="1612,-10" size="174,143" visible="false">
       <gearDisplay controller="time_clock" pages="1"/>
     </component>
-    <list id="n65_ukp7" name="list_backHand" xy="1866,653" size="1080,195" scale="0.657,1" rotation="-90" touchable="false" layout="row" overflow="scroll" colGap="-120" defaultItem="ui://8wph7p8nyffn2g" align="center" autoClearItems="true">
+    <component id="n66_g6m8" name="Btn_SendCard_back" src="yffn1l" fileName="Main_New/Component/Btn_SendCard.xml" xy="1725,273" size="200,100" group="n68_g6m8" rotation="-90">
+      <Button sound=""/>
+    </component>
+    <component id="n67_g6m8" name="Btn_Tip_back" src="yffn1o" fileName="Main_New/Component/Btn_Tip.xml" xy="1725,491" size="200,100" group="n68_g6m8" rotation="-90">
+      <Button sound=""/>
+    </component>
+    <group id="n68_g6m8" name="btn_back" xy="1725,273" size="200,318" advanced="true">
+      <gearDisplay controller="out_card_option2" pages="1"/>
+    </group>
+    <list id="n65_ukp7" name="list_backHand" xy="1173,-180" size="1080,195" scale="0.657,1" touchable="false" layout="row" overflow="scroll" colGap="-120" defaultItem="ui://8wph7p8nyffn2g" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -78,15 +87,6 @@
       <item/>
       <item/>
     </list>
-    <component id="n66_g6m8" name="Btn_SendCard_back" src="yffn1l" fileName="Main_New/Component/Btn_SendCard.xml" xy="1725,273" size="200,100" group="n68_g6m8" rotation="-90">
-      <Button sound=""/>
-    </component>
-    <component id="n67_g6m8" name="Btn_Tip_back" src="yffn1o" fileName="Main_New/Component/Btn_Tip.xml" xy="1725,491" size="200,100" group="n68_g6m8" rotation="-90">
-      <Button sound=""/>
-    </component>
-    <group id="n68_g6m8" name="btn_back" xy="1725,273" size="200,318" advanced="true">
-      <gearDisplay controller="out_card_option2" pages="1"/>
-    </group>
   </displayList>
   <transition name="score">
     <item time="0" type="Alpha" target="n55_pgkj" tween="true" startValue="0" endValue="1" duration="18"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_style_2/record/Btn_record_play.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="93,114" extention="Button">
+  <controller name="state" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n5_rayb" name="n5" src="qcrmcjy" fileName="images/record/01.png" xy="0,4">
+      <gearDisplay controller="state" pages="0"/>
+    </image>
+    <image id="n6_tjv8" name="n6" src="qcrmcjz" fileName="images/record/02.png" xy="0,0">
+      <gearDisplay controller="state" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Radio" downEffect="dark" downEffectValue="0.80"/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_style_2/record/Btn_record_return.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="128,92" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n5_rayb" name="n5" src="qcrmck1" fileName="images/record/button03.png" xy="0,0"/>
+  </displayList>
+  <Button downEffect="dark" downEffectValue="0.80"/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_style_2/record/Btn_record_speed.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="52,38" pivot="0.5,0.5" anchor="true" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="enable" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n4_rayb" name="bg" xy="0,0" size="52,38" align="right" vAlign="middle">
+      <gearLook controller="enable" pages="0,1" values="1,0,0,1|1,0,1,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <loader id="n2" name="icon" xy="0,0" size="52,38" align="right" vAlign="middle">
+      <gearLook controller="enable" pages="0,1" values="1,0,0,1|1,0,1,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button downEffect="dark" downEffectValue="0.80"/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_style_2/record/Record.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="575,165">
+  <controller name="type" pages="0,麻将,1,牛牛,2," selected="1"/>
+  <displayList>
+    <image id="n0_rayb" name="n0" src="qcrmcjt" fileName="images/record/di.png" xy="0,0"/>
+    <component id="n3_rayb" name="btn_LastStep" src="qcrmcju" fileName="component/record/Btn_record_speed.xml" xy="150,83" size="58,54">
+      <gearDisplay controller="type" pages="0"/>
+      <Button icon="ui://8wph7p8nqcrmcjv"/>
+    </component>
+    <component id="n5_rayb" name="btn_LastRound" src="qcrmcju" fileName="component/record/Btn_record_speed.xml" xy="126,81" size="60,60">
+      <gearXY controller="type" pages="0,1,2" values="61,85|126,81|129,85"/>
+      <Button icon="ui://8wph7p8nqcrmcjw"/>
+    </component>
+    <component id="n6_rayb" name="btn_NextStep" src="qcrmcju" fileName="component/record/Btn_record_speed.xml" xy="420,80" size="56,54" scale="-1,1">
+      <gearDisplay controller="type" pages="0"/>
+      <Button icon="ui://8wph7p8nqcrmcjv"/>
+    </component>
+    <component id="n7_rayb" name="btn_NextRound" src="qcrmcju" fileName="component/record/Btn_record_speed.xml" xy="438,82" size="58,56" scale="-1,1">
+      <gearXY controller="type" pages="0,1,2" values="517,81|438,82|440,83"/>
+      <Button icon="ui://8wph7p8nqcrmcjw"/>
+    </component>
+    <text id="n10_dpym" name="tex_step" xy="17,-8" size="216,38" fontSize="30" color="#ffffff" autoSize="none" text="第 999 / 999 步">
+      <gearDisplay controller="type" pages="1"/>
+    </text>
+    <component id="n11_tjv8" name="btn_play" src="qcrmcjx" fileName="component/record/Btn_record_play.xml" xy="256,25" size="89,108">
+      <gearDisplay controller="type" pages="0"/>
+    </component>
+    <text id="n12_tjv8" name="tex_speed" xy="36,-8" size="10,37" fontSize="30" color="#ff9c00" text="">
+      <gearDisplay controller="type" pages="0"/>
+    </text>
+    <text id="n13_tjv8" name="tex_1" xy="53,-8" size="10,37" fontSize="30" color="#ff9c00" text="">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="n12_tjv8" sidePair="left-right"/>
+    </text>
+    <text id="n14_tjv8" name="tex_2" xy="58,-8" size="65,38" fontSize="30" color="#ff9c00" text="暂停">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="n13_tjv8" sidePair="left-right"/>
+    </text>
+    <graph id="n15_tjv8" name="n15" xy="221,-145" size="132,132" visible="false" alpha="0.6" type="eclipse" lineSize="0" lineColor="#ff333333" fillColor="#ff000000">
+      <gearDisplay controller="type" pages="0"/>
+    </graph>
+    <component id="n9_rayb" name="btn_return" src="qcrmck0" fileName="component/record/Btn_record_return.xml" xy="227,32" pivot="0.5,0.5" size="128,98" visible="false">
+      <gearXY controller="type" pages="0,1,2" values="221,-130|227,32|458,35"/>
+      <gearSize controller="type" pages="0,1,2" values="128,92,1,1|128,98,1,1|135,93,0.6,0.6"/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="4"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -233,24 +233,14 @@
       <gearDisplay controller="witness" pages="1"/>
       <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
-    <component id="n158_ukp7" name="mask_tips" src="yffnmz" fileName="Main_style_2/Component1.xml" xy="1260,908" group="n164_ukp7">
+    <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"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <graph id="n159_ukp7" name="bg_playback" xy="0,-2" size="2532,1170" group="n164_ukp7" type="rect" lineSize="0" fillColor="#00ffffff">
+    <component id="n188_qcrm" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" pkg="v0j9abjy" xy="1250,502" size="190,8" group="n189_qcrm">
-      <gearDisplay controller="state" pages="3"/>
+      <relation target="" sidePair="center-center"/>
-    </graph>
-    <component id="n160_ukp7" name="btn_rule_back" src="yffna4" fileName="Main_new/Main/Component/btn_normol(1).xml" xy="215,33" size="115,111" group="n163_ukp7">
-      <gearDisplay controller="state" pages="3"/>
-      <Button icon="ui://8wph7p8nyffna2"/>
     </component>
-    <component id="n161_ukp7" name="btn_back_lobby_huifang" src="yffna8" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="87,57" size="81,75" group="n163_ukp7" scale="2,2">
+    <group id="n189_qcrm" name="n189" xy="967,457" size="757,165"/>
-      <gearDisplay controller="state" pages="3"/>
-    </component>
-    <component id="n162_ukp7" name="panel_record" src="yffnn0" fileName="component/record/Record_New.xml" xy="0,852" group="n163_ukp7">
-      <gearDisplay controller="state" pages="3"/>
-    </component>
-    <group id="n163_ukp7" name="huifang" xy="0,33" size="2532,984" group="n164_ukp7" advanced="true"/>
-    <group id="n164_ukp7" name="playback" xy="0,-2" size="2532,1170"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="125,125" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" 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"/>
@@ -45,12 +45,11 @@
     <image id="n40_d2rw" name="n40" src="yffn7c" fileName="component/head/tuoguan.png" xy="187,7">
       <gearDisplay controller="tuoguan" pages="1"/>
     </image>
-    <image id="n44_kx91" name="n44" src="yffn7l" fileName="component/head/jfk.png" xy="2,179" size="132,35" group="n47_kx91"/>
+    <image id="n44_kx91" name="n44" src="qcrm7ivx" fileName="images/bg_game_战绩.png" pkg="27vd145b" xy="-25,213" group="n47_kx91"/>
-    <text id="n45_kx91" name="text_jifen" xy="59,181" size="74,29" group="n47_kx91" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="1">
+    <text id="n45_kx91" name="text_jifen" xy="41,214" size="113,39" group="n47_kx91" font="Microsoft YaHei" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="11111">
       <gearColor controller="text_color" pages="1" values="#ff0000,#000000" default="#ffffff,#000000"/>
     </text>
-    <text id="n46_kx91" name="n46" xy="8,181" size="48,31" group="n47_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
+    <group id="n47_kx91" name="zhanji" xy="-25,213" size="185,42" visible="false" advanced="true"/>
-    <group id="n47_kx91" name="zhanji" xy="2,179" size="132,35" visible="false" advanced="true"/>
     <component id="n49_imp5" name="mask_piao" src="imp5cjr" fileName="Main_New/mask_piao.xml" xy="-9,92">
       <gearDisplay controller="piao" pages="1"/>
     </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="125,125" opaque="false" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" 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"/>
@@ -57,5 +57,10 @@
     <image id="n42_rnez" name="n42" src="yffn7ipf" fileName="images/icon_zhuang.png" pkg="27vd145b" xy="-10,-7">
       <gearDisplay controller="bank" pages="1"/>
     </image>
+    <image id="n57_qcrm" name="n57" src="qcrm7ivx" fileName="images/bg_game_战绩.png" pkg="27vd145b" xy="-27,213" group="n59_qcrm"/>
+    <text id="n58_qcrm" name="text_jifen" xy="39,214" size="113,39" group="n59_qcrm" font="Microsoft YaHei" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="11111">
+      <gearColor controller="text_color" pages="1" values="#ff0000,#000000" default="#ffffff,#000000"/>
+    </text>
+    <group id="n59_qcrm" name="zhanji" xy="-27,213" size="185,42" visible="false" advanced="true"/>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -859,6 +859,17 @@
     <image id="yffno0" name="bqd.png" path="/component/Result/images/"/>
     <image id="yffno1" name="hd(1).png" path="/component/Result/"/>
     <component id="yffno2" name="Btn_ResultCard.xml" path="/Main_New/Component/"/>
+    <component id="qcrmcjs" name="Record.xml" path="/Main_style_2/record/" exported="true"/>
+    <image id="qcrmcjt" name="di.png" path="/Main_style_2/images/record/" scale="9grid" scale9grid="45,0,484,137" gridTile="16"/>
+    <component id="qcrmcju" name="Btn_record_speed.xml" path="/Main_style_2/record/"/>
+    <image id="qcrmcjv" name="button02.png" path="/Main_style_2/images/record/"/>
+    <image id="qcrmcjw" name="button01.png" path="/Main_style_2/images/record/"/>
+    <component id="qcrmcjx" name="Btn_record_play.xml" path="/Main_style_2/record/"/>
+    <image id="qcrmcjy" name="01.png" path="/Main_style_2/images/record/"/>
+    <image id="qcrmcjz" name="02.png" path="/Main_style_2/images/record/"/>
+    <component id="qcrmck0" name="Btn_record_return.xml" path="/Main_style_2/record/"/>
+    <image id="qcrmck1" name="button03.png" path="/Main_style_2/images/record/"/>
+    <image id="qcrmck2" name="jfk(1).png" path="/component/head/" scale="9grid" scale9grid="77,9,22,19"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjygq7m95">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <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="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -8,45 +8,45 @@
     <text id="n93_nkur" name="wanfa_text" xy="869,485" pivot="0.5,0" size="772,56" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="玩法介绍">
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n72_l2u4" name="n21" xy="1270,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="第">
+    <text id="n72_l2u4" name="n21" xy="1260,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="第">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n76_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n73_l2u4" name="n22" xy="1345,543" size="14,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="/">
+    <text id="n73_l2u4" name="n22" xy="1335,543" size="14,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="/">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n78_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n74_l2u4" name="n23" xy="1398,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="局">
+    <text id="n74_l2u4" name="n23" xy="1388,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n79_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n75_l2u4" name="n11" xy="1080,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="剩余">
+    <text id="n75_l2u4" name="n11" xy="1050,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="剩余">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n77_l2u4" sidePair="right-left"/>
     </text>
-    <text id="n76_l2u4" name="n12" xy="1185,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="张牌">
+    <text id="n76_l2u4" name="n12" xy="1175,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" text="张牌">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <text id="n77_l2u4" name="remaining_card" xy="1155,543" size="27,54" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990099" align="center" vAlign="middle" autoSize="none" text="7">
+    <text id="n77_l2u4" name="remaining_card" xy="1125,543" size="47,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990099" align="center" vAlign="middle" text="77">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n76_l2u4" sidePair="right-left"/>
     </text>
-    <text id="n78_l2u4" name="tex_round1" xy="1314,543" size="25,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" autoClearText="true" text="2">
+    <text id="n78_l2u4" name="tex_round1" xy="1304,543" size="25,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" autoClearText="true" text="2">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n72_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n79_l2u4" name="tex_round2" xy="1365,543" size="25,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" autoClearText="true" text="8">
+    <text id="n79_l2u4" name="tex_round2" xy="1355,543" size="25,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" autoClearText="true" text="8">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n73_l2u4" sidePair="left-right"/>
     </text>
-    <group id="n80_l2u4" name="n80" xy="1080,543" size="358,54" group="n82_l2u4" advanced="true">
+    <group id="n80_l2u4" name="n80" xy="1050,543" size="378,49" group="n82_l2u4" advanced="true">
       <relation target="n81_l2u4" sidePair="left-left,top-top"/>
     </group>
-    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1202,611" pivot="0.5,0.5" group="n82_l2u4" aspect="true" scale="1.3,1.3">
+    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1192,611" pivot="0.5,0.5" group="n82_l2u4" aspect="true" scale="1.3,1.3">
       <gearDisplay controller="state" pages="1,3"/>
-      <gearXY controller="3d" pages="0,1" values="1202,611|603,254"/>
+      <gearXY controller="3d" pages="0,1" values="1192,611|603,254"/>
     </component>
-    <group id="n82_l2u4" name="n60" xy="1080,543" size="358,194" advanced="true">
+    <group id="n82_l2u4" name="n60" xy="1050,543" size="378,194" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n86_8sat" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1059,10" group="n90_8sat" touchable="false"/>

wb_new_ui/assets/Main_Majiang/component/card/OutCard_top(1).xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="36,51" extention="Button">
+<component size="69,106" extention="Button">
   <controller name="caishen" pages="0,,1," selected="0"/>
   <controller name="quese" pages="0,,1," selected="0"/>
   <controller name="hun" pages="0,,1," selected="0"/>
   <controller name="color" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n1" name="icon" xy="-1,-1" size="95,134" scale="0.4,0.4" url="ui://lxhyy2sd6cpqtx" autoSize="true"/>
+    <loader id="n1" name="icon" xy="-4,0" size="76,106" url="ui://v0j9abjygq7mk3" fill="scaleFree"/>
     <image id="n2_i5l6" name="n2" src="gq7m87" fileName="santan.png" xy="49,-12" size="69,62" rotation="90">
       <gearDisplay controller="caishen" pages="1"/>
     </image>
-    <loader id="n3_hxpw" name="flag" xy="1,26" size="24,20" aspect="true" url="ui://d493x2q7hxpw10" fill="scale">
+    <loader id="n3_hxpw" name="flag" xy="21,-20" size="24,20" aspect="true" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
     </loader>
-    <graph id="n5_f7q5" name="n5" xy="0,-1" size="36,51" alpha="0.3" touchable="false" blend="add" type="rect" lineSize="0" fillColor="#ffffefc7">
+    <graph id="n5_f7q5" name="n5" xy="0,0" size="69,106" alpha="0.3" touchable="false" blend="add" type="rect" lineSize="0" fillColor="#ffffefc7">
       <gearDisplay controller="color" pages="1"/>
     </graph>
   </displayList>