diff --git a/popcorn/Assets/Resources.meta b/popcorn/Assets/Resources.meta new file mode 100644 index 00000000..6f367190 --- /dev/null +++ b/popcorn/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 901a731cd3e594ec9962bf049bcc35e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Resources/GameAnalytics.meta b/popcorn/Assets/Resources/GameAnalytics.meta new file mode 100644 index 00000000..26f23013 --- /dev/null +++ b/popcorn/Assets/Resources/GameAnalytics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c89d13c4a8e34fb381e836c91652674 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Resources/GameAnalytics/Settings.asset b/popcorn/Assets/Resources/GameAnalytics/Settings.asset new file mode 100644 index 00000000..2ecdbb95 --- /dev/null +++ b/popcorn/Assets/Resources/GameAnalytics/Settings.asset @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f78192cec1344d83a177ac5e6139ab3, type: 3} + m_Name: Settings + m_EditorClassIdentifier: + TotalMessagesSubmitted: 0 + TotalMessagesFailed: 0 + DesignMessagesSubmitted: 0 + DesignMessagesFailed: 0 + QualityMessagesSubmitted: 0 + QualityMessagesFailed: 0 + ErrorMessagesSubmitted: 0 + ErrorMessagesFailed: 0 + BusinessMessagesSubmitted: 0 + BusinessMessagesFailed: 0 + UserMessagesSubmitted: 0 + UserMessagesFailed: 0 + CustomArea: + gameKey: + - c3c8c26af96bbd393d0423d5a9f99c11 + secretKey: + - d078eab3b8d4a6b44ccfb7d9258a8e0bddad1337 + Build: + - 0.1 + SelectedPlatformOrganization: + - usaya + SelectedPlatformStudio: + - usaya + SelectedPlatformGame: + - POPCORN + SelectedPlatformGameID: df9f0200 + SelectedOrganization: 03000000 + SelectedStudio: 01000000 + SelectedGame: 05000000 + NewVersion: + Changes: + SignUpOpen: 1 + StudioName: jp.usaya + GameName: popcorn + OrganizationName: + OrganizationIdentifier: + EmailGA: license-manager@usaya.jp + IntroScreen: 0 + InfoLogEditor: 1 + InfoLogBuild: 1 + VerboseLogBuild: 0 + UseManualSessionHandling: 0 + SendExampleGameDataToMyGame: 0 + UseIMEI: 0 + InternetConnectivity: 0 + CustomDimensions01: [] + CustomDimensions02: [] + CustomDimensions03: [] + ResourceItemTypes: [] + ResourceCurrencies: [] + LastCreatedGamePlatform: 0 + Platforms: 08000000 + CurrentInspectorState: 1 + ClosedHints: + DisplayHints: 0 + DisplayHintsScrollState: {x: 0, y: 0} + Logo: {fileID: 2800000, guid: 98df8f9c5678a4e5d964caa1244e8958, type: 3} + UpdateIcon: {fileID: 2800000, guid: 810bbb19deed24f3cb7b854f9bafde26, type: 3} + InfoIcon: {fileID: 2800000, guid: 1b4dd779aadd54ac88856975af0d3c0a, type: 3} + DeleteIcon: {fileID: 2800000, guid: 85a626f1668244d30a4e9f616991a793, type: 3} + GameIcon: {fileID: 2800000, guid: a9ac7103fc40b4e00923bf8c2cb5d30f, type: 3} + HomeIcon: {fileID: 2800000, guid: fe7e2ecc9b2fe447bafe90f6395d4709, type: 3} + InstrumentIcon: {fileID: 2800000, guid: 2ba470b4dffd848c6b267c34770cc63e, type: 3} + QuestionIcon: {fileID: 2800000, guid: f8ea67e311b0c4b2ea05718e90fd3b5b, type: 3} + UserIcon: {fileID: 2800000, guid: f49ef75333ff247cfb5dad4dab0d4dac, type: 3} + AmazonIcon: {fileID: 0} + GooglePlayIcon: {fileID: 0} + iosIcon: {fileID: 0} + macIcon: {fileID: 0} + windowsPhoneIcon: {fileID: 0} + UsePlayerSettingsBuildNumber: 0 + SubmitErrors: 1 + NativeErrorReporting: 0 + MaxErrorCount: 10 + SubmitFpsAverage: 1 + SubmitFpsCritical: 1 + IncludeGooglePlay: 1 + FpsCriticalThreshold: 20 + FpsCirticalSubmitInterval: 1 + PlatformFoldOut: 01 + CustomDimensions01FoldOut: 0 + CustomDimensions02FoldOut: 0 + CustomDimensions03FoldOut: 0 + ResourceItemTypesFoldOut: 0 + ResourceCurrenciesFoldOut: 0 diff --git a/popcorn/Assets/Resources/GameAnalytics/Settings.asset.meta b/popcorn/Assets/Resources/GameAnalytics/Settings.asset.meta new file mode 100644 index 00000000..430bb921 --- /dev/null +++ b/popcorn/Assets/Resources/GameAnalytics/Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef555f99300fb453c97e06d614b167c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Packages/manifest.json b/popcorn/Packages/manifest.json index f9b55c0b..5efb52aa 100644 --- a/popcorn/Packages/manifest.json +++ b/popcorn/Packages/manifest.json @@ -47,6 +47,7 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.xr": "1.0.0", + "com.gameanalytics.sdk": "https://github.com/GameAnalytics/GA-SDK-UNITY.git" } } diff --git a/popcorn/Packages/packages-lock.json b/popcorn/Packages/packages-lock.json index cc60c4bc..b171d15d 100644 --- a/popcorn/Packages/packages-lock.json +++ b/popcorn/Packages/packages-lock.json @@ -7,6 +7,13 @@ "dependencies": {}, "hash": "bba7df9616502051c4ab993077fb53316fd760a0" }, + "com.gameanalytics.sdk": { + "version": "https://github.com/GameAnalytics/GA-SDK-UNITY.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "53d5fd3564b1548cac3a1a6e499f75d455d7e5b3" + }, "com.unity.2d.animation": { "version": "3.2.6", "depth": 0, diff --git a/popcorn/ProjectSettings/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index ae52db95..4654e133 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/popcorn/ProjectSettings/GraphicsSettings.asset @@ -1,57 +1,62 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!30 &1 -GraphicsSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_Deferred: - m_Mode: 1 - m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} - m_DeferredReflections: - m_Mode: 1 - m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} - m_ScreenSpaceShadows: - m_Mode: 1 - m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} - m_DepthNormals: - m_Mode: 1 - m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} - m_MotionVectors: - m_Mode: 1 - m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} - m_LightHalo: - m_Mode: 1 - m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} - m_LensFlare: - m_Mode: 1 - m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} - m_AlwaysIncludedShaders: - - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} - m_CustomRenderPipeline: {fileID: 0} - m_TransparencySortMode: 0 - m_TransparencySortAxis: {x: 0, y: 0, z: 1} - m_DefaultRenderingPath: 1 - m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] - m_LightmapStripping: 0 - m_FogStripping: 0 - m_InstancingStripping: 0 - m_LightmapKeepPlain: 1 - m_LightmapKeepDirCombined: 1 - m_LightmapKeepDynamicPlain: 1 - m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepShadowMask: 1 - m_LightmapKeepSubtractive: 1 - m_FogKeepLinear: 1 - m_FogKeepExp: 1 - m_FogKeepExp2: 1 - m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_AlwaysIncludedShaders: + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] + m_LightmapStripping: 0 + m_FogStripping: 0 + m_InstancingStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 0e95b24a..3ae4f29c 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -547,7 +547,9 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLWasmStreaming: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + 4: gameanalytics_ironsource_enabled + 7: gameanalytics_ironsource_enabled platformArchitecture: iPhone: 1 scriptingBackend: {} diff --git a/popcorn/ProjectSettings/UnityConnectSettings.asset b/popcorn/ProjectSettings/UnityConnectSettings.asset index fa0b1465..584eee75 100644 --- a/popcorn/ProjectSettings/UnityConnectSettings.asset +++ b/popcorn/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events @@ -12,7 +12,7 @@ UnityConnectSettings: m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com - m_Enabled: 0 + m_Enabled: 1 m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: