aria/mojo-kitchen-chaos
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix DeliveryManager completion bug

Browse source 
If DeliveryManager found a single matching ingreedient on the plate it would mark the order complete. this is no longer the case.
This commit is contained in:
BuyMyMojo 2023-03-03 05:21:31 +11:00
parent 1aa97baff4
commit 89e482d387
3 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.erp
View file

@ -5,7 +5,7 @@
<resetOnSceneChange>false</resetOnSceneChange> <resetOnSceneChange>false</resetOnSceneChange>
<debugMode>false</debugMode> <debugMode>false</debugMode>
<EditorClosed>true</EditorClosed> <EditorClosed>true</EditorClosed>
<LastTimestamp>1677780742</LastTimestamp> <LastTimestamp>1677782054</LastTimestamp>
<LastSessionID>819460763959917709</LastSessionID> <LastSessionID>819460763959917709</LastSessionID>
<Errored>false</Errored> <Errored>false</Errored>
</ERPSettings> </ERPSettings>

16
Assets/Scripts/DeliveryManager.cs
View file

@ -79,17 +79,17 @@ public class DeliveryManager : MonoBehaviour
plateContentsMatchesRecipe = false; plateContentsMatchesRecipe = false;
} }
if (plateContentsMatchesRecipe) }
{ if (plateContentsMatchesRecipe)
// Player delivered correct recipe {
// Player delivered correct recipe
waitingRecipeSOList.RemoveAt(i); waitingRecipeSOList.RemoveAt(i);
OnRecipeCompleted?.Invoke(this, EventArgs.Empty); OnRecipeCompleted?.Invoke(this, EventArgs.Empty);
OnRecipeSuccess?.Invoke(this, EventArgs.Empty); OnRecipeSuccess?.Invoke(this, EventArgs.Empty);
return; return;
}
} }
} }
} }

70
UserSettings/Layouts/default-2022.dwlt
View file

@ -19,7 +19,7 @@ MonoBehaviour:
width: 2560 width: 2560
height: 1349 height: 1349
m_ShowMode: 4 m_ShowMode: 4
m_Title: Scene m_Title: Inspector
m_RootView: {fileID: 8} m_RootView: {fileID: 8}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
@ -47,7 +47,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 1 vertical: 1
controlID: 85 controlID: 105
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -67,8 +67,8 @@ MonoBehaviour:
y: 0 y: 0
width: 403 width: 403
height: 329 height: 329
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 19}
m_Panes: m_Panes:
- {fileID: 19} - {fileID: 19}
@ -98,7 +98,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 50} m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 56 controlID: 32
--- !u!114 &5 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -123,7 +123,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 86 controlID: 106
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -410,7 +410,7 @@ MonoBehaviour:
m_OverlaysVisible: 1 m_OverlaysVisible: 1
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastSelectedObjectID: 34536 m_LastSelectedObjectID: 28870
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -549,7 +549,7 @@ MonoBehaviour:
m_SkipHidden: 1 m_SkipHidden: 1
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets - Assets/ScriptableObjects/RecipeSO
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ImportLogFlags: 0 m_ImportLogFlags: 0
@ -565,7 +565,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 118} scrollPos: {x: 0, y: 118}
m_SelectedIDs: 3c6f0000 m_SelectedIDs: 3c6f0000
m_LastClickedID: 28476 m_LastClickedID: 28476
m_ExpandedIDs: 00000000de790000e0790000e2790000e4790000e6790000e8790000ea790000ec790000ee790000f0790000f2790000f4790000f6790000f8790000fa790000 m_ExpandedIDs: 00000000b47c0000b67c0000b87c0000ba7c0000bc7c0000be7c0000c07c0000c27c0000c47c0000c67c0000c87c0000ca7c0000cc7c0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -590,24 +590,24 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_AssetTreeState: m_AssetTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 360}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000de790000e0790000e2790000e4790000e6790000f0790000f2790000f4790000f6790000f8790000fa790000548e0000588e0000 m_ExpandedIDs: ffffffff00000000b47c0000b67c0000b87c0000ba7c0000bc7c0000be7c0000c07c0000c27c0000c47c0000c67c0000c87c0000ca7c0000cc7c0000367d0000387d00000ab00000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: UniversalRenderPipelineGlobalSettings m_Name:
m_OriginalName: UniversalRenderPipelineGlobalSettings m_OriginalName:
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 632 m_UserData: 0
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 0 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 7} m_ClientGUIView: {fileID: 7}
m_SearchString: m_SearchString:
@ -735,7 +735,7 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 78020000 m_SelectedIDs: c06f0000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 0afbffff m_ExpandedIDs: 0afbffff
m_RenameOverlay: m_RenameOverlay:
@ -1105,9 +1105,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: -2.7192113, y: 5.4323745, z: -0.9643124} m_Target: {x: 1.703675, y: -40.36872, z: 41.879623}
speed: 2 speed: 2
m_Value: {x: -2.7192113, y: 5.4323745, z: -0.9643124} m_Value: {x: 1.703675, y: -40.36872, z: 41.879623}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
@ -1153,13 +1153,13 @@ MonoBehaviour:
m_GridAxis: 1 m_GridAxis: 1
m_gridOpacity: 0.5 m_gridOpacity: 0.5
m_Rotation: m_Rotation:
m_Target: {x: 0.24366017, y: 0.039898768, z: -0.009900826, w: 0.96914274} m_Target: {x: 0.3749727, y: -0.00746769, z: 0.0030333141, w: 0.92719775}
speed: 2 speed: 2
m_Value: {x: 0.24360877, y: 0.041346278, z: -0.010264777, w: 0.9689376} m_Value: {x: 0.37490427, y: -0.0074663274, z: 0.0030327607, w: 0.92702854}
m_Size: m_Size:
m_Target: 4.3206353 m_Target: 35.35534
speed: 2 speed: 2
m_Value: 4.3206353 m_Value: 35.35534
m_Ortho: m_Ortho:
m_Target: 0 m_Target: 0
speed: 2 speed: 2
@ -1225,7 +1225,7 @@ MonoBehaviour:
m_ShowGizmos: 0 m_ShowGizmos: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0} m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 2560, y: 1440} m_TargetSize: {x: 1920, y: 1080}
m_TextureFilterMode: 0 m_TextureFilterMode: 0
m_TextureHideFlags: 61 m_TextureHideFlags: 61
m_RenderIMGUI: 1 m_RenderIMGUI: 1
@ -1240,10 +1240,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -1280 m_HBaseRangeMin: -960
m_HBaseRangeMax: 1280 m_HBaseRangeMax: 960
m_VBaseRangeMin: -720 m_VBaseRangeMin: -540
m_VBaseRangeMax: 720 m_VBaseRangeMax: 540
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
@ -1252,7 +1252,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1 m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
@ -1263,20 +1263,20 @@ MonoBehaviour:
y: 21 y: 21
width: 1828 width: 1828
height: 928 height: 928
m_Scale: {x: 0.64444447, y: 0.64444447} m_Scale: {x: 0.85925925, y: 0.85925925}
m_Translation: {x: 913.99994, y: 464} m_Translation: {x: 914, y: 464}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -1418.2758 x: -1063.7069
y: -720 y: -540
width: 2836.5515 width: 2127.4138
height: 1440 height: 1080
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 0.64444447 m_defaultScale: 0.85925925
m_LastWindowPixelSize: {x: 1828, y: 949} m_LastWindowPixelSize: {x: 1828, y: 949}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1