diff --git a/lua_probject/extend_project/extend/majiang/nancheng/MJPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/majiang/nancheng/MJPlayerSelfCardInfoView.lua index 92f236c0..0b215082 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/MJPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/MJPlayerSelfCardInfoView.lua @@ -15,21 +15,21 @@ function M.new(view, mainView) return self end -function M:ShowHuTip(card_list) - printlog("ShowHuTip") - local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui, - DataManager.CurrenRoom.room_config.Laizi) - if #tingList > 0 then - if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then - for i = 1, #DataManager.CurrenRoom.laiziInfo do - if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then - table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i]) - end - end - end - end - self._mainView._hu_tip:FillData(tingList) -end +-- function M:ShowHuTip(card_list) +-- printlog("ShowHuTip") +-- local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui, +-- DataManager.CurrenRoom.room_config.Laizi) +-- if #tingList > 0 then +-- if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then +-- for i = 1, #DataManager.CurrenRoom.laiziInfo do +-- if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then +-- table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i]) +-- end +-- end +-- end +-- end +-- self._mainView._hu_tip:FillData(tingList) +-- end function M:UpdateHandCard(getcard, mp) MJPlayerSelfCardInfoView.UpdateHandCard(self, getcard, mp) @@ -108,103 +108,104 @@ function M:UpdateHandCard(getcard, mp) -- end end -function M:__OnClickHandCard(context) - local button = context.sender - local _carViewList = self._carViewList - local refresh = true - local card_list = {} - for i = 1, #_carViewList do - local btn = _carViewList[i].card - local card = self:GetCard(btn) - if btn ~= button and btn.selected == true then - if button.data.card_item == card then - refresh = false - else - self._mainView:markOutCards(false, card) - end - btn.selected = false - end - if not btn.selected then - table.insert(card_list, card) - end - end +-- function M:__OnClickHandCard(context) +-- local button = context.sender +-- local _carViewList = self._carViewList +-- local refresh = true +-- local card_list = {} +-- for i = 1, #_carViewList do +-- local btn = _carViewList[i].card +-- local card = self:GetCard(btn) +-- if btn ~= button and btn.selected == true then +-- if button.data.card_item == card then +-- refresh = false +-- else +-- self._mainView:markOutCards(false, card) +-- end +-- btn.selected = false +-- end +-- if not btn.selected then +-- table.insert(card_list, card) +-- end +-- end - if self._out_card then - -- self:ShowHuTip(card_list) - end +-- if self._out_card then +-- -- self:ShowHuTip(card_list) +-- end - -- 标记出牌 - if refresh then - if button.selected then - self._mainView:markOutCards(true, button.data.card_item) - else - self._mainView:markOutCards(false, button.data.card_item) - end - end +-- -- 标记出牌 +-- if refresh then +-- if button.selected then +-- self._mainView:markOutCards(true, button.data.card_item) +-- else +-- self._mainView:markOutCards(false, button.data.card_item) +-- end +-- end - local _room = DataManager.CurrenRoom - if not button.selected and _room.curren_outcard_seat == _room.self_player.seat then - local card = button.data - self._mainView:OutCard(card.card_item) - end -end +-- local _room = DataManager.CurrenRoom +-- if not button.selected and _room.curren_outcard_seat == _room.self_player.seat then +-- local card = button.data +-- self._mainView:OutCard(card.card_item) +-- end +-- end -function M:__OnDragStart(card) - local card_list = membe_clone(DataManager.CurrenRoom.self_player.card_list) - list_remove(card_list, card) - -- self:ShowHuTip(card_list) -end +-- function M:__OnDragStart(card) +-- local card_list = membe_clone(DataManager.CurrenRoom.self_player.card_list) +-- list_remove(card_list, card) +-- -- self:ShowHuTip(card_list) +-- end -function M:__OnDragEnd(context) - if self.outcard_button then - self.outcard_button:Dispose() - self.outcard_button = nil - end - local button = context.sender +-- function M:__OnDragEnd(context) +-- if self.outcard_button then +-- self.outcard_button:Dispose() +-- self.outcard_button = nil +-- end +-- local button = context.sender - --button:RemoveFromParent() - local card = button.data - local _room = DataManager.CurrenRoom +-- --button:RemoveFromParent() +-- local card = button.data +-- local _room = DataManager.CurrenRoom - -- -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat) - if (button.y - card.old_postion.y < -50 and _room.curren_outcard_seat == _room.self_player.seat and card.card_item ~= 0) then - self._mainView:OutCard(card.card_item) - button.touchable = false - self.outcard_button = button - else - self._area_handcard_list:AddChildAt(button, card.index) - button:TweenMove(card.old_postion, 0.2) - end -end +-- -- -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat) +-- if (button.y - card.old_postion.y < -50 and _room.curren_outcard_seat == _room.self_player.seat and card.card_item ~= 0) then +-- self._mainView:OutCard(card.card_item) +-- button.touchable = false +-- self.outcard_button = button +-- else +-- self._area_handcard_list:AddChildAt(button, card.index) +-- button:TweenMove(card.old_postion, 0.2) +-- end +-- end -function M:CheckPlayerOnlineState() - local room = DataManager.CurrenRoom - for i = 1, #room.player_list do - if room.player_list[i].line_state == 0 then - return false - end - end - return true -end +-- function M:CheckPlayerOnlineState() +-- local room = DataManager.CurrenRoom +-- for i = 1, #room.player_list do +-- if room.player_list[i].line_state == 0 then +-- return false +-- end +-- end +-- return true +-- end function M:Clear(bskip) + MJPlayerSelfCardInfoView.Clear(self) --self._ctr_state.selectedIndex = 0 - self._area_fz_list.x = self._src_fz_list.x - self._area_fz_list.y = self._src_fz_list.y - self._area_fz_list.width = self._src_fz_list.z - self._area_fz_list.height = self._src_fz_list.w + -- self._area_fz_list.x = self._src_fz_list.x + -- self._area_fz_list.y = self._src_fz_list.y + -- self._area_fz_list.width = self._src_fz_list.z + -- self._area_fz_list.height = self._src_fz_list.w - self._area_fz_list:RemoveChildren(0, -1, true) - self._area_handcard_list:RemoveChildren(0, -1, true) - self._area_outcard_list:RemoveChildren(0, -1, true) - if bskip == nil or bskip == false then - self._mask_liangpai:RemoveChildren(0, -1, true) - end + -- self._area_fz_list:RemoveChildren(0, -1, true) + -- self._area_handcard_list:RemoveChildren(0, -1, true) + -- self._area_outcard_list:RemoveChildren(0, -1, true) + -- if bskip == nil or bskip == false then + -- self._mask_liangpai:RemoveChildren(0, -1, true) + -- end - for i = 1, #self._carViewList do - self._carViewList[i].card:Dispose() - end - self._carViewList = {} + -- for i = 1, #self._carViewList do + -- self._carViewList[i].card:Dispose() + -- end + -- self._carViewList = {} end return M