From ed455f94a044d907c9469cd36bde9acc3d503e82 Mon Sep 17 00:00:00 2001 From: atusi Date: Fri, 7 Jan 2022 11:22:05 +0900 Subject: [PATCH] fix AndroidBuild --- .../Plugins/Android/AndroidManifest.xml | 1 - popcorn/Assets/Plugins/Android/res.meta | 8 +++++ .../Assets/Plugins/Android/res/values-ja.meta | 8 +++++ .../Plugins/Android/res/values-ja/strings.xml | 4 +++ .../Android/res/values-ja/strings.xml.meta | 7 +++++ .../Assets/Plugins/Android/res/values.meta | 8 +++++ .../Plugins/Android/res/values/strings.xml | 4 +++ .../Android/res/values/strings.xml.meta | 7 +++++ .../Plugins/Android/res/values/version.xml | 4 +++ .../Android/res/values/version.xml.meta | 7 +++++ popcorn/Assets/Plugins/Android/res/xml.meta | 8 +++++ .../Plugins/Android/res/xml/file_paths.xml | 5 ++++ .../Android/res/xml/file_paths.xml.meta | 7 +++++ .../Resources/GameAnalytics/Settings.asset | 17 ++++++++--- .../ProjectSettings/GraphicsSettings.asset | 1 + .../ProjectSettings/GvhProjectSettings.xml | 1 - popcorn/ProjectSettings/ProjectSettings.asset | 29 +++++++++++++------ 17 files changed, 111 insertions(+), 15 deletions(-) create mode 100644 popcorn/Assets/Plugins/Android/res.meta create mode 100644 popcorn/Assets/Plugins/Android/res/values-ja.meta create mode 100644 popcorn/Assets/Plugins/Android/res/values-ja/strings.xml create mode 100644 popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta create mode 100644 popcorn/Assets/Plugins/Android/res/values.meta create mode 100644 popcorn/Assets/Plugins/Android/res/values/strings.xml create mode 100644 popcorn/Assets/Plugins/Android/res/values/strings.xml.meta create mode 100644 popcorn/Assets/Plugins/Android/res/values/version.xml create mode 100644 popcorn/Assets/Plugins/Android/res/values/version.xml.meta create mode 100644 popcorn/Assets/Plugins/Android/res/xml.meta create mode 100644 popcorn/Assets/Plugins/Android/res/xml/file_paths.xml create mode 100644 popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta diff --git a/popcorn/Assets/Plugins/Android/AndroidManifest.xml b/popcorn/Assets/Plugins/Android/AndroidManifest.xml index 0e0ae4a8..09fcd5f9 100644 --- a/popcorn/Assets/Plugins/Android/AndroidManifest.xml +++ b/popcorn/Assets/Plugins/Android/AndroidManifest.xml @@ -7,7 +7,6 @@ - + + ポップコーン + diff --git a/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta b/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta new file mode 100644 index 00000000..fe43f70c --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 00dc986b1e1fc4a1c996eb398f09435f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/values.meta b/popcorn/Assets/Plugins/Android/res/values.meta new file mode 100644 index 00000000..2da8c0bf --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/values.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0639bc78e2c742ad90bb7fd9209bffd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/values/strings.xml b/popcorn/Assets/Plugins/Android/res/values/strings.xml new file mode 100644 index 00000000..cb29e4d4 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Popcorn + diff --git a/popcorn/Assets/Plugins/Android/res/values/strings.xml.meta b/popcorn/Assets/Plugins/Android/res/values/strings.xml.meta new file mode 100644 index 00000000..6532f57c --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/values/strings.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ab92f99912824a619ebfd3d5d4ceb25 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/values/version.xml b/popcorn/Assets/Plugins/Android/res/values/version.xml new file mode 100644 index 00000000..f9d9be05 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/values/version.xml @@ -0,0 +1,4 @@ + + + 12451000 + \ No newline at end of file diff --git a/popcorn/Assets/Plugins/Android/res/values/version.xml.meta b/popcorn/Assets/Plugins/Android/res/values/version.xml.meta new file mode 100644 index 00000000..bb8bfcca --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/values/version.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8580f3463016e4f4c9801df8f4758dd6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/xml.meta b/popcorn/Assets/Plugins/Android/res/xml.meta new file mode 100644 index 00000000..d677757e --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/xml.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e91468763bc7644208d37eee8786052e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml b/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml new file mode 100644 index 00000000..7fd8bcf0 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta b/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta new file mode 100644 index 00000000..1491a7d6 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2dafba752bb9244e69cf0b59e5fc3b6f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Resources/GameAnalytics/Settings.asset b/popcorn/Assets/Resources/GameAnalytics/Settings.asset index 5e4b735b..de051c6f 100644 --- a/popcorn/Assets/Resources/GameAnalytics/Settings.asset +++ b/popcorn/Assets/Resources/GameAnalytics/Settings.asset @@ -32,8 +32,8 @@ MonoBehaviour: - d078eab3b8d4a6b44ccfb7d9258a8e0bddad1337 - 41e0f225a9f8751a3fc893cae6eb933df7d0214e Build: - - 0.1 - - 0.1 + - 1.0.1 + - 1.0.0 SelectedPlatformOrganization: - usaya - usaya @@ -47,8 +47,17 @@ MonoBehaviour: SelectedOrganization: 0300000003000000 SelectedStudio: 0100000001000000 SelectedGame: 0500000006000000 - NewVersion: - Changes: + NewVersion: 7.3.2 + Changes: '7.3.2 + + - fixed missing custom event fields for when trying to fix + missing session end events + + + 7.3.1 + + - fixed editor ui bug with games + with the same name' SignUpOpen: 1 StudioName: jp.usaya GameName: popcorn diff --git a/popcorn/ProjectSettings/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index 4654e133..71c9e0f5 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/popcorn/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/popcorn/ProjectSettings/GvhProjectSettings.xml b/popcorn/ProjectSettings/GvhProjectSettings.xml index eb60a0e6..652e3637 100644 --- a/popcorn/ProjectSettings/GvhProjectSettings.xml +++ b/popcorn/ProjectSettings/GvhProjectSettings.xml @@ -1,6 +1,5 @@  - diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 5cf9f8c3..4079370d 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -18,7 +18,7 @@ PlayerSettings: cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 0 m_SplashScreenLogoStyle: 0 @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -174,7 +174,7 @@ PlayerSettings: Android: jp.usaya.popcorn iPhone: jp.usaya.popcorn buildNumber: {} - AndroidBundleVersionCode: 1 + AndroidBundleVersionCode: 2 AndroidMinSdkVersion: 21 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 @@ -252,15 +252,15 @@ PlayerSettings: AndroidTargetArchitectures: 2 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: /Users/sutoatsushi/Develop/usaya/___apk_files/popcorn/key/popcorn.keystore + AndroidKeyaliasName: usaya AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 + androidUseCustomKeystore: 1 m_AndroidBanners: - width: 320 height: 180 @@ -749,11 +749,22 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 4: gameanalytics_ironsource_enabled - 7: gameanalytics_ironsource_enabled + 1: TextMeshPro + 4: gameanalytics_ironsource_enabled;TextMeshPro + 7: gameanalytics_ironsource_enabled;TextMeshPro + 13: TextMeshPro + 14: TextMeshPro + 19: TextMeshPro + 21: TextMeshPro + 25: TextMeshPro + 27: TextMeshPro + 28: TextMeshPro + 29: TextMeshPro + 30: TextMeshPro platformArchitecture: iPhone: 1 - scriptingBackend: {} + scriptingBackend: + Android: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {}