From 4cad4c373b76b3c7b89f9e695b0b96ffed2d7e33 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Sep 2022 13:52:59 +0800 Subject: [PATCH 1/2] 1 --- third_party/a8engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/a8engine b/third_party/a8engine index 9b63b8fe..3e5ad07a 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 9b63b8fee2f459b1bd096c76d4f6aecfc2ba45bd +Subproject commit 3e5ad07a23e6157161c7971994d349e5fdcb4e31 From 5890c32d2f9396fde4c19ef9f92150a395599934 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 8 Sep 2022 15:15:16 +0800 Subject: [PATCH 2/2] 1 --- server/gameserver/obstacle.cc | 4 ++++ third_party/a8engine | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc index 48cf4a7c..4c56492c 100644 --- a/server/gameserver/obstacle.cc +++ b/server/gameserver/obstacle.cc @@ -94,6 +94,10 @@ void Obstacle::RecalcSelfCollider() permanent_map_service->AddCollider(self_collider2_); } break; + case 3: + { + } + break; default: { A8_ABORT(); diff --git a/third_party/a8engine b/third_party/a8engine index 3e5ad07a..9b63b8fe 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 3e5ad07a23e6157161c7971994d349e5fdcb4e31 +Subproject commit 9b63b8fee2f459b1bd096c76d4f6aecfc2ba45bd