diff --git a/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x (1).png b/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x (1).png new file mode 100644 index 00000000..8c6e0bca Binary files /dev/null and b/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x (1).png differ diff --git a/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x.png b/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x.png deleted file mode 100644 index 44c44cee..00000000 Binary files a/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/1@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/Contents.json b/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/Contents.json index 6e1d814b..89d6af5f 100644 --- a/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/Contents.json +++ b/YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "1@3x.png", + "filename" : "1@3x (1).png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/20.20.59/entrance_activities.imageset/游戏@3x.png b/YuMi/Assets.xcassets/20.20.59/entrance_activities.imageset/游戏@3x.png index 5b1c5d7e..e9d24e2f 100644 Binary files a/YuMi/Assets.xcassets/20.20.59/entrance_activities.imageset/游戏@3x.png and b/YuMi/Assets.xcassets/20.20.59/entrance_activities.imageset/游戏@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/Contents.json index 82008047..fa4cb2eb 100644 --- a/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "游戏@3x(1).png", + "filename" : "游戏@3x (1).png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x (1).png b/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x (1).png new file mode 100644 index 00000000..b7d61380 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x (1).png differ diff --git a/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x(1).png b/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x(1).png deleted file mode 100644 index e2b5bfd1..00000000 Binary files a/YuMi/Assets.xcassets/Language/ar/entrance_activities_ar.imageset/游戏@3x(1).png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/Contents.json index ab6162ea..20d244f5 100644 --- a/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "游戏@3x.png", + "filename" : "游戏@3x (3).png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x (3).png b/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x (3).png new file mode 100644 index 00000000..e0c6e3a3 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x (3).png differ diff --git a/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x.png b/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x.png deleted file mode 100644 index f9c157ef..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/entrance_activities_en.imageset/游戏@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/Contents.json b/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/Contents.json index e86c2eae..d643df58 100644 --- a/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "游戏@3x(2).png", + "filename" : "游戏@3x (2).png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x (2).png b/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x (2).png new file mode 100644 index 00000000..1a7df5a4 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x (2).png differ diff --git a/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x(2).png b/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x(2).png deleted file mode 100644 index 14bfe2fc..00000000 Binary files a/YuMi/Assets.xcassets/Language/tr/entrance_activities_tr.imageset/游戏@3x(2).png and /dev/null differ diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index f7a73a4f..a03635fd 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/YuMi/Global/YUMIMacroUitls.h @@ -46,7 +46,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns #define kFontHeavy(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightHeavy] ///内置版本号 -#define PI_App_Version @"1.0.27.1" +#define PI_App_Version @"1.0.28" ///渠道 #define PI_App_Source @"appstore" #define PI_Test_Flight @"TestFlight" diff --git a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m b/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m index a9a21635..fdd9e182 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/EventCenterEventCell.m @@ -160,6 +160,7 @@ self.nameLabel.text = model.nick; self.idLabel.text = [NSString stringWithFormat:@"ID:%@", model.erbanNo]; self.eventDescLabel.text = model.eventTopic; + self.subLabel.text = @(model.subNum).stringValue; self.sexImageView.image = model.gender == 1 ? kImage(@"common_male") : kImage(@"common_female"); @@ -379,7 +380,7 @@ _eventDescLabel = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor colorWithWhite:1 alpha:1]]; - _eventDescLabel.numberOfLines = 0; + _eventDescLabel.numberOfLines = 1; } return _eventDescLabel; } diff --git a/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m b/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m index 384d9e8b..212d8228 100644 --- a/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m +++ b/YuMi/Modules/YMNewHome/View/CreateEventViewControllerV2.m @@ -18,8 +18,8 @@ #import "UIImage+Utils.h" #import "XPIAPRechargeViewController.h" -#define MAX_EVENT_TITLE_LENGTH 20 -#define MAX_EVENT_CONTENT_LENGTH 100 +#define MAX_EVENT_TITLE_LENGTH 50 +#define MAX_EVENT_CONTENT_LENGTH 1000 @interface CreateEventViewControllerV2 () @property (nonatomic, strong) EventConfigModel *configModel; @@ -170,8 +170,22 @@ static const CGFloat kSectionSpacing = 20.0; #pragma mark - CreateEventPresenterProcotol - (void)loadCongfigSuccess:(EventConfigModel *)model { _configModel = model; - self.uploadBannerLabel.text = [NSString stringWithFormat:YMLocalizedString(@"20.20.59_text_11"), - @(model.goldNum)]; + NSString *moneyString = @(model.goldNum).stringValue; + NSTextAttachment *icon = [[NSTextAttachment alloc] init]; + icon.bounds = CGRectMake(0, -8, 24, 24); + icon.image = kImage(@"moli_money_icon"); + NSDictionary *par = @{ + NSFontAttributeName: self.uploadBannerLabel.font, + NSForegroundColorAttributeName: self.uploadBannerLabel.textColor + }; + NSAttributedString *firstPart = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:YMLocalizedString(@"20.20.59_text_11"), + @(model.goldNum)] + attributes:par]; + NSAttributedString *iconString = [NSAttributedString attributedStringWithAttachment:icon]; + NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithAttributedString:firstPart]; + NSRange r = [string.string rangeOfString:moneyString]; + [string insertAttributedString:iconString atIndex:r.location]; + self.uploadBannerLabel.attributedText = string.copy; } - (void)loadCongfigFailure:(NSString *)msg { diff --git a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h b/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h index 152790f1..b29a3f36 100644 --- a/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h +++ b/YuMi/Modules/YMRoom/Model/ActivityInfoModel.h @@ -81,5 +81,7 @@ typedef NS_ENUM(NSInteger, ActivityType) { @property (nonatomic, copy) NSString *appKey; @property (nonatomic, assign) NSInteger gameId; +@property (nonatomic, copy) NSString *urlParam; + @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m index 416ce7ca..7352a2b0 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/LuckyGiftWinningBannerView.m @@ -308,6 +308,7 @@ exitCurrentRoom:(void(^)(void))exit { if (!_backgroundImageView) { _backgroundImageView = [[UIImageView alloc] initWithImage:[kImage(@"luck_gift_flag") ms_SetImageForRTL]]; _backgroundImageView.contentMode = UIViewContentModeScaleAspectFit; + _backgroundImageView.alpha = 0.9; } return _backgroundImageView; } diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m index 566d1c39..52a95276 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m @@ -23,7 +23,7 @@ ///VIP的类型 @property (nonatomic,strong) NetImageView *nobleTypeImageView; ///是否是VIP🔐 -@property (nonatomic,strong) UIImageView *nobleLockImageView; +//@property (nonatomic,strong) UIImageView *nobleLockImageView; ///覆盖的背景 @property (nonatomic,strong) UIView * coverView; @end @@ -45,7 +45,7 @@ [self.contentView addSubview:self.coverView]; [self.contentView addSubview:self.nobleTypeImageView]; [self.contentView addSubview:self.faceTitleLabel]; - [self.contentView addSubview:self.nobleLockImageView]; +// [self.contentView addSubview:self.nobleLockImageView]; } - (void)initSubViewConstraints { @@ -70,10 +70,10 @@ make.top.mas_equalTo(self.faceImageView.mas_bottom).offset(4); }]; - [self.nobleLockImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(11, 11)); - make.bottom.trailing.mas_equalTo(self.faceImageView); - }]; +// [self.nobleLockImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.size.mas_equalTo(CGSizeMake(11, 11)); +// make.bottom.trailing.mas_equalTo(self.faceImageView); +// }]; } #pragma mark - Getters And Setters - (void)setChatFace:(ChatFaceVo *)chatFace { @@ -91,14 +91,14 @@ if (_faceInfo.faceVipInfo) { self.nobleTypeImageView.imageUrl = _faceInfo.faceVipInfo.vipIcon; self.nobleTypeImageView.hidden = NO; - if (_faceInfo.faceVipInfo.vipLevel > self.vipLevel) { - self.nobleLockImageView.hidden = NO; - } else { - self.nobleLockImageView.hidden = YES; - } +// if (_faceInfo.faceVipInfo.vipLevel > self.vipLevel) { +// self.nobleLockImageView.hidden = NO; +// } else { +// self.nobleLockImageView.hidden = YES; +// } } else { self.nobleTypeImageView.hidden = YES; - self.nobleLockImageView.hidden = YES; +// self.nobleLockImageView.hidden = YES; } } } @@ -120,13 +120,13 @@ return _nobleTypeImageView; } -- (UIImageView *)nobleLockImageView { - if (!_nobleLockImageView) { - _nobleLockImageView = [[UIImageView alloc] init]; - _nobleLockImageView.image = [UIImage imageNamed:@"room_face_nobel_lock"]; - } - return _nobleLockImageView; -} +//- (UIImageView *)nobleLockImageView { +// if (!_nobleLockImageView) { +// _nobleLockImageView = [[UIImageView alloc] init]; +// _nobleLockImageView.image = [UIImage imageNamed:@"room_face_nobel_lock"]; +// } +// return _nobleLockImageView; +//} - (UILabel *)faceTitleLabel { if (!_faceTitleLabel) { diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m index fe838ded..a628d9fc 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m +++ b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m @@ -74,7 +74,7 @@ - (void)viewDidAppear:(BOOL)animated { [super viewDidAppear:animated]; [UIView animateWithDuration:0.5 animations:^{ - self.topView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.2]; + self.topView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.0]; }]; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m index 079bdaa2..7d2adaf3 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/GiftComboView.m @@ -250,7 +250,11 @@ #pragma mark - - (void)setupCurrentGold:(double)gold { self.comboGoldNum = gold; - self.comboGoldLabel.text = @(gold).stringValue; + NSString *formattedGold = [NSString stringWithFormat:@"%.2f", gold]; + if ([formattedGold hasSuffix:@".00"]) { + formattedGold = [formattedGold substringToIndex:formattedGold.length - 3]; + } + self.comboGoldLabel.text = formattedGold; } - (void)addToGoldQueue:(NSString *)goldString { diff --git a/YuMi/Modules/YMWeb/MSRoomGameWebVC.m b/YuMi/Modules/YMWeb/MSRoomGameWebVC.m index fb02c538..e3335596 100644 --- a/YuMi/Modules/YMWeb/MSRoomGameWebVC.m +++ b/YuMi/Modules/YMWeb/MSRoomGameWebVC.m @@ -302,12 +302,21 @@ NSString * const kJPClose = @"newTppClose"; if (self.gameModel.showType == ActivityShowType_Full) { url = [url stringByAppendingFormat:@"&safeTop=1"]; } + url = [url stringByAppendingFormat:@"&roomId=%ld", + (long)self.hostDelegate.getRoomInfo.uid]; break; case MSGameTypeCC: + url = [url stringByAppendingFormat:@"&roomid=%ld", + (long)self.hostDelegate.getRoomInfo.uid]; + break; default: break; } + if (![NSString isEmpty:self.gameModel.gameModel.urlParam]) { + url = [url stringByAppendingString:[NSString stringWithFormat:@"&%@", self.gameModel.gameModel.urlParam]]; + } + if (isMSEN()) { url = [url stringByAppendingFormat:@"&lang=%@", @"en-US"]; } else if (isMSTR()) { @@ -319,8 +328,7 @@ NSString * const kJPClose = @"newTppClose"; } url = [url stringByAppendingFormat:@"&token=%@", self.gameModel.gameModel.code]; url = [url stringByAppendingFormat:@"&uid=%@", [AccountInfoStorage instance].getUid]; - url = [url stringByAppendingFormat:@"&roomid=%ld", (long)self.hostDelegate.getRoomInfo.uid]; - + return [NSURL URLWithString:url]; }