diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 4275d289..ef495343 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -166,16 +166,14 @@ function M:InitView(url) local btn_more_group = self._view:GetChild("btn_more_group") btn_more_group.onClick:Set(function() - --self.groupMainView._view.visible = true ViewUtil.ShowModalWait(self._root_view, "请稍等,获取牌友圈中...") local enterGroupCallBackFunc = function(code) ViewUtil.CloseModalWait() if code == 0 then self.groupMainView._view.visible = true - else - ViewUtil.ErrorTip(10000000, "获取牌友圈失败,请检查网络设置!") + ViewUtil.ErrorTip(code, "获取牌友圈失败,请检查网络设置!") Application.Quit() printlog("获取圈子数据失败=======>>>>") end diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua index 5847156c..e73154bb 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua @@ -292,7 +292,7 @@ function M:Show(fg_id, callback) end else if callback then - callback(-1) + callback(res.ReturnCode) end end end) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua index 2a359f3f..67521e01 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua @@ -262,9 +262,6 @@ function M:OnEventQIPAI(evt_data) local card = evt_data["card"] local p = self._room:GetPlayerBySeat(seat) self._cacheEvent:Enqueue(function() - if self._callback_popEvent then - self._callback_popEvent(true) - end local _room = self._room if (not p.outcard_list) then p.outcard_list = {} end p.outcard_list[#p.outcard_list + 1] = card diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index e8d204a5..9d93bf2b 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -310,7 +310,7 @@ function M:EventInit() self:PlaySound(p.self_user.sex, 'F_' .. card) coroutine.start( function() - coroutine.wait(0.56) + coroutine.wait(0.16) self._popEvent = true end ) @@ -497,12 +497,12 @@ function M:EventInit() local card = arg[2] local p = _room:GetPlayerBySeat(seat) local info = self._player_card_info[self:GetPos(seat)] - info:PlayingOutCardAnima(card, self:GetPos(seat)) coroutine.start( function() - coroutine.wait(0.2) - -- self._popEvent = true + coroutine.wait(0.5) + self._popEvent = true -- info:ClearOutCard() + info:PlayingOutCardAnima(card, self:GetPos(seat)) p.DiceCard = 0 info:UpdateQiPai(p.outcard_list, false, seat) end