更换图片logo

Podfile

@@ -3,24 +3,31 @@
 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 target 'YuMi' do
   use_frameworks!
+  #pag动画
+  pod 'libpag', '~> 4.3.21'
   pod 'Bugly'
   pod 'Adjust', '~> 4.31.0'
   pod 'Firebase/Analytics'
   pod 'FBSDKLoginKit'
+  pod 'FBSDKCoreKit'
+  pod 'FBSDKShareKit'
+  pod 'LineSDKSwift'
   # 滑动标签栏
   pod 'JXCategoryView'
   pod 'JXPagingView/Pager'
-	#模型转化
-	pod 'MJExtension'
-	#图片加载
-	pod 'SDWebImage'
+  #模型转化
+  pod 'MJExtension'
+   #图片加载
+  pod 'SDWebImage'
+  pod 'FLAnimatedImage'
+  pod 'SDWebImageFLPlugin' # 对FLAnimatedImage和SDWebImage的桥接
   pod 'AFNetworking'
   #文字自动滚动
-  pod 'MarqueeLabel-ObjC'
+  pod 'MarqueeLabel'
   pod 'YYText'
   pod 'Masonry'
-	#输入
-	pod 'SZTextView'
+  #输入
+  pod 'SZTextView'
   #头饰显示
   pod 'YYWebImage'
 	#轮播图
@@ -33,41 +40,38 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 10.3.12317'
+  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
   pod 'CocoaAsyncSocket',:modular_headers => true
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 3.2.2'
-	#上传图片
-	pod 'Qiniu'
-	#内购
-	pod 'IAPHelper'
+  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'	
 	#持久化存储
-	pod 'SSKeychain'
-	pod 'Base64'
+  pod 'SSKeychain'
+  pod 'Base64'
   #pop动画
   pod 'pop', '~> 1.0.12'
   #云信
   pod 'NIMSDK_LITE', '~> 9.2.8'
-	pod 'GKCycleScrollView', '~> 1.2.0'
-	pod 'SVGAPlayer'
-
-	pod 'GoogleSignIn', '6.2.4'
-	pod 'mob_sharesdk'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Line'
-	pod 'mob_sharesdk/ShareSDKExtension'
+  pod 'GKCycleScrollView', '~> 1.2.0'
+  pod 'SVGAPlayer'
+  pod 'GoogleSignIn'
+  pod 'mob_linksdk_pro'
+  pod 'mob_sharesdk'
+  pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
+  #pod 'mob_sharesdk/ShareSDKPlatforms/Line'
+  pod 'mob_sharesdk/ShareSDKExtension'
   
   pod 'UMCommon'
-	pod 'UMDevice'
+  pod 'UMDevice'
   pod 'lottie-ios'
   pod 'WeexSDK'
   pod 'ZLCollectionViewFlowLayout'
   pod 'WMZDropDownMenu'
   pod 'TABAnimated'
-  pod 'YuMi',:path=>'yum'	
+  pod 'YuMi',:path=>'yum'
+  pod 'QCloudCOSXML'	
 end
 
 post_install do |installer|
@@ -75,6 +79,10 @@ post_install do |installer|
     project.targets.each do |target|
       target.build_configurations.each do |config|
             config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+           xcconfig_path = config.base_configuration_reference.real_path
+          xcconfig = File.read(xcconfig_path)
+          xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+          File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
        end
     end
   end

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -10,6 +10,8 @@
 #import <NIMSDK/NIMSDK.h>
 #import <ShareSDK/ShareSDK.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
+#import <UserNotifications/UserNotifications.h>
+#import <MOBFoundation/MobSDK+Privacy.h>
 ///Tool
 #import "YUMIConstant.h"
 #import "CustomAttachmentDecoder.h"
@@ -23,13 +25,18 @@
 #import "XCCurrentVCStackManager.h"
 #import "ClientConfig.h"
 #import <Adjust/Adjust.h>
+#import <UserNotifications/UserNotifications.h>
 
 #import <Bugly/Bugly.h>
 
+#import "YuMi-swift.h"
+
 
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
+
+
 @implementation AppDelegate (ThirdConfig)
 
 
@@ -40,26 +47,48 @@ UIKIT_EXTERN NSString * adImageName;
 	[self initEmojiData];
     [self configAdjust];
     [self configBugly];
+    [self registerNot];
+  
 }
+-(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];
+                                });
+                            }
+                        }];
+                    }
+                }];
+            }
+   
+}
+
 /**
  崩溃收集 Bugly
  */
 - (void) configBugly {
 
     BuglyConfig *config = [[BuglyConfig alloc] init];
-    config.channel = @"App Enterprise";
-    config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
+    
     config.blockMonitorTimeout = 5;
     config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录开关，默认关闭
 
 #ifdef DEBUG
     config.debugMode = YES; // debug 模式下，开启调试模式
+    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
     config.reportLogLevel = BuglyLogLevelVerbose; // 设置打印日志级别
     [Bugly startWithAppId:@"86cf73b8d5" config:config];
 #else
     config.debugMode = NO; // release 模式下，关闭调试模式
+    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = NO; // 卡顿监控开关，默认关闭
     config.reportLogLevel = BuglyLogLevelWarn; // 设置自定义日志上报的级别，默认不上报自定义日志
-    [Bugly startWithAppId:@"0fcba36f9a" config:config];
+    NSString *buylyKey = isEnterprise == NO ? @"5334684d86" : @"d65df59a68";
+    [Bugly startWithAppId:buylyKey config:config];
 #endif
     
 }
@@ -67,6 +96,15 @@ UIKIT_EXTERN NSString * adImageName;
 	//推荐在程序启动的时候初始化 NIMSDK
 	NSString *appKey        = KeyWithType(KeyType_NetEase);
 	NIMSDKOption *option    = [NIMSDKOption optionWithAppKey:appKey];
+#ifdef DEBUG
+    option.apnsCername = @"pikoDevelopPush";
+#else
+    option.apnsCername = @"newPiko";
+#endif
+ 
+    
+
+    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -100,14 +138,22 @@ UIKIT_EXTERN NSString * adImageName;
    [Adjust appDidLaunch:adjustConfig];
 }
 - (void)configShareSDK {
-    
-  
-    
-//	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
-//		///faceBook
+
+    [PILineLoginManager registerLine];
+
+	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
+		///faceBook
 //		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
-//		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
-//	}];
+		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
+	}];
+    NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
+    if (isUpload == nil){
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
+            
+        }];
+        [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
 }
 
 #pragma mark - 表情

YuMi/Appdelegate/AppDelegate.m

@@ -5,6 +5,8 @@
 //  Created by admin on 2023/3/9.
 //
 
+#import <MobLinkPro/MobLink.h>
+#import <MobLinkPro/MLSDKScene.h>
 #import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
@@ -13,20 +15,41 @@
 #import <UMCommon/UMCommon.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
+#import "ClientConfig.h"
+#import <GoogleSignIn/GoogleSignIn.h>
+#import "GULAppDelegateSwizzler.h"
+#import <GoogleSignIn/GoogleSignIn.h>
+#import "XPLoginViewController.h"
+#import "AccountModel.h"
+#import "YuMi-swift.h"
+#import "SessionViewController.h"
+#import "LoginFullInfoViewController.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
-@interface AppDelegate ()
+@interface AppDelegate ()<IMLSDKRestoreDelegate>
 
 @end
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    TabbarViewController *vc = [[TabbarViewController alloc] init];
-    BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
+   
+   
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    self.window.rootViewController = bnc;
+   
+    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];
@@ -39,9 +62,25 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 	}
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FIRApp configure];
+    [MobLink setDelegate:self];
+
+   
     return YES;
 }
 
+- (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;
@@ -78,13 +117,45 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 - (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 	// 上传devicetoken至云信服务器。
-	[[NIMSDK sharedSDK] updateApnsToken:deviceToken];
+	[[NIMSDK sharedSDK] updateApnsToken:deviceToken ];
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+   
+    NSString *data = userInfo[@"data"];
+    if(data){
+        NSDictionary *dataDic = [data mj_JSONObject];
+        NSString *userId = dataDic[@"uid"];
+        if(userId){
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+           
+            });
+            return;
+        }
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NSString *userId = userInfo[@"uid"];
+        if(userId){
+            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            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];
+        }
     
     NSString *text = [url query];
     if(text.length){
@@ -103,16 +174,35 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
             if (type == 2) {
                 NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]];
                 [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"uid":uid}];
-               
+                ClientConfig *config = [ClientConfig shareConfig];
+                config.roomId = uid;
+            }else if(type == 7){
+                NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]];
+                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":uid}];
+                ClientConfig *config = [ClientConfig shareConfig];
+                config.chatId = uid;
+            }else if (type == 8){
+                NSString *inviteCode = paramsDict[@"inviteCode"];
+                if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
+                    ClientConfig *config = [ClientConfig shareConfig];
+                    config.inviteCode = inviteCode;
+                }
             }
             return YES;
         }
-   
+       
     }
-    return [[FBSDKApplicationDelegate sharedInstance] application:app
-                                                         openURL:url
-                                                         sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
-                                                         annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
+    
+    if([url.absoluteString containsString:@"fb1266232494209868"]){
+        return [[FBSDKApplicationDelegate sharedInstance] application:app
+                                                             openURL:url
+                                                             sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
+                                                             annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
+    }
+   
+    return [GIDSignIn.sharedInstance handleURL:url];
+    
+    
 }
 
 

YuMi/Appdelegate/FBSDKSettings+PISDKSettings.h

@@ -0,0 +1,16 @@
+//
+//  FBSDKSettings+PISDKSettings.h
+//  YuMi
+//
+//  Created by duoban on 2023/9/22.
+//
+
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FBSDKSettings (PISDKSettings)
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Appdelegate/FBSDKSettings+PISDKSettings.m

@@ -0,0 +1,19 @@
+//
+//  FBSDKSettings+PISDKSettings.m
+//  YuMi
+//
+//  Created by duoban on 2023/9/22.
+//
+
+#import "FBSDKSettings+PISDKSettings.h"
+#import "GULAppDelegateSwizzler.h"
+
+
+@implementation FBSDKSettings (PISDKSettings)
+///必须为FBSDKSettings添加setAutoLogAppEventsEnabled方法，不然分享时会闪退
++(void)setAutoLogAppEventsEnabled:(BOOL)is{
+    
+}
+
+
+@end

YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.h

@@ -0,0 +1,16 @@
+//
+//  YYTextAsyncLayer+PITextAsyncLayer.h
+//  YuMi
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import <YYText/YYTextAsyncLayer.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YYTextAsyncLayer (PITextAsyncLayer)
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.m

@@ -0,0 +1,26 @@
+//
+//  YYTextAsyncLayer+PITextAsyncLayer.m
+//  YuMi
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import "YYTextAsyncLayer+PITextAsyncLayer.h"
+
+@implementation YYTextAsyncLayer (PITextAsyncLayer)
+///iOS17bug，如果不把方法替换会闪退
++(void)load {
+    Method displayMethod = class_getInstanceMethod(self, @selector(display));
+    Method swizzingMethod = class_getInstanceMethod(self, @selector(swizzing_display));
+    method_exchangeImplementations(displayMethod, swizzingMethod);
+}
+-(void)swizzing_display{
+    //通过变量名称获取类中的实例成员变量
+    if (self.bounds.size.width <= 0 || self.bounds.size.height <= 0) {
+        self.contents = nil;
+        return;
+    } else {
+        [self swizzing_display];
+    }
+}
+@end

YuMi/Assets.xcassets/chat/message_content_service_reply.imageset/Contents.json

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

YuMi/Assets.xcassets/chat/message_main_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_bottom_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_bottom_buy.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_bottom_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_but_btn.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_choose.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_no_choose.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_price.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_title.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_draw_diamond_rebrush.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_add.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_subtract.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_title.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_userinfo_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_shop_new_exchange_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_trials_high_ball_bg.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_treasure_fairy_trials_high_ball_bg.png",
+      "filename" : "room_treasure_fairy_trials_high_ball_bg@3x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_trials_middle_ball_bg.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_treasure_fairy_trials_middle_ball_bg.png",
+      "filename" : "room_treasure_fairy_trials_middle_ball_bg@3x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },