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 7a7c824f..d1d64e15 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua @@ -105,7 +105,7 @@ function M:GetFilter() filter = filter + tem end end - return btn_all.selected and 1 or filter + return btn_all.selected and 251 or filter end -- 显示原因文本 diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 9286c6b5..3b7825a7 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -735,7 +735,7 @@ function M:__FangziTip(tip, _uid, fptype) end if fpao and zdhu then - self:PlaySound(p.self_user.sex, 'F_DianPao') + -- self:PlaySound(p.self_user.sex, 'F_DianPao') _gamectr:SendAction(tip_id) _chipeng_tip:Dispose() self._chipeng_tip = nil @@ -1089,20 +1089,24 @@ function M:OnFangziAction(...) ) end -- if false then + local sound_name = "" + local effect = UIPackage.CreateObject('Main_RunBeard', 'FzEffect') + local info = _player_card_info[self:GetPos(player.seat)] + local pNode = info._mask_liangpai + if fz.type ~= RB_FZType.Kan and fz.type ~= RB_FZType.Bi then --printlog("jefe self RB_FZType 2=======") - local info = _player_card_info[self:GetPos(player.seat)] - local pNode = info._mask_liangpai - local effect = UIPackage.CreateObject('Main_RunBeard', 'FzEffect') if fz.type == RB_FZType.Peng then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "peng") - self:PlaySound(player.self_user.sex, 'F_Peng') + -- self:PlaySound(player.self_user.sex, 'F_Peng') + sound_name = 'F_Peng' effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'peng') elseif fz.type == RB_FZType.Chi then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "chi") --printlog("jefe self RB_FZType 3=======") - self:PlaySound(player.self_user.sex, 'F_Chi') + -- self:PlaySound(player.self_user.sex, 'F_Chi') + sound_name = 'F_Chi' effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'chi') --printlog("jefe self RB_FZType 4=======") elseif fz.type == RB_FZType.Wei then @@ -1115,7 +1119,9 @@ function M:OnFangziAction(...) -- function() -- coroutine.wait(1.0) -- info:PlayingOutCardAnima() - self:PlaySound(player.self_user.sex, 'F_Sao') + -- self:PlaySound(player.self_user.sex, 'F_Sao') + sound_name = 'F_Sao' + effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei') -- effect.touchable = false -- effect.x, effect.y = -250, -200 @@ -1137,7 +1143,9 @@ function M:OnFangziAction(...) -- function() -- coroutine.wait(1.2) -- info:PlayingOutCardAnima() - self:PlaySound(player.self_user.sex, 'F_Sao') + -- self:PlaySound(player.self_user.sex, 'F_Sao') + sound_name = 'F_Sao' + effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'wei') -- effect.touchable = false -- effect.x, effect.y = -250, -200 @@ -1153,12 +1161,16 @@ function M:OnFangziAction(...) -- ) elseif fz.type == RB_FZType.Pao then -- effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "pao") - self:PlaySound(player.self_user.sex, 'F_KaiDuo') + -- self:PlaySound(player.self_user.sex, 'F_KaiDuo') + sound_name = 'F_KaiDuo' + effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'pao') elseif fz.type == RB_FZType.Ti then -- self:PlaySound(player.self_user.sex, 'F_' .. fz.card) -- info:UpdateOutCardList(fz.card, true, true, fz.from_seat) - self:PlaySound(player.self_user.sex, 'F_SaoChuan') + -- self:PlaySound(player.self_user.sex, 'F_SaoChuan') + sound_name = 'F_SaoChuan' + effect:GetChild('icon1').icon = UIPackage.GetItemURL('Main_RunBeard', 'ti') -- effect.touchable = false -- effect.x, effect.y = -250, -200 @@ -1168,7 +1180,7 @@ function M:OnFangziAction(...) -- -- function() -- -- coroutine.wait(1.2) -- print("lingmeng tiqi") - + -- -- info:PlayingOutCardAnima() -- -- end) @@ -1182,16 +1194,6 @@ function M:OnFangziAction(...) end -- if fz.type ~= RB_FZType.Wei and fz.type ~= RB_FZType.ChouWei then - effect.touchable = false - effect.x, effect.y = -250, -200 - effect:GetTransition('t0'):Play() - pNode:AddChild(effect) - coroutine.start( - function() - coroutine.wait(0.66) - effect:Dispose() - end - ) -- end end if (player == self._room.self_player) then @@ -1207,12 +1209,24 @@ function M:OnFangziAction(...) if fz.type ~= RB_FZType.Kan then local time = 0.01 if fz.type == RB_FZType.Pao or fz.type == RB_FZType.Ti or fz.type == RB_FZType.Wei or fz.type == RB_FZType.ChouWei then - time = 0.8 + time = 0.66 end local removeOutcard = _player_card_info[self:GetPos(fz.from_seat)] coroutine.start( function() coroutine.wait(time) + ------将特效移动到这 + effect.touchable = false + effect.x, effect.y = -250, -200 + effect:GetTransition('t0'):Play() + pNode:AddChild(effect) + coroutine.start( + function() + coroutine.wait(0.66) + effect:Dispose() + end + ) + -------------- local p = self._room:GetPlayerBySeat(fz.from_seat) if p.DiceCard ~= nil and fz.active_card == p.DiceCard then local outCard @@ -1249,6 +1263,7 @@ function M:OnFangziAction(...) coroutine.wait(0.2 + time) -- removeOutcard:ClearOutCard() info:UpdateFzList(player.fz_list, true, player.seat, flag_pengPao) --更新放子数组 + self:PlaySound(player.self_user.sex, sound_name) end ) end @@ -1263,7 +1278,7 @@ function M:OnFangziAction(...) local time = 0.01 if fz.type ~= RB_FZType.Kan then if fz.type == RB_FZType.Pao or fz.type == RB_FZType.Ti or fz.type == RB_FZType.Wei or fz.type == RB_FZType.ChouWei then - time = time + 0.8 + time = time + 0.66 end end diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index e078dbbb..85f03107 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index f8239774..8d46756e 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ 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 index 8122a627..4410d0db 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png 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 index 15f2dbf8..e921c960 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png 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 index bc07b6f1..4416f295 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png 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 index 0fd687a2..cef6e1ef 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png 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 index 2721be6a..bd66e581 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png index 264250a7..743eac91 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png index 97e3cd5a..c1042649 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png index 998d2e45..96794687 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png index 24dfac85..17776330 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png index c1441f57..4077b487 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png index 64132595..21dde2c5 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png index cab171e9..8df0760c 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png index 7e76fd6b..70b3e020 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes index 0b6704df..4e9249b3 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index ab4b6654..78256ea4 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index bc8e7399..ccec90a3 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml index d46a1e76..2a34f355 100644 --- a/wb_new_ui/assets/Lobby/package.xml +++ b/wb_new_ui/assets/Lobby/package.xml @@ -681,8 +681,9 @@ + - + \ No newline at end of file