Skip to content

Commit

Permalink
Merge pull request #43 from Team-Swamp/feature/game-loop-2
Browse files Browse the repository at this point in the history
Feature/game-loop-2
  • Loading branch information
bas-boop authored Mar 14, 2024
2 parents 9e2a93d + f4c91e3 commit b51e92a
Show file tree
Hide file tree
Showing 23 changed files with 25,695 additions and 11,371 deletions.
44 changes: 34 additions & 10 deletions Assets/Animations/Penguin/NPC/AC_Penguin.controller
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Finished Walk Cycle
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4904444179754877524}
m_Solo: 0
Expand All @@ -119,7 +122,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9166667
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -180,7 +183,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Hold Item
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4904444179754877524}
m_Solo: 0
Expand All @@ -190,7 +196,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.97413796
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -202,7 +208,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Release Item
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -243718416379887218}
m_Solo: 0
Expand All @@ -212,7 +221,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.97413796
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -316,7 +325,10 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Walk Cycle
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6353554390163575455}
m_Solo: 0
Expand All @@ -326,7 +338,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.97413796
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -374,13 +386,25 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Finished Walk Cycle
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Hold Item
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Release Item
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Walk
Expand Down
80 changes: 80 additions & 0 deletions Assets/Materials/Penguin/M_ChefHat.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: M_ChefHat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/Penguin/M_ChefHat.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions Assets/Models/Penguin/SM_Chefs_Hat.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

102 changes: 97 additions & 5 deletions Assets/Prefabs/Cooking/Kitchen Appliances/Grill Variant.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174850, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: m_LocalPosition.x
value: -4.43
value: -12.94
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174850, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 2.61
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174850, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 26.48
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174850, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -55,8 +55,63 @@ PrefabInstance:
propertyPath: m_Name
value: Grill
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: useTimer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2174570612569687726}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 8781869184212037385}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ResetTimer
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: SetOrPickUpItem
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: FrameWork.Timer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: Framework.Cooking.KitchenAppliance, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
propertyPath: onInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
--- !u!114 &8781869184212037385 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8040286653525174973, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
m_PrefabInstance: {fileID: 1606555134757094836}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781869184212037618}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c4350bcfadd44b409dfaf2505014f045, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8781869184212037618 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8040286653525174854, guid: b7934e901ffb32241a2f6447dd646181, type: 3}
Expand All @@ -77,11 +132,35 @@ MonoBehaviour:
isCountingUp: 0
canCountOnAwake: 0
canCount: 0
startingTime: 0
startingTime: 5
timerThreshold: 0
onTimerDone:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 8781869184212037385}
m_TargetAssemblyTypeName: Framework.Cooking.KitchenAppliance, Assembly-CSharp
m_MethodName: CookFish
m_Mode: 1
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_Target: {fileID: 8781869184212037385}
m_TargetAssemblyTypeName: Framework.Cooking.KitchenAppliance, Assembly-CSharp
m_MethodName: ChangeCurrentIngredientState
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 2
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
onTimerPassedThreshold:
m_PersistentCalls:
m_Calls: []
Expand All @@ -91,3 +170,16 @@ MonoBehaviour:
onReset:
m_PersistentCalls:
m_Calls: []
--- !u!65 &8663106364285111791
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781869184212037618}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2.527423, y: 1, z: 5.5704536}
m_Center: {x: -0.13124609, y: 0, z: 0.2356224}
Loading

0 comments on commit b51e92a

Please sign in to comment.