回来时准备状态不对同步

lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua

@@ -392,7 +392,7 @@ function M:NumberRecordDetailRender()
             self._viewList_players:RemoveChildrenToPool()
             for j = 1, #info.totalScore do
                 local obj = self._viewList_players:AddItemFromPool()
-                self:RecordItemPlayersRender(json.decode(info.round_1), obj)
+                self:RecordItemPlayersRender(info.totalScore[j], obj)
             end
             self.ctr_numberRecord.selectedIndex = 3
         end)
@@ -500,7 +500,7 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj)
 end
 
 function M:RecordItemPlayersRender(data, obj)
-    obj:GetChild('n2').text = data.nick
+    obj.text = data.nick
 end
 
 function M:NumverRankRenderer(groupId)

lua_probject/base_project/Game/View/Family/FamilyRecord.lua

@@ -162,7 +162,7 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj)
 end
 
 function M:RecordItemPlayersRender(data, obj)
-    obj:GetChild('n2').text = data.nick
+    obj.text = data.nick
 end
 
 function M:RecordItemRenderer(data, obj)
@@ -179,7 +179,7 @@ function M:RecordItemRenderer(data, obj)
         self._viewList_players:RemoveChildrenToPool()
         for j = 1, #data.totalScore do
             local obj = self._viewList_players:AddItemFromPool()
-            self:RecordItemPlayersRender(json.decode(data.round_1), obj)
+            self:RecordItemPlayersRender(data.totalScore[j], obj)
         end
         self._ctr_cWindow.selectedIndex = 1
     end)

lua_probject/base_project/Game/View/SettingView.lua

@@ -6,10 +6,10 @@ local TableBG = import 'Game.Data.TableBG'
 local SettingView = {}
 
 local M = SettingView
-setmetatable(M, {__index = BaseWindow})
+setmetatable(M, { __index = BaseWindow })
 
 function SettingView.new(blur_view)
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = 'SettingView'
     self._currenIndex = 0
     self._blur_view = blur_view
@@ -24,47 +24,46 @@ function SettingView.new(blur_view)
 end
 
 function M:init(url)
-	
     BaseWindow.init(self, url)
 
     local view = self._view
     local slider_sound = view:GetChild('slider_sound')
     local slider_music = view:GetChild('slider_music')
-    -- local btn_music = view:GetChild('btn_music')
-    -- local btn_sound = view:GetChild('btn_sound')
+    local btn_music = view:GetChild('btn_music')
+    local btn_sound = view:GetChild('btn_sound')
 
-    -- btn_music.selected = (GameApplication.Instance.MusicValue < 5 and false or true)
+    btn_music.selected = (GameApplication.Instance.MusicValue < 5 and false or true)
     slider_sound.value = GameApplication.Instance.SoundValue
     slider_music.value = GameApplication.Instance.MusicValue
-    -- btn_sound.selected = GameApplication.Instance.SoundValue < 5 and false or true
+    btn_sound.selected = GameApplication.Instance.SoundValue < 5 and false or true
 
     slider_music.onChanged:Add(
         function()
             GameApplication.Instance.MusicValue = slider_music.value
-            -- btn_music.selected = GameApplication.Instance.MusicValue < 5 and false or true
+            btn_music.selected = GameApplication.Instance.MusicValue < 5 and false or true
         end
     )
 
     slider_sound.onChanged:Add(
         function()
             GameApplication.Instance.SoundValue = slider_sound.value
-            -- btn_sound.selected = GameApplication.Instance.SoundValue < 5 and false or true
+            btn_sound.selected = GameApplication.Instance.SoundValue < 5 and false or true
         end
     )
 
-    -- btn_sound.onChanged:Add(
-    --     function()
-    --         GameApplication.Instance.SoundValue = btn_sound.selected and 50 or 0
-    --         slider_sound.value = GameApplication.Instance.SoundValue
-    --     end
-    -- )
+    btn_sound.onChanged:Add(
+        function()
+            GameApplication.Instance.SoundValue = btn_sound.selected and 50 or 0
+            slider_sound.value = GameApplication.Instance.SoundValue
+        end
+    )
 
-    -- btn_music.onChanged:Add(
-    --     function()
-    --         GameApplication.Instance.MusicValue = btn_music.selected and 50 or 0
-    --         slider_music.value = GameApplication.Instance.MusicValue
-    --     end
-    -- )
+    btn_music.onChanged:Add(
+        function()
+            GameApplication.Instance.MusicValue = btn_music.selected and 50 or 0
+            slider_music.value = GameApplication.Instance.MusicValue
+        end
+    )
 
     self._stateController = view:GetController('state')
     self.cd_time_text = view:GetChild('n35')
@@ -111,22 +110,24 @@ function M:init(url)
             end
         )
     end
-    -- local btn_close = self._view:GetChild("btn_close")
-    -- if btn_close then
-    --     btn_close.onClick:Add(function( ... )
+    local btn_close = self._view:GetChild("btn_close")
+    if btn_close then
+        btn_close.onClick:Add(function(...)
 
-    --     end)
-    -- end
+        end)
+    end
 end
 
 --赋值bg_config
 function M:GetBGConfig()
     return TableBG.GetBGConfig()
 end
+
 --获得背景
 function M:GetBgByGameId(game_id)
     return TableBG.GetTableBG(game_id)
 end
+
 --显示背景选项，并加载背景
 function M:FillBgSection(cb, game_id, default_bg, bg_config)
     local view = self._view
@@ -144,7 +145,7 @@ function M:FillBgSection(cb, game_id, default_bg, bg_config)
         end
         item.onClick:Add(
             function(index)
-                cb(config.url,i)
+                cb(config.url, i)
             end
         )
     end

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

@@ -182,7 +182,6 @@ function M:LoadConfigToDetail(data, hpdata)
         configData = json.decode(data)
     end
 
-    pt("lingemng", data)
     local hpData = configData.hpData or hpdata
     if type(hpData) == 'string' then
         hpData = json.decode(hpData)

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

@@ -177,7 +177,7 @@ function M:LoadConfigToDetail(data, hpdata)
     returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
 
     returnString = string.format("%s,%s,%s,%s", returnString,
-        configData.zimo == 0 and "可点炮,可自摸" or "只能自摸",
+        configData.zimo == 0 and "可点炮,可自摸" or "必须自摸",
         configData.tuoguan == 0 and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
         configData.jingbibo == 1 and "有精必博" or "有精可胡")
 

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

@@ -162,7 +162,7 @@ function M:UpdatePlayerInfoView()
     local _player_info = self._player_info
     local list = self._room.player_list
 
-    for i = 1, self._room.room_config.people_num do
+    for i = 1, #list do
         local seat = self:GetPos(list[i].seat)
         local tem = self._view:GetChild(string.format("player_info%d_%d", seat, (self._state.selectedIndex % 2) + 1))
         _player_info[seat] = PlayerInfoView.new(tem, self)
@@ -771,56 +771,6 @@ function M:_ChiView(tiplist, callback)
     self._pop_tip_choice = _pop_tip_choice
 end
 
-function M:OnFangziAction(...)
-    self:__CloseTip()
-    local arg = { ... }
-    local _player_card_info = self._player_card_info
-    local fz = arg[1]
-    local player = arg[2]
-    local index = arg[3]
-    local info = _player_card_info[self:GetPos(player.seat)]
-    -- local pNode = info._mask_liangpai
-    local effect = UIPackage.CreateObject("Extend_MJ_LiChuan", "FzEffect")
-    if fz.type == FZType.Peng then
-        self:PlaySound("LiChuan_MJ", player.self_user.sex, "peng")
-        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-        -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
-    elseif fz.type == FZType.Chi then
-        self:PlaySound("LiChuan_MJ", player.self_user.sex, "chi")
-        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
-        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
-    else
-        self:PlaySound("LiChuan_MJ", player.self_user.sex, "gang")
-        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-        -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
-    end
-    effect.touchable = false
-    effect:GetTransition("t2"):Play()
-    -- pNode:AddChild(effect)
-    coroutine.start(function()
-        coroutine.wait(0.3)
-        self._popEvent = true
-    end)
-    coroutine.start(function()
-        coroutine.wait(2)
-        effect:Dispose()
-    end)
-
-    self:RemoveCursor()
-    if (player.seat ~= fz.from_seat) then
-        local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
-        fs_info:UpdateOutCardList()
-    end
-    local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
-    info:UpdateFzList(fz, index, true, seat)
-    local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
-    printlog(getcard)
-    info:UpdateHandCard(getcard)
-    self:__CloseTip()
-end
-
 function M:RunNiao(list, start_seat)
     local _room = self._room
     --local _niao_View = self._niao_View
@@ -938,6 +888,9 @@ function M:ReloadRoom(bskip)
         if bskip == nil or bskip == false then
             if p.ready and room.playing == false then
                 self._player_info[self:GetPos(p.seat)]:Ready(true)
+                if room.self_player.seat == p.seat then
+                    self._ctr_action.selectedIndex = 0
+                end
             end
         end
         if p.piao_niao ~= nil and p.piao_niao > 0 then

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

@@ -191,8 +191,6 @@ function M:EventInit()
         print("lingmeng witness FZTips")
     end)
 
-    _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
-
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
         self._popEvent = false
         self._left_time = 0
@@ -326,7 +324,7 @@ function M:EventInit()
         -- self:RemoveCursor()
         if self._clearingView == nil then
             self._clearingView = EXClearingView.new(self._root_view)
-            self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting))
+            self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self, self.ClickSetting))
             coroutine.start(function()
                 coroutine.wait(0.5)
                 self._clearingView:Show()
@@ -421,7 +419,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,true)
+        _player_info[i] = PlayerInfoView.new(tem, self, true)
         tem.visible = false
     end
 end
@@ -449,67 +447,6 @@ function M:UpdateCardBox(seat)
     self._ctr_cardbox.selectedIndex = index
 end
 
-function M:OnFangziAction(...)
-    local arg = { ... }
-    local _player_card_info = self._player_card_info
-    local fz = arg[1]
-    local player = arg[2]
-    local index = arg[3]
-    local info = _player_card_info[self:GetPos(player.seat)]
-    -- local pNode = info._mask_liangpai
-
-
-
-    local arg = { ... }
-    local _player_card_info = self._player_card_info
-    local fz = arg[1]
-    local player = arg[2]
-    local index = arg[3]
-    local info = _player_card_info[self:GetPos(player.seat)]
-    -- local pNode = info._mask_liangpai
-    local effect = UIPackage.CreateObject("Extend_MJ_LiChuan", "FzEffect")
-    if fz.type == FZType.Peng then
-        self:PlaySound("LiChuan_MJ", player.self_user.sex, "peng")
-        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "碰")
-        -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "碰框")
-    elseif fz.type == FZType.Chi then
-        self:PlaySound("LiChuan_MJ", player.self_user.sex, "chi")
-        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
-        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
-    else
-        self:PlaySound("LiChuan_MJ", player.self_user.sex, "gang")
-        effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-        effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "杠")
-        -- effect:GetChild("kuang").icon = UIPackage.GetItemURL("Main_Majiang", "杠框")
-    end
-    effect.touchable = false
-    effect:GetTransition("t2"):Play()
-    -- pNode:AddChild(effect)
-    coroutine.start(function()
-        coroutine.wait(0.3)
-        self._popEvent = true
-    end)
-    coroutine.start(function()
-        coroutine.wait(2)
-        effect:Dispose()
-    end)
-
-    self:RemoveCursor()
-    if (player.seat ~= fz.from_seat) then
-        local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
-        fs_info:UpdateOutCardList()
-    end
-    local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
-    info:UpdateFzList(fz, index, true, seat)
-
-    --因为观战没有手牌，等预处理完扣牌数之后矫正一次(最粗暴的修正方式，手牌数等于13-3*吃碰数)
-
-    info._player.hand_left_count = 14 - 3 * #info._player.fz_list
-    info:UpdateHandCardWitness(true)
-    -- self:__CloseTip()
-end
-
 local majiang_asset_path = "base/main_majiang/sound/"
 function M:PlayMJSound(path)
     ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path)

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

@@ -208,9 +208,9 @@ function M:LoadConfigToDetail(data, hpdata)
         configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖",
         configData.shaozhuang == 1 and ",有烧庄" or "",
         configData.zuoma == 0 and ",庄家坐马" or "",
-        configData.zimo == 0 and ",可点炮,可自摸" or ",只能自摸",
+        configData.zimo == 0 and ",可点炮,可自摸" or ",必须自摸",
         configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or ",不能托管",
-        configData.jiahu == 0 and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
+        configData.jiahu == 0 and ",可以假胡" or "", configData.fengding == 0 and ",封顶20炮" or "",
         configData.zhuanwan == 0 and "大转弯" or "小转弯")
 
     if configData.GPSDetection then

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

@@ -265,7 +265,7 @@ function M:EventInit()
         info:UpdateOutCardList(outcard, card, self._cursor)
 
         self:PlayMJSound("chupai.mp3")
-self:PlaySound("NanCheng_MJ", p.self_user.sex, tostring(card))
+        self:PlaySound("NanCheng_MJ", p.self_user.sex, tostring(card))
         if seat == _room.self_player.seat then
             _room.curren_outcard_seat = -1
         end
@@ -893,13 +893,13 @@ function M:ReloadRoom(bskip)
     --     self._room._reload_flag = true
     -- end
 
+    local flag_action = 0
     if bskip == nil or bskip == false then
         if not room.playing then
             self._state.selectedIndex = 2
             self._ctr_action.selectedIndex = 1
         else
             self._state.selectedIndex = 1
-            self._ctr_action.selectedIndex = 0
             self._room._reload_flag = true
         end
     end
@@ -923,7 +923,6 @@ function M:ReloadRoom(bskip)
             head_info._view:GetController('text_color').selectedIndex = 1
             head_info._view:GetChild('text_jifen').text = num --d2ad(num)
         end
-
         if p.seat == room.last_outcard_seat then
             local card = p.outcard_list[#p.outcard_list]
             info:UpdateOutCardList(nil, card, self._cursor)
@@ -936,12 +935,16 @@ function M:ReloadRoom(bskip)
         if p.seat == room.banker_seat then
             head_info:MarkBank(true)
         end
+
         -- if p.ready then
         --     self._player_info[self:GetPos(p.seat)]:Ready(true)
         -- end
         if bskip == nil or bskip == false then
             if p.ready and room.playing == false then
                 self._player_info[self:GetPos(p.seat)]:Ready(true)
+                if room.self_player.seat == p.seat then
+                    self._ctr_action.selectedIndex = 0
+                end
             end
         end
         if p.piao_niao ~= nil and p.piao_niao > 0 then

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -215,7 +215,7 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
     self:InitXiPai()
     self:InitXiPai1()
 
-    self.btn_setting.onClick:Set(handler(self,self.ClickSetting))
+    self.btn_setting.onClick:Set(handler(self, self.ClickSetting))
 end
 
 function M:ClickSetting()
@@ -723,7 +723,7 @@ function M:OnResult1(...)
     -- end
     -- self:RemoveCursor()
     self._clearingView = self.EXClearingViewClass.new(self._root_view)
-    self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting))
+    self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self, self.ClickSetting))
     coroutine.start(function()
         coroutine.wait(0.5)
         self._clearingView:Show()
@@ -880,6 +880,52 @@ function M:OnHuCard(...)
     end)
 end
 
+function M:OnFangziAction(...)
+    self:__CloseTip()
+    local arg = { ... }
+    local _player_card_info = self._player_card_info
+    local fz = arg[1]
+    local player = arg[2]
+    local index = arg[3]
+    local info = _player_card_info[self:GetPos(player.seat)]
+    local loader_HuEffect = info._viewClip_Peng_Gang
+    local effects = ""
+    if fz.type == FZType.Peng then
+        effects = "clip_peng"
+    elseif fz.type == FZType.Chi then
+
+    else
+        effects = "clip_gang"
+    end
+    local clip = UIPackage.CreateObjectFromURL(string.format("ui://Main_Majiang/%s", effects))
+    clip:SetSize(loader_HuEffect.width, loader_HuEffect.height)
+    loader_HuEffect:AddChild(clip)
+    clip:SetPlaySettings(0, -1, 1, -1)
+    clip.onPlayEnd:Add(function()
+        if clip.parent then
+            clip.parent:RemoveChild(clip)
+        end
+        clip:Dispose()
+    end)
+    clip.playing = true
+    coroutine.start(function()
+        coroutine.wait(0.3)
+        self._popEvent = true
+    end)
+
+    self:RemoveCursor()
+    if (player.seat ~= fz.from_seat) then
+        local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
+        fs_info:UpdateOutCardList()
+    end
+    local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
+    info:UpdateFzList(fz, index, true, seat)
+    local getcard = fz.type == FZType.Peng or fz.type == FZType.Chi
+    printlog(getcard)
+    info:UpdateHandCard(getcard)
+    self:__CloseTip()
+end
+
 function M:ShowJing()
     if self._room.jing then
         self.jing.visible = true

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -57,6 +57,7 @@ function M:init()
     self._viewList_HuEffect = self._view:GetChild("list_HuEffect")
     self._viewLoader_selfHuCardEffect = self._view:GetChild("loader_selfHuCardEffect")
     self._viewClip_effect_ZiMo = self._view:GetChild("effect_ZiMo")
+    self._viewClip_Peng_Gang = self._view:GetChild("area_clip_pg")
 
     self._view_getCard = self._view:GetChild('Btn_HandCard')
     self._ctr_getCard = self._view:GetController('getCard')
@@ -503,7 +504,7 @@ function M:ShowHand(cards)
     if self._viewText_cardInfo['show_columnGap'] and list.columnGap ~= tonumber(self._viewText_cardInfo['show_columnGap']) then
         list.columnGap = tonumber(self._viewText_cardInfo['show_columnGap'])
     end
-    list:RemoveChildren()
+    list:RemoveChildren(0, -1, true)
     --list:RemoveChildren()
     local passcard = false
     for _, card in pairs(cards) do

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -85,6 +85,7 @@ function M:UpdateHandCard(getcard, mp)
         else
             btn_card = self._view_handCardList:AddItemFromPool()
         end
+        -- btn_card.sound = "ui://Main_Majiang/click"
         self:FillHandCard(i, btn_card, tem_card, true)
         -- btn_card.onClick:Set(handler(self, self.__OnClickHandCard))
     end
@@ -145,7 +146,7 @@ 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
+        if self._last_chooseIndex ~= chooseIndex and self._view_handCardList.selectedIndex ~= chooseIndex then
             self._last_chooseIndex = chooseIndex
             self._mainView:PlayMJSound("clickCard.mp3")
         end

lua_probject/main_project/main/majiang/MJSettingViewNew.lua

@@ -131,10 +131,10 @@ function M:init(url)
 
 
     self.btn_cancelRoom.onClick:Set(function()
-        if self._mainView.dismiss_room_cd_time > 0 then
-            ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
-            return
-        end
+        -- if self._mainView.dismiss_room_cd_time > 0 then
+        --     ViewUtil.ErrorTip(nil, "您还处于解散冷却时间当中，请稍后重试！")
+        --     return
+        -- end
 
         local _gamectr = ControllerManager.GetController(GameController)
         _gamectr:AskDismissRoom()

lua_probject/main_project/main/majiang/MJWitnessView.lua

@@ -50,7 +50,7 @@ function M:InitView()
     TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
 
     self.btn_setting = self._view:GetChild("btn_setting")
-    self.btn_setting.onClick:Set(handler(self,self.ClickSetting))
+    self.btn_setting.onClick:Set(handler(self, self.ClickSetting))
 end
 
 function M:ClickSetting()
@@ -83,10 +83,17 @@ function M:EventInit()
         if self._clearingView then
             self._clearingView:Destroy()
             self._clearingView = nil
+            local list = _room.player_list
+            for i = 1, #list do
+                local p = list[i]
+                local info = self._player_info[self:GetPos(p.seat)]
+                info:MarkBank(p.seat == _room.banker_seat)
+                info:Ready(false)
+                local card_info = self._player_card_info[self:GetPos(p.seat)]
+                card_info:Clear()
+                card_info:UpdateHandCardWitness()
             end
-        self:UpdateRound()
-        self:RemoveCursor()
-        self._state.selectedIndex = 4
+        else
             local list = _room.player_list
             for i = 1, #list do
                 local p = list[i]
@@ -98,6 +105,10 @@ function M:EventInit()
                 card_info:Clear()
                 card_info:UpdateHandCardWitness()
             end
+        end
+        self:UpdateRound()
+        self:RemoveCursor()
+        self._state.selectedIndex = 4
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
@@ -130,6 +141,65 @@ function M:EventInit()
             _room.curren_outcard_seat = -1
         end
     end)
+
+    _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
+end
+
+function M:OnFangziAction(...)
+    local arg = { ... }
+    local _player_card_info = self._player_card_info
+    local fz = arg[1]
+    local player = arg[2]
+    local index = arg[3]
+    local info = _player_card_info[self:GetPos(player.seat)]
+    -- local pNode = info._mask_liangpai
+
+
+
+    local arg = { ... }
+    local _player_card_info = self._player_card_info
+    local fz = arg[1]
+    local player = arg[2]
+    local index = arg[3]
+    local info = _player_card_info[self:GetPos(player.seat)]
+    local loader_HuEffect = info._viewClip_Peng_Gang
+    local effects = ""
+    if fz.type == FZType.Peng then
+        effects = "clip_peng"
+    elseif fz.type == FZType.Chi then
+
+    else
+        effects = "clip_gang"
+    end
+    local clip = UIPackage.CreateObjectFromURL(string.format("ui://Main_Majiang/%s", effects))
+    clip:SetSize(loader_HuEffect.width, loader_HuEffect.height)
+    loader_HuEffect:AddChild(clip)
+    clip:SetPlaySettings(0, -1, 1, -1)
+    clip.onPlayEnd:Add(function()
+        if clip.parent then
+            clip.parent:RemoveChild(clip)
+        end
+        clip:Dispose()
+    end)
+    clip.playing = true
+    coroutine.start(function()
+        coroutine.wait(2)
+        effect:Dispose()
+    end)
+
+    self:RemoveCursor()
+    if (player.seat ~= fz.from_seat) then
+        local fs_info = _player_card_info[self:GetPos(fz.from_seat)]
+        fs_info:UpdateOutCardList()
+    end
+    local seat = (self._room.room_config.people_num == 2 and fz.from_seat == 2) and 2 or fz.from_seat - 1
+    info:UpdateFzList(fz, index, true, seat)
+
+    --因为观战没有手牌，等预处理完扣牌数之后矫正一次(最粗暴的修正方式，手牌数等于13-3*吃碰数)
+
+    info._player.hand_left_count = 14 - 3 * #info._player.fz_list
+    info:UpdateHandCardWitness(true)
+    -- self:__CloseTip()
 end
 
 return M

wb_new_ui/assets/Family/Record/Component/Item_title.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="800,78">
+<component size="800,78" extention="Button">
   <displayList>
     <image id="n3_ofwa" name="n3" src="ofwa7d6n" fileName="Main/Image/hall_club_BG_landifang.png" xy="0,0" size="800,78">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n2_slrk" name="n2" xy="258,10" size="283,65" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="用户用户用户用户">
+    <text id="n2_slrk" name="title" xy="258,10" size="283,65" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="用户用户用户用户">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
+  <Button/>
 </component>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" opaque="false" designImageLayer="1" bgColor="#000000">
   <controller name="over" pages="0,,1," selected="0"/>
-  <controller name="main" 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"/>
   <displayList>
@@ -151,7 +151,7 @@
       <gearDisplay controller="main" pages="1"/>
     </group>
     <component id="n156_l02z" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2193,20" size="141,117">
-      <Button controller="main" page="0"/>
+      <gearDisplay controller="main" pages="0"/>
     </component>
   </displayList>
 </component>

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

@@ -108,5 +108,8 @@
     <movieclip id="n69_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="2052,584" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
       <relation target="n68_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
+    <component id="n71_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1884,439" pivot="0.5,0.5" size="336,290" touchable="false">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </component>
   </displayList>
 </component>

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

@@ -92,5 +92,8 @@
     <movieclip id="n56_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,243" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
       <relation target="n55_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
+    <component id="n57_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1098,98" pivot="0.5,0.5" size="336,290" touchable="false">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </component>
   </displayList>
 </component>

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

@@ -87,12 +87,15 @@
     <component id="n50_ogwn" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-3616,-1525" pivot="0.5,0.5" size="2124,249" aspect="true">
       <relation target="n51_ogwn" sidePair="leftext-right"/>
     </component>
-    <loader id="n59_jzul" name="loader_selfHuCardEffect" xy="1266,778" pivot="0.5,0.5" anchor="true" size="280,200" align="center" vAlign="middle" fill="scale">
+    <loader id="n59_jzul" name="loader_selfHuCardEffect" xy="1126,678" pivot="0.5,0.5" size="280,200" url="ui://v0j9abjyr8cy1jy" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <relation target="" sidePair="left-center,right-center,bottom-bottom"/>
     </loader>
     <movieclip id="n60_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,778" pivot="0.5,0.5" anchor="true" size="530,383" aspect="true" visible="false" playing="false">
       <relation target="n59_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
+    <component id="n61_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1098,617" pivot="0.5,0.5" size="336,290" touchable="false">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </component>
     <list id="n58_jzul" name="list_HuEffect" xy="0,568" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height,bottom-bottom"/>
       <item/>

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

@@ -49,14 +49,14 @@
       <item/>
       <item/>
     </list>
-    <list id="n55_j6yy" name="Btn_HandCard" xy="292,833" size="67,116" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910w" autoClearItems="true">
+    <list id="n55_j6yy" name="Btn_HandCard" xy="277,833" size="67,116" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910w" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
       <item/>
     </list>
     <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,761" 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" renderOrder="descent" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -88,8 +88,11 @@
       <item/>
     </list>
     <loader id="n67_jzul" name="loader_selfHuCardEffect" xy="511,584" pivot="0.5,0.5" anchor="true" size="280,220" align="center" vAlign="middle"/>
-    <movieclip id="n68_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="511,584" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
+    <movieclip id="n68_66fw" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="511,583" pivot="0.5,0.5" anchor="true" size="530,353" aspect="true" visible="false" playing="false">
       <relation target="n67_jzul" sidePair="center-center,middle-middle"/>
     </movieclip>
+    <component id="n69_r8cy" name="area_clip_pg" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="343,439" pivot="0.5,0.5" size="336,290" touchable="false">
+      <relation target="" sidePair="width-width%,height-height%"/>
+    </component>
   </displayList>
 </component>

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

@@ -33,5 +33,5 @@
       <relation target="n3_hp0b" sidePair="top-top"/>
     </image>
   </displayList>
-  <Button mode="Check"/>
+  <Button mode="Check" sound="ui://v0j9abjyr8cy1k6" volume="0"/>
 </component>

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

@@ -2,7 +2,7 @@
 <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,83" skew="0,180" url="ui://v0j9abjylj2n18d" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="100,83" skew="180,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">

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="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="4"/>
   <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"/>
@@ -245,12 +245,12 @@
     <group id="n348_ogwn" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
       <gearDisplay controller="showNext" pages="1"/>
     </group>
-    <graph id="n378_l9ll" name="n378" xy="884,1030" size="760,92" type="rect" lineSize="0" fillColor="#4c000000">
-      <gearDisplay controller="state" pages="4"/>
+    <graph id="n378_l9ll" name="n378" xy="885,1030" size="760,92" type="rect" lineSize="0" fillColor="#4c000000">
+      <gearDisplay controller="state" pages="5"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </graph>
     <text id="n379_l9ll" name="n379" xy="1101,1035" size="326,82" font="FZCuYuan-M03" fontSize="62" color="#ffffff" letterSpacing="3" text="正在旁观中">
-      <gearDisplay controller="state" pages="4"/>
+      <gearDisplay controller="state" pages="5"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
     <component id="n351_ogwn" name="n351" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1137,7 +1137,7 @@
     <image id="whhc1fl" name="tile_cs_baguiyi.png" path="/Main_new/Image/HuCardEffect/" exported="true"/>
     <image id="whhc1fm" name="tile_cs_qidui_haohua.png" path="/Main_new/Image/HuCardEffect/" exported="true"/>
     <image id="whhc1fn" name="tile_zimo.png" path="/Main_new/Image/HuCardEffect/" exported="true"/>
-    <movieclip id="whhc1fo" name="Effect_ZiMo.jta" path="/Main_new/Main/" atlas="alone"/>
+    <movieclip id="whhc1fo" name="Effect_ZiMo.jta" path="/Main_new/Main/" exported="true" atlas="alone"/>
     <image id="j6yy1fr" name="e64501792ed1d68d0c12c5668437a69 1.png" path="/Main_new/Image/"/>
     <image id="j6yy1fs" name="Screenshot_20250412-160003.png" path="/Main_new/Image/"/>
     <image id="j6yy1ft" name="de87786dd190bbd4d4c7dbfff2484d89_720 1.png" path="/Main_new/Image/"/>
@@ -1269,6 +1269,19 @@
     <image id="66fw1jo" name="图层 1.png" path="/Main_new/Main/Image/hudong/voice/"/>
     <image id="66fw1jp" name="图层 2.png" path="/Main_new/Main/Image/hudong/voice/"/>
     <image id="66fw1jq" name="图层 3.png" path="/Main_new/Main/Image/hudong/voice/"/>
+    <image id="r8cy1jr" name="peng_ani_01.png" path="/Main_new/Main/Image/peng/"/>
+    <image id="r8cy1js" name="peng_ani_02.png" path="/Main_new/Main/Image/peng/"/>
+    <image id="r8cy1jt" name="peng_ani_03.png" path="/Main_new/Main/Image/peng/"/>
+    <image id="r8cy1ju" name="peng_ani_04.png" path="/Main_new/Main/Image/peng/"/>
+    <image id="r8cy1jv" name="peng_ani_05.png" path="/Main_new/Main/Image/peng/"/>
+    <movieclip id="r8cy1jy" name="clip_peng.jta" path="/Main_new/Main/Image/peng/" exported="true" atlas="1"/>
+    <image id="r8cy1jz" name="chi_ani_00.png" path="/Main_new/Main/Image/gang/"/>
+    <image id="r8cy1k0" name="chi_ani_01.png" path="/Main_new/Main/Image/gang/"/>
+    <image id="r8cy1k1" name="chi_ani_02.png" path="/Main_new/Main/Image/gang/"/>
+    <image id="r8cy1k2" name="chi_ani_04.png" path="/Main_new/Main/Image/gang/"/>
+    <image id="r8cy1k3" name="chi_ani_05.png" path="/Main_new/Main/Image/gang/"/>
+    <movieclip id="r8cy1k5" name="clip_gang.jta" path="/Main_new/Main/Image/gang/" exported="true" atlas="1"/>
+    <sound id="r8cy1k6" name="click.mp3" path="/Main_new/Image/" exported="true"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: baf4390005ea1484faee99cb1d3f3d98
+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/Scripts/VerCheck.cs

@@ -24,6 +24,7 @@ public class VerCheck : MonoBehaviour
     // Use this for initialization
     void Start()
     {
+        
         GameApplication.Instance.isAndroid64bit = IsAndroid64bit();
         CreateVersionView();
         StartCoroutine(CheckNet());

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -8,34 +8,34 @@
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.41",
+    "ver": "1.0.42",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.41",
+    "version": "1.0.42",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.44",
+    "ver": "1.0.45",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.44",
+    "version": "1.0.45",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.28",
+    "ver": "1.0.29",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.28",
+    "version": "1.0.29",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.27",
+    "ver": "1.0.28",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.27",
+    "version": "1.0.28",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "rank",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.7",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.7",
     "bundle": "base/main_zipaimajiang"
   }
 ]