结算页面显示剩余的牌

lua_probject/base_project/Game/View/MissileSender.lua

@@ -0,0 +1,86 @@
+local MissileSender = {}
+local pool = {}
+local curView = {}
+local MovieClipPool = {}
+
+local function GetObj()
+    if #pool > 0 then
+        local re = pool[#pool]
+        re.visible = true
+        pool[#pool] = nil
+        return re
+    end
+
+    return UIPackage.CreateObjectFromURL("ui://Main_Majiang/Missile")
+end
+
+local function BackObj(obj)
+    pool[#pool + 1] = obj
+    obj.visible = false
+end
+
+local function GetMovieClip(url)
+    local _pool = MovieClipPool[url]
+
+    if _pool and #_pool > 0 then
+        local re = _pool[#_pool]
+        re.visible = true
+        _pool[#_pool] = nil
+        return re
+    end
+
+    return UIPackage.CreateObjectFromURL(url)
+end
+
+local function BackMovieClip(obj, url)
+    if MovieClipPool[url] == nil then
+        MovieClipPool[url] = {}
+    end
+
+    local _pool = MovieClipPool[url]
+    _pool[#_pool + 1] = obj
+    obj.visible = false
+end
+
+function MissileSender.Send(url, send, target, view, animUrl, num, time)
+    if curView ~= view then
+        pool = {}
+    end
+
+    curView = view
+
+    local sendPos = send.xy--Vector2.New(send.x + send.width/2, send.y + send.height/2)
+    local targetPos = target.xy--Vector2.New(target.x + target.width/2, target.y + target.height/2)
+
+    for i = 1, num do
+        local obj = GetObj()
+        obj:GetChild("loader").url = url
+        view:AddChild(obj)
+        obj.xy = sendPos
+
+        -- 间隔
+        obj:TweenMove(obj.xy, i * 0.1):OnComplete(function()
+            obj:TweenMove(targetPos, time):OnComplete(function()
+                BackObj(obj)
+                if i == num then
+                    MissileSender.Animation(target, animUrl, view)
+                end
+            end)
+        end)
+    end
+end
+
+function MissileSender.Animation(target, animUrl, view)
+    local e = GetMovieClip(animUrl)
+    e:SetPlaySettings(1, -1, 1, -1)
+    e.onPlayEnd:Set(function()
+        e.visible = false
+        BackMovieClip(e, animUrl)
+    end)
+    view:AddChild(e)
+    e.width = target.width
+    e.height = target.height
+    e.xy = target.xy
+end
+
+return MissileSender

lua_probject/base_project/Game/View/playerDetailView.lua

@@ -0,0 +1,65 @@
+local playerDetailView = {}
+
+function playerDetailView.New()
+    setmetatable(playerDetailView, { __index = BaseWindow })
+    local inst = setmetatable({}, { __index = playerDetailView })
+    inst.class = "playerDetailView"
+    BaseWindow.init(inst, "ui://Common/playerDetail")
+    inst:Init()
+    return inst
+end
+
+function playerDetailView:Refalsh(player)
+    local p = player
+
+    ImageLoad.Load(player.self_user.head_url, self.loader_icon)
+end
+
+function playerDetailView:Show(player)
+    self:Refalsh(player)
+    BaseWindow.Show(self)
+end
+
+function playerDetailView:Init()
+    self.tex_name = self._view:GetChild("tex_name")
+    self.tex_ip = self._view:GetChild("tex_ip")
+    self.tex_id = self._view:GetChild("tex_id")
+
+    self.btn_boom = self._view:GetChild("btn_boom")
+    self.btn_egg = self._view:GetChild("btn_egg")
+    self.btn_ring = self._view:GetChild("btn_ring")
+    self.btn_flower = self._view:GetChild("btn_flower")
+    self.btn_close = self._view:GetChild("btn_close")
+
+    self.loader_icon = self._view:GetChild("loader_icon")
+
+    self.btn_boom.onClick:Set(function()
+        local mainView = BaseView.FindView("MainView")
+        if mainView then
+            mainView:Missile(1, 2, "ui://Common/boom", "ui://Main_Majiang/Missile_boom")
+        end
+    end)
+
+    self.btn_egg.onClick:Set(function()
+        local mainView = BaseView.FindView("MainView")
+        if mainView then
+            mainView:Missile(1, 2, "ui://Common/egg", "ui://Main_Majiang/Missile_egg")
+        end
+    end)
+
+    self.btn_ring.onClick:Set(function()
+        local mainView = BaseView.FindView("MainView")
+        if mainView then
+            mainView:Missile(1, 2, "ui://Common/diamo", "ui://Main_Majiang/Missile_diamo")
+        end
+    end)
+
+    self.btn_flower.onClick:Set(function()
+        local mainView = BaseView.FindView("MainView")
+        if mainView then
+            mainView:Missile(1, 2, "ui://Common/flower", "ui://Main_Majiang/Missile_flower")
+        end
+    end)
+end
+
+return playerDetailView

lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua

@@ -31,12 +31,13 @@ end
 --     end
 -- end
 
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
     -- print("===============================InitData===========================", over, room, result, total_result)
     -- pt(room)
     -- pt(result)
     -- Pt(total_result)
     self._callback = callback
+    self._witnessCallbak = witnessCallbak
     local showClearMainBtn = self._view:GetChild("btn_showClearMain")
     local nextRoundBtn = self._view:GetChild("btn_nextRound")
     local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -46,6 +47,15 @@ function M:InitData(over, room, result, total_result, callback)
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    result.cardList = json.decode(result.cardList)
+    table.sort(result.cardList)
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +65,16 @@ function M:InitData(over, room, result, total_result, callback)
     end)
 
     nextRoundBtn.onClick:Set(function()
+        if isWitness and isWitness == 1 then
+            if self._witnessCallbak then
+                self._witnessCallbak()
+            end
+            self:DestroyWithCallback()
+        else
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:PlayerReady()
             self:DestroyWithCallback()
+        end
     end)
 
 
@@ -71,9 +88,16 @@ function M:InitData(over, room, result, total_result, callback)
         _overCtr.selectedIndex = 0
         self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
+            if isWitness and isWitness == 1 then
+                if self._witnessCallbak then
+                    self._witnessCallbak()
+                end
+                self:DestroyWithCallback()
+            else
                 local _gamectr = ControllerManager.GetController(GameController)
                 _gamectr:PlayerReady()
                 self:DestroyWithCallback()
+            end
         end)
     elseif over == 1 then
         showBtnTypeCtr.selectedIndex = 1
@@ -127,6 +151,7 @@ function M:fillResult0(room, peopleNum, result)
         infoList.gang_score = infoList.gang_score or 0
         infoList.hu_score = infoList.hu_score or 0
         infoList.round_score = infoList.round_score or 0
+        self.list_lastCard.numItems = #result.cardList
 
         playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
         playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and
@@ -244,7 +269,9 @@ end
 function M:fillResult1(room, peopleNum, total_result)
     local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
     local familyIDText = self._view:GetChild("Text_FamilyID")
-    for i, v in pairs(room.self_player.self_user.games) do
+    print("lingmeng fillResult1")
+    pt(room)
+    for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
         end
@@ -288,6 +315,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua

@@ -332,6 +332,7 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    evt_data.result.cardList = evt_data.cardList
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua

@@ -31,12 +31,13 @@ end
 --     end
 -- end
 
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
     -- print("===============================InitData===========================", over, room, result, total_result)
     -- pt(room)
     -- pt(result)
     -- Pt(total_result)
     self._callback = callback
+    self._witnessCallbak = witnessCallbak
     local showClearMainBtn = self._view:GetChild("btn_showClearMain")
     local nextRoundBtn = self._view:GetChild("btn_nextRound")
     local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -46,6 +47,15 @@ function M:InitData(over, room, result, total_result, callback)
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    result.cardList = json.decode(result.cardList)
+    table.sort(result.cardList)
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +65,16 @@ function M:InitData(over, room, result, total_result, callback)
     end)
 
     nextRoundBtn.onClick:Set(function()
+        if isWitness and isWitness == 1 then
+            if self._witnessCallbak then
+                self._witnessCallbak()
+            end
+            self:DestroyWithCallback()
+        else
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:PlayerReady()
             self:DestroyWithCallback()
+        end
     end)
 
 
@@ -71,9 +88,16 @@ function M:InitData(over, room, result, total_result, callback)
         _overCtr.selectedIndex = 0
         self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
+            if isWitness and isWitness == 1 then
+                if self._witnessCallbak then
+                    self._witnessCallbak()
+                end
+                self:DestroyWithCallback()
+            else
                 local _gamectr = ControllerManager.GetController(GameController)
                 _gamectr:PlayerReady()
                 self:DestroyWithCallback()
+            end
         end)
     elseif over == 1 then
         showBtnTypeCtr.selectedIndex = 1
@@ -127,6 +151,7 @@ function M:fillResult0(room, peopleNum, result)
         infoList.gang_score = infoList.gang_score or 0
         infoList.hu_score = infoList.hu_score or 0
         infoList.round_score = infoList.round_score or 0
+        self.list_lastCard.numItems = #result.cardList
 
         playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
         playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and
@@ -240,7 +265,9 @@ end
 function M:fillResult1(room, peopleNum, total_result)
     local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
     local familyIDText = self._view:GetChild("Text_FamilyID")
-    for i, v in pairs(room.self_player.self_user.games) do
+    print("lingmeng fillResult1")
+    pt(room)
+    for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
         end
@@ -284,6 +311,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua

@@ -332,6 +332,7 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    evt_data.result.cardList = evt_data.cardList
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua

@@ -47,6 +47,15 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    result.cardList = json.decode(result.cardList)
+    table.sort(result.cardList)
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -140,6 +149,7 @@ function M:fillResult0(room, peopleNum, result)
         infoList.gang_score = infoList.gang_score or 0
         infoList.hu_score = infoList.hu_score or 0
         infoList.round_score = infoList.round_score or 0
+        self.list_lastCard.numItems = #result.cardList
 
         playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
         playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and
@@ -302,6 +312,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua

@@ -333,6 +333,7 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    evt_data.result.cardList = evt_data.cardList
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua

@@ -31,12 +31,13 @@ end
 --     end
 -- end
 
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
     -- print("===============================InitData===========================", over, room, result, total_result)
     -- pt(room)
     -- pt(result)
     -- Pt(total_result)
     self._callback = callback
+    self._witnessCallbak = witnessCallbak
     local showClearMainBtn = self._view:GetChild("btn_showClearMain")
     local nextRoundBtn = self._view:GetChild("btn_nextRound")
     local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -46,6 +47,15 @@ function M:InitData(over, room, result, total_result, callback)
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    result.cardList = json.decode(result.cardList)
+    table.sort(result.cardList)
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +65,16 @@ function M:InitData(over, room, result, total_result, callback)
     end)
 
     nextRoundBtn.onClick:Set(function()
+        if isWitness and isWitness == 1 then
+            if self._witnessCallbak then
+                self._witnessCallbak()
+            end
+            self:DestroyWithCallback()
+        else
             local _gamectr = ControllerManager.GetController(GameController)
             _gamectr:PlayerReady()
             self:DestroyWithCallback()
+        end
     end)
 
     endRound.onClick:Set(function()
@@ -69,9 +86,16 @@ function M:InitData(over, room, result, total_result, callback)
         _overCtr.selectedIndex = 0
         self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
+            if isWitness and isWitness == 1 then
+                if self._witnessCallbak then
+                    self._witnessCallbak()
+                end
+                self:DestroyWithCallback()
+            else
                 local _gamectr = ControllerManager.GetController(GameController)
                 _gamectr:PlayerReady()
                 self:DestroyWithCallback()
+            end
         end)
     elseif over == 1 then
         showBtnTypeCtr.selectedIndex = 1
@@ -125,6 +149,7 @@ function M:fillResult0(room, peopleNum, result)
         infoList.gang_score = infoList.gang_score or 0
         infoList.hu_score = infoList.hu_score or 0
         infoList.round_score = infoList.round_score or 0
+        self.list_lastCard.numItems = #result.cardList
 
         playerInfoComp:GetChild("text_name").text = playInfo.self_user.nick_name
         playerInfoComp:GetChild("Text_BoJing").text = infoList.jing_score >= 0 and
@@ -184,8 +209,7 @@ function M:fillResult0(room, peopleNum, result)
         table.sort(infoList.hand_card, self.HandCardSortAndJing)
         handCardList:SetVirtual()
         handCardList.itemRenderer = function(index, obj)
-            obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(),
-                infoList.hand_card[index + 1])
+            obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
             if room.jing == infoList.hand_card[index + 1] then
                 obj:GetController('jing').selectedIndex = 1
             end
@@ -240,7 +264,9 @@ end
 function M:fillResult1(room, peopleNum, total_result)
     local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
     local familyIDText = self._view:GetChild("Text_FamilyID")
-    for i, v in pairs(room.self_player.self_user.games) do
+    print("lingmeng fillResult1")
+    pt(room)
+    for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
         end
@@ -284,6 +310,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua

@@ -332,6 +332,7 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    evt_data.result.cardList = evt_data.cardList
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

wb_new_ui/assets/Common/buttons/btn_bg.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button" bgColor="#333333">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n0_xblm" name="n0" xy="0,0" size="100,20" alpha="0.6" touchable="false" type="rect" lineSize="0" fillColor="#ff333333">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n1_xblm" name="n1" xy="0,0" size="100,20" alpha="0.6" touchable="false" type="rect" lineSize="0" fillColor="#ff333333">
+      <gearDisplay controller="button" pages="2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n2_xblm" name="n2" xy="0,0" size="100,20" alpha="0.6" touchable="false" type="rect" lineSize="0" fillColor="#ff333333">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Common/window/Component/btn_close.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="122,122" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_qmc1" src="qmc17jbr" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Common/window/Component/btn_emoji.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_qmc1" name="icon" xy="0,0" size="100,20" align="center" vAlign="middle" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Common/window/playerDetail.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1038,484">
+  <displayList>
+    <image id="n0_qmc1" name="n0" src="qmc17jbq" fileName="images/Rectangle 297.png" xy="0,0" size="1038,484"/>
+    <image id="n3_qmc1" name="n3" src="qmc17jbt" fileName="images/Rectangle 298.png" xy="22,20" size="994,444"/>
+    <component id="n2_qmc1" name="btn_close" src="qmc17jbs" fileName="window/Component/btn_close.xml" xy="946,-20"/>
+    <loader id="n4_qmc1" name="loader_icon" xy="72,72" size="212,212" align="center" vAlign="middle" fill="scaleFree"/>
+    <graph id="n5_qmc1" name="n5" xy="72,72" size="212,212" type="rect" corner="8"/>
+    <text id="n6_qmc1" name="tex_name" xy="320,88" size="563,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#9a5f34" autoSize="none" text="9A5F34"/>
+    <text id="n7_qmc1" name="tex_ip" xy="320,234" size="561,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#9a5f34" autoSize="none" text="9A5F34"/>
+    <text id="n8_qmc1" name="tex_id" xy="320,158" size="561,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#9a5f34" autoSize="none" text="9A5F34"/>
+    <component id="n9_qmc1" name="btn_boom" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="80,311" size="112,112">
+      <Button icon="ui://27vd145bqmc17jbx"/>
+    </component>
+    <component id="n10_qmc1" name="btn_egg" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="232,332" size="112,112">
+      <Button icon="ui://27vd145bqmc17jby"/>
+    </component>
+    <component id="n11_qmc1" name="btn_ring" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="384,320" size="112,112">
+      <Button icon="ui://27vd145bqmc17jbv"/>
+    </component>
+    <component id="n12_qmc1" name="btn_flower" src="qmc17jbu" fileName="window/Component/btn_emoji.xml" xy="536,320" size="112,112">
+      <Button icon="ui://27vd145bqmc17jbw"/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/Lobby/checkbtn_click.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="50,50" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_xblm" name="n0" src="xblm7czj" fileName="component/Setting/Image/btn_dianxinchongzhi_2.png" xy="0,0" size="50,50">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_xblm" name="n1" src="xblm7czk" fileName="component/Setting/Image/btn_dianxinchongzhi_1.png" xy="1,0" size="48,50">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2_xblm" name="title" xy="70,0" size="75,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#695741" text="单击"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml

@@ -10,7 +10,7 @@
   <controller name="laizi" pages="0,,1," selected="0"/>
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="60,84" url="ui://Main_MaJiang/202_101" fill="scaleFree" clearOnPublish="true">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="60,84" url="ui://Main_MaJiang/202_101" fill="scaleFree">
       <gearXY controller="button" pages="0,1" values="0,0|-3,-22" tween="true"/>
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
       <relation target="" sidePair="width-width,height-height"/>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Missile.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="112,112" pivot="0.5,0.5">
+  <displayList>
+    <loader id="n0_uans" name="loader" xy="0,0" pivot="0.5,0.5" size="112,112" url="ui://27vd145bqmc17jbx" align="center" vAlign="middle" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml

@@ -2,7 +2,7 @@
 <component size="2532,1170" bgColor="#000000">
   <controller name="over" pages="0,,1," selected="0"/>
   <controller name="main" pages="0,,1," selected="1"/>
-  <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="1"/>
+  <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="0"/>
   <controller name="showType" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n110_qt01" name="n110" src="qt01ys" fileName="Main_new/Main/Image/Rectangle 212.png" xy="559,451" group="n113_qt01"/>
@@ -24,11 +24,11 @@
     <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,219" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
     </component>
-    <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,516" group="n121_yry6">
+    <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,591" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
       <gearXY controller="playerNum" pages="0,1" values="96,591|96,516" default="96,417"/>
     </component>
-    <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,813" group="n121_yry6">
+    <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,615" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="1,2"/>
       <gearXY controller="playerNum" pages="1" values="96,813" default="96,615"/>
     </component>
@@ -48,7 +48,7 @@
       <gearDisplay controller="playerNum" pages="2"/>
       <gearXY controller="playerNum" default="96,813"/>
     </component>
-    <list id="n145_uans" name="list_lastCard" xy="303,1038" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjyyry6z3" vAlign="middle">
+    <list id="n145_uans" name="list_lastCard" xy="303,1038" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjyyry6z3" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -109,15 +109,15 @@
     <component id="n134_yry6" name="Btn_Share" src="yry6ze" fileName="Main_new/Clearing/Component/Btn_Share.xml" xy="1425,996" group="n140_yry6"/>
     <component id="n133_yry6" name="Btn_EndRound" src="yry6zd" fileName="Main_new/Clearing/Component/Btn_EndRound.xml" xy="1761,996" group="n140_yry6"/>
     <component id="n135_yry6" name="Btn_Copy" src="yry6zf" fileName="Main_new/Clearing/Component/Btn_Copy.xml" xy="2100,996" group="n140_yry6"/>
-    <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="333,228" group="n140_yry6">
+    <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="540,228" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
       <gearXY controller="playerNum" pages="1,2" values="333,228|333,228" default="540,228"/>
     </component>
-    <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1035,228" group="n140_yry6">
+    <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1530,228" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
       <gearXY controller="playerNum" pages="0,1" values="1530,228|1035,228" default="801,228"/>
     </component>
-    <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1737,228" group="n140_yry6">
+    <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1269,228" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="1,2"/>
       <gearXY controller="playerNum" pages="1" values="1737,228" default="1269,228"/>
     </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_cancelRoom.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="478,160" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_xblm" src="xblm1ab" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_gameDismissRoom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,73" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="cStyle" pages="0,,1," selected="0">
+    <remark page="0" value="解散"/>
+    <remark page="1" value="退出"/>
+  </controller>
+  <displayList>
+    <image id="n0_xblm" name="n0" src="u63319y" fileName="Main_new/Main/Image/dismiss_room.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_qncf" name="n1" src="qncf1bj" fileName="Main_new/Main/Image/exit_room.png" xy="0,0" size="210,73">
+      <gearDisplay controller="cStyle" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio" downEffect="scale" downEffectValue="0.9"/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/loader.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="31,45">
+  <displayList>
+    <loader id="n1_uans" name="n1" xy="0,0" size="31,45" url="ui://v0j9abjyqmc11av" align="center" vAlign="middle" fill="scaleFree"/>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/checkbtn_click.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="50,50" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_xblm" name="n0" src="xblm1ae" fileName="component/Setting/Image/btn_dianxinchongzhi_2.png" xy="0,0" size="50,50">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_xblm" name="n1" src="xblm1af" fileName="component/Setting/Image/btn_dianxinchongzhi_1.png" xy="1,0" size="48,50">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2_xblm" name="title" xy="70,0" size="75,49" font="ui://27vd145bh35o7ilb" fontSize="36" color="#695741" text="单击"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Main_Majiang/component/setting/Component/btn_vedio.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="78,60" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n5_h35o" name="n5" src="xblm1al" fileName="component/Setting/Image/Vector@3x.png" xy="0,0"/>
+    <image id="n6_h35o" name="n6" src="xblm1am" fileName="component/Setting/Image/Group 82@3x.png" xy="0,-2">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/Main_Majiang/component/setting/Component/slider_vedio.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="750,36" extention="Slider">
+  <displayList>
+    <graph id="n0_tme1" name="bg" xy="0,6" size="750,24" type="rect" lineSize="0" lineColor="#ffa0a0a0" fillColor="#ffb8997d" corner="18">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <image id="n1_tme1" name="bar" src="xblm1ah" fileName="component/Setting/Image/Rectangle 77@3x.png" xy="0,0" size="742,36"/>
+    <component id="n2_tme1" name="grip" src="xblm1ai" fileName="component/Setting/Component/slider_vedio_grip.xml" xy="702,-24">
+      <relation target="n1_tme1" sidePair="right-right"/>
+    </component>
+  </displayList>
+  <Slider/>
+</component>

wb_new_ui/assets/Main_Majiang/component/setting/Component/slider_vedio_grip.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="79,84" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_tme1" src="xblm1aj" name="n0" xy="0,0"/>
+  </displayList>
+</component>

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dadc097a17cc2c1419d22885331a6b76
+guid: 7aef48e6dc5a8c6498eb76cd41e5f0e9
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: d7e6544ba54171b43948e06b99591294
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: