恢复修改

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -12,6 +12,7 @@ GroupMgrEvent = {
     BeInvited = "be_invited",
     UpdateGroup = "UpdateGroup",
     NewMailTip = "NewMailTip",
+    InviteResponse = "InviteResponse",
 }
 
 GroupMgrController = {
@@ -35,8 +36,6 @@ function GroupMgrController.new()
     self._eventmap = {}
     self._dispatcher = {}
 
-
-
     self._eventmap[Protocol.FGMGR_EVT_ADD_PLAY] = self.OnEvtAddPlay
     self._eventmap[Protocol.FGMGR_EVT_DEL_PLAY] = self.OnEvtDelPlay
     self._eventmap[Protocol.FGMGR_EVT_UPDATE_PLAY] = self.OnEvtUpdatePlay
@@ -48,6 +47,7 @@ function GroupMgrController.new()
     self._eventmap[Protocol.FGMGR_EVT_INVITED] = self.OnEvtInvited
     self._eventmap[Protocol.FGMGR_EVT_UPDATE_GROUP] = self.OnEvtUpdateGroup
     self._eventmap[Protocol.FGMGR_EVT_NEW_MAIL] = self.OnEvtNewMailTip
+    self._eventmap[Protocol.FGMGR_RESPONSE_INVITE] = self.FG_ResponseInvited
     -- self:connect(callback)
     return self
 end
@@ -290,10 +290,11 @@ function M:FG_GetOnlinePlayers(callback)
 end
 
 -- 邀请在线玩家
-function M:FG_InvitePlayer(group_id, tag, roomid, pid, game_name, callback)
+function M:FG_InvitePlayer(group_id, tag, player_id, roomid, pid, game_name, callback)
     local _data = {}
     _data.id = group_id
     _data.tagId = tag
+    _data.player_id = player_id
     _data.roomid = roomid
     _data.pid = pid
     _data.g_name = game_name
@@ -303,11 +304,21 @@ function M:FG_InvitePlayer(group_id, tag, roomid, pid, game_name, callback)
 end
 
 -- 回复邀请
-function M:FG_ResponseInvited(id, refuse)
+-- function M:FG_ResponseInvited(id, refuse)
-    local _data = {}
+--     local _data = {}
-    _data.invi_id = id
+--     _data.invi_id = id
-    _data.refuse = refuse
+--     _data.refuse = refuse
-    self._mgr_client:send(Protocol.FGMGR_RESPONSE_INVITE, _data)
+--     self._mgr_client:send(Protocol.FGMGR_RESPONSE_INVITE, _data)
+-- end
+
+--被邀请玩家收到邀请
+function M:FG_ResponseInvited(evt_data)
+    local invite_id = evt_data.invite_id
+    local g_name = evt_data.g_name
+    local roomid = evt_data.roomid
+    local pid = evt_data.pid
+    local groupid = evt_data.groupid
+    DispatchEvent(self._dispatcher, GroupMgrEvent.InviteResponse, invite_id, g_name, roomid, pid, groupid)
 end
 
 function M:PopEvent()

lua_probject/base_project/Game/View/FGAssistInviteView.lua

@@ -2,50 +2,50 @@
 local FGAssistInviteView = {}
 
 local M = FGAssistInviteView
-setmetatable(M, {__index = BaseWindow})
+setmetatable(M, { __index = BaseWindow })
 
 function FGAssistInviteView.new(blur_view, callback)
-    local self = setmetatable({}, {__index = M})
+	local self = setmetatable({}, { __index = M })
-    self.class = "FGAssistInviteView"
+	self.class = "FGAssistInviteView"
-    self._blur_view = blur_view 
+	self._blur_view = blur_view
-    self._animation = true
+	self._animation = true
-    self._new_hide = false
+	self._new_hide = false
-  	self._put_map = false
+	self._put_map = false
-  	self._close_destroy = true
+	self._close_destroy = true
-    self.callback = callback
+	self.callback = callback
-    self:initView("ui://FGAssist/panel_invite")
+	self:initView("ui://FGAssist/panel_invite")
-    return self
+	return self
 end
 
 function M:initView(url)
-    self:init(url)
+	self:init(url)
-    self.lst_player = self._view:GetChild("lst_player")
+	self.lst_player = self._view:GetChild("lst_player")
-    local btn_refresh = self._view:GetChild("btn_refresh")
+	local btn_refresh = self._view:GetChild("btn_refresh")
-    btn_refresh.onClick:Set(function()
+	btn_refresh.onClick:Set(function()
 		self.lst_player:RemoveChildrenToPool()
-    	self:FillData()
+		self:FillData()
-    end)
+	end)
 
-    self._timer = 0
+	self._timer = 0
-    self:FillData()
+	self:FillData()
-    UpdateBeat:Add(self.OnUpdate,self)
+	UpdateBeat:Add(self.OnUpdate, self)
 end
 
 function M:FillData()
-    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+	local mgr_ctr = ControllerManager.GetController(GroupMgrController)
-    if not mgr_ctr._mgr_client then
+	if not mgr_ctr._mgr_client then
-	    return
+		return
 	else
-    	self:GetOnlinePlayers()
+		self:GetOnlinePlayers()
-    end
+	end
 end
 
 function M:GetOnlinePlayers()
-    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+	local mgr_ctr = ControllerManager.GetController(GroupMgrController)
-    mgr_ctr:FG_GetOnlinePlayers(function(res)
+	mgr_ctr:FG_GetOnlinePlayers(function(res)
-        if res.ReturnCode ~= 0 then   
+		if res.ReturnCode ~= 0 then
-            ViewUtil.ErrorTip(res.ReturnCode, "获取在线成员失败")
+			ViewUtil.ErrorTip(res.ReturnCode, "获取在线成员失败")
-        else 
+		else
 			self.players = res.Data.onlines
 			self._view:GetController("empty").selectedIndex = #self.players == 0 and 1 or 0
 			self:ShowOnlinePlayers()

lua_probject/base_project/Game/View/FGAssistView.lua

@@ -68,9 +68,14 @@ function M:PlayerRenderer(index, obj)
     btn_invite.onClick:Set(function()
         local mgr_ctr = ControllerManager.GetController(GroupMgrController)
         local room = DataManager.CurrenRoom
-        mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, room.room_id, room.play_id,
+        mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, DataManager.SelfUser.account_id, room.room_id,
+            room.play_id,
             room.room_config:GetGameName(),
-            function()
+            function(res)
+                if res.ReturnCode ~= 0 then
+                    ViewUtil.ErrorTip(res.ReturnCode, "邀请失败")
+                else
+                end
             end)
     end)
 end

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

@@ -0,0 +1,122 @@
+local FGInvitedMsgView = import('.FamilyInvitedMsgView')
+
+
+local FamilyEventView = {}
+
+local M = FamilyEventView
+
+function FamilyEventView.new(root)
+    setmetatable(M, { __index = root })
+    local self = setmetatable({}, { __index = M })
+
+    local mgr_ctr = self._mgr_ctr
+    mgr_ctr:AddEventListener(GroupMgrEvent.AddPlay, handler(self, self._evtAddPlay))
+    mgr_ctr:AddEventListener(GroupMgrEvent.DelPlay, handler(self, self._evtDelPlay))
+    mgr_ctr:AddEventListener(GroupMgrEvent.UpdatePlay, handler(self, self._evtUpdatePlay))
+    mgr_ctr:AddEventListener(GroupMgrEvent.AddRoom, handler(self, self._evtAddRoom))
+    mgr_ctr:AddEventListener(GroupMgrEvent.DelRoom, handler(self, self._evtDelRoom))
+    mgr_ctr:AddEventListener(GroupMgrEvent.UpdateRoom, handler(self, self._evtUpdateRoom))
+    mgr_ctr:AddEventListener(GroupMgrEvent.UpdatePlayerInfo, handler(self, self._evtUpdatePlayerInfo))
+    mgr_ctr:AddEventListener(GroupMgrEvent.BeInvited, handler(self, self._evtInvited))
+    mgr_ctr:AddEventListener(GroupMgrEvent.UpdateGroup, handler(self, self._evtUpdateGroup))
+    mgr_ctr:AddEventListener(GroupMgrEvent.NewMailTip, handler(self, self._evtNewMailTip))
+    mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse))
+    return self
+end
+
+function M:_evtAddPlay(...)
+    local arg = { ... }
+    print("family event _evtAddPlay")
+end
+
+function M:_evtDelPlay(...)
+    local arg = { ... }
+    print("family event _evtDelPlay")
+end
+
+function M:_evtUpdatePlay(...)
+    local arg = { ... }
+    print("family event _evtUpdatePlay")
+end
+
+function M:_evtAddRoom(...)
+    local arg = { ... }
+    print("family event _evtAddRoom")
+end
+
+function M:_evtDelRoom(...)
+    local arg = { ... }
+    print("family event _evtDelRoom")
+end
+
+function M:_evtUpdateRoom(...)
+    local arg = { ... }
+    print("family event _evtUpdateRoom")
+end
+
+function M:_evtUpdatePlayerInfo(...)
+    local arg = { ... }
+    print("family event _evtUpdatePlayerInfo")
+end
+
+function M:_evtInvited(...)
+    local arg = { ... }
+    print("family event _evtInvited")
+end
+
+function M:_evtUpdateGroup(...)
+    local arg = { ... }
+    print("family event _evtUpdateGroup")
+end
+
+function M:_evtNewMailTip(...)
+    local arg = { ... }
+    print("family event _evtNewMailTip")
+end
+
+function M:_evtInviteResponse(...)
+    local arg = { ... }
+    local invite_id = arg[1]
+    local g_name = arg[2]
+    local roomid = arg[3]
+    local pid = arg[4]
+    local groupid = arg[5]
+    local roomCtr = ControllerManager.GetController(RoomController)
+    local gameId = DataManager.groups:get(groupid):getPlay(pid).gameId
+    local imv =
+        FGInvitedMsgView.new(
+            self._root_view,
+            groupid,
+            pid,
+            invite_id,
+            function()
+                roomCtr:PublicJoinRoom(
+                    Protocol.WEB_FG_JOIN_ROOM,
+                    roomid,
+                    groupid,
+                    function(response)
+                        if (response.ReturnCode == -1) then
+                            ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
+                            -- RestartGame()
+                            return
+                        end
+
+                        if response.ReturnCode ~= 0 then
+                            ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
+                            -- ViewManager.ChangeView(ViewManager.View_Lobby)
+                            return
+                        else
+                            UpdateBeat:Remove(self.OnUpdate, self)
+                            ViewManager.ChangeView(ViewManager.View_Main, gameId)
+                        end
+                    end,
+                    groupid,
+                    pid
+                )
+            end
+        )
+    -- imv:FillData(data)
+    imv:Show()
+end
+
+return M

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

@@ -0,0 +1,66 @@
+-- 被邀请界面
+local FGInvitedMsgView = {}
+
+local M = FGInvitedMsgView
+setmetatable(M, { __index = BaseWindow })
+
+function FGInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback)
+    print("lingmeng FGAssistInviteView")
+    local self = setmetatable({}, { __index = M })
+    self.class = "FGAssistInviteView"
+    self._blur_view = blur_view
+    self._animation = true
+    self._new_hide = false
+    self._put_map = false
+    self._close_destroy = true
+    self.groupid = groupid
+    self.pid = pid
+    self.invite_id = invite_id
+    self.callback = callback
+    print("lingmeng FGAssistInviteView1")
+
+    self:initView("ui://FGAssist/panel_invite")
+    print("lingmeng FGAssistInviteView2")
+
+    return self
+end
+
+function M:initView(url)
+    BaseWindow.init(self, url)
+    print("lingmeng FGAssistInviteView3")
+    self._viewText_groupName = self._view:GetChild('tex_group_name')
+    self._viewText_gameName = self._view:GetChild('tex_game_name')
+    self._viewText_inviteName = self._view:GetChild('tex_name')
+    self._viewText_playName = self._view:GetChild('tex_play_name')
+    self._viewText_playConfig = self._view:GetChild('text_play_config')
+
+    print("lingmeng FGAssistInviteView4")
+
+    self._view:GetChild('btn_no').onClick:Set(function()
+        print("lingmeng btn_no")
+        self:Destroy()
+    end)
+
+    print("lingmeng FGAssistInviteView5")
+
+    self._view:GetChild('btn_yes').onClick:Set(function()
+        print("lingmeng btn_yes", self.callback)
+
+        if self.callback then
+            self.callback()
+        end
+        self:Destroy()
+    end)
+    print("lingmeng FGAssistInviteViewend")
+    self:FillData()
+end
+
+function M:FillData()
+
+end
+
+function M:Destroy()
+    BaseWindow.Destroy(self)
+end
+
+return M

lua_probject/base_project/Game/View/FamilyView.lua

@@ -9,6 +9,7 @@ local FamilyNumberRecord = import(".Family.FamilyNumberRecord")
 local FamilyAuditNumber = import(".Family.FamilyAuditNumber")
 local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate")
 local FamilyBanDeskmate = import(".Family.FamilyBanDeskmate")
+local FamilyEventView = import(".Family.FamilyEventView")
 ---
 FamilyView = {}
 
@@ -35,6 +36,7 @@ function M:init(url)
 
     self.familyType = view:GetController('familyType')
     self.btn_close = view:GetChild('btn_close')
+    self._mgr_ctr = ControllerManager.GetController(GroupMgrController)
 
     self:InitCloseClick()
 
@@ -52,6 +54,11 @@ function M:init(url)
         self._child_familyNumberRecord = FamilyNumberRecord.New(self)
         self.lastType = 1
     end)
+
+    if FamilyEventView then
+        self._familyEventView = FamilyEventView.new(self)
+        self._familyEventView:_evtAddPlay()
+    end
 end
 
 function M:InitCloseClick()
@@ -391,6 +398,21 @@ function M:OnUpdate()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local heatTime = os.time()
     -- --12001事件
+    local func = self._mgr_ctr:PopEvent()
+    if (func ~= nil) then
+        local success, result = pcall(func)
+        if success then
+
+        else
+            print("witness error")
+            print(result)
+            -- self._gamectr = ControllerManager.GetController(GameController)
+            -- if self._gamectr then
+            --     self._gamectr:ResetConnect()
+            -- end
+        end
+        --func()
+    end
     if self._group.update_room then
         --     if self._roomNum == self._group.room_num then
         --         for i = 1, self._group.room_num do

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

@@ -404,7 +404,7 @@ function M:EventInit()
         ---
         local isZiMo = win_seat == lose_seat
         DataManager.CurrenRoom.isZiMoHu = isZiMo
-        local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2))
+        local hu_sound = isZiMo and ("zimo") or ("hu")
         printlog("声音====>>>", hu_sound)
         self:PlaySound("FuZhou_MJ", player.self_user.sex, hu_sound)
 
@@ -420,6 +420,10 @@ function M:EventInit()
                 local tem = win_list[i]
                 if tem.type > 0 and tem.type < 32 then
                     local com_name = "he" .. tem.type
+                    printlog("声音====>>>", com_name)
+                    ViewUtil.PlaySound("FuZhou_MJ",
+                        string.format("extend/majiang/fuhzou/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex],
+                            com_name))
                     local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_FuZhou/" .. com_name)
                     coroutine.wait(0.3)
                 end
@@ -802,16 +806,16 @@ function M:OnFangziAction(...)
     -- local pNode = info._mask_liangpai
     local effect = UIPackage.CreateObject("Extend_MJ_FuZhou", "FzEffect")
     if fz.type == FZType.Peng then
-        self:PlaySound("FuZhou_MJ", player.self_user.sex, "peng" .. math.random(1, 3))
+        self:PlaySound("FuZhou_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("FuZhou_MJ", player.self_user.sex, "chi" .. math.random(1, 3))
+        self:PlaySound("FuZhou_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("FuZhou_MJ", player.self_user.sex, "gang" .. math.random(1, 2))
+        self:PlaySound("FuZhou_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", "杠框")

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

@@ -10,8 +10,8 @@ local M = {}
 
 --- Create a new ZZ_MainView
 function M.new()
-    setmetatable(M,{__index = MJMainView})
+    setmetatable(M, { __index = MJMainView })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = "MainView"
     self.asset_group = "GeJiu_MJ"
     self:init()
@@ -25,78 +25,75 @@ function M:InitView(url)
     self._gps_style = 1
     self._full = true
     UIPackage.AddPackage("extend/majiang/gejiu/ui/Extend_MJ_GeJiu")
-    MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2")
+    MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
     self._hu_tip = HuTipView.new(self)
 
-    self._view:GetChild('wanfa_text').text =room.room_config.people_num .. '人个旧麻将 ' .. room.score_times .. '倍'
+    self._view:GetChild('wanfa_text').text = room.room_config.people_num .. '人个旧麻将 ' .. room.score_times .. '倍'
 
-    self.selectLaiziBtn=self._view:GetChild('selectlaizi')
+    self.selectLaiziBtn = self._view:GetChild('selectlaizi')
-    self.Laizi1Btn=self._view:GetChild('selectgang1')
+    self.Laizi1Btn = self._view:GetChild('selectgang1')
-	self.Laizi2Btn=self._view:GetChild('selectgang2')
+    self.Laizi2Btn = self._view:GetChild('selectgang2')
-	self._view:GetChild("n108").visible = true
+    self._view:GetChild("n108").visible = true
-	self.Laizi1Btn.visible=true
+    self.Laizi1Btn.visible = true
-	self.Laizi2Btn.visible=true
+    self.Laizi2Btn.visible = true
-	self.bugangnum = self._view:GetChild("bugangnum")
+    self.bugangnum = self._view:GetChild("bugangnum")
 
-   self:PlayerChangeLineState()
+    self:PlayerChangeLineState()
 
     if room.playing or room.curren_round > 0 then
         self:ReloadRoom()
     end
 end
 
-function M:__BuGang(card1,card2, callback)
+function M:__BuGang(card1, card2, callback)
+    local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Gang_tip_choice")
+    _gang_tip_choice.visible = true
 
-	local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Gang_tip_choice")
+    local gangcard1 = _gang_tip_choice:GetChild("card1")
-	_gang_tip_choice.visible = true
+    local gangcard2 = _gang_tip_choice:GetChild("card2")
-	
-	local gangcard1 = _gang_tip_choice:GetChild("card1")
-	local gangcard2 = _gang_tip_choice:GetChild("card2")
 
 
-	gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card1)
+    gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. card1)
-	gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..card2)
+    gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. card2)
 
-	gangcard1.onClick:Add(function()
+    gangcard1.onClick:Add(function()
-		callback(card1)
+        callback(card1)
-	end)
+    end)
 
-	gangcard2.onClick:Add(function()
+    gangcard2.onClick:Add(function()
-		callback(card2)
+        callback(card2)
-	end)
+    end)
 
-	_gang_tip_choice.xy = Vector2((self._view.width - _gang_tip_choice.width)/2, (self._view.height - _gang_tip_choice.height)/2)
+    _gang_tip_choice.xy = Vector2((self._view.width - _gang_tip_choice.width) / 2,
-  	self._view:AddChild(_gang_tip_choice)
+        (self._view.height - _gang_tip_choice.height) / 2)
-  	self._gang_tip_choice = _gang_tip_choice
+    self._view:AddChild(_gang_tip_choice)
+    self._gang_tip_choice = _gang_tip_choice
 end
 
+function M:SetShowGangZiProcess(currentLaizi1ID, currentLaizi2ID, bugangnum, isShowAnim)
+    --zhongid=currentLaizi1ID
+    if isShowAnim == nil then isShowAnim = false end
 
-function M:SetShowGangZiProcess(currentLaizi1ID,currentLaizi2ID,bugangnum,isShowAnim)
+    self:SetGangZiCard(self.Laizi1Btn, currentLaizi1ID)
-	--zhongid=currentLaizi1ID
+    self:SetGangZiCard(self.Laizi2Btn, currentLaizi2ID)
-	if isShowAnim==nil then  isShowAnim=false end
+    self:IsShowGangZi(self.Laizi1Btn, true)
-
+    self:IsShowGangZi(self.Laizi2Btn, true)
-	self:SetGangZiCard(self.Laizi1Btn,currentLaizi1ID)
+    self.bugangnum.text = "当前 " .. bugangnum .. " 杠"
-	self:SetGangZiCard(self.Laizi2Btn,currentLaizi2ID)
-    self:IsShowGangZi(self.Laizi1Btn,true)
-    self:IsShowGangZi(self.Laizi2Btn,true)
-    self.bugangnum.text = "当前 "..bugangnum.." 杠"
-
 end
 
-
 function M:HideAllGangZiCard()
-	self.Laizi1Btn.visible=false
+    self.Laizi1Btn.visible = false
-	self.Laizi2Btn.visible=false
+    self.Laizi2Btn.visible = false
-	self.selectLaiziBtn.visible=false
+    self.selectLaiziBtn.visible = false
-	--self.LaiziBG.visible=false
+    --self.LaiziBG.visible=false
 end
 
-function M:SetGangZiCard(btn,cardId)
+function M:SetGangZiCard(btn, cardId)
-	btn.icon='ui://Main_Majiang/' ..get_majiang_prefix(DataManager.CurrenRoom.game_id).."201_"..cardId 
+    btn.icon = 'ui://Main_Majiang/' .. get_majiang_prefix(DataManager.CurrenRoom.game_id) .. "201_" .. cardId
 end
 
-function M:IsShowGangZi(btn,isShow)
+function M:IsShowGangZi(btn, isShow)
-	btn.visible=isShow
+    btn.visible = isShow
 end
 
 function M:UpdateRound()
@@ -105,61 +102,61 @@ function M:UpdateRound()
 end
 
 function M:InitPlayerInfoView()
-  self._player_info = {}
+    self._player_info = {}
     local _player_info = self._player_info
     for i = 1, self._room.room_config.people_num do
         local tem = self._view:GetChild("player_info" .. i)
-        _player_info[i] = PlayerInfoView.new(tem,self)
+        _player_info[i] = PlayerInfoView.new(tem, self)
         tem.visible = false
     end
 end
 
-function M:NewMJPlayerCardInfoView(view,index)
+function M:NewMJPlayerCardInfoView(view, index)
     if index == 1 then
-        return MJPlayerSelfCardInfoView.new(view,self)
+        return MJPlayerSelfCardInfoView.new(view, self)
     end
-    return MJPlayerCardInfoView.new(view,self)
+    return MJPlayerCardInfoView.new(view, self)
 end
 
 function M:EventInit()
-	-- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong")
+    -- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong")
-	MainView.EventInit(self)
+    MainView.EventInit(self)
     local _room = self._room
     local _view = self._view
     local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard")
     local _player_info = self._player_info
-	local _gamectr = self._gamectr
+    local _gamectr = self._gamectr
 
 
 
-	 _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
+    _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
-        local arg = {...}
+        local arg = { ... }
-        self:SetShowLaiZiProcess(arg[1],arg[2],arg[3],arg[4])
+        self:SetShowLaiZiProcess(arg[1], arg[2], arg[3], arg[4])
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.SendGangZi, function(...)
-        local arg = {...}
+        local arg = { ... }
-        self:SetShowGangZiProcess(arg[1],arg[2],arg[3],arg[4])
+        self:SetShowGangZiProcess(arg[1], arg[2], arg[3], arg[4])
     end)
 
-	_gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...)
+    _gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...)
-        local arg = {...}
+        local arg = { ... }
-		self:__BuGang(arg[1],arg[2],
+        self:__BuGang(arg[1], arg[2],
-		function(id)
+            function(id)
-			printlog(id)
+                printlog(id)
-			_gamectr:SendGangCard(id)
+                _gamectr:SendGangCard(id)
-			self:__CloseGangTip()
+                self:__CloseGangTip()
-    	end)
+            end)
     end)
 
 
 
-    _gamectr:AddEventListener(TX_GameEvent.SendCards,function( ... )
+    _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
         -- self:ShowHuTip()
         self:UpdateRound()
         self._state.selectedIndex = 1
         local list = _room.player_list
-        for i=1,#list do
+        for i = 1, #list do
             local p = list[i]
             local info = self._player_info[self:GetPos(p.seat)]
             info:FillData(p)
@@ -169,8 +166,8 @@ function M:EventInit()
             card_info:UpdateHandCard()
         end
     end)
-     _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
+    _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
-        local arg = {...}
+        local arg = { ... }
         self._left_time = 15
         local seat = arg[1]
         self:UpdateCardBox(self:GetPos(seat))
@@ -184,11 +181,11 @@ function M:EventInit()
         info:UpdateHandCard(true)
     end)
 
-    local _gcm_outcard_url ="ui://Main_Majiang/Gcm_OutCard"
+    local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
     _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
         self:__CloseTip()
         self._left_time = 0
-        local arg = {...}
+        local arg = { ... }
         local p = arg[1]
         local card = arg[2]
         local seat = p.seat
@@ -205,7 +202,7 @@ function M:EventInit()
     end)
     _gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
         self:__CloseTip()
-        local arg = {...}
+        local arg = { ... }
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
@@ -216,27 +213,27 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.FZTips, function(...)
-        local arg = {...}
+        local arg = { ... }
         local _tip = arg[1]
         local weight = arg[2]
         self:__FangziTip(_tip, weight)
     end)
 
-    _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self,self.OnFangziAction))
+    _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
 
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
         self._left_time = 0
         self:UpdateCardBox(0)
         self:__CloseTip()
         self._popEvent = false
-		local arg = {...}
+        local arg = { ... }
         local win_seat = arg[1]
-		local lose_seat = arg[2]
+        local lose_seat = arg[2]
-		local win_card = arg[3]
+        local win_card = arg[3]
-		local cards = arg[4]
+        local cards = arg[4]
-		local win_list = arg[5]
+        local win_list = arg[5]
-		local index = self:GetPos(win_seat)
+        local index = self:GetPos(win_seat)
-		local info = self._player_card_info[index]
+        local info = self._player_card_info[index]
         self:RemoveCursor()
         info:UpdateHandCard(true, true)
 
@@ -262,21 +259,21 @@ function M:EventInit()
         local he = UIPackage.CreateObjectFromURL(url)
         pNode:AddChild(he)
         he:GetTransition("t2"):Play()
-		he:Center() 
+        he:Center()
-		if _room.room_config.people_num==2 then
+        if _room.room_config.people_num == 2 then
-			if win_seat ~= _room.self_player.seat then
+            if win_seat ~= _room.self_player.seat then
-				he.scaleY = 0.4
+                he.scaleY = 0.4
-				he.scaleX = 0.4
+                he.scaleX = 0.4
-				he.x = he.width * 0.4 * 0.5 * -1
+                he.x = he.width * 0.4 * 0.5 * -1
-				he.y = he.height * 0.4 * 0.5 * -1
+                he.y = he.height * 0.4 * 0.5 * -1
-			end
+            end
-		end
+        end
 
         if win_seat == _room.self_player.seat then
-			printlog("自己位置=====")
+            printlog("自己位置=====")
             he:Center()
         elseif url == "ui://Main_Majiang/eff_zimo" then
-			printlog("自摸地址==========")
+            printlog("自摸地址==========")
             he.scaleY = 0.4
             he.scaleX = 0.4
             he.x = he.width * 0.4 * 0.5 * -1
@@ -285,46 +282,45 @@ function M:EventInit()
 
 
 
-		---
+        ---
-		local isZiMo=win_seat==lose_seat
+        local isZiMo = win_seat == lose_seat
-		DataManager.CurrenRoom.isZiMoHu=isZiMo
+        DataManager.CurrenRoom.isZiMoHu = isZiMo
-    	local hu_sound = isZiMo and ("zimo"..math.random(1, 3)) or ("hu"..math.random(1, 2))
+        local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2))
-		printlog("声音====>>>",hu_sound)
+        printlog("声音====>>>", hu_sound)
-	    self:PlaySound("GeJiu_MJ",player.self_user.sex, hu_sound)
+        self:PlaySound("GeJiu_MJ", player.self_user.sex, hu_sound)
 
-		local pNode = info._view
+        local pNode = info._view
-        local url =  "eff_list1"
+        local url = "eff_list1"
         local he_list = UIPackage.CreateObjectFromURL("ui://Extend_MJ_GeJiu/" .. url)
         he_list.touchable = false
         pNode:AddChild(he_list)
         he_list:Center()
 
         coroutine.start(function()
-	        for i = 1 ,#win_list do
+            for i = 1, #win_list do
-	        	local tem = win_list[i]
+                local tem = win_list[i]
-				if tem.type>0 and tem.type<32  then
+                if tem.type > 0 and tem.type < 32 then
-					local com_name = "he" .. tem.type
+                    local com_name = "he" .. tem.type
-					local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_GeJiu/" .. com_name)
+                    local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_GeJiu/" .. com_name)
-					coroutine.wait(0.3)   
+                    coroutine.wait(0.3)
-				end
+                end
+            end
 
-	        end
+            coroutine.wait(2)
-			
+            obj_win_card:Dispose()
-	        coroutine.wait(2)
+            he:Dispose()
-	        obj_win_card:Dispose()
+            he_list:Dispose()
-			he:Dispose()
+            self._popEvent = true
-	        he_list:Dispose()
-	        self._popEvent = true
         end)
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)
-        local arg = {...}
+        local arg = { ... }
         self._popEvent = false
         local list = arg[1]
         local start_seat = arg[2]
-       -- ViewUtil.PlaySound("GeJiu_MJ", "extend/majiang/chaozhou/sound/zhuaniao.mp3")
+        -- ViewUtil.PlaySound("GeJiu_MJ", "extend/majiang/chaozhou/sound/zhuaniao.mp3")
-        coroutine.start(self.RunNiao,self,list, start_seat)
+        coroutine.start(self.RunNiao, self, list, start_seat)
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
@@ -333,7 +329,7 @@ function M:EventInit()
         self._left_time = 0
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
-        local arg = {...}
+        local arg = { ... }
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
@@ -351,7 +347,7 @@ function M:EventInit()
         self:RemoveCursor()
         if self._clearingView == nil then
             self._clearingView = EXClearingView.new(self._root_view)
-                coroutine.start(function()
+            coroutine.start(function()
                 coroutine.wait(0.5)
                 self._clearingView:Show()
                 self._popEvent = true
@@ -373,7 +369,7 @@ function M:EventInit()
                     end
                     info:UpdateScore()
                     info._view:GetChild("zhanji").visible = true
-					local num = data[i].hp_info.total_hp
+                    local num = data[i].hp_info.total_hp
                     if num > 0 then
                         info._view:GetController("text_color").selectedIndex = 0
                         info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
@@ -399,7 +395,7 @@ function M:EventInit()
         self._left_time = 0
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
-        local arg = {...}
+        local arg = { ... }
         local total_result = arg[2]
         local result = arg[1]
         local over = arg[3]
@@ -420,7 +416,7 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EvnetPiao, function(...)
-        local arg = {...}
+        local arg = { ... }
         local seat = arg[1]
         local num = arg[2]
         if num > 0 then
@@ -440,21 +436,21 @@ end
 
 function M:OutCard(card)
     if card ~= 0 then
-		printlog("当前出牌为===>>>"..card)
+        printlog("当前出牌为===>>>" .. card)
         local _gamectr = ControllerManager.GetController(GameController)
         self._room.curren_outcard_seat = -1
         _gamectr:SendOutCard(card, function()
-        local info = self._player_card_info[1]
+            local info = self._player_card_info[1]
-        self:RemoveCursor()
+            self:RemoveCursor()
-        info:UpdateHandCard()
+            info:UpdateHandCard()
 
-        info:UpdateOutCardList(nil, card, self._cursor)
+            info:UpdateOutCardList(nil, card, self._cursor)
-        self:PlaySound("GeJiu_MJ", self._room.self_player.self_user.sex,tostring(card))
+            self:PlaySound("GeJiu_MJ", self._room.self_player.self_user.sex, tostring(card))
-        self:PlayMJSound("chupai.mp3")
+            self:PlayMJSound("chupai.mp3")
-        -- self:ShowHuTip()
+            -- self:ShowHuTip()
-    end)
+        end)
-	else
+    else
-		printlog("鬼牌不能出===>>>"..card)
+        printlog("鬼牌不能出===>>>" .. card)
     end
 end
 
@@ -476,16 +472,16 @@ function M:__FangziTip(tip, weight)
     local count = #_tlist
     table.sort(_tlist)
     local isHu = false
-    for k=1,#_tlist do
+    for k = 1, #_tlist do
         local td = tip.tip_map_type[_tlist[k]][1]
         local url = "ui://Main_Majiang/Btn_fztip"
         local td_weight = td.weight
         if td_weight == 16 then td_weight = 8 end
         if td_weight == 8 then url = "ui://Main_Majiang/Btn_hu" end
         local btn_t = _lit_fanzi:AddItemFromPool(url)
-        btn_t.icon = "ui://Main_Majiang/fztip_"..td_weight
+        btn_t.icon = "ui://Main_Majiang/fztip_" .. td_weight
         btn_t.data = { tip, td }
-        btn_t.onClick:Add(self.__TipAction,self)
+        btn_t.onClick:Add(self.__TipAction, self)
     end
 
     -- if not (tonumber(weight) >= 16) then
@@ -540,52 +536,58 @@ function M:_ChiView(tiplist, callback)
     self._chipeng_tip.visible = false
     printlog("_ChiView")
     pt(tiplist)
-	local _pop_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Pop_tip_choice")
+    local _pop_tip_choice = UIPackage.CreateObject("Extend_MJ_GeJiu", "Pop_tip_choice")
-	local list_choose1 = _pop_tip_choice:GetChild("Lst_choose")
+    local list_choose1 = _pop_tip_choice:GetChild("Lst_choose")
-	local list_choose2 = _pop_tip_choice:GetChild("Lst_choose2")
+    local list_choose2 = _pop_tip_choice:GetChild("Lst_choose2")
-	local crossCtr = _pop_tip_choice:GetController("state")
+    local crossCtr = _pop_tip_choice:GetController("state")
-	crossCtr.selectedIndex = #tiplist == 3 and 0 or (#tiplist == 2 and 1 or (#tiplist == 4 and 2 or (#tiplist == 5 and 3 or 4)))
+    crossCtr.selectedIndex = #tiplist == 3 and 0 or
-	_pop_tip_choice:GetChild("Btn_cross").onClick:Add(function()
+    (#tiplist == 2 and 1 or (#tiplist == 4 and 2 or (#tiplist == 5 and 3 or 4)))
-		_pop_tip_choice:Dispose()
+    _pop_tip_choice:GetChild("Btn_cross").onClick:Add(function()
-		self._chipeng_tip.visible = true
+        _pop_tip_choice:Dispose()
-	end)
+        self._chipeng_tip.visible = true
-  	list_choose1:RemoveChildrenToPool()
+    end)
-  	list_choose2:RemoveChildrenToPool()
+    list_choose1:RemoveChildrenToPool()
-  	for i = 1, #tiplist do
+    list_choose2:RemoveChildrenToPool()
-  		local list_choose = i <= 3 and list_choose1 or list_choose2
+    for i = 1, #tiplist do
-		local item_choose = list_choose:AddItemFromPool()
+        local list_choose = i <= 3 and list_choose1 or list_choose2
-		item_choose:GetController("type").selectedIndex = (1 == tiplist[i].weight or 2 == tiplist[i].weight) and 1 or 0
+        local item_choose = list_choose:AddItemFromPool()
-		if tiplist[i].weight ~= 1 then
+        item_choose:GetController("type").selectedIndex = (1 == tiplist[i].weight or 2 == tiplist[i].weight) and 1 or 0
-			for j = 1, 4 do
+        if tiplist[i].weight ~= 1 then
-		  		item_choose:GetChild("card"..j).icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tiplist[i].card)
+            for j = 1, 4 do
-			end
+                item_choose:GetChild("card" .. j).icon = UIPackage.GetItemURL("Main_Majiang",
-		else
+                    self:GetPrefix() .. "202_" .. tiplist[i].card)
-			local tem = {}
+            end
-			table.insert(tem, tiplist[i].opcard[1])
+        else
-			table.insert(tem, tiplist[i].opcard[2])
+            local tem = {}
-			local tcard = tiplist[i].card
+            table.insert(tem, tiplist[i].opcard[1])
-			table.insert(tem, tcard)
+            table.insert(tem, tiplist[i].opcard[2])
-			table.sort(tem, function(a, b)
+            local tcard = tiplist[i].card
-				return a < b
+            table.insert(tem, tcard)
-			end)
+            table.sort(tem, function(a, b)
-			item_choose:GetChild("card1").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tem[1])
+                return a < b
-			item_choose:GetChild("card2").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tem[2])
+            end)
-			item_choose:GetChild("card4").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_"..tem[3])
+            item_choose:GetChild("card1").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" ..
-			local cardpos = tem[2] > tcard and 1 or (tem[2] < tcard and 4 or 2)
+            tem[1])
-			item_choose:GetChild("card" .. cardpos):GetController("color").selectedIndex = 1
+            item_choose:GetChild("card2").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" ..
-		end
+            tem[2])
-		item_choose.onClick:Add(function()
+            item_choose:GetChild("card4").icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" ..
-		  callback(tiplist[i].id)
+            tem[3])
-		end)
+            local cardpos = tem[2] > tcard and 1 or (tem[2] < tcard and 4 or 2)
-  	end
+            item_choose:GetChild("card" .. cardpos):GetController("color").selectedIndex = 1
-  	_pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width)/2, (self._view.height - _pop_tip_choice.height)/2)
+        end
-  	self._view:AddChild(_pop_tip_choice)
+        item_choose.onClick:Add(function()
-  	self._pop_tip_choice = _pop_tip_choice
+            callback(tiplist[i].id)
+        end)
+    end
+    _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width) / 2,
+        (self._view.height - _pop_tip_choice.height) / 2)
+    self._view:AddChild(_pop_tip_choice)
+    self._pop_tip_choice = _pop_tip_choice
 end
 
 function M:OnFangziAction(...)
     self:__CloseTip()
-    local arg = {...}
+    local arg = { ... }
     local _player_card_info = self._player_card_info
     local fz = arg[1]
     local player = arg[2]
@@ -595,16 +597,16 @@ function M:OnFangziAction(...)
     local pNode = info._mask_liangpai
     local effect = UIPackage.CreateObject("Extend_MJ_GeJiu", "FzEffect")
     if fz.type == FZType.Peng then
-        self:PlaySound("GeJiu_MJ", player.self_user.sex,"peng"..math.random(1, 3))
+        self:PlaySound("GeJiu_MJ", player.self_user.sex, "peng" .. math.random(1, 3))
         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("GeJiu_MJ", player.self_user.sex,"chi"..math.random(1, 3))
+        self:PlaySound("GeJiu_MJ", player.self_user.sex, "chi" .. math.random(1, 3))
         effect:GetChild("word1").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
         effect:GetChild("word2").icon = UIPackage.GetItemURL("Main_Majiang", "吃")
     else
-        self:PlaySound("GeJiu_MJ", player.self_user.sex,"gang"..math.random(1, 2))
+        self:PlaySound("GeJiu_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", "杠框")
@@ -613,9 +615,9 @@ function M:OnFangziAction(...)
     effect:GetTransition("t2"):Play()
     pNode:AddChild(effect)
     coroutine.start(function()
-		coroutine.wait(0.3)
+        coroutine.wait(0.3)
-		self._popEvent = true
+        self._popEvent = true
-	end)
+    end)
     coroutine.start(function()
         coroutine.wait(2)
         effect:Dispose()
@@ -636,7 +638,7 @@ end
 function M:RunNiao(list, start_seat)
     local _room = self._room
     --local _niao_View = self._niao_View
-    self._niao_View = UIPackage.CreateObject("Extend_MJ_GeJiu","Panel_Birds")
+    self._niao_View = UIPackage.CreateObject("Extend_MJ_GeJiu", "Panel_Birds")
     self._view:AddChild(self._niao_View)
     self._niao_View:Center()
     local _niao_View = self._niao_View
@@ -654,7 +656,7 @@ function M:RunNiao(list, start_seat)
         local card = list[i].card
         coroutine.wait(0.3)
         item:GetTransition("appear"):Play()
-        item.icon = UIPackage.GetItemURL("Main_Majiang", "201_"..card)
+        item.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. card)
         if list[i].score > 0 then item:GetController("bg").selectedIndex = 1 end
     end
     coroutine.start(function()
@@ -679,17 +681,17 @@ end
 -- end
 
 function M:__PiaoNiaoTip()
-  local obj_piao = UIPackage.CreateObject("Main_Majiang", "panel_piao_niao")
+    local obj_piao = UIPackage.CreateObject("Main_Majiang", "panel_piao_niao")
-  self._view:AddChild(obj_piao)
+    self._view:AddChild(obj_piao)
-  obj_piao.x = (self._view.width - obj_piao.width) * 0.5
+    obj_piao.x = (self._view.width - obj_piao.width) * 0.5
-  obj_piao.y = self._view.height * 0.6
+    obj_piao.y = self._view.height * 0.6
-  for i = 1, 4 do
+    for i = 1, 4 do
-    obj_piao:GetChild("btn_" .. i).onClick:Add(function()
+        obj_piao:GetChild("btn_" .. i).onClick:Add(function()
-      self._gamectr:SendAction(i - 1)
+            self._gamectr:SendAction(i - 1)
-      obj_piao:Dispose()
+            obj_piao:Dispose()
-    end)
+        end)
-  end
+    end
-  self._com_piao = obj_piao
+    self._com_piao = obj_piao
 end
 
 function M:ReloadRoom(bskip)
@@ -702,12 +704,12 @@ function M:ReloadRoom(bskip)
     -- end
 
     if bskip == nil or bskip == false then
-		if not room.playing then
+        if not room.playing then
-		self._state.selectedIndex = 2
+            self._state.selectedIndex = 2
-		else
+        else
-		self._state.selectedIndex = 1
+            self._state.selectedIndex = 1
-		self._room._reload_flag = true
+            self._room._reload_flag = true
-		end
+        end
     end
 
 
@@ -721,18 +723,18 @@ function M:ReloadRoom(bskip)
         local head_info = self._player_info[self:GetPos(p.seat)]
         head_info:UpdateScore()
         head_info._view:GetChild('zhanji').visible = true
-		local num = p.total_hp or 0
+        local num = p.total_hp or 0
-		if num > 0 then
+        if num > 0 then
-			head_info._view:GetController('text_color').selectedIndex = 0
+            head_info._view:GetController('text_color').selectedIndex = 0
-			head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
+            head_info._view:GetChild('text_jifen').text = "+" .. d2ad(num)
-		else
+        else
-			head_info._view:GetController('text_color').selectedIndex = 1
+            head_info._view:GetController('text_color').selectedIndex = 1
-			head_info._view:GetChild('text_jifen').text = d2ad(num)
+            head_info._view:GetChild('text_jifen').text = d2ad(num)
-		end
+        end
 
         if p.seat == room.last_outcard_seat then
             local card = p.outcard_list[#p.outcard_list]
-            info:UpdateOutCardList(nil,card, self._cursor)
+            info:UpdateOutCardList(nil, card, self._cursor)
         elseif p.seat == room.curren_outcard_seat then
             info:UpdateHandCard(true)
             info:UpdateOutCardList()
@@ -746,11 +748,11 @@ function M:ReloadRoom(bskip)
         --     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
+            if p.ready and room.playing == false then
-			  self._player_info[self:GetPos(p.seat)]:Ready(true)
+                self._player_info[self:GetPos(p.seat)]:Ready(true)
-			end
+            end
-		end
+        end
-        if p.piao_niao~=nil and p.piao_niao > 0 then
+        if p.piao_niao ~= nil and p.piao_niao > 0 then
             local head_info = self._player_info[self:GetPos(p.seat)]
             head_info._view:GetChild("mask_piao").title = "飘分 " .. p.piao_niao
             head_info._view:GetController("piao_niao").selectedIndex = 1
@@ -766,14 +768,14 @@ function M:ReloadRoom(bskip)
 end
 
 function M:PlayerChangeLineState()
-  -- local isOutCard = true
+    -- local isOutCard = true
-  -- local str = "玩家 "
+    -- local str = "玩家 "
-  -- for _ , player in ipairs(self._room.player_list) do
+    -- for _ , player in ipairs(self._room.player_list) do
-  --   if player.line_state == 0 then
+    --   if player.line_state == 0 then
-  --     isOutCard = false
+    --     isOutCard = false
-  --   end
+    --   end
-  -- end
+    -- end
-  --   self._player_card_info[1]._area_handcard_list.touchable = isOutCard
+    --   self._player_card_info[1]._area_handcard_list.touchable = isOutCard
 end
 
 function M:UpdateCardBox(seat)
@@ -796,7 +798,6 @@ function M:__CloseTip()
         self._pop_tip_choice:Dispose()
         self._pop_tip_choice = nil
     end
-   
 end
 
 function M:__CloseGangTip()
@@ -806,8 +807,6 @@ function M:__CloseGangTip()
     end
 end
 
-
-
 function M:closeTipOnTuoguan()
     self:__CloseTip()
 end

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

@@ -404,7 +404,7 @@ function M:EventInit()
         ---
         local isZiMo = win_seat == lose_seat
         DataManager.CurrenRoom.isZiMoHu = isZiMo
-        local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2))
+        local hu_sound = isZiMo and ("zimo") or ("hu")
         printlog("声音====>>>", hu_sound)
         self:PlaySound("JinXi_MJ", player.self_user.sex, hu_sound)
 
@@ -420,6 +420,10 @@ function M:EventInit()
                 local tem = win_list[i]
                 if tem.type > 0 and tem.type < 32 then
                     local com_name = "he" .. tem.type
+                    printlog("声音====>>>", com_name)
+                    ViewUtil.PlaySound("JinXi_MJ",
+                        string.format("extend/majiang/jinxi/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex],
+                            com_name))
                     local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_JinXi/" .. com_name)
                     coroutine.wait(0.3)
                 end
@@ -803,16 +807,16 @@ function M:OnFangziAction(...)
     -- local pNode = info._mask_liangpai
     local effect = UIPackage.CreateObject("Extend_MJ_JinXi", "FzEffect")
     if fz.type == FZType.Peng then
-        self:PlaySound("JinXi_MJ", player.self_user.sex, "peng" .. math.random(1, 3))
+        self:PlaySound("FuZhou_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("JinXi_MJ", player.self_user.sex, "chi" .. math.random(1, 3))
+        self:PlaySound("JinXi_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("JinXi_MJ", player.self_user.sex, "gang" .. math.random(1, 2))
+        self:PlaySound("JinXi_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", "杠框")

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

@@ -402,7 +402,7 @@ function M:EventInit()
         ---
         local isZiMo = win_seat == lose_seat
         DataManager.CurrenRoom.isZiMoHu = isZiMo
-        local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2))
+        local hu_sound = isZiMo and ("zimo") or ("hu")
         printlog("声音====>>>", hu_sound)
         self:PlaySound("LiChuan_MJ", player.self_user.sex, hu_sound)
 
@@ -418,6 +418,10 @@ function M:EventInit()
                 local tem = win_list[i]
                 if tem.type > 0 and tem.type < 32 then
                     local com_name = "he" .. tem.type
+                    printlog("声音====>>>", com_name)
+                    ViewUtil.PlaySound("LiChuan_MJ",
+                        string.format("extend/majiang/lichuan/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex],
+                            com_name))
                     local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_LiChuan/" .. com_name)
                     coroutine.wait(0.3)
                 end
@@ -805,16 +809,16 @@ function M:OnFangziAction(...)
     -- 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" .. math.random(1, 3))
+        self:PlaySound("FuZhou_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" .. math.random(1, 3))
+        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" .. math.random(1, 2))
+        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", "杠框")

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

@@ -403,7 +403,7 @@ function M:EventInit()
         ---
         local isZiMo = win_seat == lose_seat
         DataManager.CurrenRoom.isZiMoHu = isZiMo
-        local hu_sound = isZiMo and ("zimo" .. math.random(1, 3)) or ("hu" .. math.random(1, 2))
+        local hu_sound = isZiMo and ("zimo") or ("hu")
         printlog("声音====>>>", hu_sound)
         self:PlaySound("NanCheng_MJ", player.self_user.sex, hu_sound)
 
@@ -419,6 +419,10 @@ function M:EventInit()
                 local tem = win_list[i]
                 if tem.type > 0 and tem.type < 32 then
                     local com_name = "he" .. tem.type
+                    printlog("声音====>>>", com_name)
+                    ViewUtil.PlaySound("NanCheng_MJ",
+                        string.format("extend/majiang/nancheng/sound/%s/%s.mp3", ViewUtil.Sex_Chat[player.self_user.sex],
+                            com_name))
                     local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_NanCheng/" .. com_name)
                     print("lingmenghe", "ui://Extend_MJ_NanCheng/" .. com_name)
                     coroutine.wait(0.3)
@@ -805,16 +809,16 @@ function M:OnFangziAction(...)
     -- local pNode = info._mask_liangpai
     local effect = UIPackage.CreateObject("Extend_MJ_NanCheng", "FzEffect")
     if fz.type == FZType.Peng then
-        self:PlaySound("NanCheng_MJ", player.self_user.sex, "peng" .. math.random(1, 3))
+        self:PlaySound("FuZhou_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("NanCheng_MJ", player.self_user.sex, "chi" .. math.random(1, 3))
+        self:PlaySound("NanCheng_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("NanCheng_MJ", player.self_user.sex, "gang" .. math.random(1, 2))
+        self:PlaySound("NanCheng_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", "杠框")