molistar商店包版本修改 此commit置顶 1.0.3

Podfile

@@ -65,6 +65,7 @@ target 'YuMi' do
   pod 'UMCommon'
   pod 'UMDevice'
   pod 'lottie-ios'
+  pod 'WeexSDK'
   pod 'ZLCollectionViewFlowLayout'
   pod 'WMZDropDownMenu'
   pod 'TABAnimated'

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -72,7 +72,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -31,47 +31,55 @@
 
 #import "YuMi-swift.h"
 
+
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
+
+
 @implementation AppDelegate (ThirdConfig)
 
+
 /// 初始化一些第三方配置
-- (void)initThirdConfig{
+- (void)initThirdConfig {
 	[self configShareSDK];
 	[self configNIMSDK];
+	[self initEmojiData];
     [self configAdjust];
     [self configBugly];
     [self registerNot];
-    [self initEmojiData];
     [self setLanguage];
 }
-
 -(void)setLanguage{
-    UISemanticContentAttribute attribute = UISemanticContentAttributeForceLeftToRight;
+    
     if (isMSRTL()) {
-        attribute = UISemanticContentAttributeForceRightToLeft;
+        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
+        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
+
+
+    } else {
+        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+
+
     }
-
-    [UIView appearance].semanticContentAttribute = attribute;
-    [UISearchBar appearance].semanticContentAttribute = attribute;
 }
-
 -(void)registerNot{
     if (@available(iOS 10.0, *)) {
-        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-        [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-            if (granted) {
-                [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-                    if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            [[UIApplication sharedApplication] registerForRemoteNotifications];
-                        });
+                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+                [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+                    if (granted) {
+                        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                            if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
+                                dispatch_async(dispatch_get_main_queue(), ^{
+                                    [[UIApplication sharedApplication] registerForRemoteNotifications];
+                                });
+                            }
+                        }];
                     }
                 }];
             }
-        }];
-    }
+   
 }
 
 /**
@@ -107,7 +115,10 @@ UIKIT_EXTERN NSString * adImageName;
 #else
     option.apnsCername = @"newPiko";
 #endif
+ 
+    
 
+    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -140,7 +151,6 @@ UIKIT_EXTERN NSString * adImageName;
    #endif
    [Adjust appDidLaunch:adjustConfig];
 }
-
 - (void)configShareSDK {
 
     [PILineLoginManager registerLine];
@@ -150,10 +160,11 @@ UIKIT_EXTERN NSString * adImageName;
 //		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
 		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
 	}];
-
     NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
     if (isUpload == nil){
-        [MobSDK uploadPrivacyPermissionStatus:YES onResult:nil];
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
+            
+        }];
         [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
         [[NSUserDefaults standardUserDefaults] synchronize];
     }
@@ -161,24 +172,22 @@ UIKIT_EXTERN NSString * adImageName;
 
 #pragma mark - 表情
 - (void)initEmojiData {
-    dispatch_async(dispatch_get_global_queue(0, 0), ^{
-        NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
-        NSDictionary * dic = [dicArray firstObject];
-        NSArray * emojiArray = dic[@"data"];
-        NSMutableArray * array = [NSMutableArray array];
-        for (int i = 0; i < emojiArray.count; i++) {
-            NSDictionary * dic = [emojiArray objectAtIndex:i];
-            UIImage * image = [UIImage imageNamed:dic[@"file"]];
-            QEmotion * info = [[QEmotion alloc] init];
-            info.identifier = dic[@"id"];
-            info.image = image;
-            info.displayName = dic[@"tag"];
-            [array addObject:info];
-        }
-        //在这里强烈建议先预加载一下表情
-        QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
-        faceManager.emotionArray = array;
-    });
+	NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
+	NSDictionary * dic = [dicArray firstObject];
+	NSArray * emojiArray = dic[@"data"];
+	NSMutableArray * array = [NSMutableArray array];
+	for (int i = 0; i < emojiArray.count; i++) {
+		NSDictionary * dic = [emojiArray objectAtIndex:i];
+		UIImage * image = [UIImage imageNamed:dic[@"file"]];
+		QEmotion * info = [[QEmotion alloc] init];
+		info.identifier = dic[@"id"];
+		info.image = image;
+		info.displayName = dic[@"tag"];
+		[array addObject:info];
+	}
+	//在这里强烈建议先预加载一下表情
+	QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
+	faceManager.emotionArray = array;
 }
 
 #pragma mark - 广告
@@ -189,21 +198,22 @@ UIKIT_EXTERN NSString * adImageName;
 - (void)setupLaunchADView {
 	NSUserDefaults * kUserDefaults =  NSUserDefaults.standardUserDefaults;
 	// 判断沙盒中是否存在广告图片，如果存在，直接显示
-    NSString *adName = [kUserDefaults stringForKey:adImageName];
-	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName];
+	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:[kUserDefaults valueForKey:adImageName]];
 	BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath];
+	NSUserDefaults *userDefault = [NSUserDefaults standardUserDefaults];
 
-	if ([kUserDefaults integerForKey:@"adShow"]) {
-		[kUserDefaults setInteger:[kUserDefaults integerForKey:@"adShow"]+1
-                           forKey:@"adShow"];
+	if ([userDefault integerForKey:@"adShow"]) {
+		[userDefault setInteger:[userDefault integerForKey:@"adShow"]+1 forKey:@"adShow"];
 	} else {
-		[kUserDefaults setInteger:1 forKey:@"adShow"];
+		[userDefault setInteger:1 forKey:@"adShow"];
 	}
 
 	if (isExist) {// 图片存在
-		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
+
+		if ([userDefault integerForKey:@"adShow"] > 4) {
 			@kWeakify(self);
-			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName];
+			NSString *imageName = [kUserDefaults valueForKey:adImageName];
+			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:imageName];
 			XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds];
 			advertiseView.filePath = filePath;
 			advertiseView.dismissHandler = ^(BOOL shouldJump) {
@@ -212,8 +222,9 @@ UIKIT_EXTERN NSString * adImageName;
 					return;
 				}
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [self advertiseJumpHandleWithInfo:info];
-                });
+                    [self performSelectorOnMainThread:@selector(advertiseJumpHandleWithInfo:) withObject:info waitUntilDone:NO];
+                   });
+				
 			};
 			[advertiseView show];
 		}
@@ -223,6 +234,9 @@ UIKIT_EXTERN NSString * adImageName;
 
 /// 闪屏广告跳转处理
 - (void)advertiseJumpHandleWithInfo:(AdvertiseModel *)info {
+	if (![ClientConfig shareConfig].canOpen) {
+		return;
+	}
 	if (UIApplication.sharedApplication.keyWindow != self.window) {
 		//当前窗口不是主控制器所在窗口时，拦截跳转（目前可能情况时，闪屏后出现新人引导
 		return;

YuMi/Appdelegate/AppDelegate.m

@@ -5,16 +5,15 @@
 //  Created by admin on 2023/3/9.
 //
 
-
-#import "AppDelegate.h"
-#import <UMCommon/UMCommon.h>
 #import <MobLinkPro/MobLink.h>
 #import <MobLinkPro/MLSDKScene.h>
-#import <FBSDKCoreKit/FBSDKCoreKit.h>
+#import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
 #import "AppDelegate+ThirdConfig.h"
 #import <NIMSDK/NIMSDK.h>
+#import <UMCommon/UMCommon.h>
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import "ClientConfig.h"
 #import <GoogleSignIn/GoogleSignIn.h>
@@ -35,77 +34,61 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
-	///初始化一些 sdk配置
-    [self initThirdConfig];
-    [self initUM:application launchOptions:launchOptions];
-
+   
+   
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [self.window makeKeyAndVisible];
-
-    [self loadMainPage];
-    [self setupLaunchADView];
-
-    return YES;
-}
-
-- (void)initUM:(UIApplication *)application
- launchOptions:(NSDictionary *)launchOptions {
-    // 只有同意过了隐私协议 才初始化
-    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
-        ///初始化友盟
-        [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" 
-                            channel:@"appstore"];
+   
+    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
+    if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) {
+        XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
+        BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc];
+        nav.modalPresentationStyle = UIModalPresentationFullScreen;
+        self.window.rootViewController = nav;
+    }else{
+        TabbarViewController *vc = [[TabbarViewController alloc] init];
+        BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
+        self.window.rootViewController = bnc;
     }
+    
+    [self.window makeKeyAndVisible];
+	///设置广告页
+	[self setupLaunchADView];
+	///初始化一些 sdk配置
+	[self initThirdConfig];
+	// 只有同意过了隐私协议 才初始化
+	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
+		///初始化友盟
+		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"appstore"];
+	}
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FIRApp configure];
     [MobLink setDelegate:self];
+   
+   
+    return YES;
 }
 
-- (void)loadMainPage {
-    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
-    if (accountModel == nil || 
-        accountModel.uid == nil ||
-        accountModel.access_token == nil) {
-        [self toLoginPage];
-    }else{
-        [self toHomeTabbarPage];
-    }
-}
-
-- (void)toLoginPage {
-    XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
-    BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc];
-    navigationController.modalPresentationStyle = UIModalPresentationFullScreen;
-    self.window.rootViewController = navigationController;
-}
-
-- (void)toHomeTabbarPage {
-    TabbarViewController *vc = [[TabbarViewController alloc] init];
-    BaseNavigationController *navigationController = [[BaseNavigationController alloc] initWithRootViewController:vc];
-    self.window.rootViewController = navigationController;
-}
-
-- (void)IMLSDKWillRestoreScene:(MLSDKScene *)scene
-                       Restore:(void (^)(BOOL, RestoreStyle))restoreHandler {
+- (void) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler
+{
     NSString *inviteCode = scene.params[@"inviteCode"];
     if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
         ClientConfig *config = [ClientConfig shareConfig];
         config.inviteCode = inviteCode;
     }
+
     restoreHandler(YES, MLDefault);
+
 }
 
+
+
 - (void)applicationDidEnterBackground:(UIApplication *)application {
     NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount;
     [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
 }
-
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     [self getAdvertisingTrackingAuthority];
-    [[NSNotificationCenter defaultCenter]postNotificationName:@"kAppDidBecomeActive" object:nil];
 }
-
 - (void)getAdvertisingTrackingAuthority {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if (@available(iOS 14, *)) {
@@ -162,14 +145,17 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
             config.pushChatId = userId;
         }
        });
+   
+   
+    
 }
 
 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
     NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
     if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
-        return [PILineLoginManager applicationOpenurl:app open:url];
-    }
+            return [PILineLoginManager applicationOpenurl:app open:url];
+        }
     
     NSString *text = [url query];
     if(text.length){
@@ -215,6 +201,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     }
    
     return [GIDSignIn.sharedInstance handleURL:url];
+    
+    
 }
 
 

YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_draw_ar.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_draw_ar@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_draw_ar@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_ar@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_ar@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_menu_arrange_mic_ar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_menu_arrange_mic_ar@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_pk_panel_result_draw_ar@2x.png",
+      "filename" : "room_menu_arrange_mic_new_ar@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_pk_panel_result_draw_ar@3x.png",
+      "filename" : "room_menu_arrange_mic_new_ar@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_ar@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_ar@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ms_room_game_victory_top_icon_ar@2x.png",
+      "filename" : "mine_noble_center_tag_title_bg_en@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ms_room_game_victory_top_icon_ar@3x.png",
+      "filename" : "mine_noble_center_tag_title_bg_en@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/Language/en/ms_room_game_victory_top_icon_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_victory_top_icon_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_victory_top_icon_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_draw_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_draw_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_draw_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_fail_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_fail_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_fail_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_win_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_menu_arrange_mic_en@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_menu_arrange_mic_en@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_menu_arrange_mic_new_en@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_menu_arrange_mic_new_en@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_draw_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_draw_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_draw_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_fail_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_win_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_win_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_win_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "pi_app_login_new_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "pi_app_login_new_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_add_coin.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_add_coin@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_add_coin@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_avatar_border.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_avatar_border@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_avatar_border@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_begin_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_begin_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_btn_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_begin_btn_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_begin_btn_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_coin.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_begin_coin@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_begin_coin@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_begin_rule_icon.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_begin_rule_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_begin_rule_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_classic_icon.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_classic_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_classic_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}