更改logo

YuMi.xcodeproj/project.pbxproj

@@ -12217,7 +12217,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.8;
+				MARKETING_VERSION = 20.20.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12253,7 +12253,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.8;
+				MARKETING_VERSION = 20.20.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "1024＊1024.png",
+      "filename" : "1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.5.1"
+#define PI_App_Version @"2.5.2"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"

YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m

@@ -175,7 +175,7 @@ UIKIT_EXTERN NSString * const kRoomReceivedCandyNotificationKey;
     self.isPicking = NO;
     [self.presenter getLoveSettingInfo];
     [result enumerateObjectsUsingBlock:^(CandyTreeGiftInfoModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        if (obj.level > 0) {
+        if (obj.level > 2) {
             ///取消所有的延迟加载的方法
             [NSObject cancelPreviousPerformRequestsWithTarget:self];
             

YuMi/Modules/YMRoom/View/XPRoomViewController.m

@@ -984,7 +984,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
     }
     
 }
-- (void)enterRoomFail:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo {
+- (void)initEnterRoomSuccess:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo {
     [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view];
     [XPSkillCardPlayerManager shareInstance].roomUid = @(roomInfo.uid).stringValue;
     userInfo.fromUid = self.fromUid;
@@ -1676,9 +1676,9 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
         if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen && attachment.second ==  Custom_Message_Sub_Star_Kitchen_FullScreen){
             isHave = YES;
         }else if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
-            
+            isHave = YES;
         }else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {  //夺宝精灵
-            
+            isHave = YES;
         }else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
             isHave = YES;
         }if (attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) {