diff --git a/YuMi/Assets.xcassets/Vip Center/vip1/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip1/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip1/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_1.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_id_level_1.imageset/Contents.json similarity index 84% rename from YuMi/Assets.xcassets/Vip Center/vip_center_level_1.imageset/Contents.json rename to YuMi/Assets.xcassets/Vip Center/vip1/vip_center_id_level_1.imageset/Contents.json index 3ae7a983..590383b3 100644 --- a/YuMi/Assets.xcassets/Vip Center/vip_center_level_1.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_id_level_1.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "vip_center_level_1@3x.png", + "filename" : "切图 45@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_id_level_1.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_id_level_1.imageset/切图 45@3x.png new file mode 100644 index 00000000..05b91b2f Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_id_level_1.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_3.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_level_1.imageset/Contents.json similarity index 84% rename from YuMi/Assets.xcassets/Vip Center/vip_center_level_3.imageset/Contents.json rename to YuMi/Assets.xcassets/Vip Center/vip1/vip_center_level_1.imageset/Contents.json index 383a7b63..fbadb1be 100644 --- a/YuMi/Assets.xcassets/Vip Center/vip_center_level_3.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_level_1.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "vip_center_level_3@3x.png", + "filename" : "组 8033@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_level_1.imageset/组 8033@3x.png b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_level_1.imageset/组 8033@3x.png new file mode 100644 index 00000000..1e3a55f2 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_level_1.imageset/组 8033@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_2.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_room_card_level_1.imageset/Contents.json similarity index 84% rename from YuMi/Assets.xcassets/Vip Center/vip_center_level_2.imageset/Contents.json rename to YuMi/Assets.xcassets/Vip Center/vip1/vip_center_room_card_level_1.imageset/Contents.json index cc058177..1b994048 100644 --- a/YuMi/Assets.xcassets/Vip Center/vip_center_level_2.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_room_card_level_1.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "vip_center_level_2@3x.png", + "filename" : "切图 45@3x(1).png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_room_card_level_1.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_room_card_level_1.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..9cf1f67d Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip1/vip_center_room_card_level_1.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip2/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip2/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip2/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_id_level_2.imageset/Contents.json similarity index 84% rename from YuMi/Assets.xcassets/Vip Center/vip_center_level_4.imageset/Contents.json rename to YuMi/Assets.xcassets/Vip Center/vip2/vip_center_id_level_2.imageset/Contents.json index 51ad2d9f..590383b3 100644 --- a/YuMi/Assets.xcassets/Vip Center/vip_center_level_4.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_id_level_2.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "vip_center_level_4@3x.png", + "filename" : "切图 45@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_id_level_2.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_id_level_2.imageset/切图 45@3x.png new file mode 100644 index 00000000..6d475535 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_id_level_2.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_level_2.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_level_2.imageset/Contents.json new file mode 100644 index 00000000..26c34701 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_level_2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x-3.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_level_2.imageset/组 8033@3x-3.png b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_level_2.imageset/组 8033@3x-3.png new file mode 100644 index 00000000..a9cf5f97 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_level_2.imageset/组 8033@3x-3.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_room_card_level_2.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_room_card_level_2.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_room_card_level_2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_room_card_level_2.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_room_card_level_2.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..0face51a Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip2/vip_center_room_card_level_2.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip3/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip3/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_id_level_3.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_id_level_3.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_id_level_3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_id_level_3.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_id_level_3.imageset/切图 45@3x.png new file mode 100644 index 00000000..b3086174 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_id_level_3.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_level_3.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_level_3.imageset/Contents.json new file mode 100644 index 00000000..fbadb1be --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_level_3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_level_3.imageset/组 8033@3x.png b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_level_3.imageset/组 8033@3x.png new file mode 100644 index 00000000..c518b8be Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_level_3.imageset/组 8033@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_room_card_level_3.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_room_card_level_3.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_room_card_level_3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_room_card_level_3.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_room_card_level_3.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..66636911 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_room_card_level_3.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_wave_level_3.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_wave_level_3.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_wave_level_3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_wave_level_3.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_wave_level_3.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..c6c8a9ed Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip3/vip_center_wave_level_3.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_bubbles_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_bubbles_level_4.imageset/Contents.json new file mode 100644 index 00000000..c140de9b --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_bubbles_level_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(4).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_bubbles_level_4.imageset/切图 45@3x(4).png b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_bubbles_level_4.imageset/切图 45@3x(4).png new file mode 100644 index 00000000..73c7a3b8 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_bubbles_level_4.imageset/切图 45@3x(4).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_entry_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_entry_level_4.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_entry_level_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_entry_level_4.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_entry_level_4.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..6cd9e872 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_entry_level_4.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_id_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_id_level_4.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_id_level_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_id_level_4.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_id_level_4.imageset/切图 45@3x.png new file mode 100644 index 00000000..39d9e7e0 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_id_level_4.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_level_4.imageset/Contents.json new file mode 100644 index 00000000..b3874901 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_level_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x-2.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_level_4.imageset/组 8033@3x-2.png b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_level_4.imageset/组 8033@3x-2.png new file mode 100644 index 00000000..8582356e Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_level_4.imageset/组 8033@3x-2.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_room_card_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_room_card_level_4.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_room_card_level_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_room_card_level_4.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_room_card_level_4.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..8347fcfd Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_room_card_level_4.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_wave_level_4.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_wave_level_4.imageset/Contents.json new file mode 100644 index 00000000..63a632ca --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_wave_level_4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_wave_level_4.imageset/切图 45@3x(3).png b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_wave_level_4.imageset/切图 45@3x(3).png new file mode 100644 index 00000000..adb75379 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip4/vip_center_wave_level_4.imageset/切图 45@3x(3).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_bubbles_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_bubbles_level_5.imageset/Contents.json new file mode 100644 index 00000000..c140de9b --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_bubbles_level_5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(4).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_bubbles_level_5.imageset/切图 45@3x(4).png b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_bubbles_level_5.imageset/切图 45@3x(4).png new file mode 100644 index 00000000..d446d19a Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_bubbles_level_5.imageset/切图 45@3x(4).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_entry_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_entry_level_5.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_entry_level_5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_entry_level_5.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_entry_level_5.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..fe43af95 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_entry_level_5.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_id_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_id_level_5.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_id_level_5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_id_level_5.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_id_level_5.imageset/切图 45@3x.png new file mode 100644 index 00000000..603bc854 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_id_level_5.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_level_5.imageset/Contents.json new file mode 100644 index 00000000..fbadb1be --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_level_5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_level_5.imageset/组 8033@3x.png b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_level_5.imageset/组 8033@3x.png new file mode 100644 index 00000000..616d6f30 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_level_5.imageset/组 8033@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_room_card_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_room_card_level_5.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_room_card_level_5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_room_card_level_5.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_room_card_level_5.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..8b5aa252 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_room_card_level_5.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_wave_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_wave_level_5.imageset/Contents.json new file mode 100644 index 00000000..63a632ca --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_wave_level_5.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_wave_level_5.imageset/切图 45@3x(3).png b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_wave_level_5.imageset/切图 45@3x(3).png new file mode 100644 index 00000000..2d0a4ac0 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip5/vip_center_wave_level_5.imageset/切图 45@3x(3).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_bubbles_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_bubbles_level_6.imageset/Contents.json new file mode 100644 index 00000000..c140de9b --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_bubbles_level_6.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(4).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_bubbles_level_6.imageset/切图 45@3x(4).png b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_bubbles_level_6.imageset/切图 45@3x(4).png new file mode 100644 index 00000000..f5038162 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_bubbles_level_6.imageset/切图 45@3x(4).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_entry_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_entry_level_6.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_entry_level_6.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_entry_level_6.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_entry_level_6.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..ab57373c Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_entry_level_6.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_id_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_id_level_6.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_id_level_6.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_id_level_6.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_id_level_6.imageset/切图 45@3x.png new file mode 100644 index 00000000..faabaf3c Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_id_level_6.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_level_6.imageset/Contents.json new file mode 100644 index 00000000..fbadb1be --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_level_6.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_level_6.imageset/组 8033@3x.png b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_level_6.imageset/组 8033@3x.png new file mode 100644 index 00000000..f984ff4d Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_level_6.imageset/组 8033@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_room_card_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_room_card_level_6.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_room_card_level_6.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_room_card_level_6.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_room_card_level_6.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..226971c1 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_room_card_level_6.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_wave_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_wave_level_6.imageset/Contents.json new file mode 100644 index 00000000..63a632ca --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_wave_level_6.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_wave_level_6.imageset/切图 45@3x(3).png b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_wave_level_6.imageset/切图 45@3x(3).png new file mode 100644 index 00000000..a03766bb Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip6/vip_center_wave_level_6.imageset/切图 45@3x(3).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_bubbles_level_7.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_bubbles_level_7.imageset/Contents.json new file mode 100644 index 00000000..c140de9b --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_bubbles_level_7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(4).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_bubbles_level_7.imageset/切图 45@3x(4).png b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_bubbles_level_7.imageset/切图 45@3x(4).png new file mode 100644 index 00000000..0b8d4fb6 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_bubbles_level_7.imageset/切图 45@3x(4).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_entry_level_7.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_entry_level_7.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_entry_level_7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_entry_level_7.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_entry_level_7.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..0847e573 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_entry_level_7.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_id_level_7.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_id_level_7.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_id_level_7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_id_level_7.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_id_level_7.imageset/切图 45@3x.png new file mode 100644 index 00000000..5bebb630 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_id_level_7.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_level_7.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_level_7.imageset/Contents.json new file mode 100644 index 00000000..fbadb1be --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_level_7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_level_7.imageset/组 8033@3x.png b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_level_7.imageset/组 8033@3x.png new file mode 100644 index 00000000..688d0ef1 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_level_7.imageset/组 8033@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_room_card_level_7.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_room_card_level_7.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_room_card_level_7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_room_card_level_7.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_room_card_level_7.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..f1d571a2 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_room_card_level_7.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_wave_level_7.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_wave_level_7.imageset/Contents.json new file mode 100644 index 00000000..63a632ca --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_wave_level_7.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_wave_level_7.imageset/切图 45@3x(3).png b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_wave_level_7.imageset/切图 45@3x(3).png new file mode 100644 index 00000000..9b37a70c Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip7/vip_center_wave_level_7.imageset/切图 45@3x(3).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_bubbles_level_8.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_bubbles_level_8.imageset/Contents.json new file mode 100644 index 00000000..c140de9b --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_bubbles_level_8.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(4).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_bubbles_level_8.imageset/切图 45@3x(4).png b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_bubbles_level_8.imageset/切图 45@3x(4).png new file mode 100644 index 00000000..5647613a Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_bubbles_level_8.imageset/切图 45@3x(4).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_entry_level_8.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_entry_level_8.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_entry_level_8.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_entry_level_8.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_entry_level_8.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..f3db0daf Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_entry_level_8.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_id_level_8.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_id_level_8.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_id_level_8.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_id_level_8.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_id_level_8.imageset/切图 45@3x.png new file mode 100644 index 00000000..b010482c Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_id_level_8.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_level_8.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_level_8.imageset/Contents.json new file mode 100644 index 00000000..0db25838 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_level_8.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8063@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_level_8.imageset/组 8063@3x.png b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_level_8.imageset/组 8063@3x.png new file mode 100644 index 00000000..942d440b Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_level_8.imageset/组 8063@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_room_card_level_8.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_room_card_level_8.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_room_card_level_8.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_room_card_level_8.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_room_card_level_8.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..07bf4f44 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_room_card_level_8.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_wave_level_8.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_wave_level_8.imageset/Contents.json new file mode 100644 index 00000000..63a632ca --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_wave_level_8.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_wave_level_8.imageset/切图 45@3x(3).png b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_wave_level_8.imageset/切图 45@3x(3).png new file mode 100644 index 00000000..41c96234 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip8/vip_center_wave_level_8.imageset/切图 45@3x(3).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_bubbles_level_9.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_bubbles_level_9.imageset/Contents.json new file mode 100644 index 00000000..c140de9b --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_bubbles_level_9.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(4).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_bubbles_level_9.imageset/切图 45@3x(4).png b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_bubbles_level_9.imageset/切图 45@3x(4).png new file mode 100644 index 00000000..6e51f920 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_bubbles_level_9.imageset/切图 45@3x(4).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_entry_level_9.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_entry_level_9.imageset/Contents.json new file mode 100644 index 00000000..c87cde99 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_entry_level_9.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_entry_level_9.imageset/切图 45@3x(2).png b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_entry_level_9.imageset/切图 45@3x(2).png new file mode 100644 index 00000000..f53db709 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_entry_level_9.imageset/切图 45@3x(2).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_id_level_9.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_id_level_9.imageset/Contents.json new file mode 100644 index 00000000..590383b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_id_level_9.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_id_level_9.imageset/切图 45@3x.png b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_id_level_9.imageset/切图 45@3x.png new file mode 100644 index 00000000..fa28a063 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_id_level_9.imageset/切图 45@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_level_9.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_level_9.imageset/Contents.json new file mode 100644 index 00000000..fbadb1be --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_level_9.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 8033@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_level_9.imageset/组 8033@3x.png b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_level_9.imageset/组 8033@3x.png new file mode 100644 index 00000000..de71f2c4 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_level_9.imageset/组 8033@3x.png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_room_card_level_9.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_room_card_level_9.imageset/Contents.json new file mode 100644 index 00000000..1b994048 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_room_card_level_9.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_room_card_level_9.imageset/切图 45@3x(1).png b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_room_card_level_9.imageset/切图 45@3x(1).png new file mode 100644 index 00000000..c4326c80 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_room_card_level_9.imageset/切图 45@3x(1).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_wave_level_9.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_wave_level_9.imageset/Contents.json new file mode 100644 index 00000000..63a632ca --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_wave_level_9.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "切图 45@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_wave_level_9.imageset/切图 45@3x(3).png b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_wave_level_9.imageset/切图 45@3x(3).png new file mode 100644 index 00000000..36160837 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip9/vip_center_wave_level_9.imageset/切图 45@3x(3).png differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_1.imageset/vip_center_level_1@3x.png b/YuMi/Assets.xcassets/Vip Center/vip_center_level_1.imageset/vip_center_level_1@3x.png deleted file mode 100644 index e3c87bcc..00000000 Binary files a/YuMi/Assets.xcassets/Vip Center/vip_center_level_1.imageset/vip_center_level_1@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_2.imageset/vip_center_level_2@3x.png b/YuMi/Assets.xcassets/Vip Center/vip_center_level_2.imageset/vip_center_level_2@3x.png deleted file mode 100644 index ba5153af..00000000 Binary files a/YuMi/Assets.xcassets/Vip Center/vip_center_level_2.imageset/vip_center_level_2@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_3.imageset/vip_center_level_3@3x.png b/YuMi/Assets.xcassets/Vip Center/vip_center_level_3.imageset/vip_center_level_3@3x.png deleted file mode 100644 index bab998b6..00000000 Binary files a/YuMi/Assets.xcassets/Vip Center/vip_center_level_3.imageset/vip_center_level_3@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_4.imageset/vip_center_level_4@3x.png b/YuMi/Assets.xcassets/Vip Center/vip_center_level_4.imageset/vip_center_level_4@3x.png deleted file mode 100644 index f90abf71..00000000 Binary files a/YuMi/Assets.xcassets/Vip Center/vip_center_level_4.imageset/vip_center_level_4@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_5.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip_center_level_5.imageset/Contents.json deleted file mode 100644 index 954c4178..00000000 --- a/YuMi/Assets.xcassets/Vip Center/vip_center_level_5.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "vip_center_level_5@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_5.imageset/vip_center_level_5@3x.png b/YuMi/Assets.xcassets/Vip Center/vip_center_level_5.imageset/vip_center_level_5@3x.png deleted file mode 100644 index af179d80..00000000 Binary files a/YuMi/Assets.xcassets/Vip Center/vip_center_level_5.imageset/vip_center_level_5@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_6.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip_center_level_6.imageset/Contents.json deleted file mode 100644 index b24594a2..00000000 --- a/YuMi/Assets.xcassets/Vip Center/vip_center_level_6.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "vip_center_level_6@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_level_6.imageset/vip_center_level_6@3x.png b/YuMi/Assets.xcassets/Vip Center/vip_center_level_6.imageset/vip_center_level_6@3x.png deleted file mode 100644 index 20cd9153..00000000 Binary files a/YuMi/Assets.xcassets/Vip Center/vip_center_level_6.imageset/vip_center_level_6@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_setting.imageset/Contents.json b/YuMi/Assets.xcassets/Vip Center/vip_center_setting.imageset/Contents.json new file mode 100644 index 00000000..c4c53f73 --- /dev/null +++ b/YuMi/Assets.xcassets/Vip Center/vip_center_setting.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "vip_center_setting.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Vip Center/vip_center_setting.imageset/vip_center_setting.png b/YuMi/Assets.xcassets/Vip Center/vip_center_setting.imageset/vip_center_setting.png new file mode 100644 index 00000000..163c57a2 Binary files /dev/null and b/YuMi/Assets.xcassets/Vip Center/vip_center_setting.imageset/vip_center_setting.png differ diff --git a/YuMi/CustomUI/UIImage/UIImage+Utils.h b/YuMi/CustomUI/UIImage/UIImage+Utils.h index cd343065..35e1c80e 100644 --- a/YuMi/CustomUI/UIImage/UIImage+Utils.h +++ b/YuMi/CustomUI/UIImage/UIImage+Utils.h @@ -49,6 +49,7 @@ typedef NS_ENUM(NSUInteger, GradientType) { ///裁剪图片 - (UIImage *)cutImage:(CGSize)newSize; +- (UIImage *)cropRightAndBottomPixels:(NSUInteger)pixels; -(UIImage *)compressWithMaxLength:(NSUInteger)maxLength; - (UIImage *)roundedImageWithCornerRadius:(CGFloat)cornerRadius size:(CGSize)size; diff --git a/YuMi/CustomUI/UIImage/UIImage+Utils.m b/YuMi/CustomUI/UIImage/UIImage+Utils.m index 6fe2cc92..2f01d8e2 100644 --- a/YuMi/CustomUI/UIImage/UIImage+Utils.m +++ b/YuMi/CustomUI/UIImage/UIImage+Utils.m @@ -364,6 +364,28 @@ return scaleImage; } +- (UIImage *)cropRightAndBottomPixels:(NSUInteger)pixels { + // 获取原图像的大小 + CGSize originalSize = self.size; + + // 计算新的裁剪后的图像大小 + CGSize newSize = CGSizeMake(originalSize.width - pixels, originalSize.height - pixels); + + // 开始图像上下文 + UIGraphicsBeginImageContextWithOptions(newSize, NO, self.scale); + + // 绘制裁剪后的图像到上下文 + [self drawAtPoint:CGPointZero]; + + // 获取裁剪后的图像 + UIImage *croppedImage = UIGraphicsGetImageFromCurrentImageContext(); + + // 结束图像上下文 + UIGraphicsEndImageContext(); + + return croppedImage; +} + - (UIImage*) originImage:(UIImage *)image scaleToSize:(CGSize)size { UIGraphicsBeginImageContextWithOptions(size, NO, [UIScreen mainScreen].scale); diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m b/YuMi/Modules/YMMine/Presenter/XPMinePresent.m index 516f2914..dc25b47b 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m +++ b/YuMi/Modules/YMMine/Presenter/XPMinePresent.m @@ -79,6 +79,7 @@ }fail:^(NSInteger code, NSString * _Nullable msg) { // @kStrongify(self); // [[self getView]onGetClanDetailInfoFail]; + NSLog(@"%@", msg); }] uid:uid]; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m index a39ebf18..6831f7fa 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m @@ -166,7 +166,7 @@ } } - + } - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{ return kGetScaleWidth(10); diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h index c49309c1..60db774d 100644 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h +++ b/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h @@ -33,6 +33,9 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic,copy) NSArray *returnProfits; @property(nonatomic,assign) BOOL isReturnProfit; + +@property (nonatomic, assign) NSInteger buyAmount; + @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m index e1e31630..5d622a26 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m @@ -50,25 +50,12 @@ make.edges.equalTo(self); }]; -#ifdef DEBUG + [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.leading.bottom.equalTo(self); - make.height.mas_equalTo(375); + make.height.mas_equalTo(275); }]; -#else - if(isEnterprise == YES){ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.bottom.equalTo(self); - make.height.mas_equalTo(375); - }]; - }else{ - [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.leading.bottom.equalTo(self); - make.height.mas_equalTo(319); - }]; - } -#endif - + [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(24); make.centerX.equalTo(self.bgView); @@ -81,11 +68,11 @@ make.top.mas_equalTo(108); make.centerX.equalTo(self.bgView); }]; - [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(138); - make.leading.trailing.equalTo(self); - make.bottom.mas_equalTo(-124); - }]; +// [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.top.mas_equalTo(138); +// make.leading.trailing.equalTo(self); +// make.bottom.mas_equalTo(-124); +// }]; [self.payBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(-58); make.width.mas_equalTo(303); @@ -95,7 +82,7 @@ } - (void)setMoney:(NSNumber *)money{ _money = money; - self.diamondNumView.text = [NSString stringWithFormat:@"%.0f",_money.floatValue * 1000]; + self.diamondNumView.text = [NSString stringWithFormat:@"%@", _money]; } -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{ return self.listData.count; @@ -117,7 +104,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ self.path = indexPath; self.type = indexPath.row == 0 ? NobleCenterPayType_diamond : NobleCenterPayType_Apple; - self.diamondNumView.text = indexPath.row == 0 ? [NSString stringWithFormat:@"%.0f",_money.floatValue * 1000] : [NSString stringWithFormat:@"$%.2f",_money.floatValue]; + self.diamondNumView.text = [NSString stringWithFormat:@"%@", _money]; //indexPath.row == 0 ? [NSString stringWithFormat:@"%.0f",_money.floatValue * 1000] : [NSString stringWithFormat:@"$%.2f",_money.floatValue]; self.diamondNumTitle.text = indexPath.row == 0 ? YMLocalizedString(@"XPNobleCenterPayView1"):@""; [self.tableView reloadData]; } @@ -200,17 +187,16 @@ } - (NSArray *)listData{ if(!_listData){ -#ifdef DEBUG - _listData = @[YMLocalizedString(@"XPNobleCenterPayView2"),YMLocalizedString(@"XPNobleCenterWindow0")]; -#else - if(isEnterprise == YES){ - _listData = @[YMLocalizedString(@"XPNobleCenterPayView2"),YMLocalizedString(@"XPNobleCenterWindow0")]; - }else{ - _listData = @[YMLocalizedString(@"XPNobleCenterPayView2")]; - } -#endif - - +//#ifdef DEBUG + _listData = @[YMLocalizedString(@"XPNobleCenterPayView2")]; +//#else +// if(isEnterprise == YES){ +// _listData = @[YMLocalizedString(@"XPNobleCenterPayView2"),YMLocalizedString(@"XPNobleCenterWindow0")]; +// }else{ +// _listData = @[YMLocalizedString(@"XPNobleCenterPayView2")]; +// } +//#endif +// } return _listData; } diff --git a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m index 6b5375af..28f1c44a 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m +++ b/YuMi/Modules/YMMine/View/Noble/View/VIPCenterViewController.m @@ -9,6 +9,7 @@ #import #import +#import #import "YuMi-swift.h" #import "XPWebViewController.h" @@ -17,8 +18,10 @@ #import "Api+Main.h" #import "Api+NobleCenter.h" #import "XPNobleCenterPresenter.h" +#import "XPRoomGiftAnimationParser.h" #import "RechargeStorage.h" +#import "QGVAPConfigModel.h" #import "XPNobleCenterProtocol.h" #import "SVGAImageView.h" @@ -122,9 +125,10 @@ @end @interface VIPIdentificationCard : UIView - +@property (nonatomic, strong) UIImageView *bg; @property (nonatomic, strong) NetImageView *imageView; @property (nonatomic, strong) UILabel *titleLabel; +@property (nonatomic, assign) bool isPlaceHolder; - (void)updateTitle:(NSString *)title; - (void)updateImage:(NSString *)imagePath; @@ -140,6 +144,7 @@ [bg mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.mas_equalTo(self); }]; + _bg = bg; [self addSubview:self.imageView]; [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -156,12 +161,20 @@ return self; } +- (void)setIsPlaceHolder:(bool)isPlaceHolder { + _isPlaceHolder = isPlaceHolder; + self.bg.hidden = isPlaceHolder; + self.imageView.hidden = isPlaceHolder; + self.titleLabel.hidden = isPlaceHolder; +} + - (void)updateTitle:(NSString *)title { self.titleLabel.text = title; } - (void)updateImage:(NSString *)imagePath { - self.imageView.imageUrl = imagePath; +// self.imageView.imageUrl = imagePath; + self.imageView.image = kImage(imagePath); } - (UILabel *)titleLabel { @@ -183,7 +196,7 @@ @end -@interface VIPCardCyclePagerCell : UICollectionViewCell +@interface VIPCardCyclePagerCell : UICollectionViewCell @property (nonatomic, assign) NSInteger cellIndex; @property (nonatomic, copy) NSString *svgaPath; @@ -191,7 +204,9 @@ @property (nonatomic, strong) UIImageView *levelBgImageView; @property (nonatomic, strong) UILabel *statusLabel; @property (nonatomic, strong) NetImageView *placeHolderImageView; -@property (nonatomic, strong) SVGAImageView *svgaImageView; +//@property (nonatomic, strong) SVGAImageView *svgaImageView; +@property (nonatomic, strong) VAPView *vapView; +@property (nonatomic, strong) XPRoomGiftAnimationParser *vapParser; @end @@ -204,6 +219,13 @@ return self; } +- (void)dealloc +{ + [self.vapView stopHWDMP4]; + [self.vapView removeFromSuperview]; + self.vapView = nil; +} + - (void)setupCell { _levelBgImageView = [[UIImageView alloc] init]; [self.contentView addSubview:_levelBgImageView]; @@ -230,13 +252,12 @@ make.width.height.mas_equalTo(kGetScaleWidth(130)); }]; - _svgaImageView = [[SVGAImageView alloc] init]; - _svgaImageView.clearsAfterStop = NO; - _svgaImageView.loops = INT_MAX; - _svgaImageView.contentMode = UIViewContentModeScaleAspectFill; - NSInteger offset = 80; - [self.contentView addSubview:_svgaImageView]; - [_svgaImageView mas_makeConstraints:^(MASConstraintMaker *make) { + _vapView = [[VAPView alloc] init]; + _vapView.contentMode = UIViewContentModeScaleAspectFill; + + NSInteger offset = 0; + [self.contentView addSubview:_vapView]; + [_vapView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(_placeHolderImageView); make.bottom.mas_equalTo(_placeHolderImageView).offset(offset/2); make.width.height.mas_equalTo(kGetScaleWidth(130 + offset)); @@ -247,29 +268,94 @@ _cellIndex = cellIndex; NSString *imageName = [NSString stringWithFormat:@"vip_center_level_%ld", (long)(cellIndex+1)]; UIImage *image = kImage(imageName); - if (image == nil) { - image = kImage(@"vip_center_level_6"); - } [self.levelBgImageView setImage:image]; } - (void)setSvgaPath:(NSString *)svgaPath { - _svgaPath = svgaPath; + _svgaPath = [svgaPath stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; if (svgaPath.length == 0) { return; } - @kWeakify(self); - SVGAParser *parser = [[SVGAParser alloc] init]; - [parser parseWithURL:[NSURL URLWithString:svgaPath] - completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { - @kStrongify(self); - self.svgaImageView.videoItem = videoItem; - [self.svgaImageView startAnimation]; - self.placeHolderImageView.hidden = YES; - } - failureBlock:^(NSError * _Nullable error) {}]; + + // TODO: 这个缓存判断没有实际用途，fileName 对不上 + NSString *encodingUrl = [_svgaPath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"`#%^{}\"[]|\\<> "].invertedSet]; +// NSString *fileName = [[encodingUrl componentsSeparatedByString:@"/"] lastObject]; +// NSString *GiftDynamicEffectListPath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) xpSafeObjectAtIndex:0] stringByAppendingPathComponent:@"GiftDynamicEffectList"]; +// NSString *fullPath = [GiftDynamicEffectListPath stringByAppendingPathComponent:fileName]; +// if ([[NSFileManager defaultManager] fileExistsAtPath:fullPath]){ +// _svgaPath = fullPath; +// [self.vapView setMute:NO]; +// [self.vapView playHWDMP4:_svgaPath repeatCount:1 delegate:self]; +// } else { + @kWeakify(self); + [self.vapParser parseWithURL:encodingUrl completionBlock:^(NSString * _Nullable videoUrl) { + @kStrongify(self); + if (videoUrl.length) { + [self.vapView setMute:YES]; + [self.vapView playHWDMP4:videoUrl repeatCount:-1 delegate:self]; + } + } failureBlock:^(NSError * _Nullable error) { + }]; +// } + + +// @kWeakify(self); +// SVGAParser *parser = [[SVGAParser alloc] init]; +// [parser parseWithURL:[NSURL URLWithString:svgaPath] +// completionBlock:^(SVGAVideoEntity * _Nullable videoItem) { +// @kStrongify(self); +// self.svgaImageView.videoItem = videoItem; +// [self.svgaImageView startAnimation]; +// self.placeHolderImageView.hidden = YES; +// } +// failureBlock:^(NSError * _Nullable error) {}]; } +- (XPRoomGiftAnimationParser *)vapParser { + if (!_vapParser) { + _vapParser = [[XPRoomGiftAnimationParser alloc] init]; + } + return _vapParser; +} + +#pragma mark - HWDMP4PlayDelegate +//即将开始播放时询问，true马上开始播放，false放弃播放 +- (BOOL)shouldStartPlayMP4:(VAPView *)container config:(QGVAPConfigModel *)config { +// CGFloat width = config.info.size.width; +// CGFloat height = config.info.size.height; +// +// container.center = self.center; +// [container mas_updateConstraints:^(MASConstraintMaker *make) { +// make.width.mas_equalTo(KScreenWidth); +// make.height.mas_equalTo(KScreenWidth * height / width); +// }]; + return YES; +} + +- (void)viewDidFinishPlayMP4:(NSInteger)totalFrameCount view:(VAPView *)container { +// dispatch_async(dispatch_get_main_queue(), ^{ +// container.hidden = YES; +// if (container == self.vapView) { +// [self.vapView removeFromSuperview]; +// self.vapView = nil; +// } +// }); +} + +- (void)viewDidStopPlayMP4:(NSInteger)lastFrameIndex view:(VAPView *)container { +// dispatch_async(dispatch_get_main_queue(), ^{ +// container.hidden = YES; +// if (container == self.vapView) { +// [self.vapView removeFromSuperview]; +// self.vapView = nil; +// } +// }); +} +- (void)viewDidFailPlayMP4:(NSError *)error{ +// +} + + @end @@ -299,15 +385,20 @@ @property (nonatomic, strong) VIPIdentificationCard *identificationCard_vipIdentity; @property (nonatomic, strong) VIPIdentificationCard *identificationCard_roomCard; @property (nonatomic, strong) VIPIdentificationCard *identificationCard_entryAnimation; -@property (nonatomic, strong) VIPIdentificationCard *identificationCard_exclusiveHeadwear; +@property (nonatomic, strong) VIPIdentificationCard *identificationCard_placeHolder; @property (nonatomic, strong) VIPIdentificationCard *identificationCard_micSoundWave; @property (nonatomic, strong) VIPIdentificationCard *identificationCard_exclusiveBubbles; @property (nonatomic, strong) UIStackView *exclusivePrivilegesStack; @property (nonatomic, strong) UILabel *exclusivePrivilegesCountLabel; +@property (nonatomic, strong) UIView *purchaseContainer; @property (nonatomic, strong) UILabel *purchaseExpiresLabel; @property (nonatomic, strong) UILabel *purchasePriceLabel; +@property (nonatomic, strong) UILabel *purchaseNoticeLabel; + +@property (nonatomic, copy) NSArray *vipIdentificationInfoArray; +@property (nonatomic, copy) NSArray *vipExclusivePrivilegesInfoArray; ///订单编号 @property (nonatomic,copy) NSString *orderId; @@ -438,32 +529,42 @@ UIStackView *identificationStack = [[UIStackView alloc] init]; identificationStack.spacing = 12; + identificationStack.axis = UILayoutConstraintAxisVertical; identificationStack.distribution = UIStackViewDistributionEqualSpacing; + identificationStack.alignment = UIStackViewAlignmentFill; [self.scrollContentView addSubview:identificationStack]; [identificationStack mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(titleLabel.mas_bottom).offset(16); make.leading.mas_equalTo(self.scrollContentView).offset(16); make.trailing.mas_equalTo(self.scrollContentView).offset(-16); -// make.bottom.mas_equalTo(self.scrollContentView); }]; _identificationStack = identificationStack; - UIStackView *identificationStack_left = [[UIStackView alloc] init]; - identificationStack_left.axis = UILayoutConstraintAxisVertical; - identificationStack_left.spacing = 12; - UIStackView *identificationStack_right = [[UIStackView alloc] init]; - identificationStack_right.axis = UILayoutConstraintAxisVertical; - identificationStack_right.spacing = 12; - [identificationStack addArrangedSubview:identificationStack_left]; - [identificationStack addArrangedSubview:identificationStack_right]; + UIStackView *identificationStack_1 = [[UIStackView alloc] init]; + identificationStack_1.alignment = UIStackViewAlignmentCenter; + identificationStack_1.axis = UILayoutConstraintAxisHorizontal; + identificationStack_1.distribution = UIStackViewDistributionFillEqually; + identificationStack_1.spacing = 12; + UIStackView *identificationStack_2 = [[UIStackView alloc] init]; + identificationStack_2.alignment = UIStackViewAlignmentCenter; + identificationStack_2.axis = UILayoutConstraintAxisHorizontal; + identificationStack_2.distribution = UIStackViewDistributionFillEqually; + identificationStack_2.spacing = 12; + UIStackView *identificationStack_3 = [[UIStackView alloc] init]; + identificationStack_3.alignment = UIStackViewAlignmentLeading; + identificationStack_3.axis = UILayoutConstraintAxisHorizontal; + identificationStack_3.distribution = UIStackViewDistributionEqualSpacing; + identificationStack_3.spacing = 12; + [identificationStack addArrangedSubview:identificationStack_1]; + [identificationStack addArrangedSubview:identificationStack_2]; + [identificationStack addArrangedSubview:identificationStack_3]; - [identificationStack_left addArrangedSubview:self.identificationCard_vipIdentity]; - [identificationStack_left addArrangedSubview:self.identificationCard_entryAnimation]; - [identificationStack_left addArrangedSubview:self.identificationCard_micSoundWave]; - - [identificationStack_right addArrangedSubview:self.identificationCard_roomCard]; - [identificationStack_right addArrangedSubview:self.identificationCard_exclusiveHeadwear]; - [identificationStack_right addArrangedSubview:self.identificationCard_exclusiveBubbles]; + [identificationStack_1 addArrangedSubview:self.identificationCard_vipIdentity]; + [identificationStack_1 addArrangedSubview:self.identificationCard_roomCard]; + [identificationStack_2 addArrangedSubview:self.identificationCard_micSoundWave]; + [identificationStack_2 addArrangedSubview:self.identificationCard_exclusiveBubbles]; + [identificationStack_3 addArrangedSubview:self.identificationCard_entryAnimation]; + [identificationStack_3 addArrangedSubview:self.identificationCard_placeHolder]; [self.identificationCard_vipIdentity mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(120))); @@ -477,10 +578,10 @@ [self.identificationCard_roomCard mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(120))); }]; - [self.identificationCard_exclusiveHeadwear mas_makeConstraints:^(MASConstraintMaker *make) { + [self.identificationCard_exclusiveBubbles mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(120))); }]; - [self.identificationCard_exclusiveBubbles mas_makeConstraints:^(MASConstraintMaker *make) { + [self.identificationCard_placeHolder mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(120))); }]; } @@ -544,6 +645,12 @@ make.height.mas_equalTo(kGetScaleWidth(54)); }]; + _purchaseContainer = [[UIView alloc] init]; + [purchaseArea addSubview:_purchaseContainer]; + [_purchaseContainer mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(purchaseArea); + }]; + UIButton *purchaseButton = [UIButton buttonWithType:UIButtonTypeCustom]; [purchaseButton setTitle:@"Renew" forState:UIControlStateNormal]; @@ -554,7 +661,7 @@ [purchaseButton addTarget:self action:@selector(didTapPurchaseButton) forControlEvents:UIControlEventTouchUpInside]; - [purchaseArea addSubview:purchaseButton]; + [_purchaseContainer addSubview:purchaseButton]; [purchaseButton mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.trailing.mas_equalTo(-3); make.top.mas_equalTo(3); @@ -562,26 +669,31 @@ }]; UIImageView *coin = [[UIImageView alloc] initWithImage:kImage(@"vip_center_purchase_coin")]; - [purchaseArea addSubview:coin]; + [_purchaseContainer addSubview:coin]; [coin mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(6); make.leading.mas_equalTo(16); make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))); }]; - [purchaseArea addSubview:self.purchasePriceLabel]; + [_purchaseContainer addSubview:self.purchasePriceLabel]; [self.purchasePriceLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(coin.mas_trailing).offset(4); make.centerY.mas_equalTo(coin); make.trailing.mas_equalTo(purchaseButton.mas_leading); }]; - [purchaseArea addSubview:self.purchaseExpiresLabel]; + [_purchaseContainer addSubview:self.purchaseExpiresLabel]; [self.purchaseExpiresLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(coin); make.top.mas_equalTo(coin.mas_bottom).offset(4); make.trailing.mas_equalTo(purchaseButton.mas_leading); }]; + + [purchaseArea addSubview:self.purchaseNoticeLabel]; + [self.purchaseNoticeLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.mas_equalTo(purchaseArea); + }]; } #pragma mark - Config & Update UI @@ -590,30 +702,27 @@ } - (void)configIdentificationCards { - for (NobleAuthInfo *info in self.vipModel.vipAuthInfos) { + NSInteger currentVIPLevel = self.currentVIPInfo.vipLevel; + for (NobleAuthInfo *info in self.vipIdentificationInfoArray) { switch (info.authType) { case 1: - [self.identificationCard_vipIdentity updateImage:info.descPic]; + [self.identificationCard_vipIdentity updateImage:[NSString stringWithFormat:@"vip_center_id_level_%ld", currentVIPLevel]]; [self.identificationCard_vipIdentity updateTitle:info.authName]; break; case 5: - [self.identificationCard_roomCard updateImage:info.descPic]; + [self.identificationCard_roomCard updateImage:[NSString stringWithFormat:@"vip_center_room_card_level_%ld", currentVIPLevel]]; [self.identificationCard_roomCard updateTitle:info.authName]; break; - case 11: - [self.identificationCard_exclusiveBubbles updateImage:info.descPic]; - [self.identificationCard_exclusiveBubbles updateTitle:info.authName]; - break; -// case 4: // 没有头饰 -// [self.identificationCard_exclusiveHeadwear updateImage:info.descPic]; -// [self.identificationCard_exclusiveHeadwear updateTitle:info.authName]; -// break; case 8: - [self.identificationCard_micSoundWave updateImage:info.descPic]; + [self.identificationCard_micSoundWave updateImage:[NSString stringWithFormat:@"vip_center_wave_level_%ld", currentVIPLevel]]; [self.identificationCard_micSoundWave updateTitle:info.authName]; break; + case 11: + [self.identificationCard_exclusiveBubbles updateImage:[NSString stringWithFormat:@"vip_center_bubbles_level_%ld", currentVIPLevel]]; + [self.identificationCard_exclusiveBubbles updateTitle:info.authName]; + break; case 12: - [self.identificationCard_entryAnimation updateImage:info.descPic]; + [self.identificationCard_entryAnimation updateImage:[NSString stringWithFormat:@"vip_center_entry_level_%ld", currentVIPLevel]]; [self.identificationCard_entryAnimation updateTitle:info.authName]; break; @@ -621,12 +730,18 @@ break; } } + + self.identificationCard_micSoundWave.hidden = currentVIPLevel < 3; + self.identificationCard_entryAnimation.hidden = currentVIPLevel < 4; + self.identificationCard_placeHolder.hidden = currentVIPLevel < 4; + self.identificationCard_exclusiveBubbles.isPlaceHolder = currentVIPLevel < 4; + self.identificationCard_exclusiveBubbles.hidden = currentVIPLevel < 3; } - (void)configExclusivePrivilegesArea { int itemsPerRow = 3; NSMutableArray *tempArray = @[].mutableCopy; - for (int row = 0; row < (self.vipModel.vipAuthInfos.count + itemsPerRow - 1)/itemsPerRow; row++) { + for (int row = 0; row < (self.vipExclusivePrivilegesInfoArray.count + itemsPerRow - 1)/itemsPerRow; row++) { UIStackView *horizontalStackView = [[UIStackView alloc] init]; horizontalStackView.axis = UILayoutConstraintAxisHorizontal; // 水平排列 horizontalStackView.distribution = UIStackViewDistributionFillEqually; @@ -634,8 +749,8 @@ for (int col = 0; col < itemsPerRow; col++) { int index = row * itemsPerRow + col; - if (index < self.vipModel.vipAuthInfos.count) { - NobleAuthInfo *info = [self.vipModel.vipAuthInfos xpSafeObjectAtIndex:index]; + if (index < self.vipExclusivePrivilegesInfoArray.count) { + NobleAuthInfo *info = [self.vipExclusivePrivilegesInfoArray xpSafeObjectAtIndex:index]; VIPExclusivePrivilegesCard *v = [[VIPExclusivePrivilegesCard alloc] init]; v.info = info; @@ -661,18 +776,18 @@ } - (void)updateExclusivePrivilegesArea { - NSInteger currentPage = self.vipCardCyclePager.curIndex; - NobleInfo *currentInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:currentPage]; +// NSInteger currentPage = self.vipCardCyclePager.curIndex; +// NobleInfo *currentInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:currentPage]; NSInteger enableCount = 0; - if (currentInfo) { + if (self.currentVIPInfo) { for (VIPExclusivePrivilegesCard *v in self.exclusivePrivilegesCards) { - v.enable = [currentInfo.ownAuthTypes containsObject:@(v.info.authType)]; + v.enable = [self.currentVIPInfo.ownAuthTypes containsObject:@(v.info.authType)]; if (v.enable) { enableCount++; } } } - self.exclusivePrivilegesCountLabel.text = [NSString stringWithFormat:@"(%ld/%ld)", enableCount, self.exclusivePrivilegesCards.count]; + self.exclusivePrivilegesCountLabel.text = [NSString stringWithFormat:@"(%ld/%ld)", enableCount, self.vipExclusivePrivilegesInfoArray.count]; } - (void)updatePurchaseArea { @@ -680,26 +795,20 @@ return; } - self.rechargeModel = nil; - NSInteger currentLevel = self.userVIPInfo.vipLevel; - NSInteger currentPage = self.vipCardCyclePager.curIndex; - for (RechargeListModel *model in self.rechargeList) { - if (model.prodDesc.integerValue == currentPage + 1) { - self.rechargeModel = model; - break; - } - } - - if (self.rechargeModel == nil) { - return; - } - - self.purchasePriceLabel.text = [NSString stringWithFormat:@"%.0f/30Days", self.rechargeModel.money.floatValue * 1000]; - - if (currentLevel >= self.vipCardCyclePager.curIndex+1) { - self.purchaseExpiresLabel.text = [NSString stringWithFormat:@"%@ Expires", [self calNextVIPExpiredSeconds:self.vipModel.remainSeconds]]; + if (self.currentVIPInfo.buyAmount == 0) { + self.purchaseNoticeLabel.text = [NSString stringWithFormat:@"VIP%ld is only through activity", self.currentVIPInfo.vipLevel]; + self.purchaseNoticeLabel.hidden = NO; + self.purchaseContainer.hidden = YES; } else { - self.purchaseExpiresLabel.text = [NSString stringWithFormat:@"%@ Expires", [self calNext30Day]]; + self.purchaseNoticeLabel.hidden = YES; + self.purchaseContainer.hidden = NO; + self.purchasePriceLabel.text = [NSString stringWithFormat:@"%ld/30Days", self.currentVIPInfo.buyAmount]; + + if (self.userVIPInfo.vipLevel >= self.vipCardCyclePager.curIndex+1) { + self.purchaseExpiresLabel.text = [NSString stringWithFormat:@"%@ Expires", [self calNextVIPExpiredSeconds:self.vipModel.remainSeconds]]; + } else { + self.purchaseExpiresLabel.text = [NSString stringWithFormat:@"%@ Expires", [self calNext30Day]]; + } } } @@ -775,7 +884,24 @@ if (code == 200) { NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; self.vipModel = model; - self.currentVIPInfo = [self.vipModel.vipInfos firstObject]; + + NSMutableArray *tempArray_1 = @[].mutableCopy; + NSMutableArray *tempArray_2 = @[].mutableCopy; + [model.vipAuthInfos enumerateObjectsUsingBlock:^(NobleAuthInfo * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (obj.authType == 1 || obj.authType == 5 || obj.authType == 8 || obj.authType == 11 || obj.authType == 12) { + [tempArray_1 addObject:obj]; + } else if (obj.authType != 16) { + [tempArray_2 addObject:obj]; + } + }]; + self.vipIdentificationInfoArray = tempArray_1.copy; + self.vipExclusivePrivilegesInfoArray = tempArray_2.copy; + + if (self.userVIPInfo) { + self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:self.userVIPInfo.vipLevel - 1]; + } else { + self.currentVIPInfo = [self.vipModel.vipInfos firstObject]; + } [self configVIPCards]; [self configIdentificationCards]; @@ -805,7 +931,7 @@ window.confirmBlcok = ^{ @kStrongify(self); XPNobleCenterPayView *payView = [[XPNobleCenterPayView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - payView.money = self.rechargeModel.money; + payView.money = @(self.currentVIPInfo.buyAmount); payView.diamonds = self.walletInfo.diamonds; payView.vipLevel = @(self.currentVIPInfo.vipLevel).stringValue; payView.delegate = self; @@ -813,7 +939,7 @@ }; } else { XPNobleCenterPayView *payView = [[XPNobleCenterPayView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - payView.money = self.rechargeModel.money; + payView.money = @(self.currentVIPInfo.buyAmount); payView.diamonds = self.walletInfo.diamonds; payView.vipLevel = @(self.currentVIPInfo.vipLevel).stringValue; payView.delegate = self; @@ -852,6 +978,7 @@ self.currentVIPInfo = [self.vipModel.vipInfos xpSafeObjectAtIndex:toIndex]; + [self configIdentificationCards]; [self updateExclusivePrivilegesArea]; [self updatePurchaseArea]; } @@ -1047,6 +1174,7 @@ if ([dic[@"first"] intValue] == CustomMessageType_Noble_VIP && [dic[@"second"] intValue] == Custom_Message_Sub_Open_Noble_Success) { // 开通VIP成功 [self setupData]; + // MARK: iOS 没有弹窗 } } } @@ -1139,12 +1267,7 @@ } return _identificationCard_entryAnimation; } -- (VIPIdentificationCard *)identificationCard_exclusiveHeadwear { - if (!_identificationCard_exclusiveHeadwear) { - _identificationCard_exclusiveHeadwear = [[VIPIdentificationCard alloc] initWithFrame:CGRectMake(0, 0, kGetScaleWidth(166), kGetScaleWidth(120))]; - } - return _identificationCard_exclusiveHeadwear; -} + - (VIPIdentificationCard *)identificationCard_micSoundWave { if (!_identificationCard_micSoundWave) { _identificationCard_micSoundWave = [[VIPIdentificationCard alloc] initWithFrame:CGRectMake(0, 0, kGetScaleWidth(166), kGetScaleWidth(120))]; @@ -1158,6 +1281,14 @@ return _identificationCard_exclusiveBubbles; } +- (VIPIdentificationCard *)identificationCard_placeHolder { + if (!_identificationCard_placeHolder) { + _identificationCard_placeHolder = [[VIPIdentificationCard alloc] initWithFrame:CGRectMake(0, 0, kGetScaleWidth(166), kGetScaleWidth(120))]; + _identificationCard_placeHolder.isPlaceHolder = YES; + } + return _identificationCard_placeHolder; +} + - (UIStackView *)exclusivePrivilegesStack { if (!_exclusivePrivilegesStack) { _exclusivePrivilegesStack = [[UIStackView alloc] init]; @@ -1197,4 +1328,16 @@ return _purchaseExpiresLabel; } +- (UILabel *)purchaseNoticeLabel { + if (!_purchaseNoticeLabel) { + _purchaseNoticeLabel = [UILabel labelInitWithText:@"Is only through activity" + font:kFontRegular(15) + textColor:[DJDKMIMOMColor colorWithHexString:@"#FFE3AF"]]; + _purchaseNoticeLabel.hidden = YES; + } + return _purchaseNoticeLabel; +} + + + @end diff --git a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m index 18d2d4dc..66dfdf61 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m @@ -14,6 +14,8 @@ #import "Api+Gift.h" #import "XPGiftStorage.h" +#import "VIPCenterViewController.h" + @interface XPHomePagingViewController () @property (nonatomic, strong) UIView *topControlView; @@ -196,6 +198,13 @@ } - (void)didTapSearchButton { +#if DEBUG + VIPCenterViewController *vc = [[VIPCenterViewController alloc] init]; + [self.navigationController pushViewController:vc animated:YES]; + return; +#endif + + XPRoomSearchContainerViewController * searchVC = [[XPRoomSearchContainerViewController alloc] init]; searchVC.modalPresentationStyle = UIModalPresentationFullScreen; [self.navigationController presentViewController:searchVC diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m index b35685ed..95c82782 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m @@ -189,7 +189,8 @@ if (_messageInfo.bubbleImageUrl.length) { [self.bubbleImageView loadImageWithUrl:_messageInfo.bubbleImageUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; - self.bubbleImageView.image = [self resizableImage:image1]; + UIImage *cutImage = [image1 cropRightAndBottomPixels:2]; + self.bubbleImageView.image = [self resizableImage:cutImage]; }]; } else { _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]]; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m index 7e3149ed..b6850073 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m @@ -109,7 +109,8 @@ [self.bubbleImageView loadImageWithUrl:_messageInfo.bubbleImageUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { @kStrongify(self); UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp]; - self.bubbleImageView.image = [self resizableImage:image1]; + UIImage *cutImage = [image1 cropRightAndBottomPixels:2]; + self.bubbleImageView.image = [self resizableImage:cutImage]; }]; } // else {