diff --git a/popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/Windows/Newtonsoft.Json.dll.meta b/popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/Windows/Newtonsoft.Json.dll.meta index 99f3c9fd..0da89fe5 100644 --- a/popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/Windows/Newtonsoft.Json.dll.meta +++ b/popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/Windows/Newtonsoft.Json.dll.meta @@ -5,11 +5,14 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - '': Any + : Any second: enabled: 0 settings: @@ -28,7 +31,7 @@ PluginImporter: Exclude iOS: 1 Exclude tvOS: 1 - first: - '': Editor + : Editor second: enabled: 0 settings: @@ -76,7 +79,7 @@ PluginImporter: second: enabled: 0 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: LinuxUniversal second: diff --git a/popcorn/Assets/Joypac/Plugins/JsonDotNet/Assemblies/Windows/Newtonsoft.Json.dll.meta b/popcorn/Assets/Joypac/Plugins/JsonDotNet/Assemblies/Windows/Newtonsoft.Json.dll.meta index c2149e34..d11a10dc 100644 --- a/popcorn/Assets/Joypac/Plugins/JsonDotNet/Assemblies/Windows/Newtonsoft.Json.dll.meta +++ b/popcorn/Assets/Joypac/Plugins/JsonDotNet/Assemblies/Windows/Newtonsoft.Json.dll.meta @@ -12,25 +12,25 @@ PluginImporter: validateReferences: 1 platformData: - first: - '': Linux + : Linux second: enabled: 0 settings: CPU: x86 - first: - '': OSXIntel + : OSXIntel second: enabled: 0 settings: CPU: AnyCPU - first: - '': OSXIntel64 + : OSXIntel64 second: enabled: 0 settings: CPU: AnyCPU - first: - '': SamsungTV + : SamsungTV second: enabled: 0 settings: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index eb3093aa..1f9b66ab 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -101,7 +101,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, interval.TotalMinutes); #endif } diff --git a/popcorn/ProjectSettings/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index 71c9e0f5..4654e133 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/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}