diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index 0bd55f0a..ab3b1a5b 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -163,10 +163,9 @@ function M:ExitWitnessGame(pid, gid, rid) end local _data = {} _data["pid"] = pid - _data["gid"] = gid _data["room_id"] = rid _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data) - _client:destroy() + -- _client:destroy() end --聊天 @@ -181,8 +180,8 @@ function M:SendInteraction(playid, type, parm, callback) local _data = {} _data['playerid'] = playid _data['type'] = type - _data['parm'] = parm - _data['gid'] = 1 + _data['parm'] = tonumber(parm) + -- _data['gid'] = 1 _client:send(Protocol.GAME_INTERACTION, _data, function(res) if callback then callback(res) diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua index c0f54efc..c80bedb0 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua @@ -194,6 +194,16 @@ function M:RecordItemRenderer(data, obj) obj:GetChild('text_score').text = resultInfo.score obj:GetController('colour').selectedIndex = resultInfo.score >= 0 and 1 or 0 end + for i = 1, #data.totalScore do + if data.totalScore[i].accId == DataManager.SelfUser.account_id then + if i ~= 1 then + local tem = data.totalScore[1] + data.totalScore[1] = data.totalScore[i] + data.totalScore[i] = tem + end + break; + end + end resultDetailList.numItems = #data.totalScore end diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index c826c696..718661e5 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -912,16 +912,8 @@ function M:EventInit() end ) - _gamectr:AddEventListener( - GameEvent.WitnessPlayerEnter, - function(...) - ---- print("刷新托管数据=====") - local arg = { ... } - local witnessPlayerList = arg[1] - _room.witness_player_list = witnessPlayerList - _room._flag_updateWitness = true - end - ) + _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, handler(self, self.OnPlayerWitnessEnter)) + _gamectr:AddEventListener( GameEvent.WitnessPlayerLeave, @@ -1038,6 +1030,13 @@ function M:GetReadyNum() return readyNum end +function M:OnPlayerWitnessEnter(...) + ---- print("刷新托管数据=====") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList +end + function M:OnPlayerEnter(...) printlog("进入房间222222222222222222++++++++++++++++++++++++++++") local arg = { ... } diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua index 48367694..dcbc3aa7 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua @@ -64,6 +64,7 @@ end function M:SendOutCard(card, callback) local _data = {} _data["card"] = card + _data["isTip"] = false local _room = self._room local _client = ControllerManager.GameNetClinet _client:send(TX_Protocol.GAME_DIS_CARD, _data) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua index 90879896..3c5bedb0 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua @@ -120,18 +120,20 @@ function M:InitView(url) local btn_witness = self._view:GetChild('btn_pangGuang') if btn_witness then btn_witness.onClick:Set(function() - if room._flag_updateWitness then - room._flag_updateWitness = false - if viewList_witness.numItems == #room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #room.witness_player_list - end - end self._view:GetController('witness').selectedIndex = 1 end) end + --直接渲染观战人员 + if viewList_witness.numItems == #room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #room.witness_player_list + end + + --展示精牌 + self.jing = self._view:GetChild('jing') + self:ShowJing() ------------------------------------------------------- self._ctr_state.selectedIndex = 4 @@ -152,6 +154,22 @@ function M:EventInit() print("lingmeng witness PlayerEnter") end) + _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end + end) + _gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...) local arg = { ... } print("lingmeng witness SendLaiZi") @@ -169,7 +187,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) print("lingmeng witness SendCards") - -- self:ShowJing() + self:ShowJing() if self._clearingView then self._clearingView:Destroy() self._clearingView = nil @@ -333,6 +351,11 @@ function M:InitPlayerInfoView() end end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:NewMJPlayerCardInfoView(view, index) return MJMainView.NewMJPlayerCardInfoView(self, view, index) --[[ @@ -385,6 +408,15 @@ function M:UpdateRound() self._room.room_config.round) end +function M:ShowJing() + if self._room.jing then + self.jing.visible = true + MJPlayerCardInfoView.fillCard2(self, self.jing, "202_", self._room.jing) + else + self.jing.visible = false + end +end + function M:OnUpdate() if (self._popEvent) then local func = self._gamectr:PopEvent() diff --git a/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua index 6f14c3bc..13557409 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/ExtendConfig.lua @@ -141,6 +141,10 @@ function M:FillPlayBackData(pd_data) room.curren_round = _tableInfo["round"] local _info_list = _tableInfo["playerData"] + local jing = _tableInfo["jing"] + if jing then + room.jing = jing + end for i = 1, #_info_list do local _jp = _info_list[i] local p = room:NewPlayer() @@ -197,6 +201,11 @@ function M:FillWitnessData(pd_data) room.banker_seat = bank_seat room.curren_turn_seat = active_seat room.curren_round = _tableInfo["round"] + room.witness_player_list = _tableInfo["playerSpectatorData"] + local jing = _tableInfo["jing"] + if jing then + room.jing = jing + end local _info_list = _tableInfo["playerData"] for i = 1, #_info_list do local _jp = _info_list[i] diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index f1cfe0e3..74b22614 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -72,14 +72,14 @@ function M:SendOutCard(data, callback) -- 进行预删牌处理 local p = _room.self_player _room.curren_outcard_seat = -1 - list_remove(p.card_list, card) + list_remove(p.card_list, data.card) table.sort(p.card_list, self.HandCardSortAndJing) p.hand_left_count = p.hand_left_count - 1 if not p.outcard_list then p.outcard_list = {} end - p.outcard_list[#p.outcard_list + 1] = card + p.outcard_list[#p.outcard_list + 1] = data.card __pre_delete_card = true callback() end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 0b7f2055..b1288a75 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -170,7 +170,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) print("lingmeng witness SendCards") - -- self:ShowJing() + self:ShowJing() if self._clearingView then self._clearingView:Destroy() self._clearingView = nil @@ -274,12 +274,12 @@ function M:EventInit() -- end self:RemoveCursor() if self._clearingView == nil then - self._clearingView = EXClearingView.new(self._root_view) - coroutine.start(function() - coroutine.wait(0.5) - self._clearingView:Show() - self._popEvent = true - end) + self._clearingView = EXClearingView.new(self._root_view) + coroutine.start(function() + coroutine.wait(0.5) + self._clearingView:Show() + self._popEvent = true + end) end if _room.curren_round ~= _room.room_config.round then @@ -382,6 +382,11 @@ function M:OnFangziAction(...) -- self:__CloseTip() end +local majiang_asset_path = "base/main_majiang/sound/" +function M:PlayMJSound(path) + ViewUtil.PlaySound(self.asset_group, majiang_asset_path .. path) +end + function M:UpdateRound() self._view:GetChild("text_round").text = string.format("局数:%d /%d", self._room.curren_round, self._room.room_config.round) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua index 03e74970..36e27fba 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua @@ -197,6 +197,10 @@ function M:FillWitnessData(pd_data) room.banker_seat = bank_seat room.curren_turn_seat = active_seat room.curren_round = _tableInfo["round"] + local jing = _tableInfo["jing"] + if jing then + room.jing = jing + end local _info_list = _tableInfo["playerData"] for i = 1, #_info_list do local _jp = _info_list[i] diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 1fc778d9..f2694aa0 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -187,15 +187,6 @@ function M:InitView(url, use_custom_bg, custom_bg_config) local btn_witness = self._view:GetChild('btn_pangGuang') if btn_witness then btn_witness.onClick:Set(function() - if _room._flag_updateWitness then - print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) - _room._flag_updateWitness = false - if viewList_witness.numItems == #_room.witness_player_list then - viewList_witness:RefreshVirtualList() - else - viewList_witness.numItems = #_room.witness_player_list - end - end self._view:GetController('witness').selectedIndex = 1 end) end @@ -520,6 +511,22 @@ function M:OnPlayerReady(...) end end +function M:OnPlayerWitnessEnter(...) + self:PlayMJSound("user_enter.mp3") + local arg = { ... } + local witnessPlayerList = arg[1] + self._room.witness_player_list = witnessPlayerList + + local _room = DataManager.CurrenRoom + local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') + print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) + if viewList_witness.numItems == #_room.witness_player_list then + viewList_witness:RefreshVirtualList() + else + viewList_witness.numItems = #_room.witness_player_list + end +end + function M:CountCardLeftNum(card) local player_list = DataManager.CurrenRoom.player_list local count = 4 @@ -661,6 +668,7 @@ function M:ShowHand(msg) if infoView.class ~= "PlayerSelfCardInfoView" then printlog("ShowHand", player.seat) + table.sort(player.hand_card, self.HandCardSortAndJing) infoView:ShowHand(player.hand_card) end end @@ -890,4 +898,34 @@ function M:DoNoticeAnimation() end end +function M.HandCardSortAndJing(a, b) + local jing = DataManager.CurrenRoom.jing + if a == jing or b == jing then + if a == b then + return a < b + end + return a == jing + else + if a < 200 then + a = a + 1000 + elseif a < 300 then + a = a + 3000 + elseif a < 400 then + a = a + 2000 + else + a = a + 4000 + end + if b < 200 then + b = b + 1000 + elseif b < 300 then + b = b + 3000 + elseif b < 400 then + b = b + 2000 + else + b = b + 4000 + end + return a < b + end +end + return M diff --git a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml index a3c75619..7896d344 100644 --- a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml +++ b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailChild.xml @@ -19,9 +19,7 @@ - - - + diff --git a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml index a24015fc..50793ab4 100644 --- a/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml +++ b/wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml b/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml index 6a8aadca..cebe39e2 100644 --- a/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml +++ b/wb_new_ui/assets/Family/Record/Component/Item_familyRecord.xml @@ -13,9 +13,7 @@ - - - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml index fbe38f6b..2d545254 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml @@ -107,6 +107,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml index 5cc8f4e3..77038f18 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml @@ -86,6 +86,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml index aa859783..d6f6337a 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml @@ -5,7 +5,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -113,6 +113,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml index 96300a5f..5ea2279a 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml @@ -90,6 +90,6 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index 32322d7f..ee007e91 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -1,8 +1,8 @@ - + - + @@ -18,27 +18,27 @@ - + - + - + - + - + - + - + @@ -57,19 +57,19 @@ - + - +