21..11点同步

lua_probject/base_project/Game/View/FamilyView.lua

@@ -1071,6 +1071,7 @@ function M:ChangeOther()
     local otherList = IDENTITY_LIST[i].otherList
     local list_other = self._view:GetChild('list_other')
     self._lev = i
+    self._view:GetController('lev').selectedIndex = self._group.lev - 1
     list_other:SetVirtual()
     list_other.itemRenderer = function(index, obj)
         local cfg = otherList[index + 1]

lua_probject/base_project/Game/View/MainView.lua

@@ -1375,7 +1375,7 @@ function M:OnUpdate()
         end
         if leftTime <= 3 and self._curtime ~= leftTime and leftTime ~= 0 then
             self._curtime = leftTime
-            GameApplication.Instance:PlaySound('base/sound/daojishi1.mp3')
+            GameApplication.Instance:PlaySound('base/common/sound/timeup_alarm.mp3')
         end
     else
         self:onLeftTimeOver()

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -34,8 +34,9 @@ function M.new(view, main_view, isHideIpAdds)
     return self
 end
 
-function M:init()
+function M:init(flag_witness)
     local view = self._view
+    self.flag_witness = flag_witness
     UIPackage.AddPackage('base/chat/ui/Chat')
     self._tex_player_name = view:GetChild('name')
     -- self._tex_score = view:GetChild('text_jifen')
@@ -141,7 +142,7 @@ function M:FillData(player)
             function()
                 --local headView = HeadView.new(self._main_view._root_view, player.self_user, self._isHideIpAdds)
                 --headView:Show()
-                local _playerDetailView = playerDetailView.New()
+                local _playerDetailView = playerDetailView.New(self.flag_witness)
                 _playerDetailView:Show(player)
             end
         )

lua_probject/base_project/Game/View/WitnessView.lua

@@ -1,4 +1,5 @@
 local MJMainView = require("main.majiang.MJMainView")
+local MissileSender = import(".MissileSender")
 
 local WitnessView = {}
 
@@ -17,9 +18,13 @@ function M:init()
     self.class = "MainView"
     self._style = 1
     self._popEvent = true
+    self.Fix_Msg_Chat = ViewUtil.Fix_Msg_Chat -- 自动回复消息列表
     self:InitView()
 end
 
+-- 语音是否禁止
+local record_baned = 0
+
 function M:InitView(url)
     local room = self._room
     BaseView.InitView(self, url)
@@ -31,6 +36,181 @@ function M:InitView(url)
     self.com_notice = self._view:GetChild("com_notice")
 end
 
+function M:EventInit()
+    local _gamectr = self._gamectr
+    local _room = self._room
+
+    _gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
+        self:PlayMJSound("user_enter.mp3")
+        local arg = { ... }
+        local p = arg[1]
+        local info1 = self._player_info[self:GetPos(p.seat)]
+        info1:FillData(p)
+        info1._view.visible = true
+
+        local info2 = self._player_card_info[self:GetPos(p.seat)]
+        info2:SetPlayer(p)
+        info2:FillData()
+    end)
+
+    _gamectr:AddEventListener(GameEvent.PlayerLeave, function(...)
+        local arg = { ... }
+        local p = arg[1]
+        local info1 = self._player_info[self:GetPos(p.seat)]
+        info1._view.visible = false
+        self:PlayMJSound("user_leave.mp3")
+    end)
+
+    _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
+        self:PlayMJSound("user_enter.mp3")
+        local arg = { ... }
+        local witnessPlayerList = arg[1]
+        self._room.witness_player_list = witnessPlayerList
+
+        local _room = DataManager.CurrenRoom
+        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
+        if viewList_witness.numItems == #_room.witness_player_list then
+            viewList_witness:RefreshVirtualList()
+        else
+            viewList_witness.numItems = #_room.witness_player_list
+        end
+    end)
+
+    _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, function(...)
+        ---- print("刷新托管数据=====")
+        local arg = { ... }
+        local player = arg[1]
+        local witnessPlayerList = self._room.witness_player_list
+        for i, _player in ipairs(witnessPlayerList) do
+            if _player.aid == player then
+                table.remove(witnessPlayerList, i)
+                break
+            end
+        end
+
+        local _room = DataManager.CurrenRoom
+        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
+        print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
+        if viewList_witness.numItems == #_room.witness_player_list then
+            viewList_witness:RefreshVirtualList()
+        else
+            viewList_witness.numItems = #_room.witness_player_list
+        end
+    end)
+
+    _gamectr:AddEventListener(
+        GameEvent.TupGuanOpen,
+        function(...)
+            ---- print("刷新托管数据=====")
+            local arg = { ... }
+            local p = arg[1]
+            local info = self._player_info[self:GetPos(p.seat)]
+            self._left_time = tonumber(arg[3]) or 0
+
+            if info and info.IsShowTGTips then
+                info:IsShowTGTips(arg[2], arg[3])
+            end
+
+            if info and info.SetShowTGTips then
+                info:SetShowTGTips(arg[2], arg[3])
+            end
+        end
+    )
+
+    _gamectr:AddEventListener(
+        GameEvent.Interaction,
+        function(...)
+            local arg = { ... }
+            local data = arg[1]
+            local _type = arg[2]
+
+            -- 扔番茄
+            if _type == 7 then
+                local sendSeat = arg[3].sendSeat
+                local targetSeat = arg[3].targetSeat
+                local Missile = arg[3].Missile
+                self:Missile(sendSeat, targetSeat, Missile)
+            end
+
+            local p = arg[1]
+            if not p or not p.seat or p.seat == 0 then
+                return
+            end
+            if DataManager.BanInteractRoom == _room.room_id and p.seat ~= _room.self_player.seat then
+                return
+            end
+            local info = self._player_info[self:GetPos(p.seat)]
+            local ttype = arg[2]
+            if ttype == 5 then
+                local parm = arg[3]
+                local array = split(parm, '_')
+                local tp = self._room:GetPlayerById(tonumber(array[2]))
+                if not tp or not tp.seat or tp.seat == 0 then
+                    return
+                end
+                local pos = self._view:GlobalToLocal(info._view:LocalToGlobal(info:GetHeadCenter()))
+                if tp.seat == p.seat then
+                    for i = 1, #_room.player_list do
+                        local player = _room.player_list[i]
+                        if player.seat ~= tp.seat then
+                            tinfo = self._player_info[self:GetPos(player.seat)]
+                            tpos = self._view:GlobalToLocal(tinfo._view:LocalToGlobal(tinfo:GetHeadCenter()))
+                            self:PlayInteractAnimation(array[1], pos, tpos)
+                        end
+                    end
+                else
+                    local tinfo = self._player_info[self:GetPos(tp.seat)]
+                    local tpos = self._view:GlobalToLocal(tinfo._view:LocalToGlobal(tinfo:GetHeadCenter()))
+                    self:PlayInteractAnimation(array[1], pos, tpos)
+                end
+            elseif ttype == 3 then
+                if record_baned == 0 then
+                    info:ShowInteraction(ttype, arg[3])
+                end
+            else
+                info:ShowInteraction(ttype, arg[3])
+            end
+        end
+    )
+end
+
+function M:PlayChatSound(sex, chat_index)
+    local sex_path = ViewUtil.Sex_Chat[sex]
+    local path1 = string.format('base/common/sound/%s/chat_%s.mp3', sex_path, tostring(chat_index - 1))
+    GameApplication.Instance:PlaySound('base_chat', path1)
+    -- GameApplication.Instance:PlaySound(path1)
+end
+
+-- 获取消息使用的语言、序号
+function M:GetChatMsgLanguage(msg_index)
+    local language = math.modf(msg_index / 100)
+    local index = math.fmod(msg_index, 100)
+    return language, index
+end
+
+function M:Missile(seat, targetSeat, Missile)
+    local animUrl = ""
+    local url = ""
+    if Missile == "boom" then
+        animUrl = "ui://Main_Majiang/bomb"
+        url = "ui://Common/boom"
+    elseif Missile == "egg" then
+        animUrl = "ui://Main_Majiang/egg"
+        url = "ui://Common/egg"
+    elseif Missile == "diamo" then
+        animUrl = "ui://Main_Majiang/jiezhi"
+        url = "ui://Common/diamo"
+    elseif Missile == "flower" then
+        animUrl = "ui://Main_Majiang/flower"
+        url = "ui://Common/flower"
+    end
+
+    local send = self._player_info[self:GetPos(seat)]
+    local target = self._player_info[self:GetPos(targetSeat)]
+
+    MissileSender.Send(url, send, target, self, animUrl, Missile, 5, 1)
+end
+
 function M:Show()
     getmetatable(WitnessView).__index.Show(self)
     self:DoNoticeAnimation()
@@ -65,6 +245,7 @@ function M:DoNoticeAnimation()
 end
 
 function M:OnUpdate()
+    local deltaTime = Time.deltaTime
     if (self._popEvent) then
         local func = self._gamectr:PopEvent()
         if (func ~= nil) then
@@ -83,6 +264,33 @@ function M:OnUpdate()
             --func()
         end
     end
+
+    local _left_time = self._left_time
+    if _left_time and (_left_time > 0) then
+        _left_time = _left_time - deltaTime
+        _left_time = math.max(0, _left_time)
+        local leftTime = math.floor(_left_time)
+        self._tex_leftTime.text = string.format("%02d", _left_time)
+        self._left_time = _left_time
+        -- 桌面計時器聲音
+        if not self._curtime then
+            self._curtime = 15
+        end
+        if leftTime <= 3 and self._curtime ~= leftTime and leftTime ~= 0 then
+            self._curtime = leftTime
+            GameApplication.Instance:PlaySound('base/common/sound/timeup_alarm.mp3')
+        end
+    else
+        if self._tex_leftTime then
+            self._tex_leftTime.text = '00'
+        end
+        for i = 2, 4 do
+            local text = self["_tex_leftTime" .. i]
+            if text then
+                text.text = '00'
+            end
+        end
+    end
 end
 
 function M:DestroyPlayerInfo()

lua_probject/base_project/Game/View/playerDetailView.lua

@@ -16,10 +16,11 @@ local function Send(self, Missile)
     end)
 end
 
-function playerDetailView.New()
+function playerDetailView.New(flag_witness)
     setmetatable(playerDetailView, { __index = BaseWindow })
     local inst = setmetatable({}, { __index = playerDetailView })
     inst.class = "playerDetailView"
+    inst.flag_witness = flag_witness
     BaseWindow.init(inst, "ui://Common/playerDetail")
     inst:Init()
     return inst
@@ -33,7 +34,7 @@ function playerDetailView:Refalsh(player)
     ImageLoad.Load(player.self_user.head_url, self.loader_icon)
 
     self.cMissile.selectedIndex = 1
-    if self.player.self_user.account_id == DataManager.SelfUser.account_id then 
+    if self.player.self_user.account_id == DataManager.SelfUser.account_id or self.flag_witness then 
         self.cMissile.selectedIndex = 0
     end
 end

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

@@ -236,7 +236,9 @@ function M:EventInit()
     end)
     _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
         local arg = { ... }
-        -- self._left_time = 15
+        if not self._left_time or self._left_time <= 15 then
+            self._left_time = 15
+        end
         local seat = arg[1]
         self:UpdateCardBox(self:GetPos(seat))
         -- if seat == self._room.self_player.seat then

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

@@ -3,17 +3,17 @@ local PlayerInfoView2 = require("Game.View.PlayerInfoView2")
 
 local M = {}
 
-function M.new(view, mainView)
+function M.new(view, mainView,flag_witness)
     setmetatable(M, { __index = PlayerInfoView2 })
     local self = setmetatable({}, { __index = M })
     self._view = view
     self._main_view = mainView
-    self:init()
+    self:init(flag_witness)
     return self
 end
 
-function M:init()
+function M:init(flag_witness)
-    PlayerInfoView2.init(self)
+    PlayerInfoView2.init(self,flag_witness)
 end
 
 function M:ShowInteraction(type, str)

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

@@ -336,7 +336,33 @@ function M:EventInit()
         if _room.curren_round ~= _room.room_config.round then
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
             self._clearingView:InitData(0, _room, result, nil, function(...)
+                for i = 1, #data do
+                    local p = _room:GetPlayerBySeat(data[i].seat)
+                    p.total_score = data[i].total_score
+                    local card_info = self._player_card_info[self:GetPos(p.seat)]
+                    local info = self._player_info[self:GetPos(p.seat)]
+                    --card_info:Clear()
+                    card_info:ResetCardType()
+                    if _room:checkHpNonnegative() then
+                        p.cur_hp = data[i].total_score
+                    end
+                    info:UpdateScore()
+                    info._view:GetChild("zhanji").visible = true
+                    local num = data[i].total_score
+                    if num >= 0 then
+                        info._view:GetController("text_color").selectedIndex = 0
+                        info._view:GetChild("text_jifen").text = "+" .. num
+                    else
+                        info._view:GetController("text_color").selectedIndex = 1
+                        info._view:GetChild("text_jifen").text = num
+                    end
+    
+                    info._view:GetChild("mask_piao").title = ""
+                    info._view:GetController("piao_niao").selectedIndex = 0
+                    p.fz_list = {}
+                end
                 DataManager.CurrenRoom.self_player.card_list = {}
+                --self._state.selectedIndex = 2
                 self._clearingView = nil
             end)
         end
@@ -382,7 +408,7 @@ function M:InitPlayerInfoView()
     local _player_info = self._player_info
     for i = 1, self._room.room_config.people_num do
         local tem = self._view:GetChild(string.format("player_info%d_2", i))
-        _player_info[i] = PlayerInfoView.new(tem, self)
+        _player_info[i] = PlayerInfoView.new(tem, self,true)
         tem.visible = false
     end
 end

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -116,6 +116,9 @@ function M:Clear()
     if self._view:GetChild('List_HandCard2') then
         self._view:GetChild('List_HandCard2'):RemoveChildren(0, -1, true)
     end
+    if self._view:GetChild('Btn_HandCard2') then
+        self._view:GetChild('Btn_HandCard2'):RemoveChildren(0, -1, true)
+    end
     self._viewList_HuEffect:RemoveChildren(0, -1, true)
     self._view_handCardList.selectedIndex = -1
     self._click_index = self._view_handCardList.selectedIndex
@@ -189,13 +192,11 @@ function M:UpdateHandCard(getcard, mp)
 end
 
 function M:UpdateHandCardWitness(getcard, isSelf)
-    print("lingmeng UpdateHandCardWitness")
     getcard = getcard or false
     isSelf = isSelf or false
 
     self._view_handCardList:RemoveChildren()
     self._view_getCard:RemoveChildren()
-    print("lingmeng UpdateHandCardWitness1")
 
     for i = 0, self._player.hand_left_count - 1 do
         local btn_card
@@ -208,11 +209,9 @@ function M:UpdateHandCardWitness(getcard, isSelf)
             self:FillWitnessCard(btn_card)
         end
     end
-    print("lingmeng UpdateHandCardWitness2")
 
     self._view_handCardList.touchable = false
     self._view_getCard.touchable = false
-    print("lingmeng UpdateHandCardWitness3")
 
     self._ctr_getCard.selectedIndex = getcard and 1 or 0
 end
@@ -492,6 +491,7 @@ function M:ShowHand(cards)
     local list = self._view_handCardList
     local cardType = self._viewText_cardInfo["Hand_Card"]
     if self._viewText_cardInfo['IS_SIDE'] == "true" then
+        self._view_handCardList:RemoveChildren()
         list = self._view:GetChild('List_HandCard2')
         cardType = self._viewText_cardInfo["Hand_Card"]
     end
@@ -515,14 +515,21 @@ end
 function M:ShowHuCard(card, flag_isme)
     self.winCard = card
     self._view_getCard:RemoveChildrenToPool()
-    local btn_card = self._view_getCard:AddItemFromPool()
+    local list = self._view_getCard
-    self:fillCard2(btn_card, self._viewText_cardInfo['Out_Card'], card, 1)
+    if self._viewText_cardInfo['IS_SIDE'] == "true" then
+        list = self._view:GetChild('Btn_HandCard2')
+    end
+    local btn_card = list:AddItemFromPool()
     self._ctr_getCard.selectedIndex = 1
+
     if flag_isme then
         self._view_getCard:GetChildAt(0):GetController('showhang').selectedIndex = 1
         self._view_getCard:GetChildAt(0):GetController('special_jing').selectedIndex = self._view_getCard:GetChildAt(0)
             :GetController('jing').selectedIndex
         self._view_getCard:GetChildAt(0):GetController('jing').selectedIndex = 0
+        self:fillCard2(btn_card, self._viewText_cardInfo['Out_Card'], card, 1)
+    else
+        self:fillCard2(btn_card, self._viewText_cardInfo['Hand_Card'], card, 1)
     end
 end
 

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -95,6 +95,7 @@ function M:UpdateHandCard(getcard, mp)
         self._ctr_getCard.selectedIndex = 0
     end
     self._view_handCardList.onClickItem:Set(function(context)
+        self._mainView:PlayMJSound("clickCard.mp3")
         self:__OnClickHandCard(context)
     end)
 
@@ -110,6 +111,7 @@ function M:onTouchBegin(context)
     self.touch = true
     local button = context.sender
     self.touchPos = Vector2.New(context.inputEvent.x, context.inputEvent.y)
+    self._last_chooseIndex = -1
 end
 
 function M:onTouchMove(context)
@@ -143,7 +145,10 @@ function M:onTouchMove(context)
         local cardWidth = button.width;
         local grap = self._view_handCardList.columnGap
         local chooseIndex = math.floor(touchPos.x / (cardWidth + grap))
-
+        if self._last_chooseIndex ~= chooseIndex then
+            self._last_chooseIndex = chooseIndex
+            self._mainView:PlayMJSound("clickCard.mp3")
+        end
         if chooseIndex >= self._view_handCardList.numItems then
             self.ischoose = true
             if touchPos.x > cardWidth + (cardWidth + grap) * (self._view_handCardList.numItems - 1) and self.getcard then

lua_probject/main_project/main/majiang/MJWitnessView.lua

@@ -72,69 +72,11 @@ function M:PlaySound(group, sex, path)
 end
 
 function M:EventInit()
+    getmetatable(M).__index.EventInit(self)
     local _gamectr = self._gamectr
     local _room = self._room
 
-    _gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
-        self:PlayMJSound("user_enter.mp3")
-        local arg = { ... }
-        local p = arg[1]
-        local info1 = self._player_info[self:GetPos(p.seat)]
-        info1:FillData(p)
-        info1._view.visible = true
-
-        local info2 = self._player_card_info[self:GetPos(p.seat)]
-        info2:SetPlayer(p)
-        info2:FillData()
-    end)
-
-    _gamectr:AddEventListener(GameEvent.PlayerLeave, function(...)
-        local arg = { ... }
-        local p = arg[1]
-        local info1 = self._player_info[self:GetPos(p.seat)]
-        info1._view.visible = false
-        self:PlayMJSound("user_leave.mp3")
-    end)
-
-    _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
-        self:PlayMJSound("user_enter.mp3")
-        local arg = { ... }
-        local witnessPlayerList = arg[1]
-        self._room.witness_player_list = witnessPlayerList
-
-        local _room = DataManager.CurrenRoom
-        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
-        if viewList_witness.numItems == #_room.witness_player_list then
-            viewList_witness:RefreshVirtualList()
-        else
-            viewList_witness.numItems = #_room.witness_player_list
-        end
-    end)
-
-    _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, function(...)
-        ---- print("刷新托管数据=====")
-        local arg = { ... }
-        local player = arg[1]
-        local witnessPlayerList = self._room.witness_player_list
-        for i, _player in ipairs(witnessPlayerList) do
-            if _player.aid == player then
-                table.remove(witnessPlayerList, i)
-                break
-            end
-        end
-
-        local _room = DataManager.CurrenRoom
-        local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
-        print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
-        if viewList_witness.numItems == #_room.witness_player_list then
-            viewList_witness:RefreshVirtualList()
-        else
-            viewList_witness.numItems = #_room.witness_player_list
-        end
-    end)
-
     _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
-        print("lingmeng witness SendCards")
         self:ShowJing()
         if self._clearingView then
             self._clearingView:Destroy()
@@ -157,21 +99,18 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
-        print("lingmeng witness EventTurn")
         local arg = { ... }
-        -- self._left_time = 15
+        if not self._left_time or self._left_time <= 15 then
+            self._left_time = 15
+        end
         local seat = arg[1]
         self:UpdateCardBox(self:GetPos(seat))
-        local playerInfo = self._player_info[self:GetPos(seat)]
         local info = self._player_card_info[self:GetPos(seat)]
-        print("lingmeng hand_left_count", info._player.hand_left_count)
         info._player.hand_left_count = info._player.hand_left_count + 1
         info:UpdateHandCardWitness(true)
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
-        print("lingmeng witness OutCard")
-        self._left_time = 0
         local arg = { ... }
         local p = arg[1]
         local card = arg[2]
@@ -188,7 +127,6 @@ function M:EventInit()
         if seat == _room.self_player.seat then
             _room.curren_outcard_seat = -1
         end
-        print("ling 2zhihou2")
     end)
 end
 

wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml

@@ -7,10 +7,10 @@
     <image id="n1_ieus" name="n1" src="ieus7d1e" fileName="Main/Image/Rectangle 121.png" xy="466,154" size="2043,986">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n2_ieus" name="n2" src="ieus7d1f" fileName="Main/Image/Rectangle 123.png" xy="467,155" size="2042,834">
+    <image id="n2_ieus" name="n2" src="ieus7d1f" fileName="Main/Image/Rectangle 123.png" xy="467,155" size="2042,982">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <list id="n3_ieus" name="list_chat" xy="475,157" size="1901,833" overflow="scroll" margin="10,0,0,0" lineGap="44" defaultItem="ui://htcn7v3rieus7d1g" autoClearItems="true">
+    <list id="n3_ieus" name="list_chat" xy="475,157" size="1901,973" overflow="scroll" margin="10,0,0,0" lineGap="44" defaultItem="ui://htcn7v3rieus7d1g" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>

wb_new_ui/assets/Family/Main/Component/btn_chatRoom.xml

@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="174,99" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="cRedPoint" pages="0,,1," selected="0">
+  <controller name="cRedPoint" pages="0,,1," selected="1">
     <remark page="1" value="开启红点"/>
   </controller>
   <displayList>
     <image id="n0_ieus" name="n0" src="ieus7d1b" fileName="Main/Image/Group 108.png" xy="0,0" size="174,99">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_l4fo" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="141,-17">
+    <image id="n1_l4fo" name="n1" src="icft7d63" fileName="Main/Image/Group 687.png" xy="141,-10" size="44,44">
       <gearDisplay controller="cRedPoint" pages="1"/>
+      <relation target="n0_ieus" sidePair="right-right,top-top"/>
     </image>
-    <text id="n2_l4fo" name="tex_redPoint" xy="141,-17" size="58,58" font="ui://27vd145bh35o7ilb" fontSize="43" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="20">
+    <text id="n2_l4fo" name="tex_redPoint" xy="146,-18" size="37,58" font="Arial" fontSize="43" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="shrink" text="20">
       <gearDisplay controller="cRedPoint" pages="1"/>
+      <relation target="n1_l4fo" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.2"/>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageLayer="1" bgColor="#000000">
-  <controller name="over" pages="0,,1," selected="1"/>
+  <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="0"/>
   <controller name="showType" pages="0,,1," selected="0"/>
@@ -56,7 +56,7 @@
     <text id="n143_kxhm" name="Text_Hu" xy="2163,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
       <relation target="" sidePair="top-top"/>
     </text>
-    <text id="n144_kxhm" name="Text_Tatal" xy="2284,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
+    <text id="n144_kxhm" name="Text_Tatal" xy="2284,148" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="累计">
       <relation target="" sidePair="top-top"/>
     </text>
     <component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="93,811" group="n121_yry6">

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml

@@ -9,7 +9,7 @@
       <relation target="" sidePair="width-width%,height-height%,right-right"/>
       <item/>
     </list>
-    <list id="n52_j6yy" name="List_FZ" xy="2257,404" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" vAlign="bottom" autoClearItems="true">
+    <list id="n52_j6yy" name="List_FZ" xy="2266,404" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" vAlign="bottom" autoClearItems="true">
       <relation target="" sidePair="width-width%,height-height%,right-right"/>
       <item/>
       <item/>
@@ -72,7 +72,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n56_j6yy" name="List_HandCard2" xy="2171,197" size="101,711" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19b" align="center" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
+    <list id="n56_j6yy" name="List_HandCard2" xy="2171,206" size="101,711" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19b" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <relation target="" sidePair="width-width%,height-height%,right-right"/>
       <item/>
       <item/>
@@ -84,9 +84,6 @@
       <item/>
       <item/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
     <component id="n58_ogwn" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2713,-1114" size="2022,111">
       <gearXY controller="3d" pages="0,1" values="-2713,-1114|517,-145"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml

@@ -22,8 +22,11 @@
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <list id="n38_gi99" name="List_FZ" xy="454,18" size="1329,103" touchable="false" layout="row" selectionMode="none" colGap="7" defaultItem="ui://v0j9abjygi9910r" autoItemSize="false" align="right" vAlign="bottom" autoClearItems="true">
+    <list id="n38_gi99" name="List_FZ" xy="478,18" size="1329,103" touchable="false" layout="row" selectionMode="none" colGap="7" defaultItem="ui://v0j9abjygi9910r" autoItemSize="false" align="right" vAlign="bottom" autoClearItems="true">
       <relation target="" sidePair="width-width%,height-height%,top-top"/>
       <item/>
       <item/>
@@ -81,7 +84,7 @@
     <text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-3&quot;&#xA;}">
       <gearText controller="cStie" pages="0,1,2" values="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-3&quot;&#xA;}|{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-3&quot;&#xA;}|{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;,&#xA;&quot;back_columnGap&quot;:&quot;-9&quot;,&#xA;&quot;show_columnGap&quot;:&quot;-6 &quot;&#xA;}"/>
     </text>
-    <list id="n54_jzul" name="list_HuEffect" xy="0,33" size="2532,420" touchable="false" layout="row" selectionMode="none" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n54_jzul" name="list_HuEffect" xy="-1,32" size="2532,420" touchable="false" layout="row" selectionMode="none" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
     </list>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml

@@ -5,7 +5,7 @@
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
   <controller name="getCard" pages="0,,1," selected="0"/>
   <displayList>
-    <list id="n52_j6yy" name="List_HandCard" xy="263,192" pivot="1,1" size="76,675" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910w" align="center" vAlign="bottom" autoClearItems="true">
+    <list id="n52_j6yy" name="List_HandCard" xy="278,192" pivot="1,1" size="63,675" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910w" align="center" vAlign="bottom" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -53,13 +53,10 @@
       <gearDisplay controller="getCard" pages="1"/>
       <item/>
     </list>
-    <list id="n57_j6yy" name="Btn_HandCard2" xy="290,834" size="98,77" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjylj2n19d" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
+    <list id="n57_j6yy" name="Btn_HandCard2" xy="290,886" size="98,77" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjylj2n19d" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
       <item/>
     </list>
-    <list id="n56_j6yy" name="List_HandCard2" xy="289,118" size="101,712" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19d" autoItemSize="false" align="center" vAlign="bottom" autoClearItems="true">
+    <list id="n56_j6yy" name="List_HandCard2" xy="289,118" size="101,761" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19d" autoItemSize="false" align="center" vAlign="bottom" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml

@@ -3,30 +3,30 @@
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="jing" pages="0,,1," selected="0"/>
   <controller name="move" pages="0,,1," selected="0"/>
-  <controller name="out" pages="0,,1," selected="1"/>
+  <controller name="out" pages="0,,1," selected="0"/>
-  <controller name="showhang" homePageType="specific" homePage="1" pages="0,,1," selected="1"/>
+  <controller name="showhang" homePageType="specific" homePage="1" pages="0,,1," selected="0"/>
-  <controller name="special_jing" pages="0,,1," selected="1"/>
+  <controller name="special_jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="15,20" size="144,158" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" group="n13_jzul" aspect="true" url="ui://Main_Majiang/b202_203" fill="scaleFree">
-      <gearXY controller="button" pages="0,1" values="15,20|0,-35"/>
+      <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
       <gearSize controller="showhang" pages="1" values="144,158,1,1" default="175,191,1,1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <group id="n13_jzul" name="showHand" xy="15,20" size="144,158" advanced="true">
+    <group id="n13_jzul" name="showHand" xy="0,0" size="175,191" advanced="true">
       <gearXY controller="showhang" pages="0,1" values="0,0|15,20"/>
     </group>
-    <image id="n12_k1od" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing 1.png" xy="71,32" size="85,122" aspect="true">
+    <image id="n12_k1od" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="71,12" size="101,145" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <gearXY controller="out" pages="0,1" values="71,32|71,32" duration="0.1"/>
+      <gearXY controller="out" pages="0,1" values="71,12|71,12" duration="0.1"/>
       <gearSize controller="showhang" pages="1" values="85,122,1,1" default="101,145,1,1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="n3_hp0b" sidePair="top-top"/>
     </image>
-    <image id="n14_jzul" name="special_jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing 1.png" xy="69,7" size="85,122" aspect="true">
+    <image id="n14_jzul" name="special_jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="69,-12" size="101,145" aspect="true">
       <gearDisplay controller="special_jing" pages="1"/>
-      <gearXY controller="out" pages="0,1" values="69,8|69,7" duration="0.1"/>
+      <gearXY controller="out" pages="0,1" values="69,-12|69,-13" duration="0.1"/>
       <gearSize controller="showhang" pages="1" values="85,122,1,1" default="101,145,1,1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
       <relation target="" sidePair="width-width,height-height"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="81,83">
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n0_gi99" name="icon" xy="0,0" size="81,83" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="ofwa1gm" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="40,42" aspect="true">
+    <image id="n1_gi99" name="n1" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="30,-3" size="46,49" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,79">
+<component size="100,83">
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="100,79" url="ui://v0j9abjylj2n18d" align="center" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="100,83" url="ui://v0j9abjylj2n18d" align="center" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
+    <image id="n1_l02z" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="5,-4" size="38,55" aspect="true" flip="hz">
+      <gearDisplay controller="jing" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,79">
+<component size="100,83">
+  <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="100,79" skew="0,180" url="ui://v0j9abjylj2n18d" fill="scale">
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="100,83" skew="0,180" url="ui://v0j9abjylj2n18d" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
+    <image id="n1_l02z" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="52,-2" size="43,63" aspect="true" flip="vt">
+      <gearDisplay controller="jing" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="2"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="0"/>
   <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"/>
@@ -96,17 +96,17 @@
       <gearDisplay controller="state" pages="3"/>
       <Button icon="ui://v0j9abjylj2n17t"/>
     </component>
-    <text id="n373_jzul" name="remaining_card" xy="769,516" size="358,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
+    <text id="n373_jzul" name="remaining_card" xy="769,514" size="358,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <text id="n374_jzul" name="wanfa_text" xy="287,645" pivot="0.5,0" size="1958,152" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="44" color="#f5f5dd" align="center" vAlign="middle" autoSize="none" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
+    <text id="n374_jzul" name="wanfa_text" xy="287,643" pivot="0.5,0" size="1958,152" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="44" color="#f5f5dd" align="center" vAlign="middle" autoSize="none" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="width-width%"/>
     </text>
-    <text id="n375_jzul" name="text_round" xy="1404,516" size="364,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
+    <text id="n375_jzul" name="text_round" xy="1404,514" size="364,74" group="n376_jzul" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
       <gearDisplay controller="state" pages="1,3,4"/>
     </text>
-    <group id="n376_jzul" name="center_text" xy="287,516" size="1958,281" advanced="true">
+    <group id="n376_jzul" name="center_text" xy="287,514" size="1958,281" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n332_ogwn" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1102,406" size="335,270" group="n333_ogwn">
@@ -135,7 +135,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="87,788" default="1189,909"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
@@ -144,7 +144,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="2311,292" default="1888,519"/>
       <relation target="" sidePair="middle-middle"/>
@@ -153,7 +153,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="left-right,bottom-middle"/>
     </component>
-    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,38" size="153,132">
+    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="1865,38" default="1189,223"/>
       <relation target="" sidePair="center-center,top-top"/>
@@ -162,7 +162,7 @@
       <gearDisplay controller="state" pages="1,3,5"/>
       <relation target="" sidePair="top-top"/>
     </component>
-    <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132">
+    <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="491,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="2" values="91,521" default="491,519"/>
       <relation target="" sidePair="middle-middle,right-left"/>

wb_unity_pro/Assets/ART/base/common/sound/timeup_alarm.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e2548d99706008a4eb6e9ab1042b7a28
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/clickCard.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 2831cf3e058fc784c830469b838148b2
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/timeup_alarm.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e756cfb576fa281498984b06c556a322
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: