#761 #967

1. 修正 PK UI 问题
2. 完成礼物面板的修改

Podfile

@@ -65,7 +65,6 @@ 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 = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -31,55 +31,47 @@
 
 #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()) {
-        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
-        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
-
-
-    } else {
-        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
-        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
-
-
+        attribute = UISemanticContentAttributeForceRightToLeft;
     }
+
+    [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];
+                        });
                     }
                 }];
             }
-   
+        }];
+    }
 }
 
 /**
@@ -115,10 +107,7 @@ UIKIT_EXTERN NSString * adImageName;
 #else
     option.apnsCername = @"newPiko";
 #endif
- 
-    
 
-    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -151,6 +140,7 @@ UIKIT_EXTERN NSString * adImageName;
    #endif
    [Adjust appDidLaunch:adjustConfig];
 }
+
 - (void)configShareSDK {
 
     [PILineLoginManager registerLine];
@@ -160,11 +150,10 @@ 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:^(BOOL success) {
-            
-        }];
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:nil];
         [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
         [[NSUserDefaults standardUserDefaults] synchronize];
     }
@@ -172,22 +161,24 @@ UIKIT_EXTERN NSString * adImageName;
 
 #pragma mark - 表情
 - (void)initEmojiData {
-	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;
+    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;
+    });
 }
 
 #pragma mark - 广告
@@ -198,22 +189,21 @@ UIKIT_EXTERN NSString * adImageName;
 - (void)setupLaunchADView {
 	NSUserDefaults * kUserDefaults =  NSUserDefaults.standardUserDefaults;
 	// 判断沙盒中是否存在广告图片，如果存在，直接显示
-	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:[kUserDefaults valueForKey:adImageName]];
+    NSString *adName = [kUserDefaults stringForKey:adImageName];
+	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName];
 	BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath];
-	NSUserDefaults *userDefault = [NSUserDefaults standardUserDefaults];
 
-	if ([userDefault integerForKey:@"adShow"]) {
-		[userDefault setInteger:[userDefault integerForKey:@"adShow"]+1 forKey:@"adShow"];
+	if ([kUserDefaults integerForKey:@"adShow"]) {
+		[kUserDefaults setInteger:[kUserDefaults integerForKey:@"adShow"]+1
+                           forKey:@"adShow"];
 	} else {
-		[userDefault setInteger:1 forKey:@"adShow"];
+		[kUserDefaults setInteger:1 forKey:@"adShow"];
 	}
 
 	if (isExist) {// 图片存在
-
-		if ([userDefault integerForKey:@"adShow"] > 4) {
+		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
 			@kWeakify(self);
-			NSString *imageName = [kUserDefaults valueForKey:adImageName];
-			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:imageName];
+			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName];
 			XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds];
 			advertiseView.filePath = filePath;
 			advertiseView.dismissHandler = ^(BOOL shouldJump) {
@@ -222,9 +212,8 @@ UIKIT_EXTERN NSString * adImageName;
 					return;
 				}
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [self performSelectorOnMainThread:@selector(advertiseJumpHandleWithInfo:) withObject:info waitUntilDone:NO];
-                   });
-				
+                    [self advertiseJumpHandleWithInfo:info];
+                });
 			};
 			[advertiseView show];
 		}
@@ -234,9 +223,6 @@ 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,15 +5,16 @@
 //  Created by admin on 2023/3/9.
 //
 
+
+#import "AppDelegate.h"
+#import <UMCommon/UMCommon.h>
 #import <MobLinkPro/MobLink.h>
 #import <MobLinkPro/MLSDKScene.h>
-#import "AppDelegate.h"
+#import <FBSDKCoreKit/FBSDKCoreKit.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>
@@ -34,61 +35,77 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-   
-   
-    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-   
-    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];
-   
-   
+    [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) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler
-{
+- (void)initUM:(UIApplication *)application
+ launchOptions:(NSDictionary *)launchOptions {
+    // 只有同意过了隐私协议 才初始化
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
+        ///初始化友盟
+        [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" 
+                            channel:@"appstore"];
+    }
+    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
+    [FIRApp configure];
+    [MobLink setDelegate:self];
+}
+
+- (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 {
     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, *)) {
@@ -145,17 +162,14 @@ 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){
@@ -201,8 +215,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     }
    
     return [GIDSignIn.sharedInstance handleURL:url];
-    
-    
 }
 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+{
+  "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_pk_panel_result_draw_ar.imageset/Contents.json

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+{
+  "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/pk_top_charms_mark_en.imageset/Contents.json

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

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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pk_top_momey_mark_en@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pk_top_momey_mark_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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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_pk_panel_result_draw_en.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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/ms_mine_purse_arrow.imageset/Contents.json

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

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

@@ -0,0 +1,22 @@
+{
+  "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

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

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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

@@ -0,0 +1,22 @@
+{
+  "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

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