diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tenjin/Plugins/iOS/libTenjinSDK.a b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tenjin/Plugins/iOS/libTenjinSDK.a index 16dfa17c..1bce0282 100644 Binary files a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tenjin/Plugins/iOS/libTenjinSDK.a and b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tenjin/Plugins/iOS/libTenjinSDK.a differ diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/Info.plist.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/Info.plist.meta index 95022a58..68d9dd4a 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/Info.plist.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/Info.plist.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e4ad530b71b04e9badfe094662be466 +guid: b9d295f1d6b40474b832740c53dc0162 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools index 08770f9d..e9727db1 100644 Binary files a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools and b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools differ diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools.meta index 213d7cb9..2e9ae549 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/TGTools.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79a6505a2ad55417598ed33ded0ee42c +guid: b1e0c8870faab4b1e81eb56a2625ca49 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature.meta index 8f26e7c8..601e8c07 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9be3256ce7a394ef3bb7f2b152623c9b +guid: 9e12daaa70a7c4135a17c39fd22fada3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory index 3a348cd9..2aec4833 100644 Binary files a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory and b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory differ diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory.meta index 80c10695..4d5b9dbb 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeDirectory.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b5ad6ea0b8224b33a9c57794cfcce22 +guid: 5da1691e284094478a2e118f3b0a75f3 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1 b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1 index b830c40e..e262e06d 100644 Binary files a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1 and b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1 differ diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1.meta index 4a7c132e..ee5f99d1 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements-1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2bca2410fbd24ebfb259861cbcb618d +guid: cf3e87ee224034a7ca32d0029936d6c9 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements.meta index 0f43a46b..9785f025 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeRequirements.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d77b338aeff804c38a0c3a55134a24c0 +guid: ad451212a49674981ba4f6b25add243e DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeResources.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeResources.meta index fe22773a..fd902ed4 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeResources.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeResources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 60dfc12b4555d491baefbeb12eb6a5cc +guid: aa1bc22b5c00243859a237218c12aca1 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeSignature.meta b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeSignature.meta index 3c5d50e5..8aa1e8a9 100644 --- a/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeSignature.meta +++ b/Assets/Plugins/ToukaGames/AnalyticsSDK/Tools/TGTools.framework/_CodeSignature/CodeSignature.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f3b3743de60f43f8853b84fcf591233 +guid: 666f447dd2b6443b39554966728d7c78 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Init/InitLogic.cs b/Assets/Scripts/Init/InitLogic.cs index 40705059..603bffc2 100644 --- a/Assets/Scripts/Init/InitLogic.cs +++ b/Assets/Scripts/Init/InitLogic.cs @@ -25,16 +25,9 @@ public class InitLogic : MonoBehaviour TGTools.Instance.onAgreeHander -= ShowAntiAddiction; ToukaUtils.InitTenjinFirst(); - - if (StaticOnlineParams.IsShowAuthViewOnlineParams.DefaultValue.Equals("1")) - { - TGiOSAdManager.Instance.onAntiSuccessHander += AntiSucceed; - TGiOSAdManager.Instance.ShowAntiView(); - } - else - { - EnterGame(); - } + + TGiOSAdManager.Instance.onAntiSuccessHander += AntiSucceed; + TGiOSAdManager.Instance.ShowAntiView(); } private void AntiSucceed() diff --git a/Assets/Scripts/ToukaGames/AnalyticsScripts/ToukaSDK/ToukaAnalyticsManager.cs b/Assets/Scripts/ToukaGames/AnalyticsScripts/ToukaSDK/ToukaAnalyticsManager.cs index d8a96d61..46bb7801 100644 --- a/Assets/Scripts/ToukaGames/AnalyticsScripts/ToukaSDK/ToukaAnalyticsManager.cs +++ b/Assets/Scripts/ToukaGames/AnalyticsScripts/ToukaSDK/ToukaAnalyticsManager.cs @@ -121,11 +121,11 @@ public class ToukaAnalyticsManager : ToukaSingletonMonoBehaviour public void InitTenjinInner() { - Debug.Log("[ToukaAnalyticsManager] init tenjin inner"); - BaseTenjin instance = Tenjin.getInstance(StaticStringsKey.TENJIN_KEY); + //Debug.Log("[ToukaAnalyticsManager] init tenjin inner"); + //BaseTenjin instance = Tenjin.getInstance(StaticStringsKey.TENJIN_KEY); - // Sends install/open event to Tenjin - instance.Connect(); + //// Sends install/open event to Tenjin + //instance.Connect(); } #endregion diff --git a/Packages/manifest.json b/Packages/manifest.json index 3f8b2432..b75acd6a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,16 +1,16 @@ { "dependencies": { - "com.unity.2d.animation": "3.2.14", + "com.unity.2d.animation": "3.2.16", "com.unity.2d.pixel-perfect": "2.1.0", - "com.unity.2d.psdimporter": "2.1.10", + "com.unity.2d.psdimporter": "2.1.11", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "3.0.17", + "com.unity.2d.spriteshape": "3.0.18", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.14.4", + "com.unity.collab-proxy": "1.14.15", "com.unity.ide.rider": "1.2.1", - "com.unity.ide.visualstudio": "2.0.12", - "com.unity.ide.vscode": "1.2.4", - "com.unity.test-framework": "1.1.29", + "com.unity.ide.visualstudio": "2.0.14", + "com.unity.ide.vscode": "1.2.5", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "2.1.4", "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5f9a1370..f696b4f8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "3.2.14", - "depth": 0, + "version": "3.2.17", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "2.1.0", + "com.unity.2d.common": "2.1.2", "com.unity.mathematics": "1.1.0", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -14,7 +14,7 @@ "url": "https://packages.unity.cn" }, "com.unity.2d.common": { - "version": "2.1.0", + "version": "2.1.2", "depth": 1, "source": "registry", "dependencies": { @@ -38,12 +38,12 @@ "url": "https://packages.unity.cn" }, "com.unity.2d.psdimporter": { - "version": "2.1.10", + "version": "2.1.11", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "2.1.0", - "com.unity.2d.animation": "3.2.14", + "com.unity.2d.common": "2.1.2", + "com.unity.2d.animation": "3.2.17", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.cn" @@ -55,7 +55,7 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "3.0.17", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -72,7 +72,7 @@ "dependencies": {} }, "com.unity.collab-proxy": { - "version": "1.14.4", + "version": "1.14.15", "depth": 0, "source": "registry", "dependencies": {}, @@ -95,7 +95,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { - "version": "2.0.12", + "version": "2.0.14", "depth": 0, "source": "registry", "dependencies": { @@ -104,7 +104,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -118,7 +118,7 @@ "url": "https://packages.unity.cn" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d36335eb..6c977dbd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -72,6 +72,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -136,7 +142,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.2.1 + bundleVersion: 1.2.2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -184,7 +190,7 @@ PlayerSettings: Standalone: com.toukagames.pitch iPhone: com.toukagames.pitch buildNumber: - iPhone: 2 + iPhone: 1 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -261,6 +267,7 @@ PlayerSettings: templatePackageId: com.unity.template.2d@3.3.2 templateDefaultScene: Assets/Scenes/SampleScene.unity AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -277,6 +284,7 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: @@ -481,7 +489,9 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -552,6 +562,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 44509a2b..625776a6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.28f1c1 -m_EditorVersionWithRevision: 2019.4.28f1c1 (1f7bb6726984) +m_EditorVersion: 2019.4.38f1c1 +m_EditorVersionWithRevision: 2019.4.38f1c1 (df80985e05f0)