夺宝改版
@@ -31,7 +31,7 @@
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Release"
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
|
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "room_treasure_fairy_treasure_bg@2x.png",
|
||||
"filename" : "room_treasure_fairy_bottom_bg@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "room_treasure_fairy_treasure_bg@3x.png",
|
||||
"filename" : "room_treasure_fairy_bottom_bg@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
After Width: | Height: | Size: 30 KiB |
After Width: | Height: | Size: 75 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "room_treasure_fairy_my_middle_title_normal@2x.png",
|
||||
"filename" : "room_treasure_fairy_bottom_buy@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "room_treasure_fairy_my_middle_title_normal@3x.png",
|
||||
"filename" : "room_treasure_fairy_bottom_buy@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 3.5 KiB |
@@ -5,12 +5,12 @@
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "room_treasure_fairy_my_middle_title_select@2x.png",
|
||||
"filename" : "room_treasure_fairy_bottom_icon@2x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"filename" : "room_treasure_fairy_my_middle_title_select@3x.png",
|
||||
"filename" : "room_treasure_fairy_bottom_icon@3x.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 2.2 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_bg.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 54 KiB |
After Width: | Height: | Size: 190 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_but_btn.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 3.3 KiB |
After Width: | Height: | Size: 10 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_choose.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 309 B |
After Width: | Height: | Size: 458 B |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_icon.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 8.4 KiB |
After Width: | Height: | Size: 14 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_no_choose.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 251 B |
After Width: | Height: | Size: 368 B |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_price.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 2.8 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_buy_elf_title.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 9.4 KiB |
After Width: | Height: | Size: 18 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_draw_diamond_rebrush.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 495 B |
After Width: | Height: | Size: 689 B |
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 9.5 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 9.4 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 31 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_add.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 3.4 KiB |
After Width: | Height: | Size: 5.6 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_bg.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 43 KiB |
After Width: | Height: | Size: 153 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_subtract.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 5.2 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_new_buy_elf_title.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 9.0 KiB |
After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 18 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_shop_new_exchange_bg.imageset/Contents.json
vendored
Normal file
@@ -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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 27 KiB |
After Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 9.9 KiB |
@@ -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"
|
||||
},
|
||||
|
Before Width: | Height: | Size: 38 KiB |
After Width: | Height: | Size: 131 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 9.7 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 18 KiB |
@@ -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"
|
||||
},
|
||||
|
Before Width: | Height: | Size: 33 KiB |
After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 9.4 KiB |
22
YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_trials_salvage_bg.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"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
|
||||
}
|
||||
}
|
After Width: | Height: | Size: 7.4 KiB |
After Width: | Height: | Size: 14 KiB |
@@ -12,7 +12,7 @@
|
||||
///标题图片
|
||||
@property(nonatomic,strong) UIImageView *titleView;
|
||||
///精灵图标
|
||||
@property(nonatomic,strong) UIImageView *iconView;
|
||||
@property(nonatomic,strong) UIImageView *pi_iconView;
|
||||
///背景
|
||||
@property(nonatomic,strong) UIImageView *bgImageView;
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
[self addSubview:self.titleView];
|
||||
[self.bgImageView addSubview:self.closeView];
|
||||
[self.bgImageView addSubview:self.getView];
|
||||
[self.bgImageView addSubview:self.iconView];
|
||||
[self.bgImageView addSubview:self.pi_iconView];
|
||||
[self.bgImageView addSubview:self.numView];
|
||||
[self.bgImageView addSubview:self.chooseBnt];
|
||||
[self.bgImageView addSubview:self.tipsView];
|
||||
@@ -69,7 +69,7 @@
|
||||
make.height.mas_equalTo(kGetScaleWidth(20));
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
}];
|
||||
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
[self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.height.mas_equalTo(kGetScaleWidth(80));
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
make.top.equalTo(self.getView.mas_bottom).mas_offset(kGetScaleWidth(4));
|
||||
@@ -77,7 +77,7 @@
|
||||
[self.numView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
make.height.mas_equalTo(kGetScaleWidth(22));
|
||||
make.top.equalTo(self.iconView.mas_bottom).mas_offset(kGetScaleWidth(4));
|
||||
make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(kGetScaleWidth(4));
|
||||
}];
|
||||
[self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.bgImageView).mas_offset(kGetScaleWidth(6));
|
||||
@@ -137,12 +137,12 @@
|
||||
}
|
||||
return _bgImageView;
|
||||
}
|
||||
-(UIImageView *)iconView{
|
||||
if(!_iconView){
|
||||
_iconView = [UIImageView new];
|
||||
_iconView.image = kImage(@"room_candy_tree_buy_love_icon");
|
||||
-(UIImageView *)pi_iconView{
|
||||
if(!_pi_iconView){
|
||||
_pi_iconView = [UIImageView new];
|
||||
_pi_iconView.image = kImage(@"room_candy_tree_buy_love_icon");
|
||||
}
|
||||
return _iconView;
|
||||
return _pi_iconView;
|
||||
}
|
||||
-(UIImageView *)titleView{
|
||||
if(!_titleView){
|
||||
|
@@ -285,6 +285,7 @@
|
||||
_textField.keyboardType = UIKeyboardTypeNumberPad;
|
||||
_textField.textAlignment = NSTextAlignmentCenter;
|
||||
_textField.delegate = self;
|
||||
_textField.adjustsFontSizeToFitWidth = YES;
|
||||
_textField.backgroundColor = [UIColor clearColor];
|
||||
[_textField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged];
|
||||
}
|
||||
|
@@ -12,7 +12,7 @@
|
||||
@property(nonatomic,strong) UIButton *closeView;
|
||||
|
||||
///精灵图标
|
||||
@property(nonatomic,strong) UIImageView *iconView;
|
||||
@property(nonatomic,strong) UIImageView *pi_iconView;
|
||||
///背景
|
||||
@property(nonatomic,strong) UIImageView *bgImageView;
|
||||
///标题图片
|
||||
@@ -91,7 +91,7 @@
|
||||
[self addSubview:self.bgImageView];
|
||||
[self addSubview:self.titleView];
|
||||
[self.bgImageView addSubview:self.closeView];
|
||||
[self.bgImageView addSubview:self.iconView];
|
||||
[self.bgImageView addSubview:self.pi_iconView];
|
||||
[self.bgImageView addSubview:self.numView];
|
||||
[self.bgImageView addSubview:self.titleTipsView];
|
||||
[self.bgImageView addSubview:self.buyBtn];
|
||||
@@ -123,7 +123,7 @@
|
||||
make.height.mas_equalTo(kGetScaleWidth(17));
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
}];
|
||||
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
[self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.height.mas_equalTo(kGetScaleWidth(80));
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(8);
|
||||
@@ -131,7 +131,7 @@
|
||||
[self.numView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
make.height.mas_equalTo(kGetScaleWidth(22));
|
||||
make.top.equalTo(self.iconView.mas_bottom).mas_offset(kGetScaleWidth(5));
|
||||
make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(kGetScaleWidth(5));
|
||||
}];
|
||||
|
||||
[self.buyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
@@ -159,7 +159,7 @@
|
||||
[self addSubview:self.titleView];
|
||||
[self.bgImageView addSubview:self.closeView];
|
||||
[self.bgImageView addSubview:self.titleTipsView];
|
||||
[self.bgImageView addSubview:self.iconView];
|
||||
[self.bgImageView addSubview:self.pi_iconView];
|
||||
[self.bgImageView addSubview:self.numView];
|
||||
[self.bgImageView addSubview:self.inputNumView];
|
||||
[self.bgImageView addSubview:self.buyBtn];
|
||||
@@ -188,7 +188,7 @@
|
||||
make.height.mas_equalTo(kGetScaleWidth(17));
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
}];
|
||||
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
[self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.width.height.mas_equalTo(kGetScaleWidth(80));
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(kGetScaleWidth(8));
|
||||
@@ -196,7 +196,7 @@
|
||||
[self.numView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.centerX.equalTo(self.bgImageView);
|
||||
make.height.mas_equalTo(kGetScaleWidth(22));
|
||||
make.top.equalTo(self.iconView.mas_bottom).mas_offset(kGetScaleWidth(5));
|
||||
make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(kGetScaleWidth(5));
|
||||
}];
|
||||
[self.inputNumView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.equalTo(self.numView.mas_bottom).mas_offset(kGetScaleWidth(5));
|
||||
@@ -286,12 +286,12 @@
|
||||
}
|
||||
return _bgImageView;
|
||||
}
|
||||
-(UIImageView *)iconView{
|
||||
if(!_iconView){
|
||||
_iconView = [UIImageView new];
|
||||
_iconView.image = kImage(@"room_candy_tree_buy_love_icon");
|
||||
-(UIImageView *)pi_iconView{
|
||||
if(!_pi_iconView){
|
||||
_pi_iconView = [UIImageView new];
|
||||
_pi_iconView.image = kImage(@"room_candy_tree_buy_love_icon");
|
||||
}
|
||||
return _iconView;
|
||||
return _pi_iconView;
|
||||
}
|
||||
-(UIImageView *)titleView{
|
||||
if(!_titleView){
|
||||
|
@@ -17,7 +17,7 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification;
|
||||
///倒计时
|
||||
@property (nonatomic,strong) UILabel *timeView;
|
||||
///礼物图
|
||||
@property (nonatomic,strong) NetImageView *iconView;
|
||||
@property (nonatomic,strong) NetImageView *pi_iconView;
|
||||
///礼物
|
||||
@property (nonatomic,strong) UILabel *nameView;
|
||||
///礼物标题
|
||||
@@ -59,7 +59,7 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification;
|
||||
self.freeModel.giftId = giftId;
|
||||
self.freeModel.giftName = giftNamed;
|
||||
self.freeModel.giftUrl = giftUrl;
|
||||
self.iconView.imageUrl = self.freeModel.giftUrl;
|
||||
self.pi_iconView.imageUrl = self.freeModel.giftUrl;
|
||||
self.nameView.text = self.freeModel.giftName;
|
||||
return;
|
||||
}
|
||||
@@ -87,7 +87,7 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification;
|
||||
[self.contentView addSubview:self.bgView];
|
||||
[self.bgView addSubview:self.numView];
|
||||
[self.bgView addSubview:self.timeView];
|
||||
[self.bgView addSubview:self.iconView];
|
||||
[self.bgView addSubview:self.pi_iconView];
|
||||
[self.bgView addSubview:self.nameView];
|
||||
[self.bgView addSubview:self.titleView];
|
||||
|
||||
@@ -107,14 +107,14 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification;
|
||||
make.centerY.equalTo(self.timeView);
|
||||
make.right.equalTo(self.timeView.mas_left).mas_offset(-5);
|
||||
}];
|
||||
[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
[self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.mas_equalTo(17);
|
||||
make.width.mas_equalTo(48);
|
||||
make.height.mas_equalTo(48);
|
||||
make.centerX.equalTo(self.bgView);
|
||||
}];
|
||||
[self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
|
||||
make.top.equalTo(self.iconView.mas_bottom).mas_offset(5);
|
||||
make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(5);
|
||||
make.height.mas_equalTo(14);
|
||||
make.left.right.equalTo(self.bgView);
|
||||
}];
|
||||
@@ -136,7 +136,7 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification;
|
||||
}
|
||||
-(void)setFreeModel:(XPFreeGiftModel *)freeModel{
|
||||
_freeModel = freeModel;
|
||||
_iconView.imageUrl = _freeModel.giftUrl;
|
||||
_pi_iconView.imageUrl = _freeModel.giftUrl;
|
||||
_nameView.text = _freeModel.giftName;
|
||||
|
||||
|
||||
@@ -167,14 +167,14 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification;
|
||||
}
|
||||
return _timeView;
|
||||
}
|
||||
- (NetImageView *)iconView{
|
||||
if (!_iconView){
|
||||
- (NetImageView *)pi_iconView{
|
||||
if (!_pi_iconView){
|
||||
NetImageConfig *config = [[NetImageConfig alloc]init];
|
||||
config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder];
|
||||
_iconView = [[NetImageView alloc]initWithConfig:config];
|
||||
_pi_iconView = [[NetImageView alloc]initWithConfig:config];
|
||||
|
||||
}
|
||||
return _iconView;
|
||||
return _pi_iconView;
|
||||
}
|
||||
- (UILabel *)nameView{
|
||||
if (!_nameView){
|
||||
|
@@ -102,7 +102,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/// 兑换-精灵
|
||||
/// - Parameter completion: 完成
|
||||
/// - Parameter itemId: id
|
||||
+ (void)treasureFailyConvert:(HttpRequestHelperCompletion)completion itemId:(NSString *)itemId roomUid:(NSString *)roomUid;
|
||||
+ (void)treasureFailyConvert:(HttpRequestHelperCompletion)completion itemId:(NSString *)itemId roomUid:(NSString *)roomUid propIdStr:(NSString *)propIdStr propNumStr:(NSString *)propNumStr;
|
||||
|
||||
/// 兑换-碎片兑换列表
|
||||
/// - Parameter completion: 完成
|
||||
@@ -117,7 +117,16 @@ 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
|
||||
|