poprawki materialy unity 6, pajaki, podmiana katalogu FSM w AIControlerze, zmiana w Spider 2.0 Behaviours , skopane zycie bylo, ladowalo pajaka z zyciem 2.

This commit is contained in:
szczuras4
2024-12-28 00:03:40 +01:00
parent c596494d77
commit e75b093317
553 changed files with 48087 additions and 68332 deletions

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/Editor/vStateDecisionObjectDrawer.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/NodeDrawerHelper.cs
uploadId: 601882

View File

@@ -35,10 +35,19 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
public static float borderAlpha { get { return GetValue<float>("borderAlpha"); } set { SetValue("borderAlpha", value); } }
// Add preferences section named "My Preferences" to the Preferences Window
[PreferenceItem("vFSM Behaviour")]
#if UNITY_2019_1_OR_NEWER
[SettingsProvider]
public static SettingsProvider CreateSettingsProvider()
{
return new SettingsProvider("Invector Preferences/FSM Behaviour", SettingsScope.User)
{
guiHandler = (searchContext) =>
{
PreferencesGUI();
}
};
}
#endif
public static void PreferencesGUI()
{
var style = new GUIStyle(EditorStyles.boldLabel);
@@ -112,7 +121,7 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
}
static void Save()
{
{
System.Text.StringBuilder text = new System.Text.StringBuilder();
var count = 0;
if (keyValues == null) Load();
@@ -175,6 +184,7 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
Save();
}
static bool inLoad;
static void StringToPreferences(string stringValue)
{

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vBehaviourPreferences.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vFSMBehaviour.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vFSMEnums.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vFSMHelpboxAttribute.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vFSMHelper.cs
uploadId: 601882

View File

@@ -82,9 +82,9 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
public virtual void OnStateEnter(vIFSMBehaviourController fsmBehaviour)
{
if (resetCurrentDestination)
fsmBehaviour.aiController.Stop();
if (resetCurrentDestination && fsmBehaviour.aiController!=null)
fsmBehaviour.aiController.Stop();
if (components == null)
components = new FSMComponent(actions);
if (useActions && components != null)
@@ -95,10 +95,13 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
{
if (components == null)
components = new FSMComponent(actions);
if (useActions && components != null)
components.DoActions(fsmBehaviour, vFSMComponentExecutionType.OnStateUpdate);
components.DoActions(fsmBehaviour, vFSMComponentExecutionType.OnStateUpdate);
fsmBehaviour.ChangeState(TransitTo(fsmBehaviour));
fsmBehaviour.ChangeState(TransitTo(fsmBehaviour));
}
public virtual void OnStateExit(vIFSMBehaviourController fsmBehaviour)

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vFSMState.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vStateAction.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vStateDecision.cs
uploadId: 601882

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vStateDecisionObject.cs
uploadId: 601882

View File

@@ -25,7 +25,7 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
Dictionary<vIFSMBehaviourController, float> transitionTimers;
public vFSMState TransitTo(vIFSMBehaviourController fsmBehaviour)
{
{
var val = true;
vFSMState returState = null;
for(int i=0;i<decisions.Count;i++)
@@ -41,8 +41,9 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
else if (!val && falseState) returState= useFalseState && !muteFalse ? falseState : null;
if (transitionTimers == null) transitionTimers = new Dictionary<vIFSMBehaviourController, float>();
if (!transitionTimers.ContainsKey(fsmBehaviour)) transitionTimers.Add(fsmBehaviour,0f);
if (transitionTimers[fsmBehaviour] < transitionDelay && returState)
{
transitionTimers[fsmBehaviour] += Time.deltaTime;
@@ -53,7 +54,7 @@ namespace Invector.vCharacterController.AI.FSMBehaviour
{
transitionTimers[fsmBehaviour] = 0;
if (fsmBehaviour.debugMode && returState) fsmBehaviour.SendDebug("<color=yellow>" + parentState.name + " Transited to " + returState.name +"</color>", parentState);
}
}
return returState;
}

View File

@@ -10,3 +10,10 @@ MonoImporter:
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 123618
packageName: Invector FSM AI Template
packageVersion: 1.1.9a
assetPath: Assets/Invector-FSMAIController/FSM/Scripts/Components/vStateTransition.cs
uploadId: 601882