From 954196efa5d3967da4209d414ec29f0cacbddc3f Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Wed, 27 Sep 2023 16:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../YMRoom/View/AnimationView/XPRoomAnimationView.m      | 6 +++---
 .../View/LittleGame/View/XPRoomLittleGameContainerView.m | 2 +-
 .../YMRoom/View/RoomPK/View/XPRoomPKViewController.m     | 4 ++--
 YuMi/Modules/YMRoom/View/XPRoomViewController.m          | 9 +++++++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
index f1e1f7b5..1eae0204 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
@@ -352,8 +352,8 @@
         } else if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen){///星级厨房飘屏
             if(attachment.second == Custom_Message_Sub_Star_Kitchen_Room)return;
             NSInteger uid = 0;
-            if(attachment.data[@"uid"] != nil){
-                uid = [attachment.data[@"uid"] integerValue];
+            if(attachment.data[@"roomUid"] != nil){
+                uid = [attachment.data[@"roomUid"] integerValue];
             }
             if(attachment.second == Custom_Message_Sub_Star_Kitchen_Server && self.delegate.getRoomInfo.uid != uid){
                 return;
@@ -363,7 +363,7 @@
             [self receiveTreasureFairyGiftHighLevel:attachment];
         }else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
             PIBaseAnimationViewModel *giftNotifyInfo = [PIBaseAnimationViewModel modelWithJSON:attachment.data];
-            if(attachment.second == Custom_Message_Sub_Tarot_Intermediate && self.delegate.getRoomInfo.uid != giftNotifyInfo.uid){
+            if(attachment.second == Custom_Message_Sub_Tarot_Intermediate && self.delegate.getRoomInfo.uid != giftNotifyInfo.roomUid.integerValue){
                 return;
             }
             [self receiveTarotBanner:attachment];
diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
index e92eab07..2819fbe1 100644
--- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
+++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m
@@ -354,7 +354,7 @@
 	if (iPhoneXSeries) {
 		bottom = (47+kSafeAreaBottomHeight+30 + 70) * scale;
 	} else {
-		bottom = (47+10+70) * scale;
+		bottom = (47+10+70 + 30) * scale;
 	}
 	CGFloat width = rect.size.width * scale;
 	CGFloat height = rect.size.height * scale;
diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m
index 91df947f..1b2a6ce1 100644
--- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m
+++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m
@@ -88,8 +88,8 @@
 	self.duraTime = 30;
 	self.voteType = RoomPKVoteModeType_GiftValue;
 	NSArray * array = self.hostDelegate.getRoomPKGroupTeamList;
-	self.redUserArray = [array safeObjectAtIndex1:0];
-	self.blueUserArray = [array safeObjectAtIndex1:1];
+    self.redUserArray = [NSMutableArray arrayWithArray:[array safeObjectAtIndex1:0]];
+    self.blueUserArray = [NSMutableArray arrayWithArray:[array safeObjectAtIndex1:1]];
 	for (RoomPKChooseUserModel * userInfo in self.redUserArray) {
 		userInfo.groupType = GroupType_default;
 	}
diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
index 078af336..494866f0 100644
--- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m
+++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
@@ -507,9 +507,14 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
 			make.top.mas_equalTo(self.roomHeaderView.mas_bottom).offset(26 + 4);
 			make.height.mas_equalTo(self.stageView.hightForStageView);
 		}];
-		
+        CGFloat height = 70;
+        if (iPhoneXSeries) {
+            height = 70;
+        } else {
+            height = 50;
+        }
 		[self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) {
-			make.height.mas_equalTo(70);
+			make.height.mas_equalTo(height);
 			make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5);
 			make.left.mas_equalTo(self.view);
 			make.right.mas_equalTo(self.activityContainerView.mas_left).offset(-10);