Parameters fetch fix

Restore to default settings
This commit is contained in:
SDraw 2022-08-06 02:03:10 +03:00
parent 8e6f739589
commit ee55c60ed5
No known key found for this signature in database
GPG key ID: BB95B4DAB2BB8BB5
4 changed files with 16 additions and 4 deletions

View file

@ -50,7 +50,7 @@ namespace ml_aap
static void OnLocalAvatarSetup_Postfix() => ms_instance?.OnLocalAvatarSetup(); static void OnLocalAvatarSetup_Postfix() => ms_instance?.OnLocalAvatarSetup();
void OnLocalAvatarSetup() void OnLocalAvatarSetup()
{ {
if(m_localHandler != null) if((m_localHandler != null) && !PlayerSetup.Instance._inVr)
m_localHandler.OnAvatarSetup(); m_localHandler.OnAvatarSetup();
} }
} }

View file

@ -46,6 +46,12 @@ namespace ml_aap
m_parameters = new List<AdditionalParameterInfo>(); m_parameters = new List<AdditionalParameterInfo>();
} }
void Start()
{
if(PlayerSetup.Instance._inVr)
PlayerSetup.Instance.avatarSetupCompleted.AddListener(this.OnAvatarSetup);
}
void Update() void Update()
{ {
if(m_active) if(m_active)

View file

@ -1,10 +1,10 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyTitle("AdditionalAvatarParameters")] [assembly: AssemblyTitle("AdditionalAvatarParameters")]
[assembly: AssemblyVersion("1.0.0")] [assembly: AssemblyVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.0.0")] [assembly: AssemblyFileVersion("1.0.1")]
[assembly: MelonLoader.MelonInfo(typeof(ml_aap.AdditionalAvatarParameters), "AdditionalAvatarParameters", "1.0.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonInfo(typeof(ml_aap.AdditionalAvatarParameters), "AdditionalAvatarParameters", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

View file

@ -73,6 +73,9 @@ namespace ml_fpt
PlayerSetup.Instance._trackerManager.trackers[m_hipsTrackerIndex].ShowLine(false); PlayerSetup.Instance._trackerManager.trackers[m_hipsTrackerIndex].ShowLine(false);
CVR_InteractableManager.enableInteractions = true; CVR_InteractableManager.enableInteractions = true;
if(PlayerSetup.Instance._avatar.GetComponent<ABI.CCK.Components.CVRAvatar>().avatarUsesAdvancedSettings)
PlayerSetup.Instance.LoadCurrentAvatarSettingsDefault();
Reset(); Reset();
ShowHudNotification("Calibration completed"); ShowHudNotification("Calibration completed");
@ -141,6 +144,9 @@ namespace ml_fpt
{ {
if(m_inCalibration) if(m_inCalibration)
{ {
m_indexIk.calibrated = true;
m_indexIk.enabled = true;
m_ikCalibrator.leftHandModel.SetActive(false); m_ikCalibrator.leftHandModel.SetActive(false);
m_ikCalibrator.rightHandModel.SetActive(false); m_ikCalibrator.rightHandModel.SetActive(false);