diff --git a/Main_RunBeard.fairypackage b/Main_RunBeard.fairypackage deleted file mode 100644 index ad67921c..00000000 Binary files a/Main_RunBeard.fairypackage and /dev/null differ diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index e7d01880..a70fbc37 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -32,7 +32,6 @@ function M:init() self.Fix_Msg_Chat = ViewUtil.Fix_Msg_Chat -- 自动回复消息列表 self.Fix_Msg_Chat2 = nil -- 自动回复列表2 self._gamectr:SetPopCallback(function(falg) - print("lingmeng self._popEvent", falg) self._popEvent = falg end) self:InitView() @@ -999,22 +998,18 @@ function M:OnUpdate() if (self._popEvent) then local func = self._gamectr:PopEvent() if (func ~= nil) then - print("lingmeng self._popEvent1", self._popEvent) if self._flag_fanpaofa then self._popEvent = false end - print("lingmeng self._popEvent2", self._popEvent) local result, resultInfo = pcall(func) if result then else - print("lingmeng error", resultInfo) self._gamectr = ControllerManager.GetController(GameController) if self._gamectr then self._gamectr:ResetConnect() end end - print("lingmeng self._popEvent3", self._popEvent) --func() end end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua index 06290451..7a7c824f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua @@ -236,9 +236,9 @@ end -- 填充体力值详情对象 function M:OnRenderItem(index, obj) local data = self.hp_log[index + 1] - print("lingmeng render", self.group_id, data.pid, DataManager.groups:get(self.group_id), - DataManager.groups:get(self.group_id):getPlay(data.pid)) - pt(DataManager.groups:get(self.group_id).playList) + -- print("lingmeng render", self.group_id, data.pid, DataManager.groups:get(self.group_id), + -- DataManager.groups:get(self.group_id):getPlay(data.pid)) + -- pt(DataManager.groups:get(self.group_id).playList) local play = DataManager.groups:get(self.group_id):getPlay(data.pid) obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(self.member.nick) obj:GetChild("tex_id").text = string.format("ID:%s", ViewUtil.stringEllipsis(self.member.uid)) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua index 737f4103..6fe5098b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -25,7 +25,7 @@ function M:initData() local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) self.begin_time = today self.end_time = today + 86400 - print("lingmeng initData") + -- print("lingmeng initData") self:GetRecordData(0) --self:ShowPeopleNum() end @@ -138,7 +138,7 @@ function M:InitView() end ctr_search.selectedIndex = 1 ViewUtil.CloseModalWait() - print("lingmeng record_data_find", #self.record_data_find) + -- print("lingmeng record_data_find", #self.record_data_find) self.lst_record_find.numItems = #self.record_data_find else ViewUtil.CloseModalWait() @@ -448,7 +448,7 @@ function M:OnRenderRecordItem(index, obj) if self._view:GetController('search').selectedIndex == 1 then dataList = self.record_data_find end - print("lingmeng dataList", #dataList) + -- print("lingmeng dataList", #dataList) local data = dataList[index + 1] self:FillRecordItem2(data, obj) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua index 7f533189..6437144c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua @@ -372,7 +372,7 @@ function M:OnShowRecordInfo(rdata, ids) if group.lev == 1 then DataManager.CurrenRoom.self_player = DataManager.CurrenRoom:GetPlayerBySeat(rdata.seat) end - printlog("lingmeng seat", DataManager.CurrenRoom.self_player.seat) + -- printlog("lingmeng seat", DataManager.CurrenRoom.self_player.seat) -- if DataManager.SelfUser.playback[playback_id] ~= nil then -- DataManager.SelfUser.playback[playback_id][i] = data -- else diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index ed0e779b..88f8fd9d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -153,7 +153,7 @@ function M:OnRenderRewardsItem(index, obj) if data.rewardValueType == 2 then tem = ad2d(tem) end - print("lingmeng setpilai", tem, data.max_value) + -- print("lingmeng setpilai", tem, data.max_value) if tem > data.max_value then ViewUtil.ErrorTip(nil, "输入值超过上限") return diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua index 34c68f49..b1a7c14c 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua @@ -134,7 +134,7 @@ function M:OnEventXiPaiAnim(evt_data) end function M:SendCard(cards, currentCard) - print("lingmengSendCard", os.time()) + -- print("lingmengSendCard", os.time()) local _data = {} _data["card"] = cards _data["all_card"] = currentCard diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua index 2ceb68db..2a359f3f 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXGameController.lua @@ -279,9 +279,6 @@ function M:OnEventTakeCard(evt_data) local left_count = evt_data["left_count"] local p = _room:GetPlayerBySeat(seat) self._cacheEvent:Enqueue(function() - if self._callback_popEvent then - self._callback_popEvent(true) - end if card ~= 0 then p.DiceCard = card end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index bae7d614..e8d204a5 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -303,27 +303,22 @@ function M:EventInit() self._tex_LeftCard.text = '剩余 ' .. _leftcard .. ' 张牌' local info = self._player_card_info[self:GetPos(seat)] - print("lingmeng GetCard1") info:UpdateOutCardList(card, true, true, self:GetPos(seat)) if card ~= 0 then local p = _room:GetPlayerBySeat(seat) - print("lingmeng baopai") -- self:PlaySound(p.self_user.sex, 'F_SaoChuan') self:PlaySound(p.self_user.sex, 'F_' .. card) - print("lingmeng GetCard2", os.time()) coroutine.start( function() - coroutine.wait(0.5) - -- self._popEvent = true + coroutine.wait(0.56) + self._popEvent = true end ) else - print("lingmeng GetCard3", os.time()) coroutine.start( function() - coroutine.wait(0.5) - print("lingmeng GetCard3-1", os.time()) - -- self._popEvent = true + coroutine.wait(0.16) + self._popEvent = true -- info:ClearOutCard() end ) @@ -333,7 +328,6 @@ function M:EventInit() _gamectr:AddEventListener( GameEvent.AddCard, function(...) - print("lingmeng AddCard", self._popEvent) local arg = { ... } local seat = arg[1] local card = arg[2] @@ -1271,7 +1265,6 @@ function M:OnFangziAction(...) coroutine.start( function() - print("lingmeng OnFangziAction", time, os.time()) coroutine.wait(time) self._popEvent = true local info = _player_card_info[1] diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index a56b9c98..634ba2b2 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -407,27 +407,27 @@ function M:playAnim(fzitem, fzcards, size, i, ispaly, flag_pengPao) if (ispaly and i == size and not flag_pengPao) then local fristCard = self.card_list[1].btn_card print("lingmeng btn_card", self.card_list[1].index_X) - self._area_handcard_list:AddChild(fzcards) + -- self._area_handcard_list:AddChild(fzcards) fzcards:SetPivot(0.5, 0.5) fzcards.rotation = 180 fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) - ---[[ + --[[ fzcards:TweenMove( self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - self._area_handcard_list.xy, 0.2) fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) --]] - - ---[[ - coroutine.start( - function() - coroutine.wait(0.21) fzcards:RemoveFromParent() fzcards.xy = Vector2.zero fzcards.rotation = 0 fzcards:SetScale(1, 1) fzitem:AddChild(fzcards) self._area_fz_list:AddChildAt(fzitem, 0) + --[[ + coroutine.start( + function() + coroutine.wait(0.21) + end ) --]] diff --git a/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua index ba3bc575..f83ff601 100644 --- a/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua @@ -284,8 +284,8 @@ function M:UpdateHandCards(list) self.outcard_button = nil local CountCards = {} - print("lingmengUpdateHandCards") - pt(list) + -- print("lingmengUpdateHandCards") + -- pt(list) for i = 1, #list do CountCards[list[i].index_X] = CountCards[list[i].index_X] == nil and 1 or CountCards[list[i].index_X] + 1 end diff --git a/lua_probject/tolua_project/System/coroutine.lua b/lua_probject/tolua_project/System/coroutine.lua index a57a069a..900b3e28 100644 --- a/lua_probject/tolua_project/System/coroutine.lua +++ b/lua_probject/tolua_project/System/coroutine.lua @@ -69,11 +69,8 @@ end function coroutine.step(t, co, ...) local args = { ... } - print("lingmeng incon1", t, co) co = co or running() - print("lingmeng incon2", t, co) local timer = nil - print("lingmeng incon3", t, co) local action = function() local flag, msg = resume(co, unpack(args)) @@ -83,12 +80,9 @@ function coroutine.step(t, co, ...) return end end - print("lingmeng incon4", t, co) timer = FrameTimer.New(action, t or 1, 1) - print("lingmeng incon5", t, co) comap[co] = timer timer:Start() - print("lingmeng incon6", t, co) return yield() end diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png new file mode 100644 index 00000000..4410d0db Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png new file mode 100644 index 00000000..e921c960 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png new file mode 100644 index 00000000..4416f295 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png new file mode 100644 index 00000000..cef6e1ef Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes new file mode 100644 index 00000000..bd66e581 Binary files /dev/null and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/Btn_chat.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/Btn_chat.xml index a4046893..746ea839 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/Btn_chat.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/Btn_chat.xml @@ -3,8 +3,8 @@ - - + +