From 5e2acc8ee0dca6ed1d1570ed83e3c67fa58e1a24 Mon Sep 17 00:00:00 2001
From: itachilee <3050155685@qq.com>
Date: Mon, 11 Apr 2022 20:06:28 +0800
Subject: [PATCH] 1
---
HBLConsole.MORKIC/Control_MORKIC.cs | 8 ++++----
HBLConsole/App.config | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HBLConsole.MORKIC/Control_MORKIC.cs b/HBLConsole.MORKIC/Control_MORKIC.cs
index 7c0883f..7c3efd6 100644
--- a/HBLConsole.MORKIC/Control_MORKIC.cs
+++ b/HBLConsole.MORKIC/Control_MORKIC.cs
@@ -268,7 +268,7 @@ namespace HBLConsole.MORKIC
SimpleFactory.GetInstance.OrderChanged(subOrderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_取咖啡杯);
Wait();
- //new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
+ new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
Thread.Sleep(3000);
Thread.Sleep(500);
@@ -285,7 +285,7 @@ namespace HBLConsole.MORKIC
LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_二次取咖啡杯);
Wait();
- //new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
+ new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
Thread.Sleep(3000);
LebaiHelper.GetInstance.SetValue(1);
@@ -294,8 +294,8 @@ namespace HBLConsole.MORKIC
LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_接咖啡);
Wait();
- //new MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish(); //接咖啡控制
- //are.WaitOne(1000 * 180);
+ new MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish(); //接咖啡控制
+ are.WaitOne(1000 * 180);
Thread.Sleep(3000);
LebaiHelper.GetInstance.SetValue(1);
diff --git a/HBLConsole/App.config b/HBLConsole/App.config
index 91933c9..ef818c5 100644
--- a/HBLConsole/App.config
+++ b/HBLConsole/App.config
@@ -11,7 +11,7 @@
-
+