up

kebiao · kebiao · commit 49453bd0b1d1 · 2019-04-15T17:27:14.000+08:00
diff --git a/Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEMain.cpp b/Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEMain.cpp
@@ -111,12 +111,12 @@ void UKBEMain::deregisterEvents()
 
 void UKBEMain::onVersionNotMatch(const UKBEventData* pEventData)
 {
-	dealVersionNotMatch();
+	handVersionNotMatch();
 }
 
 void UKBEMain::onScriptVersionNotMatch(const UKBEventData* pEventData)
 {
-	dealVersionNotMatch();
+	handVersionNotMatch();
 }
 
 bool UKBEMain::isUpdateSDK()
diff --git a/Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEngine.cpp b/Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEngine.cpp
@@ -235,7 +235,7 @@ void KBEngineApp::reset()
 	serverdatas_.Empty();
 
 	serverVersion_ = TEXT("");
-	clientVersion_ = TEXT("2.4.5");
+	clientVersion_ = TEXT("2.4.15");
 	serverScriptVersion_ = TEXT("");
 	clientScriptVersion_ = TEXT("0.1.0");
 
diff --git a/kbengine_demos_assets b/kbengine_demos_assets
@@ -1 +1 @@
-Subproject commit 32e92f0b3604b4b1180c4f6982eb9f8199010a06
+Subproject commit 1ac8fcb5b3ee8412d37be4d9c3b113a809fd8c0d
diff --git a/kbengine_ue4_demo.uproject b/kbengine_ue4_demo.uproject
@@ -1,26 +1,26 @@
-{
-	"FileVersion": 3,
-	"EngineAssociation": "{A5017B0F-4319-F26C-09F4-9CA9DC88EE7D}",
-	"Category": "",
-	"Description": "",
-	"Modules": [
-		{
-			"Name": "kbengine_ue4_demo",
-			"Type": "Runtime",
-			"LoadingPhase": "Default",
-			"AdditionalDependencies": [
-				"Engine"
-			]
-		}
-	],
-	"Plugins": [
-		{
-			"Name": "KBEnginePlugins",
-			"Enabled": true,
-			"MarketplaceURL": "http://kbengine.org/marketplace"
-		}
-	],
-	"AdditionalPluginDirectories": [
-		"/kbengine_ue4_demo/Plugins"
-	]
+{
+	"FileVersion": 3,
+	"EngineAssociation": "{A5017B0F-4319-F26C-09F4-9CA9DC88EE7D}",
+	"Category": "",
+	"Description": "",
+	"Modules": [
+		{
+			"Name": "kbengine_ue4_demo",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"AdditionalDependencies": [
+				"Engine"
+			]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "KBEnginePlugins",
+			"Enabled": true,
+			"MarketplaceURL": "http://kbengine.org/marketplace"
+		}
+	],
+	"AdditionalPluginDirectories": [
+		"/kbengine_ue4_demo/Plugins"
+	]
 }

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,12 @@ void UKBEMain::deregisterEvents()`
`111`	`111`
`112`	`112`	`void UKBEMain::onVersionNotMatch(const UKBEventData* pEventData)`
`113`	`113`	`{`
`114`		`- dealVersionNotMatch();`
	`114`	`+ handVersionNotMatch();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`void UKBEMain::onScriptVersionNotMatch(const UKBEventData* pEventData)`
`118`	`118`	`{`
`119`		`- dealVersionNotMatch();`
	`119`	`+ handVersionNotMatch();`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`bool UKBEMain::isUpdateSDK()`