先提交

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
 
 -- 显示原因文本

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
 

wb_new_ui/assets/Lobby/package.xml

@@ -681,8 +681,9 @@
     <image id="yvb27e26" name="puke_00037.png" path="/images/clip_createRoom/" exported="true"/>
     <image id="yvb27e27" name="puke_00047.png" path="/images/clip_createRoom/" exported="true"/>
     <image id="yvb27e28" name="puke_00060.png" path="/images/clip_createRoom/" exported="true"/>
+    <component id="st2l7e29" name="pop_notice(1).xml" path="/component/notice/"/>
   </resources>
-  <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2" maxAtlasSize="8192">
+  <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>
   </publish>
 </packageDescription>