diff --git a/GamebaseSample/Assets/Plugins/Android/mainTemplate.gradle b/GamebaseSample/Assets/Plugins/Android/mainTemplate.gradle index 625d0a4..32d0f02 100644 --- a/GamebaseSample/Assets/Plugins/Android/mainTemplate.gradle +++ b/GamebaseSample/Assets/Plugins/Android/mainTemplate.gradle @@ -32,6 +32,10 @@ android { compileSdkVersion **APIVERSION** buildToolsVersion '**BUILDTOOLS**' + dexOptions { + javaMaxHeapSize "4g" + } + defaultConfig { minSdkVersion 16 targetSdkVersion **TARGETSDKVERSION** diff --git a/GamebaseSample/Assets/Plugins/Android/res/xml/network_security_config.xml b/GamebaseSample/Assets/Plugins/Android/res/xml/network_security_config.xml index 0dd76c6..ebfff89 100644 --- a/GamebaseSample/Assets/Plugins/Android/res/xml/network_security_config.xml +++ b/GamebaseSample/Assets/Plugins/Android/res/xml/network_security_config.xml @@ -2,7 +2,7 @@ - cdn.toastcloud.com + toastcdn.net \ No newline at end of file diff --git a/GamebaseSample/Assets/Sample/Resources/Animations/ExpAnimator.controller b/GamebaseSample/Assets/Sample/Resources/Animations/ExpAnimator.controller index 1e47a3e..1e7b4a8 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Animations/ExpAnimator.controller and b/GamebaseSample/Assets/Sample/Resources/Animations/ExpAnimator.controller differ diff --git a/GamebaseSample/Assets/Sample/Resources/Animations/Explosion.anim b/GamebaseSample/Assets/Sample/Resources/Animations/Explosion.anim index 7f7a890..26f1dcd 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Animations/Explosion.anim and b/GamebaseSample/Assets/Sample/Resources/Animations/Explosion.anim differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/Bullet.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/Bullet.prefab index b712b15..c1bb4c8 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/Bullet.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/Bullet.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/Enemy.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/Enemy.prefab index 3661859..76a8f4c 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/Enemy.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/Enemy.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/Rocket.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/Rocket.prefab index 37254e4..a309679 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/Rocket.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/Rocket.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonLPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonLPopup.prefab index 22fe065..0ea0e72 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonLPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonLPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonSPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonSPopup.prefab index a0cbc96..3d1466c 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonSPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/CommonSPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadResourceItem.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadResourceItem.prefab index 242047f..9ca10d5 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadResourceItem.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadResourceItem.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadView.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadView.prefab index 4b092fc..4df7c25 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadView.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/DownloadView.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorDetailPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorDetailPopup.prefab index 9c57b61..2bd2124 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorDetailPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorDetailPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorPopup.prefab index d906aff..1612897 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/ErrorPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/GameInfoPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/GameInfoPopup.prefab index 0f4afea..02b1be7 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/GameInfoPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/GameInfoPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/IdPasswordPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/IdPasswordPopup.prefab index eac0eb1..acdc85b 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/IdPasswordPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/IdPasswordPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardPopup.prefab index 20b592e..7b15e1c 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardRankItem.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardRankItem.prefab index 2a66e04..ea9e64c 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardRankItem.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/LeaderboardRankItem.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/Loading.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/Loading.prefab index ca1b821..d23b9cc 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/Loading.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/Loading.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/PushPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/PushPopup.prefab index 96e7447..d6f10bf 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/PushPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/PushPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/SettingsPopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/SettingsPopup.prefab index 4d8a263..13a8cc8 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/SettingsPopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/SettingsPopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/StorePopup.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/StorePopup.prefab index 54530c2..b8621cf 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/StorePopup.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/StorePopup.prefab differ diff --git a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/TouchEffect.prefab b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/TouchEffect.prefab index 0473d39..51cfad0 100644 Binary files a/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/TouchEffect.prefab and b/GamebaseSample/Assets/Sample/Resources/Prefabs/UI/TouchEffect.prefab differ diff --git a/GamebaseSample/Assets/Sample/Scene/ingame.unity b/GamebaseSample/Assets/Sample/Scene/ingame.unity index e6958f0..c950a70 100644 Binary files a/GamebaseSample/Assets/Sample/Scene/ingame.unity and b/GamebaseSample/Assets/Sample/Scene/ingame.unity differ diff --git a/GamebaseSample/Assets/Sample/Scene/intro.unity b/GamebaseSample/Assets/Sample/Scene/intro.unity index 21baeec..47319d3 100644 Binary files a/GamebaseSample/Assets/Sample/Scene/intro.unity and b/GamebaseSample/Assets/Sample/Scene/intro.unity differ diff --git a/GamebaseSample/Assets/Sample/Scene/login.unity b/GamebaseSample/Assets/Sample/Scene/login.unity index 360edfa..0a48eab 100644 Binary files a/GamebaseSample/Assets/Sample/Scene/login.unity and b/GamebaseSample/Assets/Sample/Scene/login.unity differ diff --git a/GamebaseSample/Assets/Sample/Scene/main.unity b/GamebaseSample/Assets/Sample/Scene/main.unity index dff52cf..5407730 100644 Binary files a/GamebaseSample/Assets/Sample/Scene/main.unity and b/GamebaseSample/Assets/Sample/Scene/main.unity differ diff --git a/GamebaseSample/Assets/Sample/Scripts/Localization/LocalizationManager.cs b/GamebaseSample/Assets/Sample/Scripts/Localization/LocalizationManager.cs index 409023b..96dd2f4 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Localization/LocalizationManager.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Localization/LocalizationManager.cs @@ -117,9 +117,9 @@ private bool IsWebFilePath(string filePath) private IEnumerator LoadWebFile(string filePath, System.Action callback) { #if !UNITY_EDITOR && UNITY_ANDROID - WWW www = new WWW(filePath); - yield return www; - callback(www.text); + WWW www = new WWW(filePath); + yield return www; + callback(www.text); #else UnityWebRequest www = UnityWebRequest.Get(filePath); www.timeout = 10; diff --git a/GamebaseSample/Assets/Sample/Scripts/Popup/DownloadPanel.cs b/GamebaseSample/Assets/Sample/Scripts/Popup/DownloadPanel.cs index 970a47b..275a70f 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Popup/DownloadPanel.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Popup/DownloadPanel.cs @@ -48,10 +48,10 @@ private void Update() messageText.text = string.Empty; uint completedCount = progress.CompletedFileCount; - uint totalCount = progress.TotalFileNumber; + uint totalCount = progress.TotalFileCount; totalDownloadStatusText.text = string.Format("{0}/{1} ({2}/{3})", - StringUtil.BytesToString(progress.TotalReceivedBytes), StringUtil.BytesToString(progress.TotalFileBytes), + StringUtil.BytesToString(progress.DownloadedBytes), StringUtil.BytesToString(progress.TotalFileBytes), completedCount, totalCount); if (progress.FileMap != null) diff --git a/GamebaseSample/Assets/Sample/Scripts/Popup/Settings.cs b/GamebaseSample/Assets/Sample/Scripts/Popup/Settings.cs index f5041c9..3b3616f 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Popup/Settings.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Popup/Settings.cs @@ -117,17 +117,17 @@ private void OnEnable() ChangeLanguageButton(); #if !UNITY_EDITOR && UNITY_IOS - mappingView.SetActive(true); - googleButton.SetActive(false); - gamecenterButton.SetActive(true); - facebookButton.SetActive(true); - paycoButton.SetActive(true); + mappingView.SetActive(true); + googleButton.SetActive(false); + gamecenterButton.SetActive(true); + facebookButton.SetActive(true); + paycoButton.SetActive(true); #elif !UNITY_EDITOR && UNITY_ANDROID - mappingView.SetActive(true); - googleButton.SetActive(true); - gamecenterButton.SetActive(false); - facebookButton.SetActive(true); - paycoButton.SetActive(true); + mappingView.SetActive(true); + googleButton.SetActive(true); + gamecenterButton.SetActive(false); + facebookButton.SetActive(true); + paycoButton.SetActive(true); #else pushSettingButton.color = PUSH_BUTTON_DIMMED; @@ -227,7 +227,7 @@ public void ClickPushSettingButton() LocalizationManager.Instance.GetLocalizedValue(GameStrings.COMMON_OK_BUTTON), null); #else - Push.OpenPush(gameObject, () => { }, true); + Push.OpenPush(gameObject, () => { }, true); #endif } diff --git a/GamebaseSample/Assets/Sample/Scripts/SampleVersion.cs b/GamebaseSample/Assets/Sample/Scripts/SampleVersion.cs index c94d207..0be4b31 100644 --- a/GamebaseSample/Assets/Sample/Scripts/SampleVersion.cs +++ b/GamebaseSample/Assets/Sample/Scripts/SampleVersion.cs @@ -2,6 +2,6 @@ { public static class SampleVersion { - public const string VERSION = "1.0.0"; + public const string VERSION = "1.0.1"; } } \ No newline at end of file diff --git a/GamebaseSample/Assets/Sample/Scripts/Scene/Login.cs b/GamebaseSample/Assets/Sample/Scripts/Scene/Login.cs index a752637..c5134b8 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Scene/Login.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Scene/Login.cs @@ -67,23 +67,23 @@ private void Start() private void Update() { #if !UNITY_EDITOR && UNITY_ANDROID - if (Input.GetKeyDown(KeyCode.Escape) == true) - { - Application.Quit(); - } + if (Input.GetKeyDown(KeyCode.Escape) == true) + { + Application.Quit(); + } #endif #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - if (0 < Input.touchCount) - { - for (int i = 0; i < Input.touchCount; ++i) + if (0 < Input.touchCount) { - if (Input.GetTouch(i).phase == TouchPhase.Began) + for (int i = 0; i < Input.touchCount; ++i) { - CreateTouchEffect(Input.GetTouch(i).position); + if (Input.GetTouch(i).phase == TouchPhase.Began) + { + CreateTouchEffect(Input.GetTouch(i).position); + } } } - } #else if (Input.GetMouseButtonDown(0) == true) { @@ -192,7 +192,7 @@ private void CheckLaunchingStatus() private void GamebaseLogin() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - LoginForLastLoggedInProvider(); + LoginForLastLoggedInProvider(); #else ActiveButton(true); Loading.GetInstance().HideLoading(); @@ -246,10 +246,10 @@ private void LoginWithProviderName(string loginType) if (Gamebase.IsSuccess(error) == true) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - ActiveButton(false); - Push.CheckPushSettings(gameObject, ()=> { OnLogin(); }); + ActiveButton(false); + Push.CheckPushSettings(gameObject, ()=> { OnLogin(); }); #else - OnLogin(); + OnLogin(); #endif } else @@ -288,12 +288,12 @@ private void LoadMainScene() { DataManager.User.Id = Gamebase.GetUserID(); #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - DataManager.User.IdP = Gamebase.GetLastLoggedInProvider(); + DataManager.User.IdP = Gamebase.GetLastLoggedInProvider(); #else - DataManager.User.IdP = "guest"; + DataManager.User.IdP = "guest"; #endif - SceneManager.LoadSceneAsync("main"); + SceneManager.LoadSceneAsync("main"); } else { @@ -320,11 +320,11 @@ private void ActiveButton(bool isActive) cacheDeleteButton.SetActive(isActive); #if !UNITY_EDITOR && UNITY_IOS - gamecenterButton.SetActive(isActive); - otherButtonContainer.SetActive(isActive); + gamecenterButton.SetActive(isActive); + otherButtonContainer.SetActive(isActive); #elif !UNITY_EDITOR && UNITY_ANDROID - googleButton.SetActive(isActive); - otherButtonContainer.SetActive(isActive); + googleButton.SetActive(isActive); + otherButtonContainer.SetActive(isActive); #elif UNITY_EDITOR googleButton.SetActive(false); gamecenterButton.SetActive(false); diff --git a/GamebaseSample/Assets/Sample/Scripts/Scene/Main.cs b/GamebaseSample/Assets/Sample/Scripts/Scene/Main.cs index 1360d07..145017a 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Scene/Main.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Scene/Main.cs @@ -38,22 +38,22 @@ private void OnDestroy() private void Update() { #if !UNITY_EDITOR && UNITY_ANDROID - if (Input.GetKeyDown(KeyCode.Escape) == true) - { - Application.Quit(); - } + if (Input.GetKeyDown(KeyCode.Escape) == true) + { + Application.Quit(); + } #endif #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - if (0 < Input.touchCount) - { - for (int i = 0; i < Input.touchCount; ++i) + if (0 < Input.touchCount) { - if (Input.GetTouch(i).phase == TouchPhase.Began) + for (int i = 0; i < Input.touchCount; ++i) { - CreateTouchEffect(Input.GetTouch(i).position); + if (Input.GetTouch(i).phase == TouchPhase.Began) + { + CreateTouchEffect(Input.GetTouch(i).position); + } } } - } #else if (Input.GetMouseButtonDown(0) == true) { @@ -182,7 +182,7 @@ private void GamebaseServerPushHandler(GamebaseResponse.SDK.ServerPushMessage me private void EndSession() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - SceneManager.LoadSceneAsync("login"); + SceneManager.LoadSceneAsync("login"); #else Loading.GetInstance().ShowLoading(gameObject); diff --git a/GamebaseSample/Assets/Sample/Scripts/Service/Downloader/ResourceDownloader.cs b/GamebaseSample/Assets/Sample/Scripts/Service/Downloader/ResourceDownloader.cs index 3072536..d0a5a5a 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Service/Downloader/ResourceDownloader.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Service/Downloader/ResourceDownloader.cs @@ -25,12 +25,12 @@ private static string DownloadPath { return #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + Seperator + LEAF_DIRECTORY; + Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + Seperator + LEAF_DIRECTORY; #elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX - // MacOS Path : /Users/{USER_NAME}/Documents/SmartDLDownloads - Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Seperator + "Documents" + Seperator + LEAF_DIRECTORY; + // MacOS Path : /Users/{USER_NAME}/Documents/SmartDLDownloads + Environment.GetFolderPath(Environment.SpecialFolder.Personal) + Seperator + "Documents" + Seperator + LEAF_DIRECTORY; #else - Application.persistentDataPath + Seperator + LEAF_DIRECTORY; + Application.persistentDataPath + Seperator + LEAF_DIRECTORY; #endif } } @@ -60,7 +60,7 @@ public void StartDownload(Action callback, params string[] downloadPaths) DataManager.Launching.smartdl.appkey, DataManager.Launching.smartdl.service_android, DownloadPath, - result => { callback(result.IsSuccessful); }); + result => { callback(result.Code == ResultCode.SUCCESS || result.Code == ResultCode.SUCCESS_NO_DIFFERENCE); }); } public void StopDownload() diff --git a/GamebaseSample/Assets/Sample/Scripts/Util/UnityCompatibility.cs b/GamebaseSample/Assets/Sample/Scripts/Util/UnityCompatibility.cs index ec7e037..95cfe2d 100644 --- a/GamebaseSample/Assets/Sample/Scripts/Util/UnityCompatibility.cs +++ b/GamebaseSample/Assets/Sample/Scripts/Util/UnityCompatibility.cs @@ -9,7 +9,7 @@ public static class UnityWebRequest public static AsyncOperation Send(UnityEngine.Networking.UnityWebRequest request) { #if UNITY_2017_2_OR_NEWER - return request.SendWebRequest(); + return request.SendWebRequest(); #else return request.Send(); #endif @@ -18,7 +18,7 @@ public static AsyncOperation Send(UnityEngine.Networking.UnityWebRequest request public static bool IsError(UnityEngine.Networking.UnityWebRequest request) { #if UNITY_2017_1_OR_NEWER - return request.isNetworkError; + return request.isNetworkError; #else return request.isError; #endif diff --git a/GamebaseSample/Assets/Sample/ThirdParty/iTween/iTween.cs b/GamebaseSample/Assets/Sample/ThirdParty/iTween/iTween.cs index 4de900b..3995bbc 100644 --- a/GamebaseSample/Assets/Sample/ThirdParty/iTween/iTween.cs +++ b/GamebaseSample/Assets/Sample/ThirdParty/iTween/iTween.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2011 Bob Berkebile (pixelplacment) +// Copyright (c) 2011 - 2018 Bob Berkebile (pixelplacment) // Please direct any bugs/comments/suggestions to http://pixelplacement.com // // Permission is hereby granted, free of charge, to any person obtaining a copy @@ -40,20 +40,17 @@ Neither the name of the author nor the names of contributors may be used to endo #endregion /// -/// Version: 2.0.5 +/// Version: 2.0.8 /// Author: Bob Berkebile (http://pixelplacement.com) /// Support: http://itween.pixelplacement.com /// -public class iTween : MonoBehaviour{ - +public class iTween : MonoBehaviour +{ #region Variables - + //repository of all living iTweens: public static List tweens = new List(); - - //camera fade object: - private static GameObject cameraFade; - + //status members (made public for visual troubleshooting in the inspector): public string id, type, method; public iTween.EaseType easeType; @@ -81,7 +78,7 @@ public class iTween : MonoBehaviour{ private float[] floats; private Rect[] rects; private CRSpline path; - private Vector3 preUpdate; + //private Vector3 preUpdate; private Vector3 postUpdate; private NamedValueColor namedcolorvalue; @@ -198,8 +195,6 @@ public static class Defaults{ //update defaults: public static float updateTimePercentage = .05f; public static float updateTime = 1f*updateTimePercentage; - //cameraFade defaults: - public static int cameraFadeDepth = 999999; //path look ahead amount: public static float lookAhead = .05f; public static bool useRealTime = false; // Added by PressPlay @@ -220,155 +215,7 @@ public static class Defaults{ public static void Init(GameObject target){ MoveBy(target,Vector3.zero,0); } - - /// - /// Instantly changes the amount(transparency) of a camera fade and then returns it back over time with MINIMUM customization options. - /// - /// - /// A or for how transparent the Texture2D that the camera fade uses is. - /// - /// - /// A for the time in seconds the animation will take to complete. - /// - public static void CameraFadeFrom(float amount, float time){ - if(cameraFade){ - CameraFadeFrom(Hash("amount",amount,"time",time)); - }else{ - Debug.LogError("iTween Error: You must first add a camera fade object with CameraFadeAdd() before atttempting to use camera fading."); - } - } - - /// - /// Instantly changes the amount(transparency) of a camera fade and then returns it back over time with FULL customization options. - /// - /// - /// A or for how transparent the Texture2D that the camera fade uses is. - /// - /// - /// A or for the time in seconds the animation will take to complete. - /// - /// - /// A or for the time in seconds the animation will wait before beginning. - /// - /// - /// A or for the shape of the easing curve applied to the animation. - /// - /// - /// A or for the type of loop to apply once the animation has completed. - /// - /// - /// A for the name of a function to launch at the beginning of the animation. - /// - /// - /// A for a reference to the GameObject that holds the "onstart" method. - /// - /// - /// A for arguments to be sent to the "onstart" method. - /// - /// - /// A for the name of a function to launch on every step of the animation. - /// - /// - /// A for a reference to the GameObject that holds the "onupdate" method. - /// - /// - /// A for arguments to be sent to the "onupdate" method. - /// - /// - /// A for the name of a function to launch at the end of the animation. - /// - /// - /// A for a reference to the GameObject that holds the "oncomplete" method. - /// - /// - /// A for arguments to be sent to the "oncomplete" method. - /// - public static void CameraFadeFrom(Hashtable args){ - //establish iTween: - if(cameraFade){ - ColorFrom(cameraFade,args); - }else{ - Debug.LogError("iTween Error: You must first add a camera fade object with CameraFadeAdd() before atttempting to use camera fading."); - } - } - - /// - /// Changes the amount(transparency) of a camera fade over time with MINIMUM customization options. - /// - /// - /// A or for how transparent the Texture2D that the camera fade uses is. - /// - /// - /// A for the time in seconds the animation will take to complete. - /// - public static void CameraFadeTo(float amount, float time){ - if(cameraFade){ - CameraFadeTo(Hash("amount",amount,"time",time)); - }else{ - Debug.LogError("iTween Error: You must first add a camera fade object with CameraFadeAdd() before atttempting to use camera fading."); - } - } - - /// - /// Changes the amount(transparency) of a camera fade over time with FULL customization options. - /// - /// - /// A or for how transparent the Texture2D that the camera fade uses is. - /// - /// - /// A or for the time in seconds the animation will take to complete. - /// - /// - /// A or for the time in seconds the animation will wait before beginning. - /// - /// - /// A or for the shape of the easing curve applied to the animation. - /// - /// - /// A or for the type of loop to apply once the animation has completed. - /// - /// - /// A for the name of a function to launch at the beginning of the animation. - /// - /// - /// A for a reference to the GameObject that holds the "onstart" method. - /// - /// - /// A for arguments to be sent to the "onstart" method. - /// - /// - /// A for the name of a function to launch on every step of the animation. - /// - /// - /// A for a reference to the GameObject that holds the "onupdate" method. - /// - /// - /// A for arguments to be sent to the "onupdate" method. - /// - /// - /// A for the name of a function to launch at the end of the animation. - /// - /// - /// A for a reference to the GameObject that holds the "oncomplete" method. - /// - /// - /// A for arguments to be sent to the "oncomplete" method. - /// - public static void CameraFadeTo(Hashtable args){ - /* - CameraFadeAdd(Defaults.cameraFadeDepth); - - //rescale cameraFade just in case screen size has changed to ensure it takes up the full screen: - cameraFade.guiTexture.pixelInset=new Rect(0,0,Screen.width,Screen.height); - */ - - if(cameraFade){ - //establish iTween: - ColorTo(cameraFade,args); - }else{ - Debug.LogError("iTween Error: You must first add a camera fade object with CameraFadeAdd() before atttempting to use camera fading."); - } - } + /// /// Returns a value to an 'oncallback' method interpolated between the supplied 'from' and 'to' values for application as desired. Requires an 'onupdate' callback that accepts the same type as the supplied 'from' and 'to' properties. @@ -457,7 +304,7 @@ public static void ValueTo(GameObject target, Hashtable args){ } /// - /// Changes a GameObject's alpha value instantly then returns it to the provided alpha over time with MINIMUM customization options. If a GUIText or GUITexture component is attached, it will become the target of the animation. Identical to using ColorFrom and using the "a" parameter. + /// Changes a GameObject's alpha value instantly then returns it to the provided alpha over time with MINIMUM customization options. Identical to using ColorFrom and using the "a" parameter. /// /// /// A to be the target of the animation. @@ -473,7 +320,7 @@ public static void FadeFrom(GameObject target, float alpha, float time){ } /// - /// Changes a GameObject's alpha value instantly then returns it to the provided alpha over time with FULL customization options. If a GUIText or GUITexture component is attached, it will become the target of the animation. Identical to using ColorFrom and using the "a" parameter. + /// Changes a GameObject's alpha value instantly then returns it to the provided alpha over time with FULL customization options. Identical to using ColorFrom and using the "a" parameter. /// /// /// A or for the initial alpha value of the animation. @@ -528,7 +375,7 @@ public static void FadeFrom(GameObject target, Hashtable args){ } /// - /// Changes a GameObject's alpha value over time with MINIMUM customization options. If a GUIText or GUITexture component is attached, it will become the target of the animation. Identical to using ColorTo and using the "a" parameter. + /// Changes a GameObject's alpha value over time with MINIMUM customization options. Identical to using ColorTo and using the "a" parameter. /// /// /// A to be the target of the animation. @@ -544,7 +391,7 @@ public static void FadeTo(GameObject target, float alpha, float time){ } /// - /// Changes a GameObject's alpha value over time with FULL customization options. If a GUIText or GUITexture component is attached, it will become the target of the animation. Identical to using ColorTo and using the "a" parameter. + /// Changes a GameObject's alpha value over time with FULL customization options. Identical to using ColorTo and using the "a" parameter. /// /// /// A or for the final alpha value of the animation. @@ -599,7 +446,7 @@ public static void FadeTo(GameObject target, Hashtable args){ } /// - /// Changes a GameObject's color values instantly then returns them to the provided properties over time with MINIMUM customization options. If a GUIText or GUITexture component is attached, it will become the target of the animation. + /// Changes a GameObject's color values instantly then returns them to the provided properties over time with MINIMUM customization options. /// /// /// A to be the target of the animation. @@ -615,7 +462,7 @@ public static void ColorFrom(GameObject target, Color color, float time){ } /// - /// Changes a GameObject's color values instantly then returns them to the provided properties over time with FULL customization options. If a GUIText or GUITexture component is attached, it will become the target of the animation. + /// Changes a GameObject's color values instantly then returns them to the provided properties over time with FULL customization options. /// /// /// A to change the GameObject's color to. @@ -699,11 +546,7 @@ public static void ColorFrom(GameObject target, Hashtable args){ } //set tempColor and base fromColor: - if(target.GetComponent()){ - tempColor=fromColor=target.GetComponent().color; - }else if(target.GetComponent()){ - tempColor=fromColor=target.GetComponent().material.color; - }else if(target.GetComponent()){ + if(target.GetComponent()){ tempColor=fromColor=target.GetComponent().material.color; }else if(target.GetComponent()){ tempColor=fromColor=target.GetComponent().color; @@ -737,11 +580,7 @@ public static void ColorFrom(GameObject target, Hashtable args){ } //apply fromColor: - if(target.GetComponent()){ - target.GetComponent().color=fromColor; - }else if(target.GetComponent()){ - target.GetComponent().material.color=fromColor; - }else if(target.GetComponent()){ + if(target.GetComponent()){ target.GetComponent().material.color=fromColor; }else if(target.GetComponent()){ target.GetComponent().color=fromColor; @@ -757,7 +596,7 @@ public static void ColorFrom(GameObject target, Hashtable args){ } /// - /// Changes a GameObject's color values over time with MINIMUM customization options. If a GUIText or GUITexture component is attached, they will become the target of the animation. + /// Changes a GameObject's color values over time with MINIMUM customization options. /// /// /// A to be the target of the animation. @@ -773,7 +612,7 @@ public static void ColorTo(GameObject target, Color color, float time){ } /// - /// Changes a GameObject's color values over time with FULL customization options. If a GUIText or GUITexture component is attached, they will become the target of the animation. + /// Changes a GameObject's color values over time with FULL customization options. /// /// /// A to change the GameObject's color to. @@ -3326,13 +3165,7 @@ void GenerateColorToTargets(){ //colors = new Color[3]; //from and init to values: - if(GetComponent()){ - colors = new Color[1,3]; - colors[0,0] = colors[0,1] = GetComponent().color; - }else if(GetComponent()){ - colors = new Color[1,3]; - colors[0,0] = colors[0,1] = GetComponent().material.color; - }else if(GetComponent()){ + if(GetComponent()){ colors = new Color[GetComponent().materials.Length,3]; for (int i = 0; i < GetComponent().materials.Length; i++) { colors[i,0]=GetComponent().materials[i].GetColor(namedcolorvalue.ToString()); @@ -4102,13 +3935,7 @@ void ApplyColorToTargets(){ */ //apply: - if(GetComponent()){ - //guiTexture.color=colors[2]; - GetComponent().color=colors[0,2]; - }else if(GetComponent()){ - //guiText.material.color=colors[2]; - GetComponent().material.color=colors[0,2]; - }else if(GetComponent()){ + if(GetComponent()){ //renderer.material.color=colors[2]; for (int i = 0; i < colors.GetLength(0); i++) { GetComponent().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,2]); @@ -4120,13 +3947,7 @@ void ApplyColorToTargets(){ //dial in: if(percentage==1){ - if(GetComponent()){ - //guiTexture.color=colors[1]; - GetComponent().color=colors[0,1]; - }else if(GetComponent()){ - //guiText.material.color=colors[1]; - GetComponent().material.color=colors[0,1]; - }else if(GetComponent()){ + if(GetComponent()){ //renderer.material.color=colors[1]; for (int i = 0; i < colors.GetLength(0); i++) { GetComponent().materials[i].SetColor(namedcolorvalue.ToString(),colors[i,1]); @@ -4159,7 +3980,7 @@ void ApplyStabTargets(){ } void ApplyMoveToPathTargets(){ - preUpdate = thisTransform.position; + //preUpdate = thisTransform.position; float t = ease(0,1,percentage); float lookAheadAmount; @@ -4191,14 +4012,14 @@ void ApplyMoveToPathTargets(){ //need physics? postUpdate=thisTransform.position; if(physics){ - thisTransform.position=preUpdate; + //thisTransform.position=preUpdate; GetComponent().MovePosition(postUpdate); } } void ApplyMoveToTargets(){ //record current: - preUpdate=thisTransform.position; + //preUpdate=thisTransform.position; //calculate: @@ -4225,13 +4046,13 @@ void ApplyMoveToTargets(){ //need physics? postUpdate=thisTransform.position; if(physics){ - thisTransform.position=preUpdate; + //thisTransform.position=preUpdate; GetComponent().MovePosition(postUpdate); } } void ApplyMoveByTargets(){ - preUpdate = thisTransform.position; + //preUpdate = thisTransform.position; //reset rotation to prevent look interferences as object rotates and attempts to move with translate and record current rotation Vector3 currentRotation = new Vector3(); @@ -4267,7 +4088,7 @@ void ApplyMoveByTargets(){ //need physics? postUpdate=thisTransform.position; if(physics){ - thisTransform.position=preUpdate; + //thisTransform.position=preUpdate; GetComponent().MovePosition(postUpdate); } } @@ -4302,7 +4123,7 @@ void ApplyLookToTargets(){ } void ApplyRotateToTargets(){ - preUpdate=thisTransform.eulerAngles; + //preUpdate=thisTransform.eulerAngles; //calculate: vector3s[2].x = ease(vector3s[0].x,vector3s[1].x,percentage); @@ -4328,13 +4149,13 @@ void ApplyRotateToTargets(){ //need physics? postUpdate=thisTransform.eulerAngles; if(physics){ - thisTransform.eulerAngles=preUpdate; + //thisTransform.eulerAngles=preUpdate; GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } void ApplyRotateAddTargets(){ - preUpdate = thisTransform.eulerAngles; + //preUpdate = thisTransform.eulerAngles; //calculate: vector3s[2].x = ease(vector3s[0].x,vector3s[1].x,percentage); @@ -4350,18 +4171,18 @@ void ApplyRotateAddTargets(){ //need physics? postUpdate=thisTransform.eulerAngles; if(physics){ - thisTransform.eulerAngles=preUpdate; + //thisTransform.eulerAngles=preUpdate; GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } void ApplyShakePositionTargets(){ //preUpdate = transform.position; - if (isLocal) { - preUpdate = thisTransform.localPosition; - }else{ - preUpdate = thisTransform.position; - } + //if (isLocal) { + // preUpdate = thisTransform.localPosition; + //}else{ + // preUpdate = thisTransform.position; + //} //reset rotation to prevent look interferences as object rotates and attempts to move with translate and record current rotation Vector3 currentRotation = new Vector3(); @@ -4406,7 +4227,7 @@ void ApplyShakePositionTargets(){ //need physics? postUpdate=thisTransform.position; if(physics){ - thisTransform.position=preUpdate; + //thisTransform.position=preUpdate; GetComponent().MovePosition(postUpdate); } } @@ -4431,7 +4252,7 @@ void ApplyShakeScaleTargets(){ } void ApplyShakeRotationTargets(){ - preUpdate = thisTransform.eulerAngles; + //preUpdate = thisTransform.eulerAngles; //impact: if (percentage==0) { @@ -4453,13 +4274,13 @@ void ApplyShakeRotationTargets(){ //need physics? postUpdate=thisTransform.eulerAngles; if(physics){ - thisTransform.eulerAngles=preUpdate; + //thisTransform.eulerAngles=preUpdate; GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } void ApplyPunchPositionTargets(){ - preUpdate = thisTransform.position; + //preUpdate = thisTransform.position; //reset rotation to prevent look interferences as object rotates and attempts to move with translate and record current rotation Vector3 currentRotation = new Vector3(); @@ -4507,13 +4328,13 @@ void ApplyPunchPositionTargets(){ //need physics? postUpdate=thisTransform.position; if(physics){ - thisTransform.position=preUpdate; + //thisTransform.position=preUpdate; GetComponent().MovePosition(postUpdate); } } void ApplyPunchRotationTargets(){ - preUpdate = thisTransform.eulerAngles; + //preUpdate = thisTransform.eulerAngles; //calculate: if(vector3s[1].x>0){ @@ -4548,7 +4369,7 @@ void ApplyPunchRotationTargets(){ //need physics? postUpdate=thisTransform.eulerAngles; if(physics){ - thisTransform.eulerAngles=preUpdate; + //thisTransform.eulerAngles=preUpdate; GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -4848,11 +4669,7 @@ public static void ColorUpdate(GameObject target, Hashtable args){ } //init values: - if(target.GetComponent()){ - colors[0] = colors[1] = target.GetComponent().color; - }else if(target.GetComponent()){ - colors[0] = colors[1] = target.GetComponent().material.color; - }else if(target.GetComponent()){ + if(target.GetComponent()){ colors[0] = colors[1] = target.GetComponent().material.color; }else if(target.GetComponent()){ colors[0] = colors[1] = target.GetComponent().color; @@ -4883,11 +4700,7 @@ public static void ColorUpdate(GameObject target, Hashtable args){ colors[3].a=Mathf.SmoothDamp(colors[0].a,colors[1].a,ref colors[2].a,time); //apply: - if(target.GetComponent()){ - target.GetComponent().color=colors[3]; - }else if(target.GetComponent()){ - target.GetComponent().material.color=colors[3]; - }else if(target.GetComponent()){ + if(target.GetComponent()){ target.GetComponent().material.color=colors[3]; }else if(target.GetComponent()){ target.GetComponent().color=colors[3]; @@ -5068,7 +4881,7 @@ public static void RotateUpdate(GameObject target, Hashtable args){ //need physics? if(target.GetComponent() != null){ Vector3 postUpdate=target.transform.eulerAngles; - target.transform.eulerAngles=preUpdate; + //target.transform.eulerAngles=preUpdate; target.GetComponent().MoveRotation(Quaternion.Euler(postUpdate)); } } @@ -5277,7 +5090,7 @@ public static void MoveUpdate(GameObject target, Hashtable args){ //need physics? if(target.GetComponent() != null){ Vector3 postUpdate=target.transform.position; - target.transform.position=preUpdate; + //target.transform.position=preUpdate; target.GetComponent().MovePosition(postUpdate); } } @@ -5458,26 +5271,7 @@ public static float PathLength(Vector3[] path){ return pathLength; } - - /// - /// Creates and returns a full-screen Texture2D for use with CameraFade. - /// - /// - /// Texture2D - /// - /// - /// Color - /// - public static Texture2D CameraTexture(Color color){ - Texture2D texture = new Texture2D(Screen.width,Screen.height,TextureFormat.ARGB32, false); - Color[] colors = new Color[Screen.width*Screen.height]; - for (int i = 0; i < colors.Length; i++) { - colors[i]=color; - } - texture.SetPixels(colors); - texture.Apply(); - return(texture); - } + /// /// Puts a GameObject on a path at the provided percentage @@ -5983,109 +5777,6 @@ public static void DrawPathHandles(Transform[] path,Color color) { } } - /// - /// Changes a camera fade's texture. - /// - /// - /// A - /// - public static void CameraFadeDepth(int depth){ - if(cameraFade){ - cameraFade.transform.position=new Vector3(cameraFade.transform.position.x,cameraFade.transform.position.y,depth); - } - } - - /// - /// Removes and destroyes a camera fade. - /// - public static void CameraFadeDestroy(){ - if(cameraFade){ - Destroy(cameraFade); - } - } - - /// - /// Changes a camera fade's texture. - /// - /// - /// A - /// - public static void CameraFadeSwap(Texture2D texture){ - if(cameraFade){ - cameraFade.GetComponent().texture=texture; - } - } - - /// - /// Creates a GameObject (if it doesn't exist) at the supplied depth that can be used to simulate a camera fade. - /// - /// - /// A - /// - /// - /// A - /// - /// - /// A for a reference to the CameraFade. - /// - public static GameObject CameraFadeAdd(Texture2D texture, int depth){ - if(cameraFade){ - return null; - }else{ - //establish colorFade object: - cameraFade = new GameObject("iTween Camera Fade"); - cameraFade.transform.position= new Vector3(.5f,.5f,depth); - cameraFade.AddComponent(); - cameraFade.GetComponent().texture=texture; - cameraFade.GetComponent().color = new Color(.5f,.5f,.5f,0); - return cameraFade; - } - } - - /// - /// Creates a GameObject (if it doesn't exist) at the default depth that can be used to simulate a camera fade. - /// - /// - /// A - /// - /// - /// A for a reference to the CameraFade. - /// - public static GameObject CameraFadeAdd(Texture2D texture){ - if(cameraFade){ - return null; - }else{ - //establish colorFade object: - cameraFade = new GameObject("iTween Camera Fade"); - cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth); - cameraFade.AddComponent(); - cameraFade.GetComponent().texture=texture; - cameraFade.GetComponent().color = new Color(.5f,.5f,.5f,0); - return cameraFade; - } - } - - /// - /// Creates a GameObject (if it doesn't exist) at the default depth filled with black that can be used to simulate a camera fade. - /// - /// - /// A for a reference to the CameraFade. - /// - public static GameObject CameraFadeAdd(){ - if(cameraFade){ - return null; - }else{ - //establish colorFade object: - cameraFade = new GameObject("iTween Camera Fade"); - cameraFade.transform.position= new Vector3(.5f,.5f,Defaults.cameraFadeDepth); - cameraFade.AddComponent(); - cameraFade.GetComponent().texture=CameraTexture(Color.black); - cameraFade.GetComponent().color = new Color(.5f,.5f,.5f,0); - return cameraFade; - } - } - - //################################# //# RESUME UTILITIES AND OVERLOADS # //################################# diff --git a/GamebaseSample/Assets/TOAST/SmartDL.meta b/GamebaseSample/Assets/TOAST/SmartDL.meta index db00c95..1630805 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 241479a109a3e82429f04812b44d02df folderAsset: yes -timeCreated: 1571030883 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Editor.meta b/GamebaseSample/Assets/TOAST/SmartDL/Editor.meta index 91eaf71..a70d8f7 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Editor.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Editor.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 2dfded25dcdca9a46b80234997a80004 folderAsset: yes -timeCreated: 1561344634 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Editor/SmartDlAboutWindow.cs b/GamebaseSample/Assets/TOAST/SmartDL/Editor/SmartDlAboutWindow.cs index 1665246..4a3852e 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Editor/SmartDlAboutWindow.cs +++ b/GamebaseSample/Assets/TOAST/SmartDL/Editor/SmartDlAboutWindow.cs @@ -50,7 +50,7 @@ private void OnGUI() using (new EditorGUILayout.HorizontalScope()) { GUILayout.Label(TEXT_VERSION, GUILayout.ExpandWidth(false)); - GUILayout.Label(SdkVersion.Version); + GUILayout.Label(SdkVersion.VERSION); } GUILayout.Space(4); diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll index 05e6371..746c6be 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll.meta index 9082032..5a136cd 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/SmartDLClient.dll.meta @@ -3,84 +3,32 @@ guid: 8c43adbf9c84bd746badbf99aea23a42 timeCreated: 1512115683 licenseType: Pro PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Android: - enabled: 1 - settings: - CPU: ARMv7 - Any: - enabled: 1 - settings: - Exclude Android: 0 - Exclude Editor: 0 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude OSXIntel: 0 - Exclude OSXIntel64: 0 - Exclude OSXUniversal: 0 - Exclude WebGL: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 0 - Editor: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel64: - enabled: 1 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - WebGL: - enabled: 1 - settings: {} - Win: - enabled: 1 - settings: - CPU: AnyCPU - Win64: - enabled: 1 - settings: - CPU: AnyCPU - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU data: - enabled: 0 - settings: {} - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS.meta index 2cb8429..0fee504 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: a74101da6abe34a4c8455e7f7b8b2ac5 folderAsset: yes -timeCreated: 1505453940 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll index ce97f17..b879715 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll.meta index 7c88f9b..036023c 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/SmartDLClient.iOS.dll.meta @@ -3,73 +3,143 @@ guid: 5e064069c93b63144923f53f8669c1cc timeCreated: 1542175873 licenseType: Pro PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Android: - enabled: 0 - settings: - CPU: ARMv7 - Any: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Editor: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 0 - settings: - CPU: x86 - Linux64: - enabled: 0 - settings: - CPU: x86_64 - OSXIntel: - enabled: 0 - settings: - CPU: AnyCPU - OSXIntel64: - enabled: 0 - settings: - CPU: AnyCPU - Win: - enabled: 0 - settings: - CPU: AnyCPU - Win64: - enabled: 0 - settings: - CPU: AnyCPU - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - data: - enabled: 0 - settings: {} - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: + data: + first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 0 + data: + first: + '': Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + OS: AnyOS + data: + first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: x86 + data: + first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework.meta index c8c3abf..f3d8330 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework.meta @@ -4,69 +4,136 @@ folderAsset: yes timeCreated: 1540430811 licenseType: Pro PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Android: - enabled: 0 - settings: - CPU: ARMv7 - Any: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - Editor: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 0 - settings: - CPU: x86 - Linux64: - enabled: 0 - settings: - CPU: x86_64 - OSXIntel: - enabled: 0 - settings: - CPU: AnyCPU - OSXIntel64: - enabled: 0 - settings: - CPU: AnyCPU - Win: - enabled: 0 - settings: - CPU: AnyCPU - Win64: - enabled: 0 - settings: - CPU: AnyCPU - data: - enabled: 0 - settings: {} - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: CoreTelephony; + data: + first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 0 + data: + first: + '': Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + OS: AnyOS + data: + first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: x86 + data: + first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: CoreTelephony; userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers.meta index 7e65e08..ed5fabe 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers.meta @@ -2,6 +2,7 @@ fileFormatVersion: 2 guid: ffaa031f7c9ec496abb53571e25134a7 folderAsset: yes DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/SmartDLClientIos.h.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/SmartDLClientIos.h.meta index cf7af6b..610d34e 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/SmartDLClientIos.h.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/SmartDLClientIos.h.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 4f115a632f4604eb5a2cea20d690abcb -timeCreated: 1553668294 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h index fb6f847..85799ba 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h @@ -4,15 +4,6 @@ #import extern "C" { - enum SystemInfo - { - CountryCode = 0, - OsVersion, - Language, - Locale, - Ip - }; - SMART_DL_API char* GetCountryCode(); SMART_DL_API char* GetOsVersion(); SMART_DL_API char* GetLanguage(); @@ -20,6 +11,5 @@ extern "C" { SMART_DL_API char* GetMobileCountry(); SMART_DL_API char* GetMobileCarrier(); - SMART_DL_API unsigned long GetAvailableFreeSpace(char* path); - SMART_DL_API bool CanDownloadToDisk(char* path, int64_t totalWillDownloadBytes); + SMART_DL_API char* GetAvailableFreeSpace(char* path, unsigned long& availableFreeSpace); } diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h.meta index c2baaea..c2d3502 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Headers/collector.h.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 6646d1f21b7004395b346f1217642c9c -timeCreated: 1553668294 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist index 2bba55a..794d8c9 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist.meta index 2dbd624..209ec2a 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/Info.plist.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 17c921596724a47348f6c186e5a9c9b8 -timeCreated: 1553668294 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative index 3166bbe..8a5307e 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative.meta index 6e8a93c..a295209 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/iOS/smartdlnative.framework/smartdlnative.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: d3d687cf209874026b5bf35f684edfcf -timeCreated: 1553668294 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle.meta index d06dd89..77fec0d 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle.meta @@ -1,131 +1,40 @@ fileFormatVersion: 2 guid: a7c94ace5d64c4bab92644cf9ef4670c folderAsset: yes -timeCreated: 1500971234 -licenseType: Pro PluginImporter: + externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - data: - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 0 - Exclude OSXIntel64: 0 - Exclude OSXUniversal: 0 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - data: - first: - '': Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - OS: OSX - data: - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - data: - first: - Any: - second: - enabled: 0 - settings: {} - data: - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - data: - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: x86 - data: - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - data: - first: - Standalone: OSXIntel - second: - enabled: 1 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXIntel64 - second: - enabled: 1 - settings: - CPU: AnyCPU - data: - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: {} - data: - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - data: - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + - first: + '': OSXIntel + second: + enabled: 1 + settings: {} + - first: + '': OSXIntel64 + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents.meta index 8eb01cf..e2b32b5 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 9bf536b653e4541b1a6a74bb67f40004 folderAsset: yes -timeCreated: 1515479147 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist index 7eccdb0..054b61d 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18D109 + 19F101 CFBundleDevelopmentRegion en CFBundleExecutable @@ -27,17 +27,19 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 10B61 + 11E146 DTPlatformVersion GM DTSDKBuild - 18B71 + 19E258 DTSDKName - macosx10.14 + macosx10.15 DTXcode - 1010 + 1140 DTXcodeBuild - 10B61 + 11E146 + LSMinimumSystemVersion + 10.10 NSHumanReadableCopyright © NHN Corp. All rights reserved. diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist.meta index 930440d..8df9a42 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/Info.plist.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 3f19380ad87094d3e82cab2dea4ba336 -timeCreated: 1553668294 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS.meta index 1337d6b..9abb9e2 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: 2fd9d1bcfa7aa4a54a10235430d37d1d folderAsset: yes -timeCreated: 1515479147 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative index 459bfa8..3eb575b 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative.meta index dc25f60..4aaad92 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/smartdlnative.bundle/Contents/MacOS/smartdlnative.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: e6e7e622b4ce84d2b95138f5862dc2ce -timeCreated: 1553668294 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86.meta index 83ede9f..8eb609c 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: cbd184d4d66b79c47958974995f14769 folderAsset: yes -timeCreated: 1544495220 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86/smartdlnative.dll b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86/smartdlnative.dll index bb31497..6ff5a0d 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86/smartdlnative.dll and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86/smartdlnative.dll differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64.meta index b902649..29d2d9d 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 guid: d56d5ceade8c1644caeab044c8206e2b folderAsset: yes -timeCreated: 1544495233 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll index 6a61a97..d98163a 100644 Binary files a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll and b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll differ diff --git a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll.meta b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll.meta index 4f910fa..48241d2 100644 --- a/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll.meta +++ b/GamebaseSample/Assets/TOAST/SmartDL/Plugins/x86_64/smartdlnative.dll.meta @@ -3,77 +3,137 @@ guid: accfe3b808950c1408abc87e1f0726d9 timeCreated: 1544495239 licenseType: Pro PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Android: - enabled: 0 - settings: - CPU: ARMv7 - Any: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 0 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 0 - Exclude iOS: 1 - Editor: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - Linux: - enabled: 0 - settings: - CPU: None - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: x86_64 - OSXIntel: - enabled: 0 - settings: - CPU: None - OSXIntel64: - enabled: 1 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 0 - settings: - CPU: x86_64 - Win: - enabled: 0 - settings: - CPU: None - Win64: - enabled: 1 - settings: - CPU: AnyCPU - data: - enabled: 0 - settings: {} - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: + data: + first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 0 + Exclude iOS: 1 + data: + first: + '': Editor + second: + enabled: 0 + settings: + CPU: x86_64 + OS: Windows + data: + first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Facebook: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: None + data: + first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: None + data: + first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/GamebaseSample/ProjectSettings/AudioManager.asset b/GamebaseSample/ProjectSettings/AudioManager.asset index 45ac887..da61125 100644 Binary files a/GamebaseSample/ProjectSettings/AudioManager.asset and b/GamebaseSample/ProjectSettings/AudioManager.asset differ diff --git a/GamebaseSample/ProjectSettings/ClusterInputManager.asset b/GamebaseSample/ProjectSettings/ClusterInputManager.asset index 5209659..e7886b2 100644 Binary files a/GamebaseSample/ProjectSettings/ClusterInputManager.asset and b/GamebaseSample/ProjectSettings/ClusterInputManager.asset differ diff --git a/GamebaseSample/ProjectSettings/DynamicsManager.asset b/GamebaseSample/ProjectSettings/DynamicsManager.asset index ea0bdda..78992f0 100644 Binary files a/GamebaseSample/ProjectSettings/DynamicsManager.asset and b/GamebaseSample/ProjectSettings/DynamicsManager.asset differ diff --git a/GamebaseSample/ProjectSettings/EditorBuildSettings.asset b/GamebaseSample/ProjectSettings/EditorBuildSettings.asset index dce25ce..9398953 100644 Binary files a/GamebaseSample/ProjectSettings/EditorBuildSettings.asset and b/GamebaseSample/ProjectSettings/EditorBuildSettings.asset differ diff --git a/GamebaseSample/ProjectSettings/EditorSettings.asset b/GamebaseSample/ProjectSettings/EditorSettings.asset index 96dd167..65d431d 100644 Binary files a/GamebaseSample/ProjectSettings/EditorSettings.asset and b/GamebaseSample/ProjectSettings/EditorSettings.asset differ diff --git a/GamebaseSample/ProjectSettings/GraphicsSettings.asset b/GamebaseSample/ProjectSettings/GraphicsSettings.asset index 6c9fc3d..a9bbfb0 100644 Binary files a/GamebaseSample/ProjectSettings/GraphicsSettings.asset and b/GamebaseSample/ProjectSettings/GraphicsSettings.asset differ diff --git a/GamebaseSample/ProjectSettings/InputManager.asset b/GamebaseSample/ProjectSettings/InputManager.asset index a87ceb9..17c8f53 100644 Binary files a/GamebaseSample/ProjectSettings/InputManager.asset and b/GamebaseSample/ProjectSettings/InputManager.asset differ diff --git a/GamebaseSample/ProjectSettings/NavMeshAreas.asset b/GamebaseSample/ProjectSettings/NavMeshAreas.asset index 4fc0289..3b0b7c3 100644 Binary files a/GamebaseSample/ProjectSettings/NavMeshAreas.asset and b/GamebaseSample/ProjectSettings/NavMeshAreas.asset differ diff --git a/GamebaseSample/ProjectSettings/NetworkManager.asset b/GamebaseSample/ProjectSettings/NetworkManager.asset index be6ee7c..5dc6a83 100644 Binary files a/GamebaseSample/ProjectSettings/NetworkManager.asset and b/GamebaseSample/ProjectSettings/NetworkManager.asset differ diff --git a/GamebaseSample/ProjectSettings/Physics2DSettings.asset b/GamebaseSample/ProjectSettings/Physics2DSettings.asset index bafea9e..132ee6b 100644 Binary files a/GamebaseSample/ProjectSettings/Physics2DSettings.asset and b/GamebaseSample/ProjectSettings/Physics2DSettings.asset differ diff --git a/GamebaseSample/ProjectSettings/ProjectSettings.asset b/GamebaseSample/ProjectSettings/ProjectSettings.asset index a252a24..ac561d8 100644 Binary files a/GamebaseSample/ProjectSettings/ProjectSettings.asset and b/GamebaseSample/ProjectSettings/ProjectSettings.asset differ diff --git a/GamebaseSample/ProjectSettings/ProjectVersion.txt b/GamebaseSample/ProjectSettings/ProjectVersion.txt index 2184611..0ad334d 100644 --- a/GamebaseSample/ProjectSettings/ProjectVersion.txt +++ b/GamebaseSample/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.6f2 +m_EditorVersion: 2017.4.16f1 diff --git a/GamebaseSample/ProjectSettings/QualitySettings.asset b/GamebaseSample/ProjectSettings/QualitySettings.asset index fae0ac3..6f22f0f 100644 Binary files a/GamebaseSample/ProjectSettings/QualitySettings.asset and b/GamebaseSample/ProjectSettings/QualitySettings.asset differ diff --git a/GamebaseSample/ProjectSettings/TagManager.asset b/GamebaseSample/ProjectSettings/TagManager.asset index 60d4cc0..1c92a78 100644 Binary files a/GamebaseSample/ProjectSettings/TagManager.asset and b/GamebaseSample/ProjectSettings/TagManager.asset differ diff --git a/GamebaseSample/ProjectSettings/TimeManager.asset b/GamebaseSample/ProjectSettings/TimeManager.asset index 0e84c3a..558a017 100644 Binary files a/GamebaseSample/ProjectSettings/TimeManager.asset and b/GamebaseSample/ProjectSettings/TimeManager.asset differ diff --git a/GamebaseSample/ProjectSettings/UnityConnectSettings.asset b/GamebaseSample/ProjectSettings/UnityConnectSettings.asset index f63bab9..1be4600 100644 Binary files a/GamebaseSample/ProjectSettings/UnityConnectSettings.asset and b/GamebaseSample/ProjectSettings/UnityConnectSettings.asset differ