最后提交

QXLive.xcodeproj/project.pbxproj

@@ -793,7 +793,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.1.18;
+				MARKETING_VERSION = 1.1.19;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -859,7 +859,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.1.18;
+				MARKETING_VERSION = 1.1.19;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

QXLive/Base/QXAppStartViewController.m

@@ -99,8 +99,9 @@
             model.icon_gsrz = @"icon_gsrz";
             model.icon_wdgd = @"icon_wdgd";
             model.icon_sz = @"icon_sz";
-            
+            model.bg_tabbar = @"bg_tabbar";
             model.tabbarSelectedColor = @"#FF3700";
+            QXConfig.shared.backgroundImage = @"bg_light";
             QXConfig.shared.model =model;
         }
 //        QXThemeModel *model = [QXThemeModel yy_modelWithJSON:responseObject[@"data"]];

QXLive/Config/QXConfig.h

@@ -119,6 +119,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *icon_gsrz;
 @property (nonatomic,strong)NSString *icon_wdgd;
 @property (nonatomic,strong)NSString *icon_sz;
+@property (nonatomic,strong)NSString *bg_tabbar;
 @end
 
 /// 节日主题

QXLive/Mine(音域)/View/QXMainHeaderView.m

@@ -237,7 +237,11 @@
     
     
     self.walletBgView = [[UIView alloc] initWithFrame:CGRectMake(self.topBgView.left, self.cycleScrollView.bottom+12, self.topBgView.width, 108)];
-    self.walletBgView.backgroundColor = RGB16(0x231F2C);
+    if (QXConfig.shared.model) {
+        self.walletBgView.backgroundColor = RGB16(0x600D00);
+    }else{
+        self.walletBgView.backgroundColor = RGB16(0x231F2C);
+    }
     [self.walletBgView addRoundedCornersWithRadius:8];
     [self addSubview:self.walletBgView];
     

QXLive/Mine(音域)/View/QXMineServiceCell.m

@@ -39,7 +39,11 @@
 }
 -(void)createViews{
     self.bgView = [[UIView alloc] init];
-    self.bgView.backgroundColor = RGB16(0x231F2C);
+    if (QXConfig.shared.model) {
+        self.bgView.backgroundColor = RGB16(0x600D00);
+    }else{
+        self.bgView.backgroundColor = RGB16(0x231F2C);
+    }
     [self.bgView addRoundedCornersWithRadius:10];
     [self.contentView addSubview:self.bgView];
     [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {

QXLive/Other/Assets.xcassets/activity/A_Stake/stake_alert_bg.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "组 1123@2x.png",
+      "filename" : "stake_alert_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_win.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "组 1125@2x.png",
+      "filename" : "stake_bg_win@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/activity/A_Stake/stake_failure_bg.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "组 1126@2x.png",
+      "filename" : "stake_failure_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/activity/A_Stake/wl_word_bg.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "wl_word_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

QXLive/Other/Assets.xcassets/app_theme/bg_tabbar.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "bg_tabbar@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

QXLive/Room(房间)/View/设置/QXRoomSettingView.m

@@ -309,6 +309,10 @@
                     [self.acArray addObject:self.ageAc];
                 }
                 self.hasAc = YES;
+            }else{
+                if ([self.acArray containsObject:self.ageAc]) {
+                    [self.acArray removeObject:self.ageAc];
+                }
             }
         }else if ([md.gift_bag_id isEqualToString:@"12"]) {
             if (md.status.intValue == 1) {
@@ -316,6 +320,10 @@
                     [self.acArray addObject:self.timeAc];
                 }
                 self.hasAc = YES;
+            }else{
+                if ([self.acArray containsObject:self.timeAc]) {
+                    [self.acArray removeObject:self.timeAc];
+                }
             }
         }else if ([md.gift_bag_id isEqualToString:@"60"]) {
             if (md.status.intValue == 1) {
@@ -323,6 +331,10 @@
                     [self.acArray addObject:self.fairyAc];
                 }
                 self.hasAc = YES;
+            }else{
+                if ([self.acArray containsObject:self.fairyAc]) {
+                    [self.acArray removeObject:self.fairyAc];
+                }
             }
         }else if ([md.gift_bag_id isEqualToString:@"61"]) {
             if (md.status.intValue == 1) {
@@ -330,6 +342,10 @@
                     [self.acArray addObject:self.planAc];
                 }
                 self.hasAc = YES;
+            }else{
+                if ([self.acArray containsObject:self.planAc]) {
+                    [self.acArray removeObject:self.planAc];
+                }
             }
         }
         

QXLive/Tabbar/TabbarCustomView/QXTabBar.m

@@ -52,7 +52,9 @@
 
 - (UIImageView *)bgImageView {
     if (!_bgImageView) {
-        _bgImageView = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"tabbar背景"]];
+        _bgImageView = [[UIImageView alloc]init];
+        _bgImageView.image = [UIImage imageNamed:QXConfig.shared.model?QXConfig.shared.model.bg_tabbar:@""];
+        _bgImageView.contentMode = UIViewContentModeScaleAspectFill;
         _bgImageView.userInteractionEnabled = YES;
     }
     return _bgImageView;

QXLive/活动/炼仙传说/WLStakeModel.h

@@ -25,6 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger num;
 
 @property (nonatomic, copy) NSString *type_name;
+@property (nonatomic, copy) NSString *win_type_name;
 @property (nonatomic, copy) NSString *win_type;
 
 
@@ -37,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *gift_price;
 @property (nonatomic, assign) NSInteger is_win;//是否中奖 1是2否
 @property (nonatomic, strong) NSArray *win_gift_list;//中奖礼物
+@property (nonatomic, copy) NSString *total_gift_price;
 
 @end
 

QXLive/活动/炼仙传说/WLStakeRecordCell.m

@@ -36,7 +36,7 @@
         _iconImageView.image = ImageNamed(@"stake_6_sel");
     }
 //
-    _titleLabel.text = [NSString stringWithFormat:@"第%@期 中奖炼仙传说:%@", model.id, model.type_name];
+    _titleLabel.text = [NSString stringWithFormat:@"第%@期 中奖%@", model.id, model.type_name];
     
     NSString *dateString = [self dateYMDStrignWith:model.add_time];
     _timeLabel.text = dateString;

QXLive/活动/炼仙传说/WLStakeResultFailureView.m

@@ -63,7 +63,7 @@
         _constellationImageView.image = ImageNamed(@"stake_3_sel");
     }
 
-    _constellationLabel.text = [NSString stringWithFormat:@"炼仙传说：%@", model.type_name];
+    _constellationLabel.text = [NSString stringWithFormat:@"%@", model.type_name];
 }
 
 - (TFPopupParam *)param {

QXLive/活动/炼仙传说/WLStakeResultSuccessView.m

@@ -48,21 +48,21 @@
     
     [self.iconImageView sd_setImageWithURL:URL(C_string(model.base_image))];
     self.valueLabel.text = [NSString stringWithFormat:@"%@*%ld", model.gift_name, (long)model.num];
-    self.priceLabel.text = [NSString stringWithFormat:@"%@", model.gift_price];
+    self.priceLabel.text = [NSString stringWithFormat:@"%@", model.total_gift_price];
 
-    if ([model.win_type isEqualToString:@"1"]) {
+//    if ([model.win_type isEqualToString:@"1"]) {
-        _constellationImageView.image = ImageNamed(@"stake_2_sel");
+//        _constellationImageView.image = ImageNamed(@"stake_2_sel");
-    } else if ([model.win_type isEqualToString:@"2"]) {
+//    } else if ([model.win_type isEqualToString:@"2"]) {
-        _constellationImageView.image = ImageNamed(@"stake_1_sel");
+//        _constellationImageView.image = ImageNamed(@"stake_1_sel");
-    } else if ([model.win_type isEqualToString:@"3"]) {
+//    } else if ([model.win_type isEqualToString:@"3"]) {
-        _constellationImageView.image = ImageNamed(@"stake_4_sel");
+//        _constellationImageView.image = ImageNamed(@"stake_4_sel");
-    } else if ([model.win_type isEqualToString:@"4"]) {
+//    } else if ([model.win_type isEqualToString:@"4"]) {
-        _constellationImageView.image = ImageNamed(@"stake_5_sel");
+//        _constellationImageView.image = ImageNamed(@"stake_5_sel");
-    } else if ([model.win_type isEqualToString:@"5"]) {
+//    } else if ([model.win_type isEqualToString:@"5"]) {
-        _constellationImageView.image = ImageNamed(@"stake_3_sel");
+//        _constellationImageView.image = ImageNamed(@"stake_3_sel");
-    }
+//    }
 
-    _constellationLabel.text = [NSString stringWithFormat:@"炼仙传说：%@", model.type_name];
+    _constellationLabel.text = [NSString stringWithFormat:@"%@", model.win_type_name];
 }
 
 - (void)remove {

QXLive/活动/炼仙传说/WLStakeResultSuccessView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -46,7 +46,7 @@
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="萌宠乐园：小刺猬" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sEF-0V-Wyy">
-                            <rect key="frame" x="114" y="366.66666666666663" width="147" height="21.666666666666686"/>
+                            <rect key="frame" x="116" y="366.66666666666663" width="143" height="21.666666666666686"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                             <color key="textColor" red="1" green="0.73333333333333328" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -55,7 +55,7 @@
                             <rect key="frame" x="124.66666666666669" y="408.33333333333326" width="126" height="44"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                            <state key="normal" title="确认" backgroundImage="stake_again"/>
+                            <state key="normal" backgroundImage="stake_again"/>
                             <connections>
                                 <action selector="onConfirm:" destination="iN0-l3-epB" eventType="touchUpInside" id="17q-bG-rug"/>
                             </connections>
@@ -66,7 +66,7 @@
                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="app_coin_icon" translatesAutoresizingMaskIntoConstraints="NO" id="hBr-dZ-t3g">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="room_upseat_coin" translatesAutoresizingMaskIntoConstraints="NO" id="hBr-dZ-t3g">
                             <rect key="frame" x="158" y="334.66666666666663" width="16" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="16" id="JET-N4-86e"/>
@@ -137,9 +137,9 @@
         </view>
     </objects>
     <resources>
-        <image name="app_coin_icon" width="16" height="16"/>
+        <image name="room_upseat_coin" width="16" height="16"/>
         <image name="stake_again" width="126" height="44"/>
-        <image name="stake_bg_win" width="375" height="580"/>
+        <image name="stake_bg_win" width="375" height="564"/>
         <image name="stake_win_gift_bg" width="163" height="207"/>
         <image name="win_close_white" width="28" height="28"/>
     </resources>

QXLive/活动/炼仙传说/WL_StakeView.m

@@ -363,7 +363,7 @@
             //全服播报  探索开始播报
             [self onSocketStart:dataDict[@"data"]];
         }else if ([code isEqualToString:@"3032"]){
-            [self onSocketResult:dataDict[@"data"]];
+//            [self onSocketResult:dataDict[@"data"]];
         }else if ([code isEqualToString:@"3033"]){
             [self onSocketEnd:dataDict[@"data"]];
         }
@@ -394,7 +394,14 @@
     NSLog(@"onSocketEnd--%@", dataDict);
 
     WLStakeModel *model = [WLStakeModel mj_objectWithKeyValues:dataDict];
-
+//    if (model.is_win == 1) {
+//        self.resultDict = dataDict;
+//        [self.selBgArr enumerateObjectsUsingBlock:^(UIImageView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+//            obj.hidden = [model.win_type integerValue] != idx + 1;
+//        }];
+//        
+        [self onPopSuccessView:model];
+//    }
     //    //延时0.2秒，以防万一
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if (self.resultDict == nil) {
@@ -407,20 +414,20 @@
 }
 
 - (void)onSocketResult:(NSDictionary *)dataDict {
-     if (self.resultDict == nil) {
+//     if (self.resultDict == nil) {
-        self.resultDict = dataDict;
         WLStakeModel *model = [WLStakeModel mj_objectWithKeyValues:dataDict];
         if (model.is_win == 1) {
-            
+            self.resultDict = dataDict;
             [self.selBgArr enumerateObjectsUsingBlock:^(UIImageView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                 obj.hidden = [model.win_type integerValue] != idx + 1;
             }];
             
             [self onPopSuccessView:model];
-        }else {
-            [self onPopFailureView:model];
         }
-    }
+//        else {
+//            [self onPopFailureView:model];
+//        }
+//    }
     
 }
 

QXLive/活动/炼仙传说/WL_StakeView.xib

@@ -58,10 +58,17 @@
                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="天魔城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="69l-gz-vCl">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wl_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="U2H-5S-MZU">
-                                            <rect key="frame" x="35.666666666666686" y="100.66666666666669" width="53.666666666666657" height="21.666666666666671"/>
+                                            <rect key="frame" x="22.666666666666686" y="102.33333333333331" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="80" id="XNf-Td-nhb"/>
+                                                <constraint firstAttribute="height" constant="20" id="jWz-H3-FIb"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="马不停蹄" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="69l-gz-vCl">
+                                            <rect key="frame" x="26.666666666666686" y="100.66666666666669" width="71.666666666666671" height="21.666666666666671"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" red="1" green="0.96470588235294119" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="1" green="0.92156862745098034" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x2倍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xcg-NO-L5B">
@@ -73,6 +80,7 @@
                                     </subviews>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
+                                        <constraint firstItem="U2H-5S-MZU" firstAttribute="centerX" secondItem="69l-gz-vCl" secondAttribute="centerX" id="3Yk-hP-ra2"/>
                                         <constraint firstItem="Nk2-B7-rBi" firstAttribute="centerX" secondItem="q2F-Ca-8u5" secondAttribute="centerX" id="6q6-fr-eOg"/>
                                         <constraint firstItem="LT7-5B-Y1O" firstAttribute="leading" secondItem="q2F-Ca-8u5" secondAttribute="leading" id="8vb-Kb-ip4"/>
                                         <constraint firstItem="LT7-5B-Y1O" firstAttribute="top" secondItem="q2F-Ca-8u5" secondAttribute="top" id="Bhv-gh-FI6"/>
@@ -93,6 +101,7 @@
                                         <constraint firstAttribute="bottom" secondItem="LT7-5B-Y1O" secondAttribute="bottom" id="jaT-iZ-Zj2"/>
                                         <constraint firstItem="69l-gz-vCl" firstAttribute="centerX" secondItem="q2F-Ca-8u5" secondAttribute="centerX" id="kaH-J8-U83"/>
                                         <constraint firstItem="S2p-NK-850" firstAttribute="top" secondItem="q2F-Ca-8u5" secondAttribute="top" id="my5-U1-Aae"/>
+                                        <constraint firstItem="U2H-5S-MZU" firstAttribute="bottom" secondItem="69l-gz-vCl" secondAttribute="bottom" id="ucA-az-fOU"/>
                                         <constraint firstAttribute="height" constant="125" id="wVl-5S-6jt"/>
                                     </constraints>
                                 </view>
@@ -125,10 +134,17 @@
                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="天悲谷" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MUf-54-p8R">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wl_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Aa3-sL-wgG">
-                                            <rect key="frame" x="35.666666666666657" y="100.66666666666663" width="53.666666666666657" height="21.666666666666671"/>
+                                            <rect key="frame" x="22.666666666666657" y="102.33333333333337" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="80" id="ViG-mC-vdP"/>
+                                                <constraint firstAttribute="height" constant="20" id="r0E-lO-Eqk"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="万马奔腾" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MUf-54-p8R">
+                                            <rect key="frame" x="26.666666666666657" y="100.66666666666663" width="71.666666666666671" height="21.666666666666671"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" red="1" green="0.96470588235294119" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="1" green="0.92156862745098034" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x2倍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Af-js-2xq">
@@ -142,6 +158,8 @@
                                     <constraints>
                                         <constraint firstItem="3Ib-aU-SEF" firstAttribute="top" secondItem="lfP-Go-XIV" secondAttribute="bottom" constant="5" id="1iO-sh-Kw3"/>
                                         <constraint firstItem="lfP-Go-XIV" firstAttribute="top" secondItem="Tyw-CT-yhl" secondAttribute="top" id="45o-ZA-UYV"/>
+                                        <constraint firstItem="Aa3-sL-wgG" firstAttribute="centerX" secondItem="MUf-54-p8R" secondAttribute="centerX" id="AMU-dc-nj5"/>
+                                        <constraint firstItem="Aa3-sL-wgG" firstAttribute="bottom" secondItem="MUf-54-p8R" secondAttribute="bottom" id="E6i-H7-vEz"/>
                                         <constraint firstAttribute="bottom" secondItem="lfP-Go-XIV" secondAttribute="bottom" id="Fjk-5i-CEu"/>
                                         <constraint firstAttribute="width" constant="125" id="IHc-ID-WjH"/>
                                         <constraint firstItem="2fn-0e-5p3" firstAttribute="leading" secondItem="Tyw-CT-yhl" secondAttribute="leading" id="JhM-9G-fqh"/>
@@ -192,10 +210,17 @@
                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="九煞山" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Taf-tR-dzw">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wl_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="59H-v0-JtJ">
-                                            <rect key="frame" x="35.666666666666671" y="100.66666666666669" width="53.666666666666671" height="21.666666666666671"/>
+                                            <rect key="frame" x="22.666666666666671" y="102.33333333333331" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="EJr-gp-Tqt"/>
+                                                <constraint firstAttribute="width" constant="80" id="qL9-tM-9Wf"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="龙马精神" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Taf-tR-dzw">
+                                            <rect key="frame" x="26.666666666666664" y="100.66666666666669" width="71.666666666666686" height="21.666666666666671"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" red="1" green="0.96470588235294119" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="1" green="0.92156862745098034" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x2倍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kKm-Dx-FP8">
@@ -211,6 +236,7 @@
                                         <constraint firstItem="1Bi-4p-vuS" firstAttribute="leading" secondItem="WNB-aa-Aly" secondAttribute="leading" id="8au-Sd-96u"/>
                                         <constraint firstItem="Bfs-Qz-MwR" firstAttribute="leading" secondItem="WNB-aa-Aly" secondAttribute="leading" id="90M-gc-RY2"/>
                                         <constraint firstItem="3Eh-EE-fLl" firstAttribute="top" secondItem="dKT-nn-zdW" secondAttribute="bottom" constant="5" id="Ajv-1f-vVM"/>
+                                        <constraint firstItem="59H-v0-JtJ" firstAttribute="centerX" secondItem="Taf-tR-dzw" secondAttribute="centerX" id="GRR-ae-c7C"/>
                                         <constraint firstAttribute="bottom" secondItem="1Bi-4p-vuS" secondAttribute="bottom" id="KPl-ir-S64"/>
                                         <constraint firstItem="dKT-nn-zdW" firstAttribute="leading" secondItem="WNB-aa-Aly" secondAttribute="leading" id="PhR-bM-skB"/>
                                         <constraint firstItem="kKm-Dx-FP8" firstAttribute="top" secondItem="WNB-aa-Aly" secondAttribute="top" constant="10" id="Ruf-FR-olb"/>
@@ -218,6 +244,7 @@
                                         <constraint firstAttribute="height" constant="125" id="ZTp-FJ-8oI"/>
                                         <constraint firstItem="Taf-tR-dzw" firstAttribute="centerX" secondItem="WNB-aa-Aly" secondAttribute="centerX" id="bFw-tT-8NJ"/>
                                         <constraint firstAttribute="bottom" secondItem="dKT-nn-zdW" secondAttribute="bottom" id="dfm-2a-3mS"/>
+                                        <constraint firstItem="59H-v0-JtJ" firstAttribute="bottom" secondItem="Taf-tR-dzw" secondAttribute="bottom" id="eup-3Q-PdE"/>
                                         <constraint firstItem="SWz-ab-yPJ" firstAttribute="centerX" secondItem="WNB-aa-Aly" secondAttribute="centerX" id="gKV-r2-mzM"/>
                                         <constraint firstItem="1Bi-4p-vuS" firstAttribute="top" secondItem="WNB-aa-Aly" secondAttribute="top" id="l1Q-gj-j9m"/>
                                         <constraint firstItem="3Eh-EE-fLl" firstAttribute="centerX" secondItem="WNB-aa-Aly" secondAttribute="centerX" id="lac-In-NY7"/>
@@ -259,10 +286,17 @@
                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昊天府" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3C-Nj-dZt">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wl_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="TvO-Um-3Bm">
-                                            <rect key="frame" x="35.666666666666671" y="100.66666666666669" width="53.666666666666671" height="21.666666666666671"/>
+                                            <rect key="frame" x="22.666666666666671" y="102.33333333333331" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="80" id="Pdi-wU-Hol"/>
+                                                <constraint firstAttribute="height" constant="20" id="bYL-kB-0lT"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="马年大吉" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3C-Nj-dZt">
+                                            <rect key="frame" x="26.666666666666664" y="100.66666666666669" width="71.666666666666686" height="21.666666666666671"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" red="1" green="0.96470588235294119" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="1" green="0.92156862745098034" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x2倍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rji-41-NNa">
@@ -285,6 +319,7 @@
                                         <constraint firstItem="vIg-G4-lMU" firstAttribute="top" secondItem="cOl-Wy-WhC" secondAttribute="bottom" constant="5" id="FQW-dw-ozK"/>
                                         <constraint firstAttribute="height" constant="125" id="Iib-zM-Gdu"/>
                                         <constraint firstAttribute="width" constant="125" id="L3D-np-V2a"/>
+                                        <constraint firstItem="TvO-Um-3Bm" firstAttribute="bottom" secondItem="W3C-Nj-dZt" secondAttribute="bottom" id="U0h-Z7-zhs"/>
                                         <constraint firstAttribute="trailing" secondItem="yyE-zD-Nvc" secondAttribute="trailing" id="U62-2M-MHg"/>
                                         <constraint firstItem="vIg-G4-lMU" firstAttribute="centerX" secondItem="NaW-4S-OvO" secondAttribute="centerX" id="Vri-O0-cd9"/>
                                         <constraint firstItem="rji-41-NNa" firstAttribute="top" secondItem="NaW-4S-OvO" secondAttribute="top" constant="10" id="XEg-jD-YPm"/>
@@ -293,6 +328,7 @@
                                         <constraint firstItem="zdJ-Fu-kMj" firstAttribute="top" secondItem="W3C-Nj-dZt" secondAttribute="bottom" constant="2" id="ffM-rn-gbl"/>
                                         <constraint firstItem="y1O-FD-nIK" firstAttribute="top" secondItem="NaW-4S-OvO" secondAttribute="top" id="inA-CJ-i2F"/>
                                         <constraint firstItem="zdJ-Fu-kMj" firstAttribute="centerX" secondItem="NaW-4S-OvO" secondAttribute="centerX" id="kF0-9H-cum"/>
+                                        <constraint firstItem="TvO-Um-3Bm" firstAttribute="centerX" secondItem="W3C-Nj-dZt" secondAttribute="centerX" id="p2J-7v-uLr"/>
                                         <constraint firstItem="y1O-FD-nIK" firstAttribute="leading" secondItem="NaW-4S-OvO" secondAttribute="leading" id="vwC-K7-8mn"/>
                                         <constraint firstItem="yyE-zD-Nvc" firstAttribute="leading" secondItem="NaW-4S-OvO" secondAttribute="leading" id="xmL-9C-HMK"/>
                                     </constraints>
@@ -326,10 +362,17 @@
                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="凌云殿" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PNd-ZC-gEw">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wl_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="3aD-NS-LT6">
-                                            <rect key="frame" x="35.666666666666686" y="100.66666666666669" width="53.666666666666657" height="21.666666666666671"/>
+                                            <rect key="frame" x="22.666666666666686" y="102.33333333333331" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="Iqt-bt-qd5"/>
+                                                <constraint firstAttribute="width" constant="80" id="MHv-xJ-o5H"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="一马当先" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PNd-ZC-gEw">
+                                            <rect key="frame" x="26.666666666666686" y="100.66666666666669" width="71.666666666666671" height="21.666666666666671"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" red="1" green="0.96470588235294119" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="1" green="0.92156862745098034" blue="0.28627450980392155" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x2倍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U6N-SP-K0c">
@@ -345,8 +388,10 @@
                                         <constraint firstItem="sGQ-me-XVQ" firstAttribute="centerX" secondItem="IeJ-QE-AjG" secondAttribute="centerX" id="5Sa-Sl-os3"/>
                                         <constraint firstAttribute="trailing" secondItem="CUv-Ph-w8W" secondAttribute="trailing" id="8TF-Kq-2PB"/>
                                         <constraint firstAttribute="trailing" secondItem="1VR-Cz-Z3z" secondAttribute="trailing" id="ASj-2Z-O9C"/>
+                                        <constraint firstItem="3aD-NS-LT6" firstAttribute="bottom" secondItem="PNd-ZC-gEw" secondAttribute="bottom" id="BOq-a6-avV"/>
                                         <constraint firstItem="20l-22-ulL" firstAttribute="top" secondItem="1VR-Cz-Z3z" secondAttribute="bottom" constant="5" id="CIr-Ct-e7U"/>
                                         <constraint firstAttribute="height" constant="125" id="JTH-oD-pxd"/>
+                                        <constraint firstItem="3aD-NS-LT6" firstAttribute="centerX" secondItem="PNd-ZC-gEw" secondAttribute="centerX" id="RkZ-0A-x0e"/>
                                         <constraint firstItem="1VR-Cz-Z3z" firstAttribute="leading" secondItem="IeJ-QE-AjG" secondAttribute="leading" id="Sgy-L5-SLn"/>
                                         <constraint firstItem="PNd-ZC-gEw" firstAttribute="centerX" secondItem="IeJ-QE-AjG" secondAttribute="centerX" id="Sp1-yg-18e"/>
                                         <constraint firstItem="CUv-Ph-w8W" firstAttribute="top" secondItem="IeJ-QE-AjG" secondAttribute="top" id="TFr-vI-hc7"/>
@@ -393,10 +438,17 @@
                                             <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="半月宫" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bkF-HY-L5Y">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wl_word_bg" translatesAutoresizingMaskIntoConstraints="NO" id="P2D-Ae-ylL">
-                                            <rect key="frame" x="35.666666666666657" y="100.33333333333331" width="53.666666666666657" height="21.666666666666671"/>
+                                            <rect key="frame" x="22.666666666666657" y="102" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="0R8-ia-L2n"/>
+                                                <constraint firstAttribute="width" constant="80" id="lej-rT-tca"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="马到成功" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bkF-HY-L5Y">
+                                            <rect key="frame" x="26.666666666666657" y="100.33333333333331" width="71.666666666666671" height="21.666666666666671"/>
                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                            <color key="textColor" red="1" green="0.96470588235294119" blue="0.80392156862745101" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="textColor" red="1" green="0.92156862745098034" blue="0.28627450980392155" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="x2倍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HE2-m7-vFc">
@@ -421,9 +473,11 @@
                                         <constraint firstAttribute="bottom" secondItem="Dou-t9-DOB" secondAttribute="bottom" id="aNj-GK-ecv"/>
                                         <constraint firstItem="mzD-a7-LBT" firstAttribute="top" secondItem="5MM-O7-5IA" secondAttribute="top" id="bS4-5p-7gr"/>
                                         <constraint firstItem="HE2-m7-vFc" firstAttribute="centerX" secondItem="5MM-O7-5IA" secondAttribute="centerX" id="kE3-wU-ajk"/>
+                                        <constraint firstItem="P2D-Ae-ylL" firstAttribute="bottom" secondItem="bkF-HY-L5Y" secondAttribute="bottom" id="lvF-lS-tSX"/>
                                         <constraint firstItem="aCl-mW-Gb8" firstAttribute="top" secondItem="bkF-HY-L5Y" secondAttribute="bottom" constant="2" id="ndE-if-wj4"/>
                                         <constraint firstItem="Dou-t9-DOB" firstAttribute="leading" secondItem="5MM-O7-5IA" secondAttribute="leading" id="rQr-tD-5my"/>
                                         <constraint firstItem="Dou-t9-DOB" firstAttribute="top" secondItem="5MM-O7-5IA" secondAttribute="top" id="rxE-MQ-DZB"/>
+                                        <constraint firstItem="P2D-Ae-ylL" firstAttribute="centerX" secondItem="bkF-HY-L5Y" secondAttribute="centerX" id="sP6-UL-Fpw"/>
                                         <constraint firstItem="bkF-HY-L5Y" firstAttribute="centerX" secondItem="5MM-O7-5IA" secondAttribute="centerX" id="t25-no-Zyg"/>
                                         <constraint firstItem="HE2-m7-vFc" firstAttribute="top" secondItem="5MM-O7-5IA" secondAttribute="top" constant="10" id="vbT-63-G03"/>
                                         <constraint firstItem="H8v-hu-aoC" firstAttribute="leading" secondItem="5MM-O7-5IA" secondAttribute="leading" id="x0Q-kO-yyz"/>
@@ -493,7 +547,7 @@
                             </connections>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0xt-sR-reF">
-                            <rect key="frame" x="51.666666666666657" y="539" width="192.00000000000003" height="44"/>
+                            <rect key="frame" x="51.666666666666657" y="539" width="192" height="44"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stake_yue_bg" translatesAutoresizingMaskIntoConstraints="NO" id="RCe-89-WsH">
                                     <rect key="frame" x="0.0" y="0.0" width="192" height="44"/>
@@ -644,6 +698,7 @@
         <image name="stake_name_6" width="125" height="125"/>
         <image name="stake_yue_bg" width="192" height="44"/>
         <image name="wallet_corn" width="28" height="28"/>
+        <image name="wl_word_bg" width="90" height="20"/>
         <image name="zhuan_stake_bg" width="375" height="608"/>
         <image name="zhuan_stake_pool" width="50" height="50"/>
         <image name="zhuan_stake_rank" width="50" height="50"/>

QXLive/活动/炼仙传说/手气榜/WLStakeRankCell.m

@@ -26,7 +26,7 @@
     
     self.titleL.text = [NSString stringWithFormat:@"第%@期 %@中了%@(%@)*%@", model.mid, model.nick_name, model.gift_name, model.gift_price, model.num];
     self.timeL.text = [NSString stringWithFormat:@"%@",[self time_timestampToString:[model.add_time intValue]]];
-    self.typeL.text = [NSString stringWithFormat:@"炼仙传说:%@", model.type_name];
+    self.typeL.text = [NSString stringWithFormat:@"%@", model.type_name];
 }
 
 - (NSString *)time_timestampToString:(NSInteger)timestamp{