CrispyPin/cvr-props
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update CCK to 3.10, fixing unity 2021 crash :)

Browse source
This commit is contained in:
Crispy 2024-08-03 22:24:42 +02:00
parent 48a978fa2a
commit d11e0fb3a9
492 changed files with 2165204 additions and 437687 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Assets/ABI.CCK/Scripts/Editor/CCK_CVRSpawnableTriggerEditor.cs
View file

@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using ABI.CCK.Components;
using ABI.CCK.Scripts.Editor;
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;
@ -131,8 +132,8 @@ namespace ABI.CCK.Scripts.Editor
private void OnDrawHeaderEnter(Rect rect)
{
Rect _rect = new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight);
GUI.Label(_rect, "On Enter Trigger");
EditorGUIExtensions.UtilityMenu(_rect, _onEnterList);
}
private void OnDrawElementEnter(Rect rect, int index, bool isactive, bool isfocused)
@ -200,8 +201,8 @@ namespace ABI.CCK.Scripts.Editor
private void OnDrawHeaderExit(Rect rect)
{
Rect _rect = new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight);
GUI.Label(_rect, "On Exit Trigger");
EditorGUIExtensions.UtilityMenu(_rect, _onExitList);
}
private void OnDrawElementExit(Rect rect, int index, bool isactive, bool isfocused)
@ -261,8 +262,8 @@ namespace ABI.CCK.Scripts.Editor
private void OnDrawHeaderStay(Rect rect)
{
Rect _rect = new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight);
GUI.Label(_rect, "On Stay Trigger");
EditorGUIExtensions.UtilityMenu(_rect, _onStayList);
}
private void OnDrawElementStay(Rect rect, int index, bool isactive, bool isfocused)
@ -290,7 +291,8 @@ namespace ABI.CCK.Scripts.Editor
rect.y += EditorGUIUtility.singleLineHeight * 1.25f;
_rect = new Rect(rect.x, rect.y, 100, EditorGUIUtility.singleLineHeight);
if (stayEntity.updateMethod == CVRSpawnableTriggerTaskStay.UpdateMethod.SetFromPosition)
if (stayEntity.updateMethod == CVRSpawnableTriggerTaskStay.UpdateMethod.SetFromPosition ||
stayEntity.updateMethod == CVRSpawnableTriggerTaskStay.UpdateMethod.SetFromDistance)
{
EditorGUI.LabelField(_rect, "Min Value");
_rect.x += 100;
@ -325,7 +327,8 @@ namespace ABI.CCK.Scripts.Editor
if (index > trigger.stayTasks.Count) return EditorGUIUtility.singleLineHeight * 3.75f;
stayEntity = trigger.stayTasks[index];
if (stayEntity.updateMethod == CVRSpawnableTriggerTaskStay.UpdateMethod.SetFromPosition)
if (stayEntity.updateMethod == CVRSpawnableTriggerTaskStay.UpdateMethod.SetFromPosition ||
stayEntity.updateMethod == CVRSpawnableTriggerTaskStay.UpdateMethod.SetFromDistance)
return EditorGUIUtility.singleLineHeight * 5f;
return EditorGUIUtility.singleLineHeight * 3.75f;