jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simple Node Based movement System

Browse Source 
Every Field is a Node
Additional: Camera dump smooth follow
This commit is contained in:
brausjonas
2023-01-23 22:10:02 +01:00
parent 0142f00f8b
commit 4f0dcefbcb
12 changed files with 1052 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+11 -1
View File
@@ -8,6 +8,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Camera/Camera.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/EventField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/Field.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/GetCoinsField.cs" root0="FORCE_HIGHLIGHTING" />
@@ -16,6 +17,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/LuckField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/UnluckyField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Fields/VSField.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
@@ -42,6 +44,14 @@
}
}]]></component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyTestBuild\FlufflParty.exe" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="C:\Users\braus\OneDrive\Desktop\FlufflPartyTestBuild" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" />
</configuration>
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.16f1\Editor\Unity.exe" />
<option name="PROGRAM_PARAMETERS" value="-projectPath F:\Projects\Unity\flufflparty\FlufflParty -debugCodeOptimization" />
@@ -88,7 +98,7 @@
<option name="presentableId" value="Default" />
<updated>1674498502961</updated>
<workItem from="1674498508490" duration="127000" />
<workItem from="1674498669951" duration="438000" />
<workItem from="1674498669951" duration="9033000" />
</task>
<servers />
</component>
FlufflParty/Assets/Materials/PlayerFields/Ring.mat
+1 -1
View File
@@ -76,5 +76,5 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 0.627451, b: 0.49411765, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0.8962264, g: 0.43543077, b: 0.43543077, a: 1}
m_BuildTextureStacks: []
FlufflParty/Assets/Scenes/WesternMap.unity
+775 -306
View File
File diff suppressed because it is too large Load Diff
FlufflParty/Assets/Scripts/Camera.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eb6f7c9a6e6cd424c853338442fa92fc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
FlufflParty/Assets/Scripts/Camera/Camera.cs
+23
View File
@@ -0,0 +1,23 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Camera : MonoBehaviour
{
//TODO: Replace with Follow Function later (player camera should follow)
[SerializeField] private GameObject followUp;
private Vector3 offset;
private Vector3 velocity = Vector3.zero;
//TODO: Replace with Follow Function later (player camera should follow)
private void Start()
{
offset = followUp.transform.position - transform.position;
}
private void FixedUpdate()
{
transform.position = Vector3.SmoothDamp(transform.position, followUp.transform.position - offset, ref velocity, 0.6f);
}
}
FlufflParty/Assets/Scripts/Camera/Camera.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f02425538b327cc47a5d70da69804669
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
FlufflParty/Assets/Scripts/Fields/Field.cs
+4 -2
View File
@@ -4,9 +4,10 @@ using UnityEngine;
public abstract class Field : MonoBehaviour
{
[SerializeField] private GameObject[] target;
//Liste der nächsten Feld, die auf das diesige Feld folgen
[SerializeField] private Field[] target;
public GameObject[] Target
public Field[] Target
{
get
{
@@ -14,5 +15,6 @@ public abstract class Field : MonoBehaviour
}
}
//Feld aktion (Münzen etc..)
public abstract void Action();
}
FlufflParty/Assets/Scripts/Players.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bcbe5b660ed69574181c2fc9d164238d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
FlufflParty/Assets/Scripts/Players/Player.cs
+126
View File
@@ -0,0 +1,126 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Random = UnityEngine.Random;
public class Player : MonoBehaviour
{
[SerializeField] private Field nextField;
private Field currentField;
[SerializeField] private GameObject dice;
private Vector3 moveTo = Vector3.zero;
private Vector3 lastPos = Vector3.zero;
private float speed = 5;
private float interPol = 0;
private int wurfelZahl = 0;
private bool activated = true;
private bool wait = false;
private void Start()
{
Debug.Log("Test: zum Würfeln Leertaste drücken!");
}
private void Update()
{
if(activated)
{
//Generiere Würfelzahl von 1-6 wenn gerade gewürfelt werden darf
if (Input.GetKeyDown(KeyCode.Space) && wurfelZahl == 0)
{
wurfelZahl = Random.Range(1, 7);
Debug.Log("Test: gewürfelt wurde " + wurfelZahl);
//nächstes Feld anvisieren
TargetNextField();
}
}
}
private void FixedUpdate()
{
if (activated)
{
if (!wait)
{
//Laufe zum nöchsten Feld, falls noch Züge übrig sind
if (interPol < 1 && wurfelZahl > 0)
{
InterPolerate();
}
//Würfelzahl um 1 verringern falls noch züge übrig sind
else if (wurfelZahl > 0 )
{
wurfelZahl--;
//Visiere das nächste Feld an falls noch ein Zug übrig ist (Player steht gerade auf einem Feld oder läuft darüber)
if (wurfelZahl > 0)
{
TargetNextField();
}
}
//Der Spieler steht gerade
else
{
}
}
else
{
//TEST!!!!!!!!!!!!!!!
//TODO: Replace with selection arrows
if (Input.GetKeyDown(KeyCode.N))
{
nextField = nextField = nextField.Target[0];
moveTo = nextField.transform.position;
wait = false;
}
else if (Input.GetKeyDown(KeyCode.A))
{
nextField = nextField = nextField.Target[1];
moveTo = nextField.transform.position;
wait = false;
}
}
}
}
//Das nächste Feld aufgrund des aktuellen Feldes anvisieren
private void TargetNextField()
{
interPol = 0;
lastPos = transform.position;
currentField = nextField;
if(nextField.Target.Length == 1)
{
nextField = nextField.Target[0];
moveTo = nextField.transform.position;
}
else
{
wait = true;
Debug.Log("Test: AlternativWeg = A NormalerWeg = N");
}
}
//Bewegt den Player von einem Punkt(lastPos) zu einem anderen Punkt(moveTo) mit konstanter Geschwindigkeit
private void InterPolerate()
{
Vector3 nextPoint = Vector3.Lerp(lastPos, moveTo, interPol);
transform.position = new Vector3(nextPoint.x, transform.position.y, nextPoint.z);
interPol += (Time.deltaTime * speed) / Mathf.Abs(Vector3.Distance(moveTo, lastPos));
}
//Aktiviert den Player
public void Activate()
{
activated = true;
}
//Deaktiviert den Player
public void DeActivate()
{
activated = false;
}
}
FlufflParty/Assets/Scripts/Players/Player.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0c5b74f4bdf875641a8d9ac432a5166f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
FlufflParty/ProjectSettings/EditorBuildSettings.asset
+4 -1
View File
@@ -4,5 +4,8 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/Scenes/WesternMap.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
m_configObjects: {}
FlufflParty/UserSettings/Layouts/default-2021.dwlt
+70 -68
View File
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 1117
m_ShowMode: 4
m_Title: Project
m_Title: Game
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 17
controlID: 70
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -68,8 +68,8 @@ MonoBehaviour:
y: 0
width: 417
height: 1067
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
@@ -94,8 +94,8 @@ MonoBehaviour:
y: 0
width: 355
height: 757
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -111,7 +111,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -120,14 +120,14 @@ MonoBehaviour:
y: 757
width: 1503
height: 310
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 13}
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 13}
- {fileID: 17}
m_Selected: 0
m_LastSelected: 1
- {fileID: 16}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -223,7 +223,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 58
controlID: 71
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -248,7 +248,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 45
controlID: 72
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -259,7 +259,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -270,12 +270,12 @@ MonoBehaviour:
height: 757
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 12}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 12}
- {fileID: 16}
m_Selected: 0
m_LastSelected: 1
- {fileID: 17}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -385,7 +385,7 @@ MonoBehaviour:
containerId: overlay-container--right
floating: 0
collapsed: 0
displayed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
@@ -501,9 +501,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 114.80537, y: 7.496409, z: 123.43292}
m_Target: {x: 110.7924, y: -10.311268, z: 99.623726}
speed: 2
m_Value: {x: 114.80537, y: 7.496409, z: 123.43292}
m_Value: {x: 110.7924, y: -10.311268, z: 99.623726}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -550,13 +550,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.05425779, y: 0.92581004, z: -0.34559166, w: 0.1446222}
m_Target: {x: 0.14066349, y: 0.85657394, z: -0.37594578, w: 0.325938}
speed: 2
m_Value: {x: 0.053728133, y: 0.9258328, z: -0.34560058, w: 0.14320345}
m_Value: {x: 0.14058787, y: 0.85611343, z: -0.3757437, w: 0.32576278}
m_Size:
m_Target: 3.6915483
m_Target: 12.595625
speed: 2
m_Value: 3.6915483
m_Value: 12.595625
m_Ortho:
m_Target: 0
speed: 2
@@ -622,22 +622,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/BlenderFiles/Textures
- Assets/Scripts/Camera
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/BlenderFiles/Textures
- Assets/Scripts/Camera
m_LastFoldersGridSize: -1
m_LastProjectPath: F:\Projects\Unity\flufflparty\FlufflParty
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 53}
m_SelectedIDs: 145b0000
m_LastClickedID: 23316
m_ExpandedIDs: 00000000dc5a0000de5a000000ca9a3bffffff7f
scrollPos: {x: 0, y: 167}
m_SelectedIDs: 02330500
m_LastClickedID: 340738
m_ExpandedIDs: 00000000dc5a0000de5a0000205b00002cdf000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -692,7 +692,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -795,7 +795,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 38fbffff
m_ExpandedIDs: d2ccfaff14cdfaff14d3faff8ed5faffd0d5faffd0dbfaff52f2faffa0f2faffa0f8faffb0fbfaff04fcfaff0402fbff4a4cfcffa239ffff089fffffdaacffffaedcfffff2efffffe6f2ffff58f4ffffacf4fffff4f4ffff3cf5ffff38fbffff545f000068290500
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -828,10 +828,38 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 830
width: 1502
height: 289
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
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: 12015, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 200, y: 200}
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
@@ -847,8 +875,10 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_SerializedViewNames: []
m_SerializedViewValues: []
m_SerializedViewNames:
- UnityEditor.DeviceSimulation.SimulatorWindow
m_SerializedViewValues:
- F:\Projects\Unity\flufflparty\FlufflParty\Library\PlayModeViewStates\c6c91308d2b1ef94abaf51759a7819fb
m_PlayModeViewName: GameView
m_ShowGizmos: 0
m_TargetDisplay: 0
@@ -857,7 +887,7 @@ MonoBehaviour:
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
m_EnterPlayModeBehavior: 0
m_EnterPlayModeBehavior: 2
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
@@ -880,7 +910,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -911,31 +941,3 @@ MonoBehaviour:
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 665
width: 1455
height: 446
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []