From 6af3be305fb10c002e3489ff04aafe5eaad20f00 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Fri, 15 Nov 2024 16:33:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=AD=A3=E9=98=BF?= =?UTF-8?q?=E8=AF=AD=E6=88=BF=E9=97=B4=E8=83=8C=E6=99=AF=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YMRoom/Model/CustomRoomBGItemModel.m | 8 ++-- .../View/AnimationView/XPRoomAnimationView.m | 37 ++++++++++--------- YuMi/ar.lproj/Localizable.strings | 2 +- YuMi/en.lproj/Localizable.strings | 2 +- YuMi/tr.lproj/Localizable.strings | 2 +- YuMi/zh-Hant.lproj/Localizable.strings | 2 +- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m b/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m index 1535ff41..c1945ebc 100644 --- a/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m +++ b/YuMi/Modules/YMRoom/Model/CustomRoomBGItemModel.m @@ -23,10 +23,10 @@ } - (NSString *)pricePerDays { - return [NSString stringWithFormat:@"%@/%@%@", - @(self.goldPrice), - @(self.buyHour/24), - YMLocalizedString(@"1.0.18_8")]; + NSString *content =[NSString stringWithFormat:@"%@/%@", + @(self.goldPrice), + @(self.buyHour/24)]; + return [NSString stringWithFormat:YMLocalizedString(@"1.0.18_8"), content]; } - (BOOL)isAlreadyPay { diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m index f42d4bf1..3bdeae83 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m @@ -1086,24 +1086,6 @@ HWDMP4PlayDelegate> } - (void)playUserEnterRoomAnimation:(NSString *)title experLevelSeq:(NSInteger)experLevelSeq effectPath:(NSString *)effectPath { - NSString * path; - if (experLevelSeq >= 30 && experLevelSeq <= 39) { - path = @"svga_member_in_lv30"; - } else if (experLevelSeq >= 40 && experLevelSeq <= 49) { - path = @"svga_member_in_lv40"; - } else if (experLevelSeq >= 50 && experLevelSeq <= 59) { - path = @"svga_member_in_lv50"; - } else if (experLevelSeq >= 60 && experLevelSeq <= 69) { - path = @"svga_member_in_lv60"; - } else if (experLevelSeq >= 70 && experLevelSeq <= 79) { - path = @"svga_member_in_lv70"; - } else if (experLevelSeq >= 80 && experLevelSeq <= 89) { - path = @"svga_member_in_lv80"; - } else { - path = @"svga_member_in_lv90"; - } - NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/%@.svga", API_Image_URL, path]; - if (self.enterEffectView.superview == nil) { self.enterEffectView.frame = CGRectMake(KScreenWidth, 339 + kSafeAreaTopHeight, KScreenWidth, effectPath.length ? 75 : 40); [self.lowLevelView addSubview:self.enterEffectView]; @@ -1123,8 +1105,26 @@ HWDMP4PlayDelegate> [self.enterEffectView setAttributedText:attribute forKey:@"room_text"]; [self.enterEffectView startAnimation]; } failureBlock:^(NSError * _Nonnull error) { + NSLog(@"%@", error); }]; } else { + NSString * path; + if (experLevelSeq >= 30 && experLevelSeq <= 39) { + path = @"svga_member_in_lv30"; + } else if (experLevelSeq >= 40 && experLevelSeq <= 49) { + path = @"svga_member_in_lv40"; + } else if (experLevelSeq >= 50 && experLevelSeq <= 59) { + path = @"svga_member_in_lv50"; + } else if (experLevelSeq >= 60 && experLevelSeq <= 69) { + path = @"svga_member_in_lv60"; + } else if (experLevelSeq >= 70 && experLevelSeq <= 79) { + path = @"svga_member_in_lv70"; + } else if (experLevelSeq >= 80 && experLevelSeq <= 89) { + path = @"svga_member_in_lv80"; + } else { + path = @"svga_member_in_lv90"; + } + NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/%@.svga", API_Image_URL, path]; @kWeakify(self); [self.parser parseWithURL:[NSURL URLWithString:anatomiser1Name] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { @kStrongify(self); @@ -1136,6 +1136,7 @@ HWDMP4PlayDelegate> [self.enterEffectView setAttributedText:attribute forKey:@"room_text"]; [self.enterEffectView startAnimation]; } failureBlock:^(NSError * _Nonnull error) { + NSLog(@"%@", error); }]; } [UIView animateWithDuration:0.5 animations:^{ diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 3b9f9a7a..1e5f2630 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -3976,7 +3976,7 @@ ineHeadView12" = "الحمل"; سوف نراجع الخلفية التي تم تحميلها خلال 24 ساعة. \nإذا تم رفض الخلفية، فسوف تتلقى استردادًا للعملات."; "1.0.18_7" = "انتهاء الصلاحية"; -"1.0.18_8" = "أيام"; +"1.0.18_8" = "أيام%@"; "1.0.18_9" = "شراء"; "1.0.18_10" = "تجديد"; "1.0.18_11" = "تلميح شراء"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 1dd415f9..391d0580 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -3769,7 +3769,7 @@ "1.0.18_5" = "You can customize up to 6 backgrounds."; "1.0.18_6" = "You can only upload up to 6 images at a time as a custom background. \nOnce the background is created, it cannot be canceled. \nWe will review the uploaded background within 24 hours. \nIf the background is rejected, you will receive a refund of coins."; "1.0.18_7" = "Expired"; -"1.0.18_8" = "Days"; +"1.0.18_8" = "%@Days"; "1.0.18_9" = "Buy"; "1.0.18_10" = "Renew"; "1.0.18_11" = "Purchases Tips"; diff --git a/YuMi/tr.lproj/Localizable.strings b/YuMi/tr.lproj/Localizable.strings index 2bd47b00..f44a6fb3 100644 --- a/YuMi/tr.lproj/Localizable.strings +++ b/YuMi/tr.lproj/Localizable.strings @@ -3555,7 +3555,7 @@ "1.0.18_5" = "En fazla 6 arka planı özelleştirebilirsiniz."; "1.0.18_6" = "Özel arka plan olarak aynı anda en fazla 6 resim yükleyebilirsiniz. \nArka plan oluşturulduktan sonra iptal edilemez. \nYüklenen arka planı 24 saat içinde inceleyeceğiz. \nArka plan reddedilirse, jeton iadesi alacaksınız."; "1.0.18_7" = "Süresi doldu"; -"1.0.18_8" = "Günler"; +"1.0.18_8" = "%@Günler"; "1.0.18_9" = "Satın Al"; "1.0.18_10" = "Yenile"; "1.0.18_11" = "Satın Alma İpucu"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index c5c6bbcf..a447fe81 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -3425,7 +3425,7 @@ "1.0.18_5" = "您最多可以自定義 6 個背景。"; "1.0.18_6" = "您一次最多只能上传 6 张图片作为自定义背景。\n 背景一旦创建,就无法取消。\n我们将在 24 小时内审核上传的背景。\n 如果背景被拒绝,您将收到金币退款。"; "1.0.18_7" = "過期"; -"1.0.18_8" = "天"; +"1.0.18_8" = "%@天"; "1.0.18_9" = "買"; "1.0.18_10" = "更新"; "1.0.18_11" = "購買提示";