diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua index 6f5335d2..996d8371 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua @@ -118,9 +118,9 @@ function M:OnEventSendCards(evt_data) local p = _room.self_player local seat = evt_data["bank_seat"] local jing = evt_data["jing"] + _room.jing = jing self._cacheEvent:Enqueue(function() _room.banker_seat = seat - _room.jing = jing for i = 1, #_room.player_list do _room.player_list[i].hand_left_count = 13 _room.player_list[i].fz_list = {} @@ -245,11 +245,11 @@ function M:OnEventFzAction(evt_data) fz.active_card = actice_card if (index == -1) then if (ftype == FZType.Chi) then - local data = {} - data[1] = opcard[1] - data[2] = card - data[3] = opcard[2] - fz.opcard = data + local data = {} + data[1] = opcard[1] + data[2] = card + data[3] = opcard[2] + fz.opcard = data end p.fz_list[#p.fz_list + 1] = fz end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 0e21d7ef..54f3ca56 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -233,7 +233,6 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction)) _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...) - print("==============================================ZPHuCard") self._left_time = 0 self:UpdateCardBox(0) self:__CloseTip() @@ -244,17 +243,11 @@ function M:EventInit() local win_card = arg[3] local cards = arg[4] local win_list = arg[5] - print("==============================================ZPHuCard1", win_seat, lose_seat, win_card, win_list) local index = self:GetPos(win_seat) - print("==============================================ZPHuCard2") local info = self._player_card_info[index] - print("==============================================ZPHuCard3") self:RemoveCursor() - print("==============================================ZPHuCard4") info:UpdateHandCard(true, true) - print("==============================================ZPHuCard5") - local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card") obj_win_card.icon = "ui://Main_Majiang/202_" .. win_card obj_win_card:GetController("bg").selectedIndex = 1 diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index cc6216ca..6a3bb639 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -117,10 +117,10 @@ function M:GetPrefix() end function M:fillCard(obj, pos_str, card, use3d) - -- print("=======================================jing", card, DataManager.CurrenRoom.jing) - -- if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing then - -- obj:GetController('jing').selectedIndex = 1 - -- end + print("=======================================jing", card, DataManager.CurrenRoom.jing) + if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing then + obj:GetController('jing').selectedIndex = 1 + end if self._current_card_type == 2 and (use3d == nil or use3d == true) then obj.icon = 'ui://MajiangCard3d/' .. 'b' .. pos_str .. card else