From a022b7e53bac7f6a7428a0e318336d94d71a4121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=8B=E5=90=B4?= <617088122@qq.com> Date: Mon, 7 Nov 2022 11:41:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0SDK=E5=B8=A6=E4=BA=A4?= =?UTF-8?q?=E5=8F=89=E6=8E=A8=E5=B9=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/BillingMode.json.meta | 2 +- .../Common/GameInterface/TKGSDKManager.cs | 32 ++++++ Assets/TKGSDK/Common/internal/ITKGSDK.cs | 20 ++++ Assets/TKGSDK/Common/internal/TKGSDKNative.cs | 45 +++++++++ .../Common/internal/iOS/TGiOSAdmanager.cs | 76 ++++++++++---- .../Editor/ToukaAdsBuildPostProcessor.cs | 85 +++++++++++++++- .../ToukaAnalyticsBuildPostProcessor.cs | 6 +- .../Scripts/SDK/TKGNativeInterface.cs | 22 ++++- .../Scripts/SDK/TKGNativeInterfaceAndroid.cs | 33 +++++++ .../Scripts/SDK/TKGNativeInterfaceDefault.cs | 32 ++++++ .../Scripts/SDK/TKGNativeInterfaceIOS.cs | 51 +++++++++- .../Resources/ES3/ES3Defaults.asset | 4 +- .../Install/PlayMakerAddOn.unitypackage.meta | 8 -- Packages/manifest.json | 6 +- Packages/packages-lock.json | 50 ++-------- ProjectSettings/ProjectSettings.asset | 99 ++++++++++++------- ProjectSettings/ProjectVersion.txt | 4 +- 17 files changed, 455 insertions(+), 120 deletions(-) delete mode 100644 Assets/ThirdPlugins/EasyTouchBundle/Install/PlayMakerAddOn.unitypackage.meta diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta index 7d8b779c..da85b565 100644 --- a/Assets/Resources/BillingMode.json.meta +++ b/Assets/Resources/BillingMode.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce2eb409db1b346a0866210a77260619 +guid: 0fad6ce3e5a5840a79c4ecabc5ec0ad8 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs b/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs index d3417cd4..7a51ccb2 100644 --- a/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs +++ b/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs @@ -495,6 +495,38 @@ public class TKGSDKManager : TKGSingleton m_sdkInterface.OpenMoreGame(); } + /// + /// show picture cross + /// + public bool showPictureCross() + { + return m_sdkInterface.showPictureCross(); + } + + /// + /// remove picture cross + /// + public void removePictureCross() + { + m_sdkInterface.removePictureCross(); + } + + /// + /// show more game icon + /// + public bool showMoreGameIcon() + { + return m_sdkInterface.showMoreGameIcon(); + } + + /// + /// remove more game icon + /// + public void removeMoreGameIcon() + { + m_sdkInterface.removeMoreGameIcon(); + } + /// /// open url by browser /// diff --git a/Assets/TKGSDK/Common/internal/ITKGSDK.cs b/Assets/TKGSDK/Common/internal/ITKGSDK.cs index f0f078b5..58dbb96f 100644 --- a/Assets/TKGSDK/Common/internal/ITKGSDK.cs +++ b/Assets/TKGSDK/Common/internal/ITKGSDK.cs @@ -290,6 +290,26 @@ namespace Touka /// void ShareTxt(string _shareTxt); + /// + /// show picture cross + /// + bool showPictureCross(); + + /// + /// remove picture cross + /// + void removePictureCross(); + + /// + /// show more game icon + /// + bool showMoreGameIcon(); + + /// + /// remove more game icon + /// + void removeMoreGameIcon(); + /// /// regist APNS /// diff --git a/Assets/TKGSDK/Common/internal/TKGSDKNative.cs b/Assets/TKGSDK/Common/internal/TKGSDKNative.cs index f6ad7153..f3daa62e 100644 --- a/Assets/TKGSDK/Common/internal/TKGSDKNative.cs +++ b/Assets/TKGSDK/Common/internal/TKGSDKNative.cs @@ -602,6 +602,51 @@ namespace Touka } + /// + /// show picture cross + /// + public bool showPictureCross() + { +#if UNITY_EDITOR + return false; +#endif + return TKGNativeInterface.Instance.showPictureCross(); + + } + + /// + /// remove picture cross + /// + public void removePictureCross() + { +#if UNITY_EDITOR + return; +#endif + TKGNativeInterface.Instance.removePictureCross(); + } + + /// + /// show more game icon + /// + public bool showMoreGameIcon() + { +#if UNITY_EDITOR + return false; +#endif + return TKGNativeInterface.Instance.showMoreGameIcon(); + } + + /// + /// remove more game icon + /// + public void removeMoreGameIcon() + { +#if UNITY_EDITOR + return; +#endif + TKGNativeInterface.Instance.removeMoreGameIcon(); + } + /// /// regist APNS /// diff --git a/Assets/TKGSDK/Common/internal/iOS/TGiOSAdmanager.cs b/Assets/TKGSDK/Common/internal/iOS/TGiOSAdmanager.cs index 93fe0fc7..96d6bbf8 100644 --- a/Assets/TKGSDK/Common/internal/iOS/TGiOSAdmanager.cs +++ b/Assets/TKGSDK/Common/internal/iOS/TGiOSAdmanager.cs @@ -15,21 +15,36 @@ public class TGiOSAdManager : MonoBehaviour public Action onAntiSuccessHander; private System.Action m_userSourceCallback; - public static TGiOSAdManager Instance + /// + /// show picture cross + /// + public bool showPictureCross() { - get - { - if (s_instance == null) - { - GameObject TGGameObject = new GameObject - { - name = "AdObject" - }; - s_instance = TGGameObject.AddComponent(); - DontDestroyOnLoad(TGGameObject); - } - return s_instance; - } + return TKG_ShowPictureCross(); + } + + /// + /// remove picture cross + /// + public void removePictureCross() + { + TKG_RemovePictureCross(); + } + + /// + /// show more game icon + /// + public bool showMoreGameIcon() + { + return TKG_ShowMoreGameIcon(); + } + + /// + /// remove more game icon + /// + public void removeMoreGameIcon() + { + TKG_RemoveMoreGameIcon(); } @@ -75,8 +90,6 @@ public class TGiOSAdManager : MonoBehaviour IntPtr rvClick = Marshal.GetFunctionPointerForDelegate(rvClickHandler); rewardAdClickCallback(rvClick); - - TKG_InitSDK(); } @@ -447,8 +460,20 @@ public class TGiOSAdManager : MonoBehaviour } } - + // dll + [DllImport("__Internal")] + private static extern bool TKG_ShowPictureCross(); + + [DllImport("__Internal")] + private static extern void TKG_RemovePictureCross(); + + [DllImport("__Internal")] + private static extern bool TKG_ShowMoreGameIcon(); + + [DllImport("__Internal")] + private static extern void TKG_RemoveMoreGameIcon(); + [DllImport("__Internal")] private static extern void TKG_SetFuncs(string funcs); @@ -647,6 +672,23 @@ public class TGiOSAdManager : MonoBehaviour { TKG_SetUnityVersion(version); } + + public static TGiOSAdManager Instance + { + get + { + if (s_instance == null) + { + GameObject TGGameObject = new GameObject + { + name = "AdObject" + }; + s_instance = TGGameObject.AddComponent(); + DontDestroyOnLoad(TGGameObject); + } + return s_instance; + } + } } #endif diff --git a/Assets/TKGSDK/Editor/ToukaAdsBuildPostProcessor.cs b/Assets/TKGSDK/Editor/ToukaAdsBuildPostProcessor.cs index e1aa8dea..c99eb560 100644 --- a/Assets/TKGSDK/Editor/ToukaAdsBuildPostProcessor.cs +++ b/Assets/TKGSDK/Editor/ToukaAdsBuildPostProcessor.cs @@ -64,7 +64,6 @@ namespace Touka PlistDocument doc = new PlistDocument(); doc.ReadFromFile(plistPath); PlistElementDict rootDict = doc.root.AsDict(); - Debug.Log("yangs" + rootDict["NSAppTransportSecurity"]); if (rootDict != null) { if (rootDict["NSAppTransportSecurity"] != null) @@ -77,13 +76,9 @@ namespace Touka doc.WriteToFile(plistPath); } } - else - { - } #region iOS 14 - //SKAdnetwork追加 PlistElementArray URLWhiteListArr2 = plist.root.CreateArray("SKAdNetworkItems"); //admob (1) @@ -663,6 +658,46 @@ namespace Touka dic139 = URLWhiteListArr2.AddDict(); dic139.SetString("SKAdNetworkIdentifier", "x5l83yy675.skadnetwork"); + + PlistElementDict dic140; + dic140 = URLWhiteListArr2.AddDict(); + dic140.SetString("SKAdNetworkIdentifier", "6p4ks3rnbw.skadnetwork"); + + PlistElementDict dic141; + dic141 = URLWhiteListArr2.AddDict(); + dic141.SetString("SKAdNetworkIdentifier", "a2p9lx4jpn.skadnetwork"); + + PlistElementDict dic142; + dic142 = URLWhiteListArr2.AddDict(); + dic142.SetString("SKAdNetworkIdentifier", "bxvub5ada5.skadnetwork"); + + PlistElementDict dic143; + dic143 = URLWhiteListArr2.AddDict(); + dic143.SetString("SKAdNetworkIdentifier", "s69wq72ugq.skadnetwork"); + + PlistElementDict dic144; + dic144 = URLWhiteListArr2.AddDict(); + dic144.SetString("SKAdNetworkIdentifier", "47vhws6wlr.skadnetwork"); + + PlistElementDict dic145; + dic145 = URLWhiteListArr2.AddDict(); + dic145.SetString("SKAdNetworkIdentifier", "a2p9lx4jpn.skadnetwork"); + + PlistElementDict dic146; + dic146 = URLWhiteListArr2.AddDict(); + dic146.SetString("SKAdNetworkIdentifier", "cp8zw746q7.skadnetwork"); + + PlistElementDict dic147; + dic147 = URLWhiteListArr2.AddDict(); + dic147.SetString("SKAdNetworkIdentifier", "y5ghdn5j9k.skadnetwork"); + + PlistElementDict dic148; + dic148 = URLWhiteListArr2.AddDict(); + dic148.SetString("SKAdNetworkIdentifier", "a2p9lx4jpn.skadnetwork"); + + PlistElementDict dic149; + dic149 = URLWhiteListArr2.AddDict(); + dic149.SetString("SKAdNetworkIdentifier", "nu4557a4je.skadnetwork"); #endregion PlistElementArray urlTypes = plist.root.CreateArray("CFBundleURLTypes"); @@ -672,6 +707,46 @@ namespace Touka PlistElementArray schemesArray = dict.CreateArray("CFBundleURLSchemes"); schemesArray.AddString(Application.identifier); + PlistElementArray QueriesSchemes = plist.root.CreateArray("LSApplicationQueriesSchemes"); + QueriesSchemes.AddString("openapp.jdmobile"); + QueriesSchemes.AddString("vipshop"); + QueriesSchemes.AddString("tbopen"); + QueriesSchemes.AddString("tmall"); + QueriesSchemes.AddString("suning"); + QueriesSchemes.AddString("ctrip"); + QueriesSchemes.AddString("qunariphone"); + QueriesSchemes.AddString("imeituan"); + QueriesSchemes.AddString("dianping"); + QueriesSchemes.AddString("lianjia"); + QueriesSchemes.AddString("pddopen"); + QueriesSchemes.AddString("xhsdiscover"); + QueriesSchemes.AddString("baiduhaokan"); + QueriesSchemes.AddString("bdminivideo"); + QueriesSchemes.AddString("baiduboxlite"); + QueriesSchemes.AddString("baiduboxmission"); + QueriesSchemes.AddString("com.baidu.tieba"); + QueriesSchemes.AddString("zhihu"); + QueriesSchemes.AddString("wireless1688"); + QueriesSchemes.AddString("iqiyi"); + QueriesSchemes.AddString("weixin"); + QueriesSchemes.AddString("qihooloan"); + QueriesSchemes.AddString("weishi"); + QueriesSchemes.AddString("travelguide"); + QueriesSchemes.AddString("wbmain"); + QueriesSchemes.AddString("taobaotravel"); + QueriesSchemes.AddString("kwai"); + QueriesSchemes.AddString("ksnebula"); + QueriesSchemes.AddString("sinaweibo"); + QueriesSchemes.AddString("alipays"); + QueriesSchemes.AddString("youku"); + QueriesSchemes.AddString("openjdlite"); + QueriesSchemes.AddString("com.360buy.jdpingou"); + QueriesSchemes.AddString("cainiao"); + QueriesSchemes.AddString("kaola"); + QueriesSchemes.AddString("OneTravel"); + QueriesSchemes.AddString("lianjiabeike"); + QueriesSchemes.AddString("iosamap"); + File.WriteAllText(plistPath, plist.WriteToString()); } diff --git a/Assets/TKGSDK/Editor/ToukaAnalyticsBuildPostProcessor.cs b/Assets/TKGSDK/Editor/ToukaAnalyticsBuildPostProcessor.cs index 5b84ede2..7435a0ea 100644 --- a/Assets/TKGSDK/Editor/ToukaAnalyticsBuildPostProcessor.cs +++ b/Assets/TKGSDK/Editor/ToukaAnalyticsBuildPostProcessor.cs @@ -63,7 +63,7 @@ public class ToukaAnalyticsBuildPostProcessor proj.AddFrameworkToProject(target, "SafariServices.framework", false); proj.AddFrameworkToProject(target, "VideoToolbox.framework", false); proj.AddFrameworkToProject(target, "WebKit.framework", false); - + proj.AddFrameworkToProject(target, "DeviceCheck.framework", false); string fileGuidSqlite = proj.AddFile("usr/lib/libxml2.tbd", "Libraries/libxml2.tbd", PBXSourceTree.Sdk); @@ -185,8 +185,12 @@ public class ToukaAnalyticsBuildPostProcessor plist.root.SetString("NSLocationWhenInUseUsageDescription", "为了更好的体验游戏"); plist.root.SetString("NSUserTrackingUsageDescription", "该标识符将用于向您投放个性化广告"); plist.root.SetString("NSPhotoLibraryUsageDescription", "为了更好的体验游戏,请允许APP保存图片到您的相册"); + plist.root.SetString("NSCalendarsUsageDescription", "为了更好的体验游戏"); + + #else + plist.root.SetString("NSCalendarsUsageDescription", "for better experience the game"); plist.root.SetString ("NSLocationAlwaysUsageDescription", "for better experience the game"); plist.root.SetString("NSCameraUsageDescription", "for better experience the game"); plist.root.SetString ("NSLocationWhenInUseUsageDescription", "for better experience the game"); diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs index ff05fd95..5b58262f 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs @@ -11,7 +11,7 @@ namespace Touka { private static TKGNativeInterface _instance; - private string UnitySDKVersion = "2.2.8"; + private string UnitySDKVersion = "2.2.11"; public static TKGNativeInterface Instance { @@ -407,6 +407,26 @@ namespace Touka /// public abstract void RegistAPNS(); + /// + /// show picture cross + /// + public abstract bool showPictureCross(); + + /// + /// remove picture cross + /// + public abstract void removePictureCross(); + + /// + /// show more game icon + /// + public abstract bool showMoreGameIcon(); + + /// + /// remove more game icon + /// + public abstract void removeMoreGameIcon(); + /// /// shake /// diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceAndroid.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceAndroid.cs index 226c9671..3ef325a6 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceAndroid.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceAndroid.cs @@ -683,6 +683,39 @@ namespace Touka } + /// + /// show picture cross + /// + public override bool showPictureCross() + { + return SDKCall("showPictureCross"); + } + + /// + /// remove picture cross + /// + public override void removePictureCross() + { + SDKCall("removePictureCross"); + } + + /// + /// show more game icon + /// + public override bool showMoreGameIcon() + { + return SDKCall("showMoreGameIcon"); + } + + /// + /// remove more game icon + /// + public override void removeMoreGameIcon() + { + SDKCall("removeMoreGameIcon"); + } + + public override void RegistNotification(string notiId, string body, string fireDate, int badge, string title, string subTitle) { SDKCall("registNotification",notiId,body,fireDate,badge,title,subTitle); diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceDefault.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceDefault.cs index 8033edd0..e943b45e 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceDefault.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceDefault.cs @@ -419,6 +419,38 @@ namespace Touka } + /// + /// show picture cross + /// + public override bool showPictureCross() + { + return false; + } + + /// + /// remove picture cross + /// + public override void removePictureCross() + { + + } + + /// + /// show more game icon + /// + public override bool showMoreGameIcon() + { + return false; + } + + /// + /// remove more game icon + /// + public override void removeMoreGameIcon() + { + + } + /// /// shake(can repeat) /// diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceIOS.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceIOS.cs index 317e2ad6..d43f677a 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceIOS.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceIOS.cs @@ -507,6 +507,55 @@ namespace Touka TGiOSAdManager.Instance.share(_shareTxt); } + /// + /// show picture cross + /// + public override bool showPictureCross() + { + +#if UNITY_EDITOR + return false; +#else + return TGiOSAdManager.Instance.showPictureCross(); +#endif + } + + /// + /// remove picture cross + /// + public override void removePictureCross() + { + +#if !UNITY_EDITOR + TGiOSAdManager.Instance.removePictureCross(); +#endif + } + + /// + /// show more game icon + /// + public override bool showMoreGameIcon() + { + +#if UNITY_EDITOR + return false; +#else + return TGiOSAdManager.Instance.showMoreGameIcon(); +#endif + } + + /// + /// remove more game icon + /// + public override void removeMoreGameIcon() + { + +#if !UNITY_EDITOR + TGiOSAdManager.Instance.removeMoreGameIcon(); +#endif + } + + public override void RegistAPNS() { #if !UNITY_EDITOR @@ -657,7 +706,7 @@ namespace Touka TGiOSAdManager.Instance.setFunctions(temp); } - #endregion +#endregion } diff --git a/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset index 51752f68..f26c42eb 100644 --- a/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -29,12 +29,12 @@ MonoBehaviour: referenceMode: 2 serializationDepthLimit: 64 assemblyNames: + - StompyRobot.SRDebugger - Assembly-CSharp - StompyRobot.SRF - - StompyRobot.SRDebugger - Purchasing.Common - - StompyRobot.SRF.Editor - StompyRobot.SRDebugger.Editor + - StompyRobot.SRF.Editor showAdvancedSettings: 0 addMgrToSceneAutomatically: 0 autoUpdateReferences: 1 diff --git a/Assets/ThirdPlugins/EasyTouchBundle/Install/PlayMakerAddOn.unitypackage.meta b/Assets/ThirdPlugins/EasyTouchBundle/Install/PlayMakerAddOn.unitypackage.meta deleted file mode 100644 index 4eef7c6f..00000000 --- a/Assets/ThirdPlugins/EasyTouchBundle/Install/PlayMakerAddOn.unitypackage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e9b7f2af592a2e24da2b1b1e3bfb412e -timeCreated: 1458037330 -licenseType: Store -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 62361fd2..1c33e324 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "1.17.2", + "com.unity.collab-proxy": "1.14.18", "com.unity.ide.rider": "3.0.15", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.purchasing": "4.4.1", + "com.unity.purchasing": "4.1.5", "com.unity.test-framework": "1.1.31", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "2.1.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 40fb1101..9d3a1451 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,12 +7,10 @@ "dependencies": {} }, "com.unity.collab-proxy": { - "version": "1.17.2", + "version": "1.14.18", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { @@ -47,15 +45,8 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, "com.unity.purchasing": { - "version": "4.4.1", + "version": "4.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -64,29 +55,16 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.3.1", - "com.unity.services.analytics": "4.0.1" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.services.analytics": { - "version": "4.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.4.0" + "com.unity.services.core": "1.0.1" }, "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.4.0", - "depth": 2, + "version": "1.0.1", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.cn" }, @@ -102,7 +80,7 @@ "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "2.1.6", "depth": 0, "source": "registry", "dependencies": { @@ -264,18 +242,6 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 596a7b8d..b83ddc9c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 20 productGUID: 0ef24a14e2ecd4b8d858de5a9fdc19ca AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -55,8 +55,6 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 - mipStripping: 0 - numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -136,9 +134,8 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 - vulkanEnableCommandBufferRecycling: 1 + useSecurityBuild: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -153,6 +150,31 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: + cardboard: + depthFormat: 0 + enableTransitionView: 0 + daydream: + depthFormat: 0 + useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 + minimumSupportedHeadTracking: 0 + maximumSupportedHeadTracking: 1 + hololens: + depthFormat: 1 + depthBufferSharingEnabled: 1 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 + oculus: + sharedDepthBuffer: 1 + dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -161,7 +183,6 @@ PlayerSettings: m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 - resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -170,9 +191,8 @@ PlayerSettings: iPhone: com.hotpotgames.mergemilitary.global buildNumber: Standalone: 1 - iPhone: 2 + iPhone: 1 tvOS: 0 - overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 8 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 30 @@ -226,8 +246,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: + iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: - iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -245,17 +265,9 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - useCustomMainManifest: 0 - useCustomLauncherManifest: 0 - useCustomMainGradleTemplate: 0 - useCustomLauncherGradleManifest: 0 - useCustomBaseGradleTemplate: 0 - useCustomGradlePropertiesTemplate: 0 - useCustomProguardFile: 0 AndroidTargetArchitectures: 3 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 @@ -275,9 +287,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 - AndroidMinifyRelease: 0 - AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: @@ -397,7 +406,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 - m_BuildTargetSecurityBuild: [] + m_BuildTargetEncrypting: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -459,7 +468,6 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] - m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -469,15 +477,12 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: - bluetoothUsageDescription: - switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -606,7 +611,6 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 - switchUseNewStyleFilepaths: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -686,6 +690,31 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 + ps5ParamFilePath: + ps5VideoOutPixelFormat: 0 + ps5VideoOutInitialWidth: 1920 + ps5VideoOutOutputMode: 1 + ps5BackgroundImagePath: + ps5StartupImagePath: + ps5Pic2Path: + ps5StartupImagesFolder: + ps5IconImagesFolder: + ps5SaveDataImagePath: + ps5SdkOverride: + ps5BGMPath: + ps5ShareOverlayImagePath: + ps5NPConfigZipPath: + ps5Passcode: j99nsQzldVI5ZuGXbEWRK5RhRXdCdG5n + ps5UseResolutionFallback: 0 + ps5UseAudio3dBackend: 0 + ps5ScriptOptimizationLevel: 2 + ps5Audio3dVirtualSpeakerCount: 14 + ps5UpdateReferencePackage: + ps5disableAutoHideSplash: 0 + ps5OperatingSystemCanDisableSplashScreen: 0 + ps5IncludedModules: [] + ps5SharedBinaryContentLabels: [] + ps5SharedBinarySystemFolders: [] monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -702,15 +731,13 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 - webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLDecompressionFallback: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: 1: USE_IAP;USE_FIREBASE 4: USE_IAP;AppStore_GB 7: USE_IAP - additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: Android: 1 @@ -719,9 +746,6 @@ PlayerSettings: incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 - useDeterministicCompilation: 1 - useReferenceAssemblies: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -757,7 +781,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -785,7 +808,10 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: {} + vrEditorSettings: + daydream: + daydreamIconForeground: {fileID: 0} + daydreamIconBackground: {fileID: 0} cloudServicesEnabled: UNet: 1 luminIcon: @@ -800,12 +826,11 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 0 cloudProjectId: af0f904d-024e-4c4b-b9cc-5ae7fdbf3ba2 framebufferDepthMemorylessMode: 0 - qualitySettingsNames: [] projectName: Merge&Tactics organizationId: shinryu139391213 cloudEnabled: 0 + enableNativePlatformBackendsForNewInputSystem: 0 + disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 - virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6f1f9421..625776a6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.40f1c1 -m_EditorVersionWithRevision: 2020.3.40f1c1 (739f03df2e02) +m_EditorVersion: 2019.4.38f1c1 +m_EditorVersionWithRevision: 2019.4.38f1c1 (df80985e05f0)