From 259ce7a18a3f5f0343e64d053374bb9f3bd7046e Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Thu, 30 May 2024 10:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=B8=B8=E6=88=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 6 + .../Contents.json | 22 - .../ms_room_game_underwa_top_icon@2x.png | Bin 6857 -> 0 bytes .../ms_room_game_underwa_top_icon@3x.png | Bin 12091 -> 0 bytes .../Modules/YMMessage/Model/AttachmentModel.h | 10 + .../YMNewHome/Model/HomePlayRoomModel.h | 2 +- .../View/RoomGame/Api/Api+MSRoomGameApi.h | 2 + .../View/RoomGame/Api/Api+MSRoomGameApi.m | 4 + .../View/RoomGame/Model/MSRoomGameModel.h | 56 + .../View/RoomGame/Model/MSRoomGameModel.m | 22 + .../RoomGame/Presenter/MSRoomGamePresenter.h | 8 +- .../RoomGame/Presenter/MSRoomGamePresenter.m | 54 + .../RoomGame/Protocol/MSRoomGameProtocol.h | 2 + .../YMRoom/View/RoomGame/View/MSRoomGameVC.h | 6 +- .../YMRoom/View/RoomGame/View/MSRoomGameVC.m | 121 +- .../View/RoomGame/View/MSTabbarRoomGameVC.m | 18 +- .../View/SubView/MSRoomGameHeadAvatarView.h | 2 +- .../View/SubView/MSRoomGameHeadAvatarView.m | 4 + .../View/SubView/MSRoomGameHeadView.h | 5 +- .../View/SubView/MSRoomGameHeadView.m | 40 +- .../RoomGame/View/SubView/MSRoomGameMsgView.h | 5 +- .../RoomGame/View/SubView/MSRoomGameMsgView.m | 58 +- .../RoomGame/View/SubView/MSRoomGameView.m | 1630 ++++++++--------- YuMi/zh-Hans.lproj/Localizable.strings | 7 + YuMi/zh-Hant.lproj/Localizable.strings | 9 +- 25 files changed, 1164 insertions(+), 929 deletions(-) delete mode 100644 YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/ms_room_game_underwa_top_icon@2x.png delete mode 100644 YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/ms_room_game_underwa_top_icon@3x.png create mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h create mode 100644 YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 965adc66..868e16ef 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -288,6 +288,7 @@ 237701102BCF740400D661F1 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010F2BCF740400D661F1 /* libsqlite3.tbd */; }; 237701122BCF742C00D661F1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701112BCF742C00D661F1 /* libz.tbd */; }; 237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */ = {isa = PBXBuildFile; fileRef = 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */; }; + 237852A12C072D8D00E360AC /* MSRoomGameModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A02C072D8D00E360AC /* MSRoomGameModel.m */; }; 237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; }; 237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; }; 237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; }; @@ -2107,6 +2108,8 @@ 2377010F2BCF740400D661F1 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 237701112BCF742C00D661F1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_happy_egg_smash.svga; sourceTree = ""; }; + 2378529F2C072D8D00E360AC /* MSRoomGameModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameModel.h; sourceTree = ""; }; + 237852A02C072D8D00E360AC /* MSRoomGameModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameModel.m; sourceTree = ""; }; 237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = ""; }; 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = ""; }; 237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = ""; }; @@ -6058,6 +6061,8 @@ children = ( 239D0FD62C047DD8002977CE /* MSTabbarRoomGameModel.h */, 239D0FD72C047DD8002977CE /* MSTabbarRoomGameModel.m */, + 2378529F2C072D8D00E360AC /* MSRoomGameModel.h */, + 237852A02C072D8D00E360AC /* MSRoomGameModel.m */, ); path = Model; sourceTree = ""; @@ -11831,6 +11836,7 @@ E81060EB2987BE8300B772F0 /* MessageGiftModel.m in Sources */, E8EEB91726FC7B35007C6EBA /* XPMineUserInfoDesViewController.m in Sources */, 9B1B72AC280031DB003FACE9 /* XPAnchorPKViewController.m in Sources */, + 237852A12C072D8D00E360AC /* MSRoomGameModel.m in Sources */, 180806FB2729A354001FD836 /* ThemeColor+Room.m in Sources */, 9BC8C83028090C9200C24F85 /* XPRoomAnchorRankBannerView.m in Sources */, E81A653F283511BE00F55894 /* XPMonentsInteractiveViewController.m in Sources */, diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/Contents.json b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/Contents.json deleted file mode 100644 index 0f4a220d..00000000 --- a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "ms_room_game_underwa_top_icon@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "ms_room_game_underwa_top_icon@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/ms_room_game_underwa_top_icon@2x.png b/YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_top_icon.imageset/ms_room_game_underwa_top_icon@2x.png deleted file mode 100644 index 000e7da97935433dc099a71acd477f20f050e121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6857 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 diff --git a/YuMi/Modules/YMMessage/Model/AttachmentModel.h b/YuMi/Modules/YMMessage/Model/AttachmentModel.h index d2b27956..c9a50cef 100644 --- a/YuMi/Modules/YMMessage/Model/AttachmentModel.h +++ b/YuMi/Modules/YMMessage/Model/AttachmentModel.h @@ -122,6 +122,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) { CustomMessageType_General_Floating_Screen = 107, ///聊天大厅上头条 CustomMessageType_Chat_Hall_Headlinesn = 108, + ///游戏 + CustomMessageType_Chat_Room_Game = 109, ///家族新协议 CustomMessageType_New_Hall = 110, }; @@ -663,6 +665,14 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeChatHallHeadlinesn) { ///所有房间 Custom_Message_Sub_Chat_Hall_Headlinesn = 1081,//单房间 +}; +//CustomMessageType_Chat_Room_Game = 109, +typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomGame) { + + Custom_Message_Sub_Room_Game_Match_Success = 1091,//匹配成功 + Custom_Message_Sub_Room_Game_Match_Fail = 1092,//匹配失败 + + }; ///家族新协议 //CustomMessageType_New_Hall = 110, diff --git a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h index 73d1f79b..a3565489 100644 --- a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h +++ b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h @@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,copy) NSString *nick; ///用户的uid @property (nonatomic,copy) NSString *uid; - +@property(nonatomic,copy) NSString *erbanNo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h b/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h index d2aa38d8..71b51f05 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.h @@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN +(void)getRoomGameHomeConfig:(HttpRequestHelperCompletion)completion; ///开始匹配游戏 +(void)startMatchGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode; +///得到房间详情 ++(void)getRoomGameDetails:(HttpRequestHelperCompletion)completion roomType:(NSString *)roomType; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m b/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m index c2133871..93c6653d 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/Api/Api+MSRoomGameApi.m @@ -16,4 +16,8 @@ +(void)startMatchGame:(HttpRequestHelperCompletion)completion roomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode{ [self makeRequest:@"miniGame/nav/start" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,roomId,mgId,gameMode,nil]; } +///得到房间详情 ++(void)getRoomGameDetails:(HttpRequestHelperCompletion)completion roomType:(NSString *)roomType{ + [self makeRequest:@"chatRoom/getByType" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,roomType,nil]; +} @end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h new file mode 100644 index 00000000..6dbac76f --- /dev/null +++ b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.h @@ -0,0 +1,56 @@ +// +// MSRoomGameModel.h +// YuMi +// +// Created by duoban on 2024/5/29. +// + +#import "PIBaseModel.h" +#import "HomePlayRoomModel.h" +NS_ASSUME_NONNULL_BEGIN + + +typedef enum : NSUInteger { + MSRoomGameInfoModelMatchmaking,// 匹配中 + MSRoomGameInfoModelMatchSuccessfully,//匹配成功 + MSRoomGameInfoModelGameEnd,///游戏结束 + MSRoomGameInfoModelMatchFail ,/// 匹配失败 +} MSRoomGameInfoModelType; + + + + +@class MSRoomGameMicModel,MSRoomGameInfoModel; +@interface MSRoomGameModel : PIBaseModel +@property(nonatomic,strong) MSRoomGameInfoModel *data; +@property(nonatomic,assign) int roomType; +@property(nonatomic,copy)NSString *chatRoomId; +@property(nonatomic,copy) NSString *roomId; +@property(nonatomic,copy) NSArray *roomMics; +@end + + +@interface MSRoomGameMicModel : PIBaseModel + +@property(nonatomic,assign)BOOL micState; +@property(nonatomic,copy) NSString *roomId; +@property(nonatomic,strong) HomePlayMicUserModel *micUser; +@property(nonatomic,assign) int posState; +@property(nonatomic,assign) int position; +@end + +@interface MSRoomGameInfoModel : PIBaseModel +@property(nonatomic,copy) NSString *gameRoomIcon; +@property(nonatomic,copy) NSString *mgId; +//"轮次状态 0 进行中 1 结束 +@property(nonatomic,assign) int roundStatus; +///结果分值 +@property(nonatomic,copy) NSArray *scores; +@property(nonatomic,copy) NSString *configJson; +@property(nonatomic,assign) MSRoomGameInfoModelType matchStatus; + + + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m new file mode 100644 index 00000000..8856fb85 --- /dev/null +++ b/YuMi/Modules/YMRoom/View/RoomGame/Model/MSRoomGameModel.m @@ -0,0 +1,22 @@ +// +// MSRoomGameModel.m +// YuMi +// +// Created by duoban on 2024/5/29. +// + +#import "MSRoomGameModel.h" + +@implementation MSRoomGameModel ++ (NSDictionary *)objectClassInArray{ + return @{@"roomMics":MSRoomGameMicModel.class}; +} +@end + +@implementation MSRoomGameMicModel + +@end +@implementation MSRoomGameInfoModel + +@end + diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h index 59697b39..168eff2c 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.h @@ -6,7 +6,7 @@ // #import "BaseMvpPresenter.h" - +#import "UserInfoModel.h" NS_ASSUME_NONNULL_BEGIN @interface MSRoomGamePresenter : BaseMvpPresenter @@ -14,6 +14,12 @@ NS_ASSUME_NONNULL_BEGIN -(void)getRoomGameConfig; ///开始匹配游戏 -(void)startMatchGameWithroomId:(NSString *)roomId mgId:(NSString *)mgId gameMode:(NSString *)gameMode; +///得到房间详情 +-(void)getRoomGameDetailWithRoomType:(NSString *)roomType; +///进入房间 +- (void)enterNIMRoom:(NSString *)roomId user:(UserInfoModel *)userInfo; +///退出房间 +- (void)exitNIMRoom:(NSString *)roomId; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m index 0066d2e1..736b603c 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/Presenter/MSRoomGamePresenter.m @@ -13,6 +13,9 @@ #import "WalletInfoModel.h" #import "MSTabbarRoomGameModel.h" #import "MSRoomGameProtocol.h" +#import "MSRoomGameModel.h" +#import +#import "XPMessageRemoteExtModel.h" @implementation MSRoomGamePresenter -(void)getRoomGameConfig{ @@ -64,4 +67,55 @@ } showLoading:YES errorToast:YES] roomId:roomId mgId:mgId gameMode:gameMode]; } +///得到房间详情 +-(void)getRoomGameDetailWithRoomType:(NSString *)roomType{ + [Api getRoomGameDetails:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:data.data]; + [[self getView]getRoomGameDetailsSuccessWithModel:model]; + }] roomType:roomType]; +} +- (void)enterNIMRoom:(NSString *)roomId user:(UserInfoModel *)userInfo { + NIMChatroomEnterRequest *request = [[NIMChatroomEnterRequest alloc] init]; + request.roomId = roomId; + //设置ext + XPMessageRemoteExtModel * extModel = [[XPMessageRemoteExtModel alloc] init]; + extModel.defUser = userInfo.defUser; + extModel.erbanNo = userInfo.erbanNo; + extModel.carName = userInfo.carName; + extModel.inRoomNameplatePic = userInfo.nameplatePic; + extModel.inRoomNameplateWord = userInfo.nameplateWord; + extModel.isCustomWord = userInfo.isCustomWord; + extModel.charmUrl = userInfo.userLevelVo.charmUrl; + extModel.experLevelSeq = userInfo.userLevelVo.experLevelSeq; + extModel.experUrl = userInfo.userLevelVo.experUrl; + extModel.newUser = userInfo.newUser; + extModel.vipIcon = userInfo.userVipInfoVO.vipIcon; + extModel.fromUid = userInfo.fromUid; + extModel.fromType = userInfo.fromType; + extModel.fromNick = userInfo.fromNick; + extModel.iosBubbleUrl = userInfo.iosBubbleUrl; + extModel.androidBubbleUrl = userInfo.androidBubbleUrl; + extModel.enterHide = userInfo.userVipInfoVO.enterHide; + extModel.preventKick = userInfo.userVipInfoVO.preventKick; + extModel.enterRoomEffects = userInfo.userVipInfoVO.enterRoomEffects; + extModel.gender = userInfo.gender; + extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; + extModel.platformRole = userInfo.platformRole; + + NSMutableDictionary *ext = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; + request.roomExt = [ext toJSONString]; + [[NIMSDK sharedSDK].chatroomManager enterChatroom:request completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom, NIMChatroomMember * _Nullable me) { + if (error) { + + } else { + + } + }]; + +} + +- (void)exitNIMRoom:(NSString *)roomId { + [[NIMSDK sharedSDK].chatroomManager exitChatroom:roomId completion:nil]; + +} @end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h b/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h index 04980e5b..a0dd6792 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/Protocol/MSRoomGameProtocol.h @@ -9,11 +9,13 @@ #import "UserInfoModel.h" #import "WalletInfoModel.h" #import "MSTabbarRoomGameModel.h" +#import "MSRoomGameModel.h" NS_ASSUME_NONNULL_BEGIN @protocol MSRoomGameProtocol -(void)getRoomGameConfigSuccessWithUser:(UserInfoModel *)user coinModel:(WalletInfoModel *)coinModel gameModel:(MSTabbarRoomGameModel *)gameModel; -(void)startMatchGameSuccess; +-(void)getRoomGameDetailsSuccessWithModel:(MSRoomGameModel *)model; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h index 188de001..192c964b 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.h @@ -6,11 +6,13 @@ // #import "MvpViewController.h" - +#import "MSTabbarRoomGameModel.h" +#import "UserInfoModel.h" NS_ASSUME_NONNULL_BEGIN @interface MSRoomGameVC : MvpViewController -- (instancetype)initWithRoomUid:(NSString *)roomUid; +@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; +@property(nonatomic,strong) UserInfoModel *userinfo; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m index cd52a47e..6b5a90b1 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m @@ -13,31 +13,42 @@ #import "XPRoomLittleGameContainerView.h" #import "MSRoomGameVictoryView.h" #import "MSRoomGameQuitGameView.h" -@interface MSRoomGameVC () +#import "MSRoomGamePresenter.h" +#import "MSRoomGameProtocol.h" +#import +#import "AttachmentModel.h" +@interface MSRoomGameVC () @property(nonatomic,strong) UIImageView *bgImageView; @property(nonatomic,strong) MSRoomGameHeadView *headView; @property(nonatomic,strong) MsRoomMessagChatHallView *chatView; @property(nonatomic,strong) MSRoomGameMsgView *msgView; -@property (nonatomic,copy)NSString *roomUid; +@property(nonatomic,copy) NSString *roomId; @property(nonatomic,strong) MSRoomGameSendMsgView *sendMsgView; ///小游戏的容器 @property (nonatomic,strong) XPRoomLittleGameContainerView *littleGameView; @end @implementation MSRoomGameVC -- (instancetype)initWithRoomUid:(NSString *)roomUid { - self = [super init]; - if (self) { - self.roomUid = roomUid; - } - return self; +- (MSRoomGamePresenter *)createPresenter { + return [[MSRoomGamePresenter alloc] init]; +} +-(void)dealloc{ + [[NIMSDK sharedSDK].chatroomManager removeDelegate:self]; + [[NIMSDK sharedSDK].chatManager removeDelegate:self]; + [[NIMSDK sharedSDK].loginManager removeDelegate:self]; + [[NIMSDK sharedSDK].conversationManager removeDelegate:self]; + } - (void)viewDidLoad { [super viewDidLoad]; [self installUI]; [self installConstraints]; + [self.presenter getRoomGameDetailWithRoomType:@"0"]; + [[NIMSDK sharedSDK].chatroomManager addDelegate:self]; + [[NIMSDK sharedSDK].chatManager addDelegate:self]; + [[NIMSDK sharedSDK].loginManager addDelegate:self]; + [[NIMSDK sharedSDK].conversationManager addDelegate:self]; - } -(void)installUI{ [self.view addSubview:self.bgImageView]; @@ -71,6 +82,13 @@ - (BOOL)isHiddenNavBar { return YES; } + +#pragma mark - MSRoomGameProtocol +-(void)getRoomGameDetailsSuccessWithModel:(MSRoomGameModel *)model{ + self.headView.roomGameModel = model; + self.roomId = model.roomId; + [self.presenter enterNIMRoom:model.roomId user:self.userinfo]; +} #pragma mark -MSRoomGameVictoryViewDelegate - (void)closeGameAction{ @@ -80,17 +98,85 @@ } #pragma mark - MSRoomGameQuitGameViewDelegate - (void)quitGameAction{ - + [self dismissViewControllerAnimated:YES completion:nil]; } #pragma mark -MSRoomGameHeadViewDelegate - (void)clickQuitGameAction{ -// MSRoomGameQuitGameView *quitGameView = [[MSRoomGameQuitGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; -// quitGameView.delegate = self; -// [TTPopup popupView:quitGameView style:TTPopupStyleAlert]; - MSRoomGameVictoryView *victoryView = [[MSRoomGameVictoryView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - victoryView.delegate = self; - [TTPopup popupView:victoryView style:TTPopupStyleAlert]; + MSRoomGameQuitGameView *quitGameView = [[MSRoomGameQuitGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; + quitGameView.delegate = self; + [TTPopup popupView:quitGameView style:TTPopupStyleAlert]; +// MSRoomGameVictoryView *victoryView = [[MSRoomGameVictoryView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; +// victoryView.delegate = self; +// [TTPopup popupView:victoryView style:TTPopupStyleAlert]; + + } + +#pragma mark - NIMChatManagerDelegate +- (void)onRecvMessages:(NSArray *)messages { + for (NIMMessage * message in messages) { + + + // 非房间内消息不处理 + if (message.session.sessionType != NIMSessionTypeChatroom) { + continue; + } + + if(![message.session.sessionId isEqualToString:self.roomId]){ + + continue; + } + if (message.messageType == NIMMessageTypeNotification) { + NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; + NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; + switch (content.eventType) { + case NIMChatroomEventTypeEnter: + { + [self.msgView handleNIMNotificationMessage:message]; + break; + }; + + default: + break; + } + }else if (message.messageType == NIMMessageTypeText) { + [self.msgView handleNIMTextMessage:message]; + }else if (message.messageType == NIMMessageTypeCustom) { + NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; + if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { + AttachmentModel * attachment = (AttachmentModel *)obj.attachment; + if(attachment.first == CustomMessageType_Chat_Room_Game && attachment.second == Custom_Message_Sub_Room_Game_Match_Success){ + [self.presenter exitNIMRoom:self.roomId]; + MSRoomGameModel *model = [MSRoomGameModel modelWithJSON:attachment.data]; + self.roomId = model.roomId; + self.headView.roomGameModel = model; + [self.presenter enterNIMRoom:model.roomId user:self.userinfo]; + + }if(attachment.first == CustomMessageType_Chat_Room_Game && attachment.second == Custom_Message_Sub_Room_Game_Match_Fail){ + [self.presenter exitNIMRoom:self.roomId]; + [self showErrorToast:YMLocalizedString(@"MSRoomGameVC0")]; + [self dismissViewControllerAnimated:YES completion:nil]; + + } + } + + } + } +} +#pragma mark - NIMBroadcastDelegate + +//发送消息成功回调 +- (void)sendMessage:(NIMMessage *)message didCompleteWithError:(NSError *)error { + // 非本房间不处理 + if([message.session.sessionId isEqualToString:self.roomId]){ + return;; + } + if (message.messageType == NIMMessageTypeText) { + [self.msgView handleNIMTextMessage:message]; + } + +} + #pragma mark - 懒加载 - (UIImageView *)bgImageView{ if(!_bgImageView){ @@ -104,12 +190,13 @@ if(!_headView){ _headView = [[MSRoomGameHeadView alloc]initWithFrame:CGRectZero]; _headView.delegate = self; + _headView.chooseGameModel = self.chooseGameModel; } return _headView; } - (MSRoomGameMsgView *)msgView{ if(!_msgView){ - _msgView = [[MSRoomGameMsgView alloc]initWithRoomUid:self.roomUid]; + _msgView = [[MSRoomGameMsgView alloc]initWithFrame:CGRectZero]; } return _msgView; } diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m index 238f0e5c..766cbaa3 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSTabbarRoomGameVC.m @@ -20,6 +20,8 @@ @property(nonatomic,strong) MSTabbarRoomGameHeadView *headView; @property(nonatomic,strong) MSTabbarRoomGameView *gameView; @property(nonatomic,strong) MSTabbarRoomGameModel *gameModel; +@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; + @end @implementation MSTabbarRoomGameVC @@ -90,15 +92,21 @@ } #pragma mark -MSTabbarRoomGameViewDelegate -(void)chooseGameType:(MSTabbarRoomGameItemModel *)model{ -// MSTabbarBeginGameView *beginGameView = [[MSTabbarBeginGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; -// beginGameView.itemModel = model; -// beginGameView.delegate = self; -// [kWindow addSubview:beginGameView]; + MSTabbarBeginGameView *beginGameView = [[MSTabbarBeginGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; + beginGameView.itemModel = model; + beginGameView.delegate = self; + self.chooseGameModel = model; + [kWindow addSubview:beginGameView]; + + +} +-(void)startMatchGameSuccess{ MSRoomGameVC *gameVC = [MSRoomGameVC new]; + gameVC.chooseGameModel = self.chooseGameModel; + gameVC.userinfo = self.headView.userModel; BaseNavigationController *nav = [[BaseNavigationController alloc]initWithRootViewController:gameVC]; nav.modalPresentationStyle = UIModalPresentationFullScreen; [self presentViewController:nav animated:YES completion:nil]; - } #pragma mark - XPIAPRechargeViewControllerDelegate - (void)paySuccess{ diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h index 60d9b466..db1e8dd7 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN @interface MSRoomGameHeadAvatarView : UIView - +@property(nonatomic,copy) NSString *imageUrl; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m index 1f494e82..ab2df97f 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadAvatarView.m @@ -35,6 +35,10 @@ }]; } +-(void)setImageUrl:(NSString *)imageUrl{ + _imageUrl = imageUrl; + _avatarView.imageUrl = imageUrl; +} #pragma mark - 懒加载 - (NetImageView *)avatarView{ if(!_avatarView){ diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h index e82155db..d0054f3a 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.h @@ -6,7 +6,8 @@ // #import - +#import "MSRoomGameModel.h" +#import "MSTabbarRoomGameModel.h" NS_ASSUME_NONNULL_BEGIN @protocol MSRoomGameHeadViewDelegate @@ -15,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN @end @interface MSRoomGameHeadView : UIView @property(nonatomic,weak) iddelegate; +@property(nonatomic,strong) MSRoomGameModel *roomGameModel; +@property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m index e05910e6..7a86feb0 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameHeadView.m @@ -7,9 +7,10 @@ #import "MSRoomGameHeadView.h" #import "MSRoomGameHeadAvatarView.h" +#import "HomePlayRoomModel.h" @interface MSRoomGameHeadView() -@property(nonatomic,strong) UIImageView *topImageView; +@property(nonatomic,strong) NetImageView *topImageView; @property(nonatomic,strong) UIButton *backBtn; @property(nonatomic,strong) UILabel *titleView; @property(nonatomic,strong) UIImageView *pkImageView; @@ -104,11 +105,38 @@ [self.delegate clickQuitGameAction]; } } +-(void)setChooseGameModel:(MSTabbarRoomGameItemModel *)chooseGameModel{ + _chooseGameModel = chooseGameModel; + id coin = _chooseGameModel.scores.firstObject; + if(coin != nil){ + self.coinNumView.text = [NSString stringWithFormat:@"%@",coin]; + } +} +- (void)setRoomGameModel:(MSRoomGameModel *)roomGameModel{ + _roomGameModel = roomGameModel; + NSString *uid = [[AccountInfoStorage instance]getUid]; + for (MSRoomGameMicModel *obj in _roomGameModel.roomMics) { + if([obj.micUser.uid isEqualToString:uid]){ + self.mineView.imageUrl = obj.micUser.avatar; + }else{ + self.rivalView.imageUrl = obj.micUser.avatar; + } + + } + MSRoomGameInfoModel *data = _roomGameModel.data; + if(data != nil){ + _topImageView.imageUrl = data.gameRoomIcon; + if (data.matchStatus == MSRoomGameInfoModelMatchmaking){ + _titleView.text = YMLocalizedString(@"MSRoomGameHeadView0"); + }else if(data.matchStatus == MSRoomGameInfoModelMatchSuccessfully){ + _titleView.text = YMLocalizedString(@"MSRoomGameHeadView1"); + } + } +} #pragma mark - 懒加载 -- (UIImageView *)topImageView{ +- (NetImageView *)topImageView{ if(!_topImageView){ - _topImageView = [UIImageView new]; - _topImageView.image = kImage(@"ms_room_game_underwa_top_icon"); + _topImageView = [NetImageView new]; } return _topImageView; } @@ -123,7 +151,7 @@ } - (UILabel *)titleView{ if(!_titleView){ - _titleView = [UILabel labelInitWithText:@"匹配中" font:kFontBold(18) textColor:[UIColor whiteColor]]; + _titleView = [UILabel labelInitWithText:YMLocalizedString(@"MSRoomGameHeadView0") font:kFontBold(18) textColor:[UIColor whiteColor]]; } return _titleView; } @@ -149,7 +177,7 @@ - (UILabel *)hintView{ if(!_hintView){ _hintView = [UILabel new]; - NSMutableAttributedString *attText = [[NSMutableAttributedString alloc]initWithString:@"获胜奖励18金币" attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:[UIColor whiteColor]}]; + NSMutableAttributedString *attText = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:YMLocalizedString(@"MSRoomGameHeadView0"),@"18"] attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:[UIColor whiteColor]}]; [attText addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0xFF6629)} range:[attText.string rangeOfString:@"18金币"]]; _hintView.attributedText = attText; _hintView.numberOfLines = 0; diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h index 8a8da464..2b164d8e 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.h @@ -6,13 +6,14 @@ // #import - +#import #import "UserInfoModel.h" NS_ASSUME_NONNULL_BEGIN @interface MSRoomGameMsgView : UIView @property(nonatomic,strong) UserInfoModel *userInfo; -- (instancetype)initWithRoomUid:(NSString *)roomUid; +- (void)handleNIMNotificationMessage:(NIMMessage *)message; +- (void)handleNIMTextMessage:(NIMMessage *)message; @end diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m index 0049c393..e3939507 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameMsgView.m @@ -8,7 +8,7 @@ #import "MSRoomGameMsgView.h" ///Third #import -#import + ///Tool #import "DJDKMIMOMColor.h" @@ -68,17 +68,17 @@ - (void)dealloc { } - -- (instancetype)initWithRoomUid:(NSString *)roomUid { - self = [super init]; - if (self) { - self.isLoadHistoryMessage = YES; - self.roomUid = roomUid; +-(instancetype)initWithFrame:(CGRect)frame{ + self = [super initWithFrame:frame]; + if(self){ [self initSubViews]; [self initSubViewConstraints]; } return self; } + +#pragma mark - 懒加载 + #pragma mark - JXCategoryListContentViewDelegate - (UIView *)listView { return self; @@ -190,7 +190,7 @@ option.limit = 100; option.startTime = 0; option.order = NIMMessageSearchOrderAsc; - option.messageTypes = @[@(NIMMessageTypeText),@(NIMMessageTypeImage)]; + option.messageTypes = @[@(NIMMessageTypeText)]; [[NIMSDK sharedSDK].chatroomManager fetchMessageHistory:roomId option:option result:^(NSError * _Nullable error, NSArray * _Nullable messages) { if(error != nil){ self.isLoadHistoryMessage = NO; @@ -201,7 +201,7 @@ NIMHistoryMessageSearchOption *option = [[NIMHistoryMessageSearchOption alloc] init]; option.limit = 100; option.order = NIMMessageSearchOrderDesc; - option.messageTypes = @[@(NIMMessageTypeText),@(NIMMessageTypeImage)]; + option.messageTypes = @[@(NIMMessageTypeText)]; [[NIMSDK sharedSDK].chatroomManager fetchMessageHistory:roomId option:option result:^(NSError * _Nullable error, NSArray * _Nullable messages) { if(error != nil){ self.isLoadHistoryMessage = NO; @@ -253,36 +253,8 @@ BOOL isHaveSave = NO; if(item.messageType == NIMMessageTypeText){ isHaveSave = YES; - }else if(item.messageType == NIMMessageTypeImage){ - isHaveSave = YES; - }else if(item.messageType == NIMMessageTypeCustom){ - NIMCustomObject *obj = (NIMCustomObject *)item.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Chat_Hall_Headlinesn && attachment.second == Custom_Message_Sub_Chat_Hall_Headlinesn) { - isHaveSave = YES; - } - - } } if(isHaveSave == NO)return; - if (item.messageType == NIMMessageTypeImage){ - PIRoomPhotoAlbumItemModel*model = [PIRoomPhotoAlbumItemModel new]; - model.type = @"1"; - model.status = 1; - NIMImageObject * imageObject = (NIMImageObject*)item.messageObject; - model.photoUrl = imageObject.url; - XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init]; - messageInfo.albumModel = model; - messageInfo.first = CustomMessageType_Room_Album; - XPMessageRemoteExtModel * extModel = [XPMessageRemoteExtModel modelWithJSON:item.remoteExt[item.from]]; - messageInfo.charmUrl = extModel.charmUrl; - messageInfo.experUrl = extModel.experUrl; - messageInfo.bubbleImageUrl = extModel.iosBubbleUrl; - messageInfo.nameText = extModel.nick; - [self.datasource addObject:messageInfo]; - return; - } [self.datasource addObject:[self.messageParser parseMessageAttributeForChatHall:item]]; } - (void)handleNIMTextMessage:(NIMMessage *)message { @@ -315,17 +287,7 @@ return self.datasource.count; } -//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { -// XPMessageInfoModel* messageInfo = [self.datasource safeObjectAtIndex1:indexPath.row]; -// -// if(messageInfo.first == CustomMessageType_Room_Album){ -// return 186; -// }else if(messageInfo.first == CustomMessageType_Chat_Hall_Headlinesn){ -// return 40; -// } -// -// return messageInfo.rowHeight; -//} + - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { XPMessageInfoModel* attr = [self.datasource safeObjectAtIndex1:indexPath.row]; diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m index 4638a31d..1d9e01e3 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameView.m @@ -37,7 +37,7 @@ ///小游戏code @property (nonatomic, copy) NSString *code; /// -@property (nonatomic,weak) id hostDelegate; +@property(nonatomic,copy) NSString *mgId; @property (nonatomic, strong) id fsmAPP2MG; /// 你画我猜专用，游戏中选中的关键词，会回调出来，通过 DrawSomethingKeyWord 进行保存。 @property (nonatomic, copy) NSString * DrawSomethingKeyWord; @@ -48,821 +48,821 @@ @end @implementation MSRoomGameView -- (instancetype)initWithDelegate:(id)delegate -{ - self = [super init]; - if (self) { - self.hostDelegate = delegate; - } - return self; -} - -#pragma mark - Private Method -- (void)updateSudGame { - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - if (roomInfo.type == RoomType_MiniGame) { - if (self.currentmgId == 0) {//第一次加载游戏 - self.currentmgId = roomInfo.mgId; - if (self.currentmgId != 0) {//房间信息已加载 - NSLog(@"initLittleGame---%lld", self.currentmgId); - [self initLittleGame]; - } - } else { - if (self.currentmgId != roomInfo.mgId) { - //切换游戏玩法 - self.currentmgId = roomInfo.mgId; - NSLog(@"updateLittleGame---%lld", self.currentmgId); - if (self.currentmgId != 0) { - [self.fsmAPP2MG destroyMG]; - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - [self gameSetUp]; - } - } - } - } -} - -- (void)initLittleGame { - [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSString * gameCode = data.data[@"code"]; - self.code = gameCode; - [self gameSetUp]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:[AccountInfoStorage instance].getUid]; -} - -- (void)gameSetUp { - NSLog(@"小游戏的版本号是：%@", [SudMGP getVersion]); - BOOL isTestEnv = NO; -#ifdef DEBUG - isTestEnv = YES; -#else - isTestEnv = NO; -#endif - if(isEnterprise == NO){ - [[SudMGP getCfg]setBackgroundMode:NO]; - } - [SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) appKey:KeyWithType(KeyType_SudGameAppKey) isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) { - if (retCode == 0) { - if (!self.currentmgId) { - return; - } - NSString * userId = [AccountInfoStorage instance].getUid; - NSString * roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; - NSLog(@"用户ID：%@，房间ID：%@, 游戏ID：%lld, code:%@", userId, roomId, self.currentmgId, self.code); +//- (instancetype)initWithmgId:(NSString *)mgId +//{ +// self = [super init]; +// if (self) { +// self.mgId = mgId; +// } +// return self; +//} // - - NSString *language = [NSBundle getLanguageText]; - if ([language hasPrefix:@"zh"]) { - if ([language rangeOfString:@"Hans"].location != NSNotFound) { - language = @"zh-CN"; // 简体中文 - } else { - language = @"zh-TW"; // 繁體中文 - } - }else{ - language = @"en-US"; // 英文 - } - self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:language fsmMG:self rootView:self]; - } else { - /// 初始化失败, 可根据业务重试 - NSLog(@"ISudFSMMG:initGameSDKWithAppID:初始化sdk失败 :%@",retMsg); - } - }]; -} - -//判断是否在麦上 -- (BOOL)isOnMicro:(NSInteger)uid{ - NSArray *chatRoomMicSequences = [self.hostDelegate.getMicroQueue allValues] ; - if (chatRoomMicSequences != nil && chatRoomMicSequences.count > 0) { - for (int i = 0; i < chatRoomMicSequences.count; i ++) { - MicroQueueModel *chatRoomMicSequence = chatRoomMicSequences[i]; - if (chatRoomMicSequence.userInfo.uid == uid) { - return YES; - } - } - } - return NO; -} - -- (NSString *)findFreePosition{ - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - if (micQueue != nil && micQueue.allKeys.count > 0) { - NSArray *keys = [micQueue allKeys]; - if (keys.count > 0) { - ///重新排序，按照升序 - NSArray *resultArr = [keys sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { - return [obj1 compare:obj2]; - }]; - for (NSString *key in resultArr) { - UserInfoModel *userInfo = [[micQueue objectForKey:key] userInfo]; - if ( !userInfo) { - return key; - } - } - } - } - return nil; -} - -//通过uid判断麦位 -- (NSString *)findThePositionByUid:(NSInteger)uid{ - if (uid > 0) { - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - NSArray *keys = [micQueue allKeys]; - if (keys.count > 0) { - for (NSString *key in keys) { - UserInfoModel *userInfo = [[micQueue objectForKey:key] userInfo]; - if (userInfo.uid == uid) { - return key; - } - } - } - } - return nil; -} - -//上麦以加入游戏 -- (void)upMicToJoinGame { - NSString *position = [self findFreePosition]; - if (position.length > 0) { - NSString * userId = [AccountInfoStorage instance].getUid; - UserInfoModel * userInfo = self.hostDelegate.getUserInfo; - //清空该uid之前在队列中的信息 - if ([self isOnMicro:userId.integerValue]) { - if (position) { - NSString *findOldPosition = [self findThePositionByUid:userInfo.uid]; - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = findOldPosition; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - if (findOldPosition) { - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil) { - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - [self notifySelfInState:YES seatIndex:-1]; - }]; - } - }]; - } - } - }else{ - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - [self notifySelfInState:YES seatIndex:-1]; - }]; - } - } -} - -- (void)updateMicInfoWithGameStatus:(LittleGamePlayStatus)status { - NSString * position = [self findThePositionByUid:[AccountInfoStorage instance].getUid.integerValue]; - if (position != nil) { - UserInfoModel * userInfo = self.hostDelegate.getUserInfo; - userInfo.gameStatus = status; - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - - }]; - } -} - -/** - * 麦位更新扩展字段。 - */ -- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; - extModel.gender = userInfo.gender; - extModel.avatar = userInfo.avatar; - extModel.uid = userInfo.uid; - extModel.nick = userInfo.nick; - extModel.gameStatus = userInfo.gameStatus; - extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; - extModel.preventKick = userInfo.userVipInfoVO.preventKick; - extModel.enterHide = userInfo.userVipInfoVO.enterHide; - return [extModel model2dictionary]; -} - -//自己是否在游戏中 -- (BOOL)isInSudGame { - BOOL isGamePlaying = NO; - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { - isGamePlaying = YES; - break; - } - } - } - return isGamePlaying; -} - -//游戏状态 -- (LittleGamePlayStatus)getCurrentUserSudGameStatus { - LittleGamePlayStatus gameStatus = LittleGamePlayStatus_NoIn; - for (int i = -1; i<5; i++) { - NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; - MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; - if (micSequence == nil || micSequence.userInfo == nil) { - continue; - } - if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { - gameStatus = micSequence.userInfo.gameStatus; - break; - } - } - return gameStatus; -} - -///下麦 -- (void)onDownMic:(NSInteger)uid { - if (uid == [AccountInfoStorage instance].getUid.integerValue) {//自己下麦 - [self notifyIsPlayingState:false]; - [self nofityPlayerPlaying:NO]; - [self notifySetReady:false]; - /// 下游戏麦 - [self notifySelfInState:false seatIndex:-1]; - } -} - -#pragma mark =======ISudFSMMG Delegate======= -/** -* 游戏日志 -*/ --(void)onGameLog:(NSString*)dataJson { - NSLog(@"ISudFSMMG:onGameLog:%@", dataJson); - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - NSString * msg_string = [dic objectForKey:@"msg"]; - if (!msg_string) { - return; - } -} - -/** -* 游戏开始 -*/ --(void)onGameStarted { - NSLog(@"ISudFSMMG:onGameStarted:游戏开始"); -} - -/** - * 游戏销毁 - */ --(void)onGameDestroyed { - NSLog(@"ISudFSMMG:onGameDestroyed:游戏开始"); -} - -/** - * Code过期 - * @param dataJson {"code":"value"} - */ --(void)onExpireCode:(id)handle dataJson:(NSString*)dataJson { - NSLog(@"ISudFSMMG:onExpireCode:Code过期"); - // 请求业务服务器刷新令牌 - [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200) { - NSString * gameCode = data.data[@"code"]; - self.code = gameCode; - [self.fsmAPP2MG updateCode:gameCode listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { - NSLog(@"ISudFSMMG:updateGameCode retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); - }]; - // 回调结果 - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onExpireCode", @"ret_msg", nil]; - [handle success:[SudCommon dictionaryToJson:dict]]; - } else { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } uid:[AccountInfoStorage instance].getUid]; -} - -/** - * 获取游戏View信息 - * @param handle 回调句柄 - * @param dataJson {} - */ --(void)onGetGameViewInfo:(id)handle dataJson:(NSString*)dataJson { - CGRect rect = [[UIScreen mainScreen] bounds]; - CGFloat scale = [[UIScreen mainScreen] nativeScale]; - - CGFloat top = (kNavigationHeight+105) * scale; - CGFloat bottom; - if (iPhoneXSeries) { - bottom = (47+kSafeAreaBottomHeight+30 + 70) * scale; - } else { - bottom = (47+10+70 ) * scale; - } - CGFloat width = rect.size.width * scale; - CGFloat height = rect.size.height * scale; - NSDictionary *rectDict = [NSDictionary dictionaryWithObjectsAndKeys:@(top), @"top", @(0), @"left", @(bottom), @"bottom", @(0), @"right", nil]; - NSDictionary *viewDict = [NSDictionary dictionaryWithObjectsAndKeys:@(width), @"width", @(height), @"height", nil]; - NSDictionary *dataDict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onGetGameViewInfo", @"ret_msg", viewDict, @"view_size", rectDict, @"view_game_rect", nil]; - /// 回调 - [handle success:[SudCommon dictionaryToJson:dataDict]]; -} - -/** - * 获取游戏配置 - * @param handle 回调句柄 - * @param dataJson {} - */ --(void)onGetGameCfg:(id)handle dataJson:(NSString*)dataJson { - NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; - dict[@"ret_code"] = @(0); - dict[@"ret_msg"] = @"return form APP onGetGameCfg"; - - dict[@"ui"] = @{ - @"join_btn" : @{@"custom": @(YES), @"hide": @(NO)},//加入游戏 - @"start_btn" : @{@"custom": @(YES), @"hide": @(NO)},//开始游戏 - @"lobby_players" : @{@"custom": @(YES), @"hide": @(NO)},//游戏中坑位点击 - @"level" : @{@"custom": @(YES), @"hide" : @(YES)},//段位信息 - }; - NSString *dataJsonRet = @""; - NSData *dataJsonData = [NSJSONSerialization dataWithJSONObject:dict options:NSJSONWritingPrettyPrinted error:nil]; - if (dataJsonData != nil) { - dataJsonRet = [[NSString alloc]initWithData:dataJsonData encoding:NSUTF8StringEncoding]; - } - [handle success:dataJsonRet]; -} - -/** - * 游戏状态变化 - * @param handle 回调句柄 - * @param state 游戏状态 - * @param dataJson 回调json - */ --(void)onGameStateChange:(id) handle state:(NSString*) state dataJson:(NSString*) dataJson { - if ([state isEqualToString:MG_COMMON_PUBLIC_MESSAGE]) { - NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:公屏消息"); - } else if ([state isEqualToString:MG_COMMON_KEY_WORD_TO_HIT]) { - NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; - NSString *word = [dic objectForKey:@"word"]; - NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:你画我猜关键词获取:%@",word); - /// 记录你画我猜关键字 - self.DrawSomethingKeyWord = word; - if (word == (id) [NSNull null] || [word isEqualToString:@""]) { - /// 关闭公屏关键词hit状态 - self.keyWordHiting = NO; - } else { - /// 开启公屏关键词hit状态 - self.keyWordHiting = YES; - } - }else if ([state isEqualToString:MG_COMMON_SELF_CLICK_JOIN_BTN]) {//加入游戏按钮点击 - NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; - int seatIndex = -1; - if ([dic objectForKey:@"seatIndex"]) { - seatIndex = [[dic objectForKey:@"seatIndex"] intValue]; - } - if (seatIndex == -1) { - NSLog(@"来自加入按钮%d",seatIndex); - }else { - NSLog(@"来自麦位+入%d",seatIndex); - } - if ([self isOnMicro:[AccountInfoStorage instance].getUid.integerValue]) {//判断是否在麦上 - [self notifySelfInState:YES seatIndex:seatIndex]; - } else { - //不在麦上 - [self upMicToJoinGame]; - } - } else if([state isEqualToString:MG_COMMON_SELF_CLICK_START_BTN]) {//开始游戏按钮点击 - [self notifyIsPlayingState:YES]; - } else if ([state isEqualToString:MG_COMMON_SELF_CLICK_CANCEL_JOIN_BTN]) { - /// 取消加入游戏（退出游戏按钮点击） - [self handleSelfInExitEvent]; - } else { - /// 其他状态 - NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:state:%@",MG_COMMON_PUBLIC_MESSAGE); - } -} - -/** - * 游戏玩家状态变化 - * @param handle 回调句柄 - * @param userId 用户id - * @param state 玩家状态 - * @param dataJson 回调JSON - */ --(void)onPlayerStateChange:(nullable id) handle userId:(NSString*) userId state:(NSString*) state dataJson:(NSString*) dataJson { - NSLog(@"ISudFSMMG:onPlayerStateChange:游戏->APP:游戏玩家状态变化:userId: %@ --state: %@ --dataJson: %@", userId, state, dataJson); - /// 状态解析 - NSString *dataStr = @""; - if ([state isEqualToString:MG_COMMON_PLAYER_IN]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView0"); - [self handleState_MG_COMMON_PLAYER_IN_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_READY]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView1"); - [self handleState_MG_COMMON_PLAYER_READY_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_CAPTAIN]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView2"); - [self handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_COMMON_PLAYER_PLAYING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView3"); - [self handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_SELECTING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView4"); - [self handleState_MG_DG_SELECTING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_PAINTING]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView5"); - [self handleState_MG_DG_PAINTING_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_ERRORANSWER]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView6"); - [self handleState_MG_DG_ERRORANSWER_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_TOTALSCORE]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView7"); - [self handleState_MG_DG_TOTALSCORE_WithUserId:userId dataJson:dataJson]; - } else if ([state isEqualToString:MG_DG_SCORE]) { - dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView8"); - [self handleState_MG_DG_SCORE_WithUserId:userId dataJson:dataJson]; - }else { - NSLog(@"ISudFSMMG:onPlayerStateChange:未做解析状态:%@", MG_DG_SCORE); - } - NSLog(@"ISudFSMMG:onPlayerStateChange:dataStr:%@", dataStr); - /// 回调 - NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onPlayerStateChange", @"ret_msg", nil]; - [handle success:[SudCommon dictionaryToJson:dict]]; -} - -/// 退出游戏 -- (void)handleSelfInExitEvent { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - return; - } - /// 正在游戏中，只退出游戏 - if ([self getCurrentUserSudGameStatus] == LittleGamePlayStatus_Plying) { - [self notifyIsPlayingState:false]; - [self nofityPlayerPlaying:NO]; - [self notifySetReady:false]; - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } else if ([self getCurrentUserSudGameStatus] == LittleGamePlayStatus_Ready) { /// 非游戏状态下 - /// 如果已经准备先退出准备状态 - [self notifySetReady:false]; - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } else { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } - /// 下游戏麦 - [self notifySelfInState:false seatIndex:-1]; -} - -/// 准备游戏 -- (void)handleSelfReadyEvent { - [self notifySetReady:true]; -} - -/// 取消准备 -- (void)handleSelfCancelReadyEvent { - [self notifySetReady:false]; -} - -/// 开始游戏 -- (void)handleGameStartEvent { - [self notifyIsPlayingState:YES]; -} - -#pragma mark =======APP->游戏状态处理======= -/// 状态通知（app to mg） -/// @param state 状态名称 -/// @param dataJson 需传递的json -- (void)notifyStateChange:(NSString *) state dataJson:(NSString*) dataJson { - [self.fsmAPP2MG notifyStateChange:state dataJson:dataJson listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { - NSLog(@"ISudFSMMG:notifyStateChange:retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); - RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_PLAYING]) {//开始游戏 - //上报游戏开始 - NSString *mgid = [NSString stringWithFormat:@"%lld", self.currentmgId]; - if (mgid.length <= 0) { - return; - } - [Api startGameCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code != 200) { - [XNDJTDDLoadingTool showErrorWithMessage:msg]; - } - } roomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] mgId:mgid]; - } else if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_END]) {//结束游戏 - - } - }]; -} - -/// 加入,退出游戏 -/// @param isIn YES:加入 NO:退出 -- (void)notifySelfInState:(BOOL)isIn uid:(NSInteger)uid { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isIn), @"isIn", @(1), @"teamId", nil]; - [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 加入,退出游戏 -/// @param isIn YES:加入 NO:退出 -- (void)notifySelfInState:(BOOL)isIn seatIndex:(int)seatIndex { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(seatIndex), @"seatIndex", @(isIn), @"isIn", @(1), @"teamId", nil]; - [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 踢出用户 -/// @param userId 踢出用户id -- (void)notifyKickStateWithUserId:(NSString *)userId { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"kickedUID", nil]; - [self notifyStateChange:APP_COMMON_SELF_KICK dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 设置用户为队长 -/// @param userId 被设置用户id -- (void)notifySetCaptainStateWithUserId:(NSString *)userId { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"curCaptainUID", nil]; - [self notifyStateChange:APP_COMMON_SELF_CAPTAIN dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 命中 关键词状态 （你画我猜） -- (void)notifyChangeTextHitState:(NSString *)keyWord { - if([keyWord isKindOfClass:[NSNull class]])return; - if (keyWord.length && [keyWord containsString:self.DrawSomethingKeyWord]) { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(true), @"isHit", self.DrawSomethingKeyWord, @"keyWord", self.DrawSomethingKeyWord, @"text", nil]; - [self notifyStateChange:APP_COMMON_SELF_TEXT_HIT dataJson:[SudCommon dictionaryToJson:dic]]; - } -} - -/// 是否设置为准备状态 -- (void)notifySetReady:(BOOL)isReady { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isReady), @"isReady", nil]; - [self notifyStateChange:APP_COMMON_SELF_READY dataJson:[SudCommon dictionaryToJson:dic]]; -} - -/// 停止游戏状态设置 -- (void)notifySetEnd { - [self notifyStateChange:APP_COMMON_SELF_END dataJson:[SudCommon dictionaryToJson:@{}]]; -} - -/// 游戏中状态设置 -- (void)notifyIsPlayingState:(BOOL)isPlaying { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; - [self notifyStateChange:APP_COMMON_SELF_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; -} - -///游戏中退出游戏 -- (void)nofityPlayerPlaying:(BOOL)isPlaying { - NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; - [self notifyStateChange:MG_COMMON_PLAYER_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; -} - -#pragma mark =======游戏->APP状态处理======= -- (void)handleState_MG_COMMON_PLAYER_IN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - /// 加入状态：YES加入，NO退出 - BOOL isIn = NO; - if (dic) { - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isIn = [[dic objectForKey:@"isIn"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) {//是当前用户 - if (isIn) {//加入了游戏 - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; - } else {//不在麦上 - [self upMicToJoinGame]; - } - //判断是否为房主，房主需要设为队长 - if (self.hostDelegate.getRoomInfo.uid == userId.integerValue) { - [self notifySetCaptainStateWithUserId:userId]; - } - self.sudGameStatus = LittleGamePlayStatus_IsIn; - }else {//退出了游戏 - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; - } - self.sudGameStatus = LittleGamePlayStatus_NoIn; - } - } else {//退出游戏 - if (self.sudGameStatus == LittleGamePlayStatus_Plying) {//游戏进行中，用户退出 - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in self.hostDelegate.getRoomSuperAdminList) { - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - break; - } - } - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[[AccountInfoStorage instance].getUid]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember *member = members.firstObject; - if (member.type == NIMChatroomMemberTypeManager || member.type == NIMChatroomMemberTypeCreator || meIsSuperAdmin) { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; - request.userIds = @[userId]; - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - NIMChatroomMember *member = members.firstObject; - [XNDJTDDLoadingTool showErrorWithMessage:[NSString stringWithFormat:YMLocalizedString(@"XPRoomLittleGameContainerView9"), member.roomNickname]]; - } - }]; - } - } - }]; - - } - } -} - -- (void)handleState_MG_COMMON_PLAYER_READY_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 玩家是否准备,YES:已准备，NO:未准备 - BOOL isReady = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isReady = [[dic objectForKey:@"isReady"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { - if (isReady) { - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_Ready]; - } - self.sudGameStatus = LittleGamePlayStatus_Ready; - }else { - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; - } - self.sudGameStatus = LittleGamePlayStatus_IsIn; - } - } -} - -- (void)handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 是否是队长：YES：是队长 NO：不是队长 - BOOL isCaptain = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - /// 错误处理 - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isCaptain = [[dic objectForKey:@"isCaptain"] boolValue]; - } -} - -- (void)handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 是否正在游戏中 - BOOL isPlaying = NO; - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - if (dic) { - /// 错误处理 - NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; - if (retCode != 0) { - return; - } - isPlaying = [[dic objectForKey:@"isPlaying"] boolValue]; - } - if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { - if (isPlaying) { - //判断是否在麦上 - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_Plying]; - } - if (self.delegate && [self.delegate respondsToSelector:@selector(hiddenSudGamePostionView)]) { - [self.delegate hiddenSudGamePostionView]; - } - self.sudGameStatus = LittleGamePlayStatus_Plying; - }else { - if ([self isOnMicro:[userId longLongValue]]) { - [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; - } - self.sudGameStatus = LittleGamePlayStatus_IsIn; - } - } -} - -- (void)handleState_MG_DG_SELECTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSLog(@"handleState_MG_DG_SELECTING_WithUserId%@",dataJson); -} - -- (void)handleState_MG_DG_PAINTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - NSLog(@"handleState_MG_DG_PAINTING_WithUserId%@",dataJson); - /// 设置麦位状态为作画中 - NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; - bool isPainting = NO; - if (dic) { - isPainting = [dic[@"isPainting"] boolValue]; - } -} - -- (void)handleState_MG_DG_ERRORANSWER_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 错误答案 - NSLog(@"handleState_MG_DG_ERRORANSWER_WithUserId%@",dataJson); - -} - -- (void)handleState_MG_DG_TOTALSCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 总积分 - NSLog(@"handleState_MG_DG_TOTALSCORE_WithUserId%@",dataJson); -} - -- (void)handleState_MG_DG_SCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { - /// 本次积分 - NSLog(@"handleState_MG_DG_SCORE_WithUserId%@",dataJson); -} - -/// 销毁MG -- (void)destroyMG { - if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.fsmAPP2MG destroyMG]; - }); - } -} - -#pragma mark - RoomGuestDelegate -- (void)onRoomEntered { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - self.hidden = YES; - return; - } else { - self.hidden = NO; - } - [self updateSudGame]; -} - -- (void)onRoomUpdate { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - self.hidden = YES; - [self.fsmAPP2MG destroyMG]; - } else { - self.hidden = NO; - } - [self updateSudGame]; -} -#pragma mark - RoomGuestDelegate -- (void)handleNIMCustomMessage:(NIMMessage *)message { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { - return; - } - NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Kick_User) { - XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; - [self onDownMic:kickModel.uid]; - } else if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Kick) { - XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; - [self onDownMic:kickModel.uid]; - } - } -} - -- (void)handleNIMNotificationMessage:(NIMMessage *)message { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;} - NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; - NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - switch (content.eventType) { - case NIMChatroomEventTypeQueueChange: // 麦序上下麦 - { - NSDictionary* data = (NSDictionary *)content.ext; - UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; - NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - if (changeType != 1) { - [self onDownMic:userInfo.uid]; - } - } - break; - default: - break; - } -} - -- (void)handleNIMTextMessage:(NIMMessage *)message { - if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;} - if (message.from.integerValue == [AccountInfoStorage instance].getUid.integerValue && [self isInSudGame]) { - [self notifyChangeTextHitState:message.text]; - } -} +//#pragma mark - Private Method +//- (void)updateSudGame { +// +// +// if (self.currentmgId == 0) {//第一次加载游戏 +// self.currentmgId = roomInfo.mgId; +// if (self.currentmgId != 0) {//房间信息已加载 +// NSLog(@"initLittleGame---%lld", self.currentmgId); +// [self initLittleGame]; +// } +// } else { +// if (self.currentmgId != roomInfo.mgId) { +// //切换游戏玩法 +// self.currentmgId = roomInfo.mgId; +// NSLog(@"updateLittleGame---%lld", self.currentmgId); +// if (self.currentmgId != 0) { +// [self.fsmAPP2MG destroyMG]; +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; +// [self gameSetUp]; +// } +// } +// } +// +//} +// +//- (void)initLittleGame { +// [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { +// if (code == 200) { +// NSString * gameCode = data.data[@"code"]; +// self.code = gameCode; +// [self gameSetUp]; +// } else { +// [XNDJTDDLoadingTool showErrorWithMessage:msg]; +// } +// } uid:[AccountInfoStorage instance].getUid]; +//} +// +//- (void)gameSetUp { +// NSLog(@"小游戏的版本号是：%@", [SudMGP getVersion]); +// BOOL isTestEnv = NO; +//#ifdef DEBUG +// isTestEnv = YES; +//#else +// isTestEnv = NO; +//#endif +// if(isEnterprise == NO){ +// [[SudMGP getCfg]setBackgroundMode:NO]; +// } +// [SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) appKey:KeyWithType(KeyType_SudGameAppKey) isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) { +// if (retCode == 0) { +// if (!self.currentmgId) { +// return; +// } +// NSString * userId = [AccountInfoStorage instance].getUid; +// NSString * roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; +// NSLog(@"用户ID：%@，房间ID：%@, 游戏ID：%lld, code:%@", userId, roomId, self.currentmgId, self.code); +//// +// +// NSString *language = [NSBundle getLanguageText]; +// if ([language hasPrefix:@"zh"]) { +// if ([language rangeOfString:@"Hans"].location != NSNotFound) { +// language = @"zh-CN"; // 简体中文 +// } else { +// language = @"zh-TW"; // 繁體中文 +// } +// }else{ +// language = @"en-US"; // 英文 +// } +// self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:language fsmMG:self rootView:self]; +// } else { +// /// 初始化失败, 可根据业务重试 +// NSLog(@"ISudFSMMG:initGameSDKWithAppID:初始化sdk失败 :%@",retMsg); +// } +// }]; +//} +// +////判断是否在麦上 +//- (BOOL)isOnMicro:(NSInteger)uid{ +// NSArray *chatRoomMicSequences = [self.hostDelegate.getMicroQueue allValues] ; +// if (chatRoomMicSequences != nil && chatRoomMicSequences.count > 0) { +// for (int i = 0; i < chatRoomMicSequences.count; i ++) { +// MicroQueueModel *chatRoomMicSequence = chatRoomMicSequences[i]; +// if (chatRoomMicSequence.userInfo.uid == uid) { +// return YES; +// } +// } +// } +// return NO; +//} +// +//- (NSString *)findFreePosition{ +// NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; +// if (micQueue != nil && micQueue.allKeys.count > 0) { +// NSArray *keys = [micQueue allKeys]; +// if (keys.count > 0) { +// ///重新排序，按照升序 +// NSArray *resultArr = [keys sortedArrayUsingComparator:^NSComparisonResult(id _Nonnull obj1, id _Nonnull obj2) { +// return [obj1 compare:obj2]; +// }]; +// for (NSString *key in resultArr) { +// UserInfoModel *userInfo = [[micQueue objectForKey:key] userInfo]; +// if ( !userInfo) { +// return key; +// } +// } +// } +// } +// return nil; +//} +// +////通过uid判断麦位 +//- (NSString *)findThePositionByUid:(NSInteger)uid{ +// if (uid > 0) { +// NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; +// NSArray *keys = [micQueue allKeys]; +// if (keys.count > 0) { +// for (NSString *key in keys) { +// UserInfoModel *userInfo = [[micQueue objectForKey:key] userInfo]; +// if (userInfo.uid == uid) { +// return key; +// } +// } +// } +// } +// return nil; +//} +// +////上麦以加入游戏 +//- (void)upMicToJoinGame { +// NSString *position = [self findFreePosition]; +// if (position.length > 0) { +// NSString * userId = [AccountInfoStorage instance].getUid; +// UserInfoModel * userInfo = self.hostDelegate.getUserInfo; +// //清空该uid之前在队列中的信息 +// if ([self isOnMicro:userId.integerValue]) { +// if (position) { +// NSString *findOldPosition = [self findThePositionByUid:userInfo.uid]; +// NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; +// request.key = findOldPosition; +// request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; +// if (findOldPosition) { +// [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { +// if (error == nil) { +// NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; +// request.key = position; +// request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; +// request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; +// request.transient = YES; +// [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { +// [self notifySelfInState:YES seatIndex:-1]; +// }]; +// } +// }]; +// } +// } +// }else{ +// NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; +// request.key = position; +// request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; +// request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; +// request.transient = YES; +// [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { +// [self notifySelfInState:YES seatIndex:-1]; +// }]; +// } +// } +//} +// +//- (void)updateMicInfoWithGameStatus:(LittleGamePlayStatus)status { +// NSString * position = [self findThePositionByUid:[AccountInfoStorage instance].getUid.integerValue]; +// if (position != nil) { +// UserInfoModel * userInfo = self.hostDelegate.getUserInfo; +// userInfo.gameStatus = status; +// NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; +// request.key = position; +// request.value = [[self userInfoToQueueExt:userInfo] toJSONString]; +// request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; +// request.transient = YES; +// [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { +// +// }]; +// } +//} +// +///** +// * 麦位更新扩展字段。 +// */ +//- (NSDictionary *)userInfoToQueueExt:(UserInfoModel *)userInfo { +// MicroExtModel * extModel = [[MicroExtModel alloc] init]; +// extModel.gender = userInfo.gender; +// extModel.avatar = userInfo.avatar; +// extModel.uid = userInfo.uid; +// extModel.nick = userInfo.nick; +// extModel.gameStatus = userInfo.gameStatus; +// extModel.headWearUrl = userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; +// extModel.preventKick = userInfo.userVipInfoVO.preventKick; +// extModel.enterHide = userInfo.userVipInfoVO.enterHide; +// return [extModel model2dictionary]; +//} +// +////自己是否在游戏中 +//- (BOOL)isInSudGame { +// BOOL isGamePlaying = NO; +// if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { +// for (int i = -1; i<5; i++) { +// NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; +// MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; +// if (micSequence == nil || micSequence.userInfo == nil) { +// continue; +// } +// if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && micSequence.userInfo.gameStatus == LittleGamePlayStatus_Plying) { +// isGamePlaying = YES; +// break; +// } +// } +// } +// return isGamePlaying; +//} +// +////游戏状态 +//- (LittleGamePlayStatus)getCurrentUserSudGameStatus { +// LittleGamePlayStatus gameStatus = LittleGamePlayStatus_NoIn; +// for (int i = -1; i<5; i++) { +// NSMutableDictionary * micQueue = self.hostDelegate.getMicroQueue; +// MicroQueueModel *micSequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i]]; +// if (micSequence == nil || micSequence.userInfo == nil) { +// continue; +// } +// if (micSequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { +// gameStatus = micSequence.userInfo.gameStatus; +// break; +// } +// } +// return gameStatus; +//} +// +/////下麦 +//- (void)onDownMic:(NSInteger)uid { +// if (uid == [AccountInfoStorage instance].getUid.integerValue) {//自己下麦 +// [self notifyIsPlayingState:false]; +// [self nofityPlayerPlaying:NO]; +// [self notifySetReady:false]; +// /// 下游戏麦 +// [self notifySelfInState:false seatIndex:-1]; +// } +//} +// +//#pragma mark =======ISudFSMMG Delegate======= +///** +//* 游戏日志 +//*/ +//-(void)onGameLog:(NSString*)dataJson { +// NSLog(@"ISudFSMMG:onGameLog:%@", dataJson); +// NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; +// NSString * msg_string = [dic objectForKey:@"msg"]; +// if (!msg_string) { +// return; +// } +//} +// +///** +//* 游戏开始 +//*/ +//-(void)onGameStarted { +// NSLog(@"ISudFSMMG:onGameStarted:游戏开始"); +//} +// +///** +// * 游戏销毁 +// */ +//-(void)onGameDestroyed { +// NSLog(@"ISudFSMMG:onGameDestroyed:游戏开始"); +//} +// +///** +// * Code过期 +// * @param dataJson {"code":"value"} +// */ +//-(void)onExpireCode:(id)handle dataJson:(NSString*)dataJson { +// NSLog(@"ISudFSMMG:onExpireCode:Code过期"); +// // 请求业务服务器刷新令牌 +// [Api getSudGameCode:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { +// if (code == 200) { +// NSString * gameCode = data.data[@"code"]; +// self.code = gameCode; +// [self.fsmAPP2MG updateCode:gameCode listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { +// NSLog(@"ISudFSMMG:updateGameCode retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); +// }]; +// // 回调结果 +// NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onExpireCode", @"ret_msg", nil]; +// [handle success:[SudCommon dictionaryToJson:dict]]; +// } else { +// [XNDJTDDLoadingTool showErrorWithMessage:msg]; +// } +// } uid:[AccountInfoStorage instance].getUid]; +//} +// +///** +// * 获取游戏View信息 +// * @param handle 回调句柄 +// * @param dataJson {} +// */ +//-(void)onGetGameViewInfo:(id)handle dataJson:(NSString*)dataJson { +// CGRect rect = [[UIScreen mainScreen] bounds]; +// CGFloat scale = [[UIScreen mainScreen] nativeScale]; +// +// CGFloat top = (kNavigationHeight+105) * scale; +// CGFloat bottom; +// if (iPhoneXSeries) { +// bottom = (47+kSafeAreaBottomHeight+30 + 70) * scale; +// } else { +// bottom = (47+10+70 ) * scale; +// } +// CGFloat width = rect.size.width * scale; +// CGFloat height = rect.size.height * scale; +// NSDictionary *rectDict = [NSDictionary dictionaryWithObjectsAndKeys:@(top), @"top", @(0), @"left", @(bottom), @"bottom", @(0), @"right", nil]; +// NSDictionary *viewDict = [NSDictionary dictionaryWithObjectsAndKeys:@(width), @"width", @(height), @"height", nil]; +// NSDictionary *dataDict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onGetGameViewInfo", @"ret_msg", viewDict, @"view_size", rectDict, @"view_game_rect", nil]; +// /// 回调 +// [handle success:[SudCommon dictionaryToJson:dataDict]]; +//} +// +///** +// * 获取游戏配置 +// * @param handle 回调句柄 +// * @param dataJson {} +// */ +//-(void)onGetGameCfg:(id)handle dataJson:(NSString*)dataJson { +// NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; +// dict[@"ret_code"] = @(0); +// dict[@"ret_msg"] = @"return form APP onGetGameCfg"; +// +// dict[@"ui"] = @{ +// @"join_btn" : @{@"custom": @(YES), @"hide": @(NO)},//加入游戏 +// @"start_btn" : @{@"custom": @(YES), @"hide": @(NO)},//开始游戏 +// @"lobby_players" : @{@"custom": @(YES), @"hide": @(NO)},//游戏中坑位点击 +// @"level" : @{@"custom": @(YES), @"hide" : @(YES)},//段位信息 +// }; +// NSString *dataJsonRet = @""; +// NSData *dataJsonData = [NSJSONSerialization dataWithJSONObject:dict options:NSJSONWritingPrettyPrinted error:nil]; +// if (dataJsonData != nil) { +// dataJsonRet = [[NSString alloc]initWithData:dataJsonData encoding:NSUTF8StringEncoding]; +// } +// [handle success:dataJsonRet]; +//} +// +///** +// * 游戏状态变化 +// * @param handle 回调句柄 +// * @param state 游戏状态 +// * @param dataJson 回调json +// */ +//-(void)onGameStateChange:(id) handle state:(NSString*) state dataJson:(NSString*) dataJson { +// if ([state isEqualToString:MG_COMMON_PUBLIC_MESSAGE]) { +// NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:公屏消息"); +// } else if ([state isEqualToString:MG_COMMON_KEY_WORD_TO_HIT]) { +// NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; +// NSString *word = [dic objectForKey:@"word"]; +// NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:你画我猜关键词获取:%@",word); +// /// 记录你画我猜关键字 +// self.DrawSomethingKeyWord = word; +// if (word == (id) [NSNull null] || [word isEqualToString:@""]) { +// /// 关闭公屏关键词hit状态 +// self.keyWordHiting = NO; +// } else { +// /// 开启公屏关键词hit状态 +// self.keyWordHiting = YES; +// } +// }else if ([state isEqualToString:MG_COMMON_SELF_CLICK_JOIN_BTN]) {//加入游戏按钮点击 +// NSDictionary *dic = [SudCommon turnStringToDictionary:dataJson]; +// int seatIndex = -1; +// if ([dic objectForKey:@"seatIndex"]) { +// seatIndex = [[dic objectForKey:@"seatIndex"] intValue]; +// } +// if (seatIndex == -1) { +// NSLog(@"来自加入按钮%d",seatIndex); +// }else { +// NSLog(@"来自麦位+入%d",seatIndex); +// } +// if ([self isOnMicro:[AccountInfoStorage instance].getUid.integerValue]) {//判断是否在麦上 +// [self notifySelfInState:YES seatIndex:seatIndex]; +// } else { +// //不在麦上 +// [self upMicToJoinGame]; +// } +// } else if([state isEqualToString:MG_COMMON_SELF_CLICK_START_BTN]) {//开始游戏按钮点击 +// [self notifyIsPlayingState:YES]; +// } else if ([state isEqualToString:MG_COMMON_SELF_CLICK_CANCEL_JOIN_BTN]) { +// /// 取消加入游戏（退出游戏按钮点击） +// [self handleSelfInExitEvent]; +// } else { +// /// 其他状态 +// NSLog(@"ISudFSMMG:onGameStateChange:游戏->APP:state:%@",MG_COMMON_PUBLIC_MESSAGE); +// } +//} +// +///** +// * 游戏玩家状态变化 +// * @param handle 回调句柄 +// * @param userId 用户id +// * @param state 玩家状态 +// * @param dataJson 回调JSON +// */ +//-(void)onPlayerStateChange:(nullable id) handle userId:(NSString*) userId state:(NSString*) state dataJson:(NSString*) dataJson { +// NSLog(@"ISudFSMMG:onPlayerStateChange:游戏->APP:游戏玩家状态变化:userId: %@ --state: %@ --dataJson: %@", userId, state, dataJson); +// /// 状态解析 +// NSString *dataStr = @""; +// if ([state isEqualToString:MG_COMMON_PLAYER_IN]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView0"); +// [self handleState_MG_COMMON_PLAYER_IN_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_COMMON_PLAYER_READY]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView1"); +// [self handleState_MG_COMMON_PLAYER_READY_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_COMMON_PLAYER_CAPTAIN]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView2"); +// [self handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_COMMON_PLAYER_PLAYING]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView3"); +// [self handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_DG_SELECTING]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView4"); +// [self handleState_MG_DG_SELECTING_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_DG_PAINTING]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView5"); +// [self handleState_MG_DG_PAINTING_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_DG_ERRORANSWER]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView6"); +// [self handleState_MG_DG_ERRORANSWER_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_DG_TOTALSCORE]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView7"); +// [self handleState_MG_DG_TOTALSCORE_WithUserId:userId dataJson:dataJson]; +// } else if ([state isEqualToString:MG_DG_SCORE]) { +// dataStr = YMLocalizedString(@"XPRoomLittleGameContainerView8"); +// [self handleState_MG_DG_SCORE_WithUserId:userId dataJson:dataJson]; +// }else { +// NSLog(@"ISudFSMMG:onPlayerStateChange:未做解析状态:%@", MG_DG_SCORE); +// } +// NSLog(@"ISudFSMMG:onPlayerStateChange:dataStr:%@", dataStr); +// /// 回调 +// NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:@(0), @"ret_code", @"return form APP onPlayerStateChange", @"ret_msg", nil]; +// [handle success:[SudCommon dictionaryToJson:dict]]; +//} +// +///// 退出游戏 +//- (void)handleSelfInExitEvent { +// if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { +// return; +// } +// /// 正在游戏中，只退出游戏 +// if ([self getCurrentUserSudGameStatus] == LittleGamePlayStatus_Plying) { +// [self notifyIsPlayingState:false]; +// [self nofityPlayerPlaying:NO]; +// [self notifySetReady:false]; +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; +// } else if ([self getCurrentUserSudGameStatus] == LittleGamePlayStatus_Ready) { /// 非游戏状态下 +// /// 如果已经准备先退出准备状态 +// [self notifySetReady:false]; +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; +// } else { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; +// } +// /// 下游戏麦 +// [self notifySelfInState:false seatIndex:-1]; +//} +// +///// 准备游戏 +//- (void)handleSelfReadyEvent { +// [self notifySetReady:true]; +//} +// +///// 取消准备 +//- (void)handleSelfCancelReadyEvent { +// [self notifySetReady:false]; +//} +// +///// 开始游戏 +//- (void)handleGameStartEvent { +// [self notifyIsPlayingState:YES]; +//} +// +//#pragma mark =======APP->游戏状态处理======= +///// 状态通知（app to mg） +///// @param state 状态名称 +///// @param dataJson 需传递的json +//- (void)notifyStateChange:(NSString *) state dataJson:(NSString*) dataJson { +// [self.fsmAPP2MG notifyStateChange:state dataJson:dataJson listener:^(int retCode, const NSString *retMsg, const NSString *dataJson) { +// NSLog(@"ISudFSMMG:notifyStateChange:retCode=%@ retMsg=%@ dataJson=%@", @(retCode), retMsg, dataJson); +// RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; +// if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_PLAYING]) {//开始游戏 +// //上报游戏开始 +// NSString *mgid = [NSString stringWithFormat:@"%lld", self.currentmgId]; +// if (mgid.length <= 0) { +// return; +// } +// [Api startGameCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { +// if (code != 200) { +// [XNDJTDDLoadingTool showErrorWithMessage:msg]; +// } +// } roomUid:[NSString stringWithFormat:@"%ld", roomInfo.uid] mgId:mgid]; +// } else if (retCode == 0 && [state isEqualToString:APP_COMMON_SELF_END]) {//结束游戏 +// +// } +// }]; +//} +// +///// 加入,退出游戏 +///// @param isIn YES:加入 NO:退出 +//- (void)notifySelfInState:(BOOL)isIn uid:(NSInteger)uid { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isIn), @"isIn", @(1), @"teamId", nil]; +// [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +///// 加入,退出游戏 +///// @param isIn YES:加入 NO:退出 +//- (void)notifySelfInState:(BOOL)isIn seatIndex:(int)seatIndex { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(seatIndex), @"seatIndex", @(isIn), @"isIn", @(1), @"teamId", nil]; +// [self notifyStateChange:APP_COMMON_SELF_IN dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +///// 踢出用户 +///// @param userId 踢出用户id +//- (void)notifyKickStateWithUserId:(NSString *)userId { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"kickedUID", nil]; +// [self notifyStateChange:APP_COMMON_SELF_KICK dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +///// 设置用户为队长 +///// @param userId 被设置用户id +//- (void)notifySetCaptainStateWithUserId:(NSString *)userId { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:userId, @"curCaptainUID", nil]; +// [self notifyStateChange:APP_COMMON_SELF_CAPTAIN dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +///// 命中 关键词状态 （你画我猜） +//- (void)notifyChangeTextHitState:(NSString *)keyWord { +// if([keyWord isKindOfClass:[NSNull class]])return; +// if (keyWord.length && [keyWord containsString:self.DrawSomethingKeyWord]) { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(true), @"isHit", self.DrawSomethingKeyWord, @"keyWord", self.DrawSomethingKeyWord, @"text", nil]; +// [self notifyStateChange:APP_COMMON_SELF_TEXT_HIT dataJson:[SudCommon dictionaryToJson:dic]]; +// } +//} +// +///// 是否设置为准备状态 +//- (void)notifySetReady:(BOOL)isReady { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isReady), @"isReady", nil]; +// [self notifyStateChange:APP_COMMON_SELF_READY dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +///// 停止游戏状态设置 +//- (void)notifySetEnd { +// [self notifyStateChange:APP_COMMON_SELF_END dataJson:[SudCommon dictionaryToJson:@{}]]; +//} +// +///// 游戏中状态设置 +//- (void)notifyIsPlayingState:(BOOL)isPlaying { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; +// [self notifyStateChange:APP_COMMON_SELF_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +/////游戏中退出游戏 +//- (void)nofityPlayerPlaying:(BOOL)isPlaying { +// NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:@(isPlaying), @"isPlaying", nil]; +// [self notifyStateChange:MG_COMMON_PLAYER_PLAYING dataJson:[SudCommon dictionaryToJson:dic]]; +//} +// +//#pragma mark =======游戏->APP状态处理======= +//- (void)handleState_MG_COMMON_PLAYER_IN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; +// /// 加入状态：YES加入，NO退出 +// BOOL isIn = NO; +// if (dic) { +// NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; +// if (retCode != 0) { +// return; +// } +// isIn = [[dic objectForKey:@"isIn"] boolValue]; +// } +// if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) {//是当前用户 +// if (isIn) {//加入了游戏 +// //判断是否在麦上 +// if ([self isOnMicro:[userId longLongValue]]) { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; +// } else {//不在麦上 +// [self upMicToJoinGame]; +// } +// //判断是否为房主，房主需要设为队长 +// if (self.hostDelegate.getRoomInfo.uid == userId.integerValue) { +// [self notifySetCaptainStateWithUserId:userId]; +// } +// self.sudGameStatus = LittleGamePlayStatus_IsIn; +// }else {//退出了游戏 +// //判断是否在麦上 +// if ([self isOnMicro:[userId longLongValue]]) { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_NoIn]; +// } +// self.sudGameStatus = LittleGamePlayStatus_NoIn; +// } +// } else {//退出游戏 +// if (self.sudGameStatus == LittleGamePlayStatus_Plying) {//游戏进行中，用户退出 +// ///自己是公会超管 +// BOOL meIsSuperAdmin = NO; +// for (GuildSuperAdminInfoModel *managerInfo in self.hostDelegate.getRoomSuperAdminList) { +// if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { +// meIsSuperAdmin = YES; +// break; +// } +// } +// NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; +// request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; +// request.userIds = @[[AccountInfoStorage instance].getUid]; +// [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { +// if (error == nil) { +// NIMChatroomMember *member = members.firstObject; +// if (member.type == NIMChatroomMemberTypeManager || member.type == NIMChatroomMemberTypeCreator || meIsSuperAdmin) { +// NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; +// request.roomId = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.roomId]; +// request.userIds = @[userId]; +// [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { +// if (error == nil) { +// NIMChatroomMember *member = members.firstObject; +// [XNDJTDDLoadingTool showErrorWithMessage:[NSString stringWithFormat:YMLocalizedString(@"XPRoomLittleGameContainerView9"), member.roomNickname]]; +// } +// }]; +// } +// } +// }]; +// +// } +// } +//} +// +//- (void)handleState_MG_COMMON_PLAYER_READY_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// /// 玩家是否准备,YES:已准备，NO:未准备 +// BOOL isReady = NO; +// NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; +// if (dic) { +// NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; +// if (retCode != 0) { +// return; +// } +// isReady = [[dic objectForKey:@"isReady"] boolValue]; +// } +// if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { +// if (isReady) { +// //判断是否在麦上 +// if ([self isOnMicro:[userId longLongValue]]) { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_Ready]; +// } +// self.sudGameStatus = LittleGamePlayStatus_Ready; +// }else { +// if ([self isOnMicro:[userId longLongValue]]) { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; +// } +// self.sudGameStatus = LittleGamePlayStatus_IsIn; +// } +// } +//} +// +//- (void)handleState_MG_COMMON_PLAYER_CAPTAIN_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// /// 是否是队长：YES：是队长 NO：不是队长 +// BOOL isCaptain = NO; +// NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; +// if (dic) { +// /// 错误处理 +// NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; +// if (retCode != 0) { +// return; +// } +// isCaptain = [[dic objectForKey:@"isCaptain"] boolValue]; +// } +//} +// +//- (void)handleState_MG_COMMON_PLAYER_PLAYING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// /// 是否正在游戏中 +// BOOL isPlaying = NO; +// NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; +// if (dic) { +// /// 错误处理 +// NSInteger retCode = [[dic objectForKey:@"retCode"] integerValue]; +// if (retCode != 0) { +// return; +// } +// isPlaying = [[dic objectForKey:@"isPlaying"] boolValue]; +// } +// if ([userId isEqualToString:[AccountInfoStorage instance].getUid]) { +// if (isPlaying) { +// //判断是否在麦上 +// if ([self isOnMicro:[userId longLongValue]]) { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_Plying]; +// } +// if (self.delegate && [self.delegate respondsToSelector:@selector(hiddenSudGamePostionView)]) { +// [self.delegate hiddenSudGamePostionView]; +// } +// self.sudGameStatus = LittleGamePlayStatus_Plying; +// }else { +// if ([self isOnMicro:[userId longLongValue]]) { +// [self updateMicInfoWithGameStatus:LittleGamePlayStatus_IsIn]; +// } +// self.sudGameStatus = LittleGamePlayStatus_IsIn; +// } +// } +//} +// +//- (void)handleState_MG_DG_SELECTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// NSLog(@"handleState_MG_DG_SELECTING_WithUserId%@",dataJson); +//} +// +//- (void)handleState_MG_DG_PAINTING_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// NSLog(@"handleState_MG_DG_PAINTING_WithUserId%@",dataJson); +// /// 设置麦位状态为作画中 +// NSDictionary * dic = [SudCommon turnStringToDictionary:dataJson]; +// bool isPainting = NO; +// if (dic) { +// isPainting = [dic[@"isPainting"] boolValue]; +// } +//} +// +//- (void)handleState_MG_DG_ERRORANSWER_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// /// 错误答案 +// NSLog(@"handleState_MG_DG_ERRORANSWER_WithUserId%@",dataJson); +// +//} +// +//- (void)handleState_MG_DG_TOTALSCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// /// 总积分 +// NSLog(@"handleState_MG_DG_TOTALSCORE_WithUserId%@",dataJson); +//} +// +//- (void)handleState_MG_DG_SCORE_WithUserId:(NSString *)userId dataJson:(NSString *)dataJson { +// /// 本次积分 +// NSLog(@"handleState_MG_DG_SCORE_WithUserId%@",dataJson); +//} +// +///// 销毁MG +//- (void)destroyMG { +// if (self.hostDelegate.getRoomInfo.type == RoomType_MiniGame) { +// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ +// [self.fsmAPP2MG destroyMG]; +// }); +// } +//} +// +//#pragma mark - RoomGuestDelegate +//- (void)onRoomEntered { +// if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { +// self.hidden = YES; +// return; +// } else { +// self.hidden = NO; +// } +// [self updateSudGame]; +//} +// +//- (void)onRoomUpdate { +// if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { +// self.hidden = YES; +// [self.fsmAPP2MG destroyMG]; +// } else { +// self.hidden = NO; +// } +// [self updateSudGame]; +//} +//#pragma mark - RoomGuestDelegate +//- (void)handleNIMCustomMessage:(NIMMessage *)message { +// if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) { +// return; +// } +// NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; +// if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { +// AttachmentModel *attachment = (AttachmentModel *)obj.attachment; +// if (attachment.first == CustomMessageType_Kick_User) { +// XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; +// [self onDownMic:kickModel.uid]; +// } else if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Kick) { +// XPKickUserModel * kickModel = [XPKickUserModel modelWithJSON:attachment.data]; +// [self onDownMic:kickModel.uid]; +// } +// } +//} +// +//- (void)handleNIMNotificationMessage:(NIMMessage *)message { +// if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;} +// NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; +// NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; +// switch (content.eventType) { +// case NIMChatroomEventTypeQueueChange: // 麦序上下麦 +// { +// NSDictionary* data = (NSDictionary *)content.ext; +// UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; +// NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; +// if (changeType != 1) { +// [self onDownMic:userInfo.uid]; +// } +// } +// break; +// default: +// break; +// } +//} +// +//- (void)handleNIMTextMessage:(NIMMessage *)message { +// if (self.hostDelegate.getRoomInfo.type != RoomType_MiniGame) {return;} +// if (message.from.integerValue == [AccountInfoStorage instance].getUid.integerValue && [self isInSudGame]) { +// [self notifyChangeTextHitState:message.text]; +// } +//} @end diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 9ca8a9c6..33453903 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -3272,3 +3272,10 @@ "MSRoomGameQuitGameView0"="游戏已经开始，退出房间将默认 游戏失败，确认退出房间？"; "MSRoomGameQuitGameView1"="退出"; "MSRoomGameQuitGameView2"="继续游戏"; +//MSRoomGameHeadView +"MSRoomGameHeadView0"="匹配中"; +"MSRoomGameHeadView1"="匹配成功"; +"MSRoomGameHeadView2"="获胜奖励%@金币"; + +//MSRoomGameVC +"MSRoomGameVC0"="匹配失败"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 1f08e566..d1e3a300 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -3257,11 +3257,4 @@ ///MSRoomSetingBackdropCell "MSRoomSetingBackdropCell0"="使用中"; "MSRoomSetingBackdropCell1"="確認選擇這張圖片作為房間主題嗎？"; -///MSTabbarBeginGameView -"MSTabbarBeginGameView0"="開始"; -///MSRoomGameVictoryView -"MSRoomGameVictoryView0"="重新匹配"; -///MSRoomGameQuitGameView -"MSRoomGameQuitGameView0"="遊戲已經開始，退出房間將默認 遊戲失敗，確認退出房間？"; -"MSRoomGameQuitGameView1"="退出"; -"MSRoomGameQuitGameView2"="繼續遊戲"; +