Merge branch 'master' of gitlab.huolea.com:lmi/luckfarm

# Conflicts:
#	GYDemo/GYDemo.xcodeproj/project.pbxproj
#	GYDemo/GYDemo/AppDelegate.mm

GYDemo/GYDemo.xcodeproj/project.pbxproj

@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		644C8E742542D24B0032763A /* UnityFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA062541318100AF1416 /* UnityFramework.framework */; };
-		644C8E752542D24B0032763A /* UnityFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA062541318100AF1416 /* UnityFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		644C8E872542DEAA0032763A /* UnityFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA062541318100AF1416 /* UnityFramework.framework */; };
+		644C8E882542DEAA0032763A /* UnityFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA062541318100AF1416 /* UnityFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		64E8CA10254132E300AF1416 /* BGKeychainTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 64E8CA0F254132E300AF1416 /* BGKeychainTool.m */; };
 		64E8CA16254133CF00AF1416 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA15254133CF00AF1416 /* Foundation.framework */; };
 		6E42AF336D54EF2C5073BB5C /* Pods_GYDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 917ED4A8EF1F82D94F8A8E38 /* Pods_GYDemo.framework */; };
@@ -90,13 +90,13 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		644C8E762542D24B0032763A /* Embed Frameworks */ = {
+		644C8E892542DEAA0032763A /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				644C8E752542D24B0032763A /* UnityFramework.framework in Embed Frameworks */,
+				644C8E882542DEAA0032763A /* UnityFramework.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -999,7 +999,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 102;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
@@ -1031,7 +1031,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 102;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;

GYDemo/GYDemo.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>GYDemo.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

GYDemo/GYDemo/AppDelegate.mm

@@ -93,6 +93,7 @@ NSDictionary* appLaunchOpts;
 
 // 跳转每日福利
 - (void)ios_oneveryDayWelfareClick {
+    return;
     GYWebViewController * web = [[GYWebViewController alloc] init];
     web.url = [[CGUserManager shared].h5_url objectForKey:@"welfareurl"];
     UINavigationController * nav = [[UINavigationController alloc] initWithRootViewController:web];
@@ -111,6 +112,13 @@ NSDictionary* appLaunchOpts;
 
 // 跳转订单弹窗
 - (void)ios_jumpOrderDialog {
+    
+    NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
+    NSLog(@"isopenH5  = %@", status);
+    if ([status isEqualToString:@"0"]) {
+        return;
+    }
+    
     [[CGNetworkTools shared] getWithAction:getOrderInfo parameters:@{} success:^(id  _Nonnull response) {
         
         NSDictionary * orderDic = [[response objectForKey:@"result"] objectForKey:@"data"];
@@ -300,6 +308,13 @@ NSDictionary* appLaunchOpts;
 
 // 获取地块列表
 - (void)ios_getListLand {
+    
+    NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
+    NSLog(@"isopenH5  = %@", status);
+    if (status.length > 0) {
+        [[self ufw] sendMessageToGOWithName: "GameManager" functionName: "showMoreInfo" message: [status UTF8String]];
+    }
+    
     [[CGNetworkTools shared]  getWithAction: getPlaceList parameters: @{} success:^(id  _Nonnull response) {
         
         if ([[response objectForKey:@"status"] integerValue] == 200) {
@@ -311,13 +326,6 @@ NSDictionary* appLaunchOpts;
     } failure:^(NSError * _Nonnull error) {
         
     }];
-    
-    NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
-    NSLog(@"isopenH5  = %@", status);
-    if (status.length > 0) {
-        status = @"1";
-        [[self ufw] sendMessageToGOWithName: "GameManager" functionName: "showMoreInfo" message: [status UTF8String]];
-    }
 }
 
 // 解锁地块
@@ -607,7 +615,7 @@ NSDictionary* appLaunchOpts;
 - (void)onResp:(BaseResp *)resp{
     
     
-    [[CGNetworkTools shared] getWithAdsAction:<#(TQNetwortGetAction)#> parameters:<#(nonnull id)#> success:<#^(id  _Nonnull response)success#> failure:<#^(NSError * _Nonnull error)failure#>]
+//    [[CGNetworkTools shared] getWithAdsAction:<#(TQNetwortGetAction)#> parameters:<#(nonnull id)#> success:<#^(id  _Nonnull response)success#> failure:<#^(NSError * _Nonnull error)failure#>]
 }
      
 @end

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

@@ -94,10 +94,10 @@
             filePath = "GYDemo/GYDemo/AppDelegate.mm"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "608"
-            endingLineNumber = "608"
-            landmarkName = "-onResp:"
-            landmarkType = "7">
+            startingLineNumber = "598"
+            endingLineNumber = "598"
+            landmarkName = "AppDelegate"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

iOSFarm202008/MainApp/main.mm

@@ -23,7 +23,6 @@ int main(int argc, char* argv[])
     @autoreleasepool
     {
         id ufw = UnityFrameworkLoad();
-        [ufw setDataBundleId: "com.unity3d.framework"];
         [ufw runUIApplicationMainWithArgc: argc argv: argv];
         return 0;
     }

iOSFarm202008/Unity-iPhone.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>Unity-iPhone.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>UnityFramework.xcscheme_^#shared#^_</key>
 		<dict>