From 7adcecd82e552ad6c03607ef5074fc6a8fa46671 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 4 Jul 2022 20:57:13 +0800 Subject: * node test --- Art/Models/Malenia2 .blend | Bin 710384 -> 1780240 bytes Art/Models/untitled.blend | Bin 0 -> 234774 bytes Erika/Assets/Art/Models/Characters/Default.meta | 8 ++++++ Erika/Assets/Art/Models/Characters/Erika2.meta | 8 ++++++ .../AbstractWiresEffect/Scripts.meta | 8 ++++++ .../Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta | 8 ++++++ .../Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta | 8 ++++++ Erika/Assets/Bundle/Materials/Unit/Effect.meta | 8 ++++++ Erika/Assets/Bundle/Shaders/Include.meta | 8 ++++++ Erika/Assets/Bundle/Shaders/Unit/Effect.meta | 8 ++++++ .../Unit/Monster/Robots_Prowler/ActionData.meta | 8 ++++++ .../Unit/Monster/Robots_Prowler/UnitData.meta | 8 ++++++ Erika/Assets/Bundle/Unit/NPC.meta | 8 ++++++ .../Bundle/Unit/PC/Erika/Materials/Normal.meta | 8 ++++++ Erika/Assets/Bundle/Unit/PC/Erika/Models.meta | 8 ++++++ Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta | 8 ++++++ .../Bundle/Unit/PC/ErikaCyborg/ActionData.meta | 8 ++++++ .../Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta | 8 ++++++ .../Bundle/Unit/PC/ErikaCyborg/AnimationData.meta | 8 ++++++ .../Unit/PC/ErikaCyborg/Materials/AfterImage.meta | 8 ++++++ .../Unit/PC/ErikaCyborg/Materials/Normal.meta | 8 ++++++ .../Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta | 8 ++++++ .../Bundle/Unit/PC/ErikaCyborg/RootMotion.meta | 8 ++++++ .../Bundle/Unit/PC/ErikaCyborg/UnitData.meta | 8 ++++++ .../Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta | 8 ++++++ Erika/Assets/Bundle/Unit/Prop.meta | 8 ++++++ Erika/Assets/ProBuilder Data.meta | 8 ------ Erika/Assets/Scripts/Curve3D.meta | 8 ++++++ Erika/Assets/Scripts/Drone.meta | 8 ++++++ Erika/Assets/Scripts/Managers/Physics.meta | 8 ++++++ Erika/Assets/Scripts/Props.meta | 8 ++++++ Erika/Assets/Scripts/Robot.meta | 8 ++++++ Erika/Assets/Scripts/Unit/AI/Actions.meta | 8 ++++++ Erika/Assets/Scripts/Unit/AI/Conditionals.meta | 8 ++++++ .../UMotion/UMotionExamples/Example Scene.meta | 8 ------ Other/NodeEditorExamples/.gitignore | 1 + .../Examples/MathGraph/New Math Graph.asset | 28 +++++++++++++++++++++ .../Examples/StateMachine/New State Graph.asset | 2 +- .../StateMachine/Nodes/Editor/StateNodeEditor.cs | 6 ++--- .../xNode-examples/Scripts/Editor/NodeEditorGUI.cs | 2 +- Other/NodeEditorExamples/Docs/xNodeEditor.xlsx | Bin 0 -> 340614 bytes 41 files changed, 282 insertions(+), 21 deletions(-) create mode 100644 Art/Models/untitled.blend create mode 100644 Erika/Assets/Art/Models/Characters/Default.meta create mode 100644 Erika/Assets/Art/Models/Characters/Erika2.meta create mode 100644 Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta create mode 100644 Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta create mode 100644 Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta create mode 100644 Erika/Assets/Bundle/Materials/Unit/Effect.meta create mode 100644 Erika/Assets/Bundle/Shaders/Include.meta create mode 100644 Erika/Assets/Bundle/Shaders/Unit/Effect.meta create mode 100644 Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta create mode 100644 Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta create mode 100644 Erika/Assets/Bundle/Unit/NPC.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/Erika/Models.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta create mode 100644 Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta create mode 100644 Erika/Assets/Bundle/Unit/Prop.meta delete mode 100644 Erika/Assets/ProBuilder Data.meta create mode 100644 Erika/Assets/Scripts/Curve3D.meta create mode 100644 Erika/Assets/Scripts/Drone.meta create mode 100644 Erika/Assets/Scripts/Managers/Physics.meta create mode 100644 Erika/Assets/Scripts/Props.meta create mode 100644 Erika/Assets/Scripts/Robot.meta create mode 100644 Erika/Assets/Scripts/Unit/AI/Actions.meta create mode 100644 Erika/Assets/Scripts/Unit/AI/Conditionals.meta delete mode 100644 Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta create mode 100644 Other/NodeEditorExamples/Docs/xNodeEditor.xlsx diff --git a/Art/Models/Malenia2 .blend b/Art/Models/Malenia2 .blend index 85b1a028..429cb001 100644 Binary files a/Art/Models/Malenia2 .blend and b/Art/Models/Malenia2 .blend differ diff --git a/Art/Models/untitled.blend b/Art/Models/untitled.blend new file mode 100644 index 00000000..c28389e2 Binary files /dev/null and b/Art/Models/untitled.blend differ diff --git a/Erika/Assets/Art/Models/Characters/Default.meta b/Erika/Assets/Art/Models/Characters/Default.meta new file mode 100644 index 00000000..43499fc7 --- /dev/null +++ b/Erika/Assets/Art/Models/Characters/Default.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8a40298dd4efd14c9f90a63734ca39b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Art/Models/Characters/Erika2.meta b/Erika/Assets/Art/Models/Characters/Erika2.meta new file mode 100644 index 00000000..fd7369d9 --- /dev/null +++ b/Erika/Assets/Art/Models/Characters/Erika2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 077f81003f9fc564791cce182048c2b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta new file mode 100644 index 00000000..b76e98a5 --- /dev/null +++ b/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20381b3eecfbfe34a9d9222868969d29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta new file mode 100644 index 00000000..41200932 --- /dev/null +++ b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abff7cb61c760094f8ab9437379e0f2c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta new file mode 100644 index 00000000..fa9e76cd --- /dev/null +++ b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e38cb65072bb4a64cbe162792de9bec2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Materials/Unit/Effect.meta b/Erika/Assets/Bundle/Materials/Unit/Effect.meta new file mode 100644 index 00000000..fdf8c1db --- /dev/null +++ b/Erika/Assets/Bundle/Materials/Unit/Effect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0525fec1eb7cc94458170e9e106955d5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Shaders/Include.meta b/Erika/Assets/Bundle/Shaders/Include.meta new file mode 100644 index 00000000..2666365a --- /dev/null +++ b/Erika/Assets/Bundle/Shaders/Include.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc32af12c5122994d8791378227adeb6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Shaders/Unit/Effect.meta b/Erika/Assets/Bundle/Shaders/Unit/Effect.meta new file mode 100644 index 00000000..7df9a033 --- /dev/null +++ b/Erika/Assets/Bundle/Shaders/Unit/Effect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cc4684b9f432f149b16a51f148c9490 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta new file mode 100644 index 00000000..ca7266b0 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1d7b6e0d8fb1a642a65011fb6cd7d89 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta new file mode 100644 index 00000000..142f5872 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ad7401709700f34db2b795830937d76 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/NPC.meta b/Erika/Assets/Bundle/Unit/NPC.meta new file mode 100644 index 00000000..eeea13e1 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/NPC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ced034d375cdfa488814663ea17a79b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta new file mode 100644 index 00000000..8c41a6b2 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5dc1b71affc68b54594096a1b96a5c00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta new file mode 100644 index 00000000..11148d17 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d712421d808a43438a43d8a5d34effe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta new file mode 100644 index 00000000..7d4b13eb --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 922befa8a94692845b88500a23229d7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta new file mode 100644 index 00000000..f5434a00 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07c3b2bf6cb8cc2498422bbb105cbad8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta new file mode 100644 index 00000000..4ed2c938 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 827d77abe87680a47ae2d71a9e953a18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta new file mode 100644 index 00000000..43a52cd1 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a2b72fbb41383047ac45e6c22ea9663 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta new file mode 100644 index 00000000..85d58a8c --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b0838fb0603964e99904eefe81ad7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta new file mode 100644 index 00000000..dd867045 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c8a678ea9e801f439a1003d04f33cf5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta new file mode 100644 index 00000000..dc530723 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebf636c7cf7b1934b885298ce1f5f42e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta new file mode 100644 index 00000000..b28b6f04 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2022e8298d3a8624992143eb57c0f8ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta new file mode 100644 index 00000000..eeca0d3b --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6aa859c834c51f498ef0b3c3b83a0f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta new file mode 100644 index 00000000..7f91da28 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df69962f5b01e444a8bea87e31c7d0a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Prop.meta b/Erika/Assets/Bundle/Unit/Prop.meta new file mode 100644 index 00000000..affd6eed --- /dev/null +++ b/Erika/Assets/Bundle/Unit/Prop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dafc173db1ebeab4c80641cc3d4fa528 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/ProBuilder Data.meta b/Erika/Assets/ProBuilder Data.meta deleted file mode 100644 index 8424bd32..00000000 --- a/Erika/Assets/ProBuilder Data.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 62b452114e207404bacccba32c7da124 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Curve3D.meta b/Erika/Assets/Scripts/Curve3D.meta new file mode 100644 index 00000000..fef1c5e7 --- /dev/null +++ b/Erika/Assets/Scripts/Curve3D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad8b718b6b700d8419838dad07158567 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Drone.meta b/Erika/Assets/Scripts/Drone.meta new file mode 100644 index 00000000..694cff70 --- /dev/null +++ b/Erika/Assets/Scripts/Drone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec3412151f8a72a41b2ed21316763399 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Managers/Physics.meta b/Erika/Assets/Scripts/Managers/Physics.meta new file mode 100644 index 00000000..2296b3f8 --- /dev/null +++ b/Erika/Assets/Scripts/Managers/Physics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 603d4624aaedd794cb89497954a83f4a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Props.meta b/Erika/Assets/Scripts/Props.meta new file mode 100644 index 00000000..bb96602e --- /dev/null +++ b/Erika/Assets/Scripts/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f299520ed9fcf4a45858ad4ef5a8d5d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Robot.meta b/Erika/Assets/Scripts/Robot.meta new file mode 100644 index 00000000..0b5a087e --- /dev/null +++ b/Erika/Assets/Scripts/Robot.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c09ca1609552d24bbe697d1516f8aa9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta new file mode 100644 index 00000000..9b4ad463 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AI/Actions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 971e9d55b8bc0894eb6a110fb962000b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta new file mode 100644 index 00000000..70a86da5 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b7e0c7ed1d12f42a5178bfbf3d934c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta b/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta deleted file mode 100644 index 7c152025..00000000 --- a/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 13ba4d2ee6e74bf4b9aea7f330df39c2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Other/NodeEditorExamples/.gitignore b/Other/NodeEditorExamples/.gitignore index ee0cd4c1..64be6d8a 100644 --- a/Other/NodeEditorExamples/.gitignore +++ b/Other/NodeEditorExamples/.gitignore @@ -1,6 +1,7 @@ / /* !/Assets/ +!/Docs/ !/Packages/ !/ProjectSettings/ !.gitignore diff --git a/Other/NodeEditorExamples/Assets/xNode-examples/Examples/MathGraph/New Math Graph.asset b/Other/NodeEditorExamples/Assets/xNode-examples/Examples/MathGraph/New Math Graph.asset index 45efea59..e3ad295c 100644 --- a/Other/NodeEditorExamples/Assets/xNode-examples/Examples/MathGraph/New Math Graph.asset +++ b/Other/NodeEditorExamples/Assets/xNode-examples/Examples/MathGraph/New Math Graph.asset @@ -17,6 +17,7 @@ MonoBehaviour: - {fileID: 114067149339165002} - {fileID: 114441428018438906} - {fileID: 114775482956350040} + - {fileID: 114583718538277734} --- !u!114 &114067149339165002 MonoBehaviour: m_ObjectHideFlags: 0 @@ -120,6 +121,33 @@ MonoBehaviour: _connectionType: 1 _typeConstraint: 0 _dynamic: 0 +--- !u!114 &114583718538277734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98f6f901f0da53142b79277ea3f42518, type: 3} + m_Name: Display Value + m_EditorClassIdentifier: + graph: {fileID: 11400000} + position: {x: 70.31308, y: -56.076015} + ports: + keys: + - input + values: + - _fieldName: input + _node: {fileID: 114583718538277734} + _typeQualifiedName: XNode.Examples.MathNodes.DisplayValue+Anything, Assembly-CSharp, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + connections: [] + _direction: 0 + _connectionType: 1 + _typeConstraint: 0 + _dynamic: 0 --- !u!114 &114652361136345764 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/New State Graph.asset b/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/New State Graph.asset index 00465c33..d475d3f7 100644 --- a/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/New State Graph.asset +++ b/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/New State Graph.asset @@ -112,7 +112,7 @@ MonoBehaviour: m_Name: State Node m_EditorClassIdentifier: graph: {fileID: 11400000} - position: {x: -296, y: -328} + position: {x: -312, y: -376} ports: keys: - enter diff --git a/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/Nodes/Editor/StateNodeEditor.cs b/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/Nodes/Editor/StateNodeEditor.cs index f9d6b9eb..6ce01956 100644 --- a/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/Nodes/Editor/StateNodeEditor.cs +++ b/Other/NodeEditorExamples/Assets/xNode-examples/Examples/StateMachine/Nodes/Editor/StateNodeEditor.cs @@ -8,7 +8,7 @@ namespace XNodeEditor.Examples { [CustomNodeEditor(typeof(StateNode))] public class StateNodeEditor : NodeEditor { - public override void OnHeaderGUI() { + public override void OnHeaderGUI() { GUI.color = Color.white; StateNode node = target as StateNode; StateGraph graph = node.graph as StateGraph; @@ -19,8 +19,8 @@ namespace XNodeEditor.Examples { } public override void OnBodyGUI() { - base.OnBodyGUI(); - StateNode node = target as StateNode; + base.OnBodyGUI(); + StateNode node = target as StateNode; StateGraph graph = node.graph as StateGraph; if (GUILayout.Button("MoveNext Node")) node.MoveNext(); if (GUILayout.Button("Continue Graph")) graph.Continue(); diff --git a/Other/NodeEditorExamples/Assets/xNode-examples/Scripts/Editor/NodeEditorGUI.cs b/Other/NodeEditorExamples/Assets/xNode-examples/Scripts/Editor/NodeEditorGUI.cs index 41f1d9ca..28f64cd7 100644 --- a/Other/NodeEditorExamples/Assets/xNode-examples/Scripts/Editor/NodeEditorGUI.cs +++ b/Other/NodeEditorExamples/Assets/xNode-examples/Scripts/Editor/NodeEditorGUI.cs @@ -450,7 +450,7 @@ namespace XNodeEditor { GUILayout.BeginArea(new Rect(nodePos, new Vector2(nodeEditor.GetWidth(), 4000))); bool selected = selectionCache.Contains(graph.nodes[n]); - + if (selected) { GUIStyle style = new GUIStyle(nodeEditor.GetBodyStyle()); GUIStyle highlightStyle = new GUIStyle(nodeEditor.GetBodyHighlightStyle()); diff --git a/Other/NodeEditorExamples/Docs/xNodeEditor.xlsx b/Other/NodeEditorExamples/Docs/xNodeEditor.xlsx new file mode 100644 index 00000000..b2cd58f2 Binary files /dev/null and b/Other/NodeEditorExamples/Docs/xNodeEditor.xlsx differ -- cgit v1.1-26-g67d0