diff --git a/robowaiter/scene/tasks/AEM.py b/robowaiter/scene/tasks/AEM.py index 3ab63f1..dbbc598 100644 --- a/robowaiter/scene/tasks/AEM.py +++ b/robowaiter/scene/tasks/AEM.py @@ -54,8 +54,8 @@ class SceneAEM(Scene): # navigation_test(i,map_id) # map_map = np.zeros((math.ceil(950 / map_ratio), math.ceil(1850 / map_ratio))) - # self.add_walker(0, 30, 520, ) - # self.add_walker(10, 30, 420) + self.add_walker(31, 30, 520, ) + self.add_walker(15, 30, 420) while True: walker_count = 0 fig = plt.figure() diff --git a/robowaiter/scene/tasks/GQA/GQA_1_ask_order_place.py b/robowaiter/scene/tasks/GQA/GQA_1_ask_order_place.py index f5b48c6..a0c1714 100644 --- a/robowaiter/scene/tasks/GQA/GQA_1_ask_order_place.py +++ b/robowaiter/scene/tasks/GQA/GQA_1_ask_order_place.py @@ -17,15 +17,15 @@ class SceneGQA(Scene): # 在这里加入场景中发生的事件, (事件发生的时间,事件函数) self.signal_event_list = [ (5, self.customer_say, (6, "你好呀,你们这有啥好吃的?")), # 男 - (15, self.customer_say, (6, "听起来都好甜呀,我女朋友爱吃水果。")), - (15, self.customer_say, (6, "你们这人可真多。")), - (15, self.customer_say, (6, "我女朋友怕晒,有空余的阴凉位置嘛?")), - (15, self.customer_say, (6, "那还不错。")), - (15, self.customer_say, (5, "请问洗手间在哪呢?")), - (15, self.customer_say, (5, "我们还想一起下下棋,切磋切磋。")), - (15, self.customer_say, (6, "太棒啦,亲爱的。")), - (15, self.customer_say, (5, "那你知道附近最近的电影院在哪吗?")), - (15, self.customer_say, (6, "谢啦,那我们先去阴凉位置下个棋,等电影开始了就去看呢!")), + (8, self.customer_say, (6, "听起来都好甜呀,我女朋友爱吃水果。")), + (8, self.customer_say, (6, "你们这人可真多。")), + (8, self.customer_say, (6, "我女朋友怕晒,有空余的阴凉位置嘛?")), + (8, self.customer_say, (6, "那还不错。")), + (8, self.customer_say, (5, "请问洗手间在哪呢?")), + (8, self.customer_say, (5, "我们还想一起下下棋,切磋切磋。")), + (8, self.customer_say, (6, "太棒啦,亲爱的。")), + (8, self.customer_say, (5, "那你知道附近最近的电影院在哪吗?")), + (8, self.customer_say, (6, "谢啦,那我们先去阴凉位置下个棋,等电影开始了就去看呢!")), # (6, self.customer_say, (5, "你好呀,这位可是我女朋友呢!")), # (5, self.customer_say, (6, "你们这有什么饮料嘛?")), @@ -44,7 +44,7 @@ class SceneGQA(Scene): self.add_walkers([ [16,250, 1200],[6,-55, 750],[10,70, -200],[47,-290, 400, 180],[26, 60,-320,90]]) self.control_walker(1, True, 100, 60, 720, 0) self.control_walker(4, True, 100, 60, -120, 0) - self.add_walkers([[31, 60,500,0], [15,60,550,0]]) + self.add_walkers([[31, 60,480,0], [15,60,550,0]]) pass diff --git a/robowaiter/scene/tasks/OT/OT_coffee_water_dessert.py b/robowaiter/scene/tasks/OT/OT_coffee_water_dessert.py index 9db7e84..a36779b 100644 --- a/robowaiter/scene/tasks/OT/OT_coffee_water_dessert.py +++ b/robowaiter/scene/tasks/OT/OT_coffee_water_dessert.py @@ -13,8 +13,8 @@ class SceneVLM(Scene): self.signal_event_list = [ (5, self.customer_say, (5, "给我来杯咖啡,哦对,再倒一杯水。")), (1, self.control_walker_ls,([[[5, False, 100, -250, 480, 0],[6, False, 100, 60, 520, 0]]])), - (-1, self.customer_say, (5, "感谢,这些够啦,你去忙吧。")), - (10, self.customer_say, (6, "我想来份点心和酸奶。")), + (10, self.customer_say, (5, "感谢,这些够啦,你去忙吧。")), + (2, self.customer_say, (6, "我想来份点心和酸奶。")), (-1, self.customer_say, (6, "真美味啊!")), ]