diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index 27af0920..67f2e85a 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -1174,6 +1174,7 @@ E8F9168727EC927C00F10D8F /* XPHomeLittleGamePesenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168627EC927C00F10D8F /* XPHomeLittleGamePesenter.m */; }; E8F9168B27EC940E00F10D8F /* XPHomeLittleGameTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168A27EC940E00F10D8F /* XPHomeLittleGameTableViewCell.m */; }; E8F9168E27ECA69500F10D8F /* HomeLittleGameRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8F9168D27ECA69500F10D8F /* HomeLittleGameRoomModel.m */; }; + F1152AC928E49A71007CB09A /* app_launch_screen01.png in Resources */ = {isa = PBXBuildFile; fileRef = F1152AC828E49A71007CB09A /* app_launch_screen01.png */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3372,6 +3373,7 @@ E8F9168A27EC940E00F10D8F /* XPHomeLittleGameTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomeLittleGameTableViewCell.m; sourceTree = ""; }; E8F9168C27ECA69500F10D8F /* HomeLittleGameRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeLittleGameRoomModel.h; sourceTree = ""; }; E8F9168D27ECA69500F10D8F /* HomeLittleGameRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeLittleGameRoomModel.m; sourceTree = ""; }; + F1152AC828E49A71007CB09A /* app_launch_screen01.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = app_launch_screen01.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -3618,6 +3620,7 @@ 189DD56126DE45F800AB55B1 /* Main */, E81C27AF26EF39B00031E639 /* AppDelegate */, 189DD53826DE255600AB55B1 /* Assets.xcassets */, + F1152AC828E49A71007CB09A /* app_launch_screen01.png */, E8937ACE276C99C300B2C7E1 /* Launch Screen.storyboard */, 189DD53D26DE255600AB55B1 /* Info.plist */, 189DD53E26DE255600AB55B1 /* main.m */, @@ -8602,6 +8605,7 @@ E8937AC7276C3EDE00B2C7E1 /* svga_member_in_lv40.svga in Resources */, E80EC85528ACD84000D133C5 /* emoji_118@2x.png in Resources */, E80EC8B728ACD84100D133C5 /* emoji_119@2x.png in Resources */, + F1152AC928E49A71007CB09A /* app_launch_screen01.png in Resources */, E80EC86228ACD84000D133C5 /* emoji_22@2x.png in Resources */, E8A1E461276220DA00B294CA /* candyTree.svga in Resources */, E80EC82528ACD84000D133C5 /* emoji_61@2x.png in Resources */, diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024_1024.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024_1024.png new file mode 100644 index 00000000..425ac056 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024_1024.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120pt 1.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120pt 1.png deleted file mode 100644 index 7f5fab45..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120pt 1.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120pt.png deleted file mode 100644 index 7f5fab45..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/180pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/180pt.png deleted file mode 100644 index b619ba12..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/180pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/20pt@2x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/20pt@2x.png new file mode 100644 index 00000000..dace91f6 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/20pt@2x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/20pt@3x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/20pt@3x.png new file mode 100644 index 00000000..4cadf1a1 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/20pt@3x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt.png deleted file mode 100644 index 8963dcab..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt@2x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt@2x.png new file mode 100644 index 00000000..7761b8fe Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt@2x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt@3x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt@3x.png new file mode 100644 index 00000000..1e6b0792 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29pt@3x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt.png deleted file mode 100644 index a53add1f..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt@2x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt@2x.png new file mode 100644 index 00000000..3f6d9cfe Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt@2x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt@3x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt@3x.png new file mode 100644 index 00000000..831547c1 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40pt@3x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/58pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/58pt.png deleted file mode 100644 index 4a2b8a44..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/58pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt.png deleted file mode 100644 index ef096a4b..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt@2x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt@2x.png new file mode 100644 index 00000000..831547c1 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt@2x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt@3x.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt@3x.png new file mode 100644 index 00000000..d36bfe55 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60pt@3x.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/80pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/80pt.png deleted file mode 100644 index c6aeccd4..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/80pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/87pt.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/87pt.png deleted file mode 100644 index efa890ab..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/87pt.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/APP Store 1024_1024.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/APP Store 1024_1024.png deleted file mode 100644 index 47a4b577..00000000 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/APP Store 1024_1024.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json index 3185b43a..e08d22c8 100644 --- a/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,71 +1,55 @@ { "images" : [ { - "filename" : "40pt.png", + "filename" : "20pt@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "60pt.png", + "filename" : "20pt@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "29pt.png", - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58pt.png", + "filename" : "29pt@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "87pt.png", + "filename" : "29pt@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "80pt.png", + "filename" : "40pt@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "120pt.png", + "filename" : "40pt@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "idiom" : "iphone", - "scale" : "1x", - "size" : "57x57" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "57x57" - }, - { - "filename" : "120pt 1.png", + "filename" : "60pt@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "180pt.png", + "filename" : "60pt@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "APP Store 1024_1024.png", + "filename" : "1024_1024.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json index 228a4829..bcd123e8 100644 --- a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "common_avatar@2x.jpg", + "filename" : "common_avatar@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.jpg b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.jpg deleted file mode 100644 index eaa56e5a..00000000 Binary files a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.jpg and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.png b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.png new file mode 100644 index 00000000..a3f704b0 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png index 40babc72..7edea0a2 100644 Binary files a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png and b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png index f3e4ff05..a085ebb3 100644 Binary files a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png and b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/Contents.json b/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/Contents.json index 809f8e41..6c80589f 100644 --- a/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "login_appIcon@2x.jpg", + "filename" : "login_appIcon@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/login_appIcon@2x.jpg b/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/login_appIcon@2x.jpg deleted file mode 100644 index eaa56e5a..00000000 Binary files a/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/login_appIcon@2x.jpg and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/login_appIcon@2x.png b/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/login_appIcon@2x.png new file mode 100644 index 00000000..a3f704b0 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/login_appIcon@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json index d971c514..8dc8d10d 100644 --- a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "ming_setting_about_us@2x.jpg", + "filename" : "ming_setting_about_us@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.jpg b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.jpg deleted file mode 100644 index eaa56e5a..00000000 Binary files a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.jpg and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.png b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.png new file mode 100644 index 00000000..a3f704b0 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.png differ diff --git a/xplan-ios/Assets.xcassets/app_launch_screen.imageset/1242_2208.png b/xplan-ios/Assets.xcassets/app_launch_screen.imageset/1242_2208.png deleted file mode 100644 index bc4b45c3..00000000 Binary files a/xplan-ios/Assets.xcassets/app_launch_screen.imageset/1242_2208.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/app_launch_screen.imageset/Contents.json b/xplan-ios/Assets.xcassets/app_launch_screen.imageset/Contents.json deleted file mode 100644 index 014feeda..00000000 --- a/xplan-ios/Assets.xcassets/app_launch_screen.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "1242_2208.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Launch Screen.storyboard b/xplan-ios/Launch Screen.storyboard index 78b6841f..94ab4b6c 100644 --- a/xplan-ios/Launch Screen.storyboard +++ b/xplan-ios/Launch Screen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -16,7 +16,7 @@ - + @@ -36,6 +36,6 @@ - + diff --git a/xplan-ios/app_launch_screen01.png b/xplan-ios/app_launch_screen01.png new file mode 100644 index 00000000..dd6e3357 Binary files /dev/null and b/xplan-ios/app_launch_screen01.png differ