diff --git a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png index 295a2faf..ece81545 100644 Binary files a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png and b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@3x.png b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@3x.png index b3e74cf9..5a73a50a 100644 Binary files a/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@3x.png and b/YuMi/Assets.xcassets/Login/pi_app_login_new_bg.imageset/pi_app_login_new_bg@3x.png differ diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 9df474f7..95ca9a98 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -191,7 +191,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; make.width.mas_offset(kGetScaleWidth(162)); make.height.mas_equalTo(kGetScaleWidth(32)); make.centerX.equalTo(self.view); - make.top.equalTo(self.bgImageView.mas_bottom).mas_offset(kGetScaleWidth(10)); + make.top.equalTo(self.bgImageView.mas_bottom).mas_offset(kGetScaleWidth(-15)); }]; @@ -732,7 +732,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; if(!_bgImageView){ _bgImageView = [[UIImageView alloc]init]; _bgImageView.image = kImage(@"pi_app_login_new_bg"); - _bgImageView.contentMode = 2; + _bgImageView.contentMode = UIViewContentModeScaleAspectFit; } return _bgImageView; } diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index 7ad2b574..b624be9d 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -365,7 +365,7 @@ UIKIT_EXTERN NSString *kRequestRicket; return cell; }else if (indexPath.section == 1) { XPMinePersonalCenterCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPMinePersonalCenterCell class])]; -// cell.isHaveGiveDiamond = self.isHavePermission; + cell.isHaveGiveDiamond = NO; @kWeakify(self) cell.clickAction = ^(int type){ @kStrongify(self) diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 4821d7d7..35ba49cd 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -277,7 +277,7 @@ "XPIncomeRecordView5"="الماس"; "XPIncomeRecordVC0"="سجل الإيرادات"; - +"XPIncomeRecordVC1"="المحفظة"; "XPExchangeDiamondsItemView0"="عملاتي: %.2"; "XPExchangeDiamondsItemView1"="الماس الخاص بي: %@"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index b90685df..086874fc 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -2974,7 +2974,7 @@ "XPIncomeRecordView5"="Diamonds"; "XPIncomeRecordVC0"="Earnings Record"; - +"XPIncomeRecordVC1"="Wallet"; "XPExchangeDiamondsItemView0"="My Coins: %@"; "XPExchangeDiamondsItemView1"="My Diamonds: %.2f"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 3b175a8b..af7dff86 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -3269,6 +3269,7 @@ //"XPIncomeRecordVC" "XPIncomeRecordVC0"="收益记录"; +"XPIncomeRecordVC1"="钱包"; ///MSTabbarBeginGameView "MSTabbarBeginGameView0"="开始"; ///MSRoomGameVictoryView @@ -3292,5 +3293,5 @@ //MSRoomGameVC "MSRoomGameVC0"="匹配失败"; -"MSRoomGameVC1"="钱包"; + diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 4c894a67..6f7c79bb 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -2603,7 +2603,7 @@ "XPIncomeRecordView4"="金幣"; "XPIncomeRecordView5"="鉆石"; -"XPIncomeRecordVC0"="收益記錄"; + "XPExchangeDiamondsItemView0"="我的金幣:%@"; "XPExchangeDiamondsItemView1"="我的鉆石:%.2f"; @@ -3259,7 +3259,9 @@ ///MSRoomSetingBackdropCell "MSRoomSetingBackdropCell0"="使用中"; "MSRoomSetingBackdropCell1"="確認選擇這張圖片作為房間主題嗎?"; - +//"XPIncomeRecordVC" +"XPIncomeRecordVC0"="收益记录"; +"XPIncomeRecordVC1"="钱包"; ///MSTabbarBeginGameView "MSTabbarBeginGameView0"="开始"; ///MSRoomGameVictoryView @@ -3279,4 +3281,4 @@ "MSRoomGameHeadView4"="入場費(%@)"; //MSRoomGameVC "MSRoomGameVC0"="匹配失败"; -"MSRoomGameVC1"="钱包"; +