moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

疯狂动物园

Browse Source
This commit is contained in:
liyuhua
2024-03-12 18:17:33 +08:00
parent d00366238e
commit 905e3ed441
13 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YuMi.xcodeproj/project.pbxproj
View File

@@ -402,6 +402,7 @@
23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */; };
23E9EB312A85E5D100B792F2 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */; };
23E9EB332A85E97C00B792F2 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */; };
23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */; };
23FF255B2AB956D50064E904 /* pi_home_new_pk.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */; };
23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */; };
23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25642ABC3B3B0064E904 /* XPHomeGameView.m */; };
@@ -2258,6 +2259,7 @@
23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_new_mine_info_online.svga; sourceTree = "<group>"; };
23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = "<group>"; };
23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = "<group>"; };
23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_crazy_zoo.svga; sourceTree = "<group>"; };
23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_home_new_pk.svga; sourceTree = "<group>"; };
23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_game_fine_love.svga; sourceTree = "<group>"; };
23FF25632ABC3B3B0064E904 /* XPHomeGameView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeGameView.h; sourceTree = "<group>"; };
@@ -9396,6 +9398,7 @@
E8A1E45C276220B100B294CA /* Resources */ = {
isa = PBXGroup;
children = (
23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */,
23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */,
23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */,
23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */,
@@ -10550,6 +10553,7 @@
E8729EEF2A3B34D30076D80A /* images in Resources */,
E80EC86728ACD84000D133C5 /* emoji_11@2x.png in Resources */,
E80EC88B28ACD84000D133C5 /* emoji_58@2x.png in Resources */,
23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */,
E80EC85D28ACD84000D133C5 /* emoji_06@2x.png in Resources */,
E80EC83428ACD84000D133C5 /* emoji_128@2x.png in Resources */,
E80EC81C28ACD84000D133C5 /* emoji_92@2x.png in Resources */,

BIN
YuMi/Assets.xcassets/yna/room_star_kitchen.imageset/room_star_kitchen@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
YuMi/Assets.xcassets/yna/room_star_kitchen.imageset/room_star_kitchen@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 29 KiB

12
YuMi/Modules/YMMessage/Model/AttachmentModel.h
View File

@@ -96,8 +96,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
CustomMessageType_Gift_Compound = 93,
///涂鸦礼物
CustomMessageType_Graffiti_Gift = 94,
///星级厨房飘屏
CustomMessageType_Graffiti_Star_Kitchen = 95,
///免费礼物倒计时重置时间
CustomMessageType_Free_Gift_Star_Reset_Time = 96,
///精灵密藏
@@ -114,6 +113,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
CustomMessageType_Guardian_Planet = 102,
///通用公屏信息
CustomMessageType_General_Public_Screen = 103,
///疯狂动物园飘屏
CustomMessageType_Graffiti_Star_Kitchen = 104,
};
@@ -547,12 +548,11 @@ typedef NS_ENUM(NSUInteger, CustomMessageGraffitiGift) {
//first = CustomMessageType_Graffiti_Star_Kitchen
typedef NS_ENUM(NSUInteger, CustomMessageGraffitiStarKitchen) {
/// // 星级厨房礼物房间飘屏通知
Custom_Message_Sub_Star_Kitchen_Room = 950,
/// // 星级厨房礼物全服飘屏通知
Custom_Message_Sub_Star_Kitchen_Server = 951,
Custom_Message_Sub_Star_Kitchen_Server = 1041,
/// // 星级厨房礼物全服飘屏通知
Custom_Message_Sub_Star_Kitchen_FullScreen = 952,
Custom_Message_Sub_Star_Kitchen_FullScreen = 1042,
};
///夺宝精灵 CustomMessageType_Treasure_Fairy = 97,
typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {

12
YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
View File

@@ -354,14 +354,6 @@
} else if(attachment.first == CustomMessageType_Graffiti_Gift) {///涂鸦礼物
[self receiveRoomGraffitiGift:attachment];
} else if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen){///星级厨房飘屏
if(attachment.second == Custom_Message_Sub_Star_Kitchen_Room)return;
NSInteger uid = 0;
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;
}
[self receiveRoomGraffitiStarKitchen:attachment];
}else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) { //夺宝精灵
[self receiveTreasureFairyGiftHighLevel:attachment];
@@ -400,6 +392,8 @@
PIBaseAnimationViewModel *roomGraffiti = [PIBaseAnimationViewModel new];
roomGraffiti.data = attacment.data;
roomGraffiti.type = GiftBannerType_kitchen;
roomGraffiti.first = attacment.first;
roomGraffiti.second = attacment.second;
if(self.animationListB.count == 0 && self.isPlayOfB == NO){
[self createStarKitchenBannerAnimation:roomGraffiti];
}
@@ -410,7 +404,7 @@
self.isPlayOfB = YES;
CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
XPRoomStarKitchenBannerView *starKitchenView = [[XPRoomStarKitchenBannerView alloc]initWithFrame:CGRectMake(0, top, KScreenWidth, kGetScaleWidth(60))];
starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_Server;
starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_FullScreen;
XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attacment.data];
starKitchenView.delegate = self;
starKitchenView.starModel = starModel;

2
YuMi/Modules/YMRoom/View/AnimationView/XPRoomStarKitchenBannerView.m
View File

@@ -74,7 +74,7 @@
self.titleView.hidden = NO;
self.titleView.attributedText = att;
@kWeakify(self);
[self.parser parseWithNamed:@"Star_kitchen" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
[self.parser parseWithNamed:@"pi_crazy_zoo" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
@kStrongify(self);
self.svgaView.loops = 1;
self.svgaView.clearsAfterStop = NO;

5
YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
View File

@@ -114,6 +114,7 @@
XPMessageRemoteExtModel * model = [XPMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]];
messageInfo.bubbleImageUrl = [self parseMessageBubble:message];
int first = attachment.first;
int second = attachment.second;
if (first == CustomMessageType_Gift) {///单人送
return [self createSendGiftAttribute:attachment sendInfo:model messageInfo:messageInfo];
} else if(first == CustomMessageType_AllMicroSend) {///全麦送 多人送
@@ -154,9 +155,7 @@
return [self createRoomSailingAttribute:attachment messageInfo:messageInfo];
} else if (first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_OpenRedPacketSuccess) {
return [self createRedPacketAttribute:attachment messageInfo:messageInfo];
} else if (first == CustomMessageType_Graffiti_Star_Kitchen){
return [self createStarredKitchenAttribute:attachment messageInfo:messageInfo];
}else if (first == CustomMessageType_Treasure_Fairy) {
} else if (first == CustomMessageType_Treasure_Fairy) {
return [self createTreasureFairyAttribute:attachment messageInfo:messageInfo];
}else if (first == CustomMessageType_Room_Album) {
NSDictionary *userInfo = attachment.data[@"user"];

2
YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
View File

@@ -382,8 +382,6 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
if (self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq > prizeModel.userLevelLimit) {
return YES;
}
} else if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen){
return YES;
} else if(attachment.first == CustomMessageType_Room_Album){
return YES;
}else if(attachment.first == CustomMessageType_Gift) {

4
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -1674,9 +1674,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject];
AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]];
BOOL isHave = NO;
if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen && attachment.second == Custom_Message_Sub_Star_Kitchen_FullScreen){
isHave = YES;
}else if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
isHave = YES;
}else if(attachment.first == CustomMessageType_Guardian_Planet && attachment.second == Custom_Message_Sub_Guardian_Planet_All_Room){
isHave = YES;

4
YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
View File

@@ -623,6 +623,8 @@
PIBaseAnimationViewModel *roomGraffiti = [PIBaseAnimationViewModel new];
roomGraffiti.data = attacment.data;
roomGraffiti.type = GiftBannerType_kitchen;
roomGraffiti.first = attacment.first;
roomGraffiti.second = attacment.second;
if(self.animationListB.count == 0 && self.isPlayOfB == NO){
[self createStarKitchenBannerAnimation:roomGraffiti];
}
@@ -633,7 +635,7 @@
self.isPlayOfB = YES;
CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
XPRoomStarKitchenBannerView *starKitchenView = [[XPRoomStarKitchenBannerView alloc]initWithFrame:CGRectMake(0, top, KScreenWidth, kGetScaleWidth(60))];
starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_Server;
starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_FullScreen;
XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attacment.data];
starKitchenView.delegate = self;
starKitchenView.starModel = starModel;

BIN
YuMi/Resources/pi_crazy_zoo.svga Normal file
View File

Binary file not shown.

2
YuMi/zh-Hans.lproj/Localizable.strings
View File

@@ -47,7 +47,7 @@
///LoginPresenter.m
"LoginPresenter0" = "登录取消";
"LoginPresenter1" = "登录失败，请重试";
"XPRoomStarKitchenBannerView0"="恭喜%@在星级厨房抽中%@倍奖励，获得 %@钻石！";
"XPRoomStarKitchenBannerView0"="恭喜%@在疯狂动物园抽中%@倍奖励，获得 %@钻石！";
"XPRoomMessageParser1033333"="恭喜%@在星级厨房抽中 %@倍奖励，获得 %@钻石！";
"XPRoomMessageParser1033334"="恭喜 %@ 在守护星球中成功击败怪兽，获得%@钻石奖励";
///XPShareView.m

2
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -47,7 +47,7 @@
///LoginPresenter.m
"LoginPresenter0" = "登錄取消";
"LoginPresenter1" = "登錄失敗，請重試";
"XPRoomStarKitchenBannerView0"="恭喜%@在星級廚房抽中%@倍獎勵，獲得 %@鉆石！";
"XPRoomStarKitchenBannerView0"="恭喜%@在瘋狂動物園抽中%@倍獎勵，獲得 %@鉆石！";
"XPRoomMessageParser1033333"="恭喜%@在星級廚房抽中 %@倍獎勵，獲得 %@鉆石！";
"XPRoomMessageParser1033334"="恭喜 %@ 在守護星球中成功擊敗怪獸，獲得%@鉆石獎勵";
///XPShareView.m