diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 769ebe1d..747790f0 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -12770,7 +12770,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.21; + MARKETING_VERSION = 20.20.22; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12808,7 +12808,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.21; + MARKETING_VERSION = 20.20.22; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/Contents.json new file mode 100644 index 00000000..bb531bd9 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_room_game_victory_top_fail_icon_ar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_room_game_victory_top_fail_icon_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/ms_room_game_victory_top_fail_icon_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/ms_room_game_victory_top_fail_icon_ar@2x.png new file mode 100644 index 00000000..97c0980d Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/ms_room_game_victory_top_fail_icon_ar@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/ms_room_game_victory_top_fail_icon_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/ms_room_game_victory_top_fail_icon_ar@3x.png new file mode 100644 index 00000000..51bd9803 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/ms_room_game_victory_top_fail_icon_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/Contents.json new file mode 100644 index 00000000..2dac417d --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_room_game_victory_top_icon_ar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_room_game_victory_top_icon_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/ms_room_game_victory_top_icon_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/ms_room_game_victory_top_icon_ar@2x.png new file mode 100644 index 00000000..bcbe0af3 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/ms_room_game_victory_top_icon_ar@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/ms_room_game_victory_top_icon_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/ms_room_game_victory_top_icon_ar@3x.png new file mode 100644 index 00000000..d9d3dec7 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/ms_room_game_victory_top_icon_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/Contents.json new file mode 100644 index 00000000..6d6c35cc --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_room_game_victory_top_fail_icon_en@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_room_game_victory_top_fail_icon_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/ms_room_game_victory_top_fail_icon_en@2x.png b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/ms_room_game_victory_top_fail_icon_en@2x.png new file mode 100644 index 00000000..4c10d6f4 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/ms_room_game_victory_top_fail_icon_en@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/ms_room_game_victory_top_fail_icon_en@3x.png b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/ms_room_game_victory_top_fail_icon_en@3x.png new file mode 100644 index 00000000..a0fad9b7 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_fail_icon_en.imageset/ms_room_game_victory_top_fail_icon_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/Contents.json new file mode 100644 index 00000000..ed0ecbb9 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_room_game_victory_top_icon_en@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_room_game_victory_top_icon_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/ms_room_game_victory_top_icon_en@2x.png b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/ms_room_game_victory_top_icon_en@2x.png new file mode 100644 index 00000000..1ad6375f Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/ms_room_game_victory_top_icon_en@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/ms_room_game_victory_top_icon_en@3x.png b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/ms_room_game_victory_top_icon_en@3x.png new file mode 100644 index 00000000..4d91139d Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/ms_room_game_victory_top_icon_en@3x.png differ diff --git a/YuMi/Modules/YMMine/Model/XPMineItemModel.h b/YuMi/Modules/YMMine/Model/XPMineItemModel.h index ba5489ca..c7cd0275 100644 --- a/YuMi/Modules/YMMine/Model/XPMineItemModel.h +++ b/YuMi/Modules/YMMine/Model/XPMineItemModel.h @@ -32,8 +32,8 @@ typedef NS_ENUM(NSInteger, XPMineItemType) { XPMineItemType_FansTeam = 72,///粉丝团 XPMineItemType_DressUp_Market = 73, ///装扮商场 XPMineItemType_My_Dressup = 74,///我的装扮 - XPMineItemType_My_Set = 75///设置 - + XPMineItemType_My_Set = 75,///设置 + XPMineItemType_My_Gift = 77///我的转赠 }; diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index def445fb..eac83dae 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -316,6 +316,11 @@ UIKIT_EXTERN NSString *kRequestRicket; } break; + case XPMineItemType_My_Gift: + { + [self pushGiveDiamondVC]; + } + break; default: break; } @@ -359,7 +364,7 @@ UIKIT_EXTERN NSString *kRequestRicket; return cell; }else if (indexPath.section == 1) { XPMinePersonalCenterCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMinePersonalCenterCell class])]; - cell.isHaveGiveDiamond = self.isHavePermission; +// cell.isHaveGiveDiamond = self.isHavePermission; @kWeakify(self) cell.clickAction = ^(int type){ @kStrongify(self) @@ -527,6 +532,12 @@ UIKIT_EXTERN NSString *kRequestRicket; - (void)onGetMineFuntionItemSuccess:(NSArray *)items { [self.functionArray removeAllObjects]; [self.functionArray addObjectsFromArray:items]; + for (XPMineFuntionItemModel * _Nonnull obj in self.functionArray) { + if(obj.skipType == XPMineItemType_My_Gift && self.isHavePermission == NO){ + [self.functionArray removeObject:obj]; + break; + } + } [self.functionArray enumerateObjectsUsingBlock:^(XPMineFuntionItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (obj.skipType == XPMineItemType_CP || obj.skipType == XPMineItemType_My_Room) { [self.functionArray removeObject:obj]; @@ -534,6 +545,7 @@ UIKIT_EXTERN NSString *kRequestRicket; if([obj.centerName isEqualToString:@"切换分区"]){ [self.functionArray removeObject:obj]; } + }]; NSMutableArray *array = [NSMutableArray array]; for (XPMineFuntionItemModel *item in self.functionArray) { diff --git a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m b/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m index 530298b0..9250dabc 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m +++ b/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m @@ -156,7 +156,7 @@ [array addObject:roomPK]; } - if (isCreator && roomInfo.isPermitRoom == PermitRoomType_Licnese && roomInfo.type != RoomType_MiniGame) { + if (isCreator && roomInfo.type != RoomType_MiniGame) { [array addObject:acrossRoomPK]; } diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m b/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m index f96b9994..0005a2f9 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/Cell/MSTabbarRoomGameCell.m @@ -32,7 +32,7 @@ if(_itemMode == nil)return; _bgImageView.image = nil; [_bgImageView loadImageWithUrl:_itemMode.modeIcon completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { - self.bgImageView.image = [image ms_SetImageForRTL]; + self.bgImageView.image = image; }]; } #pragma mark - 懒加载 diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m index d2c9db2b..af1c04ce 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/MSRoomGameVC.m @@ -158,13 +158,7 @@ self.headView.roomGameModel = model; self.headView.userInfo = self.userinfo; self.roomId = model.roomId; - - - [self enterNIMRoomWithRoomId:self.roomId]; - - - if(model.data.matchStatus == MSRoomGameInfoModelMatchSuccessfully && model.data.roundStatus == 0){ self.roomGameView.gameModel = model; if(self.roomGameView.superview == nil){ @@ -248,6 +242,9 @@ - (void)clickQuitGameAction{ MSRoomGameQuitGameView *quitGameView = [[MSRoomGameQuitGameView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; + if(self.headView.roomGameModel.data.matchStatus == MSRoomGameInfoModelMatchmaking){ + quitGameView.text = YMLocalizedString(@"MSRoomGameQuitGameView5"); + } quitGameView.delegate = self; [TTPopup popupView:quitGameView style:TTPopupStyleAlert]; } diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h index c4e3fe15..c7ad68f6 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.h @@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)closeGameActionWithModel:(MSTabbarRoomGameItemModel *)model; @end @interface MSRoomGameQuitGameView : UIView +@property(nonatomic,copy) NSString *text; @property(nonatomic,strong) MSTabbarRoomGameItemModel *chooseGameModel; @property(nonatomic,assign) BOOL isNormalFail; @property(nonatomic,weak) iddelegate; diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m index f5265e54..591c825c 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameQuitGameView.m @@ -51,6 +51,10 @@ make.top.mas_equalTo(kGetScaleWidth(48)); }]; } +-(void)setText:(NSString *)text{ + _text = text; + _titleView.text = _text; +} -(void)setChooseGameModel:(MSTabbarRoomGameItemModel *)chooseGameModel{ _chooseGameModel = chooseGameModel; @@ -128,6 +132,8 @@ _resumeBtn.titleLabel.font = kFontBold(14); _resumeBtn.layer.cornerRadius = kGetScaleWidth(38)/2; _resumeBtn.layer.masksToBounds = YES; + _resumeBtn.titleLabel.numberOfLines = 2; + _resumeBtn.titleLabel.textAlignment = NSTextAlignmentCenter; [_resumeBtn addTarget:self action:@selector(resumeBtnAction) forControlEvents:UIControlEventTouchUpInside]; } return _resumeBtn; diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m index 3be338a5..b6653869 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameVictoryView.m @@ -95,7 +95,7 @@ _resultsList = resultsList; MSRoomGameResultsModel *resultsModel = _resultsList.firstObject; NSString *uid = [AccountInfoStorage instance].getUid; - self.topView.image = [resultsModel.uid isEqualToString:[AccountInfoStorage instance].getUid] ? kImage(@"ms_room_game_victory_top_icon") : kImage(@"ms_room_game_victory_top_fail_icon"); + self.topView.image = [resultsModel.uid isEqualToString:uid] ? [UIImage getLanguageImage:@"ms_room_game_victory_top_icon"]: [UIImage getLanguageImage:@"ms_room_game_victory_top_fail_icon"]; [_tableView reloadData]; } #pragma mark - 懒加载 diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index bfe28143..4821d7d7 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -3817,6 +3817,7 @@ ineHeadView12" = "الحمل"; "MSRoomGameQuitGameView2"="متابعة اللعب"; "MSRoomGameQuitGameView3"="فشلت المطابقة، هل تريد المحاولة مرة أخرى؟"; "MSRoomGameQuitGameView4"="جاري التحميل، هل تريد العودة إلى الغرفة؟"; +"MSRoomGameQuitGameView5"="جاري المطابقة، الخروج من الغرفة ،نهاية المطابقة. هل تريد الخروج؟"; //MSRoomGameHeadView "MSRoomGameHeadView0"="جاري المطابقة "; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 2f4f9379..565f0be8 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -3621,7 +3621,7 @@ "MSRoomGameQuitGameView2"="Continue the game"; "MSRoomGameQuit tGameView3"="Match failed, do you want to rematch? "; "MSRoomGameQuitGameView4"="Game in progress, do you want to return to the room? "; - +"MSRoomGameQuitGameView5"="During a match, exiting a room will end the match. Do you want to exit?"; //MSRoomGameHeadView "MSRoomGameHeadView0"="Matching"; "MSRoomGameHeadView1"="Match successful"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index d385cb1f..3b175a8b 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -3281,6 +3281,7 @@ "MSRoomGameQuitGameView3"="匹配失败，是否重新匹配？"; "MSRoomGameQuitGameView4"="游戏进行中，是否返回房间？"; +"MSRoomGameQuitGameView5"="游戏匹配中，退出房间则结束匹配，是否退出？"; //MSRoomGameHeadView "MSRoomGameHeadView0"="匹配中"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index d5c28f29..4c894a67 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -3270,7 +3270,7 @@ "MSRoomGameQuitGameView2"="继续游戏"; "MSRoomGameQuitGameView3"="匹配失败，是否重新匹配？"; "MSRoomGameQuitGameView4"="游戏进行中，是否返回房间？"; - +"MSRoomGameQuitGameView5"="遊戲匹配中，退出房間則結束匹配，是否退出？"; //MSRoomGameHeadView "MSRoomGameHeadView0"="匹配中"; "MSRoomGameHeadView1"="匹配成功";