浏览代码

update for unity2020

/CloudFunction
siyao 2 年前
当前提交
018b98ff
共有 14 个文件被更改,包括 225 次插入76 次删除
  1. 3
      Assets/Plugins/Android/gradleTemplate.properties
  2. 7
      Assets/Plugins/Android/launcherTemplate.gradle
  3. 5
      Assets/Plugins/Android/mainTemplate.gradle
  4. 12
      Packages/manifest.json
  5. 49
      Packages/packages-lock.json
  6. 11
      ProjectSettings/EditorBuildSettings.asset
  7. 7
      ProjectSettings/PackageManagerSettings.asset
  8. 120
      ProjectSettings/ProjectSettings.asset
  9. 4
      ProjectSettings/ProjectVersion.txt
  10. 3
      ProjectSettings/UnityConnectSettings.asset
  11. 21
      ProjectSettings/AutoStreamingSettings.asset
  12. 8
      ProjectSettings/VersionControlSettings.asset
  13. 51
      UserSettings/EditorUserSettings.asset

3
Assets/Plugins/Android/gradleTemplate.properties


unityStreamingAssets=.unity3d**STREAMING_ASSETS**
android.enableR8=**MINIFY_WITH_R_EIGHT**

7
Assets/Plugins/Android/launcherTemplate.gradle


}
aaptOptions {
noCompress = ['.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**]
noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
}**SIGN**

useProguard **PROGUARD_DEBUG**
useProguard true
}**PACKAGING_OPTIONS****SPLITS**
}**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS**
**BUILT_APK_LOCATION**
bundle {
language {

5
Assets/Plugins/Android/mainTemplate.gradle


}
aaptOptions {
noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
}**REPOSITORIES****SOURCE_BUILD_SETUP**
}**REPOSITORIES**
**IL_CPP_BUILD_SETUP**
**SOURCE_BUILD_SETUP**
**EXTERNAL_SOURCES**

12
Packages/manifest.json


{
"dependencies": {
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.1",
"com.unity.test-framework": "1.1.16",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.14",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.11",
"com.unity.ide.vscode": "1.2.4",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

49
Packages/packages-lock.json


{
"dependencies": {
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
},
"version": "1.0.0",
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},

"version": "1.1.4",
"version": "2.0.7",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.ide.visualstudio": {
"version": "2.0.11",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.cn"
},
"version": "1.2.1",
"version": "1.2.4",
"depth": 0,
"source": "registry",
"dependencies": {},

"version": "1.1.16",
"version": "1.1.29",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ext.nunit": "1.0.6",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},

"version": "2.0.1",
"version": "3.0.6",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.timeline": {
"version": "1.2.14",
"version": "1.4.8",
"dependencies": {},
"dependencies": {
"com.unity.modules.director": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0"
},
"url": "https://packages.unity.cn"
},
"com.unity.ugui": {

"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}

11
ProjectSettings/EditorBuildSettings.asset


- enabled: 0
path: Assets/HuaweiServiceDemo/Scenes/HmsAppLinkingSampleScene.unity
guid: 2a06d635f4d86455aa7a945033ca787c
- enabled: 1
- enabled: 0
path: Assets/HuaweiServiceDemo/Scenes/HmsAppMessageSampleScene.unity
guid: b3476cb507ef74fc3ba3f5a751256fe8
- enabled: 0

- enabled: 0
path: Assets/HuaweiServiceDemo/Scenes/HmsCloudStorageTest.unity
guid: 3c3ce425b8c754f3fa91a9119e6f8cd7
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 0
path: Assets/HuaweiServiceDemo/HuaweiCloudDBDemo/Scenes/CloudDBSampleScene.unity
guid: 7d9d75ef041984bf7ab6194acbeb998f
- enabled: 1
path: Assets/HuaweiServiceDemo/HuaweiCloudFunctionDemo/Scenes/AGCCloudFunctionScene.unity
guid: b572b4b6e597f465fb89e6cf1e198b99
m_configObjects: {}

7
ProjectSettings/PackageManagerSettings.asset


m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_EnablePreviewPackages: 0
m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0
m_Registries:

m_Scopes: []
m_IsDefault: 1
m_Capabilities: 7
m_UserSelectedRegistryName:
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:

m_Url:
m_Scopes: []
m_IsDefault: 0
m_Capabilities: 0
m_Modified: 0
m_Name:
m_Url:

120
ProjectSettings/ProjectSettings.asset


--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 20
serializedVersion: 22
productGUID: 0aa8a7f8aa5fe4da491b4654cd4ce45d
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0

useOnDemandResources: 0
accelerometerFrequency: 60
companyName: huawei
productName: codelabpush.huawei
productName: agc.clouddb.demo
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}

m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1

androidRenderOutsideSafeArea: 1
androidUseSwappy: 0
androidBlitType: 0
androidResizableWindow: 0
androidDefaultWindowWidth: 1920
androidDefaultWindowHeight: 1080
androidMinimumWindowWidth: 400
androidMinimumWindowHeight: 300
androidFullscreenMode: 1
runInBackground: 1
runInBackground: 0
captureSingleScreen: 0
muteOtherAudioSources: 0
Prepare IOS For Recording: 0

submitAnalytics: 1
usePlayerLog: 1
autoStreaming: 0
useAnimationStreaming: 0
useFontStreaming: 0
autoStreamingId:
instantGameAppId:
bakeCollisionMeshes: 0
forceSingleInstance: 0
useFlipModelSwapchain: 1

stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
vulkanEnablePreTransform: 0
useSecurityBuild: 0
vulkanEnableCommandBufferRecycling: 1
m_SupportedAspectRatios:
4:3: 1
5:4: 1

xboxOneDisableKinectGpuReservation: 1
xboxOneEnable7thCore: 1
vrSettings:
cardboard:
depthFormat: 0
enableTransitionView: 0
daydream:
depthFormat: 0
useSustainedPerformanceMode: 0
enableVideoLayer: 0
useProtectedVideoMemory: 0
minimumSupportedHeadTracking: 0
maximumSupportedHeadTracking: 1
hololens:
depthFormat: 1
depthBufferSharingEnabled: 1
lumin:
depthFormat: 0
frameTiming: 2
enableGLCache: 0
glCacheMaxBlobSize: 524288
glCacheMaxFileSize: 8388608
oculus:
sharedDepthBuffer: 1
dashSupport: 1
lowOverheadMode: 0
protectedContext: 0
v2Signing: 1
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0

androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.huawei.codelabpush.huawei
buildNumber: {}
Android: com.huawei.agc.clouddb.demo
buildNumber:
Standalone: 0
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 28

StripUnusedMeshComponents: 1
VertexChannelCompressionMask: 4054
iPhoneSdkVersion: 988
iOSTargetOSVersionString: 10.0
iOSTargetOSVersionString: 11.0
tvOSTargetOSVersionString: 10.0
tvOSTargetOSVersionString: 11.0
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1

iOSLaunchScreeniPadFillPct: 100
iOSLaunchScreeniPadSize: 100
iOSLaunchScreeniPadCustomXibPath:
iOSUseLaunchScreenStoryboard: 0
iOSLaunchScreeniPadCustomStoryboardPath:
iOSDeviceRequirements: []
iOSURLSchemes: []
iOSBackgroundModes: 0

iOSRenderExtraFrameOnPause: 0
iosCopyPluginsCodeInsteadOfSymlink: 0
appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:

iOSRequireARKit: 0
iOSAutomaticallyDetectAndAddCapabilities: 1
appleEnableProMotion: 0
shaderPrecisionModel: 0
useCustomMainManifest: 1
useCustomLauncherManifest: 0
useCustomMainGradleTemplate: 1
useCustomLauncherGradleManifest: 1
useCustomBaseGradleTemplate: 1
useCustomGradlePropertiesTemplate: 1
useCustomProguardFile: 1
AndroidTargetDevices: 0
AndroidKeystoreName: /Users/siyao/git/hms/unity-hms_sdk/hmsDemo/hhms.keystore
AndroidKeystoreName: F:/code/unity-hms_sdk/hhms.keystore
AndroidKeyaliasName: hhms
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 0

height: 180
banner: {fileID: 0}
androidGamepadSupportLevel: 0
chromeosInputEmulation: 1
AndroidMinifyWithR8: 0
AndroidMinifyRelease: 0
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []

m_Kind: 1
m_SubKind:
m_BuildTargetBatching: []
m_BuildTargetEncrypting: []
m_BuildTargetSecurityBuild: []
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0

- m_BuildTarget: AndroidPlayer
m_APIs: 150000000b000000
m_Automatic: 0
- m_BuildTarget: iOSSupport
m_APIs: 10000000
m_Automatic: 1
m_BuildTargetVRSettings: []
openGLRequireES31: 0
openGLRequireES31AEP: 0

tvOS: 1
m_BuildTargetGroupLightmapEncodingQuality: []
m_BuildTargetGroupLightmapSettings: []
m_BuildTargetNormalMapEncoding: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1

cameraUsageDescription:
locationUsageDescription:
microphoneUsageDescription:
bluetoothUsageDescription:
switchNMETAOverride:
switchNetLibKey:
switchSocketMemoryPoolSize: 6144
switchSocketAllocatorPoolSize: 128

switchUseGOLDLinker: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchTitleNames_0:

switchTitleNames_12:
switchTitleNames_13:
switchTitleNames_14:
switchTitleNames_15:
switchPublisherNames_0:
switchPublisherNames_1:
switchPublisherNames_2:

switchPublisherNames_12:
switchPublisherNames_13:
switchPublisherNames_14:
switchPublisherNames_15:
switchIcons_0: {fileID: 0}
switchIcons_1: {fileID: 0}
switchIcons_2: {fileID: 0}

switchIcons_12: {fileID: 0}
switchIcons_13: {fileID: 0}
switchIcons_14: {fileID: 0}
switchIcons_15: {fileID: 0}
switchSmallIcons_0: {fileID: 0}
switchSmallIcons_1: {fileID: 0}
switchSmallIcons_2: {fileID: 0}

switchSmallIcons_12: {fileID: 0}
switchSmallIcons_13: {fileID: 0}
switchSmallIcons_14: {fileID: 0}
switchSmallIcons_15: {fileID: 0}
switchManualHTML:
switchAccessibleURLs:
switchLegalInformation:

switchSocketInitializeEnabled: 1
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0
switchUseMicroSleepForYield: 1
switchMicroSleepForYieldTime: 25
ps4NPAgeRating: 12
ps4NPTitleSecret:
ps4NPTrophyPackPath:

ps4videoRecordingFeaturesUsed: 0
ps4contentSearchFeaturesUsed: 0
ps4CompatibilityPS5: 0
ps4AllowPS5Detection: 0
ps4GPU800MHz: 1
ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: []

webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 1
webGLWasmArithmeticExceptions: 0
webGLWasmStreaming: 0
webGLDecompressionFallback: 0
additionalCompilerArguments: {}
suppressCommonWarnings: 1
useDeterministicCompilation: 1
useReferenceAssemblies: 1
enableRoslynAnalyzers: 1
assemblyVersionValidation: 1
metroPackageName: Template_2D
metroPackageVersion:
metroPackageName: Template2D
metroPackageVersion: 1.0.0.0
metroCertificatePath:
metroCertificatePassword:
metroCertificateSubject:

wsaImages: {}
metroTileShortName:
metroTileShortName: codelabpush.huawei
metroTileShowName: 0
metroMediumTileShowName: 0
metroLargeTileShowName: 0

XboxOneCapability: []
XboxOneGameRating: {}
XboxOneIsContentPackage: 0
XboxOneEnhancedXboxCompatibilityMode: 0
XboxOneEnableGPUVariability: 1
XboxOneSockets: {}
XboxOneSplashScreen: {fileID: 0}

XboxOneOverrideIdentityName:
XboxOneOverrideIdentityPublisher:
vrEditorSettings:
daydream:
daydreamIconForeground: {fileID: 0}
daydreamIconBackground: {fileID: 0}
vrEditorSettings: {}
cloudServicesEnabled:
UNet: 1
luminIcon:

m_VersionCode: 1
m_VersionName:
apiCompatibilityLevel: 6
activeInputHandler: 0
qualitySettingsNames: []
enableNativePlatformBackendsForNewInputSystem: 0
disableOldInputManagerSupport: 0
virtualTexturingSupportEnabled: 0

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.4.10f1
m_EditorVersionWithRevision: 2019.4.10f1 (9b222ea32f23)
m_EditorVersion: 2020.3.22f1c1
m_EditorVersionWithRevision: 2020.3.22f1c1 (9ee66e5289da)

3
ProjectSettings/UnityConnectSettings.asset


m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
m_ConfigUrl: https://config.uca.cloud.unity3d.com
m_DashboardUrl: https://dashboard.unity3d.com
m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
m_CNConfigUrl: https://cdp.cloud.unity.cn/config
m_TestInitMode: 0
CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com

21
ProjectSettings/AutoStreamingSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1200 &1
AutoStreamingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
mSearchMode: 15
mCustomSearchFile:
mTextureSearchString:
mMeshSearchString:
mTextures: []
mAudios: []
mMeshes: []
mScenes: []
mConfigCCD:
useCCD: 0
cosKey:
projectGuid:
bucketUuid:
bucketName:
badgeName:

8
ProjectSettings/VersionControlSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!890905787 &1
VersionControlSettings:
m_ObjectHideFlags: 0
m_Mode: Visible Meta Files
m_CollabEditorSettings:
inProgressEnabled: 1

51
UserSettings/EditorUserSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25c4e2292c3d3e0be13b373f0c2ffe0f3a08f3050f450400f41a08
flags: 0
RecentlyUsedScenePath-1:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25c5e8393e28300de10f05331133f7390a0ef80e441e1f07e917
flags: 0
RecentlyUsedScenePath-2:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25cee6373a0f3c10f935073b253aff05471ef8021e12
flags: 0
RecentlyUsedScenePath-3:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25caf53b2c340a03e22c083b323cf7040c45e305031f08
flags: 0
RecentlyUsedScenePath-4:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25caeb352a380a16e02e0539040bf7191d45e305031f08
flags: 0
RecentlyUsedScenePath-5:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25c8f72a12392a11ee3b010d0032e2060c38f50e040e5f1bf30705e6
flags: 0
RecentlyUsedScenePath-6:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25c8f72a13353709e632030d0032e2060c38f50e040e5f1bf30705e6
flags: 0
RecentlyUsedScenePath-7:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f621a1e36ece52777caea25c8e93b33252d0bec0f05331133f7390a0ef80e441e1f07e917
flags: 0
RecentlyUsedScenePath-8:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f62010832f5e53d1beee823edc3181b39340da00f073b0f3ae1452a07f91e0e2f333dfc0301f3152012c016c054dd1115df00
flags: 0
RecentlyUsedScenePath-9:
value: 2242470311464673180f1b2719105a02001e1b2f082d2b3f62010832f5e53d1beee823edc12f313f2d0be032203b0c30bd390a0ef80e19443029de2d1df0051737d016c60ec11012f81a19c0c853c4eddcc2cd
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 0
正在加载...
取消
保存