fix release build 1.1.1

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 272cb4e750c31440692b918cf38d9c6f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.mdb.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 65dd5cb1c5774b1cbf72bcc2214ea924
+labels:
+- gvh
+- gvh_rename_to_disable
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.mdb
+- gvhp_targets-editor
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.meta

@@ -0,0 +1,38 @@
+fileFormatVersion: 2
+guid: e2b1894e7d784825bf9719c33331fae8
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll
+- gvhp_targets-editor
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.mdb.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 1f4515f9bdc74ab7be520e59a52eba96
+labels:
+- gvh
+- gvh_rename_to_disable
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.mdb
+- gvhp_targets-editor
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.meta

@@ -0,0 +1,38 @@
+fileFormatVersion: 2
+guid: 2730c87d98d4480884d11cfb29ff72cb
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll
+- gvhp_targets-editor
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.mdb.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: b257c5dd89c04aa6a1004c7a19e936fb
+labels:
+- gvh
+- gvh_rename_to_disable
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.mdb
+- gvhp_targets-editor
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.meta

@@ -0,0 +1,38 @@
+fileFormatVersion: 2
+guid: 3ed19a202c4b4b439183dc00efee3c4a
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll
+- gvhp_targets-editor
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.mdb.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 43f0f02ca8484767ae5cec73d99ce49c
+labels:
+- gvh
+- gvh_rename_to_disable
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.mdb
+- gvhp_targets-editor
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.meta

@@ -0,0 +1,38 @@
+fileFormatVersion: 2
+guid: 14338063180a4626be53643cb2ab5d69
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll
+- gvhp_targets-editor
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/CHANGELOG.md

@@ -1,3 +1,40 @@
+# Version 1.2.169 - Jan 20, 2021
+* General - Fixes #425 - Change to save `GvhProjectSettings.xml` without
+  Unicode byte order mark (BoM).
+* Android Resolver - Remove reference to `jcenter()`
+* iOS Resolver - Force setting `LANG` when executing Cocoapods in shell mode on
+  Mac.
+
+# Version 1.2.168 - Dec 9, 2021
+* All - Fixes #472 by removing the use of `System.Diagnostics.Debug.Assert`
+* All - Fixed #477 by properly enabling EDM4U libraries for Unity 2021.2+ when
+  the package is installed through `.tgz`
+
+# Version 1.2.167 - Oct 6, 2021
+* All - Moved versioned `.dll` in EDM4U to a versioned folder and remove their
+  version postfix in their filename. For instance, `IOSResolver.dll` will be
+  placed at `ExternalDependencyManager/Editor/1.2.167/Google.IOSResolver.dll`.
+* Android Resolver - Fixed #243 by only using the highest version in
+  `mainTemplate.gradle` when duplicated dependencies are presented.
+* Android Resolver - Added supports to x86_64 to ABI list for Android apps on
+  Chrome OS.
+
+# Version 1.2.166 - Jun 30, 2021
+* All - Fixed #440 and fixed #447 by specifying the parameter type while calling
+  `GetApplicationIdentifier()` Unity API using reflection, due to a new
+  overloaded method introduced in Unity 2021.2.
+* Android Resolver - Fixed #442 by patching `Dependency.IsGreater()` when the
+  version strings end '+'.
+
+# Version 1.2.165 - Apr 28, 2021
+## Bug Fixes
+* Version Handler - Fixed #431 by replacing the use of `HttpUtility.UrlEncode()`
+  which causes NullReferenceException in certain version of Unity.
+* Android Resolver - Check that androidSdkRootPath directory exists before using
+  as sdkPath.
+* Android Resolver - Fixed Android Resolver integration tests with Unity
+  2019.3+.
+
 # Version 1.2.164 - Feb 4, 2021
 ## New Features
 * Android Resolver - Added support for Android packages with classifier in their

popcorn/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta

@@ -1,7 +1,12 @@
 fileFormatVersion: 2
-guid: 39dd59b7c002145379fd263f890f693f
+guid: deafbeef1ed04f639e3195087b6d2e9f
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md
+timeCreated: 1584567712
+licenseType: Pro
 TextScriptImporter:
-  externalObjects: {}
+  userData:
-  userData: 
+  assetBundleName:
-  assetBundleName: 
+  assetBundleVariant:
-  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a70a07fc09d84c579086381e5f2f0327
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
+timeCreated: 1538009133
+licenseType: Pro
+DefaultImporter:
+  userData:
+  assetBundleName:
+  assetBundleVariant:

popcorn/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta

@@ -1,18 +1,21 @@
 fileFormatVersion: 2
-guid: 592cfd036a2c941f9ad2da0e1eb567ba
+guid: 17e39196248d458daa69b514bc09b6a7
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll
+- gvhp_targets-editor
+timeCreated: 1480838400
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
   isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
   - first:
-      Any: 
+      Any:
     second:
       enabled: 0
       settings: {}
@@ -28,6 +31,6 @@ PluginImporter:
       enabled: 0
       settings:
         CPU: AnyCPU
-  userData: 
+  userData:
-  assetBundleName: 
+  assetBundleName:
-  assetBundleVariant: 
+  assetBundleVariant:

popcorn/Assets/ExternalDependencyManager/Editor/LICENSE.meta

@@ -1,7 +1,12 @@
 fileFormatVersion: 2
-guid: 807495fed00f447198f5a6bc6a416c69
+guid: 61e923e8fff245a9bf5cfcf0774e75df
-DefaultImporter:
+labels:
-  externalObjects: {}
+- gvh
-  userData: 
+- gvh_version-1.2.169
-  assetBundleName: 
+- gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE
-  assetBundleVariant: 
+timeCreated: 1584567712
+licenseType: Pro
+TextScriptImporter:
+  userData:
+  assetBundleName:
+  assetBundleVariant:

popcorn/Assets/ExternalDependencyManager/Editor/README.md.meta

@@ -1,7 +1,12 @@
 fileFormatVersion: 2
-guid: 046625c64f6614014b29265dc01461c1
+guid: 57b5c3f72b65480eba2cc96380835972
+labels:
+- gvh
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/README.md
+timeCreated: 1584567712
+licenseType: Pro
 TextScriptImporter:
-  externalObjects: {}
+  userData:
-  userData: 
+  assetBundleName:
-  assetBundleName: 
+  assetBundleVariant:
-  assetBundleVariant: 

popcorn/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt

@@ -0,0 +1,13 @@
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.mdb
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.mdb
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.mdb
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll
+Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.mdb
+Assets/ExternalDependencyManager/Editor/CHANGELOG.md
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
+Assets/ExternalDependencyManager/Editor/LICENSE
+Assets/ExternalDependencyManager/Editor/README.md

popcorn/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt.meta

@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: f0ebd68c0b4541ada7e16bfce4ef4155
+labels:
+- gvh
+- gvh_manifest
+- gvh_version-1.2.169
+- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt
+- gvhp_manifestname-0External Dependency Manager
+- gvhp_manifestname-play-services-resolver
+timeCreated: 1474401009
+licenseType: Pro
+TextScriptImporter:
+  userData:
+  assetBundleName:
+  assetBundleVariant:

popcorn/Assets/GameAnalytics/Editor/Android.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f4ee4210c9704d2a9a6b650fefc3a07
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/GameAnalytics/Editor/Android/Dependencies.xml

@@ -0,0 +1,6 @@
+<dependencies>
+    <androidPackages>
+        <androidPackage spec="com.google.android.instantapps:instantapps:1.1.0"/>
+        <androidPackage spec="com.google.android.gms:play-services-appset:16.0.2"/>
+    </androidPackages>
+</dependencies>

popcorn/Assets/GameAnalytics/Editor/Android/Dependencies.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f4d3591460e6344cca6fe66ecbde645f
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/GameAnalytics/Plugins/Scripts/Setup/Settings.cs

@@ -53,7 +53,7 @@ namespace GameAnalyticsSDK.Setup
         /// The version of the GA Unity Wrapper plugin
         /// </summary>
         [HideInInspector]
-        public static string VERSION = "7.3.20";
+        public static string VERSION = "7.3.23";
 
         [HideInInspector]
         public static bool CheckingForUpdates = false;

popcorn/Assets/GameAnalytics/Plugins/Scripts/Utilities/GA_MiniJson.cs

@@ -4,6 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Globalization;
 
 namespace GameAnalyticsSDK.Utilities
 {
@@ -534,7 +535,7 @@ namespace GameAnalyticsSDK.Utilities
                             else
                             {
                                 builder.Append("\\u");
-                                builder.Append(codepoint.ToString("x4"));
+                                builder.Append(codepoint.ToString("x4", CultureInfo.InvariantCulture));
                             }
                             break;
                     }
@@ -550,7 +551,7 @@ namespace GameAnalyticsSDK.Utilities
                 // Previously floats and doubles lost precision too.
                 if (value is float)
                 {
-                    builder.Append(((float)value).ToString("R"));
+                    builder.Append(((float)value).ToString("R", CultureInfo.InvariantCulture));
                 }
                 else if (value is int
                   || value is uint
@@ -566,7 +567,7 @@ namespace GameAnalyticsSDK.Utilities
                 else if (value is double
                   || value is decimal)
                 {
-                    builder.Append(Convert.ToDouble(value).ToString("R"));
+                    builder.Append(Convert.ToDouble(value).ToString("R", CultureInfo.InvariantCulture));
                 }
                 else
                 {

popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs

@@ -98,7 +98,7 @@ public class ShopLevelUp : MonoBehaviour
         // 進捗計測
         var progress = "level_" + String.Format("{0:00}", shopLevel);
         TimeSpan interval = DateTime.UtcNow - DateTime.FromBinary(GameDataManager.GameData.beginPlayTime);
-        GameAnalytics.NewProgressionEvent(GAProgressionStatus.Complete, progress, interval.TotalMinutes);
+        GameAnalytics.NewProgressionEvent(GAProgressionStatus.Complete, progress, (int)interval.TotalMinutes);
 #endif        
     }
 

popcorn/Assets/Resources/GameAnalytics/Settings.asset

@@ -32,8 +32,8 @@ MonoBehaviour:
   - d078eab3b8d4a6b44ccfb7d9258a8e0bddad1337
   - 41e0f225a9f8751a3fc893cae6eb933df7d0214e
   Build:
-  - 1.1.0
+  - 1.1.1
-  - 1.1.0
+  - 1.1.1
   SelectedPlatformOrganization:
   - usaya
   - usaya
@@ -47,121 +47,23 @@ MonoBehaviour:
   SelectedOrganization: 0300000003000000
   SelectedStudio: 0100000001000000
   SelectedGame: 0500000006000000
-  NewVersion: 7.3.17
+  NewVersion: 7.3.23
-  Changes: '7.3.19
+  Changes: '7.3.23
 
-    - updated dependencies
+    - fixed bug with custom fields (locale related bug)
 
 
-    7.3.18
+    7.3.22
-
-    - fixed fps event
-    script to still run coroutines when Time.timeScale = 0 by using WaitForSecondsRealtime
-    instead of WaitForSeconds
-
-
-    7.3.17
-
-    - added method manually update gamekey
-    and secretkey
-
-
-    7.3.16
-
-    - fixed uwp build errors
-
-
-    7.3.15
 
     -
-    changed frequency logic for fps events
+    added external dependency manager for .unitypackage release as well to solve
+    issues with appset id on android
 
 
-    7.3.14
+    7.3.21
 
-    - small fix
+    - fixed bug in internal error
-
+    reporting'
-
-    7.3.13
-
-    -
-    fixed crash for android builds
-
-
-    7.3.12
-
-    - removed imei identifiers and
-    other alternative identifiers from user identifier logic (android)
-
-
-    7.3.11
-
-    -
-    updated dependency to external dependency resolver
-
-
-    7.3.10
-
-    - adding
-    missing .meta file for upm release
-
-    - switched to using openupm for scoped
-    registry when using upm, please update the upm setup for the unity sdk
-
-
-    7.3.9
-
-    -
-    fixed upm package.json
-
-
-    7.3.8
-
-    - fixed upm dependecy
-
-
-    7.3.7
-
-    -
-    added depedencies.xml for upm release
-
-
-    7.3.6
-
-    - fixed playmaker bugs
-
-
-    7.3.5
-
-    -
-    changed settings to have FPS events turned off by default
-
-
-    7.3.4
-
-    -
-    added error events to be sent for invalid custom event fields used
-
-    - added
-    optional mergeFields argument to event methods to merge with global custom fields
-    instead of overwrite them
-
-
-    7.3.3
-
-    - playmaker fixes
-
-
-    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

popcorn/ProjectSettings/GraphicsSettings.asset

@@ -34,7 +34,6 @@ 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}

popcorn/ProjectSettings/ProjectSettings.asset

@@ -127,7 +127,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.1.0
+  bundleVersion: 1.1.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -174,7 +174,7 @@ PlayerSettings:
     Android: jp.usaya.popcorn
     iPhone: jp.usaya.popcorn
   buildNumber:
-    iPhone: 1
+    iPhone: 2
   AndroidBundleVersionCode: 2
   AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
@@ -253,7 +253,7 @@ PlayerSettings:
   AndroidTargetArchitectures: 2
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: /Users/sutoatsushi/Develop/usaya/___apk_files/popcorn/key/popcorn.keystore
+  AndroidKeystoreName: "/Volumes/GoogleDrive/\u30DE\u30A4\u30C8\u3099\u30E9\u30A4\u30D5\u3099/\u30A2\u30D5\u309A\u30EA\u4E00\u89A7/_\u5171\u901A/android_keys/unity/popcorn/key/popcorn.keystore"
   AndroidKeyaliasName: usaya
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0