diff --git a/DevelopmentUnityProject/Packages/manifest.json b/DevelopmentUnityProject/Packages/manifest.json index 4380f0d..5bca82c 100644 --- a/DevelopmentUnityProject/Packages/manifest.json +++ b/DevelopmentUnityProject/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.lupidan.unity-apptrackingtransparency": "file:../../com.lupidan.unity-apptrackingtransparency/", - "com.unity.ide.rider": "1.2.1", - "com.unity.ide.visualstudio": "2.0.8", - "com.unity.ide.vscode": "1.2.3", - "com.unity.test-framework": "1.1.24", - "com.unity.textmeshpro": "2.1.4", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.vscode": "1.2.5", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/DevelopmentUnityProject/Packages/packages-lock.json b/DevelopmentUnityProject/Packages/packages-lock.json index 38a0270..cf705d7 100644 --- a/DevelopmentUnityProject/Packages/packages-lock.json +++ b/DevelopmentUnityProject/Packages/packages-lock.json @@ -14,16 +14,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.2.1", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.8", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -32,14 +32,14 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.24", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -50,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.4", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -200,6 +200,18 @@ "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" } diff --git a/DevelopmentUnityProject/ProjectSettings/EditorBuildSettings.asset b/DevelopmentUnityProject/ProjectSettings/EditorBuildSettings.asset index 3005579..4d41615 100644 --- a/DevelopmentUnityProject/ProjectSettings/EditorBuildSettings.asset +++ b/DevelopmentUnityProject/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/RequestTrackingSample/RequestTrackingSampleScene.unity guid: 90da4b86c34484d6f8f32c1216e93eb9 m_configObjects: {} diff --git a/DevelopmentUnityProject/ProjectSettings/MemorySettings.asset b/DevelopmentUnityProject/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/DevelopmentUnityProject/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/DevelopmentUnityProject/ProjectSettings/ProjectSettings.asset b/DevelopmentUnityProject/ProjectSettings/ProjectSettings.asset index 204aae0..4e46282 100644 --- a/DevelopmentUnityProject/ProjectSettings/ProjectSettings.asset +++ b/DevelopmentUnityProject/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 24 productGUID: c814af67fc2884f0b81ece7f21845ab4 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,7 +48,10 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -66,6 +69,13 @@ PlayerSettings: androidRenderOutsideSafeArea: 0 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -113,11 +123,14 @@ PlayerSettings: switchNVNOtherPoolsGranularity: 16777216 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -132,46 +145,27 @@ PlayerSettings: 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 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: Standalone: com.Company.ProductName - buildNumber: {} + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -186,10 +180,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -223,10 +217,11 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -242,10 +237,20 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 5f34be1353de5cf4398729fda238591b templatePackageId: com.unity.template.2d@1.3.0 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' @@ -262,11 +267,204 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -301,8 +499,16 @@ PlayerSettings: m_GraphicsJobMode: 0 - m_BuildTarget: XboxOnePlayer m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AndroidPlayer + m_APIs: 0b00000008000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -313,6 +519,8 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -322,12 +530,16 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -345,6 +557,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -360,6 +573,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -375,6 +589,7 @@ PlayerSettings: 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} @@ -390,6 +605,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -399,7 +615,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -441,6 +656,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -451,7 +667,12 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -522,6 +743,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -542,19 +764,39 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -581,11 +823,13 @@ PlayerSettings: metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -604,6 +848,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -612,10 +857,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -630,11 +872,15 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 + virtualTexturingSupportEnabled: 0 diff --git a/DevelopmentUnityProject/ProjectSettings/ProjectVersion.txt b/DevelopmentUnityProject/ProjectSettings/ProjectVersion.txt index 3886c07..8386a05 100644 --- a/DevelopmentUnityProject/ProjectSettings/ProjectVersion.txt +++ b/DevelopmentUnityProject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.28f1 -m_EditorVersionWithRevision: 2019.4.28f1 (1381962e9d08) +m_EditorVersion: 2021.3.45f1 +m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) diff --git a/DevelopmentUnityProject/ProjectSettings/VersionControlSettings.asset b/DevelopmentUnityProject/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /dev/null +++ b/DevelopmentUnityProject/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%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 diff --git a/DevelopmentUnityProject/ProjectSettings/boot.config b/DevelopmentUnityProject/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29 diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef index 8363e86..512b721 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef +++ b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef @@ -1,17 +1,4 @@ { - "name": "AppTrackingTransparency.Editor", - "references": [ - "AppTrackingTransparency.Common" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file + "name": "Editor", + "references":[ "GUID:45ef1b2a737c943e7b09569e3d25a68a", "GUID:175dd095c0f0f443895ad89ef6d8b501" ] +} diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef.meta b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef.meta index ca93809..3eebfb7 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef.meta +++ b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparency.Editor.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 045f515ae0dc24cf39cf8337033ac566 +guid: 4bfdece46571b4bec8587a8b9bac7ffc AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorPrefs.cs.meta b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorPrefs.cs.meta deleted file mode 100644 index 808dccf..0000000 --- a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorPrefs.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 52b2ef3ff1b2438e83831b66f59a2f02 -timeCreated: 1617365787 \ No newline at end of file diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorTools.cs b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorTools.cs index 1c8d66f..d5361a6 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorTools.cs +++ b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorTools.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; using AppTrackingTransparency.Common; -using AppTrackingTransparency.Editor.Settings; +using AppTrackingTransparency.Common.Settings; using UnityEditor; using UnityEngine; diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyPostprocessBuild.cs b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyPostprocessBuild.cs index bc4d4ec..e681881 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyPostprocessBuild.cs +++ b/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyPostprocessBuild.cs @@ -1,5 +1,5 @@ using System.IO; -using AppTrackingTransparency.Editor.Settings; +using AppTrackingTransparency.Common.Settings; using UnityEditor; using UnityEditor.Build; using UnityEditor.Build.Reporting; diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparency.asmdef b/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparency.asmdef index 5825a7b..c0452e3 100644 --- a/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparency.asmdef +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparency.asmdef @@ -1,17 +1,4 @@ { - "name": "AppTrackingTransparency", - "references": [ - "AppTrackingTransparency.Common", - "AppTrackingTransparency.Editor", - "AppTrackingTransparency.Native" - ], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file + "name": "AppTrackingTransparency", + "references":[ "GUID:45ef1b2a737c943e7b09569e3d25a68a" ] +} diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparencyModule.cs b/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparencyModule.cs index ee2e865..76bda88 100644 --- a/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparencyModule.cs +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/AppTrackingTransparencyModule.cs @@ -1,9 +1,8 @@ +using AppTrackingTransparency.Common; #if UNITY_IOS || UNITY_TVOS #define PLATFORM_SUPPORTS_APPTRACKINGTRANSPARENCY #endif -using AppTrackingTransparency.Common; - namespace AppTrackingTransparency { public static class AppTrackingTransparencyModule @@ -24,7 +23,7 @@ public static IAppTrackingTransparencyManager CreateManager() { #if PLATFORM_SUPPORTS_APPTRACKINGTRANSPARENCY #if UNITY_EDITOR - return new Editor.EditorAppTrackingTransparencyManager(); + return new EditorAppTrackingTransparencyManager(); #else return new Native.NativeAppTrackingTransparencyManager(); #endif diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparency.Common.asmdef b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparency.Common.asmdef index 5b65a66..a98b59d 100644 --- a/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparency.Common.asmdef +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparency.Common.asmdef @@ -1,13 +1,4 @@ { - "name": "AppTrackingTransparency.Common", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file + "name": "AppTrackingTransparency.Common", + "references":[ "GUID:175dd095c0f0f443895ad89ef6d8b501" ] +} diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorPrefs.cs b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparencyEditorPrefs.cs similarity index 78% rename from com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorPrefs.cs rename to com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparencyEditorPrefs.cs index a7a20a4..b0e90cb 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/AppTrackingTransparencyEditorPrefs.cs +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparencyEditorPrefs.cs @@ -1,7 +1,6 @@ -using AppTrackingTransparency.Common; - -namespace AppTrackingTransparency.Editor +namespace AppTrackingTransparency.Common { +#if UNITY_EDITOR public static class AppTrackingTransparencyEditorPrefs { /// @@ -10,7 +9,10 @@ public static class AppTrackingTransparencyEditorPrefs internal const string AnonymousIdfa = "00000000-0000-0000-0000-000000000000"; private const string IdfaEditorPrefKey = "com.lupidan.unity-apptrackingtransparency.idfa"; - private const string AuthorizationStatusEditorPrefKey = "com.lupidan.unity-apptrackingtransparency.authorizationstatus"; + + private const string AuthorizationStatusEditorPrefKey = + "com.lupidan.unity-apptrackingtransparency.authorizationstatus"; + private const int DefaultAuthorizationStatus = (int)AppTrackingTransparencyAuthorizationStatus.NotDetermined; /// @@ -27,8 +29,9 @@ public static string Idfa /// public static AppTrackingTransparencyAuthorizationStatus AuthorizationStatus { - get => (AppTrackingTransparencyAuthorizationStatus) UnityEditor.EditorPrefs.GetInt(AuthorizationStatusEditorPrefKey, DefaultAuthorizationStatus); - set => UnityEditor.EditorPrefs.SetInt(AuthorizationStatusEditorPrefKey, (int) value); + get => (AppTrackingTransparencyAuthorizationStatus)UnityEditor.EditorPrefs.GetInt( + AuthorizationStatusEditorPrefKey, DefaultAuthorizationStatus); + set => UnityEditor.EditorPrefs.SetInt(AuthorizationStatusEditorPrefKey, (int)value); } /// @@ -40,4 +43,5 @@ public static void Clear() UnityEditor.EditorPrefs.DeleteKey(AuthorizationStatusEditorPrefKey); } } -} +#endif +} \ No newline at end of file diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparencyEditorPrefs.cs.meta b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparencyEditorPrefs.cs.meta new file mode 100644 index 0000000..6abf5b7 --- /dev/null +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/AppTrackingTransparencyEditorPrefs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 28491befce6ca4552980f89c2b6e7523 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/EditorAppTrackingTransparencyManager.cs b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/EditorAppTrackingTransparencyManager.cs similarity index 95% rename from com.lupidan.unity-apptrackingtransparency/Editor/EditorAppTrackingTransparencyManager.cs rename to com.lupidan.unity-apptrackingtransparency/Runtime/Common/EditorAppTrackingTransparencyManager.cs index 7104ef0..05a1973 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/EditorAppTrackingTransparencyManager.cs +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/EditorAppTrackingTransparencyManager.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Globalization; -using AppTrackingTransparency.Common; -using AppTrackingTransparency.Editor.Settings; +using AppTrackingTransparency.Common.Settings; using UnityEditor; using UnityEngine; -namespace AppTrackingTransparency.Editor +namespace AppTrackingTransparency.Common { + #if UNITY_EDITOR public class EditorAppTrackingTransparencyManager : IAppTrackingTransparencyManager { private readonly List _pendingCallbacks = new List(); @@ -63,4 +63,5 @@ private static string GetIdfa() : AppTrackingTransparencyEditorPrefs.AnonymousIdfa; } } + #endif } diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/EditorAppTrackingTransparencyManager.cs.meta b/com.lupidan.unity-apptrackingtransparency/Runtime/Common/EditorAppTrackingTransparencyManager.cs.meta similarity index 100% rename from com.lupidan.unity-apptrackingtransparency/Editor/EditorAppTrackingTransparencyManager.cs.meta rename to com.lupidan.unity-apptrackingtransparency/Runtime/Common/EditorAppTrackingTransparencyManager.cs.meta diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/Native/AppTrackingTransparency.Native.asmdef b/com.lupidan.unity-apptrackingtransparency/Runtime/Native/AppTrackingTransparency.Native.asmdef index f1b4cbd..1890d5e 100644 --- a/com.lupidan.unity-apptrackingtransparency/Runtime/Native/AppTrackingTransparency.Native.asmdef +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Native/AppTrackingTransparency.Native.asmdef @@ -1,19 +1,4 @@ { - "name": "AppTrackingTransparency.Native", - "references": [ - "AppTrackingTransparency.Common" - ], - "includePlatforms": [ - "Editor", - "iOS", - "tvOS" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": false, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file + "name": "AppTrackingTransparency.Native", + "references":[ "GUID:45ef1b2a737c943e7b09569e3d25a68a" ] +} diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/Native/NativeAppTrackingTransparencyManager.cs b/com.lupidan.unity-apptrackingtransparency/Runtime/Native/NativeAppTrackingTransparencyManager.cs index 03264e8..20d66ba 100644 --- a/com.lupidan.unity-apptrackingtransparency/Runtime/Native/NativeAppTrackingTransparencyManager.cs +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Native/NativeAppTrackingTransparencyManager.cs @@ -6,13 +6,21 @@ namespace AppTrackingTransparency.Native { public class NativeAppTrackingTransparencyManager : IAppTrackingTransparencyManager { - public string Idfa { get { return UnityEngine.iOS.Device.advertisingIdentifier; } } +#if UNITY_IOS + public string Idfa => UnityEngine.iOS.Device.advertisingIdentifier; +#else + public string Idfa => "00000000-0000-0000-0000-000000000000"; +#endif public AppTrackingTransparencyAuthorizationStatus TrackingAuthorizationStatus { get { +#if UNITY_IOS var rawAuthorizationStatus = PInvoke.AppTrackingTransparencyManager_GetTrackingAuthorizationStatus(); +#else + var rawAuthorizationStatus = 0U; +#endif return GetAuthorizationStatusFromUnsignedInteger(rawAuthorizationStatus); } } @@ -24,7 +32,9 @@ public void RequestTrackingAuthorization(Action callback if (!_isInitialized) { +#if UNITY_IOS PInvoke.AppTrackingTransparencyManager_SetRequestTrackingAuthorizationCallbackHandler( PInvoke.RequestTrackingAuthorizationCallbackHandler); +#endif _isInitialized = true; } @@ -123,6 +135,8 @@ public static void RequestTrackingAuthorizationCallbackHandler(uint requestId, u } } +#if UNITY_IOS + [System.Runtime.InteropServices.DllImport(DllName)] public static extern uint AppTrackingTransparencyManager_GetTrackingAuthorizationStatus(); @@ -131,6 +145,7 @@ public static void RequestTrackingAuthorizationCallbackHandler(uint requestId, u [System.Runtime.InteropServices.DllImport(DllName)] public static extern void AppTrackingTransparencyManager_RequestTrackingAuthorizationCallback(uint requestId); +#endif } } } diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/Settings.meta b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings.meta similarity index 100% rename from com.lupidan.unity-apptrackingtransparency/Editor/Settings.meta rename to com.lupidan.unity-apptrackingtransparency/Runtime/Settings.meta diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparency.Settings.asmdef b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparency.Settings.asmdef new file mode 100644 index 0000000..f31f4c9 --- /dev/null +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparency.Settings.asmdef @@ -0,0 +1,3 @@ +{ + "name": "AppTrackingTransparency.Settings" +} diff --git a/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparency.Settings.asmdef.meta b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparency.Settings.asmdef.meta new file mode 100644 index 0000000..5f1531a --- /dev/null +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparency.Settings.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 175dd095c0f0f443895ad89ef6d8b501 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettings.cs b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettings.cs similarity index 97% rename from com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettings.cs rename to com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettings.cs index cb8bd05..0e54b74 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettings.cs +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettings.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace AppTrackingTransparency.Editor.Settings +namespace AppTrackingTransparency.Common.Settings { [Serializable] public class AppTrackingTransparencySettings diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettings.cs.meta b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettings.cs.meta similarity index 100% rename from com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettings.cs.meta rename to com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettings.cs.meta diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettingsManager.cs b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettingsManager.cs similarity index 98% rename from com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettingsManager.cs rename to com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettingsManager.cs index 712a35e..8d644bb 100644 --- a/com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettingsManager.cs +++ b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettingsManager.cs @@ -1,7 +1,7 @@ using System.IO; using UnityEngine; -namespace AppTrackingTransparency.Editor.Settings +namespace AppTrackingTransparency.Common.Settings { public static class AppTrackingTransparencySettingsManager { diff --git a/com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettingsManager.cs.meta b/com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettingsManager.cs.meta similarity index 100% rename from com.lupidan.unity-apptrackingtransparency/Editor/Settings/AppTrackingTransparencySettingsManager.cs.meta rename to com.lupidan.unity-apptrackingtransparency/Runtime/Settings/AppTrackingTransparencySettingsManager.cs.meta