fix paizi bugs

GYDemo/GYDemo.xcodeproj/project.pbxproj

@@ -1003,7 +1003,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 103;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
@@ -1035,7 +1035,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 103;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;

GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 +(GYCashSixAwardAlertView *)loadFromNib;
 
+@property (weak, nonatomic) IBOutlet UIImageView *centerImageView;
 @property (weak, nonatomic) IBOutlet UILabel *mainTitleLabel;
 @property (weak, nonatomic) IBOutlet UIButton *cancelButton;
 

GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.m

@@ -57,12 +57,15 @@
         [self.commitButton setBackgroundImage:[UIImage imageNamed:@"alert_six_cash_btn_bg"] forState:UIControlStateNormal];
         [self.commitButton setImage:[UIImage imageNamed:@"alert_six_cash_play_btn_bg"] forState:UIControlStateNormal];
         [self.commitButton setTitle:@"    领6倍奖励" forState:UIControlStateNormal];
+        self.centerImageView.image = [UIImage imageNamed:@"toast_double_cash_icon"];
+        
     } else {
         self.gainAmountLeftLabel.hidden = false;
         self.mainTitleLabel.text = @"获得翻倍奖励";
         [self.commitButton setBackgroundImage:[UIImage imageNamed:@"gift_confirm"] forState:UIControlStateNormal];
         [self.commitButton setImage:nil forState:UIControlStateNormal];
         [self.commitButton setTitle:@"开心收下" forState:UIControlStateNormal];
+        self.centerImageView.image = [UIImage imageNamed:@"toast_double_red_icon"];
     }
     [toView addSubview:self];
 

GYDemo/GYDemo/Alert/GYCashSixAwardAlertView.xib

@@ -117,6 +117,7 @@
             <connections>
                 <outlet property="adContentView" destination="VdM-km-MHW" id="Rhe-vZ-pJD"/>
                 <outlet property="cancelButton" destination="HYO-Ph-Ebm" id="sZH-rX-m98"/>
+                <outlet property="centerImageView" destination="p9y-5L-dzc" id="LQH-MG-KTd"/>
                 <outlet property="commitButton" destination="Ylj-kZ-eAE" id="9gt-NL-B7v"/>
                 <outlet property="gainAmountLabel" destination="MRv-Ar-Cpc" id="bkx-7x-Mq6"/>
                 <outlet property="gainAmountLeftLabel" destination="zxy-Fc-ho1" id="mbb-1c-bsz"/>

GYDemo/GYDemo/AppDelegate.mm

@@ -553,25 +553,25 @@ NSDictionary* appLaunchOpts;
 
 // 拆红包
 - (void)ios_adRedPackPlan {
-    //   open_plant_box
-        [[CGNetworkTools shared] postWithAction:open_plant_box parameters:@{} success:^(id  _Nonnull response) {
-            if ([[response objectForKey:@"status"] integerValue] == 200) {
-
-                NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
-                
-                GYOpenBoxModel * sModel = [GYOpenBoxModel new];
-                sModel.type = [[result objectForKey:@"type"] integerValue];
-                sModel.awardNum = [[result objectForKey:@"awardNum"] integerValue];
+    
+    WEAKSELF
+    [[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) {
+        if (success) {
+            [[CGNetworkTools shared] postWithAction:open_plant_box parameters:@{} success:^(id  _Nonnull response) {
+                if ([[response objectForKey:@"status"] integerValue] == 200) {
+                    
+                    NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
+                    
+                    NSString *awardNumber = [[result objectForKey:@"awardNum"] stringValue];
+                    GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
+                    [alertVC showAlertToView:[[weakSelf ufw] appController].window amount:awardNumber firstShow: false];
+                    [weakSelf ios_getHomeInfo];
+                }
+            } failure:^(NSError * _Nonnull error) {
                 
-                GYGiftAlertView * gift = [[NSBundle mainBundle] loadNibNamed:NSStringFromClass([GYGiftAlertView class]) owner:self options:nil].firstObject;
-                gift.boxModel = sModel;
-                gift.frame = [[self ufw] appController].window.bounds;
-                [[[self ufw] appController].window addSubview:gift];
-                [gift show:nil];
-            }
-        } failure:^(NSError * _Nonnull error) {
-            
-        }];
+            }];
+        }
+    }];
 }
 
 // 收红包
@@ -599,39 +599,16 @@ NSDictionary* appLaunchOpts;
     WEAKSELF
     alertVC.closeCallBack = ^(bool result) {
         if (result) {
-            // 播放视频
-            [[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) {
-                if (success) {
-                    [[CGNetworkTools shared] postWithAction:awardMultiple parameters:@{@"sid": sid} success:^(id  _Nonnull response) {
-                        
-                        if ([[response objectForKey:@"status"] integerValue] == 200) {
-                            
-                            NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
-                            NSArray *rewardContentList = [result objectForKey:@"rewardContentList"];
-                            if (rewardContentList.count <= 0) {
-                                return;
-                            }
-                            NSString *totalRewardNum = [[rewardContentList.firstObject objectForKey:@"totalRewardNum"] stringValue];
-                            
-                            GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
-                            [alertVC showAlertToView:[[self ufw] appController].window amount:totalRewardNum firstShow: false];
-                            
-                            [self ios_getHomeInfo];
-                            [self ios_onGetRedPackList];
-                        }
-                    } failure:^(NSError * _Nonnull error) {
-                        
-                    }];
-                } else {
-                    [MBProgressHUD showError:@"抱歉, 请重试"];
-                }
-            }];
-            
+            [self gainMultipleAward: sid];
         } else {
             // 取消播放领取
             [[CGNetworkTools shared] postWithAction: adForcePost parameters:@{} success:^(id  _Nonnull response) {
                 NSDictionary *data = [[response objectForKey:@"result"] objectForKey:@"data"];
                 NSLog(@"取消播放领取 adForcePost = %@", data);
+                NSInteger result = [[data objectForKey:@"force"] integerValue];
+                if (result == 1) {
+                    [weakSelf gainMultipleAward: sid];
+                }
             } failure:^(NSError * _Nonnull error) {
                 
             }];
@@ -640,6 +617,38 @@ NSDictionary* appLaunchOpts;
     
 }
 
+// 领取加倍红包
+- (void)gainMultipleAward: (NSString *)sid {
+    // 播放视频
+    WEAKSELF
+    [[IOSADManager shareADManager] showADType:ADType_Video resultBlock:^(BOOL success) {
+        if (success) {
+            [[CGNetworkTools shared] postWithAction:awardMultiple parameters:@{@"sid": sid} success:^(id  _Nonnull response) {
+                
+                if ([[response objectForKey:@"status"] integerValue] == 200) {
+                    
+                    NSDictionary *result = [[response objectForKey:@"result"] objectForKey:@"data"];
+                    NSArray *rewardContentList = [result objectForKey:@"rewardContentList"];
+                    if (rewardContentList.count <= 0) {
+                        return;
+                    }
+                    NSString *totalRewardNum = [[rewardContentList.firstObject objectForKey:@"totalRewardNum"] stringValue];
+                    
+                    GYCashSixAwardAlertView *alertVC = [GYCashSixAwardAlertView loadFromNib];
+                    [alertVC showAlertToView:[[weakSelf ufw] appController].window amount:totalRewardNum firstShow: false];
+                    
+                    [weakSelf ios_getHomeInfo];
+                    [weakSelf ios_onGetRedPackList];
+                }
+            } failure:^(NSError * _Nonnull error) {
+                
+            }];
+        } else {
+            [MBProgressHUD showError:@"抱歉, 请重试"];
+        }
+    }];
+}
+
 // 红包列表
 - (void)ios_onGetRedPackList {
     [[CGNetworkTools shared]  getWithAction: getRedPackList parameters: @{} success:^(id  _Nonnull response) {

GYDemo/GYDemo/Assets.xcassets/AlertCash/toast_double_cash_icon.imageset/Contents.json

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

UnityiOSFarm/Classes/Native/Assembly-CSharp.cpp

@@ -27700,7 +27700,7 @@ IL2CPP_EXTERN_C IL2CPP_METHOD_ATTR void NewFruitControl_onClickLanType_mBFDCE09A
 		int32_t L_14 = __this->get_clickType_11();
 		if ((((int32_t)L_14) == ((int32_t)(-1))))
 		{
-			goto IL_01a3;
+			goto IL_019a;
 		}
 	}
 	{
@@ -27709,7 +27709,7 @@ IL2CPP_EXTERN_C IL2CPP_METHOD_ATTR void NewFruitControl_onClickLanType_mBFDCE09A
 		bool L_16 = FruitCodeType_get_getIsShow_mBA808A6AE158CEA145056DB9B020BFAA4ED740FA_inline(L_15, /*hidden argument*/NULL);
 		if (!L_16)
 		{
-			goto IL_01a3;
+			goto IL_019a;
 		}
 	}
 	{
@@ -27818,39 +27818,75 @@ IL_0132:
 	}
 
 IL_0179:
-	{
-		// if (clickType != 1)
-		int32_t L_57 = __this->get_clickType_11();
-		if ((((int32_t)L_57) == ((int32_t)1)))
-		{
-			goto IL_01b7;
-		}
-	}
 	{
 		// GameObject.Find("Form_land").GetComponent<FarmControl>().onClickUnlockLand(fruit_id, clickType);
-		GameObject_tC000A2E1A7CF1E10FD7BA08863287C072207C319 * L_58 = GameObject_Find_m20157C941F1A9DA0E33E0ACA1324FAA41C2B199B(_stringLiteral3EBDBEC0B30D38662FBDDC885AD4D0E8EF670D46, /*hidden argument*/NULL);
+		GameObject_tC000A2E1A7CF1E10FD7BA08863287C072207C319 * L_57 = GameObject_Find_m20157C941F1A9DA0E33E0ACA1324FAA41C2B199B(_stringLiteral3EBDBEC0B30D38662FBDDC885AD4D0E8EF670D46, /*hidden argument*/NULL);
+		NullCheck(L_57);
+		FarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4 * L_58 = GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8(L_57, /*hidden argument*/GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8_RuntimeMethod_var);
+		int32_t L_59 = __this->get_fruit_id_12();
+		int32_t L_60 = __this->get_clickType_11();
 		NullCheck(L_58);
-		FarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4 * L_59 = GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8(L_58, /*hidden argument*/GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8_RuntimeMethod_var);
-		int32_t L_60 = __this->get_fruit_id_12();
-		int32_t L_61 = __this->get_clickType_11();
-		NullCheck(L_59);
-		FarmControl_onClickUnlockLand_mABD68AC787A745E3FCF0C2CDF969B28D7A1CBB48(L_59, L_60, L_61, /*hidden argument*/NULL);
+		FarmControl_onClickUnlockLand_mABD68AC787A745E3FCF0C2CDF969B28D7A1CBB48(L_58, L_59, L_60, /*hidden argument*/NULL);
 		// }
 		return;
 	}
 
-IL_01a3:
+IL_019a:
 	{
-		// GameObject.Find("Form_land").GetComponent<FarmControl>().getLandList();
-		GameObject_tC000A2E1A7CF1E10FD7BA08863287C072207C319 * L_62 = GameObject_Find_m20157C941F1A9DA0E33E0ACA1324FAA41C2B199B(_stringLiteral3EBDBEC0B30D38662FBDDC885AD4D0E8EF670D46, /*hidden argument*/NULL);
-		NullCheck(L_62);
-		FarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4 * L_63 = GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8(L_62, /*hidden argument*/GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8_RuntimeMethod_var);
+		// if (clickType == 1)
+		int32_t L_61 = __this->get_clickType_11();
+		if ((!(((uint32_t)L_61) == ((uint32_t)1))))
+		{
+			goto IL_01fb;
+		}
+	}
+	{
+		// Debug.Log("clickType" + clickType + "fruit_id" + fruit_id);
+		ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE* L_62 = (ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE*)(ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE*)SZArrayNew(ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE_il2cpp_TypeInfo_var, (uint32_t)4);
+		ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE* L_63 = L_62;
 		NullCheck(L_63);
-		FarmControl_getLandList_m4EECA57812FDCE4E2D18DCE8DDC129BF415A88BA(L_63, /*hidden argument*/NULL);
+		ArrayElementTypeCheck (L_63, _stringLiteral43C491FE784E6475CA46379CDFEEFCBB79D0E6C4);
+		(L_63)->SetAt(static_cast<il2cpp_array_size_t>(0), (RuntimeObject *)_stringLiteral43C491FE784E6475CA46379CDFEEFCBB79D0E6C4);
+		ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE* L_64 = L_63;
+		int32_t L_65 = __this->get_clickType_11();
+		int32_t L_66 = L_65;
+		RuntimeObject * L_67 = Box(Int32_tFDE5F8CD43D10453F6A2E0C77FE48C6CC7009046_il2cpp_TypeInfo_var, &L_66);
+		NullCheck(L_64);
+		ArrayElementTypeCheck (L_64, L_67);
+		(L_64)->SetAt(static_cast<il2cpp_array_size_t>(1), (RuntimeObject *)L_67);
+		ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE* L_68 = L_64;
+		NullCheck(L_68);
+		ArrayElementTypeCheck (L_68, _stringLiteral6C467912654C818DAA3C493E1AFA591A3072B4FC);
+		(L_68)->SetAt(static_cast<il2cpp_array_size_t>(2), (RuntimeObject *)_stringLiteral6C467912654C818DAA3C493E1AFA591A3072B4FC);
+		ObjectU5BU5D_tC1F4EE0DB0B7300255F5FD4AF64FE4C585CF5ADE* L_69 = L_68;
+		int32_t L_70 = __this->get_fruit_id_12();
+		int32_t L_71 = L_70;
+		RuntimeObject * L_72 = Box(Int32_tFDE5F8CD43D10453F6A2E0C77FE48C6CC7009046_il2cpp_TypeInfo_var, &L_71);
+		NullCheck(L_69);
+		ArrayElementTypeCheck (L_69, L_72);
+		(L_69)->SetAt(static_cast<il2cpp_array_size_t>(3), (RuntimeObject *)L_72);
+		String_t* L_73 = String_Concat_m6F0ED62933448F8B944E52872E1EE86F6705D306(L_69, /*hidden argument*/NULL);
+		IL2CPP_RUNTIME_CLASS_INIT(Debug_tEB68BCBEB8EFD60F8043C67146DC05E7F50F374B_il2cpp_TypeInfo_var);
+		Debug_Log_mC26E5AD0D8D156C7FFD173AA15827F69225E9DB8(L_73, /*hidden argument*/NULL);
+		// GameObject.Find("Form_land").GetComponent<FarmControl>().onClickUnlockLand(fruit_id, 1);
+		GameObject_tC000A2E1A7CF1E10FD7BA08863287C072207C319 * L_74 = GameObject_Find_m20157C941F1A9DA0E33E0ACA1324FAA41C2B199B(_stringLiteral3EBDBEC0B30D38662FBDDC885AD4D0E8EF670D46, /*hidden argument*/NULL);
+		NullCheck(L_74);
+		FarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4 * L_75 = GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8(L_74, /*hidden argument*/GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8_RuntimeMethod_var);
+		int32_t L_76 = __this->get_fruit_id_12();
+		NullCheck(L_75);
+		FarmControl_onClickUnlockLand_mABD68AC787A745E3FCF0C2CDF969B28D7A1CBB48(L_75, L_76, 1, /*hidden argument*/NULL);
+		// }
+		return;
 	}
 
-IL_01b7:
+IL_01fb:
 	{
+		// GameObject.Find("Form_land").GetComponent<FarmControl>().getLandList();
+		GameObject_tC000A2E1A7CF1E10FD7BA08863287C072207C319 * L_77 = GameObject_Find_m20157C941F1A9DA0E33E0ACA1324FAA41C2B199B(_stringLiteral3EBDBEC0B30D38662FBDDC885AD4D0E8EF670D46, /*hidden argument*/NULL);
+		NullCheck(L_77);
+		FarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4 * L_78 = GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8(L_77, /*hidden argument*/GameObject_GetComponent_TisFarmControl_t231FA3492CFC97C89279A07A1C278AF8A95050C4_mFC077B30C7AFC0F95EF160BE6A014CD35A2A3CB8_RuntimeMethod_var);
+		NullCheck(L_78);
+		FarmControl_getLandList_m4EECA57812FDCE4E2D18DCE8DDC129BF415A88BA(L_78, /*hidden argument*/NULL);
 		// }
 		return;
 	}

farm.xcworkspace/xcuserdata/mazy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,38 +3,4 @@
    uuid = "4A11BE7E-1EBF-4E83-9D51-2ED4EFD99DC9"
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C6F380D1-80EF-408A-9AD1-B00DBF24FABE"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "GYDemo/GYDemo/AppDelegate.mm"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "344"
-            endingLineNumber = "344"
-            landmarkName = "-ios_getCloudSpeed"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "71BC9847-D05B-43CD-A4B7-62B10F03DD04"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "GYDemo/GYDemo/AppDelegate.mm"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "331"
-            endingLineNumber = "331"
-            landmarkName = "-ios_getHomeInfo"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>