Parcourir la source

c-添加大礼物动画

poppin_leaf il y a 1 mois
Parent
commit
7e4cf255d5

+ 1 - 1
module_base/src/main/java/com/yc/module_base/manager/GiftManager.kt

@@ -221,7 +221,7 @@ object GiftManager : MainScopeDelegate {
         for (giftGroup in groups) {
             if (giftGroup.groupGiftList.isNullOrEmpty()) continue
             for (gift in giftGroup.groupGiftList) {
-                if (gift.giftType == GiftType.LUXURY_GIFT.type || gift.giftType == GiftType.BIG_GIFT.type || giftGroup.groupId == 6666L) {
+                if (gift.giftType == GiftType.LUXURY_GIFT.type || gift.giftType == GiftType.BIG_GIFT.type || gift.giftType == GiftType.NORMAL_GIFT.type || giftGroup.groupId == 6666L) {
                     allBigGiftList.add(gift)
                 }
                 allGiftList.add(gift)

+ 2 - 2
module_live/src/main/java/com/yc/module_live/view/live/livetop/TopLiveLayerFragment.kt

@@ -941,11 +941,11 @@ class TopLiveLayerFragment : TopLiveLayerClickFragment<TopLayerVm>(),
         gift?.let {
             if (it.giftType == GiftType.LUXURY_GIFT.type && LiveSession.getIsOpenSpecial()) {
                 bigGiftView.addGiftList(it)
-            } else if (it.luckyMulti >= 500 && LiveSession.getIsOpenSpecial()) {
+            } else if (it.luckyMulti >= 500 && gift.roomId == viewModel.room?.roomId && LiveSession.getIsOpenSpecial()) {
                 val luckyGift: Gift? = GiftManager.allGiftList.find {
                     it.giftId == gift.giftId
                 }
-                if (luckyGift != null && luckyGift.price > 5000) {
+                if (luckyGift != null) {
                     bigGiftView.addGiftList(it)
                 }
             } else if (it.giftType == GiftType.BIG_GIFT.type && LiveSession.getIsOpenSpecial()) {