diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta index 2059acb8..5425ba50 100644 --- a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudio.dll.meta @@ -1,78 +1,113 @@ -fileFormatVersion: 2 -guid: 684d4d47a018ed14080e15f4c99b8e86 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - Linux: - enabled: 1 - settings: - CPU: None - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: None - OSXIntel64: - enabled: 1 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - SamsungTV: - enabled: 0 - settings: - STV_MODEL: STANDARD_13 - WP8: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - Win: - enabled: 0 - settings: - CPU: None - Win64: - enabled: 1 - settings: - CPU: AnyCPU - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 684d4d47a018ed14080e15f4c99b8e86 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 1 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : OSXIntel + second: + enabled: 1 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : SamsungTV + second: + enabled: 0 + settings: + STV_MODEL: STANDARD_13 + - first: + : WP8 + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + SDK: AnySDK + - first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs index 6a2cd40e..d247457b 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs @@ -9,12 +9,12 @@ public class CarAudioController : MonoBehaviour private void Awake() { - //Debug.LogError("AUDIO MANAGER:"); - //Debug.LogError(AudioManager.Instance); - //Debug.LogError("FMOD EVENTS INSTANCE:"); - //Debug.LogError(FMODEvents.Instance); - //Debug.LogError("Car Simple Driving:"); - //Debug.LogError(FMODEvents.Instance.BoltCarSimpleDriving); + Debug.LogError("AUDIO MANAGER:"); + Debug.LogError(AudioManager.Instance); + Debug.LogError("FMOD EVENTS INSTANCE:"); + Debug.LogError(FMODEvents.Instance); + Debug.LogError("Car Simple Driving:"); + Debug.LogError(FMODEvents.Instance.BoltCarSimpleDriving); carMovementInstance = AudioManager.Instance.CreateInstance(FMODEvents.Instance.CarModulatedDriving); carStopInstance = AudioManager.Instance.CreateInstance(FMODEvents.Instance.BoltCarStopSound); diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 05ca2d30..58740269 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a64a422f2a78ccb87d8e420c14c973b183a145d17aac20a1b836553f3efb318 -size 67106882 +oid sha256:f6e08fe5d6043e83592b86e782b4c9901a8e6a9e77971c9571f900f9de893548 +size 67153322 diff --git a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs index e2162b13..4e776752 100644 --- a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs +++ b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs @@ -63,6 +63,12 @@ public class AudioManager : MonoBehaviour // public static AudioManager instance; private static EventInstance musicEventInstance; + // ===== Dialogue / Programmer Sounds ===== + + [SerializeField] + private EventReference dialogueEvent; + + private EVENT_CALLBACK dialogueCallback; // public access for the Singleton // and lazy instantiation if not exists @@ -121,6 +127,9 @@ public class AudioManager : MonoBehaviour _instance.sfxVCA.setVolume(_instance.SFXVolume); _instance.uiVCA.setVolume(_instance.UIVolume); + _instance.dialogueCallback = new EVENT_CALLBACK(DialogueEventCallback); + + } public void SetMasterVCA(float value) @@ -280,6 +289,82 @@ public class AudioManager : MonoBehaviour //=====// //=====// + public void PlayDialogue(string audioTableKey) + { + if (!dialogueEvent.IsNull) + { + EventInstance instance = RuntimeManager.CreateInstance(dialogueEvent); + + // Pin the string so FMOD can read it safely + GCHandle stringHandle = GCHandle.Alloc(audioTableKey); + instance.setUserData(GCHandle.ToIntPtr(stringHandle)); + + instance.setCallback(dialogueCallback); + instance.start(); + instance.release(); + } + else + { + Debug.LogWarning("Dialogue EventReference is not assigned!"); + } + } + + [AOT.MonoPInvokeCallback(typeof(EVENT_CALLBACK))] + private static FMOD.RESULT DialogueEventCallback( + EVENT_CALLBACK_TYPE type, + IntPtr instancePtr, + IntPtr parameterPtr) + { + EventInstance instance = new EventInstance(instancePtr); + + instance.getUserData(out IntPtr stringPtr); + GCHandle stringHandle = GCHandle.FromIntPtr(stringPtr); + string key = stringHandle.Target as string; + + switch (type) + { + case EVENT_CALLBACK_TYPE.CREATE_PROGRAMMER_SOUND: + { + var parameter = Marshal.PtrToStructure(parameterPtr); + + FMOD.Studio.SOUND_INFO soundInfo; + var result = RuntimeManager.StudioSystem.getSoundInfo(key, out soundInfo); + if (result != FMOD.RESULT.OK) + break; + + FMOD.Sound sound; + RuntimeManager.CoreSystem.createSound( + soundInfo.name_or_data, + soundInfo.mode | FMOD.MODE.CREATECOMPRESSEDSAMPLE, + ref soundInfo.exinfo, + out sound + ); + + parameter.sound = sound.handle; + parameter.subsoundIndex = soundInfo.subsoundindex; + Marshal.StructureToPtr(parameter, parameterPtr, false); + break; + } + + case EVENT_CALLBACK_TYPE.DESTROY_PROGRAMMER_SOUND: + { + var parameter = Marshal.PtrToStructure(parameterPtr); + var sound = new FMOD.Sound(parameter.sound); + sound.release(); + break; + } + + case EVENT_CALLBACK_TYPE.DESTROYED: + { + // Release pinned string + stringHandle.Free(); + break; + } + } + + return FMOD.RESULT.OK; + } + public void StopSFX() { sfxBus.stopAllEvents(FMOD.Studio.STOP_MODE.IMMEDIATE); diff --git a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs index 7c294c8f..29e00732 100644 --- a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs +++ b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs @@ -19,6 +19,7 @@ public class FMODEvents : MonoBehaviour [field: SerializeField] public EventReference BowGrab { get; private set; } [field: SerializeField] public EventReference Spray { get; private set; } [field: SerializeField] public EventReference Coughing { get; private set; } + [field: SerializeField] public EventReference MyNewSoundEffect { get; private set; } [field: Header("CAR")] [field: SerializeField] public EventReference DoorOpen { get; private set; } diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br index df6b81bd..39a618a9 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br index 68d6f129..ef742096 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br index 00159ee3..bd760e00 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br differ diff --git a/DeltaVRFMOD/.cache/{8c60e824-3775-468b-890c-c055851d91cd}.pdc b/DeltaVRFMOD/.cache/{8c60e824-3775-468b-890c-c055851d91cd}.pdc index 241953be..2042dda2 100644 Binary files a/DeltaVRFMOD/.cache/{8c60e824-3775-468b-890c-c055851d91cd}.pdc and b/DeltaVRFMOD/.cache/{8c60e824-3775-468b-890c-c055851d91cd}.pdc differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank index 943b8a77..cd386ae1 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank index 70ea54c9..deebc36f 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index 39acd35e..412b125e 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank index 91e9d6c8..c37301b7 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Voiceovers.bank differ diff --git a/DeltaVRFMOD/Metadata/Bank/{ec80a96c-f205-4a18-87f3-a3c6f162f9ae}.xml b/DeltaVRFMOD/Metadata/Bank/{ec80a96c-f205-4a18-87f3-a3c6f162f9ae}.xml index 6355eef9..11db2a92 100644 --- a/DeltaVRFMOD/Metadata/Bank/{ec80a96c-f205-4a18-87f3-a3c6f162f9ae}.xml +++ b/DeltaVRFMOD/Metadata/Bank/{ec80a96c-f205-4a18-87f3-a3c6f162f9ae}.xml @@ -7,5 +7,13 @@ {b2d8e5a6-b2a3-4016-a958-fe70e51f4f68} + + {0b49a74d-0ab0-41f8-aff8-da02568f0863} + + + + + Voiceovers_Table + diff --git a/DeltaVRFMOD/Metadata/Event/{ecaeaea2-3cd6-4186-a29f-eeb232656be9}.xml b/DeltaVRFMOD/Metadata/Event/{ecaeaea2-3cd6-4186-a29f-eeb232656be9}.xml new file mode 100644 index 00000000..c12af982 --- /dev/null +++ b/DeltaVRFMOD/Metadata/Event/{ecaeaea2-3cd6-4186-a29f-eeb232656be9}.xml @@ -0,0 +1,574 @@ + + + + + Voicelines_DeltaVR + + + 5 + + + {51962f58-bf61-41ab-9a12-97570ba0bed8} + + + {daa4592b-8892-4df2-a956-af85849232d9} + + + {7ed8bdd6-d71f-4c61-8063-6e796423973a} + + + {8a446dca-0628-4427-acee-7bbf36af72ec} + + + {7de2dd2a-b01e-4258-9e02-754b894fcdf4} + + + {d5fbd2bd-0763-4c1e-a75f-79ea818521cd} + + + {e435692c-4c85-4382-a80d-951e29d5661d} + + + {e4697c61-3675-42f7-9fb8-447b12226e48} + + + {ec80a96c-f205-4a18-87f3-a3c6f162f9ae} + + + + + {ca466107-01f3-4d6e-94f2-e13fec13aa35} + + + + + {ca466107-01f3-4d6e-94f2-e13fec13aa35} + + + + + {6b4a4058-0c85-4540-9028-8fb7755f7b87} + + + {86531f5d-d99e-4f2a-8673-bc93ae7d61a4} + + + {7a292e97-7d25-47a5-bc9a-d0b6c76125a2} + + + + + + + {a8c6c531-4673-407f-bf84-15073066c2fa} + + + {c0c425bb-3c91-4543-abf3-d9f840c9d155} + + + + + {a8c6c531-4673-407f-bf84-15073066c2fa} + + + + + {03694c0e-58e5-4436-8d96-c182fba3b37d} + + + {389f970e-f940-40ca-aa29-c06a8012f646} + + + {daa4592b-8892-4df2-a956-af85849232d9} + + + + + {979fe415-3c15-4b68-9edc-cb367e846ea4} + + + + + + 5 + + + + + Audio 1 + + + {f1e537df-e254-4056-9426-d42100a05345} + + + {c612ed77-e32a-4e5b-abf3-1c69b4694adf} + + + {ca466107-01f3-4d6e-94f2-e13fec13aa35} + + + + + {a8cce9c4-852f-4a3b-833c-725a5d3c1d31} + {234c7f14-862a-433a-8632-bbe38d14a01f} + + + + + + + {598b12af-5d39-4aba-af92-748be8fc0d81} + + + + + + + {4eed2757-1e34-47cb-bff9-03ec0a607216} + + + + + + Steam Audio Spatializer + + + {43df2957-6edd-42f8-9dfc-4d4e627a7b62} + {1fe6c3ac-48c5-4b5a-9b60-128f3bc2187d} + {742b5574-6234-4e00-8ef0-6a5441bdf21c} + {d2433a63-88c2-456b-b4a5-fb4ec627ff1c} + {aa1ce065-75e7-40ea-a122-adada59d822a} + {3bc3467e-4a27-4e75-a68b-0e15166e5c07} + {27167066-0c4e-452c-ba09-97b6f6dcdf71} + {bb9c0610-11c4-4b1e-b1fa-e701856ac5fb} + {a0673e19-a099-495a-aacb-9e9485687ef0} + {1bcd7226-1c47-4714-b4c3-84bc9bd63831} + {b0738bd4-0450-4477-855a-8c94555375c5} + {b9771c5e-e99d-4584-a667-8cddc9c82677} + {1cbe3ebd-855a-4124-be47-1280e36d8a8c} + {5b166570-ba4d-46d0-a922-3ee4197ed5f7} + {bd1a7c9c-dc35-45f3-9e07-bbeed982a2b7} + {c99a6664-4acc-4130-803c-33509b6ff592} + {d17b2198-3bb0-4bbb-8347-6c6025071703} + {c2e1351f-c58d-47aa-b7c1-3fce3e56af59} + {b145046d-32ce-4f8f-ade4-69839010c7bb} + {ca7ffb9e-7af4-4ad3-9396-60a99fd5fb60} + {d4ca11b5-7cef-4ca5-b084-20aae3688034} + {911bda0c-3f2a-4cc7-9213-6cd7a177c8f1} + {a09feb0a-1471-4b8f-bf49-3e355598c075} + {ad86ff8f-4ee1-40ae-a555-95baccbcb637} + {35b959ed-58a6-4fe1-acd0-132bb09463b6} + {764de2c9-ad66-4f71-a3a2-358284a54290} + {7a175c49-4c41-4c73-b74c-f9820eb2696d} + {a2c4b1d6-1b1f-4786-b7b1-a8592aca259e} + {5cef4434-e07b-4485-b59f-5a02a397f565} + {9e4f24d2-75e1-436e-a2ae-0ae71b9c4059} + {6063dea6-0d12-4c31-a6d2-20e28ee5c0b2} + {a30d804b-22f6-4a32-804a-9777cec88f13} + {a7d58bae-0c4b-476d-b1ac-e256681feda0} + {b1dab080-fee4-42da-81b9-4abe2026874b} + {55010852-cb48-4979-b503-b01fa4b33748} + {62738f18-0e6f-409a-84e6-977b279f72bc} + + + + + SourcePos + + + + -2 + + + + + OverallGain + + + + -1 + + + + + ApplyDA + + + 2 + + + 0 + + + 2 + + + + + ApplyAA + + + 0 + + + 0 + + + 2 + + + + + ApplyDir + + + 2 + + + 0 + + + 2 + + + + + ApplyOccl + + + 0 + + + 0 + + + 2 + + + + + ApplyTrans + + + 0 + + + 0 + + + 2 + + + + + ApplyRefl + + + false + + + + + ApplyPath + + + true + + + + + Interpolation + + + 1 + + + 0 + + + 1 + + + + + DistAtt + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + DAType + + + 0 + + + 0 + + + 4 + + + + + DAMinDist + + + 1 + + + {(0.000000,0.000000)(1.000000,10000.000000)} + + + + + DAMaxDist + + + 30 + + + {(0.000000,0.000000)(1.000000,10000.000000)} + + + + + AirAbsLow + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + AirAbsMid + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + AirAbsHigh + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + Directivity + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + DipoleWeight + + + 0 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + DipolePower + + + 1 + + + {(0.000000,1.000000)(1.000000,4.000000)} + + + + + Occlusion + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + TransType + + + 0 + + + 0 + + + 1 + + + + + TransLow + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + TransMid + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + TransHigh + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + DirMixLevel + + + 1 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + ReflBinaural + + + false + + + + + ReflMixLevel + + + 1 + + + {(0.000000,0.000000)(1.000000,10.000000)} + + + + + PathBinaural + + + true + + + + + PathMixLevel + + + 1 + + + {(0.000000,0.000000)(1.000000,10.000000)} + + + + + SimOutputs + + + + 0 + + + + + DirectBinaural + + + true + + + + + DistRange + + + + -6 + + + + + SimOutHandle + + + -1 + + + -1 + + + 10000 + + + + + OutputFormat + + + 0 + + + 0 + + + 2 + + + + + PathNormEQ + + + false + + + diff --git a/DeltaVRFMOD/Metadata/Event/{f4f4316b-e717-4ccd-af9e-c34ebeb884d8}.xml b/DeltaVRFMOD/Metadata/Event/{f4f4316b-e717-4ccd-af9e-c34ebeb884d8}.xml index 820e7c50..54b1c42f 100644 --- a/DeltaVRFMOD/Metadata/Event/{f4f4316b-e717-4ccd-af9e-c34ebeb884d8}.xml +++ b/DeltaVRFMOD/Metadata/Event/{f4f4316b-e717-4ccd-af9e-c34ebeb884d8}.xml @@ -8,7 +8,7 @@ 5 - {bb0dfa19-2848-45c1-b83a-f212448dc5ad} + {46ecb943-a7f0-4a91-92cc-befbdfb0c276} {4785766d-0662-4337-956d-971b698d998d} diff --git a/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml b/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml index c7b6e7b3..c4611e66 100644 --- a/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml +++ b/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml @@ -5,7 +5,7 @@ Voiceovers - {7db632b8-c5c2-4e3e-ab97-f087b29d2976} + {162960f4-09a2-4526-a61e-7ac7e219d27d} {18fe57ae-4110-48b9-92ff-598d3be28f6c} diff --git a/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml b/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml index 060634e4..a63cd027 100644 --- a/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml +++ b/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml @@ -16,7 +16,7 @@ 10000 - 0 + 1450 {2d77917c-85b0-45ca-a155-7d6dc10cbbde} diff --git a/DeltaVRFMOD/Metadata/Return/{95a057b4-7ce0-471e-96b5-2b4c636024cc}.xml b/DeltaVRFMOD/Metadata/Return/{95a057b4-7ce0-471e-96b5-2b4c636024cc}.xml index 79bb56d9..5904a941 100644 --- a/DeltaVRFMOD/Metadata/Return/{95a057b4-7ce0-471e-96b5-2b4c636024cc}.xml +++ b/DeltaVRFMOD/Metadata/Return/{95a057b4-7ce0-471e-96b5-2b4c636024cc}.xml @@ -33,7 +33,7 @@ 64 - -12.5 + -80 -80 diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index fbd629d2..88f8711e 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -99,7 +99,7 @@ { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "SelectEdgeLoop.selectIterative", - "value": "{\"m_Value\":false}" + "value": "{\"m_Value\":true}" }, { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -109,13 +109,38 @@ { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "FillHole.selectEntirePath", - "value": "{\"m_Value\":true}" + "value": "{\"m_Value\":false}" }, { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "experimental.meshesAreAssets", "value": "{\"m_Value\":false}" }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.extrudeEdgesAsGroup", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "GrowSelection.useAngle", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "GrowSelection.iterativeGrow", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "UVEditor.showPreviewMaterial", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "SelectEdgeRing.selectIterative", + "value": "{\"m_Value\":true}" + }, { "type": "UnityEngine.ProBuilder.LogLevel, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "log.level", @@ -149,7 +174,7 @@ { "type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.dragSelectRectMode", - "value": "{\"m_Value\":0}" + "value": "{\"m_Value\":1}" }, { "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -164,7 +189,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.lastMeshSelectMode", - "value": "{\"m_Value\":2}" + "value": "{\"m_Value\":4}" }, { "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -184,12 +209,12 @@ { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastPivotPosition", - "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0}}" + "value": "{\"m_Value\":{\"x\":-9.5367431640625e-7,\"y\":0.0,\"z\":0.0}}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastSize", - "value": "{\"m_Value\":{\"x\":49.08480453491211,\"y\":0.10000000149011612,\"z\":-30.85292625427246}}" + "value": "{\"m_Value\":{\"x\":-32.194129943847659,\"y\":-34.063941955566409,\"z\":34.12318801879883}}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -254,7 +279,7 @@ { "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "ExtrudeFaces.distance", - "value": "{\"m_Value\":0.5}" + "value": "{\"m_Value\":57.900001525878909}" }, { "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -266,6 +291,26 @@ "key": "WeldVertices.weldDistance", "value": "{\"m_Value\":0.009999999776482582}" }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "ExtrudeEdges.distance", + "value": "{\"m_Value\":-0.5}" + }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "GrowSelection.angleValue", + "value": "{\"m_Value\":15.0}" + }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "BevelEdges.size", + "value": "{\"m_Value\":0.20000000298023225}" + }, + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "smoothing.NormalsSize", + "value": "{\"m_Value\":1.0}" + }, { "type": "UnityEditor.ProBuilder.Actions.DetachFaces+DetachSetting, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "DetachFaces.target", @@ -274,12 +319,17 @@ { "type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.extrudeMethod", - "value": "{\"m_Value\":2}" + "value": "{\"m_Value\":0}" }, { "type": "UnityEditor.ProBuilder.Actions.OffsetElements+CoordinateSpace, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "MoveElements.s_CoordinateSpace", "value": "{\"m_Value\":0}" + }, + { + "type": "UnityEditor.ProBuilder.Actions.MirrorObjects+MirrorSettings, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "MirrorObjects.mirrorAxes", + "value": "{\"m_Value\":1}" } ] } diff --git a/highscores.json b/highscores.json index 938f4e84..b20d7269 100644 --- a/highscores.json +++ b/highscores.json @@ -28,6 +28,10 @@ "name": "jtimu", "score": 465.0 }, + { + "name": "rt", + "score": 465.0 + }, { "name": "llllpttrgje", "score": 456.0 @@ -55,10 +59,6 @@ { "name": ",..,", "score": 436.0 - }, - { - "name": "terrrffgggjh", - "score": 431.0 } ] } \ No newline at end of file