修复bug

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/Assets.xcassets/jm/Fairy/room_treasure_fairy_bottom_buy.imageset/Contents.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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@3x.png",
+      "filename" : "room_treasure_fairy_trials_high_ball_bg.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@3x.png",
+      "filename" : "room_treasure_fairy_trials_middle_ball_bg.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

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

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

YuMi/Config/ClientConfig.h

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///开箱子 大于等级  展示
 @property (nonatomic, assign) NSInteger openCandyTreeLimitLevel;
 @property (nonatomic,assign) BOOL canOpen;
+@property(nonatomic,assign) BOOL isLoad;
 ///房间id，用于分享房间跳转到房间
 @property (nonatomic, copy) NSString *__nullable roomId;
 ///用户id，用于外部h5跳转到聊天页面

YuMi/Config/ClientConfig.m

@@ -42,7 +42,7 @@
 		if (code == 200) {
 			self.retryCount = 0;
 			NSDictionary * initData = data.data;
-			self.canOpen = ![initData[@"aModel"] boolValue];
+			self.canOpen = YES;
 			self.iosPhoneBind = [initData[@"iosPhoneBind"] boolValue];
 			//糖果树配置
 			self.openCandyTree = [initData[@"openBoxSwitch"] boolValue];

YuMi/Global/YUMIHtmlUrl.h

@@ -100,7 +100,8 @@ typedef NS_ENUM(NSUInteger, URLType) {
     kTreasureRuleURL,
     ///夺宝记录
     kTreasureRecordURL,
-    kChannelUrl,
+    ///第三方充值
+    kThirdPartyPay,
 };
 
 NSString * const URLWithType(URLType type);

YuMi/Global/YUMIHtmlUrl.m

@@ -18,8 +18,6 @@ NSString * const URLWithType(URLType type) {
     prefix = [NSString stringWithFormat:@"%@o",prefix];
     
     
-    
-    
   NSDictionary *newDic = @{
       @(kTreasureTicketBuyURL) : @"modules/act-treasureSnatching/index.html",///夺宝购买
       @(kTreasureRankListURL)  : @"modules/act-treasureSnatching/list.html",///夺宝达人
@@ -28,7 +26,7 @@ NSString * const URLWithType(URLType type) {
       @(kNobleRankURL)         : @"modules/noble/index.html",///排行榜
       @(kGoldEarningsRecord)   : @"modules/myincome/index.html#/GoldLog",///金币收益记录
       @(kCandyTreeRuleURL)     : @"modules/rule/newWishingWellRule.html",///糖果树规则 modules/rank/index.html#/wishingWellRule
-      @(kChannelUrl)           : @"modules/%@/index.html?channelType=%@&deviceId=%@",
+      @(kThirdPartyPay)        : @"modules/pay/index.html?channelType=%@&deviceId=%@",///第三方充值
   };
     NSString * newUrl = [newDic objectForKey:@(type)];
     if(newUrl != nil){

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 
-#define PI_App_Version @"2.0.7"
+#define PI_App_Version @"2.0.8"
 #ifdef DEBUG
 #define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]