diff --git a/ConsoleDemo/ConsoleDemo.vcxproj b/ConsoleDemo/ConsoleDemo.vcxproj index a32b2be5..25bf8a2f 100644 --- a/ConsoleDemo/ConsoleDemo.vcxproj +++ b/ConsoleDemo/ConsoleDemo.vcxproj @@ -23,7 +23,7 @@ {70931955-FE2D-4A50-93C6-6955A730B0FE} Win32Proj ConsoleDemo - 10.0.15063.0 + 10.0.16299.0 diff --git a/Demo/Demo.vcxproj b/Demo/Demo.vcxproj index 1f739914..a61d8f52 100644 --- a/Demo/Demo.vcxproj +++ b/Demo/Demo.vcxproj @@ -23,7 +23,7 @@ {9D85A92F-BCCE-4EF0-BAD3-601C0086661C} Win32Proj Demo - 10.0.15063.0 + 10.0.16299.0 diff --git a/Easy2D/Base/EApp.cpp b/Easy2D/Base/EApp.cpp index 0b68ea14..4f8a9336 100644 --- a/Easy2D/Base/EApp.cpp +++ b/Easy2D/Base/EApp.cpp @@ -714,7 +714,12 @@ LRESULT e2d::EApp::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam pEApp->getCurrentScene()->onActivate() && pEApp->onActivate()) { - pEApp->m_bPaused = false; + EApp::get()->m_bPaused = false; + // 刷新当前时间 + GetNow() = steady_clock::now(); + // 重置动画和定时器 + EActionManager::_resetAllActions(); + ETimerManager::_resetAllTimers(); } } } diff --git a/Easy2D/Easy2D.vcxproj b/Easy2D/Easy2D.vcxproj index 5820be2a..ecfdfd61 100644 --- a/Easy2D/Easy2D.vcxproj +++ b/Easy2D/Easy2D.vcxproj @@ -23,7 +23,7 @@ {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF} Win32Proj Easy2D - 10.0.15063.0 + 10.0.16299.0