diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index 243f6f4b..9b2bf781 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -62,7 +62,7 @@ function M:init(name) self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_FAIL] = self.OnEventDismissRoomFail self._eventmap[Protocol.GAME_EVT_INTERACTION] = self.OnEventInteraction - self._eventmap[Protocol.GAME_EVT_UPDATE_GPS] = self.OnEventUpdateGPS + -- self._eventmap[Protocol.GAME_EVT_UPDATE_GPS] = self.OnEventUpdateGPS self._eventmap[Protocol.GAME_EVT_KICKED] = self.OnEventKicked self._eventmap[Protocol.GAME_EVT_UPDATE_PLAYERINFO] = self.OnEvtUpdateInfo @@ -395,8 +395,8 @@ function M:OnEventUpdateGPS(evt_data) if seat == 0 or seat == 'skip' then return end - local p = self._room:GetPlayerBySeat(seat) - p.self_user.location = Location.new(pos) + -- local p = self._room:GetPlayerBySeat(seat) + -- p.self_user.location = Location.new(pos) end ) end diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua index 0a84a7a1..807e5185 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupFastGamesView.lua @@ -31,7 +31,6 @@ function M:FillView() self.lst_allplays.itemRenderer = function(index, obj) self:OnRenderAllPlaysItem(index, obj, self.showid) end - printlog(self.showid) self:GetFlagPlaysData(self.showid) end diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png index 29ccdfb2..431ea053 100644 Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/洗牌.png differ diff --git a/wb_new_ui/assets/Main_Majiang/buttons/Group 646.png b/wb_new_ui/assets/Main_Majiang/buttons/Group 646.png index 5b3f5b9d..431ea053 100644 Binary files a/wb_new_ui/assets/Main_Majiang/buttons/Group 646.png and b/wb_new_ui/assets/Main_Majiang/buttons/Group 646.png differ diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml index 7dc8ef8e..d61f924c 100644 --- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml @@ -24,9 +24,9 @@ - + - + @@ -53,7 +53,7 @@ - + @@ -79,7 +79,7 @@ - +