Skip to content

L
LuckFarm
Commit 9f3f66af authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

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

parents 545d6cb4 c9031a77
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8116 additions and 7874 deletions
GYDemo/GYDemo.xcodeproj/project.pbxproj
View file @ 9f3f66af
......@@ -7,8 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
649496442541925A008F37C4 /* UnityFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA062541318100AF1416 /* UnityFramework.framework */; };
649496452541925A008F37C4 /* UnityFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 64E8CA062541318100AF1416 /* UnityFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
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, ); }; };
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 */; };
......@@ -86,13 +86,13 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
64949632254179AA008F37C4 /* Embed Frameworks */ = {
644C8E762542D24B0032763A /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
649496452541925A008F37C4 /* UnityFramework.framework in Embed Frameworks */,
644C8E752542D24B0032763A /* UnityFramework.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -212,7 +212,7 @@
files = (
6E42AF336D54EF2C5073BB5C /* Pods_GYDemo.framework in Frameworks */,
64E8CA16254133CF00AF1416 /* Foundation.framework in Frameworks */,
649496442541925A008F37C4 /* UnityFramework.framework in Frameworks */,
644C8E742542D24B0032763A /* UnityFramework.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -498,7 +498,7 @@
A91A7871253EE56B00F9B216 /* Frameworks */,
A91A7872253EE56B00F9B216 /* Resources */,
1A6A7A7F158855E12111551D /* [CP] Embed Pods Frameworks */,
64949632254179AA008F37C4 /* Embed Frameworks */,
644C8E762542D24B0032763A /* Embed Frameworks */,
);
buildRules = (
);
......
GYDemo/GYDemo.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 9f3f66af
......@@ -7,7 +7,7 @@
<key>GYDemo.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>6</integer>
</dict>
</dict>
</dict>
......
GYDemo/GYDemo/AppDelegate.mm
View file @ 9f3f66af
......@@ -248,6 +248,7 @@ NSDictionary* appLaunchOpts;
// 云朵加速
- (void)ios_getCloudSpeed {
[[CGNetworkTools shared] postWithAction:CloudSpeedUp parameters:@{} success:^(id _Nonnull response) {
if ([[response objectForKey:@"status"] integerValue] == 200) {
NSData *data = [NSJSONSerialization dataWithJSONObject:[[response objectForKey:@"result"] objectForKey:@"data"] options:NSJSONWritingFragmentsAllowed error:nil];
......@@ -272,6 +273,12 @@ NSDictionary* appLaunchOpts;
} failure:^(NSError * _Nonnull error) {
}];
NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
NSLog(@"isopenH5 = %@", status);
if (status.length > 0) {
[[self ufw] sendMessageToGOWithName: "GameManager" functionName: "showMoreInfo" message: [status UTF8String]];
}
}
// 解锁地块
......@@ -433,12 +440,11 @@ NSDictionary* appLaunchOpts;
[self.window makeKeyAndVisible];
[ZJGuideConfig configWithWindow:self.window finishMainVC: nil showGuide:^(BOOL result) {
// dispatch_async(dispatch_get_global_queue(0, 0), ^{
dispatch_async(dispatch_get_main_queue(), ^{
[self initUnity];
[[[self ufw] appController].window makeKeyAndVisible];
});
// });
dispatch_async(dispatch_get_main_queue(), ^{
[self initUnity];
[[[self ufw] appController].window makeKeyAndVisible];
});
}];
return YES;
......@@ -463,13 +469,19 @@ NSDictionary* appLaunchOpts;
// set quit handler to change default behavior of exit app
[[self ufw] appController].quitHandler = ^(){ NSLog(@"AppController.quitHandler called"); };
}
- (void)applicationWillResignActive:(UIApplication *)application { [[[self ufw] appController] applicationWillResignActive: application]; }
- (void)applicationDidEnterBackground:(UIApplication *)application { [[[self ufw] appController] applicationDidEnterBackground: application]; }
- (void)applicationWillEnterForeground:(UIApplication *)application { [[[self ufw] appController] applicationWillEnterForeground: application]; }
- (void)applicationDidBecomeActive:(UIApplication *)application { [[[self ufw] appController] applicationDidBecomeActive: application]; }
- (void)applicationWillTerminate:(UIApplication *)application { [[[self ufw] appController] applicationWillTerminate: application]; }
- (void)applicationWillResignActive:(UIApplication *)application {
[[[self ufw] appController] applicationWillResignActive: application]; }
- (void)applicationDidEnterBackground:(UIApplication *)application {
[[[self ufw] appController] applicationDidEnterBackground: application]; }
- (void)applicationWillEnterForeground:(UIApplication *)application {
[[[self ufw] appController] applicationWillEnterForeground: application]; }
- (void)applicationDidBecomeActive:(UIApplication *)application {
[[[self ufw] appController] applicationDidBecomeActive: application]; }
- (void)applicationWillTerminate:(UIApplication *)application {
[[[self ufw] appController] applicationWillTerminate: application]; }
@end
GYDemo/GYDemo/Info.plist
View file @ 9f3f66af
......@@ -37,6 +37,8 @@
<array>
<string>armv7</string>
</array>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
......@@ -48,5 +50,7 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
</dict>
</plist>
GYDemo/Pods/Pods.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 9f3f66af
......@@ -9,35 +9,35 @@
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
<integer>0</integer>
</dict>
<key>MBProgressHUD.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
<integer>2</integer>
</dict>
<key>Masonry.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>3</integer>
<integer>1</integer>
</dict>
<key>Pods-GYDemo.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
<integer>3</integer>
</dict>
<key>SwiftyStoreKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>6</integer>
<integer>4</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
......
iOSFarm202008/Classes/Native/Il2CppCompilerCalculateTypeValuesTable.cpp
View file @ 9f3f66af
......@@ -1790,7 +1790,7 @@ IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2827[7];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2828[12];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2829[3];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2830[4];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2831[5];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2831[11];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2836[10];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2838[23];
IL2CPP_EXTERN_C_CONST int32_t g_FieldOffsetTable2839[5];
......
iOSFarm202008/Classes/Native/Il2CppGenericMethodDefinitions.c
View file @ 9f3f66af
......@@ -991,7 +991,7 @@ const Il2CppMethodSpec g_Il2CppMethodSpecTable[10287] =
{ 17260, 1, -1 } /* T TMPro.TMP_TextProcessingStack`1<System.Object>::CurrentItem() */,
{ 17261, 1, -1 } /* T TMPro.TMP_TextProcessingStack`1<System.Object>::PreviousItem() */,
{ 17335, -1, 1 } /* System.Int32 TMPro.TMPro_ExtensionMethods::FindInstanceID<System.Object>(System.Collections.Generic.List`1<T>,T) */,
{ 18036, -1, 1 } /* System.Boolean DG.Tweening.DOTweenAnimationExtensions::IsSameOrSubclassOf<System.Object>(UnityEngine.Component) */,
{ 18037, -1, 1 } /* System.Boolean DG.Tweening.DOTweenAnimationExtensions::IsSameOrSubclassOf<System.Object>(UnityEngine.Component) */,
{ 8498, 71, -1 } /* System.Void System.Collections.ObjectModel.ReadOnlyCollection`1<System.Exception>::.ctor(System.Collections.Generic.IList`1<T>) */,
{ 8800, 71, -1 } /* System.Void System.Collections.Generic.List`1<System.Exception>::.ctor(System.Collections.Generic.IEnumerable`1<T>) */,
{ 8800, 72, -1 } /* System.Void System.Collections.Generic.List`1<System.Runtime.ExceptionServices.ExceptionDispatchInfo>::.ctor(System.Collections.Generic.IEnumerable`1<T>) */,
iOSFarm202008/Classes/Native/Il2CppMetadataRegistration.c
View file @ 9f3f66af
......@@ -44,6 +44,6 @@ const Il2CppMetadataRegistration g_MetadataRegistration =
g_FieldOffsetTable,
2918,
g_Il2CppTypeDefinitionSizesTable,
10781,
10782,
g_MetadataUsages,
};
iOSFarm202008/Classes/Native/profile.json
View file @ 9f3f66af
This diff is collapsed.
iOSFarm202008/Info.plist
View file @ 9f3f66af
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDuration</key>
<false/>
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>IOSFarm2020</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen-iPhone</string>
<key>UILaunchStoryboardName~ipad</key>
<string>LaunchScreen-iPad</string>
<key>UILaunchStoryboardName~iphone</key>
<string>LaunchScreen-iPhone</string>
<key>UILaunchStoryboardName~ipod</key>
<string>LaunchScreen-iPhone</string>
<key>UIPrerenderedIcon</key>
<false/>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
<string>metal</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
<key>UIRequiresPersistentWiFi</key>
<false/>
<key>UIStatusBarHidden</key>
<true/>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleDefault</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
</array>
<key>UnityBuilder</key>
<string>12369893060913</string>
<key>UnityCloudProjectID</key>
<string></string>
<key>UnityCrashSubmissionURL</key>
<string></string>
<key>Unity_LoadingActivityIndicatorStyle</key>
<integer>-1</integer>
</dict>
<dict>
<key>CADisableMinimumFrameDuration</key>
<false />
<key>CFBundleAllowMixedLocalizations</key>
<true />
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>IOSFarm2020</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<key>LSRequiresIPhoneOS</key>
<true />
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true />
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen-iPhone</string>
<key>UILaunchStoryboardName~ipad</key>
<string>LaunchScreen-iPad</string>
<key>UILaunchStoryboardName~iphone</key>
<string>LaunchScreen-iPhone</string>
<key>UILaunchStoryboardName~ipod</key>
<string>LaunchScreen-iPhone</string>
<key>UIPrerenderedIcon</key>
<false />
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
<string>metal</string>
</array>
<key>UIRequiresFullScreen</key>
<true />
<key>UIRequiresPersistentWiFi</key>
<false />
<key>UIStatusBarHidden</key>
<true />
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleDefault</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
</array>
<key>Unity_LoadingActivityIndicatorStyle</key>
<integer>-1</integer>
<key>UnityBuilder</key>
<string>12369893060913</string>
<key>UnityCloudProjectID</key>
<string />
<key>UnityCrashSubmissionURL</key>
<string />
</dict>
</plist>
iOSFarm202008/LaunchScreen-iPhone.storyboard
View file @ 9f3f66af
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="UnityLaunchScreen-ViewController">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="UnityLaunchScreen-ViewController">
<device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
<dependencies>
<deployment version="4352" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<development version="9000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -38,6 +39,6 @@
</scene>
</scenes>
<resources>
<image name="LaunchScreen-iPhonePortrait.png" width="1" height="1"/>
<image name="LaunchScreen-iPhonePortrait.png" width="1242" height="2208"/>
</resources>
</document>
iOSFarm202008/Libraries/Plugins/iOS/NativeCallProxy.mm
View file @ 9f3f66af
......@@ -126,10 +126,7 @@ extern "C"{
// 仓库
void getWareHouseData(int tabId) {
NSLog(@"仓库");
// NSString * dateStr = @"[{\"id\":1,\"ownNum\":1},{\"id\":2,\"ownNum\":33},{\"id\":3,\"ownNum\":33}]";
// UnitySendMessage("ware_content", "unity_onHomeWareListResult", [dateStr UTF8String]);
[api ios_getWareHouseData:tabId];
}
......
iOSFarm202008/Unity-iPhone.xcodeproj/project.pbxproj
View file @ 9f3f66af
This source diff could not be displayed because it is too large. You can view the blob instead.
iOSFarm202008/Unity-iPhone.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted 100644 → 0
View file @ 545d6cb4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
iOSFarm202008/Unity-iPhone.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 9f3f66af
......@@ -7,12 +7,12 @@
<key>Unity-iPhone.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>5</integer>
</dict>
<key>UnityFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>7</integer>
</dict>
</dict>
</dict>
......
iOSFarm202008/Unity-iPhone.xcodeproj/xcuserdata/mingjinli.xcuserdatad/xcschemes/xcschememanagement.plist deleted 100644 → 0
View file @ 545d6cb4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Unity-iPhone.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>UnityFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
</dict>
</dict>
</plist>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment