diff --git a/.gitignore b/.gitignore index f9e4212..6cc8363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,34 @@ +# This .gitignore file should be placed at the root of your Unity project directory +# +# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore +# /[Ll]ibrary/ /[Tt]emp/ /[Oo]bj/ /[Bb]uild/ /[Bb]uilds/ -/Assets/AssetStoreTools* -/.gradle/ -/.idea/ +/[Ll]ogs/ +/[Uu]ser[Ss]ettings/ -# Visual Studio 2015 cache directory -/.vs/ +# MemoryCaptures can get excessive in size. +# They also could contain extremely sensitive data +/[Mm]emoryCaptures/ + +# Asset meta data should only be ignored when the corresponding asset is also ignored +!/[Aa]ssets/**/*.meta + +# Uncomment this line if you wish to ignore the asset store tools plugin +# /[Aa]ssets/AssetStoreTools* + +# Autogenerated Jetbrains Rider plugin +/[Aa]ssets/Plugins/Editor/JetBrains* + +# Visual Studio cache directory +.vs/ +.vscode/ + +# Gradle cache directory +.gradle/ # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ @@ -24,14 +44,29 @@ ExportedObj/ *.booproj *.svd *.pdb +*.mdb +*.opendb +*.VC.db # Unity3D generated meta files *.pidb.meta +*.pdb.meta +*.mdb.meta -# Unity3D Generated File On Crash Reports +# Unity3D generated file on crash reports sysinfo.txt # Builds *.apk -/.project -MemoryCaptures +*.aab +*.unitypackage + +# Crashlytics generated file +crashlytics-build.properties + +# Packed Addressables +/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* + +# Temporary auto-generated Android Assets +/[Aa]ssets/[Ss]treamingAssets/aa.meta +/[Aa]ssets/[Ss]treamingAssets/aa/* \ No newline at end of file diff --git a/Assets/BackgroundAudio/Plugins/Android/BackgroundAudioService.java b/Assets/BackgroundAudio/Plugins/Android/BackgroundAudioService.java index 5291ecb..8b14b96 100644 --- a/Assets/BackgroundAudio/Plugins/Android/BackgroundAudioService.java +++ b/Assets/BackgroundAudio/Plugins/Android/BackgroundAudioService.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.content.res.Resources; import android.media.MediaPlayer; +import android.media.PlaybackParams; import android.net.Uri; import android.os.Build; import android.os.IBinder; @@ -37,6 +38,7 @@ public class BackgroundAudioService extends Service { private static final String EXTRA_INSTANCE_ID = "instanceId"; private static final String EXTRA_VOLUME = "volume"; private static final String EXTRA_LOOP = "loop"; + private static final String EXTRA_SPEED = "speed"; private static final String ACTION_SET_VOLUME = "volume"; private static final String ACTION_SET_LOOP = "loop"; @@ -47,6 +49,7 @@ public class BackgroundAudioService extends Service { private static final String ACTION_RESUME = "resume"; private static final String ACTION_SEEK = "seek"; private static final String ACTION_STOP_SERVICE = "stopService"; + private static final String ACTION_SET_SPEED = "speed"; private static final String TAG = "BackgroundAudio"; private volatile static HashMap usedMediaPlayers = new HashMap<>(); @@ -239,6 +242,23 @@ public int onStartCommand(Intent intent, int flags, int startId) { serviceActive = false; stopSelf(); + break; + } + case ACTION_SET_SPEED:{ + if (!usedMediaPlayers.containsKey(instanceId)) break; + MediaWrapper wrapper = usedMediaPlayers.get(instanceId); + + float speed = intent.getFloatExtra(EXTRA_SPEED, 1f); + + try { + PlaybackParams params = wrapper.player.getPlaybackParams(); + params.setSpeed(speed); + wrapper.player.setPlaybackParams(params); + } catch (Exception e) { + Log.d(TAG, e.getMessage()); + throw e; + } + break; } } @@ -407,8 +427,17 @@ public static void setLoop(Context context, int id, boolean value) { context.startService(intent); } + private static void setSpeed(Context context, int id, float speed) { + Intent intent = new Intent(context, BackgroundAudioService.class); + intent.putExtra(EXTRA_INSTANCE_ID, id); + intent.setAction(ACTION_SET_SPEED); + intent.putExtra(EXTRA_SPEED, speed); + + context.startService(intent); + } + @Override public IBinder onBind(Intent intent) { return null; } -} \ No newline at end of file +} diff --git a/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java b/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java index 9bd2fcd..e0957b4 100644 --- a/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java +++ b/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java @@ -7,6 +7,7 @@ public class MediaWrapper { public MediaPlayer player; public int instanceId; public boolean playing, paused; + public float speed; public MediaWrapper(int instanceId) { this.player = new MediaPlayer(); @@ -17,5 +18,6 @@ public void Reset(){ this.player.reset(); this.playing = false; this.paused = false; + this.speed = 1; } } diff --git a/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java.meta b/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java.meta index d2ebc3c..1c1876a 100644 --- a/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java.meta +++ b/Assets/BackgroundAudio/Plugins/Android/MediaWrapper.java.meta @@ -9,12 +9,29 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 + validateReferences: 1 platformData: + - first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 1 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 - first: Android: Android second: enabled: 1 - settings: {} + settings: + CPU: ARMv7 - first: Any: second: @@ -25,7 +42,59 @@ PluginImporter: second: enabled: 0 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift b/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift index 84f2f8e..e05b3f2 100644 --- a/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift +++ b/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift @@ -28,7 +28,6 @@ class AudioInstance: AVAudioPlayer, AVAudioPlayerDelegate { print("\(#function) called on an audioplayer with no InstanceId"); return; } - UnityBackgroundAudio.dispose(instanceId: instanceId); } } diff --git a/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift.meta b/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift.meta index 3b87def..0830617 100644 --- a/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift.meta +++ b/Assets/BackgroundAudio/Plugins/iOS/AudioInstance.swift.meta @@ -9,6 +9,7 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: Any: diff --git a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm index fff37af..c99439f 100644 --- a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm +++ b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm @@ -1,8 +1,6 @@ - #import #import -// This header file is generated automatically when Xcode build runs. -#import "unityswift-Swift.h" // Required +#import "UnityFramework/UnityFramework-Swift.h" extern "C" { @@ -46,6 +44,9 @@ void _setLoop(const int identifier, const bool value) { [UnityBackgroundAudio setLoopForInstanceId:identifier to:value]; } + void _setSpeed(const int identifier, const float speed){ + [UnityBackgroundAudio setSpeedForInstanceId:identifier to:speed]; + } bool _isLooping(const int identifier) { return [UnityBackgroundAudio isLoopingOnInstanceId:identifier]; diff --git a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm.meta b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm.meta index d04fa6e..c44be52 100644 --- a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm.meta +++ b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.mm.meta @@ -9,6 +9,7 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: Any: diff --git a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift index da37a1d..3407dd3 100644 --- a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift +++ b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift @@ -9,15 +9,14 @@ import UIKit import AVFoundation -@objc class UnityBackgroundAudio: NSObject { +@objc public class UnityBackgroundAudio: NSObject { private static var _players = [Int: AudioInstance](); - @objc static func initialize(_ instanceId: Int) { - + @objc public static func initialize(_ instanceId: Int) { do{ let audioSession = AVAudioSession.sharedInstance(); - try audioSession.setCategory(AVAudioSessionCategoryPlayback); + try audioSession.setCategory(AVAudioSession.Category.playback); try audioSession.setActive(true); } catch { print (error); @@ -25,13 +24,12 @@ import AVFoundation print("Successfully initialized player with Id \(instanceId) \n"); } - @objc static func play (onInstance instanceId: Int, fromUrl path: String) { + @objc public static func play (onInstance instanceId: Int, fromUrl path: String) { print("Trying to play from path: \(path)\n"); - do{ _players.updateValue(try AudioInstance.init(contentsOfURL: URL(fileURLWithPath: path), withId: instanceId), forKey: instanceId); let player = _players[instanceId]!; - + player.enableRate=true; if player.prepareToPlay(){ player.play(); print("Playing instance \(instanceId)"); @@ -45,17 +43,16 @@ import AVFoundation } } - @objc static func dispose (instanceId: Int){ + @objc public static func dispose (instanceId: Int){ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return; } - player.stop(); _players.removeValue(forKey: instanceId); } - @objc static func pause(instanceId: Int){ + @objc public static func pause(instanceId: Int){ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return; @@ -66,7 +63,7 @@ import AVFoundation } } - @objc static func resume(instanceId: Int){ + @objc public static func resume(instanceId: Int){ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return; @@ -75,11 +72,9 @@ import AVFoundation if !isPlaybackOver(onPlayer: player) { player.play(); } - } - @objc static func seek(instanceId: Int, forSeconds time: Float){ - + @objc public static func seek(instanceId: Int, forSeconds time: Float){ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return; @@ -89,7 +84,7 @@ import AVFoundation if seekTo < 0 { player.currentTime = 0; - } + } else if seekTo > player.duration { player.currentTime = player.duration; } @@ -98,63 +93,60 @@ import AVFoundation } } - @objc static func getDuration(forInstanceId instanceId: Int)->Float{ - + @objc public static func getDuration(forInstanceId instanceId: Int)->Float{ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return 0; } - return Float(player.duration); } - @objc static func getCurrentPosition(forInstanceId instanceId: Int)->Float{ - + @objc public static func getCurrentPosition(forInstanceId instanceId: Int)->Float{ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return 0; } - return Float(player.currentTime); } - @objc static func setVolume(forInstanceId instanceId: Int, to volume: Float){ - + @objc public static func setVolume(forInstanceId instanceId: Int, to volume: Float){ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return; } - player.volume = volume; } - @objc static func setLoop(forInstanceId instanceId: Int, to value: Bool){ - + @objc public static func setSpeed(forInstanceId instanceId: Int, to speed: Float){ + guard let player = _players[instanceId] else { + print("[\(#function)] Could not find instance \(instanceId)"); + return; + } + player.rate = speed; + //player.prepareToPlay(); + } + + @objc public static func setLoop(forInstanceId instanceId: Int, to value: Bool){ guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return; } - player.numberOfLoops = value == true ? -1 : 0; } - @objc static func isPlaying(onInstanceId instanceId: Int) -> Bool { - + @objc public static func isPlaying(onInstanceId instanceId: Int) -> Bool { guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return false; } - return !isPlaybackOver(onPlayer: player); } - @objc static func isLooping(onInstanceId instanceId: Int) -> Bool { - + @objc public static func isLooping(onInstanceId instanceId: Int) -> Bool { guard let player = _players[instanceId] else { print("[\(#function)] Could not find instance \(instanceId)"); return false; } - return (player.numberOfLoops != 0); } diff --git a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift.meta b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift.meta index 48f2c59..d84b764 100644 --- a/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift.meta +++ b/Assets/BackgroundAudio/Plugins/iOS/UnityBackgroundAudio.swift.meta @@ -9,6 +9,7 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: Any: diff --git a/Assets/BackgroundAudio/Scripts/Android/AndroidBackgroundAudio.cs b/Assets/BackgroundAudio/Scripts/Android/AndroidBackgroundAudio.cs index ce3c432..40daed8 100644 --- a/Assets/BackgroundAudio/Scripts/Android/AndroidBackgroundAudio.cs +++ b/Assets/BackgroundAudio/Scripts/Android/AndroidBackgroundAudio.cs @@ -9,19 +9,19 @@ public class AndroidBackgroundAudio : BackgroundAudioImplementation public const string CLASS_NAME = "BackgroundAudioService"; public const string INTERFACE_NAME = "BackgroundAudioServiceCallback"; public const string PACKAGE_NAME = "com.Faizan.Github.BackgroundAudio"; - + private const int SECONDS_TO_MILLISECONDS = 1000; private const float MILLISECONDS_TO_SECONDS = 0.001f; - + private static volatile AndroidJavaClass _service; private static volatile AndroidJavaObject _unityActivity; - + private AndroidBackgroundAudioCallback _callbackListener; private bool _playing, _paused, _looping; - private float _volume = 1; - + private float _volume = 1, _speed = 1; + public override event Action OnAudioStarted, OnAudioStopped, OnAudioPaused, OnAudioResumed; - + protected override void Initialize() { Application.runInBackground = true; @@ -30,10 +30,10 @@ protected override void Initialize() AndroidJavaClass unityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"); _unityActivity = unityClass.GetStatic("currentActivity"); } - + if (_service == null) _service = new AndroidJavaClass(PACKAGE_NAME + "." + CLASS_NAME); - + _callbackListener = new AndroidBackgroundAudioCallback(); _callbackListener.OnAudioStarted += () => { @@ -41,129 +41,142 @@ protected override void Initialize() _paused = false; SetLoop(_looping); SetVolume(_volume); - + OnAudioStarted?.Invoke(); }; - + _callbackListener.OnAudioStopped += () => { _playing = false; _paused = false; OnAudioStopped?.Invoke(); }; - + _callbackListener.OnAudioResumed += () => { _playing = true; _paused = false; OnAudioResumed?.Invoke(); }; - + _callbackListener.OnAudioPaused += () => { _playing = false; _paused = true; OnAudioPaused?.Invoke(); }; - + CallOnService("initialize", Id, _callbackListener); } - + ~AndroidBackgroundAudio() { CallOnService("uninitialize", Id); _callbackListener = null; - + if (IsPlaying()) { Stop(); } } - + public override void Play(string path) { CallOnService("play", _unityActivity, Id, path, Application.identifier); } - + public override void Pause() { if (!IsPlaying()) return; - + CallOnService("pause", _unityActivity, Id); } - + public override void Resume() { if (IsPlaying()) return; - + CallOnService("resume", _unityActivity, Id); } - + public override void Seek(float seconds) { if (!_playing && !_paused) return; - - CallOnService("seek", _unityActivity, Id, (int) (seconds * SECONDS_TO_MILLISECONDS)); + + CallOnService("seek", _unityActivity, Id, (int)(seconds * SECONDS_TO_MILLISECONDS)); } - + public override float GetVolume() { return _volume; } - + + public override float GetSpeed() + { + return _speed; + } + public override bool IsLooping() { return _looping; } - + public override bool IsPlaying() { return _playing && !_paused && (_playing = CallOnService("isPlaying", Id)); } - + public override bool IsPaused() { return _paused && (_paused = CallOnService("isPaused", Id)); } - + public override float GetCurrentPosition() { return _playing || _paused ? CallOnService("getCurrentPosition", Id) * MILLISECONDS_TO_SECONDS : 0; } - + public override float GetDuration() { return _playing || _paused ? CallOnService("getDuration", Id) * MILLISECONDS_TO_SECONDS : 0; } - + public override void Stop() { if (!_paused && !_playing) return; - + CallOnService("disposeInstance", _unityActivity, Id); } - + public override void SetVolume(float volume) { _volume = volume; if (!_playing && !_paused) return; - + CallOnService("setVolume", _unityActivity, Id, volume); } - + public override void SetLoop(bool value) { _looping = value; if (!_playing && !_paused) return; - + CallOnService("setLoop", _unityActivity, Id, value); } - + + public override void SetSpeed(float speed) + { + _speed = speed; + if (!_playing && !_paused) return; + + CallOnService("setSpeed", _unityActivity, Id, speed); + } + private static void CallOnService(string method, params object[] args) { _service.CallStatic(method, args); } - + private static T CallOnService(string method, params object[] args) { return _service.CallStatic(method, args); diff --git a/Assets/BackgroundAudio/Scripts/Base/BackgroundAudioImplementation.cs b/Assets/BackgroundAudio/Scripts/Base/BackgroundAudioImplementation.cs index 3ca3e35..cae4247 100644 --- a/Assets/BackgroundAudio/Scripts/Base/BackgroundAudioImplementation.cs +++ b/Assets/BackgroundAudio/Scripts/Base/BackgroundAudioImplementation.cs @@ -23,10 +23,12 @@ protected BackgroundAudioImplementation() public abstract void SetVolume(float volume); public abstract void SetLoop(bool value); + public abstract void SetSpeed(float speed); public abstract float GetCurrentPosition(); public abstract float GetDuration(); public abstract float GetVolume(); + public abstract float GetSpeed(); public abstract bool IsLooping(); public abstract bool IsPlaying(); diff --git a/Assets/BackgroundAudio/Scripts/Unsupported/UnsupportedPlatformBackgroundAudio.cs b/Assets/BackgroundAudio/Scripts/Unsupported/UnsupportedPlatformBackgroundAudio.cs index 26ec346..e13900b 100644 --- a/Assets/BackgroundAudio/Scripts/Unsupported/UnsupportedPlatformBackgroundAudio.cs +++ b/Assets/BackgroundAudio/Scripts/Unsupported/UnsupportedPlatformBackgroundAudio.cs @@ -12,72 +12,94 @@ public class UnsupportedPlatformBackgroundAudio : BackgroundAudioImplementation protected override void Initialize() { - throw new PlatformNotSupportedException(); + //throw new PlatformNotSupportedException(); } public override void Play(string path) { - throw new PlatformNotSupportedException(); + // throw new PlatformNotSupportedException(); } public override void Stop() { - throw new PlatformNotSupportedException(); + //throw new PlatformNotSupportedException(); } public override void Pause() { - throw new PlatformNotSupportedException(); + //throw new PlatformNotSupportedException(); } public override void Resume() { - throw new PlatformNotSupportedException(); + // throw new PlatformNotSupportedException(); } public override void Seek(float seconds) { - throw new PlatformNotSupportedException(); + //throw new PlatformNotSupportedException(); } public override void SetVolume(float volume) { - throw new PlatformNotSupportedException(); + // throw new PlatformNotSupportedException(); } public override void SetLoop(bool value) { - throw new PlatformNotSupportedException(); + //throw new PlatformNotSupportedException(); + } + public override void SetSpeed(float speed) + { + //throw new NotImplementedException(); } public override float GetCurrentPosition() { - throw new PlatformNotSupportedException(); + return 0; + //throw new PlatformNotSupportedException(); } public override float GetDuration() { - throw new PlatformNotSupportedException(); + return 0; + + //throw new PlatformNotSupportedException(); } public override float GetVolume() { - throw new PlatformNotSupportedException(); + return 0; + + // throw new PlatformNotSupportedException(); } public override bool IsLooping() { + return false; + throw new PlatformNotSupportedException(); } public override bool IsPlaying() { + return false; + throw new PlatformNotSupportedException(); } public override bool IsPaused() { + return false; + throw new PlatformNotSupportedException(); } + + public override float GetSpeed() + { + return 1; + + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/Assets/BackgroundAudio/Scripts/iOS/IOSBackgroundAudio.cs b/Assets/BackgroundAudio/Scripts/iOS/IOSBackgroundAudio.cs index bb2398a..b0d1016 100644 --- a/Assets/BackgroundAudio/Scripts/iOS/IOSBackgroundAudio.cs +++ b/Assets/BackgroundAudio/Scripts/iOS/IOSBackgroundAudio.cs @@ -8,54 +8,57 @@ public class IOSBackgroundAudio : BackgroundAudioImplementation { private static int _globalCounter; private bool _playing, _paused, _looping; - private float _volume = 1; - + private float _volume = 1, _speed = 1; + [DllImport("__Internal")] private static extern void _initialize(int id); - + [DllImport("__Internal")] private static extern void _play(int id, string path); - + [DllImport("__Internal")] private static extern void _resume(int id); - + [DllImport("__Internal")] private static extern void _pause(int id); - + [DllImport("__Internal")] private static extern void _stop(int id); - + [DllImport("__Internal")] private static extern void _seek(int id, float seconds); - + [DllImport("__Internal")] private static extern float _getCurrentPosition(int id); - + [DllImport("__Internal")] private static extern float _getDuration(int id); - + [DllImport("__Internal")] private static extern void _setVolume(int id, float volume); - + [DllImport("__Internal")] private static extern void _setLoop(int id, bool value); - + + [DllImport("__Internal")] + private static extern void _setSpeed(int id, float speed); + [DllImport("__Internal")] private static extern bool _isLooping(int id); - + [DllImport("__Internal")] private static extern bool _isPlaying(int id); - + public override event Action OnAudioStarted; public override event Action OnAudioStopped; public override event Action OnAudioPaused; public override event Action OnAudioResumed; - + protected override void Initialize() { _initialize(Id); } - + public override void Play(string path) { _play(Id, path); @@ -65,85 +68,98 @@ public override void Play(string path) _paused = false; OnAudioStarted?.Invoke(); } - + public override void Stop() { if (!IsPlaying()) return; - + _stop(Id); _playing = false; _paused = false; OnAudioStopped?.Invoke(); } - + public override void Pause() { if (!IsPlaying()) return; - + _pause(Id); _playing = false; _paused = true; OnAudioPaused?.Invoke(); } - + public override void Resume() { if (IsPlaying()) return; - + _resume(Id); _playing = true; _paused = false; OnAudioResumed?.Invoke(); } - + public override void Seek(float seconds) { if (!_playing && !_paused) return; - + _seek(Id, seconds); } - + public override float GetCurrentPosition() { return _playing || _paused ? _getCurrentPosition(Id) : 0; } - + public override float GetDuration() { return _playing || _paused ? _getDuration(Id) : 0; } - + public override float GetVolume() { return _volume; } - + + public override float GetSpeed() + { + return _speed; + } + public override void SetVolume(float volume) { _volume = volume; if (!_playing && !_paused) return; - + _setVolume(Id, volume); } - + public override void SetLoop(bool value) { _looping = value; if (!IsPlaying()) return; - + _setLoop(Id, value); } - + + public override void SetSpeed(float speed) + { + _speed = speed; + if (!_playing && !_paused) return; + + _setSpeed(Id, speed); + } + public override bool IsLooping() { return IsPlaying() && _looping && (_looping = _isLooping(Id)); } - + public override bool IsPlaying() { return _playing && !_paused && (_playing = _isPlaying(Id)); } - + public override bool IsPaused() { return _paused; diff --git a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb.meta b/Assets/ExternalDependencyManager.meta similarity index 60% rename from Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb.meta rename to Assets/ExternalDependencyManager.meta index 6327296..a02e655 100644 --- a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb.meta +++ b/Assets/ExternalDependencyManager.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: a62902835ed04594a6119107f3c61ed4 -labels: -- gvh -- gvh_version-1.2.102.0 +guid: b4ae57028da064004bc7cb55539549f5 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/UnitySwift/Editor.meta b/Assets/ExternalDependencyManager/Editor.meta similarity index 67% rename from Assets/UnitySwift/Editor.meta rename to Assets/ExternalDependencyManager/Editor.meta index 8042860..4ef5961 100644 --- a/Assets/UnitySwift/Editor.meta +++ b/Assets/ExternalDependencyManager/Editor.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 391a19e6f711b498fa514c157fed3a7a +guid: b42aa8acaabecbf943da2892de5e6aeb folderAsset: yes -timeCreated: 1467687641 +timeCreated: 1448926516 licenseType: Pro DefaultImporter: userData: diff --git a/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml b/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml new file mode 100644 index 0000000..efd69e2 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml @@ -0,0 +1,11 @@ + + + + + com.google + + + diff --git a/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta b/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta new file mode 100644 index 0000000..6a229b9 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 81e43a9734ee4e3d8d85776f1b564bd3 +labels: +- gvh_version-1.2.159 +- gvhp_exportpath-ExternalDependencyManager/Editor/GoogleRegistries.xml +- gvh +- gumpr_registries +timeCreated: 1583806049 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll b/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll deleted file mode 100644 index 125ba31..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb b/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb deleted file mode 100644 index c00532e..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb.meta b/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb.meta deleted file mode 100644 index 3acecb1..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: bdca12b389be428e9c46ee3a3c9cf6de -labels: -- gvh -- gvh_version-1.2.102.0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.meta b/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.meta deleted file mode 100644 index 57f085f..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: ceb87906bbbd45b79cc63a912b9f56e4 -labels: -- gvh -- gvh_targets-editor -- gvh_version-1.2.102.0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll b/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll deleted file mode 100644 index dcac4b7..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb b/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb deleted file mode 100644 index 3aabf6b..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.meta b/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.meta deleted file mode 100644 index 361ed72..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 22d30e33ee024ece954f1356eab393e2 -labels: -- gvh -- gvh_targets-editor -- gvh_version-1.2.102.0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll b/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll deleted file mode 100644 index 4d63ba3..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb b/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb deleted file mode 100644 index 3ebc0d6..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta b/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta deleted file mode 100644 index ac18f3e..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: f46780a3ea3341bb815ca22b3bb67c2a -labels: -- gvh -- gvh_version-1.2.102.0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta b/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta deleted file mode 100644 index c3efa3d..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 15afd7af02e6436cb771a21035797730 -labels: -- gvh -- gvh_targets-editor -- gvh_version-1.2.102.0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll b/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll deleted file mode 100644 index 1aa5d7d..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb b/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb deleted file mode 100644 index 80cb89a..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb.meta b/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb.meta deleted file mode 100644 index 3d5b436..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 5a3803e6b09841afbdc45fd712176c4e -labels: -- gvh -- gvh_version-1.2.102.0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.meta b/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.meta deleted file mode 100644 index 1dc6e94..0000000 --- a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.meta +++ /dev/null @@ -1,36 +0,0 @@ -fileFormatVersion: 2 -guid: 2d59d5c6ad0f462696d9674e4066e987 -labels: -- gvh -- gvh_targets-editor -- gvh_version-1.2.102.0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.102.0.txt b/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.102.0.txt deleted file mode 100644 index 3b06159..0000000 --- a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.102.0.txt +++ /dev/null @@ -1,8 +0,0 @@ -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.102.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.102.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.102.0.dll.mdb diff --git a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt b/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt new file mode 100644 index 0000000..a0268fc --- /dev/null +++ b/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt @@ -0,0 +1,2 @@ +Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb diff --git a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.102.0.txt.meta b/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt.meta similarity index 54% rename from Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.102.0.txt.meta rename to Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt.meta index 0ebc6ee..123eba0 100644 --- a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.102.0.txt.meta +++ b/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt.meta @@ -1,11 +1,12 @@ fileFormatVersion: 2 -guid: dca957f2e78547578641b8c491a50769 +guid: c69c623988cd643269334a577190568a labels: +- gvh_version-1.2.137.0 - gvh - gvh_manifest -- gvh_version-1.2.102.0 +timeCreated: 1474401009 +licenseType: Pro TextScriptImporter: - externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Android/gen.meta b/Assets/Plugins/Android/gen.meta deleted file mode 100644 index 8c02479..0000000 --- a/Assets/Plugins/Android/gen.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 6febd68171f29468a9ec53593b6eb0da -folderAsset: yes -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll index f33966c..5fde5c6 100644 Binary files a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll and b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll differ diff --git a/Assets/Sample.cs b/Assets/Sample.cs index c850c5a..55e2279 100644 --- a/Assets/Sample.cs +++ b/Assets/Sample.cs @@ -11,6 +11,8 @@ public class Sample : MonoBehaviour private BackgroundAudioImplementation _androidBackgroundAudio; [SerializeField] private Toggle _toggle; [SerializeField] private Slider _seekBar; + [SerializeField] private Text _speedTex; + [SerializeField] private Slider _speedBar; private void Awake() { @@ -18,6 +20,11 @@ private void Awake() _androidBackgroundAudio.OnAudioStarted += () => UnityMainThreadDispatcher.Instance().Enqueue(() => _seekBar.maxValue = _androidBackgroundAudio.GetDuration()); _toggle.onValueChanged.AddListener(SetLooping); + + } + private void Start() + { + _speedBar.value=(_androidBackgroundAudio.GetSpeed()/0.25f); } public void Play() @@ -27,14 +34,14 @@ public void Play() private void GetAudioFileURI(Action callback) { - #if UNITY_IOS // IOS can read from StreamingAssets +#if UNITY_IOS // IOS can read from StreamingAssets var filePath = Path.Combine(Application.streamingAssetsPath, "SampleAudio.mp3"); callback?.Invoke(filePath); return; - #endif - #if UNITY_ANDROID // Android can't +#endif +#if UNITY_ANDROID // Android can't var persistantPath = Path.Combine(Application.persistentDataPath, "SampleAudio.mp3"); var filePath = Path.Combine(Application.streamingAssetsPath, "SampleAudio.mp3"); Debug.Log($"PersistantPath: {persistantPath}"); @@ -50,7 +57,7 @@ private void GetAudioFileURI(Action callback) var req = new UnityWebRequest(filePath, UnityWebRequest.kHttpVerbGET, new DownloadHandlerFile(persistantPath), null); var asyncOp = req.SendWebRequest(); asyncOp.completed += op => { callback?.Invoke(persistantPath); }; - #endif +#endif } private void Update() @@ -85,4 +92,11 @@ public void SetLooping(bool value) { _androidBackgroundAudio.SetLoop(value); } + + public void SetSpeed(float value) + { + var speed = value * 0.25f; + _speedTex.text = speed.ToString(); + _androidBackgroundAudio.SetSpeed(speed); + } } \ No newline at end of file diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta index fdb75ae..d83e253 100644 --- a/Assets/Scenes.meta +++ b/Assets/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2fc8c0167b2e547b28e4dfb14e66a9df +guid: 2396adb6221704dc68ffc9b76a6cabd3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ead3499..aa8c35c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -167,8 +167,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 25 @@ -191,6 +189,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 49668450} m_CullTransparentMesh: 0 +--- !u!1 &79485547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 79485548} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &79485548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79485547} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 415649324} + m_Father: {fileID: 1860223507} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &185214576 GameObject: m_ObjectHideFlags: 0 @@ -281,8 +315,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &185214579 MonoBehaviour: m_ObjectHideFlags: 0 @@ -301,8 +333,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -484,8 +514,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -503,6 +531,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 264018116} m_CullTransparentMesh: 0 +--- !u!1 &415649323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 415649324} + - component: {fileID: 415649326} + - component: {fileID: 415649325} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &415649324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415649323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 79485548} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &415649325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415649323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &415649326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415649323} + m_CullTransparentMesh: 0 --- !u!1 &422604085 GameObject: m_ObjectHideFlags: 0 @@ -558,8 +658,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 20 @@ -730,8 +828,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -741,6 +837,78 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &605840262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 605840263} + - component: {fileID: 605840265} + - component: {fileID: 605840264} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &605840263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605840262} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1936309827} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &605840264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605840262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &605840265 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605840262} + m_CullTransparentMesh: 0 --- !u!1 &698272718 GameObject: m_ObjectHideFlags: 0 @@ -796,8 +964,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 25 @@ -884,8 +1050,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!224 &761404603 RectTransform: m_ObjectHideFlags: 0 @@ -997,8 +1161,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &831998046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1017,8 +1179,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1091,8 +1251,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 25 @@ -1205,8 +1363,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &890329160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1225,8 +1381,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1334,8 +1488,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &950385172 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1354,8 +1506,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1428,8 +1578,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 25 @@ -1507,8 +1655,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1586,8 +1732,6 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_IsOn: 0 --- !u!224 &1289613827 RectTransform: @@ -1699,8 +1843,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1395941356 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1719,8 +1861,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1738,6 +1878,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395941353} m_CullTransparentMesh: 0 +--- !u!1 &1482230545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1482230548} + - component: {fileID: 1482230547} + - component: {fileID: 1482230546} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1482230546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482230545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1482230547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482230545} + m_CullTransparentMesh: 0 +--- !u!224 &1482230548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1482230545} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1860223507} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1682951963 GameObject: m_ObjectHideFlags: 0 @@ -1772,6 +1989,8 @@ MonoBehaviour: m_EditorClassIdentifier: _toggle: {fileID: 1289613826} _seekBar: {fileID: 761404602} + _speedTex: {fileID: 1482230546} + _speedBar: {fileID: 1860223508} --- !u!114 &1682951965 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1850,6 +2069,7 @@ RectTransform: - {fileID: 1289613827} - {fileID: 831998044} - {fileID: 890329158} + - {fileID: 1860223507} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1894,8 +2114,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1987,8 +2205,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 25 @@ -2066,8 +2282,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2085,6 +2299,104 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1765787197} m_CullTransparentMesh: 0 +--- !u!1 &1860223506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1860223507} + - component: {fileID: 1860223508} + m_Layer: 5 + m_Name: Slider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1860223507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860223506} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2034706003} + - {fileID: 79485548} + - {fileID: 1936309827} + - {fileID: 1482230548} + m_Father: {fileID: 1682951968} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1860223508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860223506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 605840264} + m_FillRect: {fileID: 415649324} + m_HandleRect: {fileID: 605840263} + m_Direction: 0 + m_MinValue: 1 + m_MaxValue: 8 + m_WholeNumbers: 1 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1682951964} + m_MethodName: SetSpeed + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1909511374 GameObject: m_ObjectHideFlags: 0 @@ -2121,3 +2433,111 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1936309826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936309827} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1936309827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936309826} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 605840263} + m_Father: {fileID: 1860223507} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2034706002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2034706003} + - component: {fileID: 2034706005} + - component: {fileID: 2034706004} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2034706003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034706002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1860223507} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2034706004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034706002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &2034706005 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034706002} + m_CullTransparentMesh: 0 diff --git a/Assets/UnitySwift.meta b/Assets/UnitySwift.meta deleted file mode 100644 index c269f2a..0000000 --- a/Assets/UnitySwift.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c5463632759494c0c9c76357197ff966 -folderAsset: yes -timeCreated: 1467687641 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnitySwift/Editor/PostProcessor.cs b/Assets/UnitySwift/Editor/PostProcessor.cs deleted file mode 100644 index 03dd80b..0000000 --- a/Assets/UnitySwift/Editor/PostProcessor.cs +++ /dev/null @@ -1,34 +0,0 @@ -using UnityEngine; -using UnityEditor; -using UnityEditor.Callbacks; -using UnityEditor.iOS.Xcode; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; - -namespace UnitySwift { - public static class PostProcessor { - [PostProcessBuild] - public static void OnPostProcessBuild(BuildTarget buildTarget, string buildPath) { - if(buildTarget == BuildTarget.iOS) { - // So PBXProject.GetPBXProjectPath returns wrong path, we need to construct path by ourselves instead - // var projPath = PBXProject.GetPBXProjectPath(buildPath); - var projPath = buildPath + "/Unity-iPhone.xcodeproj/project.pbxproj"; - var proj = new PBXProject(); - proj.ReadFromFile(projPath); - - var targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName()); - - //// Configure build settings - proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO"); - proj.SetBuildProperty(targetGuid, "SWIFT_OBJC_BRIDGING_HEADER", "Libraries/UnitySwift/UnitySwift-Bridging-Header.h"); - proj.SetBuildProperty(targetGuid, "SWIFT_OBJC_INTERFACE_HEADER_NAME", "unityswift-Swift.h"); - proj.AddBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", "@executable_path/Frameworks"); - - proj.WriteToFile(projPath); - } - } - } -} diff --git a/Assets/UnitySwift/Editor/PostProcessor.cs.meta b/Assets/UnitySwift/Editor/PostProcessor.cs.meta deleted file mode 100644 index 9d77065..0000000 --- a/Assets/UnitySwift/Editor/PostProcessor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: fd00e9b781c034ecfa81246579806b3f -timeCreated: 1468687463 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UnitySwift/UnitySwift-Bridging-Header.h b/Assets/UnitySwift/UnitySwift-Bridging-Header.h deleted file mode 100644 index 7f2da10..0000000 --- a/Assets/UnitySwift/UnitySwift-Bridging-Header.h +++ /dev/null @@ -1,7 +0,0 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - -#import -#import -#import "UnityInterface.h" diff --git a/Assets/UnitySwift/UnitySwift-Bridging-Header.h.meta b/Assets/UnitySwift/UnitySwift-Bridging-Header.h.meta deleted file mode 100644 index 735b89f..0000000 --- a/Assets/UnitySwift/UnitySwift-Bridging-Header.h.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: d88763964993f492aaed83a9d99f81fb -timeCreated: 1467687641 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - 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 - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/BackgroundAudio1.0.unitypackage b/BackgroundAudio1.0.unitypackage deleted file mode 100644 index 2d14de8..0000000 Binary files a/BackgroundAudio1.0.unitypackage and /dev/null differ diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log index 408df69..355188a 100644 --- a/Logs/Packages-Update.log +++ b/Logs/Packages-Update.log @@ -1,17 +1,15 @@ -=== Sat Mar 30 19:17:36 2019 +=== Tue Sep 29 15:20:05 2020 Packages were changed. -Update Mode: mergeDefaultDependencies +Update Mode: resetToDefaultDependencies The following packages were added: - com.unity.analytics@3.2.2 - com.unity.purchasing@2.0.3 - com.unity.ads@2.0.8 - com.unity.textmeshpro@1.3.0 - com.unity.package-manager-ui@2.0.3 - com.unity.collab-proxy@1.2.15 + com.unity.collab-proxy@1.2.16 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.2.1 com.unity.modules.ai@1.0.0 + com.unity.modules.androidjni@1.0.0 com.unity.modules.animation@1.0.0 com.unity.modules.assetbundle@1.0.0 com.unity.modules.audio@1.0.0 @@ -41,3 +39,7 @@ The following packages were added: com.unity.modules.vr@1.0.0 com.unity.modules.wind@1.0.0 com.unity.modules.xr@1.0.0 + com.unity.test-framework@1.1.16 + com.unity.textmeshpro@2.1.1 + com.unity.timeline@1.2.16 + com.unity.ugui@1.0.0 diff --git a/Packages/manifest.json b/Packages/manifest.json index bd0c348..bf56235 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,14 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.3", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.3.0", + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.2.1", + "com.unity.test-framework": "1.1.16", + "com.unity.textmeshpro": "2.1.1", + "com.unity.timeline": "1.2.16", + "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000..529ef34 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,312 @@ +{ + "dependencies": { + "com.unity.collab-proxy": { + "version": "1.2.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.16", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "2.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.2.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml deleted file mode 100644 index 5655c64..0000000 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - com.android.support:support-compat:+ - - - Assets/Plugins/Android/android.arch.core.common-1.1.1.jar - Assets/Plugins/Android/android.arch.lifecycle.common-1.1.1.jar - Assets/Plugins/Android/android.arch.lifecycle.runtime-1.1.1.aar - Assets/Plugins/Android/com.android.support.collections-28.0.0.jar - Assets/Plugins/Android/com.android.support.support-annotations-28.0.0.jar - Assets/Plugins/Android/com.android.support.support-compat-28.0.0.aar - Assets/Plugins/Android/com.android.support.versionedparcelable-28.0.0.aar - - \ No newline at end of file diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index 304925e..07ebfb0 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -1,17 +1,19 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!11 &1 -AudioManager: - m_ObjectHideFlags: 0 - m_Volume: 1 - Rolloff Scale: 1 - Doppler Factor: 1 - Default Speaker Mode: 2 - m_SampleRate: 0 - m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 512 - m_RealVoiceCount: 32 - m_SpatializerPlugin: - m_AmbisonicDecoderPlugin: - m_DisableAudio: 0 - m_VirtualizeEffects: 1 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Volume: 1 + Rolloff Scale: 1 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_SampleRate: 0 + m_DSPBufferSize: 1024 + m_VirtualVoiceCount: 512 + m_RealVoiceCount: 32 + m_SpatializerPlugin: + m_AmbisonicDecoderPlugin: + m_DisableAudio: 0 + m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 1024 diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset index a84cf4e..e7886b2 100644 --- a/ProjectSettings/ClusterInputManager.asset +++ b/ProjectSettings/ClusterInputManager.asset @@ -1,6 +1,6 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!236 &1 -ClusterInputManager: - m_ObjectHideFlags: 0 - m_Inputs: [] +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index b3c263d..cdc1f3e 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 11 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -28,3 +28,7 @@ PhysicsManager: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 250, y: 250, z: 250} m_WorldSubdivisions: 8 + m_FrictionType: 0 + m_EnableEnhancedDeterminism: 0 + m_EnableUnifiedHeightmaps: 1 + m_DefaultMaxAngluarSpeed: 7 diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index f48de93..f920544 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,21 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 - m_LineEndingsForNewScripts: 2 - m_DefaultBehaviorMode: 1 + m_LineEndingsForNewScripts: 0 + m_DefaultBehaviorMode: 0 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} - m_SpritePackerMode: 4 + m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 0 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index eb3619d..4706883 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -29,10 +29,14 @@ GraphicsSettings: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, @@ -58,3 +62,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 0 diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml deleted file mode 100644 index 4f05a22..0000000 --- a/ProjectSettings/GvhProjectSettings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 2596646..17c8f53 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -1,295 +1,295 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!13 &1 -InputManager: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Axes: - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: a - altPositiveButton: d - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!13 &1 +InputManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Axes: + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: a + altPositiveButton: d + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: s + altPositiveButton: w + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: mouse 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: mouse 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: mouse 2 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: space + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse X + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse Y + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse ScrollWheel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 1 + axis: 2 + joyNum: 0 + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 1 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 2 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 3 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: enter + altNegativeButton: + altPositiveButton: space + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Cancel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index c8fa1b5..3b0b7c3 100644 --- a/ProjectSettings/NavMeshAreas.asset +++ b/ProjectSettings/NavMeshAreas.asset @@ -1,91 +1,91 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!126 &1 -NavMeshProjectSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - areas: - - name: Walkable - cost: 1 - - name: Not Walkable - cost: 1 - - name: Jump - cost: 2 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - - name: - cost: 1 - m_LastAgentTypeID: -887442657 - m_Settings: - - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.75 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_SettingNames: - - Humanoid +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshProjectSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + areas: + - name: Walkable + cost: 1 + - name: Not Walkable + cost: 1 + - name: Jump + cost: 2 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + - name: + cost: 1 + m_LastAgentTypeID: -887442657 + m_Settings: + - serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.75 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_SettingNames: + - Humanoid diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset deleted file mode 100644 index e9cd578..0000000 --- a/ProjectSettings/NetworkManager.asset +++ /dev/null @@ -1,8 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!149 &1 -NetworkManager: - m_ObjectHideFlags: 0 - m_DebugLevel: 0 - m_Sendrate: 15 - m_AssetToPrefab: {} diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset index 0832099..67a94da 100644 --- a/ProjectSettings/PresetManager.asset +++ b/ProjectSettings/PresetManager.asset @@ -1,13 +1,7 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1386491679 &1 -PresetManager: - m_ObjectHideFlags: 0 - m_DefaultList: - - type: - m_NativeTypeID: 20 - m_ManagedTypePPtr: {fileID: 0} - m_ManagedTypeFallback: - defaultPresets: - - m_Preset: {fileID: 2655988077585873504, guid: bfcfc320427f8224bbb7a96f3d3aebad, - type: 2} +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 881b7cd..73c2b59 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,12 +3,12 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 - productGUID: 9a845c785493047baa1d71fee52d61c2 + serializedVersion: 20 + productGUID: 5d2941e3c028f4eb39d33429e04c6a39 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 + defaultScreenOrientation: 0 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 @@ -52,8 +52,7 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: -1 - displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 1 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -64,7 +63,8 @@ PlayerSettings: preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 - androidRenderOutsideSafeArea: 0 + androidRenderOutsideSafeArea: 1 + androidUseSwappy: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -79,11 +79,11 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games - gpuSkinning: 0 - graphicsJobs: 0 + gpuSkinning: 1 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -91,7 +91,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -104,9 +103,21 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -118,9 +129,8 @@ PlayerSettings: metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 - isWsaHolographicRemotingEnabled: 0 + xboxOneDisableKinectGpuReservation: 1 + xboxOneEnable7thCore: 1 vrSettings: cardboard: depthFormat: 0 @@ -134,25 +144,34 @@ PlayerSettings: maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 0 + 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 - protectGraphicsMemory: 0 + isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.Faizan.Github.BackgroundAudio - Standalone: com.Company.ProductName + iPhone: com.FaizanGithub.UnityBackgroundAudio buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -166,29 +185,17 @@ PlayerSettings: keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 - iPhoneSdkVersion: 989 - iOSTargetOSVersionString: 9.0 + iPhoneSdkVersion: 988 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -230,132 +237,201 @@ PlayerSettings: tvOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 - appleEnableAutomaticSigning: 0 + appleEnableAutomaticSigning: 2 iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - clonedFromGUID: 5f34be1353de5cf4398729fda238591b - templatePackageId: com.unity.template.2d@1.0.2 + clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea + templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 5 + AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 - AndroidTVCompatibility: 1 + AndroidTVCompatibility: 0 AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - - m_BuildTarget: Android + - m_BuildTarget: iPhone m_Icons: - m_Textures: [] - m_Width: 432 - m_Height: 432 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 324 - m_Height: 324 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 216 - m_Height: 216 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 162 - m_Height: 162 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 108 - m_Height: 108 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 81 - m_Height: 81 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 + m_Width: 180 + m_Height: 180 m_Kind: 0 - m_SubKind: + m_SubKind: iPhone - m_Textures: [] - m_Width: 144 - m_Height: 144 + m_Width: 120 + m_Height: 120 m_Kind: 0 - m_SubKind: + m_SubKind: iPhone - m_Textures: [] - m_Width: 96 - m_Height: 96 + m_Width: 167 + m_Height: 167 m_Kind: 0 - m_SubKind: + m_SubKind: iPad - m_Textures: [] - m_Width: 72 - m_Height: 72 + m_Width: 152 + m_Height: 152 m_Kind: 0 - m_SubKind: + m_SubKind: iPad - m_Textures: [] - m_Width: 48 - m_Height: 48 + m_Width: 76 + m_Height: 76 m_Kind: 0 - m_SubKind: + m_SubKind: iPad - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad - m_Textures: [] - m_Width: 144 - m_Height: 144 + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 m_Kind: 1 - m_SubKind: + m_SubKind: iPhone - m_Textures: [] - m_Width: 96 - m_Height: 96 + m_Width: 58 + m_Height: 58 m_Kind: 1 - m_SubKind: + m_SubKind: iPhone - m_Textures: [] - m_Width: 72 - m_Height: 72 + m_Width: 29 + m_Height: 29 m_Kind: 1 - m_SubKind: + m_SubKind: iPhone - m_Textures: [] - m_Width: 48 - m_Height: 48 + m_Width: 58 + m_Height: 58 m_Kind: 1 - m_SubKind: + m_SubKind: iPad - m_Textures: [] - m_Width: 36 - m_Height: 36 + m_Width: 29 + m_Height: 29 m_Kind: 1 - m_SubKind: - m_BuildTargetBatching: [] + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + m_BuildTargetBatching: + - m_BuildTarget: Standalone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: tvOS + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: Android + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: iPhone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 1 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 1 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 1 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 1 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 1 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 1 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 1 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: + - m_BuildTarget: AndroidPlayer + m_APIs: 150000000b000000 + m_Automatic: 0 - m_BuildTarget: iOSSupport - m_APIs: 1000000008000000 + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AppleTVSupport + m_APIs: 10000000 m_Automatic: 0 - m_BuildTargetVRSettings: [] - m_BuildTargetEnableVuforiaSettings: [] + - m_BuildTarget: WebGLSupport + m_APIs: 0b000000 + m_Automatic: 1 + m_BuildTargetVRSettings: + - m_BuildTarget: Standalone + m_Enabled: 0 + m_Devices: + - Oculus + - OpenVR openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -471,6 +547,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -485,7 +562,8 @@ PlayerSettings: switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 switchUserAccountLockEnabled: 0 - switchSupportedNpadStyles: 3 + switchSystemResourceMemory: 16777216 + switchSupportedNpadStyles: 22 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 @@ -526,6 +604,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -538,6 +617,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -550,6 +630,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -566,13 +647,17 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: - webGLMemorySize: 256 + webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 webGLDataCaching: 1 @@ -585,8 +670,10 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: {} - platformArchitecture: {} + platformArchitecture: + iPhone: 1 scriptingBackend: {} il2cppCompilerConfiguration: {} managedStrippingLevel: {} @@ -594,18 +681,22 @@ PlayerSettings: allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 + gcIncremental: 0 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Android: 3 + Standalone: 3 + iPhone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_2D + metroPackageName: Template_3D metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_2D + metroApplicationDescription: Template_3D wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -625,7 +716,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -644,14 +734,14 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 + XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} @@ -664,18 +754,11 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 78fa540..d53ff41 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.2f1 +m_EditorVersion: 2019.4.11f1 +m_EditorVersionWithRevision: 2019.4.11f1 (2d9804dddde7) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 2069f19..7b7658d 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,191 +1,232 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!47 &1 -QualitySettings: - m_ObjectHideFlags: 0 - serializedVersion: 5 - m_CurrentQuality: 3 - m_QualitySettings: - - serializedVersion: 2 - name: Very Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 15 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 1 - textureQuality: 1 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.3 - maximumLODLevel: 0 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Medium - pixelLightCount: 1 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 0.7 - maximumLODLevel: 0 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: High - pixelLightCount: 2 - shadows: 0 - shadowResolution: 1 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 1 - maximumLODLevel: 0 - particleRaycastBudget: 256 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Very High - pixelLightCount: 3 - shadows: 0 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 70 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 1.5 - maximumLODLevel: 0 - particleRaycastBudget: 1024 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Ultra - pixelLightCount: 4 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 150 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 2 - maximumLODLevel: 0 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PSM: 5 - PSP2: 2 - Standalone: 5 - Tizen: 2 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!47 &1 +QualitySettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_CurrentQuality: 5 + m_QualitySettings: + - serializedVersion: 2 + name: Very Low + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 15 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + blendWeights: 1 + textureQuality: 1 + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + vSyncCount: 0 + lodBias: 0.3 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Low + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + vSyncCount: 0 + lodBias: 0.4 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 16 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Medium + pixelLightCount: 1 + shadows: 1 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 0 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + realtimeReflectionProbes: 0 + billboardsFaceCameraPosition: 0 + vSyncCount: 1 + lodBias: 0.7 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: High + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + vSyncCount: 1 + lodBias: 1 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Very High + pixelLightCount: 3 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 70 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + vSyncCount: 1 + lodBias: 1.5 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 1024 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Ultra + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + vSyncCount: 1 + lodBias: 2 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + m_PerPlatformDefaultQuality: + Android: 2 + Lumin: 5 + Nintendo 3DS: 5 + Nintendo Switch: 5 + PS4: 5 + PSP2: 2 + Stadia: 5 + Standalone: 5 + WebGL: 3 + Windows Store Apps: 5 + XboxOne: 5 + iPhone: 2 + tvOS: 2 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 3281f1b..1c92a78 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,43 +1,43 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!78 &1 -TagManager: - serializedVersion: 2 - tags: [] - layers: - - Default - - TransparentFX - - Ignore Raycast - - - - Water - - UI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - m_SortingLayers: - - name: Default - uniqueID: 0 - locked: 0 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!78 &1 +TagManager: + serializedVersion: 2 + tags: [] + layers: + - Default + - TransparentFX + - Ignore Raycast + - + - Water + - UI + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + m_SortingLayers: + - name: Default + uniqueID: 0 + locked: 0 diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 06bcc6d..558a017 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -4,6 +4,6 @@ TimeManager: m_ObjectHideFlags: 0 Fixed Timestep: 0.02 - Maximum Allowed Timestep: 0.1 + Maximum Allowed Timestep: 0.33333334 m_TimeScale: 1 Maximum Particle Timestep: 0.03 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index c3ae9a0..fa0b146 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 1 + m_Enabled: 0 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index 6e0eaca..3a95c98 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -6,6 +6,7 @@ VFXManager: m_IndirectShader: {fileID: 0} m_CopyBufferShader: {fileID: 0} m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file diff --git a/README.md b/README.md index 5cd0f00..c3f02b6 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,21 @@ # UnityBackgroundAudio + Play audio on mobile even when the game is suspended in the background ## Dependencies + The following plug-ins are needed for UnityBackgroundAudio to work. + +- Unity Version 2019.4 or later + - Unity-Swift - [Github](https://github.com/miyabi/unity-swift/releases) + - Unity-Jar-Resolver [Github](https://github.com/googlesamples/unity-jar-resolver/releases) ## Usage -Download and import the dependencies and the `.unitypackage` from [Releases](https://github.com/FaizanDurrani/UnityBackgroundAudio/releases) + +Download and import the dependencies and the `.unitypackage` from [Releases](../releases) + ```cs // Get an instance of the BackgroundAudioImplementation class for the current build platform var instance = BackgroundAudioManager.NewInstance(); @@ -29,13 +37,19 @@ instance.OnAudioResumed += () => Debug.Log("Audio resumed"); ``` ## Caveats (Android) -#### Notification + +### Notification + The plugin starts a ForegroundService whenever an audio is played. This is required so that even if Android decides to kill the game the audio continues to play. To change the icon, simply replace the `ba_notification_icon.png` inside `Assets/Plugins/Android/res/drawable/` with your own icon. -#### Threading + +### Threading + `AndroidJNI.AttachCurrentThread();` must be called before calling any methods from outside the main thread and `AndroidJNI.DetachCurrentThread();` must be called before the thread closes. ## Sample + Clone or download the repo as `.zip` and open the `SampleScene` scene under `Assets/Scenes/` ## Notes + I am still learning Native Plugin development for Android and iOS so there might be inefficient/bad code in the `.java` or `.swift` files. Feel free to criticize or submit pull requests.