MeigoFried/GameVsJam
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'main' of ssh://gitfrieds.nackenbox.xyz:3011/MeigoFried/GameVsJam

Browse Source
This commit is contained in:
klappstuhl24
2024-04-07 01:22:49 +02:00
parent 993b38c057 029ca69924
commit 51f9151060
9 changed files with 490 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
3d Prototyp/Assets/Scenes/GameJamScene.unity
View File

@ -40602,6 +40602,8 @@ MonoBehaviour:
speakingSpeed: 1.1
playSound: 0
generate: 0
newVoiceAndGenerate: 0
Voice:
--- !u!4 &1298233948 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5737504958030667471, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
@ -46559,6 +46561,8 @@ MonoBehaviour:
speakingSpeed: 1.1
playSound: 0
generate: 0
newVoiceAndGenerate: 0
Voice:
--- !u!1001 &1502597417
PrefabInstance:
m_ObjectHideFlags: 0
@ -49966,12 +49970,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
moveSpeed: 30
groundDrag: 1
groundDrag: 4
speed: 5
turningRate: 600
_targetRotation: {x: 0, y: 0, z: 0, w: 1}
jumpKey: 32
jumpForce: 4
jumpForce: 40
jumpCooldown: 0.5
playerHeight: 2
whatIsGround:
@ -50169,6 +50173,132 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &1573807356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1573807341}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: fb2e9958e9ec8d24c836f615c25410f8, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807344}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoJump
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 7f3b63a1-be87-41ca-ad1b-19f55d303089
m_ActionName: Player/Jump
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807344}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoMove
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8b6b0ff-5561-4ddc-b2bd-66e2fef329a0
m_ActionName: Player/Walk
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807344}
m_TargetAssemblyTypeName: Character, Assembly-CSharp
m_MethodName: DoDropItem
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 1fbac6ab-15a0-4a9c-ab41-f1657cfe70f6
m_ActionName: Player/Drop Item
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807350}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoInteract
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 48a90872-b876-4bfd-b3fb-e9d66df8b6a4
m_ActionName: Player/Interact[/Keyboard/e,/XInputControllerWindows/buttonWest]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807350}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectPreviousAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 82379c74-be3b-419a-8663-4d6235bf1585
m_ActionName: Player/Select Previous Action[/Keyboard/leftArrow,/XInputControllerWindows/dpad/left]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1573807350}
m_TargetAssemblyTypeName: InteractionHandler, Assembly-CSharp
m_MethodName: DoSelectNextAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a8df853a-df28-4087-8356-bb64a7a81c51
m_ActionName: Player/Select Next Action[/Keyboard/rightArrow,/XInputControllerWindows/dpad/right]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Player
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1 &1577864189
GameObject:
m_ObjectHideFlags: 0
@ -59979,6 +60109,8 @@ MonoBehaviour:
speakingSpeed: 1.1
playSound: 0
generate: 0
newVoiceAndGenerate: 0
Voice:
--- !u!82 &1891423493
AudioSource:
m_ObjectHideFlags: 0
@ -62298,6 +62430,8 @@ MonoBehaviour:
speakingSpeed: 1.1
playSound: 0
generate: 0
newVoiceAndGenerate: 0
Voice:
--- !u!1 &1961564159
GameObject:
m_ObjectHideFlags: 0
@ -66309,6 +66443,8 @@ MonoBehaviour:
speakingSpeed: 1.1
playSound: 0
generate: 0
newVoiceAndGenerate: 0
Voice:
--- !u!1 &2101876026
GameObject:
m_ObjectHideFlags: 0
@ -68195,6 +68331,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807353}
- targetCorrespondingSourceObject: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
insertIndex: -1
addedObject: {fileID: 1573807356}
m_SourcePrefab: {fileID: 100100000, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
--- !u!23 &87716553343573121
MeshRenderer: