From ff6b400bee69d124cee0dc3a0d96328055c16027 Mon Sep 17 00:00:00 2001 From: DragonAura Date: Thu, 25 May 2023 18:42:03 +0800 Subject: [PATCH 1/2] docs: :memo: fix capi multi line --- docs/Tool_tutorial.md | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/docs/Tool_tutorial.md b/docs/Tool_tutorial.md index 995689a..ea12adc 100644 --- a/docs/Tool_tutorial.md +++ b/docs/Tool_tutorial.md @@ -53,9 +53,12 @@ #include int main() { - auto sec = std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(); - auto msec = std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(); - std::cout << "从 1970 年元旦到现在的：秒数" << sec << "；毫秒数：" << msec << std::endl; + auto sec = std::chrono::duration_cast( + std::chrono::system_clock::now().time_since_epoch()).count(); + auto msec = std::chrono::duration_cast( + std::chrono::system_clock::now().time_since_epoch()).count(); + std::cout << "从 1970 年元旦到现在的：秒数" << sec << "；毫秒数：" << + msec << std::endl; return 0; } ``` @@ -74,7 +77,8 @@ std::this_thread::sleep_for(std::chrono::milliseconds(20)); // 休眠 20 毫 std::this_thread::sleep_for(std::chrono::seconds(2)); // 休眠 2 秒 // 下面这个也能休眠 200 毫秒 -std::this_thread::sleep_until(std::chrono::system_clock::now() += std::chrono::milliseconds(200)); +std::this_thread::sleep_until(std::chrono::system_clock::now() + += std::chrono::milliseconds(200)); ``` 休眠过程中，线程将被阻塞，而不继续进行，直到休眠时间结束方继续向下执行。 @@ -113,15 +117,20 @@ std::future f_async() int main() { auto start = std::chrono::system_clock::now(); - std::cout << std::chrono::duration_cast>(std::chrono::system_clock::now() - start).count() << std::endl; + std::cout << std::chrono::duration_cast>( + std::chrono::system_clock::now() - start).count() << std::endl; auto x = f_async(); - std::cout << std::chrono::duration_cast>(std::chrono::system_clock::now() - start).count() << std::endl; + std::cout << std::chrono::duration_cast>( + std::chrono::system_clock::now() - start).count() << std::endl; std::cout << x.get() << std::endl; - std::cout << std::chrono::duration_cast>(std::chrono::system_clock::now() - start).count() << std::endl; + std::cout << std::chrono::duration_cast>( + std::chrono::system_clock::now() - start).count() << std::endl; auto y = f_sync(); - std::cout << std::chrono::duration_cast>(std::chrono::system_clock::now() - start).count() << std::endl; + std::cout << std::chrono::duration_cast>( + std::chrono::system_clock::now() - start).count() << std::endl; std::cout << y << std::endl; - std::cout << std::chrono::duration_cast>(std::chrono::system_clock::now() - start).count() << std::endl; + std::cout << std::chrono::duration_cast>( + std::chrono::system_clock::now() - start).count() << std::endl; } ``` From c152b05b606afbccc877188c48255b1f4377b16b Mon Sep 17 00:00:00 2001 From: shangfengh <3495281661@qq.com> Date: Fri, 26 May 2023 08:19:55 +0800 Subject: [PATCH 2/2] fix: :ambulance: fix the bug about climbing the windows --- docs/版本更新说明.md | 7 +++++-- logic/GameClass/GameObj/Map/Window.cs | 4 +++- logic/Gaming/ActionManager.cs | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/版本更新说明.md b/docs/版本更新说明.md index 4ed07c0..c6065cc 100644 --- a/docs/版本更新说明.md +++ b/docs/版本更新说明.md @@ -79,7 +79,10 @@ - fix：修复了可以学习完成作业的问题 - fix：修复了HaveTea越界的问题 -# 5月25日更新 +# 5月25日24：00更新 - fix：修复了终局得分的问题 - fix：修复了开校门的问题 -- docs：摧毁一个TechOtaku的机器人，得50分。 \ No newline at end of file +- docs：摧毁一个TechOtaku的机器人，得50分。 + +# 5月26日更新 +- fix：修复了卡窗的问题 \ No newline at end of file diff --git a/logic/GameClass/GameObj/Map/Window.cs b/logic/GameClass/GameObj/Map/Window.cs index e864a55..5ea244f 100644 --- a/logic/GameClass/GameObj/Map/Window.cs +++ b/logic/GameClass/GameObj/Map/Window.cs @@ -48,13 +48,15 @@ namespace GameClass.GameObj public bool TryToClimb(ICharacter character) { lock (gameObjLock) + { if (whoIsClimbing == null) { stage = new(0, 0); whoIsClimbing = (Character)character; return true; } - else return false; + } + return false; } public void FinishClimbing() { diff --git a/logic/Gaming/ActionManager.cs b/logic/Gaming/ActionManager.cs index d7737e0..371014a 100644 --- a/logic/Gaming/ActionManager.cs +++ b/logic/Gaming/ActionManager.cs @@ -469,8 +469,8 @@ namespace Gaming lock (player.ActionLock) { if (!player.StartThread(stateNum, RunningStateType.RunningActively)) return; - player.ReSetPos(windowToPlayer + windowForClimb.Position); windowForClimb.Enter2Stage(windowForClimb.Position - 2 * windowToPlayer); + player.ReSetPos(windowToPlayer + windowForClimb.Position); } player.MoveSpeed = player.SpeedOfClimbingThroughWindows; @@ -484,6 +484,7 @@ namespace Gaming { if (stateNum == player.StateNum) { + player.ReSetPos(windowForClimb.Stage); player.SetPlayerStateNaturally(); windowForClimb.FinishClimbing(); }