From 61e316044da4e9e06df501efcfff9001ea628ecf Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Thu, 19 Sep 2024 16:52:32 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=20cp=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 46 +++ YuMi/Assets.xcassets/1.0.16/Contents.json | 6 + .../Contents.json | 21 ++ .../cp_avatar_flag_lv_1@3x.png | Bin 0 -> 48308 bytes .../Contents.json | 21 ++ .../cp_avatar_flag_lv_2@3x.png | Bin 0 -> 50264 bytes .../Contents.json | 21 ++ .../cp_avatar_flag_lv_3@3x.png | Bin 0 -> 48126 bytes .../Contents.json | 21 ++ .../cp_avatar_flag_lv_4@3x.png | Bin 0 -> 49567 bytes .../Contents.json | 21 ++ .../cp_avatar_flag_lv_5@3x.png | Bin 0 -> 49526 bytes .../Contents.json | 21 ++ .../cp_avatar_flag_lv_6@3x.png | Bin 0 -> 50362 bytes .../Contents.json | 21 ++ .../cp_avatar_head_lv_2@3x.png | Bin 0 -> 154086 bytes .../Contents.json | 21 ++ .../cp_avatar_head_lv_3@3x.png | Bin 0 -> 170451 bytes .../Contents.json | 21 ++ .../cp_avatar_head_lv_4@3x.png | Bin 0 -> 154848 bytes .../Contents.json | 21 ++ .../cp_avatar_head_lv_5@3x.png | Bin 0 -> 196879 bytes .../Contents.json | 21 ++ .../cp_avatar_head_lv_6@3x.png | Bin 0 -> 197363 bytes .../cp_avatar_heart.imageset/Contents.json | 21 ++ .../cp_avatar_heart@3x.png | Bin 0 -> 26996 bytes .../1.0.16/cp_bg.imageset/Contents.json | 21 ++ .../1.0.16/cp_bg.imageset/框@3x.png | Bin 0 -> 200611 bytes .../cp_break_heart.imageset/Contents.json | 21 ++ .../cp_break_heart.imageset/切图 32@3x.png | Bin 0 -> 1946 bytes .../cp_empty_avatar.imageset/Contents.json | 21 ++ .../cp_empty_avatar.imageset/头像@3x.png | Bin 0 -> 10015 bytes .../1.0.16/cp_heart.imageset/Contents.json | 21 ++ .../1.0.16/cp_heart.imageset/爱心@3x.png | Bin 0 -> 103036 bytes .../1.0.16/cp_help.imageset/Contents.json | 21 ++ .../1.0.16/cp_help.imageset/返回 1@3x.png | Bin 0 -> 2325 bytes .../Contents.json | 21 ++ .../切图 32@3x-2.png | Bin 0 -> 42022 bytes .../1.0.16/cp_menu.imageset/Contents.json | 21 ++ .../1.0.16/cp_menu.imageset/切图 31@3x.png | Bin 0 -> 601 bytes .../cp_relationship_bg.imageset/Contents.json | 21 ++ .../cp_relationship_bg@3x.png | Bin 0 -> 203927 bytes .../Contents.json | 21 ++ .../cp_relationship_lv_0@3x.png | Bin 0 -> 15692 bytes .../Contents.json | 21 ++ .../cp_relationship_lv_1@3x.png | Bin 0 -> 17156 bytes .../Contents.json | 21 ++ .../cp_relationship_lv_2@3x.png | Bin 0 -> 15405 bytes .../Contents.json | 21 ++ .../cp_relationship_lv_3@3x.png | Bin 0 -> 16419 bytes .../Contents.json | 21 ++ .../cp_relationship_lv_4@3x.png | Bin 0 -> 16889 bytes .../Contents.json | 21 ++ .../cp_relationship_lv_5@3x.png | Bin 0 -> 17196 bytes YuMi/Modules/YMMine/Api/Api+Mine.h | 6 + YuMi/Modules/YMMine/Api/Api+Mine.m | 10 + .../YMMine/View/CPListViewController.h | 16 + .../YMMine/View/CPListViewController.m | 264 ++++++++++++++ .../MineInfo/XPMineUserInfoViewController.m | 1 + YuMi/Modules/YMMine/View/SubViews/CPCard.h | 22 ++ YuMi/Modules/YMMine/View/SubViews/CPCard.m | 345 ++++++++++++++++++ .../MineInfo/XPMineUserInfoHeaderView.h | 3 + .../MineInfo/XPMineUserInfoHeaderView.m | 180 +++++++-- YuMi/Resources/cp/1.svga | Bin 0 -> 60496 bytes YuMi/Resources/cp/2.svga | Bin 0 -> 75031 bytes YuMi/Resources/cp/3.svga | Bin 0 -> 87583 bytes YuMi/Resources/cp/4.svga | Bin 0 -> 115423 bytes YuMi/Resources/cp/5.svga | Bin 0 -> 119404 bytes YuMi/Structure/MVP/Api/Api.h | 29 +- YuMi/Structure/MVP/Api/Api.m | 45 +-- YuMi/Structure/MVP/Model/RelationUserVO.h | 38 ++ YuMi/Structure/MVP/Model/RelationUserVO.m | 16 + YuMi/Structure/MVP/Model/UserInfoModel.h | 4 + 73 files changed, 1506 insertions(+), 71 deletions(-) create mode 100644 YuMi/Assets.xcassets/1.0.16/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/cp_avatar_flag_lv_1@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_1.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_1.imageset/cp_avatar_flag_lv_2@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_2.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_2.imageset/cp_avatar_flag_lv_3@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_3.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_3.imageset/cp_avatar_flag_lv_4@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_4.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_4.imageset/cp_avatar_flag_lv_5@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_5.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_5.imageset/cp_avatar_flag_lv_6@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_1.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_1.imageset/cp_avatar_head_lv_2@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_2.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_2.imageset/cp_avatar_head_lv_3@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_3.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_3.imageset/cp_avatar_head_lv_4@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_4.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_4.imageset/cp_avatar_head_lv_5@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_5.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_head_lv_5.imageset/cp_avatar_head_lv_6@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_heart.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_avatar_heart.imageset/cp_avatar_heart@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_bg.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_bg.imageset/框@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_break_heart.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_break_heart.imageset/切图 32@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_empty_avatar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_empty_avatar.imageset/头像@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_heart.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_heart.imageset/爱心@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_help.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_help.imageset/返回 1@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_list_placeholder.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_list_placeholder.imageset/切图 32@3x-2.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_menu.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_menu.imageset/切图 31@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_bg.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_bg.imageset/cp_relationship_bg@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_0.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_0.imageset/cp_relationship_lv_0@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_1.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_1.imageset/cp_relationship_lv_1@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_2.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_2.imageset/cp_relationship_lv_2@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_3.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_3.imageset/cp_relationship_lv_3@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_4.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_4.imageset/cp_relationship_lv_4@3x.png create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_5.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/1.0.16/cp_relationship_lv_5.imageset/cp_relationship_lv_5@3x.png create mode 100644 YuMi/Modules/YMMine/View/CPListViewController.h create mode 100644 YuMi/Modules/YMMine/View/CPListViewController.m create mode 100644 YuMi/Modules/YMMine/View/SubViews/CPCard.h create mode 100644 YuMi/Modules/YMMine/View/SubViews/CPCard.m create mode 100644 YuMi/Resources/cp/1.svga create mode 100644 YuMi/Resources/cp/2.svga create mode 100644 YuMi/Resources/cp/3.svga create mode 100644 YuMi/Resources/cp/4.svga create mode 100644 YuMi/Resources/cp/5.svga create mode 100644 YuMi/Structure/MVP/Model/RelationUserVO.h create mode 100644 YuMi/Structure/MVP/Model/RelationUserVO.m diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index fa345163..757e322f 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -517,6 +517,8 @@ 548E01C92C3F78600071C83D /* FeedBackConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01C82C3F78600071C83D /* FeedBackConfigModel.m */; }; 548E01CC2C3FB1C70071C83D /* i18nGiftNameMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */; }; 54ACDCC22C5B31BD0099472C /* XPBeautIDView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54ACDCC12C5B31BD0099472C /* XPBeautIDView.m */; }; + 54AE7E142C9AD9AB006D2BE2 /* CPCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AE7E132C9AD9A6006D2BE2 /* CPCard.m */; }; + 54AE7E172C9AE589006D2BE2 /* CPListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54AE7E162C9AE589006D2BE2 /* CPListViewController.m */; }; 54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */; }; 54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */; }; 54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; }; @@ -538,6 +540,12 @@ 54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693A2C2A984D00A83655 /* MedalModel.m */; }; 54F4693E2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */; }; 54F469412C2AB56900A83655 /* XPMineGiftsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */; }; + 54FFD37A2C9BCB1900DE61E5 /* RelationUserVO.m in Sources */ = {isa = PBXBuildFile; fileRef = 54FFD3792C9BCB1900DE61E5 /* RelationUserVO.m */; }; + 54FFD3812C9BD12600DE61E5 /* 4.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37E2C9BD12600DE61E5 /* 4.svga */; }; + 54FFD3822C9BD12600DE61E5 /* 1.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37B2C9BD12600DE61E5 /* 1.svga */; }; + 54FFD3832C9BD12600DE61E5 /* 5.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37F2C9BD12600DE61E5 /* 5.svga */; }; + 54FFD3842C9BD12600DE61E5 /* 3.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37D2C9BD12600DE61E5 /* 3.svga */; }; + 54FFD3852C9BD12600DE61E5 /* 2.svga in Resources */ = {isa = PBXBuildFile; fileRef = 54FFD37C2C9BD12600DE61E5 /* 2.svga */; }; 73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; }; 9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; }; 9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; }; @@ -2568,6 +2576,10 @@ 548E01CB2C3FB1C70071C83D /* i18nGiftNameMap.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = i18nGiftNameMap.m; sourceTree = ""; }; 54ACDCC02C5B31BD0099472C /* XPBeautIDView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPBeautIDView.h; sourceTree = ""; }; 54ACDCC12C5B31BD0099472C /* XPBeautIDView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPBeautIDView.m; sourceTree = ""; }; + 54AE7E122C9AD98C006D2BE2 /* CPCard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPCard.h; sourceTree = ""; }; + 54AE7E132C9AD9A6006D2BE2 /* CPCard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPCard.m; sourceTree = ""; }; + 54AE7E152C9AE589006D2BE2 /* CPListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPListViewController.h; sourceTree = ""; }; + 54AE7E162C9AE589006D2BE2 /* CPListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPListViewController.m; sourceTree = ""; }; 54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineViewController.h; sourceTree = ""; }; 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeMineViewController.m; sourceTree = ""; }; 54C3895D2C2189DD00FD47B1 /* XPHomeMinePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMinePresenter.h; sourceTree = ""; }; @@ -2610,6 +2622,13 @@ 54F4693D2C2A9D4E00A83655 /* XPMineMedalsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineMedalsTableViewCell.m; sourceTree = ""; }; 54F4693F2C2AB56900A83655 /* XPMineGiftsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGiftsTableViewCell.h; sourceTree = ""; }; 54F469402C2AB56900A83655 /* XPMineGiftsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGiftsTableViewCell.m; sourceTree = ""; }; + 54FFD3782C9BCB1900DE61E5 /* RelationUserVO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RelationUserVO.h; sourceTree = ""; }; + 54FFD3792C9BCB1900DE61E5 /* RelationUserVO.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RelationUserVO.m; sourceTree = ""; }; + 54FFD37B2C9BD12600DE61E5 /* 1.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 1.svga; sourceTree = ""; }; + 54FFD37C2C9BD12600DE61E5 /* 2.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 2.svga; sourceTree = ""; }; + 54FFD37D2C9BD12600DE61E5 /* 3.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 3.svga; sourceTree = ""; }; + 54FFD37E2C9BD12600DE61E5 /* 4.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 4.svga; sourceTree = ""; }; + 54FFD37F2C9BD12600DE61E5 /* 5.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = 5.svga; sourceTree = ""; }; 7DB00EC07F1D0ADFF900B38D /* Pods-YuMi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.debug.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.debug.xcconfig"; sourceTree = ""; }; 9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = ""; }; 9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = ""; }; @@ -4978,6 +4997,8 @@ 9B2A12DD2783FEDD00CED41B /* UserVipInfoVo.m */, 54F469392C2A984D00A83655 /* MedalModel.h */, 54F4693A2C2A984D00A83655 /* MedalModel.m */, + 54FFD3782C9BCB1900DE61E5 /* RelationUserVO.h */, + 54FFD3792C9BCB1900DE61E5 /* RelationUserVO.m */, ); path = Model; sourceTree = ""; @@ -6444,6 +6465,18 @@ path = SubViews; sourceTree = ""; }; + 54FFD3802C9BD12600DE61E5 /* cp */ = { + isa = PBXGroup; + children = ( + 54FFD37B2C9BD12600DE61E5 /* 1.svga */, + 54FFD37C2C9BD12600DE61E5 /* 2.svga */, + 54FFD37D2C9BD12600DE61E5 /* 3.svga */, + 54FFD37E2C9BD12600DE61E5 /* 4.svga */, + 54FFD37F2C9BD12600DE61E5 /* 5.svga */, + ); + path = cp; + sourceTree = ""; + }; 9B0086C727BA4F4A0032BD2B /* Anchor */ = { isa = PBXGroup; children = ( @@ -9920,6 +9953,7 @@ E8A1E45C276220B100B294CA /* Resources */ = { isa = PBXGroup; children = ( + 54FFD3802C9BD12600DE61E5 /* cp */, 54F179062C8EA48C00CB5219 /* Combo_Boom.svga */, 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */, 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */, @@ -10746,6 +10780,8 @@ E8E70D7F26F2F39000F03460 /* SubViews */, E8E70D7526F2F15100F03460 /* XPMineViewController.h */, E8E70D7626F2F15100F03460 /* XPMineViewController.m */, + 54AE7E152C9AE589006D2BE2 /* CPListViewController.h */, + 54AE7E162C9AE589006D2BE2 /* CPListViewController.m */, 54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */, 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */, 23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */, @@ -10871,6 +10907,8 @@ E8E70D7F26F2F39000F03460 /* SubViews */ = { isa = PBXGroup; children = ( + 54AE7E122C9AD98C006D2BE2 /* CPCard.h */, + 54AE7E132C9AD9A6006D2BE2 /* CPCard.m */, E87E545229AA05EA00EBE52B /* XPFootPrintNavView.h */, E87E545329AA05EA00EBE52B /* XPFootPrintNavView.m */, E8B846CC26FDD93D00A777FE /* Recharge */, @@ -11164,6 +11202,11 @@ E80EC81928ACD84000D133C5 /* emoji_80@2x.png in Resources */, 237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */, E80EC8B328ACD84100D133C5 /* emoji_115@2x.png in Resources */, + 54FFD3812C9BD12600DE61E5 /* 4.svga in Resources */, + 54FFD3822C9BD12600DE61E5 /* 1.svga in Resources */, + 54FFD3832C9BD12600DE61E5 /* 5.svga in Resources */, + 54FFD3842C9BD12600DE61E5 /* 3.svga in Resources */, + 54FFD3852C9BD12600DE61E5 /* 2.svga in Resources */, E80EC8A828ACD84100D133C5 /* emoji_76@2x.png in Resources */, 2368ECCF2BC38F9800EDF4C9 /* InfoPlist.strings in Resources */, E80EC88E28ACD84000D133C5 /* emoji_142@2x.png in Resources */, @@ -11811,6 +11854,7 @@ E8412F9927799249006E1101 /* InviteFansModel.m in Sources */, E88C72912828EA4E0047FB2B /* Music+CoreDataProperties.m in Sources */, E84BF7CA277AF79D00EF8877 /* XPRoomSettingTagCell.m in Sources */, + 54FFD37A2C9BCB1900DE61E5 /* RelationUserVO.m in Sources */, 9BE9F0F927FED12D00667200 /* XPAnchorFansPrivilegeModel.m in Sources */, E87DF5022A42CDF1009C1185 /* XPHomeAttentionCollectionViewCell.m in Sources */, E8AB631628ADE2D20023B0D2 /* XPMonentsTopicLatestViewController.m in Sources */, @@ -11876,6 +11920,7 @@ 5412E0FD2C52512100FDD668 /* RoomBottomEntranceModel.m in Sources */, E818DD1C2A4896EE00F163F7 /* XPLoginAraeViewController.m in Sources */, 23959FE72BB15C930085A282 /* UploadFileModel.m in Sources */, + 54AE7E142C9AD9AB006D2BE2 /* CPCard.m in Sources */, E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */, E85E7B432A4EB0D300B6D00A /* XPMineExchangeAuthorityHeadView.m in Sources */, 23194DD02AD14BF000649F51 /* DDLog.m in Sources */, @@ -12358,6 +12403,7 @@ 2331C1B82A60F32D00E1D940 /* XPRoomHalfWebView.m in Sources */, 9BFE0D8E2898C8C300F53C24 /* XPAnchorCardSkillCollectionViewCell.m in Sources */, E87DF4B72A42C2FD009C1185 /* XPFirstRechargeCollectionView.m in Sources */, + 54AE7E172C9AE589006D2BE2 /* CPListViewController.m in Sources */, 238B37A92AC55A2C00BFC9D5 /* TreasureFairyUserInfoModel.m in Sources */, E85E7B382A4EB0D300B6D00A /* XPMineGuildSearchMemberTableViewCell.m in Sources */, 23D321D52ADD0F05006B259C /* Api+PhotoAlbum.m in Sources */, diff --git a/YuMi/Assets.xcassets/1.0.16/Contents.json b/YuMi/Assets.xcassets/1.0.16/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/YuMi/Assets.xcassets/1.0.16/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/Contents.json b/YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/Contents.json new file mode 100644 index 00000000..45f9790b --- /dev/null +++ b/YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "cp_avatar_flag_lv_1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/cp_avatar_flag_lv_1@3x.png b/YuMi/Assets.xcassets/1.0.16/cp_avatar_flag_lv_0.imageset/cp_avatar_flag_lv_1@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..8f41bf532bd09c1f1112a2c9e0014cc8ebdb4d9c GIT binary patch literal 48308 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