From 80d4880f19572ff5894076a5bd9dd25b8da6c628 Mon Sep 17 00:00:00 2001
From: Nomango <569629550@qq.com>
Date: Sun, 3 Dec 2017 23:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=84=A6=E7=82=B9=E6=97=B6=EF=BC=8C=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=99=A8=E5=92=8C=E5=8A=A8=E7=94=BB=E5=8A=A0=E5=BF=AB?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ConsoleDemo/ConsoleDemo.vcxproj | 2 +-
 Demo/Demo.vcxproj               | 2 +-
 Easy2D/Base/EApp.cpp            | 7 ++++++-
 Easy2D/Easy2D.vcxproj           | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

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 @@
     <ProjectGuid>{70931955-FE2D-4A50-93C6-6955A730B0FE}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ConsoleDemo</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
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 @@
     <ProjectGuid>{9D85A92F-BCCE-4EF0-BAD3-601C0086661C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Demo</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
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 @@
     <ProjectGuid>{FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Easy2D</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">