up

Author: kebiao

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

@@ -1434,6 +1434,7 @@ void EntityDef::initScriptModules()
 
 	//DEBUG_MSG("EntityDef::initScriptModules: add(NPC), property(utype / 41005).");
 
+	pNPCModule->useMethodDescrAlias = true;
 	ScriptModule* pGateModule = new ScriptModule("Gate", 7);
 	EntityDef::moduledefs.Add(TEXT("Gate"), pGateModule);
 	EntityDef::idmoduledefs.Add(7, pGateModule);
@@ -1564,6 +1565,7 @@ void EntityDef::initScriptModules()
 
 	//DEBUG_MSG("EntityDef::initScriptModules: add(Gate), property(utype / 41005).");
 
+	pGateModule->useMethodDescrAlias = true;
 }
 
 void EntityDef::initDefTypes()

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

@@ -7,6 +7,7 @@
 #include "Bundle.h"
 #include "Engine.h"
 #include "KBDebug.h"
+#include "Entity.h"
 
 // Sets default values for this component's properties
 UKBEMain::UKBEMain(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
@@ -20,7 +21,7 @@ UKBEMain::UKBEMain(const FObjectInitializer& ObjectInitializer) : Super(ObjectIn
 
 	ip = TEXT("127.0.0.1");
 	port = 20013;
-	syncPlayer = true;
+	syncPlayerMS = 100;
 	useAliasEntityID = true;
 	isOnInitCallPropertysSetMethods = true;
 	clientType = EKCLIENT_TYPE::CLIENT_TYPE_WIN;
@@ -47,7 +48,7 @@ void UKBEMain::BeginPlay()
 	KBEngineArgs* pArgs = new KBEngineArgs();
 	pArgs->ip = ip;
 	pArgs->port = port;
-	pArgs->syncPlayer = syncPlayer;
+	pArgs->syncPlayerMS = syncPlayerMS;
 	pArgs->useAliasEntityID = useAliasEntityID;
 	pArgs->isOnInitCallPropertysSetMethods = isOnInitCallPropertysSetMethods;
 	pArgs->clientType = clientType;

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

@@ -91,7 +91,7 @@ class KBENGINEPLUGINS_API UKBEMain : public UActorComponent
 	EKCLIENT_TYPE clientType;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
-	bool syncPlayer;
+	int syncPlayerMS;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
 	bool useAliasEntityID;

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

@@ -24,7 +24,8 @@ KBEngineApp::KBEngineApp() :
 	username_(TEXT("")),
 	password_(TEXT("")),
 	baseappIP_(TEXT("")),
-	baseappPort_(0),
+	baseappTcpPort_(0),
+	baseappUdpPort_(0),
 	currserver_(TEXT("")),
 	currstate_(TEXT("")),
 	serverdatas_(),
@@ -34,7 +35,7 @@ KBEngineApp::KBEngineApp() :
 	clientVersion_(TEXT("")),
 	serverScriptVersion_(TEXT("")),
 	clientScriptVersion_(TEXT("")),
-	serverProtocolMD5_(TEXT("4930E6C01028CE4D5B3CE228CA841378")),
+	serverProtocolMD5_(TEXT("5B63B0B05CB019181AA032A1D92F1C0F")),
 	serverEntitydefMD5_(TEXT("A0C96A57AD7D75964F55B1BF3ED664D3")),
 	entity_uuid_(0),
 	entity_id_(0),
@@ -63,7 +64,8 @@ KBEngineApp::KBEngineApp(KBEngineArgs* pArgs):
 	username_(TEXT("")),
 	password_(TEXT("")),
 	baseappIP_(TEXT("")),
-	baseappPort_(0),
+	baseappTcpPort_(0),
+	baseappUdpPort_(0),
 	currserver_(TEXT("")),
 	currstate_(TEXT("")),
 	serverdatas_(),
@@ -73,7 +75,7 @@ KBEngineApp::KBEngineApp(KBEngineArgs* pArgs):
 	clientVersion_(TEXT("")),
 	serverScriptVersion_(TEXT("")),
 	clientScriptVersion_(TEXT("")),
-	serverProtocolMD5_(TEXT("4930E6C01028CE4D5B3CE228CA841378")),
+	serverProtocolMD5_(TEXT("5B63B0B05CB019181AA032A1D92F1C0F")),
 	serverEntitydefMD5_(TEXT("A0C96A57AD7D75964F55B1BF3ED664D3")),
 	entity_uuid_(0),
 	entity_id_(0),
@@ -341,13 +343,13 @@ FString KBEngineApp::serverErr(uint16 id)
 
 void KBEngineApp::updatePlayerToServer()
 {
-	if (!pArgs_->syncPlayer || spaceID_ == 0)
+	if (pArgs_->syncPlayerMS <= 0 || spaceID_ == 0)
 		return;
 
 	double tnow = getTimeSeconds();
 	double span = tnow - lastUpdateToServerTime_;
 
-	if (span < 0.1)
+	if (span < ((double)pArgs_->syncPlayerMS / 1000.0))
 		return;
 
 	Entity* pPlayerEntity = player();
@@ -614,10 +616,11 @@ void KBEngineApp::Client_onLoginSuccessfully(MemoryStream& stream)
 	stream >> accountName;
 	username_ = accountName;
 	stream >> baseappIP_;
-	stream >> baseappPort_;
+	stream >> baseappTcpPort_;
+	stream >> baseappUdpPort_;
 
 	DEBUG_MSG("KBEngineApp::Client_onLoginSuccessfully(): accountName(%s), addr("
-		 "%s:%d), datas(%d)!", *accountName, *baseappIP_, baseappPort_, serverdatas_.Num());
+		 "%s:%d:%d), datas(%d)!", *accountName, *baseappIP_, baseappTcpPort_, baseappUdpPort_, serverdatas_.Num());
 
 	stream.readBlob(serverdatas_);
 	login_baseapp(true);
@@ -632,7 +635,7 @@ void KBEngineApp::login_baseapp(bool noconnect)
 		pNetworkInterface_->destroy();
 		pNetworkInterface_ = NULL;
 		initNetwork();
-		pNetworkInterface_->connectTo(baseappIP_, baseappPort_, this, 2);
+		pNetworkInterface_->connectTo(baseappIP_, baseappTcpPort_, this, 2);
 	}
 	else
 	{
@@ -670,13 +673,16 @@ void KBEngineApp::onLogin_baseapp()
 
 void KBEngineApp::reloginBaseapp()
 {
+	lastTickTime_ = getTimeSeconds();
+	lastTickCBTime_ = getTimeSeconds();
+
 	if(pNetworkInterface_->valid())
 		return;
 
 	UKBEventData_onReloginBaseapp* pEventData = NewObject<UKBEventData_onReloginBaseapp>();
 	KBENGINE_EVENT_FIRE("KBEngineApp::reloginBaseapp(): onReloginBaseapp", pEventData);
 
-	pNetworkInterface_->connectTo(baseappIP_, baseappPort_, this, 3);
+	pNetworkInterface_->connectTo(baseappIP_, baseappTcpPort_, this, 3);
 }
 
 void KBEngineApp::onReloginTo_baseapp_callback(FString ip, uint16 port, bool success)

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

@@ -414,7 +414,8 @@ class KBENGINEPLUGINS_API KBEngineApp : public InterfaceConnect
 
 	// 服务端分配的baseapp地址
 	FString baseappIP_;
-	uint16 baseappPort_;
+	uint16 baseappTcpPort_;
+	uint16 baseappUdpPort_;
 
 	// 当前状态
 	FString currserver_;

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

@@ -6,7 +6,7 @@ KBEngineArgs::KBEngineArgs():
 	ip(TEXT("127.0.0.1")),
 	port(20013),
 	clientType(EKCLIENT_TYPE::CLIENT_TYPE_WIN),
-	syncPlayer(true),
+	syncPlayerMS(100),
 	useAliasEntityID(true),
 	isOnInitCallPropertysSetMethods(true),
 	serverHeartbeatTick(15),

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

@@ -25,7 +25,7 @@ class KBENGINEPLUGINS_API KBEngineArgs
 	// Reference: http://www.kbengine.org/docs/programming/clientsdkprogramming.html, client types
 	EKCLIENT_TYPE clientType;
 
-	bool syncPlayer;
+	int syncPlayerMS;
 	bool useAliasEntityID;
 	bool isOnInitCallPropertysSetMethods;