Skip to content

L
LuckFarm
Commit a57c5cb4 authored by Mazy's avatar Mazy
Browse files
Options

merge code

parent 8ce70344
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 20 deletions
GYDemo/GYDemo.xcodeproj/project.pbxproj
View file @ a57c5cb4
......@@ -7,8 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
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, ); }; };
6459A98E2549165C004EA240 /* UnityFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6459A98D2549165C004EA240 /* UnityFramework.framework */; };
6459A98F2549165C004EA240 /* UnityFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6459A98D2549165C004EA240 /* 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 */
644C8E892542DEAA0032763A /* Embed Frameworks */ = {
6459A9902549165C004EA240 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
644C8E882542DEAA0032763A /* UnityFramework.framework in Embed Frameworks */,
6459A98F2549165C004EA240 /* UnityFramework.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -105,6 +105,7 @@
/* Begin PBXFileReference section */
033C10D1CFA56FEA0D33753E /* Pods-GYDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GYDemo.release.xcconfig"; path = "Target Support Files/Pods-GYDemo/Pods-GYDemo.release.xcconfig"; sourceTree = "<group>"; };
6459A98D2549165C004EA240 /* UnityFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UnityFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
64E8CA062541318100AF1416 /* UnityFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UnityFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
64E8CA0E254132E300AF1416 /* BGKeychainTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BGKeychainTool.h; sourceTree = "<group>"; };
64E8CA0F254132E300AF1416 /* BGKeychainTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BGKeychainTool.m; sourceTree = "<group>"; };
......@@ -248,8 +249,8 @@
files = (
6E42AF336D54EF2C5073BB5C /* Pods_GYDemo.framework in Frameworks */,
64E8CA16254133CF00AF1416 /* Foundation.framework in Frameworks */,
644C8E742542D24B0032763A /* UnityFramework.framework in Frameworks */,
A9F5CF8E2546C74C0035F17B /* libGDTMobSDK.a in Frameworks */,
6459A98E2549165C004EA240 /* UnityFramework.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -273,6 +274,7 @@
A3BE8AD6E326D640425E6E5A /* Frameworks */ = {
isa = PBXGroup;
children = (
6459A98D2549165C004EA240 /* UnityFramework.framework */,
64E8CA15254133CF00AF1416 /* Foundation.framework */,
64E8CA062541318100AF1416 /* UnityFramework.framework */,
917ED4A8EF1F82D94F8A8E38 /* Pods_GYDemo.framework */,
......@@ -575,8 +577,8 @@
A91A7871253EE56B00F9B216 /* Frameworks */,
A91A7872253EE56B00F9B216 /* Resources */,
1A6A7A7F158855E12111551D /* [CP] Embed Pods Frameworks */,
644C8E762542D24B0032763A /* Embed Frameworks */,
2A1BD8C188A878DAEA17EDEE /* [CP] Copy Pods Resources */,
6459A9902549165C004EA240 /* Embed Frameworks */,
);
buildRules = (
);
......
GYDemo/GYDemo.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ a57c5cb4
......@@ -7,7 +7,7 @@
<key>GYDemo.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>6</integer>
</dict>
</dict>
</dict>
......
GYDemo/Pods/Pods.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ a57c5cb4
......@@ -11,6 +11,16 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>Bytedance-UnionAD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>KSAdSDK.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>MBProgressHUD.xcscheme</key>
<dict>
<key>isShown</key>
......@@ -39,6 +49,11 @@
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>WechatOpenSDK.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict/>
......
iOSFarm202008/Unity-iPhone.xcodeproj/project.pbxproj
View file @ a57c5cb4
......@@ -304,7 +304,7 @@
1CD04973ADF63AADB2624A9B /* Il2CppGenericMethodDefinitions.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = Il2CppGenericMethodDefinitions.c; path = Classes/Native/Il2CppGenericMethodDefinitions.c; sourceTree = SOURCE_ROOT; };
1CF240FCB0A675A211339FE0 /* UnityEngine.GridModule_CodeGen.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = UnityEngine.GridModule_CodeGen.c; path = Classes/Native/UnityEngine.GridModule_CodeGen.c; 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 = dressup.app; sourceTree = BUILT_PRODUCTS_DIR; };
1D6058910D05DD3D006BFB54 /* dressup.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dressup.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DA84D8BA4D888F429D537C8 /* UnityEngine.AudioModule_CodeGen.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = UnityEngine.AudioModule_CodeGen.c; path = Classes/Native/UnityEngine.AudioModule_CodeGen.c; sourceTree = SOURCE_ROOT; };
1EC640BC8651DD1B3729ADFF /* Generics11.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Generics11.cpp; path = Classes/Native/Generics11.cpp; sourceTree = SOURCE_ROOT; };
201B40AFAD69FCA7851BCCF6 /* UnityEngine.AndroidJNIModule.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnityEngine.AndroidJNIModule.cpp; path = Classes/Native/UnityEngine.AndroidJNIModule.cpp; sourceTree = SOURCE_ROOT; };
......@@ -620,7 +620,7 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */,
1D6058910D05DD3D006BFB54 /* dressup.app */,
5623C57317FDCB0800090B9E /* Unity-iPhone Tests.xctest */,
9D25AB9D213FB47800354C27 /* UnityFramework.framework */,
);
......@@ -1044,7 +1044,7 @@
);
name = "Unity-iPhone";
productName = "iPhone-target";
productReference = 1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */;
productReference = 1D6058910D05DD3D006BFB54 /* dressup.app */;
productType = "com.apple.product-type.application";
};
5623C57217FDCB0800090B9E /* Unity-iPhone Tests */ = {
......@@ -1092,7 +1092,8 @@
attributes = {
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
ProvisioningStyle = Automatic;
DevelopmentTeam = 6RN3R6H9YU;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.GameControllers.appletvos = {
enabled = 1;
......@@ -1429,8 +1430,9 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 6RN3R6H9YU;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_OPTIMIZATION_LEVEL = 0;
......@@ -1452,7 +1454,7 @@
PRODUCT_NAME = "$(PRODUCT_NAME_APP)";
PROVISIONING_PROFILE = "$(PROVISIONING_PROFILE_APP)";
PROVISIONING_PROFILE_APP = "";
PROVISIONING_PROFILE_SPECIFIER = "$(PROVISIONING_PROFILE_SPECIFIER_APP)";
PROVISIONING_PROFILE_SPECIFIER = dress_dev;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -1473,8 +1475,9 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 6RN3R6H9YU;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
......@@ -1493,7 +1496,7 @@
PRODUCT_NAME = "$(PRODUCT_NAME_APP)";
PROVISIONING_PROFILE = "$(PROVISIONING_PROFILE_APP)";
PROVISIONING_PROFILE_APP = "";
PROVISIONING_PROFILE_SPECIFIER = "$(PROVISIONING_PROFILE_SPECIFIER_APP)";
PROVISIONING_PROFILE_SPECIFIER = dress_dev;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -1632,9 +1635,10 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 6RN3R6H9YU;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
......@@ -1653,7 +1657,7 @@
PRODUCT_NAME = "$(PRODUCT_NAME_APP)";
PROVISIONING_PROFILE = "$(PROVISIONING_PROFILE_APP)";
PROVISIONING_PROFILE_APP = "";
PROVISIONING_PROFILE_SPECIFIER = "$(PROVISIONING_PROFILE_SPECIFIER_APP)";
PROVISIONING_PROFILE_SPECIFIER = dress_dev;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -1740,8 +1744,9 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 6RN3R6H9YU;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
......@@ -1760,7 +1765,7 @@
PRODUCT_NAME = "$(PRODUCT_NAME_APP)";
PROVISIONING_PROFILE = "$(PROVISIONING_PROFILE_APP)";
PROVISIONING_PROFILE_APP = "";
PROVISIONING_PROFILE_SPECIFIER = "$(PROVISIONING_PROFILE_SPECIFIER_APP)";
PROVISIONING_PROFILE_SPECIFIER = dress_dev;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
......
iOSFarm202008/Unity-iPhone.xcodeproj/xcuserdata/mazy.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ a57c5cb4
......@@ -12,7 +12,7 @@
<key>UnityFramework.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
<integer>9</integer>
</dict>
</dict>
</dict>
......
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