Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	GYDemo/GYDemo/Network/CGNetworkTools.h

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -434,33 +434,6 @@ static IOSADManager * manager = nil;
             [weakSelf.ruishiAd showAdWithData:showData withADType:adType];
         }
         
-        
-//        if ([showData.adPlatform  isEqualToString:@"sigmob"]){
-//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                if (weakSelf.videoModels.count <= 1) {
-//                    [weakSelf requestVideoAD];
-//                }else{
-//                    [weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
-//                }
-//            });
-//
-//        } else {
-//            if (weakSelf.videoModels.count <= 1) {
-//                [weakSelf requestVideoAD];
-//            }else{
-//                [weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
-//            }
-//        }
-        
-//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//            if (weakSelf.videoModels.count <= 1) {
-//                [weakSelf requestVideoAD];
-//            }else{
-//                [weakSelf loadAdWithData:weakSelf.videoModels[1] withADType:ADType_Video];
-//            }
-//        });
-        
-        
     }else if (adType == ADType_BigImage){ //大图
         
     }else if (adType == ADType_OpenScreen){ //开屏

GYDemo/GYDemo/SCAds/platform/AddCSJADManager.m

@@ -79,7 +79,7 @@
 /// @param adType 广告类型
 - (void)showAdWithData:(GYAdsTrackModel *)showData withADType:(eADType)adType;{
     WEAKSELF
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         
         if (adType == ADType_OpenScreen) { // 开屏
             

GYDemo/GYDemo/SCAds/platform/AddGDTADManager.m

@@ -112,7 +112,7 @@
     self.loadSuccessCallbackBlock(self.currentData, YES);
     WEAKSELF;
     if (splashAd.isAdValid) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [weakSelf.splashAd_GDT showAdInWindow:self.currentWindow withBottomView:nil skipView:nil];
 
         });

GYDemo/GYDemo/SCAds/platform/AddRuiShiADManager.m

@@ -68,7 +68,7 @@
 /// @param adType 广告类型
 - (void)showAdWithData:(GYAdsTrackModel *)showData withADType:(eADType)adType;{
     WEAKSELF
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if (adType == ADType_OpenScreen) { // 开屏
             
         }else if (adType == ADType_Video){ //视频

GYDemo/GYDemo/SCAds/platform/AddSigmobADManager.m

@@ -66,7 +66,7 @@
 - (void)showAdWithData:(GYAdsTrackModel *)showData withADType:(eADType)adType;{
    
     WEAKSELF
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         NSString * ADID = showData.codeId;
         if (adType == ADType_OpenScreen) { // 开屏
             

GYDemo/GYDemo/ViewController/Welfare/WelfareCenterVC.m

@@ -85,6 +85,7 @@
 #pragma - mark   返回
 
 - (void)leftBarButtonItemAction:(UIButton *)btn{
+    [self.treasureBox.layer removeAnimationForKey:@"transform.scale"];
 
     [self dismissViewControllerAnimated:YES completion:^{
             
@@ -247,6 +248,8 @@
         animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
         animation.autoreverses = YES;
         animation.repeatCount = MAXFLOAT;
+        animation.removedOnCompletion = NO;
+
 //        transform.scale
         [self.treasureBox.layer addAnimation:animation forKey:@"transform.scale"];
         

UnityiOSFarm/Unity-iPhone.xcodeproj/project.pbxproj

@@ -307,7 +307,7 @@
 		1C6E49DC864E3EED53B45627 /* DOTween43.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DOTween43.cpp; path = Classes/Native/DOTween43.cpp; sourceTree = SOURCE_ROOT; };
 		1C8D4A3385C1732B174B4E80 /* Il2CppCompilerCalculateTypeValuesTable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Il2CppCompilerCalculateTypeValuesTable.cpp; path = Classes/Native/Il2CppCompilerCalculateTypeValuesTable.cpp; sourceTree = SOURCE_ROOT; };
 		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "Unity-Target-New.app"; path = nongchang.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1D6058910D05DD3D006BFB54 /* nongchang.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = nongchang.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1E274189AA06BEB8CEB030D3 /* LaunchScreen-iPhone.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "LaunchScreen-iPhone.storyboard"; sourceTree = SOURCE_ROOT; };
 		1EEB448B9323422E1C68B67F /* UnityEngine.UIModule_CodeGen.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = UnityEngine.UIModule_CodeGen.c; path = Classes/Native/UnityEngine.UIModule_CodeGen.c; sourceTree = SOURCE_ROOT; };
 		1FA648958F814A773E50775B /* UnityEngine.TextRenderingModule_CodeGen.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = UnityEngine.TextRenderingModule_CodeGen.c; path = Classes/Native/UnityEngine.TextRenderingModule_CodeGen.c; sourceTree = SOURCE_ROOT; };
@@ -623,7 +623,7 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */,
+				1D6058910D05DD3D006BFB54 /* nongchang.app */,
 				5623C57317FDCB0800090B9E /* Unity-iPhone Tests.xctest */,
 				9D25AB9D213FB47800354C27 /* UnityFramework.framework */,
 			);
@@ -1047,7 +1047,7 @@
 			);
 			name = "Unity-iPhone";
 			productName = "iPhone-target";
-			productReference = 1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */;
+			productReference = 1D6058910D05DD3D006BFB54 /* nongchang.app */;
 			productType = "com.apple.product-type.application";
 		};
 		5623C57217FDCB0800090B9E /* Unity-iPhone Tests */ = {
@@ -1425,7 +1425,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -1470,7 +1470,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -1630,7 +1630,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
@@ -1739,7 +1739,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";