Merge branch '1.x' of https://github.com/kbengine/kbengine_ue4_demo into 1.x

Author: kebiao

Plugins/kbengine_ue4_plugins/README.md

@@ -209,6 +209,7 @@ KBE-Plugin fire-out events(KBE => UE4):
 
 			Event-datas: 
 				uint16: retcode
+				bytes: serverdatas
 					http://kbengine.github.io/docs/configuration/server_errors.html
 
 		onLoginBaseappFailed

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEngine.cpp

@@ -39,7 +39,7 @@ KBEngineApp::KBEngineApp() :
 	serverScriptVersion_(TEXT("")),
 	clientScriptVersion_(TEXT("")),
 	serverProtocolMD5_(TEXT("13AF19B0A958067AEB2BC4ED1CD3B46F")),
-	serverEntitydefMD5_(TEXT("2B445B443EFC9427000733CD39EB2700")),
+	serverEntitydefMD5_(TEXT("D9BE27DA40153A58EFB4835189190B5D")),
 	entity_uuid_(0),
 	entity_id_(0),
 	entity_type_(TEXT("")),
@@ -81,7 +81,7 @@ KBEngineApp::KBEngineApp(KBEngineArgs* pArgs):
 	serverScriptVersion_(TEXT("")),
 	clientScriptVersion_(TEXT("")),
 	serverProtocolMD5_(TEXT("13AF19B0A958067AEB2BC4ED1CD3B46F")),
-	serverEntitydefMD5_(TEXT("2B445B443EFC9427000733CD39EB2700")),
+	serverEntitydefMD5_(TEXT("D9BE27DA40153A58EFB4835189190B5D")),
 	entity_uuid_(0),
 	entity_id_(0),
 	entity_type_(TEXT("")),
@@ -727,6 +727,7 @@ void KBEngineApp::Client_onLoginFailed(MemoryStream& stream)
 	UKBEventData_onLoginFailed* pEventData = NewObject<UKBEventData_onLoginFailed>();
 	pEventData->failedcode = failedcode;
 	pEventData->errorStr = serverErr(failedcode);
+	pEventData->serverdatas = serverdatas_;
 	KBENGINE_EVENT_FIRE(KBEventTypes::onLoginFailed, pEventData);
 }
 
@@ -2320,19 +2321,19 @@ void KBEngineApp::_updateVolatileData(ENTITY_ID entityID, float x, float y, floa
 	if (roll != KBE_FLT_MAX)
 	{
 		changeDirection = true;
-		entity.direction.X = int82angle((int8)roll, false);
+		entity.direction.X = isOptimized ? int82angle((int8)roll, false) : roll;
 	}
 
 	if (pitch != KBE_FLT_MAX)
 	{
 		changeDirection = true;
-		entity.direction.Y = int82angle((int8)pitch, false);
+		entity.direction.Y = isOptimized ? int82angle((int8)pitch, false) : pitch;
 	}
 
 	if (yaw != KBE_FLT_MAX)
 	{
 		changeDirection = true;
-		entity.direction.Z = int82angle((int8)yaw, false);
+		entity.direction.Z = isOptimized ? int82angle((int8)yaw, false) : yaw;
 	}
 
 	bool done = false;
@@ -2346,10 +2347,10 @@ void KBEngineApp::_updateVolatileData(ENTITY_ID entityID, float x, float y, floa
 		done = true;
 	}
 
-        bool positionChanged = x != KBE_FLT_MAX || y != KBE_FLT_MAX || z != KBE_FLT_MAX;
-        if (x == KBE_FLT_MAX) x = 0.0f;
-        if (y == KBE_FLT_MAX) y = 0.0f;
-        if (z == KBE_FLT_MAX) z = 0.0f;
+	bool positionChanged = x != KBE_FLT_MAX || y != KBE_FLT_MAX || z != KBE_FLT_MAX;
+	if (x == KBE_FLT_MAX) x = isOptimized ? 0.0f : entity.position.X;
+	if (y == KBE_FLT_MAX) y = isOptimized ? 0.0f : entity.position.Y;
+	if (z == KBE_FLT_MAX) z = isOptimized ? 0.0f : entity.position.Z;
 
 	if (positionChanged)
 	{

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEvent.h

@@ -171,6 +171,9 @@ class KBENGINEPLUGINS_API UKBEventData_onLoginFailed : public UKBEventData
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
 	FString errorStr;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
+	TArray<uint8> serverdatas;
 };
 
 UCLASS(Blueprintable, BlueprintType)

Source/kbengine_ue4_demo/GameModeWorld.cpp

@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// Fill out your copyright notice in the Description page of Project Settings.
 
 #include "GameModeWorld.h"
 #include "kbengine_ue4_demo.h"
@@ -19,7 +19,7 @@ void AGameModeWorld::installEvents()
 	Super::installEvents();
 
 	// in world
-	// 这个事件触发时我们需要切换地图到游戏世界地图
+	// 这个事件触发时我们需要切换地图到游戏世界地图
 	KBENGINE_REGISTER_EVENT(KBEngine::KBEventTypes::addSpaceGeometryMapping, addSpaceGeometryMapping);
 	KBENGINE_REGISTER_EVENT(KBEngine::KBEventTypes::onEnterWorld, onEnterWorld);
 	KBENGINE_REGISTER_EVENT(KBEngine::KBEventTypes::onLeaveWorld, onLeaveWorld);
@@ -57,8 +57,8 @@ void AGameModeWorld::BeginPlay()
 
 	check(KBEngine::KBEngineApp::getSingleton().isInitialized());
 
-	// 如果已经有被创建的实体，说明他们在上一个场景未来得及跳转之前已经通知创建了，但由于我们的world场景并没有来得及创建，这部分实体进入世界事件已经漏掉
-	// 此时我们需要再次触发一次onEnterWorld，让表现层能够在游戏场景中创建出所有的实体
+	// 如果已经有被创建的实体，说明他们在上一个场景未来得及跳转之前已经通知创建了，但由于我们的world场景并没有来得及创建，这部分实体进入世界事件已经漏掉
+	// 此时我们需要再次触发一次onEnterWorld，让表现层能够在游戏场景中创建出所有的实体
 	KBEngine::KBEngineApp::ENTITIES_MAP& entities = KBEngine::KBEngineApp::getSingleton().entities();
 	for (auto& item : entities)
 	{
@@ -80,7 +80,7 @@ void AGameModeWorld::BeginPlay()
 
 void AGameModeWorld::reqRelive(int reliveType)
 {
-	// 由于玩家的Avatar实体注册了该事件， 如果此时Avatar实体存在那么必然会执行到该事件 
+	// 由于玩家的Avatar实体注册了该事件， 如果此时Avatar实体存在那么必然会执行到该事件 
 	UKBEventData_reqRelive* pEventData = NewObject<UKBEventData_reqRelive>();
 	pEventData->reliveType = reliveType;
 	KBENGINE_EVENT_FIRE("relive", pEventData);
@@ -115,6 +115,7 @@ void AGameModeWorld::onEnterWorld_Implementation(const UKBEventData* pEventData)
 	const UKBEventData_onEnterWorld* pData = Cast<UKBEventData_onEnterWorld>(pEventData);
 
 	FRotator Rot(0.f, 0.f, 0.f);
+	KBDir2UE4Dir(Rot, pData->direction);
 	FTransform SpawnTransform(Rot, pData->position);
 
 	if (pData->isPlayer)
@@ -157,6 +158,7 @@ void AGameModeWorld::onEnterSpace_Implementation(const UKBEventData* pEventData)
 	const UKBEventData_onEnterSpace* pData = Cast<UKBEventData_onEnterSpace>(pEventData);
 
 	FRotator Rot(0.f, 0.f, 0.f);
+	KBDir2UE4Dir(Rot, pData->direction);
 	FTransform SpawnTransform(Rot, pData->position);
 
 	if (pData->isPlayer)
@@ -280,6 +282,7 @@ void AGameModeWorld::set_modelID_Implementation(const UKBEventData* pEventData)
 {
 	const UKBEventData_set_modelID* pData = Cast<UKBEventData_set_modelID>(pEventData);
 	AGameEntity* pAGameEntity = findGameEntity(pData->entityID);
+
 	if (pAGameEntity)
 		pAGameEntity->setModelID(pData->modelID);
 }