Skip to content

Commit 025d470

Browse files
kebiaokebiao
committed
up
1 parent 079571a commit 025d470

File tree

9 files changed

+31
-25
lines changed

9 files changed

+31
-25
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,7 @@ void EntityDef::initScriptModules()
11701170

11711171
//DEBUG_MSG("EntityDef::initScriptModules: add(NPC), property(utype / 41005).");
11721172

1173+
pNPCModule->useMethodDescrAlias = true;
11731174
ScriptModule* pGateModule = new ScriptModule("Gate", 5);
11741175
EntityDef::moduledefs.Add(TEXT("Gate"), pGateModule);
11751176
EntityDef::idmoduledefs.Add(5, pGateModule);
@@ -1300,6 +1301,7 @@ void EntityDef::initScriptModules()
13001301

13011302
//DEBUG_MSG("EntityDef::initScriptModules: add(Gate), property(utype / 41005).");
13021303

1304+
pGateModule->useMethodDescrAlias = true;
13031305
}
13041306

13051307
void EntityDef::initDefTypes()

‎Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBECommon.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ struct FKServerErr
6464
};
6565

6666
// 客户端的类别
67-
// http://www.kbengine.org/docs/programming/clientsdkprogramming.html
68-
// http://www.kbengine.org/cn/docs/programming/clientsdkprogramming.html
67+
// http://kbengine.github.io/docs/programming/clientsdkprogramming.html
68+
// http://kbengine.github.io/cn/docs/programming/clientsdkprogramming.html
6969
UENUM(BlueprintType)
7070
enum class EKCLIENT_TYPE : uint8
7171
{

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "Bundle.h"
88
#include "Engine.h"
99
#include "KBDebug.h"
10+
#include "Entity.h"
1011

1112
// Sets default values for this component's properties
1213
UKBEMain::UKBEMain(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
@@ -20,7 +21,7 @@ UKBEMain::UKBEMain(const FObjectInitializer& ObjectInitializer) : Super(ObjectIn
2021

2122
ip = TEXT("127.0.0.1");
2223
port = 20013;
23-
syncPlayer = true;
24+
syncPlayerMS = 100;
2425
useAliasEntityID = true;
2526
isOnInitCallPropertysSetMethods = true;
2627
clientType = EKCLIENT_TYPE::CLIENT_TYPE_WIN;
@@ -47,7 +48,7 @@ void UKBEMain::BeginPlay()
4748
KBEngineArgs* pArgs = new KBEngineArgs();
4849
pArgs->ip = ip;
4950
pArgs->port = port;
50-
pArgs->syncPlayer = syncPlayer;
51+
pArgs->syncPlayerMS = syncPlayerMS;
5152
pArgs->useAliasEntityID = useAliasEntityID;
5253
pArgs->isOnInitCallPropertysSetMethods = isOnInitCallPropertysSetMethods;
5354
pArgs->clientType = clientType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class KBENGINEPLUGINS_API UKBEMain : public UActorComponent
9191
EKCLIENT_TYPE clientType;
9292

9393
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
94-
bool syncPlayer;
94+
int syncPlayerMS;
9595

9696
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
9797
bool useAliasEntityID;

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ KBEngineApp::KBEngineApp() :
3434
clientVersion_(TEXT("")),
3535
serverScriptVersion_(TEXT("")),
3636
clientScriptVersion_(TEXT("")),
37-
serverProtocolMD5_(TEXT("A27C011AA0FCAC031A349A8A3D288C7D")),
37+
serverProtocolMD5_(TEXT("4930E6C01028CE4D5B3CE228CA841378")),
3838
serverEntitydefMD5_(TEXT("39BBC4CA001B76B399F5F1CF960055BD")),
3939
entity_uuid_(0),
4040
entity_id_(0),
@@ -73,7 +73,7 @@ KBEngineApp::KBEngineApp(KBEngineArgs* pArgs):
7373
clientVersion_(TEXT("")),
7474
serverScriptVersion_(TEXT("")),
7575
clientScriptVersion_(TEXT("")),
76-
serverProtocolMD5_(TEXT("A27C011AA0FCAC031A349A8A3D288C7D")),
76+
serverProtocolMD5_(TEXT("4930E6C01028CE4D5B3CE228CA841378")),
7777
serverEntitydefMD5_(TEXT("39BBC4CA001B76B399F5F1CF960055BD")),
7878
entity_uuid_(0),
7979
entity_id_(0),
@@ -205,7 +205,7 @@ void KBEngineApp::reset()
205205
serverdatas_.Empty();
206206

207207
serverVersion_ = TEXT("");
208-
clientVersion_ = TEXT("1.1.9");
208+
clientVersion_ = TEXT("1.1.10");
209209
serverScriptVersion_ = TEXT("");
210210
clientScriptVersion_ = TEXT("0.1.0");
211211

@@ -341,13 +341,13 @@ FString KBEngineApp::serverErr(uint16 id)
341341

342342
void KBEngineApp::updatePlayerToServer()
343343
{
344-
if (!pArgs_->syncPlayer || spaceID_ == 0)
344+
if (pArgs_->syncPlayerMS <= 0 || spaceID_ == 0)
345345
return;
346346

347347
double tnow = getTimeSeconds();
348348
double span = tnow - lastUpdateToServerTime_;
349349

350-
if (span < 0.1)
350+
if (span < ((double)pArgs_->syncPlayerMS / 1000.0))
351351
return;
352352

353353
Entity* pPlayerEntity = player();
@@ -670,6 +670,9 @@ void KBEngineApp::onLogin_baseapp()
670670

671671
void KBEngineApp::reloginBaseapp()
672672
{
673+
lastTickTime_ = getTimeSeconds();
674+
lastTickCBTime_ = getTimeSeconds();
675+
673676
if(pNetworkInterface_->valid())
674677
return;
675678

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class MemoryStream;
1616
包括网络创建、持久化协议、entities的管理、以及引起对外可调用接口。
1717
1818
一些可以参考的地方:
19-
http://www.kbengine.org/docs/programming/clientsdkprogramming.html
20-
http://www.kbengine.org/docs/programming/kbe_message_format.html
19+
http://kbengine.github.io/docs/programming/clientsdkprogramming.html
20+
http://kbengine.github.io/docs/programming/kbe_message_format.html
2121
*/
2222
class KBENGINEPLUGINS_API KBEngineApp : public InterfaceConnect
2323
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ KBEngineArgs::KBEngineArgs():
66
ip(TEXT("127.0.0.1")),
77
port(20013),
88
clientType(EKCLIENT_TYPE::CLIENT_TYPE_WIN),
9-
syncPlayer(true),
9+
syncPlayerMS(100),
1010
useAliasEntityID(true),
1111
isOnInitCallPropertysSetMethods(true),
1212
serverHeartbeatTick(15),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class KBENGINEPLUGINS_API KBEngineArgs
2222
int port;
2323

2424
// 客户端类型
25-
// Reference: http://www.kbengine.org/docs/programming/clientsdkprogramming.html, client types
25+
// Reference: http://kbengine.github.io/docs/programming/clientsdkprogramming.html, client types
2626
EKCLIENT_TYPE clientType;
2727

28-
bool syncPlayer;
28+
int syncPlayerMS;
2929
bool useAliasEntityID;
3030
bool isOnInitCallPropertysSetMethods;
3131

‎Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/Messages.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,30 +1369,30 @@ class KBENGINEPLUGINS_API Messages
13691369
Messages::messages.Add(TEXT("Loginapp_reqAccountResetPassword"), new Message_Loginapp_reqAccountResetPassword(11, "Loginapp_reqAccountResetPassword", -1, 0, Loginapp_reqAccountResetPassword_argstypes));
13701370
Messages::loginappMessages.Add(11, Messages::messages["Loginapp_reqAccountResetPassword"]);
13711371

1372-
Messages::messages.Add(TEXT("Baseapp_onUpdateDataFromClient"), new Message_Baseapp_onUpdateDataFromClient(27, "Baseapp_onUpdateDataFromClient", -1, -1, TArray<uint8>()));
1373-
Messages::baseappMessages.Add(27, Messages::messages["Baseapp_onUpdateDataFromClient"]);
1372+
Messages::messages.Add(TEXT("Baseapp_onUpdateDataFromClient"), new Message_Baseapp_onUpdateDataFromClient(25, "Baseapp_onUpdateDataFromClient", -1, -1, TArray<uint8>()));
1373+
Messages::baseappMessages.Add(25, Messages::messages["Baseapp_onUpdateDataFromClient"]);
13741374

1375-
Messages::messages.Add(TEXT("Baseapp_onUpdateDataFromClientForControlledEntity"), new Message_Baseapp_onUpdateDataFromClientForControlledEntity(28, "Baseapp_onUpdateDataFromClientForControlledEntity", -1, -1, TArray<uint8>()));
1376-
Messages::baseappMessages.Add(28, Messages::messages["Baseapp_onUpdateDataFromClientForControlledEntity"]);
1375+
Messages::messages.Add(TEXT("Baseapp_onUpdateDataFromClientForControlledEntity"), new Message_Baseapp_onUpdateDataFromClientForControlledEntity(26, "Baseapp_onUpdateDataFromClientForControlledEntity", -1, -1, TArray<uint8>()));
1376+
Messages::baseappMessages.Add(26, Messages::messages["Baseapp_onUpdateDataFromClientForControlledEntity"]);
13771377

13781378

13791379
TArray<uint8> Baseapp_reqAccountBindEmail_argstypes;
13801380
Baseapp_reqAccountBindEmail_argstypes.Add(8);
13811381
Baseapp_reqAccountBindEmail_argstypes.Add(1);
13821382
Baseapp_reqAccountBindEmail_argstypes.Add(1);
1383-
Messages::messages.Add(TEXT("Baseapp_reqAccountBindEmail"), new Message_Baseapp_reqAccountBindEmail(50, "Baseapp_reqAccountBindEmail", -1, 0, Baseapp_reqAccountBindEmail_argstypes));
1384-
Messages::baseappMessages.Add(50, Messages::messages["Baseapp_reqAccountBindEmail"]);
1383+
Messages::messages.Add(TEXT("Baseapp_reqAccountBindEmail"), new Message_Baseapp_reqAccountBindEmail(48, "Baseapp_reqAccountBindEmail", -1, 0, Baseapp_reqAccountBindEmail_argstypes));
1384+
Messages::baseappMessages.Add(48, Messages::messages["Baseapp_reqAccountBindEmail"]);
13851385

13861386

13871387
TArray<uint8> Baseapp_reqAccountNewPassword_argstypes;
13881388
Baseapp_reqAccountNewPassword_argstypes.Add(8);
13891389
Baseapp_reqAccountNewPassword_argstypes.Add(1);
13901390
Baseapp_reqAccountNewPassword_argstypes.Add(1);
1391-
Messages::messages.Add(TEXT("Baseapp_reqAccountNewPassword"), new Message_Baseapp_reqAccountNewPassword(53, "Baseapp_reqAccountNewPassword", -1, 0, Baseapp_reqAccountNewPassword_argstypes));
1392-
Messages::baseappMessages.Add(53, Messages::messages["Baseapp_reqAccountNewPassword"]);
1391+
Messages::messages.Add(TEXT("Baseapp_reqAccountNewPassword"), new Message_Baseapp_reqAccountNewPassword(51, "Baseapp_reqAccountNewPassword", -1, 0, Baseapp_reqAccountNewPassword_argstypes));
1392+
Messages::baseappMessages.Add(51, Messages::messages["Baseapp_reqAccountNewPassword"]);
13931393

1394-
Messages::messages.Add(TEXT("Entity_forwardEntityMessageToCellappFromClient"), new Message_Entity_forwardEntityMessageToCellappFromClient(57, "Entity_forwardEntityMessageToCellappFromClient", -1, -1, TArray<uint8>()));
1395-
Messages::baseappMessages.Add(57, Messages::messages["Entity_forwardEntityMessageToCellappFromClient"]);
1394+
Messages::messages.Add(TEXT("Entity_forwardEntityMessageToCellappFromClient"), new Message_Entity_forwardEntityMessageToCellappFromClient(55, "Entity_forwardEntityMessageToCellappFromClient", -1, -1, TArray<uint8>()));
1395+
Messages::baseappMessages.Add(55, Messages::messages["Entity_forwardEntityMessageToCellappFromClient"]);
13961396

13971397
Messages::messages.Add(TEXT("Baseapp_hello"), new Message_Baseapp_hello(200, "Baseapp_hello", -1, -1, TArray<uint8>()));
13981398
Messages::baseappMessages.Add(200, Messages::messages["Baseapp_hello"]);

0 commit comments

Comments
 (0)