修改夺爱和夺宝

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/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m

@@ -112,9 +112,9 @@
 - (void)textFieldDidChange:(UITextField *)textField {
     if(textField.text.integerValue <= 0){
         textField.text = @"";
-    }else if(textField.text.integerValue > 200){
+    }else if(textField.text.integerValue > 99999){
         [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")];
-        textField.text = @"200";
+        textField.text = @"99999";
     }
     self.chooseNum = textField.text;
 
@@ -127,9 +127,9 @@
 - (void)textFieldDidEndEditing:(UITextField *)textField{
     if(textField.text.length <= 0){
         textField.text = @"";
-    }else if(textField.text.integerValue > 200){
+    }else if(textField.text.integerValue > 99999){
         [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")];
-        textField.text = @"200";
+        textField.text = @"99999";
     }
     self.chooseNum = textField.text;
     NSArray *btnArr = @[self.oneTapBtn,self.tenTapBtn,self.hundredTapBtn];

YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m

@@ -70,9 +70,9 @@
 - (void)textFieldDidChanged:(UITextField *)textField {
     if(textField.text.integerValue <= 0){
         textField.text = @"";
-    }else if(textField.text.integerValue > 200){
+    }else if(textField.text.integerValue > 99999){
         [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")];
-        textField.text = @"200";
+        textField.text = @"99999";
     }
  
     
@@ -83,9 +83,9 @@
 - (void)textFieldDidEndEditing:(UITextField *)textField{
     if(textField.text.length <= 0){
         textField.text = @"";
-    }else if(textField.text.integerValue > 200){
+    }else if(textField.text.integerValue > 99999){
         [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")];
-        textField.text = @"200";
+        textField.text = @"99999";
     }
    
     if(self.delegate && [self.delegate respondsToSelector:@selector(inputLoveNum:)]){
@@ -114,8 +114,8 @@
 -(void)addBtnAction{
     
     NSInteger num = self.textFiled.text.integerValue + 10;
-    if(num > 200){
-        num = 200;
+    if(num > 99999){
+        num = 99999;
         [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPCandyTreeViewController5")];
     }
     self.textFiled.text = @(num).stringValue;

YuMi/Modules/YMRoom/View/TreasureFairy/Api/Api+TreasureFairy.h

@@ -102,7 +102,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 兑换-精灵
 /// - Parameter completion: 完成
 /// - Parameter itemId: id
-+ (void)treasureFailyConvert:(HttpRequestHelperCompletion)completion itemId:(NSString *)itemId roomUid:(NSString *)roomUid propIdStr:(NSString *)propIdStr propNumStr:(NSString *)propNumStr;
++ (void)treasureFailyConvert:(HttpRequestHelperCompletion)completion itemId:(NSString *)itemId roomUid:(NSString *)roomUid;
 
 /// 兑换-碎片兑换列表
 /// - Parameter completion: 完成
@@ -117,16 +117,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///   - page: 页数
 ///   - pageSize: 一页多少个
 + (void)treasureFairyConvertRecord:(HttpRequestHelperCompletion)completion convertType:(NSString *)convertType page:(NSString *)page pageSize:(NSString *)pageSize;
-/// 购买精灵碎片
-/// - Parameters:
-///   - completion: 完成
-///   - num: 数量
-///   - uid: 用户id
-+(void)buyElfShard:(HttpRequestHelperCompletion)completion num:(NSString *)num uid:(NSString *)uid;
-/// 精灵分解
-/// - Parameter completion: 完成
-/// - Parameter salvageReq: 分解的精灵
-+ (void)treasureFailySalvageall:(HttpRequestHelperCompletion)completion salvageReq:(NSArray *)salvageReq;
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/TreasureFairy/Api/Api+TreasureFairy.m

@@ -119,14 +119,7 @@
 	[dic safeSetObject:compoundReqs forKey:@"expendList"];
 	[HttpRequestHelper postSkillCard:@"act/seize-treasure/elf/compound" params:dic.toJSONString completion:completion];
 }
-/// 精灵分解
-/// - Parameter completion: 完成
-/// - Parameter salvageReq: 分解的精灵
-+ (void)treasureFailySalvageall:(HttpRequestHelperCompletion)completion salvageReq:(NSArray *)salvageReq {
-    NSMutableDictionary * dic = [NSMutableDictionary dictionary];
-    [dic safeSetObject:salvageReq forKey:@"expendList"];
-    [HttpRequestHelper postSkillCard:@"act/seize-treasure/elf/salvage" params:dic.toJSONString completion:completion];
-}
+
 /// 精灵试炼记录
 /// - Parameter completion: 完成
 /// - Parameter page: 页数
@@ -146,11 +139,7 @@
 /// 兑换-精灵
 /// - Parameter completion: 完成
 /// - Parameter itemId: id
-+ (void)treasureFailyConvert:(HttpRequestHelperCompletion)completion itemId:(NSString *)itemId roomUid:(nonnull NSString *)roomUid propIdStr:(NSString *)propIdStr propNumStr:(NSString *)propNumStr {
-    if(propIdStr.length > 0){
-        [self makeRequest:@"act/seize-treasure/convert" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, itemId, roomUid,propIdStr,propNumStr,nil];
-        return;
-    }
++ (void)treasureFailyConvert:(HttpRequestHelperCompletion)completion itemId:(NSString *)itemId roomUid:(nonnull NSString *)roomUid {
 	[self makeRequest:@"act/seize-treasure/convert" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, itemId, roomUid,nil];
 }
 
@@ -172,13 +161,4 @@
     [self makeRequest:@"act/seize-treasure/convert/record" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, convertType, page, pageSize, nil];
 }
 
-/// 购买精灵碎片
-/// - Parameters:
-///   - completion: 完成
-///   - num: 数量
-///   - uid: 用户id
-+(void)buyElfShard:(HttpRequestHelperCompletion)completion num:(NSString*)num uid:(NSString *)uid{
-    [self makeRequest:@"act/seize-treasure/shard/buy" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, num,uid, nil];
-}
-
 @end

YuMi/Modules/YMRoom/View/TreasureFairy/Model/TreasureFairyBallInfoModel.h

@@ -45,8 +45,6 @@ NS_ASSUME_NONNULL_BEGIN
 ///赠送的人的uid
 @property (nonatomic,assign) NSInteger uid;
 
-
-@property(nonatomic,assign) BOOL isHigh;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/TreasureFairy/Model/TreasureFairyFragmentModel.h

@@ -34,20 +34,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// 兑换类型
 @property (nonatomic, assign) NSInteger type;
 
-@property(nonatomic,copy) NSArray *propItems;
-
 @end
-@interface TreasureFairyFragmentItemModel : NSObject
 
-
-@property (nonatomic, copy) NSString *picUrl;
-
-@property (nonatomic, copy) NSString *propId;
-
-@property (nonatomic, copy) NSString *propName;
-
-@property (nonatomic, copy) NSString *propNum;
-
-
-@end
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/TreasureFairy/Model/TreasureFairyFragmentModel.m

@@ -8,13 +8,5 @@
 #import "TreasureFairyFragmentModel.h"
 
 @implementation TreasureFairyFragmentModel
-+ (NSDictionary *)objectClassInArray{
-    return @{@"propItems":TreasureFairyFragmentItemModel.class};
-}
-@end
-
-@implementation TreasureFairyFragmentItemModel
-
-
 
 @end