Merge branch 'master' into lps/fixBug.2025.7.1-M

master
DESKTOP-7R8JEQQ\k 2025-07-02 17:19:54 +08:00
commit 1f597d037d
1 changed files with 2 additions and 1 deletions

View File

@ -215,7 +215,8 @@ function M:__OnDragEnd(context)
local xy = self._view_handCardList:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) local xy = self._view_handCardList:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
local cardHeight = button.height local cardHeight = button.height
if ((xy.y < -35 or (self.ischoose and self._ctr_seletedGet.selectedIndex == 0) or (context.inputEvent.y - self.touchPos.y < -cardHeight * 0.2)) and _room.curren_outcard_seat == _room.self_player.seat) then if ((xy.y < -35 or (context.inputEvent.y - self.touchPos.y < -cardHeight * 0.2)) and _room.curren_outcard_seat == _room.self_player.seat) then
-- if ((xy.y < -35 or (self.ischoose and self._ctr_seletedGet.selectedIndex == 0) or (context.inputEvent.y - self.touchPos.y < -cardHeight * 0.2)) and _room.curren_outcard_seat == _room.self_player.seat) then
self._mainView:OutCard(card.card_item) self._mainView:OutCard(card.card_item)
self.outcard_button = button self.outcard_button = button
self:ClearChoose() self:ClearChoose()