From 93c33046019c88859074bbf12998b0d6049c1784 Mon Sep 17 00:00:00 2001 From: edwinQQQ Date: Wed, 8 Jan 2025 12:10:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20UI=20=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../room_position_lock.imageset/Contents.json | 3 +- .../room_position_lock@2x.png | Bin 1665 -> 0 bytes .../room_position_lock@3x.png | Bin 2708 -> 0 bytes .../组 8307@3x.png | Bin 0 -> 5476 bytes .../Contents.json | 3 +- .../room_position_normal@2x.png | Bin 877 -> 0 bytes .../room_position_normal@3x.png | Bin 1380 -> 0 bytes .../组 8307@3x (1).png | Bin 0 -> 4593 bytes YuMi/CustomUI/Adbvertise/XPAdvertiseView.m | 2 +- .../Cell/Friend/XPMineFansTableViewCell.m | 24 +++------------ .../View/RoomMode/RoomModeViewController.m | 26 +++++++++++++--- .../View/UserRoomCardViewController.m | 29 ++++++++++++------ .../YMRoom/View/XPRoomViewController.m | 8 ++--- YuMi/en.lproj/Localizable.strings | 1 + 14 files changed, 54 insertions(+), 42 deletions(-) delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png create mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/组 8307@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png create mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/组 8307@3x (1).png diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/Contents.json index bd58c2b0..8d95a6fb 100644 --- a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/Contents.json +++ b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/Contents.json @@ -5,12 +5,11 @@ "scale" : "1x" }, { - "filename" : "room_position_lock@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "room_position_lock@3x.png", + "filename" : "组 8307@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png deleted file mode 100644 index 0fe6c7c889df6f9cf5cf638233674dcaa32ee2b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1665 zcma)6Sx^%O5RC{1F##=z5GVqPR7DiAs9>sw1i~dlL8}~!KtM#QQt;xcAh%I&sVz4| zh~Wy5gm48y5&{N@Bpl)tiy}}j%!pv+*oOap^v&#hGrMnhXZB;$+}+4%4U7f?fj~Ps zl01}3Sqt^`N+#ojf)R*yH{4xM+5>!J$18oc%dZDKdI>j*12fT^3E^a4q1;7}C+A$Ed!jn$unSsek zVDg}N1j>hi%Ymu^C>sSn2dZVz#f9!}XdH#wzkoFk!Y3e|f!A|uqm~&43m8J^sDUmzRQ5r2H`Mch z&4GqCC>jQu1h`GmRtr5PP(BEva-fT#iMzI|a1^S<(AWYkOz3_DWlw?G4jdNntDsm0 z75&gw4+0vL3_)KJc&~}(xi7@K9T$50)sj!d=#nqaCu`nl&n$73Ebvix_Dz;WO zb}RpG!U3Nx9tdN>>4UGz#7;sTk85{zJ*8&pUiO^vBQJM_a@BsbRvRtrd%JO$P3{(H zqUD?176)gKvD@hu6uLRC{-SG%UMR8P)w}g!Rkqu$lI{8mh+30v)#SbhiAAP04I4J1kx|sZJZtrQX#}p=z~2y+*vQ=+ z5TA91a=pSdRX;JcFU-+6#!|;mwb3{`o@x2a$mT+P*O{4dlOTetDJl24ao@V~aJg#* zsq1RU#SNxE%Tg_VB|EE7$+>Yv!%=*|5uT}0(k=DRafFx+pEgfJg1gG6&32z0x2`nI zb#MZg7IGFhiAOtrC;Cn`6*n(`?adi{F~NJm>n5LQ|AUyWCg&WUw>@ZPCOUm(U95%> zMMnitWp$o`Q8CMkSDqz<=Xcnvua6ygcS%2mJ=e@SYBkY@M~_=(oBH}sW33ie3@eaG zVqm0t(~o%j^xNWlv(Y&1Nxz#m-aM7BI@$tlJqj`8T?)>C{PuIuZ%&E;iV4|dvY@Uv zGpaqA@P)6pF4>MhvpYkM(Mu#ycN!$cL>H4o(K-PPy)2D8)mnaCD6ip=m@}xaJN2=; z1QTs-86(26F^!PA6|0iwnlY0Z9HEhvs#mIp`Xx3BpAz=7+XT};a=$ed(a(c8J zTzU&>H7KopMZX*R#Dt9oOM|vxY>WoTm$;a3Yf=U;AKqT7Q2Z_9_-Ss7RKMQLo}zl! zC`z9d7%pAJM>l&O@*PV%mVIEMcAR}JJQ&}WTyWFnE=43Qnmv|56ERL;1pE%_dV09^ zD&;}|e#qE4AU`iY^60|xg7wT&Vp!5yW8^njpBl{`(RXM*qE)UXa0sl^3g0UfweAqp zCbVsFvDZ1m;sR%C9fl(9UR~D2iR4pP-xiK9%Wf`yc)JPhLAruVev`KUpsoe(g14wr zEHzFq=a7gG75nX$N8IfNpJpPk)RIFth%AQy{12Gbc5~~<)Ki2jo}3`ja}N2&dwj9} zi_@WO`Yd|!&jQ6eufsn*RIEG-?!I@-w%VDxk7uxLarVCE7ozmz2+MyY$;&9nJ~z+* z@+D0|tj)mZf6ils%zgv5EdNPDoNx5}KPum)^-D04vzFQ$tDd=7W2Q2{#|GCS$>V;J zzvOHyjA5JmgnsCIu;D=F;ZqU$gTryY<%{LUA7@+)R(1}NH1gZyGOWt3nnjxz^jbYu zon7!yiBt$(hYL$Bg_3HV{H)hcC#QLxk~^9%uP+?gmskA0Y<4c)Eq#@bUL9FTx{ukv z`v*?$SOhC~O!w3TPiiQu?XNuUI6fWN;op1NdXGgJKl{48em;YJZsomLiy`__Zlx_% QRX#L?lf4_M*6w`5zg2*imjD0& diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png deleted file mode 100644 index a225ba73c72350d84e43cea438f91d4749015a31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2708 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 ac>fRY|Gf$5=;M1%flMGtYY^P({{?81 zQb~|suqK0zuBCyQ@fI$%*{mz1_}OJl?Ulua9!$(Wu>QjG_WH`$H~Ojk3=B*YJzX3_ zGVX1;d^7L1fk5lS$C2K%u02yNoGsRS|G(nuZJu+E^l3&ts<;2qz{nRS?A>m+Y1V}@ z@1#>3?U$_FK6%0ghmJE-CF_&ZN|l975+zmM^!P}ICz)=FozcC-Ei>Ux2m2+pvkp!w z$tlT;CEmF(oiH?1Z?T>rqTj(I9ISb%W1+$1WgIW3NE|iHG?%?O`SH3r--0K4^jIf% zO`ht|s&I+*h~v+fZ?(#$}R$Sifqm!=i;wV)vCB z15~-*3s|grVgY1oa^-uJgq(V;J&EJ$qAyKf+Oi`5H%Tmx%K1NWTEL~k&(f@czxi+S zYP|SaVl`FcaGs0T{;iS|-?#pEdg)Qub7K3Ul?hiRylzcVy4J(7MQ@RW;KN-Ur@1-< z#2Hm(mY6BAe+iS`D0eYiS?*wzbYNR?Zi{SC#~Sx1>5@tUDb;cFt81htwjckxQ@Mzf zV`ty;+kc(Z4vFoYXLN$uC|6yfewOKW8J0wij(aBN4ou5FsUBSM`~K3EbyxPMMOl`Z z1ql6`VO<>8>iX=H(!o=!?<`*v{p;IH_t{fL&iLMs6`%a%lUUu0=SLJQHuSD-|;;O)jwb f|EOTy!-9PEWV1!3%0&slq|D&y>gTe~DWM4fsphMs diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png deleted file mode 100644 index ac8e2b7c55692696f98abe95331b74c14181226a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1380 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 b^1%Cl>?y|jl+Gcp00000NkvXXu0mjf1NWVo literal 0 HcmV?d00001 diff --git a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m index dde39cb3..e9089c49 100644 --- a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m +++ b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m @@ -225,7 +225,7 @@ static int const showtime = 3; NSAttributedString *string = [[NSAttributedString alloc] initWithString:content attributes:@{ NSFontAttributeName: kFontMedium(kGetScaleWidth(24)), - NSForegroundColorAttributeName: UIColorFromRGB(0xF9F8CF) + NSForegroundColorAttributeName: UIColorFromRGB(0xFDF565) }]; [self.svgaView setAttributedText:string forKey:key]; diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m index 562bb3f4..7dcecb7d 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m @@ -79,7 +79,6 @@ [self.stackView addArrangedSubview:self.nickLabel]; -// [self.stackView addArrangedSubview:self.sexImageView]; [self.stackView addArrangedSubview:self.experImageView]; [self.stackView addArrangedSubview:self.charmImageView]; [self.stackView addArrangedSubview:self.nobleImageView]; @@ -136,9 +135,7 @@ _fansInfo = fansInfo; if (_fansInfo) { self.avatarImageView.imageUrl = _fansInfo.avatar; -// if(_fansInfo.nick.length > 5){ -// _fansInfo.nick = [NSString stringWithFormat:@"%@...",[_fansInfo.nick substringToIndex:5]]; -// } + self.nickLabel.text = _fansInfo.nick; self.signLabel.text = _fansInfo.userDesc && _fansInfo.userDesc.length > 0? _fansInfo.userDesc : YMLocalizedString(@"XPMineFansTableViewCell0"); if (_fansInfo.useingType != ContactUseingType_In_Room && _fansInfo.useingType != ContactUseingType_Share) { @@ -158,18 +155,6 @@ self.attentionButton.enabled = !isMyFriend; self.attentionButton.hidden = NO; - if (isMyFriend) { - [self.attentionButton setCornerRadius:15 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:0 - borderColor:[UIColor clearColor]]; - } else { - [self.attentionButton setCornerRadius:15 - corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner - borderWidth:1 - borderColor:UIColorFromRGB(0xFF8C03)]; - } - UIImage *nobleImage = self.nobleImageView.image; if (nobleImage) { CGFloat scale = nobleImage.size.width / nobleImage.size.height; @@ -293,11 +278,12 @@ [_attentionButton setBackgroundImage:[UIImage imageWithColor:[UIColor whiteColor]] forState:UIControlStateNormal]; [_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell2") forState:UIControlStateDisabled]; - [_attentionButton setTitleColor:UIColorFromRGB(0xffffff) forState:UIControlStateDisabled]; - [_attentionButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateDisabled]; [_attentionButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - + [_attentionButton setCornerRadius:15 + corners:kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner + borderWidth:1 + borderColor:UIColorFromRGB(0xFF8C03)]; [_attentionButton setCornerRadius:15]; } return _attentionButton; diff --git a/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m b/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m index ec36a5b8..1fcfce18 100644 --- a/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m +++ b/YuMi/Modules/YMRoom/View/RoomMode/RoomModeViewController.m @@ -21,6 +21,7 @@ @property(nonatomic, strong) SVGAParser *parser; @property(nonatomic, strong) UILabel *nameLabel; @property(nonatomic, assign) BOOL isForRoomType; +@property(nonatomic, copy) NSString *roomTypeImageName; + (void)registerTo:(UICollectionView *)collectionView; + (RoomModeCollectionCell *)cellFro:(UICollectionView *)collectionView indexPath:(NSIndexPath *)indexPath displayName:(BOOL)displayName; @@ -79,6 +80,10 @@ self.imageView.image = kImage(@"room_mode_default_skin"); }else { self.imageView.image = kImage(@"room_mic_normal"); + [self.imageView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.center.mas_equalTo(self.statusView); + make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.9); + }]; } } else { if (micInfoModel.dressType == MicResourceType_Skin) { @@ -92,7 +97,8 @@ - (void)setIsForRoomType:(BOOL)isForRoomType { _isForRoomType = isForRoomType; if (isForRoomType) { - [self.imageView mas_updateConstraints:^(MASConstraintMaker *make) { + [self.imageView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.center.mas_equalTo(self.statusView); make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.8); }]; } @@ -102,7 +108,6 @@ if (!_svgaImageView) { [self.contentView addSubview:self.svgaImageView]; [self.svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self.imageView); make.center.mas_equalTo(self.statusView); make.width.height.mas_equalTo(self.statusView.mas_height).multipliedBy(0.85); }]; @@ -146,6 +151,10 @@ self.statusView.layer.borderWidth = selected ? 1 : 0; self.statusView.backgroundColor = selected ? UIColorRGBAlpha(0xFF8C03, 0.1) : UIColorFromRGB(0x1b1b1d); self.nameLabel.textColor = [UIColor colorWithWhite:1 alpha:selected ? 1 : 0.5]; + if (self.isForRoomType) { + NSString *imageName = [NSString stringWithFormat:@"%@_%@", self.roomTypeImageName, selected ? @"on" : @"off"]; + self.imageView.image = kImage(imageName); + } } - (UIView *)statusView { @@ -323,7 +332,7 @@ [self.contentView addSubview:self.expToNextLabel]; [self.expToNextLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.backgroundImageView); - make.bottom.mas_equalTo(self.backgroundImageView).offset(-16); + make.bottom.mas_equalTo(self.backgroundImageView).offset(-13); make.height.mas_equalTo(18); }]; } @@ -494,9 +503,11 @@ NSDictionary *dic = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; if (dic) { cell.selected = [[dic objectForKey:@"isUses"] boolValue]; - NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.isSelected ? @"on" : @"off"]; + NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.selected ? @"on" : @"off"]; cell.imageView.image = kImage(imageName); + cell.roomTypeImageName = [NSString stringWithFormat:@"room_mode_mic_%@", [dic objectForKey:@"type"]]; + cell.nameLabel.text = [dic objectForKey:@"name"]; } @@ -504,6 +515,13 @@ } - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { +// RoomModeCollectionCell *cell = [RoomModeCollectionCell cellFro:collectionView indexPath:indexPath displayName:YES]; +// NSDictionary *dic = [self.dataSource xpSafeObjectAtIndex:indexPath.row]; +// if (dic) { +// NSString *imageName = [NSString stringWithFormat:@"room_mode_mic_%@_%@", [dic objectForKey:@"type"], cell.selected ? @"on" : @"off"]; +// cell.imageView.image = kImage(imageName); +// } + if (_updateSelectedType) { RoomType selectedType = RoomType_Game; switch (indexPath.row) { diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m index 998a6575..3a51f9ce 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/UserRoomCardViewController.m @@ -1087,6 +1087,8 @@ @property(nonatomic, assign) BOOL upMicFlag; @property(nonatomic, assign) CGFloat collectionHeight; +@property(nonatomic, strong) UIView *toastView; + @end @implementation UserRoomCardViewController @@ -1224,8 +1226,6 @@ } break; case UserCardItemType_Manager: { - [TTPopup popupView:[self managerLimitToast] style:TTPopupStyleAlert]; - return; if (item.isSelect) { if ([self isSuperUser]) { [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"1" roomUid:roomUid isSet:!item.isSelect]; @@ -1242,7 +1242,7 @@ [self.presenter makeUserManager:self.cardInfo.uid roomId:roomId enable:!item.isSelect]; } } failure:^(NSError * _Nonnull error) { - if (error.code == 20505) { + if (error.code == 20504) { // 管理员数量已达上限 [TTPopup popupView:[self managerLimitToast] style:TTPopupStyleAlert]; } }]; @@ -1261,8 +1261,12 @@ } } +- (void)removeManagerLimitToast { + [TTPopup dismiss]; +} + - (UIView *)managerLimitToast { - UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(290))]; + UIView *view = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth-80, kGetScaleWidth(410))]; [view setBackgroundColor:[UIColor whiteColor]]; [view setCornerRadius:16]; @@ -1271,7 +1275,10 @@ UILabel *tipContentLabel = [UILabel labelInitWithText:YMLocalizedString(@"1.0.33_text_19") font:kFontMedium(15) textColor:UIColorFromRGB(0x313131)]; tipContentLabel.numberOfLines = 0; UIImageView *ruleImageView = [[UIImageView alloc] initWithImage:kImage(@"room_manager_limit")]; +// ruleImageView.contentMode = UIViewContentModeScaleAspectFit; UIButton *confirmButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [confirmButton addTarget:self action:@selector(removeManagerLimitToast) forControlEvents:UIControlEventTouchUpInside]; + [confirmButton setTitle:YMLocalizedString(@"TTAlertConfig0") forState:UIControlStateNormal]; [confirmButton setCornerRadius:18]; [confirmButton addGradientBackgroundWithColors:@[ UIColorFromRGB(0xE29030), UIColorFromRGB(0xFCC074) @@ -1292,18 +1299,20 @@ make.leading.trailing.mas_equalTo(view).inset(23); }]; - [ruleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.mas_equalTo(tipContentLabel); - make.top.mas_equalTo(tipContentLabel.mas_bottom).offset(12); - make.height.mas_equalTo(kGetScaleWidth(238)); - }]; - [confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(view).offset(-14); make.leading.trailing.mas_equalTo(tipContentLabel); make.height.mas_equalTo(36); }]; + [ruleImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.mas_equalTo(tipContentLabel); + make.top.mas_equalTo(tipTitleLabel.mas_bottom).offset(70); + make.bottom.mas_equalTo(confirmButton.mas_top).offset(-10); +// make.top.mas_equalTo(view).offset(kGetScaleWidth(10)); +// make.bottom.mas_equalTo(view.mas_bottom).offset(-kGetScaleWidth(60)); + }]; + return view; } diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index c8088360..5c804151 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -1861,10 +1861,10 @@ XPCandyTreeInsufficientBalanceViewDelegate> NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; - NSLog(@" --- Message Content class: %@", [notiMsg.content class]); - if ([notiMsg.content isKindOfClass:[NIMUnsupportedNotificationContent class]]) { - NSLog(@"Fuck %@", message); - } +// NSLog(@" --- Message Content class: %@", [notiMsg.content class]); +// if ([notiMsg.content isKindOfClass:[NIMUnsupportedNotificationContent class]]) { +// NSLog(@"Fuck %@", message); +// } if (![notiMsg.content isKindOfClass:[NIMChatroomNotificationContent class]]) { return; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index bb727370..5efefa4e 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -3848,3 +3848,4 @@ "1.0.33_text_17" = "1. You can contact the official customer service and provide relevant evidence to improve the star rating.\n2. The star rating is divided into 1~5 stars.5 stars is the best recharge agent.\n3. The star rating will be displayed when the user found the recharge agent.\n4. The higher the star rating, the higher the ranking in the transfer list.\n5. All interpretation rights belong to the official and have nothing to do with Google or Apple."; "1.0.33_text_18" = "Room Lv. >=%@ Can be used"; "1.0.33_text_19" = "The number of admins corresponding to your current room level is full, please upgrade first and then add!"; +