年度盛典appicon、tabbarIcon替换

xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,55 +1,55 @@
 {
   "images" : [
     {
-      "filename" : "20pt@2x.png",
+      "filename" : "40pt.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "20pt@3x.png",
+      "filename" : "60pt.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "29pt@2x.png",
+      "filename" : "58pt.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "29pt@3x.png",
+      "filename" : "87pt.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "40pt@2x.png",
+      "filename" : "80pt.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "40pt@3x.png",
+      "filename" : "120pt 1.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "60pt@2x.png",
+      "filename" : "120pt.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "60pt@3x.png",
+      "filename" : "180pt.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "1024_1024.png",
+      "filename" : "APP Store 1024_1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

xplan-ios/Main/Tabbar/View/TabbarViewController.m

@@ -443,7 +443,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
 - (void)initTabs:(BOOL)logined {
 	self.viewControllers = nil;
     NSArray *normalImageNames = @[@"tab_gameHome_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"];
-    NSArray *selectImageNames = @[@"tab_gameHome_selected",@"tab_monents_select",@"tab_message_selected", @"tab_mine_selected"];
+    NSArray *selectImageNames = @[@"tab_gameHome_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"];
     NSArray *tabLabel = @[@"派对",@"广场",@"消息", @"我的"];
     
     UIViewController *game;
@@ -482,9 +482,9 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
     itemVc.title = title;
     itemVc.tabBarItem.image = [[UIImage imageNamed:image] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     itemVc.tabBarItem.selectedImage =  [[UIImage imageNamed:selectedImage] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-    [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor appMainColor]} forState:UIControlStateSelected];
-    [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[ThemeColor secondTextColor]} forState:UIControlStateNormal];
-    
+    [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x333333)} forState:UIControlStateSelected];
+    [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x999999)} forState:UIControlStateNormal];
+    itemVc.tabBarItem.titlePositionAdjustment =  UIOffsetMake(0, 5);
     BaseNavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:itemVc];
     return nav;
 }