diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/AllServiceLuckGiftDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/AllServiceLuckGiftDialog.kt
index 22c4850a8..40bd0c0e5 100644
--- a/app/src/main/java/com/chwl/app/avroom/dialog/AllServiceLuckGiftDialog.kt
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/AllServiceLuckGiftDialog.kt
@@ -11,6 +11,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.app.utils.NumberUtils
 import com.chwl.core.gift.bean.LuckyGiftMsgAllBean
 import com.chwl.core.gift.bean.MsgSuperLuckyGift
+import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.praise.PraiseModel
 import com.chwl.core.room.bean.RoomInfo
 import com.chwl.core.room.model.AvRoomModel
@@ -58,23 +59,15 @@ class AllServiceLuckGiftDialog(
                 override fun onOk() {
                     mDialogManager?.dismissDialog()
                     luckyGiftMsgBean?.roomUid?.let {
-                        AvRoomModel.get().exitRoom(object : com.chwl.library.net.rxnet.callback.CallBack<RoomInfo?> {
-                            override fun onSuccess(data: RoomInfo?) {
-                                AVRoomActivity.start(context, it)
-                            }
-                            override fun onFail(code: Int, error: String?) {
-                            }
-                        })
+                        if (AvRoomDataManager.get().roomUid != it) {
+                            AVRoomActivity.start(context, it)
+                        }
                     }
                 }
             })
 
         }
-    }
 
-    override fun show() {
-        super.show()
-        init()
     }
 
     var mCallBack : CallBack? = null
@@ -83,7 +76,7 @@ class AllServiceLuckGiftDialog(
     }
 
     override fun dismissDialog() {
-        hide()
+        super.dismissDialog()
         mCallBack?.onHide()
     }
 
diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java
index 476741f33..08ab68ce2 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java
@@ -34,6 +34,7 @@ import com.chwl.core.auth.AuthModel;
 import com.chwl.core.gift.bean.LuckyGiftMsgAllBean;
 import com.chwl.core.gift.bean.LuckyGiftMsgSelfBean;
 import com.chwl.core.gift.bean.MsgSuperLuckyGift;
+import com.chwl.core.gift.bean.Sender;
 import com.chwl.core.utils.ComboUtil;
 import com.chwl.app.ui.utils.ImageLoadUtilsV2;
 import com.chwl.app.ui.widget.GiftComboButtonView;
@@ -697,7 +698,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
     }
 
 
-    AllServiceLuckGiftDialog allServiceLuckGiftDialog;
     private void onLuckyGiftMsg(RoomEvent roomEvent) {
         MsgSuperLuckyGift msgSuperLuckyGift = roomEvent.getMsgSuperLuckyGift();
         if (msgSuperLuckyGift != null) {
@@ -761,20 +761,35 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
         }, 2300);
     }
 
+    AllServiceLuckGiftDialog allServiceLuckGiftDialog;
     private void showLuckyGiftDlg(LuckyGiftMsgAllBean luckyGiftMsgAllBean){
-        if (allServiceLuckGiftDialog != null && allServiceLuckGiftDialog.isShowing()) {
-            mLuckyGiftList.add(luckyGiftMsgAllBean);
-            return;
+        LogUtils.d(" LuckyGiftDlg -- showLuckyGiftDlg() ");
+        mLuckyGiftList.add(luckyGiftMsgAllBean);
+        if (!(allServiceLuckGiftDialog != null && allServiceLuckGiftDialog.isShowing())) {
+            LuckyGiftMsgAllBean data = mLuckyGiftList.remove(0);
+            LogUtils.d(" LuckyGiftDlg -- showLuckyGiftDlg() -> showLuckyGiftDialog"+mLuckyGiftList.size());
+            showLuckyGiftDialog(data);
         }
+    }
+    private void showLuckyGiftDialog(LuckyGiftMsgAllBean luckyGiftMsgAllBean){
+        LogUtils.d(" LuckyGiftDlg -- showLuckyGiftDialog() ");
         allServiceLuckGiftDialog = new AllServiceLuckGiftDialog(requireContext());
         allServiceLuckGiftDialog.setLuckyGiftMsgBean(luckyGiftMsgAllBean);
         allServiceLuckGiftDialog.setMCallBack(new AllServiceLuckGiftDialog.CallBack() {
             @Override
             public void onHide() {
-                if (!mLuckyGiftList.isEmpty()){
-                    LuckyGiftMsgAllBean data = mLuckyGiftList.remove(0);
-                    showLuckyGiftDlg(data);
-                }
+                LogUtils.d(" LuckyGiftDlg -- showLuckyGiftDialog() ->onHide");
+                gameMainBinding.getRoot().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        LogUtils.d(" LuckyGiftDlg -- showLuckyGiftDialog() ->onHide->postDelayed");
+                        if (!mLuckyGiftList.isEmpty()){
+                            LuckyGiftMsgAllBean data = mLuckyGiftList.remove(0);
+                            LogUtils.d(" LuckyGiftDlg -- showLuckyGiftDialog() ->onHide->postDelayed-> "+mLuckyGiftList.size());
+                            showLuckyGiftDialog(data);
+                        }
+                    }
+                },100);
             }
         });
         allServiceLuckGiftDialog.show();
diff --git a/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java b/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java
index 812b8d468..c6903b596 100644
--- a/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java
+++ b/app/src/main/java/com/chwl/app/avroom/widget/GiftV2View.java
@@ -266,6 +266,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
                     Point senderPoint = micViewPoint.get(senderPosition);
                     Point receivePoint = micViewPoint.get(receivePosition);
 
+                    // 连击 特殊动画
                     if (giftReceiveInfo.getUid() == AuthModel.get().getCurrentUid()){
                         if (ComboUtil.INSTANCE.isChangePoint()) {
                             senderPoint = ComboUtil.INSTANCE.getPoint();
@@ -694,6 +695,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
 
         long time;
         ObjectAnimator objectAnimator;
+        // 连击 特殊动画
         if (ComboUtil.INSTANCE.isChangePoint()  &&  giftInfo.uid == AuthModel.get().getCurrentUid()){
             objectAnimator = ObjectAnimator.ofPropertyValuesHolder(imageView, p2c, p3c, p1c, p0c);
             time = 1000;
diff --git a/app/src/main/java/com/chwl/app/ui/widget/GiftComboLayout.kt b/app/src/main/java/com/chwl/app/ui/widget/GiftComboLayout.kt
index c1f484e92..bf8eb2e55 100644
--- a/app/src/main/java/com/chwl/app/ui/widget/GiftComboLayout.kt
+++ b/app/src/main/java/com/chwl/app/ui/widget/GiftComboLayout.kt
@@ -2,6 +2,7 @@ package com.chwl.app.ui.widget
 
 import android.animation.ObjectAnimator
 import android.animation.PropertyValuesHolder
+import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Handler
@@ -251,7 +252,7 @@ class GiftComboLayout  @JvmOverloads constructor(
             sentUserName = giftInfo.nick
             sentAvatar = giftInfo.avatar
             receiverUserName = giftInfo.targetUsers?.getOrNull(0)?.nick?:""
-            receiverNumber = giftInfo.targetUsers?.size?:1
+            receiverNumber = giftInfo.targetUsers?.size?: giftInfo.targetUids?.size?: 1
             giftNumber = giftInfo.giftNum
             giftImgUrl = giftInfo.gift?.giftUrl?:""
             comboCount = giftInfo.comboCount
diff --git a/app/src/main/java/com/chwl/app/utils/GiftAnimUtil.java b/app/src/main/java/com/chwl/app/utils/GiftAnimUtil.java
index af9e4c34c..9471a079e 100644
--- a/app/src/main/java/com/chwl/app/utils/GiftAnimUtil.java
+++ b/app/src/main/java/com/chwl/app/utils/GiftAnimUtil.java
@@ -14,7 +14,7 @@ public class GiftAnimUtil {
 
     public static void showAnimation(View view) {
         // 透明度从0到1
-        ObjectAnimator fadeIn = ObjectAnimator.ofFloat(view, "alpha", 0f, 1f);
+        ObjectAnimator fadeIn = ObjectAnimator.ofFloat(view, "alpha", 1f, 1f);
         fadeIn.setDuration(1000);
 
         // 尺寸从0%到100%
diff --git a/app/src/main/res/anim/scale_number.xml b/app/src/main/res/anim/scale_number.xml
new file mode 100644
index 000000000..7fdc30b27
--- /dev/null
+++ b/app/src/main/res/anim/scale_number.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale
+        android:duration="500"
+        android:fromXScale="1.3"
+        android:fromYScale="1.3"
+        android:toXScale="1"
+        android:toYScale="1"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck.png b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck.png
index 884a338d9..e40dbdc73 100644
Binary files a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck.png and b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck_2.png b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck_2.png
new file mode 100644
index 000000000..cf678e359
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/all_service_gift_bg_luck_2.png differ
diff --git a/app/src/main/res/layout/all_service_luck_gift_dlg.xml b/app/src/main/res/layout/all_service_luck_gift_dlg.xml
index 919eeeb8a..9330635c1 100644
--- a/app/src/main/res/layout/all_service_luck_gift_dlg.xml
+++ b/app/src/main/res/layout/all_service_luck_gift_dlg.xml
@@ -12,143 +12,148 @@
 
     <ImageView
         android:id="@+id/bg"
-        android:layout_width="@dimen/dp_279"
-        android:layout_height="@dimen/dp_90"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_82"
+        android:layout_marginHorizontal="@dimen/dp_15"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:src="@drawable/all_service_gift_bg_luck"
-        android:orientation="horizontal"
+        android:background="@drawable/all_service_gift_bg_luck"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
+    <ImageView
+        android:id="@+id/bg2"
+        app:layout_constraintEnd_toEndOf="@+id/bg"
+        app:layout_constraintTop_toTopOf="@+id/bg"
+        android:src="@drawable/all_service_gift_bg_luck_2"
+        app:layout_constraintBottom_toBottomOf="@+id/bg"
+        android:layout_width="@dimen/dp_82"
+        android:layout_height="@dimen/dp_82"/>
+
+
+    <com.chwl.app.common.widget.CircleImageView
+        android:id="@+id/avatar"
+        android:layout_width="@dimen/dp_43"
+        android:layout_height="@dimen/dp_43"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_8"
+        android:src="@drawable/default_avatar"
+        app:layout_constraintBottom_toBottomOf="@+id/bg"
+        app:layout_constraintStart_toStartOf="@+id/bg"
+        app:layout_constraintTop_toTopOf="@+id/bg"
+        app:riv_border_color="#FFE375"
+        app:riv_border_width="1dp" />
+
+    <TextView
+        android:id="@+id/send"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/bg"
-        app:layout_constraintEnd_toEndOf="@id/bg"
-        app:layout_constraintStart_toStartOf="@id/bg"
-        app:layout_constraintTop_toTopOf="@id/bg">
+        android:layout_marginStart="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_2"
+        android:includeFontPadding="false"
+        android:text="@string/send"
+        android:textColor="@color/white"
+        android:textSize="14sp"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="@id/avatar" />
 
-        <com.chwl.app.common.widget.CircleImageView
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/dp_36"
-            android:layout_height="@dimen/dp_36"
-            android:layout_marginStart="@dimen/dp_9"
-            android:src="@drawable/default_avatar"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:riv_border_color="#FFE375"
-            app:riv_border_width="1dp" />
+    <TextView
+        android:id="@+id/giftName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_3"
+        android:includeFontPadding="false"
+        android:textColor="#ffffe375"
+        android:textSize="14sp"
+        app:layout_constraintStart_toEndOf="@id/send"
+        app:layout_constraintTop_toTopOf="@id/send"
+        app:layout_constraintBottom_toBottomOf="@id/send"
+        tools:text="Lucky travel" />
 
-        <TextView
-            android:id="@+id/send"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_9"
-            android:layout_marginTop="@dimen/dp_1"
-            android:includeFontPadding="false"
-            android:text="@string/send"
-            android:textColor="@color/white"
-            android:textSize="13sp"
-            app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintTop_toTopOf="@id/avatar" />
+    <TextView
+        android:id="@+id/win"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="@string/win"
+        android:textColor="@color/white"
+        android:layout_marginBottom="@dimen/dp_2"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@id/avatar"
+        app:layout_constraintStart_toStartOf="@id/send" />
 
-        <TextView
-            android:id="@+id/giftName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_3"
-            android:includeFontPadding="false"
-            android:textColor="#ffffe375"
-            android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/send"
-            app:layout_constraintTop_toTopOf="@id/send"
-            app:layout_constraintBottom_toBottomOf="@id/send"
-            tools:text="Lucky travel" />
-
-        <TextView
-            android:id="@+id/win"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:text="@string/win"
-            android:textColor="@color/white"
-            android:layout_marginBottom="@dimen/dp_1"
-            android:textSize="13sp"
-            app:layout_constraintBottom_toBottomOf="@id/avatar"
-            app:layout_constraintStart_toStartOf="@id/send" />
-
-        <TextView
-            android:id="@+id/winNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_2"
-            android:includeFontPadding="false"
-            android:textColor="#ffffe375"
-            android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/win"
-            app:layout_constraintTop_toTopOf="@id/win"
-            app:layout_constraintBottom_toBottomOf="@id/win"
-            tools:text="500" />
+    <TextView
+        android:id="@+id/winNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_2"
+        android:includeFontPadding="false"
+        android:textColor="#ffffe375"
+        android:textSize="14sp"
+        app:layout_constraintStart_toEndOf="@id/win"
+        app:layout_constraintTop_toTopOf="@id/win"
+        app:layout_constraintBottom_toBottomOf="@id/win"
+        tools:text="500" />
 
 
-        <TextView
-            android:id="@+id/times"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_2"
-            android:includeFontPadding="false"
-            android:text="@string/time"
-            android:textColor="@color/white"
-            android:textSize="13sp"
-            app:layout_constraintStart_toEndOf="@id/winNum"
-            app:layout_constraintBottom_toBottomOf="@id/winNum"
-            app:layout_constraintTop_toTopOf="@id/win" />
+    <TextView
+        android:id="@+id/times"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_2"
+        android:includeFontPadding="false"
+        android:text="@string/time"
+        android:textColor="@color/white"
+        android:textSize="14sp"
+        app:layout_constraintStart_toEndOf="@id/winNum"
+        app:layout_constraintBottom_toBottomOf="@id/winNum"
+        app:layout_constraintTop_toTopOf="@id/win" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/barrier"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        app:barrierDirection="end"
+        app:constraint_referenced_ids="giftName,times" />
+
+
+
+    <TextView
+        android:id="@+id/coinNum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="@dimen/dp_45"
+        android:includeFontPadding="false"
+        android:shadowColor="#ffa40e00"
+        android:layout_marginTop="@dimen/dp_3"
+        android:shadowDx="0"
+        android:gravity="center_horizontal"
+        android:shadowDy="1"
+        android:shadowRadius="3.0"
+        android:textColor="#ffffe375"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="@+id/bg2"
+        app:layout_constraintEnd_toEndOf="@+id/bg2"
+        app:layout_constraintTop_toTopOf="@+id/bg2"
+        app:layout_constraintBottom_toTopOf="@id/coins"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="1000k" />
+
+    <TextView
+        android:id="@+id/coins"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="@string/avroom_widget_messageview_027"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="@id/coinNum"
+        app:layout_constraintStart_toStartOf="@id/coinNum"
+        app:layout_constraintTop_toBottomOf="@id/coinNum"
+        app:layout_constraintBottom_toBottomOf="@id/bg2"/>
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="end"
-            app:constraint_referenced_ids="giftName,times" />
-
-        <TextView
-            android:id="@+id/coinNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="@dimen/dp_45"
-            android:layout_marginEnd="@dimen/dp_14"
-            android:includeFontPadding="false"
-            android:shadowColor="#ffa40e00"
-            android:shadowDx="0"
-            android:gravity="center_horizontal"
-            android:shadowDy="1"
-            android:shadowRadius="3.0"
-            android:textColor="#ffffe375"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@id/coins"
-            app:layout_constraintTop_toTopOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="1000k" />
-
-        <TextView
-            android:id="@+id/coins"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:text="@string/avroom_widget_messageview_027"
-            android:layout_marginEnd="@dimen/dp_9"
-            android:textColor="@color/white"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@id/avatar"
-            app:layout_constraintEnd_toEndOf="@id/coinNum"
-            app:layout_constraintTop_toBottomOf="@id/coinNum" />
 
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <View
         android:id="@+id/clickArea"
diff --git a/app/src/main/res/layout/item_gift_combo_view.xml b/app/src/main/res/layout/item_gift_combo_view.xml
index 1e5562aef..849d0c24d 100644
--- a/app/src/main/res/layout/item_gift_combo_view.xml
+++ b/app/src/main/res/layout/item_gift_combo_view.xml
@@ -35,7 +35,7 @@
         android:layout_marginStart="@dimen/dp_6"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textColor="#FFE995"
+        android:textColor="#ffdd5d"
         android:textSize="10sp"
         android:textStyle="bold"
         app:layout_constraintStart_toEndOf="@+id/sentUserAvatar"
@@ -60,7 +60,7 @@
         android:layout_marginStart="@dimen/dp_2"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textColor="#FFE995"
+        android:textColor="#ffdd5d"
         android:textSize="10sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/sendTips"
@@ -84,7 +84,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/barrier"/>
 
-    <com.coorchice.library.SuperTextView
+    <TextView
         android:id="@+id/giftComboNumber"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/layout_lucky_gift_tip.xml b/app/src/main/res/layout/layout_lucky_gift_tip.xml
index 07bbc7de5..775f4951a 100644
--- a/app/src/main/res/layout/layout_lucky_gift_tip.xml
+++ b/app/src/main/res/layout/layout_lucky_gift_tip.xml
@@ -8,69 +8,68 @@
     android:layout_gravity="top|center"
     android:layout_marginTop="@dimen/dp_110"
     android:background="@drawable/bg_lucky_gift_tip"
-    android:gravity="center_horizontal"
+    android:gravity="center"
     android:orientation="vertical">
 
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/win"
-        android:layout_marginTop="@dimen/dp_40"
-        android:textColor="#ffffe375"
-        android:textSize="16sp" />
-
-    <TextView
-        android:id="@+id/coinNum"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="@dimen/dp_6"
-        android:layout_marginTop="@dimen/dp_4"
-        android:shadowColor="#ffa40e00"
-        android:shadowDx="0"
-        android:shadowDy="1"
-        android:shadowRadius="3.0"
-        android:textColor="#ffffe375"
-        android:textSize="26sp"
-        android:textStyle="bold"
-        app:drawableStartCompat="@drawable/ic_coin_63"
-        tools:text="666.52K" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_8"
-        android:orientation="horizontal">
-
         <TextView
-            android:id="@+id/win"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:includeFontPadding="false"
             android:text="@string/win"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
-
-        <TextView
-            android:id="@+id/winNum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:includeFontPadding="false"
             android:textColor="#ffffe375"
-            android:textSize="13sp"
-            tools:text="500" />
+            android:textSize="16sp" />
 
         <TextView
-            android:id="@+id/times"
+            android:id="@+id/coinNum"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_5"
-            android:includeFontPadding="false"
-            android:text="@string/time"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
+            android:drawablePadding="@dimen/dp_6"
+            android:layout_marginTop="@dimen/dp_4"
+            android:shadowColor="#ffa40e00"
+            android:shadowDx="0"
+            android:shadowDy="1"
+            android:shadowRadius="3.0"
+            android:textColor="#ffffe375"
+            android:textSize="26sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_coin_63"
+            tools:text="666.52K" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_8"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/win"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:text="@string/win"
+                android:textColor="@color/white"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/winNum"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_5"
+                android:includeFontPadding="false"
+                android:textColor="#ffffe375"
+                android:textSize="13sp"
+                tools:text="500" />
+
+            <TextView
+                android:id="@+id/times"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_5"
+                android:includeFontPadding="false"
+                android:text="@string/time"
+                android:textColor="@color/white"
+                android:textSize="13sp" />
+
+        </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b71ccaed4..00d04848c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -4927,7 +4927,7 @@
     <string name="settleable_gold_coin">可結算鑽石</string>
     <string name="please_input_withdraw_gold">請輸入提現鑽石</string>
     <string name="all">全部</string>
-    <string name="time">次</string>
+    <string name="time">倍</string>
     <string name="empty_data">暫無數據</string>
     <string name="select_area_code">選擇區号</string>
     <string name="login_input_code">輸入驗證碼</string>
diff --git a/core/src/main/java/com/chwl/core/gift/toolbox/GiftToolbox.java b/core/src/main/java/com/chwl/core/gift/toolbox/GiftToolbox.java
index 575a5a96f..400f6ccd7 100644
--- a/core/src/main/java/com/chwl/core/gift/toolbox/GiftToolbox.java
+++ b/core/src/main/java/com/chwl/core/gift/toolbox/GiftToolbox.java
@@ -125,6 +125,10 @@ public class GiftToolbox {
                 for (GiftReceiver targetUser : multiGiftReceiveInfo.getTargetUsers()) {
                     targetUids.add(targetUser.getUid());
                 }
+            }else {
+                if (multiGiftReceiveInfo.getTargetUids() != null) {
+                    targetUids.addAll(multiGiftReceiveInfo.getTargetUids());
+                }
             }
             giftMultiReceiverInfo.setTargetUids(targetUids);
             //礼物值