移除与“精灵夺宝”相关的代码和逻辑，优化 UI 元素的约束设置，增强按钮的适应性和可读性，同时更新本地化字符串以确保准确性。

2025-09-18 14:22:39 +08:00
parent 888098e2a5
commit ddd54b96c5
15 changed files with 108 additions and 375 deletions
--- a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m
+++ b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m
@@ -56,7 +56,7 @@ static int const showtime = 3;
 		[self addSubview:self.countdownButton];
        [self.countdownButton mas_makeConstraints:^(MASConstraintMaker *make) {
            make.trailing.mas_equalTo(-24);
-            make.width.mas_equalTo(60);
+//            make.width.mas_equalTo(60);
            make.height.mas_equalTo(30);
            make.top.mas_equalTo(40);
        }];
@@ -279,6 +279,8 @@ static int const showtime = 3;
 		[_countdownButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
 		_countdownButton.backgroundColor = [UIColor colorWithRed:38 /255.0 green:38 /255.0 blue:38 /255.0 alpha:0.6];
 		_countdownButton.layer.cornerRadius = 4;
+        _countdownButton.contentEdgeInsets = UIEdgeInsetsMake(0, 8, 0, 8);
+        [_countdownButton sizeToFit];
 	}
 	return _countdownButton;
 }
--- a/YuMi/Modules/YMLogin/View/LoginViewController.m
+++ b/YuMi/Modules/YMLogin/View/LoginViewController.m
@@ -116,8 +116,9 @@ typedef NS_ENUM(NSUInteger, LoginType) {
        make.trailing.mas_equalTo(self.view).offset(-16);
        make.top.mas_equalTo(self.view).offset(kStatusBarHeight);
        make.height.mas_equalTo(22);
-        make.width.mas_greaterThanOrEqualTo(84);
+//        make.width.mas_lessThanOrEqualTo(200); // 设置最大宽度防止过长
    }];
+    [self.view setNeedsLayout];
 }

 - (void)setupBottomPolicy {
@@ -434,14 +435,20 @@ typedef NS_ENUM(NSUInteger, LoginType) {
    UIButton *feedBackButton = [UIButton buttonWithType:UIButtonTypeCustom];
    [feedBackButton setTitle:YMLocalizedString(@"XPMineFeedbackViewController0") forState:UIControlStateNormal];
    [feedBackButton setTitleColor:UIColorFromRGB(0x313131) forState:UIControlStateNormal];
+    [feedBackButton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, 10)];
    feedBackButton.titleLabel.font = kFontRegular(12);
+    // 设置文本自适应，防止截断
+//    feedBackButton.titleLabel.adjustsFontSizeToFitWidth = YES;
+//    feedBackButton.titleLabel.minimumScaleFactor = 0.8;
+//    feedBackButton.titleLabel.numberOfLines = 1;
    [feedBackButton setBackgroundImage:[[UIImage imageWithColor:[UIColor whiteColor]] imageByApplyingAlpha:0.5]
                              forState:UIControlStateNormal];
    [feedBackButton setCornerRadius:10.5];
    [feedBackButton addTarget:self
                    action:@selector(didTapFeedback)
          forControlEvents:UIControlEventTouchUpInside];
-    [feedBackButton enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)];
+    [feedBackButton sizeToFit];
+//    [feedBackButton enlargeTouchArea:UIEdgeInsetsMake(10, 10, 10, 10)];
    return feedBackButton;
 }

--- a/YuMi/Modules/YMMessage/Model/AttachmentModel.h
+++ b/YuMi/Modules/YMMessage/Model/AttachmentModel.h
@@ -106,7 +106,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
    ///免费礼物倒计时重置时间
    CustomMessageType_Free_Gift_Star_Reset_Time = 96,
    ///精灵密藏
-    CustomMessageType_Treasure_Fairy = 97,
+//    CustomMessageType_Treasure_Fairy = 97,
 	///寻爱之旅
 	CustomMessageType_Look_Love = 98,
    ///联系客服
@@ -646,40 +646,40 @@ typedef NS_ENUM(NSUInteger, CustomMessageGraffitiStarKitchen) {
    Custom_Message_Sub_Star_Kitchen_FullScreen = 1042,
 };
 ///夺宝精灵 CustomMessageType_Treasure_Fairy = 97,
-typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {
-    ///精灵赠送
-    Custom_Message_Sub_Treasure_Fairy_Send_Fairy = 9701,
-    ///索要精灵
-    Custom_Message_Sub_Treasure_Fairy_Ask_Fairy = 9702,
-
-
-     ///抽奖礼物
-    ///抽奖L1礼物
-    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L1 = 9711,
-    ///抽奖L2礼物
-    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L2 = 9712,
-    ///抽奖L3礼物
-    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L3 = 9713,
-    ///抽奖L4礼物
-    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 = 9714,
-    ///抽奖L5礼物
-    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 = 9715,
-
-    ///抽奖获得的精灵球的
-    /// 抽奖L1精灵球
-    Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L1 = 9721,
-    /// 抽奖L2精灵球
-    Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L2 = 9722,
-    /// 抽奖L3精灵球
-    Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L3 = 9723,
-    ///精灵球召唤礼物
-    ///召唤L1
-    Custom_Message_Sub_Treasure_Fairy_Convert_L1 = 9731,
-    ///召唤L2
-    Custom_Message_Sub_Treasure_Fairy_Convert_L2 = 9732,
-    ///召唤L3
-    Custom_Message_Sub_Treasure_Fairy_Convert_L3 = 9733,
-};
+//typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {
+//    ///精灵赠送
+//    Custom_Message_Sub_Treasure_Fairy_Send_Fairy = 9701,
+//    ///索要精灵
+//    Custom_Message_Sub_Treasure_Fairy_Ask_Fairy = 9702,
+//
+//
+//     ///抽奖礼物
+//    ///抽奖L1礼物
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L1 = 9711,
+//    ///抽奖L2礼物
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L2 = 9712,
+//    ///抽奖L3礼物
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L3 = 9713,
+//    ///抽奖L4礼物
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 = 9714,
+//    ///抽奖L5礼物
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 = 9715,
+//
+//    ///抽奖获得的精灵球的
+//    /// 抽奖L1精灵球
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L1 = 9721,
+//    /// 抽奖L2精灵球
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L2 = 9722,
+//    /// 抽奖L3精灵球
+//    Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L3 = 9723,
+//    ///精灵球召唤礼物
+//    ///召唤L1
+//    Custom_Message_Sub_Treasure_Fairy_Convert_L1 = 9731,
+//    ///召唤L2
+//    Custom_Message_Sub_Treasure_Fairy_Convert_L2 = 9732,
+//    ///召唤L3
+//    Custom_Message_Sub_Treasure_Fairy_Convert_L3 = 9733,
+//};

 ///first = CustomMessageType_Candy_Tree
 typedef NS_ENUM(NSUInteger, CustomMessageSubLookLove) {
--- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m
+++ b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m
@@ -55,7 +55,6 @@
 #import "MessageLevelUpgradeModel.h"
 #import "MessageRevokeModel.h"
 #import "MessageTipsModel.h"
-#import "MessageTreasureFairyModel.h"
 #import "MessageCPNotifyModel.h"
 #import "MessagePublicEventModel.h"
 ///View
@@ -343,12 +342,6 @@
                model = [[MessageRedPacketModel alloc] initWithMessage:message];
            }
            break;
-        case CustomMessageType_Treasure_Fairy:
-            if (second == Custom_Message_Sub_Treasure_Fairy_Ask_Fairy ||
-                second == Custom_Message_Sub_Treasure_Fairy_Send_Fairy) {
-                model = [[MessageTreasureFairyModel alloc] initWithMessage:message];
-            }
-            break;
        case CustomMessageType_Service_Reply:
            model = [[PIMessageContentServiceReplyModel alloc] initWithMessage:message];
            break;
--- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m
@@ -270,8 +270,13 @@
    if (!_attentionButton) {
        _attentionButton = [UIButton buttonWithType:UIButtonTypeCustom];
        _attentionButton.titleLabel.font = kFontMedium(14);
-        _attentionButton.titleLabel.numberOfLines = 2;
+        _attentionButton.titleLabel.numberOfLines = 2;                 // 允许多行
+        _attentionButton.titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
+        _attentionButton.titleLabel.adjustsFontSizeToFitWidth = YES;   // 关键
+        _attentionButton.titleLabel.minimumScaleFactor = 0.1;          // 最小允许缩到 50%
+        _attentionButton.titleLabel.lineBreakMode = NSLineBreakByClipping;
        _attentionButton.titleLabel.textAlignment = NSTextAlignmentCenter;
+        _attentionButton.contentEdgeInsets = UIEdgeInsetsMake(0, 8, 0, 8);
        
        [_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell1") forState:UIControlStateNormal];
        [_attentionButton setTitleColor:UIColorFromRGB(0xFF8C03) forState:UIControlStateNormal];
@@ -285,6 +290,8 @@
                                  borderWidth:1
                                  borderColor:UIColorFromRGB(0xFF8C03)];
        [_attentionButton setCornerRadius:15];
+        
+        
    }
    return _attentionButton;
 }
--- a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m
@@ -100,6 +100,8 @@
        _titleLabel.font = kFontRegular(14);
        _titleLabel.textColor = UIColorFromRGB(0x313131);
 		[_titleLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
+        _titleLabel.adjustsFontSizeToFitWidth = YES;
+        _titleLabel.numberOfLines = 0;
 	}
 	return _titleLabel;
 }
--- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m
+++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m
@@ -13,7 +13,6 @@
 ///Tool
 #import "AccountInfoStorage.h"
 #import "Api+Room.h"
-#import "Api+TreasureFairy.h"
 #import "Api+LittleGame.h"
 #import "ClientConfig.h"
 #import "NetImageView.h"
@@ -25,7 +24,6 @@
 #import "BoomInfoModel.h"
 #import "AttachmentModel.h"
 #import "FirstRechargeModel.h"
-#import "TreasureFairyLimitModel.h"
 #import "XPRedPacketResultModel.h"

 ///View
@@ -36,7 +34,6 @@
 #import "XPArrangeMicViewController.h"
 #import "XPSailingViewController.h"
 #import "XCCurrentVCStackManager.h"
-#import "XPTreasureFairyViewController.h"
 #import "PIRoomEnterRedPacketView.h"
 #import "BaseNavigationController.h"
 #import "PIRoomActivityWebView.h"
@@ -484,18 +481,7 @@
            [self lookLoveTapRecognizer];
        } else if([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) {
            [self sailTapRecognizer];
-        }else if([info.code isEqualToString:@"SEIZE_TREASURE"]){
-            XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
-            fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
-            fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
-            [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:fairyVC];
-//            [fairyVC.navigationController setNavigationBarHidden:YES animated:NO];
-            [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:fairyVC.view];
-            [UIView animateWithDuration:0.2 animations:^{
-                fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
-            }completion:^(BOOL finished) {
-            }];
-        }else {
+        } else {
            if (info.skipType == ActivitySkipType_Room) {
                [self.hostDelegate exitRoom];
                [XPRoomViewController openRoom:info.skipContent viewController:kWindow.rootViewController];
@@ -533,25 +519,11 @@
        if(info == nil)return;
        if([info.code isEqualToString:@"FIRST_CHARGE"]) {
            [self firstRechargeTapRecognizer];
-        }else if ([info.code isEqualToString:@"FIND_LOVE"]) {
+        } else if ([info.code isEqualToString:@"FIND_LOVE"]) {
            [self lookLoveTapRecognizer];
        } else if([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) {
            [self sailTapRecognizer];
-        }else if([info.code isEqualToString:@"SEIZE_TREASURE"]){
-            XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
-            fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
-            fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
-            [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:fairyVC];
-            [fairyVC.navigationController setNavigationBarHidden:YES animated:NO];
-            [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:fairyVC.view];
-            [UIView animateWithDuration:0.2 animations:^{
-               
-            fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
-                
-            }completion:^(BOOL finished) {
-                            
-            }];
-        }else {
+        } else {
 //            if(index < self.playList.count){
 //                if(info.showType == ActivityShowType_Half){
 //                    XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
@@ -725,20 +697,6 @@
        [self lookLoveTapRecognizer];
    } else if([model.code isEqualToString:@"NAUTICAL_ADVENTURE"]) {
        [self sailTapRecognizer];
-    }else if([model.code isEqualToString:@"SEIZE_TREASURE"]){
-        XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
-        fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
-        fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
-        [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:fairyVC];
-        [fairyVC.navigationController setNavigationBarHidden:YES animated:NO];
-        [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:fairyVC.view];
-        [UIView animateWithDuration:0.2 animations:^{
-           
-        fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
-            
-        }completion:^(BOOL finished) {
-                        
-        }];
    } else if(model.skipType == ActivitySkipType_Web) {
        if(model.showType == ActivityShowType_Half){
            XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
--- a/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/RoomAnimationView.m
@@ -68,7 +68,6 @@
 #import "XPRoomGiftCompoundView.h"
 #import "XPRoomGiftBroadcastView.h"
 #import "XPRoomLuckyBigPrizeView.h"
-#import "XPTreasureFairyGiftView.h"
 #import "XPAcrossRoomPKPrizeView.h"
 #import "PIRoomGiftBroadcastWindow.h"
 #import "XPRoomDatingAnimationView.h"
@@ -1937,9 +1936,6 @@ BannerSchedulerDelegate
        case CustomMessageType_Graffiti_Star_Kitchen:
            [self handle104:attachment];
            break;
-        case CustomMessageType_Treasure_Fairy:
-            [self handleFairy:attachment];
-            break;
        case CustomMessageType_Tarot:
            [self handleTarot:attachment];
            break;
@@ -2230,24 +2226,6 @@ BannerSchedulerDelegate
    }
 }

- (void)handleFairy:(AttachmentModel *)attachment {
-    if (!attachment) {
-        return;
-    }
-    switch (attachment.second) {
-        case Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4:
-        case Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5:
-        case Custom_Message_Sub_Treasure_Fairy_Convert_L1:
-        case Custom_Message_Sub_Treasure_Fairy_Convert_L2:
-        case Custom_Message_Sub_Treasure_Fairy_Convert_L3:
-            [self receiveTreasureFairyGiftHighLevel:attachment];
-            break;
-            
-        default:
-            break;
-    }
-}
-
 - (void)handle98:(AttachmentModel *)attachment {
    if (!attachment) {
        return;
@@ -2458,9 +2436,6 @@ BannerSchedulerDelegate
            case CustomMessageType_Look_Love:
                [self handle98:attachment];
                break;
-            case CustomMessageType_Treasure_Fairy:
-                [self handleFairy:attachment];
-                break;
            case CustomMessageType_Tarot:
                [self handleTarot:attachment];
                break;
@@ -3210,73 +3185,6 @@ BannerSchedulerDelegate
    }
 }

- (void)receiveTreasureFairyGiftHighLevel:(AttachmentModel *)attatchment {
-    if ([self _isInSudGame]) {return;}
-    PIBaseAnimationViewModel *giftModel = [PIBaseAnimationViewModel new];
-    giftModel.data = attatchment.data;
-    giftModel.second = attatchment.second;
-    giftModel.first = attatchment.first;
-    giftModel.type = GiftBannerType_Fairy;
-    if (self.animationListB.count == 0 && self.isPlayOfB == NO) {
-        [self createTreasureFairyBannerAnimation:giftModel];
-    }
-    [self.animationListB addObject:giftModel];
-}
-
- (void)createTreasureFairyBannerAnimation:(PIBaseAnimationViewModel *)attatchment {
-    self.isPlayOfB = YES;
-    CGFloat kscale = (CGFloat)60 / (CGFloat)375;
-    CGFloat top = (kNavigationHeight + 15);
-    XPTreasureFairyGiftView *treasureView = [[XPTreasureFairyGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)];
-    //最大礼物
-    if ((attatchment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5) || (attatchment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {
-        treasureView.isMaxLargeGift = YES;
-    }else{
-        treasureView.isMaxLargeGift = NO;
-    }
-    if ((attatchment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4) || (attatchment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5)) {
-        treasureView.isDrawGift = YES; //抽奖
-    }else{
-        treasureView.isDrawGift = NO; //召唤
-    }
-    treasureView.treasureInfo = attatchment.data;
-    [self.middleContainer addSubview:treasureView];
-    POPSpringAnimation *springAnimation = [POPSpringAnimation animationWithPropertyNamed:kPOPViewCenter];
-    springAnimation.springSpeed = 12;
-    springAnimation.springBounciness = 10.f;
-    springAnimation.fromValue = [NSValue valueWithCGPoint:treasureView.center];
-    springAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(treasureView.frame.size.width / 2, treasureView.center.y)];
-    [springAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) {
-        if (finished) {
-            POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter];
-            moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, treasureView.center.y)];
-            moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, treasureView.center.y)];
-            moveAnimation.beginTime = CACurrentMediaTime()  + 3;
-            moveAnimation.duration = 0.5;
-            moveAnimation.repeatCount = 1;
-            moveAnimation.removedOnCompletion = YES;
-            @kWeakify(self);
-            [moveAnimation setCompletionBlock:^(POPAnimation *anim, BOOL finished) {
-                @kStrongify(self);
-                if (finished) {
-                    [treasureView removeFromSuperview];
-                    self.isPlayOfB = NO;
-                    if (self.animationListB.count > 0) {
-                        [self.animationListB xpSafeRemoveObjectAtIndex:0];
-                    }
-                    [self playAnimationWithModel];
-                }
-            }];
-            [treasureView pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"];
-        }
-    }];
-    [treasureView pop_addAnimation:springAnimation forKey:@"candyTreespingOutAnimation"];
-}
-
-
-
-
-
 - (void)createGiftCompoundBannerAnimation:(PIBaseAnimationViewModel *)attachment {
    self.isPlayOfB = YES;
    XPRoomGiftCompoundView *compoundGiftView = [[XPRoomGiftCompoundView alloc] initWithFrame:CGRectMake(KScreenWidth, kNavigationHeight + 15, KScreenWidth, 45)];
@@ -3700,9 +3608,6 @@ BannerSchedulerDelegate
        case GiftBannerType_LicneseHour:
            [self createAnchorHourRankAnimation:model];
            break;
-        case GiftBannerType_Fairy:
-            [self createTreasureFairyBannerAnimation:model];
-            break;
        case GiftBannerType_Magic_House:
            [self createGiftCompoundBannerAnimation:model];
            break;
--- a/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m
+++ b/YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameVC.m
@@ -7,7 +7,6 @@
 #import "Api+Room.h"
 #import "MSRoomMenuGameVC.h"
 #import "MSRoomMenuGameView.h"
-#import "XPTreasureFairyViewController.h"
 #import "XPRoomHalfWebView.h"
 #import "XPWebViewController.h"
 #import "XPCandyTreeViewController.h"
@@ -344,21 +343,6 @@
        [self clickGameVC:model];
    } else if ([model.code isEqualToString:@"LEADERCC"]) {
        [self clickGameVC:model];
-    } else if([model.code isEqualToString:@"SEIZE_TREASURE"]){
-        if ([self.hostDelegate isKindOfClass:[XPRoomViewController class]]){
-            XPRoomViewController *vc = (XPRoomViewController *)self.hostDelegate;
-            XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
-            fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
-            fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
-            [vc addChildViewController:fairyVC];
-            [fairyVC.navigationController setNavigationBarHidden:YES animated:NO];
-            [vc.view addSubview:fairyVC.view];
-            [UIView animateWithDuration:0.2 animations:^{
-                fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
-            }completion:^(BOOL finished) {
-
-            }];
-        }
    } else if(model.skipType == ActivitySkipType_Web) {
        if(model.showType == ActivityShowType_Half){
            XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init];
--- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
+++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
@@ -41,7 +41,6 @@
 #import "XPOpenRedPacketModel.h"
 #import "XPMessageInfoModel.h"

-#import "TreasureFailryMessageModel.h"
 #import "NetImageView.h"

 #import "XPRoomTopicAlertView.h"
@@ -49,7 +48,6 @@
 #import "XPRoomPKResultView.h"
 #import "XPWebViewController.h"
 #import "XCCurrentVCStackManager.h"
-#import "XPTreasureFairyViewController.h"
 #import "PIGeneralPublicScreenModel.h"
 #import "QEmotionHelper.h"

@@ -213,9 +211,7 @@
        } else if (attachment.second == Custom_Message_Sub_LuckyPackage){
            return [self createNewRedPacketAttribute:attachment messageInfo:messageInfo];
        }
-    } else if (first == CustomMessageType_Treasure_Fairy) {
-        return [self createTreasureFairyAttribute:attachment messageInfo:messageInfo];
-    }else if (first == CustomMessageType_Room_Album) {
+    } else if (first == CustomMessageType_Room_Album) {
        NSDictionary *userInfo = attachment.data[@"user"];
        NSDictionary *userLevel = attachment.data[@"userLevel"];
        if(userLevel != nil){
@@ -614,83 +610,6 @@
    }
    return nil;
 }
-#pragma mark - 夺宝精灵
- (XPMessageInfoModel *)createTreasureFairyAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{
-    TreasureFailryMessageModel *info = [TreasureFailryMessageModel modelWithDictionary:attachment.data];
-    NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
-    if (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L3) {///初级礼物
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser115") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        NSMutableAttributedString * nickAttriibute = [self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont];
-        [self attributeAddHihtLight:nickAttriibute uid:info.uid.integerValue];
-        [attribute appendAttributedString:nickAttriibute];
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser116") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        [attribute appendAttributedString:[self createTextAttribute:info.rewardName color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
-        if (info.rewardNum > 1) {
-            [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"X%ld", info.rewardNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
-        }
-    } else if (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5) {///高级礼物
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser117") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        NSMutableAttributedString * nickAttriibute = [self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont];
-        [self attributeAddHihtLight:nickAttriibute uid:info.uid.integerValue];
-        [attribute appendAttributedString:nickAttriibute];
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser116") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        [attribute appendAttributedString:[self createTextAttribute:info.rewardName color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
-        if (info.rewardNum > 1) {
-            [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"X%ld", info.rewardNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
-        }
-    }  else if (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L1) {///初级球
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser115") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        NSMutableAttributedString * nickAttriibute = [self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont];
-        [self attributeAddHihtLight:nickAttriibute uid:info.uid.integerValue];
-        [attribute appendAttributedString:nickAttriibute];
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser116") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        [attribute appendAttributedString:[self createTextAttribute:info.rewardName color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
-    } else if (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L3) {///高级球
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser117") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        NSMutableAttributedString * nickAttriibute = [self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont];
-        [self attributeAddHihtLight:nickAttriibute uid:info.uid.integerValue];
-        [attribute appendAttributedString:nickAttriibute];
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser116") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        [attribute appendAttributedString:[self createTextAttribute:info.rewardName color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
-    }  else if (attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3) {///合成礼物
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser115") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        NSMutableAttributedString * nickAttriibute = [self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont];
-        [self attributeAddHihtLight:nickAttriibute uid:info.uid.integerValue];
-        [attribute appendAttributedString:nickAttriibute];
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser116") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        if(attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3) {
-            [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser119") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        } else if (attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2) {
-            [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser120") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        } else {
-            [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser121") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        }
-        [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser122") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-        [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%ld", info.rewardShowValue] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
-        if ([info.rewardType isEqualToString:@"gift"]){
-            [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser123") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
-        } else {
-            [attribute appendAttributedString:[self createTextAttribute:info.rewardUnit color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
-        }
-        [attribute appendAttributedString:[self createTextAttribute:info.rewardName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
-    }
-    if (self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq >= info.userLevelLimit) {
-        NSMutableAttributedString * nickAttriibute = [self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser124") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont];
-        @kWeakify(self);
-        [nickAttriibute yy_setTextHighlightRange:NSMakeRange(0, nickAttriibute.length) color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
-            @kStrongify(self);
-            
-            XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
-            fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
-            fairyVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
-            [self.hostDelegate.getCurrentNav presentViewController:fairyVC animated:YES completion:nil];
-        }];
-        [attribute appendAttributedString:nickAttriibute];
-    }
-    messageInfo.content = attribute;
-    messageInfo.first = attachment.first;
-    return messageInfo;
-}

 - (XPMessageInfoModel *)createGeneralPublicScreenAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{
    
--- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
+++ b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
@@ -154,7 +154,6 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
            case CustomMessageType_Candy_Tree:
            case CustomMessageType_Super_Gift:
            case CustomMessageType_AllMicroSend:
-            case CustomMessageType_Treasure_Fairy:
                [self.datasource_gift addObject:model];
                break;
            default:
@@ -350,7 +349,6 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
                case CustomMessageType_Candy_Tree:
                case CustomMessageType_Super_Gift:
                case CustomMessageType_AllMicroSend:
-                case CustomMessageType_Treasure_Fairy:
                    [self.datasource_gift removeObject:removedModel];
                    break;
                default:
@@ -912,21 +910,6 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
             @(Custom_Message_Sub_OpenRedPacketSuccess),
             @(Custom_Message_Sub_LuckyPackage),
             nil],
-        @(CustomMessageType_Treasure_Fairy):
-            [NSSet setWithObjects:
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L1),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L2),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L3),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L1),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L2),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L3),
-             @(Custom_Message_Sub_Treasure_Fairy_Convert_L1),
-             @(Custom_Message_Sub_Treasure_Fairy_Convert_L2),
-             @(Custom_Message_Sub_Treasure_Fairy_Convert_L3),
-             nil],
-
        @(CustomMessageType_General_Public_Screen):
            [NSSet setWithObjects:
             @(Custom_Message_Sub_General_Public_Screen_One_Room),
--- a/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m
+++ b/YuMi/Modules/YMRoom/View/RoomSideMenu/RoomSideMenu.m
@@ -13,7 +13,6 @@

 #import "Api+Room.h"
 #import "Api+LittleGame.h"
-#import "Api+TreasureFairy.h"

 #import "AttachmentModel.h"
 #import "RoomBoomManager.h"
@@ -33,7 +32,6 @@
 #import "XCCurrentVCStackManager.h"
 #import "XPCandyTreeViewController.h"
 #import "XPArrangeMicViewController.h"
-#import "XPTreasureFairyViewController.h"

 #import "RoomLuckyPackageInfoModel.h"
 #import "LuckyPackageLogicManager.h"
@@ -832,16 +830,6 @@ static CGFloat const kNormalHeight = 160.0f;
        [self lookLoveTapRecognizer];
    } else if ([info.code isEqualToString:@"NAUTICAL_ADVENTURE"]) {
        [self sailTapRecognizer];
-    } else if ([info.code isEqualToString:@"SEIZE_TREASURE"]) {
-        XPTreasureFairyViewController * fairyVC = [[XPTreasureFairyViewController alloc] initWithdelegate:self.hostDelegate];
-        fairyVC.roomUid =[NSString stringWithFormat:@"%ld",  self.hostDelegate.getRoomInfo.uid];
-        fairyVC.view.frame = CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight);
-        [[XCCurrentVCStackManager shareManager].getCurrentVC addChildViewController:fairyVC];
-        [[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:fairyVC.view];
-        [UIView animateWithDuration:0.2 animations:^{
-            fairyVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
-        }completion:^(BOOL finished) {
-        }];
    } else {
        if (info.skipType == ActivitySkipType_Room) {
            [self.hostDelegate exitRoom];
--- a/YuMi/Modules/YMRoom/View/XPMiniRoomView.m
+++ b/YuMi/Modules/YMRoom/View/XPMiniRoomView.m
@@ -364,20 +364,6 @@ UIKIT_EXTERN NSString *kRoomKickoutTime;
             @(Custom_Message_Sub_Sailing_AllRoom_Notify),
             @(Custom_Message_Sub_Sailing_InRoom_NeedAllMicSend),
             nil],
-        @(CustomMessageType_Treasure_Fairy):
-            [NSSet setWithObjects:
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L1),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L2),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L3),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L1),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L2),
-             @(Custom_Message_Sub_Treasure_Fairy_Draw_Ball_L3),
-             @(Custom_Message_Sub_Treasure_Fairy_Convert_L1),
-             @(Custom_Message_Sub_Treasure_Fairy_Convert_L2),
-             @(Custom_Message_Sub_Treasure_Fairy_Convert_L3),
-             nil]
    };
 }

--- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m
+++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m
@@ -2919,8 +2919,6 @@ XPCandyTreeInsufficientBalanceViewDelegate>
            isHave = YES;
        }else if(attachment.first == CustomMessageType_General_Public_Screen && attachment.second == Custom_Message_Sub_General_Public_Screen_All_Room){
            isHave = YES;
-        }else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {  //夺宝精灵
-            isHave = YES;
        }else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
            isHave = YES;
        }else if(attachment.first == CustomMessageType_LuckyBag && attachment.second == Custom_Message_Sub_Room_Gift_LuckBag_FullScree){
--- a/YuMi/ru.lproj/Localizable.strings
+++ b/YuMi/ru.lproj/Localizable.strings
@@ -261,7 +261,7 @@

 "XPMonentsViewController1" = "Подписки";
 "XPMonentsViewController2" = "Рекомендации";
-"XPMonentsViewController3" = "Последние";
+"XPMonentsViewController3" = "Новое";

 "XPMonentsRecommendHeaderView0" = "Рекомендованные темы";

@@ -323,9 +323,9 @@

 "XPMonentsInteractiveViewController0" = "Все сообщения";
 "XPMonentsInteractiveViewController1" = "Больше данных нет";
-"XPMonentsInteractiveViewController2" = "Очистка удалит все уведомления об взаимодействии, вы уверены, что хотите очистить?";
+"XPMonentsInteractiveViewController2" = "После очистки все уведомления об активности будут удалены. Вы уверены, что хотите очистить?";

-"XPMonentTopicContainerViewController1" = "Последние";
+"XPMonentTopicContainerViewController1" = "Новое";
 "XPMonentTopicContainerViewController2" = "Участвовать в теме";

 "XPMoentsTopicListViewController0" = "Больше тем";
@@ -339,7 +339,7 @@

 "TabbarViewController0" = "Ваш вход в систему был отменен, если это не было сделано вами, немедленно смените пароль";
 "TabbarViewController1" = "Другая сторона отозвала сообщение";
-"TabbarViewController2" = "Главная";
+"TabbarViewController2" = "Профиль";
 "TabbarViewController3" = "Форум";
 "TabbarViewController4" = "Сообщения";
 "TabbarViewController5" = "Мои";
@@ -421,13 +421,13 @@
 "XPCandyTreeMoreView2" = "История призов";
 "XPCandyTreeMoreView3" = "Правила игры";
 "XPCandyTreeMoreView4" = "Разрешить внешнее отображение сообщений о призах";
-"XPCandyTreeEmptyableViewCell0" = "Данные недоступны";
+"XPCandyTreeEmptyableViewCell0" = "Нет данных";
 "XPCandyTreeMoreRuleCell0" = "Чтобы использовать, уровень удачи должен достигнуть %ld, поторопись повысить уровень~";

 "XPCandyTreeViewController2" = "Количество приобретаемых молотков не может быть нулевым!";
 "XPCandyTreeViewController4" = "Присоединиться сейчас";
 "XPCandyTreeViewController5" = "За один раз можно выбрать только 99999 раз";
-"XPCandyTreeViewController7" = "Таблица лидеров";
+"XPCandyTreeViewController7" = "Рейтинг";
 "XPCandyRankContainerView0" = "Сегодня";
 "XPCandyRankContainerView1" = "Вчера";
 "XPCandyTreeInsufficientBalanceView0" = "Напоминание";
@@ -563,7 +563,7 @@
 "XPMineAttentionViewController0" = "Больше данных нет";
 "XPMineAttentionViewController1" = "Мои подписки";
 "XPMineAttentionViewController2" = "Вы еще никого не подписались";
-"XPIncomeRecordGoldDetailsView0"="Данные недоступны";
+"XPIncomeRecordGoldDetailsView0"="Нет данных";
 "XPIncomeRecordGoldDetailsView1"="Общий поток золотых монет в текущей комнате: %@ монет";

 "XPIncomeRecordGoldDetailsVC0"="Детали бриллиантов";
@@ -587,7 +587,7 @@
 "XPMineContactViewController3" = "Подписаться";

 "XPMineFansViewController0" = "Больше комнат нет";
-"XPMineFansViewController1" = "Мои фанаты";
+"XPMineFansViewController1" = "Мои подписчики";
 "XPMineFansViewController2" = "Подписка оформлена успешно";
 "XPMineFansViewController3" = "У вас еще нет фанатов";

@@ -597,7 +597,7 @@

 "XPDressUpShopListViewController0" = "Покупка выполнена успешно";
 "XPDressUpShopListViewController2" = "Головной убор успешно используется";
-"XPDressUpShopListViewController4" = "Транспорт успешно используется";
+"XPDressUpShopListViewController4" = "Драйв успешно используется";
 "XPDressUpShopListViewController6" = "Nameplate used successfully";
 "XPDressUpShopListViewController8" = "Информационная карта успешно используется";
 "XPDressUpShopListViewController12" = "Временно нет чат-пузырей";
@@ -655,30 +655,30 @@

 "XPDressUpShopCardViewController0" = "Покупка прошла успешно";
 "XPDressUpShopCardViewController2" = "Головной убор успешно используется";
-"XPDressUpShopCardViewController4" = "Транспорт успешно используется";
-"XPDressUpShopCardViewController6" = "Намплейт успешно используется";
+"XPDressUpShopCardViewController4" = "Драйв успешно используется";
+"XPDressUpShopCardViewController6" = "Табличка успешно используется";
 "XPDressUpShopCardViewController8" = "Информационная карта успешно используется";
 "XPDressUpShopCardViewController9" = "Временно нет информационных карт";
 "XPDressUpShopCardViewController10" = "Временно нет головных уборов";
-"XPDressUpShopCardViewController11" = "Временно нет намплейтов";
-"XPDressUpShopCardViewController12" = "Временно нет транспортных средств";
+"XPDressUpShopCardViewController11" = "Временно нет Табличка";
+"XPDressUpShopCardViewController12" = "Временно нет Драйв средств";

 "XPMineDressUpViewController0" = "Мой предмет";
 "XPMineDressUpViewController1" = "Рамка аватара";
-"XPMineDressUpViewController2" = "Транспорт";
-"XPMineDressUpViewController3" = "Намплейт";
-"XPMineDressUpViewController4" = "Профильная карта";
+"XPMineDressUpViewController2" = "Драйв";
+"XPMineDressUpViewController3" = "Табличка";
+"XPMineDressUpViewController4" = "Карточка";
 "XPMineDressUpViewController5" = "Чат-пузырь";
 "XPMineDressUpViewController6" = "Отмена использования головного убора прошла успешно";
-"XPMineDressUpViewController7" = "Отмена использования транспорта прошла успешно";
-"XPMineDressUpViewController8" = "Отмена использования намплейта прошла успешно";
+"XPMineDressUpViewController7" = "Отмена использования Драйв прошла успешно";
+"XPMineDressUpViewController8" = "Отмена использования Табличка прошла успешно";
 "XPMineDressUpViewController9" = "Отмена использования информационной карты прошла успешно";

 "XPMineDressUpListViewController1" = "Головной убор успешно используется";
-"XPMineDressUpListViewController3" = "Транспорт успешно используется";
-"XPMineDressUpListViewController5" = "Намплейт успешно используется";
+"XPMineDressUpListViewController3" = "Драйв успешно используется";
+"XPMineDressUpListViewController5" = "Табличка успешно используется";
 "XPMineDressUpListViewController7" = "Информационная карта успешно используется";
-"XPMineDressUpListViewController10" = "Уважаемый пользователь, у вас еще нет намплейтов!";
+"XPMineDressUpListViewController10" = "Уважаемый пользователь, у вас еще нет Табличка!";
 "XPMineDressUpListViewController11" = "Уважаемый пользователь, у вас еще нет рамки аватара!";
 "XPMineDressUpListViewController12" = "Уважаемый пользователь, у вас еще нет маунта!";

@@ -730,7 +730,7 @@
 "XPMineHeadView2" = "Неверный формат даты!!";
 "XPMineHeadView3" = "Неверный формат даты!!!";
 "XPMineHeadView4" = "Подписки";
-"XPMineHeadView5" = "Фанаты";
+"XPMineHeadView5" = "Подписчики";
 "XPMineHeadView6" = "Знак %@";
 "XPMineHeadView7" = "На рассмотрении";
 "XPMineHeadView8" = "Скопировано успешно";
@@ -1048,7 +1048,7 @@
 "XPSimpleMineHeaderView1" = "Подписчики";
 "XPSimpleMineHeaderView2" = "Посетители";
 "XPSimpleMineHeaderView3" = "Просмотр";
-"XPSimpleMineHeaderView4" = "Мой кошелек";
+"XPSimpleMineHeaderView4" = "Мой Кошелёк";
 "XPSimpleMineHeaderView5" = "Мои комнаты";
 "XPSimpleMineHeaderView6" = "Мои избранные";
 "XPSimpleMineHeaderView7" = "Мой уровень";
@@ -1114,7 +1114,7 @@

 "XPHomeSearchRelateView0" = "Связанные комнаты";

-"XPHomeSearchNavView0" = "Поиск по никнейму/ID/названию комнаты";
+"XPHomeSearchNavView0" = "Поиск по Ник/ID/названию комнаты";
 "XPHomeSearchNavView1" = "Поиск";

 "XPRoomSearchRecommendHeadView0" = "Еще нет живых комнат";
@@ -1128,7 +1128,7 @@
 "XPHomeMineViewController2" = "Комната %@";
 "XPHomeMineViewController3" = "Добро пожаловать в мою комнату";

-"XPNewHomeNavView0" = "Поиск по никнейму/ID/комнате";
+"XPNewHomeNavView0" = "Поиск по Ник/ID/комнате";

 "XPHomeRecommendViewController0" = "Развернуть чат";
 "XPHomeRecommendViewController1" = "Вечеринки в комнатах";
@@ -2006,7 +2006,7 @@
 "XPRoomSendRedPacketViewController11" = "Общее количество монет";
 "XPRoomSendRedPacketViewController12" = "Монеты";
 "XPRoomSendRedPacketViewController13" = "Общая сумма красных пакетов не должна быть менее 100 монет и должна быть кратной 10";
-"XPRoomSendRedPacketViewController14" = "Неприобретенные красные пакеты будут возвращены в ваш кошелек через 30 минут";
+"XPRoomSendRedPacketViewController14" = "Неприобретенные красные пакеты будут возвращены в ваш Кошелёк через 30 минут";
 "XPRoomSendRedPacketViewController15" = "Поздравляем, желаем вам удачи";
 "XPRoomSendRedPacketViewController16" = "Пополнить монеты";
 "XPRoomSendRedPacketViewController17" = "Сумма красного пакета не может быть менее 0";
@@ -2020,7 +2020,7 @@


 "XPReceiveRedPacketView0" = "В комнате";
-"XPReceiveRedPacketView1" = "был зачислен на ваш кошелек, подтвердите в Моих заработках";
+"XPReceiveRedPacketView1" = "был зачислен на ваш Кошелёк, подтвердите в Моих заработках";
 "XPReceiveRedPacketView2" = "Все взяли, приходите раньше в следующий раз~";
 "XPReceiveRedPacketView3" = "-ов красный пакет";
 "XPReceiveRedPacketView4" = "Забрано %@/%@";
@@ -2232,7 +2232,7 @@
 "XPMonentsInteractiveTableViewCell0" = "Оставил комментарий к вашей записи";
 "XPMonentsInteractiveTableViewCell1" = "Пригласил";

-"XPMonentsEmptyTableViewCell0" = "Данные недоступны";
+"XPMonentsEmptyTableViewCell0" = "Нет данных";

 "XPMonentsReplyMoreTableViewCell0" = "Показать еще %ld ответов";

@@ -2241,7 +2241,7 @@
 "XPMonentsTopicLatestViewController2" = "Успешно удалено";

 "XPMomentListViewController0" = "Больше данных недоступно";
-"XPMomentListViewController1" = "Опубликовать момент";
+"XPMomentListViewController1" = "Момент";
 "XPMomentListViewController2" = "Площадь";

 "XPMonentsPublishViewController0" = "Максимум 500 символов";
@@ -2251,7 +2251,7 @@
 "XPMonentsPublishViewController4" = "Ой-ой!";
 "XPMonentsPublishViewController5" = "Подтвердить возврат";
 "XPMonentsPublishViewController6" = "Введите содержание вашей записи";
-"XPMonentsPublishViewController7" = "Опубликовать момент";
+"XPMonentsPublishViewController7" = "Момент";
 "XPMonentsPublishViewController8" = "Опубликовать";
 "XPMonentsPublishViewController9" = "Записывайте свою текущую жизнь и делитесь ею с интересными людьми";
 "XPMonentsPublishViewController10" = "Запрещены коммерческие объявления, телефонные номера, а также вульгарное, порнографическое, жестокое и оскорбительное язык. Преступники будут заблокированы";
@@ -2260,7 +2260,7 @@
 "XPMonentsInteractiveViewController1" = "Больше данных недоступно";
 "XPMonentsInteractiveViewController2" = "Все уведомления об взаимодействии будут удалены после очистки. Вы уверены, что хотите их очистить?";

-"XPMonentTopicContainerViewController1" = "Последние";
+"XPMonentTopicContainerViewController1" = "Новое";
 "XPMonentTopicContainerViewController2" = "Участвующие темы";

 "XPMoentsTopicListViewController0" = "Больше тем";
@@ -2285,7 +2285,7 @@
 "XPLoginViewController3" = "Согласитесь по умолчанию и авторизуйте %@ для доступа к текущему номеру телефона";
 "XPLoginViewController4" = "Вход выполнен успешно";
 "XPLoginViewController5" = "Вход по номеру телефона";
-"XPLoginViewController6" = "Согласиться с Условия обслуживания и Политика конфиденциальности";
+"XPLoginViewController6" = "Согласиться с Условиями обслуживания и Политикой конфиденциальности";
 "XPLoginViewController7" = "Условия обслуживания";
 "XPLoginViewController8" = " и ";
 "XPLoginViewController9" = "Политика конфиденциальности";
@@ -2644,7 +2644,7 @@
 "XPMineGuildViewController9" = "Требуется одобрение владельца комнаты";
 "XPMineGuildViewController10" = "Выход разорвет отношения, эта операция %@, вы уверены, что хотите выйти?";
 "XPMineGuildViewController11" = "Выйти из комнаты";
-"XPMineGuildViewController12" = "Присоединиться к агентству";
+"XPMineGuildViewController12" = "Вступить в агентство";

 ///XPGuildSuperAdminMenuView.m
 "XPGuildSuperAdminMenuView0" = "Установить управляемые комнаты";
@@ -2875,8 +2875,8 @@

 ///XPMineTheGuildCell.m
 "XPMineTheGuildCell0" = "Агентство · Комната";
-"XPMineTheGuildCell1" = "Присоединиться к агентству";
-"XPMineTheGuildCell2" = "Присоединиться к VIP";
+"XPMineTheGuildCell1" = "Вступить в агентство";
+"XPMineTheGuildCell2" = "Вступить в VIP";
 "XPMineTheGuildCell3" = "Мое агентство";

 ///XPMineGiveDiamondVC
@@ -2971,7 +2971,7 @@
 "XPIncomeRecordView5"="Алмазы";

 "XPIncomeRecordVC0"="История доходов";
-"XPIncomeRecordVC1"="Кошелек";
+"XPIncomeRecordVC1"="Кошелёк";
 "XPExchangeDiamondsItemView0"="Мои монеты: %@";
 "XPExchangeDiamondsItemView1"="Мои алмазы: %.2f";
 "XPExchangeDiamondsItemView2"="Мои алмазы";
@@ -3425,10 +3425,10 @@
 "XPHomeGameView0"="Создать комнату";
 "XPHomeGameView1"="Создать комнату";
 ///XPSessionMainViewController.m
-"XPSessionMainViewController0" = "Сообщения";
+"XPSessionMainViewController0" = "Сообщ.";
 "XPSessionMainViewController1" = "Друзья";
-"XPSessionMainViewController2" = "Подписки";
-"XPSessionMainViewController3" = "Фанаты";
+"XPSessionMainViewController2" = "Подп.";
+"XPSessionMainViewController3" = "Подписчики";
 ///XPFreeGiftsObtainView
 "XPFreeGiftsObtainView0"="Понятно";
 "XPFreeGiftsObtainView1"="Сегодня смотрели прямой эфир в течение %@, даём вам подарок";
@@ -3513,7 +3513,7 @@
 "PIRoomSendRedPacketItemVC3"="шт";
 "PIRoomSendRedPacketItemVC4"="Действителен немедленно";
 "PIRoomSendRedPacketItemVC5"="Действителен в течение ограниченного времени";
-"PIRoomSendRedPacketItemVC6"="Незаложенные красные конверты будут возвращены на ваш кошелек через %@ часов";
+"PIRoomSendRedPacketItemVC6"="Незаложенные красные конверты будут возвращены на ваш Кошелёк через %@ часов";
 "PIRoomSendRedPacketItemVC7"="Пожалуйста, введите содержимое комментария";
 ///PIInputScrollingView
 "PIInputScrollingView0"="Введите указанное содержимое комментария (не более 10 символов)";
@@ -3616,10 +3616,10 @@
 "MSRoomGameHeadView1"="Партия состоялась";
 "MSRoomGameHeadView2"="Выигрыш %@ золотых монет";
 "MSRoomGameHeadView3"="%@ золотых монет";
-"MSRoomGameHeadView4"="Входной сбор(%@)";
+"MSRoomGameHeadView4"="Входной билет(%@)";
 //MSRoomGameVC
 "MSRoomGameVC0"="Партия не состоялась";
-"MSRoomGameVC1"="Кошелек";
+"MSRoomGameVC1"="Кошелёк";
 //XPMineAccountView
 "XPMineAccountView1"="Быстрый доступ к пополнению";
 //MSRoomMenuGameVC
@@ -3782,7 +3782,7 @@
 "1.0.30_text_6" = "Дать";
 "1.0.30_text_7" = "Магазин";
 "1.0.30_text_8" = "Мой наряд";
-"1.0.30_text_9" = "Главная страница";
+"1.0.30_text_9" = "Профиль";
 "1.0.30_text_10" = "VIP%@-%%@%%";
 "1.0.30_text_11" = "Выбрать друга";
 "1.0.30_text_12" = "Не использовано";
@@ -3900,7 +3900,7 @@
 "1.0.37_text_47" = "История";
 "1.0.37_text_48" = "Расчет:%@ÜS";
 "1.0.37_text_49" = "%@ÜS";
-"1.0.37_text_50" = "Монеты были помещены в кошелек!";
+"1.0.37_text_50" = "Монеты были помещены в Кошелёк!";
 "1.0.37_text_51" = "Подарки были помещены в сумку!";
 "1.0.37_text_52" = "Вы не можете использовать эту функцию.";

@@ -3932,7 +3932,7 @@
 "20.20.51_text_29" = "Количество алмазов должно быть кратно 1000";

 "20.20.56_text_1" = "Текущее количество матчей недостаточно, матч не удался. Сыграть снова?";
-"20.20.56_text_2" = "Матч не удался, потраченные вами монеты возвращены в кошелек";
+"20.20.56_text_2" = "Матч не удался, потраченные вами монеты возвращены в Кошелёк";
 "20.20.56_text_3" = "Изменить отношения";
 "20.20.56_text_4" = "Выберите отношения, которые вы хотите изменить";
 "20.20.56_text_5" = "После подтверждения изменения исходное значение CP и уровень CP останутся неизменными. Каждое отношение можно изменить только один раз в течение 30 дней";
@@ -3946,7 +3946,7 @@
 "20.20.56_text_13" = "Другой сторона приглашает вас изменить отношения на %@";
 "20.20.56_text_14" = "Ваши отношения были изменены на %@";
 "20.20.56_text_15" = "Советы по доходам";
-"20.20.56_text_16" = "Получите Bravo, и вы получите 2% от дохода от монет./nМонеты будут напрямую распределены в ваш кошелек с монетами./nПримечание: Этот доход не включается в доход от алмазов.";
+"20.20.56_text_16" = "Получите Bravo, и вы получите 2% от дохода от монет./nМонеты будут напрямую распределены в ваш Кошелёк с монетами./nПримечание: Этот доход не включается в доход от алмазов.";
 "20.20.56_text_17" = "Доход";
 "20.20.56_text_18" = "Принято";
 "20.20.56_text_19" = "Отклонено";
@@ -4020,6 +4020,7 @@
 "20.20.62_text_7" = "У вас нет разрешения приглашать пользователя на микрофон.";
 "20.20.62_text_8" = "Не удалось отправить приглашение. Пожалуйста, проверьте сеть.";

+
 "20.20.62_text_9" = "Включение/выключение эффектов";
 "20.20.62_text_9.1" = "Режим Турбо";
 "20.20.62_text_9.2" = "Режим без турбо";