Skip to content

Commit 8dcd59d

Browse files
committed
up
1 parent ff3a4b3 commit 8dcd59d

File tree

7 files changed

+180
-103
lines changed

7 files changed

+180
-103
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ bool UKBEMain::destroyKBEngine()
149149
return false;
150150

151151
KBEngineApp::getSingleton().destroy();
152+
KBENGINE_EVENT_CLEAR();
152153
return true;
153154
}
154155

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ KBEngineApp::KBEngineApp() :
3737
clientVersion_(TEXT("")),
3838
serverScriptVersion_(TEXT("")),
3939
clientScriptVersion_(TEXT("")),
40-
serverProtocolMD5_(TEXT("15BB33A3346B4DBF182B132C85E37536")),
40+
serverProtocolMD5_(TEXT("91E15FF1D8FE1B072A89D153B9263A1A")),
4141
serverEntitydefMD5_(TEXT("90AA620FCF194B85FBE7A8E4F4F8F938")),
4242
entity_uuid_(0),
4343
entity_id_(0),
@@ -78,7 +78,7 @@ KBEngineApp::KBEngineApp(KBEngineArgs* pArgs):
7878
clientVersion_(TEXT("")),
7979
serverScriptVersion_(TEXT("")),
8080
clientScriptVersion_(TEXT("")),
81-
serverProtocolMD5_(TEXT("15BB33A3346B4DBF182B132C85E37536")),
81+
serverProtocolMD5_(TEXT("91E15FF1D8FE1B072A89D153B9263A1A")),
8282
serverEntitydefMD5_(TEXT("90AA620FCF194B85FBE7A8E4F4F8F938")),
8383
entity_uuid_(0),
8484
entity_id_(0),
@@ -217,7 +217,7 @@ void KBEngineApp::reset()
217217
serverdatas_.Empty();
218218

219219
serverVersion_ = TEXT("");
220-
clientVersion_ = TEXT("2.3.4");
220+
clientVersion_ = TEXT("2.3.5");
221221
serverScriptVersion_ = TEXT("");
222222
clientScriptVersion_ = TEXT("0.1.0");
223223

@@ -558,6 +558,18 @@ void KBEngineApp::Client_onScriptVersionNotMatch(MemoryStream& stream)
558558
KBENGINE_EVENT_FIRE(KBEventTypes::onScriptVersionNotMatch, pEventData);
559559
}
560560

561+
void KBEngineApp::Client_onImportClientSDK(MemoryStream& stream)
562+
{
563+
UKBEventData_onImportClientSDK* pEventData = NewObject<UKBEventData_onImportClientSDK>();
564+
565+
pEventData->remainingFiles = stream.readInt32();
566+
pEventData->fileName = stream.readString();
567+
pEventData->fileSize = stream.readInt32();
568+
stream.readBlob(pEventData->fileDatas);
569+
570+
KBENGINE_EVENT_FIRE("onImportClientSDK", pEventData);
571+
}
572+
561573
void KBEngineApp::Client_onKicked(uint16 failedcode)
562574
{
563575
DEBUG_MSG("KBEngineApp::Client_onKicked(): failedcode=%d, %s", failedcode, *serverErr(failedcode));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ class KBENGINEPLUGINS_API KBEngineApp : public InterfaceConnect
9898
// 无需实现,已由插件生成静态代码
9999
}
100100

101+
void Client_onImportClientSDK(MemoryStream& stream);
102+
101103
/**
102104
插件的主循环处理函数
103105
*/

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ KBEvent::~KBEvent()
1616

1717
void KBEvent::clear()
1818
{
19+
events_.Empty();
1920
clearFiredEvents();
2021
}
2122

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ class KBENGINEPLUGINS_API KBEvent
9696
// 恢复事件
9797
#define KBENGINE_EVENT_RESUME() KBEvent::resume();
9898

99+
// 清除所有的事件
100+
#define KBENGINE_EVENT_CLEAR() KBEvent::clear();
101+
99102
UCLASS(Blueprintable, BlueprintType)
100103
class KBENGINEPLUGINS_API UKBEventData_Baseapp_importClientMessages : public UKBEventData
101104
{
@@ -604,3 +607,22 @@ class KBENGINEPLUGINS_API UKBEventData_onStreamDataCompleted : public UKBEventDa
604607
int resID;
605608
};
606609

610+
UCLASS(Blueprintable, BlueprintType)
611+
class KBENGINEPLUGINS_API UKBEventData_onImportClientSDK : public UKBEventData
612+
{
613+
GENERATED_BODY()
614+
615+
public:
616+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
617+
int remainingFiles;
618+
619+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
620+
int fileSize;
621+
622+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
623+
FString fileName;
624+
625+
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = KBEngine)
626+
TArray<uint8> fileDatas;
627+
};
628+

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ void Message_Client_onImportServerErrorsDescr::handleMessage(MemoryStream& msgst
178178
KBEngineApp::getSingleton().Client_onImportServerErrorsDescr(msgstream);
179179
}
180180

181+
void Message_Client_onImportClientSDK::handleMessage(MemoryStream& msgstream)
182+
{
183+
KBEngineApp::getSingleton().Client_onImportClientSDK(msgstream);
184+
}
185+
181186
void Message_Client_initSpaceData::handleMessage(MemoryStream& msgstream)
182187
{
183188
KBEngineApp::getSingleton().Client_initSpaceData(msgstream);
@@ -370,6 +375,10 @@ void Message_Loginapp_reqCreateMailAccount::handleMessage(MemoryStream& msgstrea
370375
{
371376
}
372377

378+
void Message_Loginapp_importClientSDK::handleMessage(MemoryStream& msgstream)
379+
{
380+
}
381+
373382
void Message_Loginapp_importServerErrorsDescr::handleMessage(MemoryStream& msgstream)
374383
{
375384
}

0 commit comments

Comments
 (0)