diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index c718a8e2..51659c2f 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -11633,7 +11633,7 @@ CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-ios.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -11649,7 +11649,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 2.0.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -11896,7 +11896,7 @@ CODE_SIGN_ENTITLEMENTS = "xplan-ios/xplan-iosRelease.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -11912,7 +11912,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.0; + MARKETING_VERSION = 2.0.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png index a70fefc5..31f1ac20 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png index 965e3960..61e5980c 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120 1.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120 1.png new file mode 100644 index 00000000..a926e769 Binary files /dev/null and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120 1.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png index 6373e148..a926e769 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png index 3cb149fe..9fb83b14 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png index 744de34b..8ae0ac24 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png index d5d51de0..d13a738e 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png index 8a7754b5..ecded466 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png index 05304e83..10836d98 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png index 17d4880b..5aec76a2 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png index 28ff2049..2e38edea 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png index 544b8256..c354d919 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json index 73d3b7f6..0497b95c 100644 --- a/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1,80 @@ -{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]} \ No newline at end of file +{ + "images" : [ + { + "filename" : "40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "120 1.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "57.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "57x57" + }, + { + "filename" : "114.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "57x57" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png index 845f8450..a2d4447f 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png index 28a4362c..f2ad3482 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_normal.imageset/tab_gameHome_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png index 5fef21ec..2ebc420d 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png index 61069c78..dba5ac51 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_gameHome_selected.imageset/tab_gameHome_selected@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png index 12879746..e4ee9e02 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png index b59c8795..301fb6b3 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_normal.imageset/tab_message_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png index 06657ff0..230da0c0 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png index 8da7a466..8d0b610d 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_message_selected.imageset/tab_message_selected@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png index 318b8bb4..4bee888c 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png index 0081187a..7bf4c6c1 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_normal.imageset/tab_mine_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png index f3694c5d..b728720f 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png index 2b4092f8..43b32eea 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_mine_selected.imageset/tab_mine_selected@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png index 6cd4c59b..081c408e 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png index d59d0479..5a3d7a9c 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_normal.imageset/tab_monents_normal@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png index 462e3555..cb52380b 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png index 6e08421c..6e311ddb 100644 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png and b/xplan-ios/Assets.xcassets/Tabbar/tab_monents_select.imageset/tab_monents_select@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json deleted file mode 100644 index c018c9aa..00000000 --- a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tab_party_normal@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tab_party_normal@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@2x.png deleted file mode 100644 index 7458a2c4..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@3x.png deleted file mode 100644 index 0804c669..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_party_normal.imageset/tab_party_normal@3x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json deleted file mode 100644 index 5f73162f..00000000 --- a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tab_party_selected@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tab_party_selected@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@2x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@2x.png deleted file mode 100644 index 9f8e27aa..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@2x.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@3x.png b/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@3x.png deleted file mode 100644 index 3d88bc56..00000000 Binary files a/xplan-ios/Assets.xcassets/Tabbar/tab_party_selected.imageset/tab_party_selected@3x.png and /dev/null differ