Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added chopping and mining, added particles for trees

Browse Source
This commit is contained in:
TAASONI3 2024-06-22 20:22:17 +02:00
parent 7b9683bb49
commit cbd086d658
15 changed files with 22023 additions and 589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6260
Assets/IMG/Animations/Player/Chopping.anim
View File

File diff suppressed because it is too large Load Diff

6398
Assets/IMG/Animations/Player/Mining.anim
View File

File diff suppressed because it is too large Load Diff

2
Assets/IMG/Animations/Player/Mining.anim.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dfe6f42559279b9f2a43256075839781
guid: b6f5bfd53f502aa33a1066fae2506e7f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

62
Assets/IMG/Animations/Player/PlayerAnimator.controller
View File

@ -81,16 +81,16 @@ AnimatorStateMachine:
m_Position: {x: 260, y: -50, z: 0}
- serializedVersion: 1
m_State: {fileID: -2600215542219053945}
m_Position: {x: 490, y: -290, z: 0}
m_Position: {x: 780, y: -250, z: 0}
- serializedVersion: 1
m_State: {fileID: 2517434392923035321}
m_Position: {x: 570, y: 180, z: 0}
m_Position: {x: 210, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -2961105820709773878}
m_Position: {x: 790, y: -310, z: 0}
- serializedVersion: 1
m_State: {fileID: 7708062428621576211}
m_Position: {x: 410, y: 80, z: 0}
m_Position: {x: 450, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -8563349213657961902}
m_Position: {x: 520, y: -50, z: 0}
@ -107,6 +107,50 @@ AnimatorStateMachine:
m_ExitPosition: {x: 860, y: -30, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4026934837641483164}
--- !u!1101 &-4201526255213873428
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4026934837641483164}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6590909
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3900587270583262934
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4026934837641483164}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-2961105820709773878
AnimatorState:
serializedVersion: 6
@ -275,9 +319,10 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Chopping
m_Speed: 1
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: -4201526255213873428}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -391,9 +436,10 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Mining
m_Speed: 1
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: -3900587270583262934}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -403,7 +449,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
m_Motion: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:

3
Assets/Prefabs/Rock_1.prefab
View File

@ -147,4 +147,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4fc88a9ab15a9238baf100c2fd070aa7, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
clip: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
keepAlive: 0

3
Assets/Prefabs/Rock_2.prefab
View File

@ -147,4 +147,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4fc88a9ab15a9238baf100c2fd070aa7, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
clip: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
keepAlive: 0

4857
Assets/Prefabs/Tree_1.prefab
View File

File diff suppressed because it is too large Load Diff

4858
Assets/Prefabs/Tree_2.prefab
View File

File diff suppressed because it is too large Load Diff

3
Assets/Prefabs/copperOre.prefab
View File

@ -180,7 +180,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
clip: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
keepAlive: 0
--- !u!1 &8310517336631356992
GameObject:
m_ObjectHideFlags: 0

3
Assets/Prefabs/goldOre.prefab
View File

@ -180,7 +180,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
clip: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
keepAlive: 0
--- !u!1 &8774396427657433139
GameObject:
m_ObjectHideFlags: 0

3
Assets/Prefabs/ironOre.prefab
View File

@ -180,7 +180,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
clip: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
keepAlive: 0
--- !u!1 &7892395422436754689
GameObject:
m_ObjectHideFlags: 0

3
Assets/Prefabs/tinOre.prefab
View File

@ -180,7 +180,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
m_Name:
m_EditorClassIdentifier:
clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
clip: {fileID: 7400000, guid: b6f5bfd53f502aa33a1066fae2506e7f, type: 2}
keepAlive: 0
--- !u!1 &7170566803458479965
GameObject:
m_ObjectHideFlags: 0

8
Assets/Scenes/GameScene.unity
View File

@ -18611,8 +18611,8 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 927922402}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
@ -27708,8 +27708,8 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438812379}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1

27
Assets/Scripts/InteractableObjects/InteractableObject.cs
View File

@ -27,9 +27,8 @@ namespace Assets.Scripts.InteractableObjects
public void OnInteraction(GameObject player)
{
//StartCoroutine(playParticle(player));
//StartCoroutine(playAnimation(player));
StartCoroutine(playParticle(player));
StartCoroutine(playAnimation(player));
handleInteraction(player);
}
@ -55,30 +54,8 @@ namespace Assets.Scripts.InteractableObjects
{
if (clip != null)
{
Animator animator = player.GetComponent<Animator>();
AnimationClip[] clips = animator.runtimeAnimatorController.animationClips;
float length = 0;
foreach (AnimationClip clip in clips)
{
if (clip.name.ToLower() == "disarming")
{
length = clip.length;
break;
}
}
if (player.GetComponent<PlayerGameObject>().isArmed)
{
player.GetComponent<Animator>().Play("Disarming");
yield return new WaitForSeconds(length);
}
player.GetComponent<Animator>().Play(clip.name);
yield return new WaitForSeconds(clip.length);
if (player.GetComponent<PlayerGameObject>().isArmed)
{
player.GetComponent<Animator>().Play("Arming");
yield return new WaitForSeconds(length);
}
}
animationPlayed = true;
}

122
UserSettings/Layouts/default-2022.dwlt
View File

@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 988
m_ShowMode: 4
m_Title: Project
m_Title: Game
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@ -118,7 +118,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 51
controlID: 43
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -143,7 +143,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 52
controlID: 44
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -168,7 +168,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 53
controlID: 45
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -193,7 +193,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 23
controlID: 46
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@ -213,8 +213,8 @@ MonoBehaviour:
y: 0
width: 332
height: 662
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: 14}
m_Panes:
- {fileID: 14}
@ -230,7 +230,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: LocalizationTablesWindow
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -239,16 +239,16 @@ MonoBehaviour:
y: 0
width: 1290
height: 662
m_MinSize: {x: 902, y: 621}
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
- {fileID: 16}
- {fileID: 17}
- {fileID: 18}
- {fileID: 19}
- {fileID: 13}
- {fileID: 16}
m_Selected: 5
m_LastSelected: 0
--- !u!114 &11
@ -276,9 +276,8 @@ MonoBehaviour:
m_Panes:
- {fileID: 20}
- {fileID: 21}
- {fileID: 22}
m_Selected: 0
m_LastSelected: 1
m_LastSelected: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@ -300,9 +299,9 @@ MonoBehaviour:
height: 938
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 23}
m_ActualView: {fileID: 22}
m_Panes:
- {fileID: 23}
- {fileID: 22}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &13
@ -359,8 +358,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1920
y: 122
x: 0
y: 19
width: 331
height: 641
m_SerializedDataModeController:
@ -376,9 +375,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 56090000
m_LastClickedID: 0
m_ExpandedIDs: ded2feff10a80000a0aa0000faaa0000aaab000020ac0000f4ac0000
m_SelectedIDs: 82680000
m_LastClickedID: 26754
m_ExpandedIDs: 0c0cfeff4614feff74b3feffbab3fefff2c0feff28c4feff0efbffffb66000002a6100005c610000066300005865000044660000ae6600004c67000082680000aa680000266a0000626a0000866a0000a86b0000526c0000566c00005c6c0000666c0000686c0000886c00009c6c00009e6c0000ce6c0000da6c0000e26c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -730,7 +729,7 @@ MonoBehaviour:
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: UnityEditor.SceneViewCameraOverlay
index: 9
index: 10
layout: 4
size: {x: 0, y: 0}
sizeOverriden: 0
@ -784,9 +783,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 25.992912, y: 11.057134, z: -15.056614}
m_Target: {x: 45.12087, y: -80.28963, z: -116.913055}
speed: 2
m_Value: {x: -0.55497044, y: -0.06195605, z: 0.07799015}
m_Value: {x: 45.12087, y: -80.28963, z: -116.913055}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -832,13 +831,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.07058, y: -0.8598145, z: 0.12325598, w: -0.48889694}
m_Target: {x: 0.057730015, y: 0.9274457, z: -0.32548937, w: 0.17011483}
speed: 2
m_Value: {x: -0.00959617, y: 0.97118896, z: -0.23476727, w: -0.039803635}
m_Value: {x: 0.057777107, y: 0.9282022, z: -0.32575488, w: 0.17025359}
m_Size:
m_Target: 22.643044
m_Target: 81.71963
speed: 2
m_Value: 1.626575
m_Value: 81.71963
m_Ortho:
m_Target: 0
speed: 2
@ -886,7 +885,7 @@ MonoBehaviour:
x: 2252
y: 122
width: 1288
height: 640
height: 641
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@ -942,22 +941,22 @@ MonoBehaviour:
x: 0
y: 21
width: 1288
height: 619
m_Scale: {x: 0.57314813, y: 0.57314813}
m_Translation: {x: 644, y: 309.5}
height: 620
m_Scale: {x: 0.5740741, y: 0.5740741}
m_Translation: {x: 644, y: 310}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -1123.6188
x: -1121.8064
y: -540
width: 2247.2375
width: 2243.6128
height: 1080
m_MinimalGUI: 1
m_defaultScale: 0.57314813
m_LastWindowPixelSize: {x: 1288, y: 640}
m_defaultScale: 0.5740741
m_LastWindowPixelSize: {x: 1288, y: 641}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@ -1600,7 +1599,7 @@ MonoBehaviour:
x: 2252
y: 122
width: 1288
height: 640
height: 641
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@ -1692,7 +1691,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Locals/StringTable
- Assets/Prefabs
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@ -1700,16 +1699,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Locals/StringTable
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 72}
m_SelectedIDs: 56090000
m_LastClickedID: 2390
m_ExpandedIDs: 00000000ea0600003e070000520700001e0800008e080000b608000000ca9a3b
scrollPos: {x: 0, y: 120}
m_SelectedIDs: 82710000
m_LastClickedID: 29058
m_ExpandedIDs: 00000000ce700000d0700000d2700000d4700000d67000007c7100008271000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1737,7 +1736,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ea0600003e0700001e0800008e080000b6080000
m_ExpandedIDs: 00000000ce700000d0700000d2700000d4700000d6700000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1828,43 +1827,6 @@ MonoBehaviour:
m_SaveData: []
m_OverlaysVisible: 1
--- !u!114 &22
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: 12071, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Animation
m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1920
y: 778
width: 1621
height: 261
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
m_SupportedDataModes:
isAutomatic: 1
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: 204018
--- !u!114 &23
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}