Merge pull request #7 from kbengine/master

merge

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/Bundle.cpp

@@ -6,6 +6,9 @@
 #include "KBDebug.h"
 #include "ObjectPool.h"
 
+namespace KBEngine
+{
+
 static ObjectPool<Bundle> _g_bundlePool;
 
 Bundle::Bundle():
@@ -292,4 +295,6 @@ void Bundle::writeVector4(const FVector4& v)
 {
 	checkStream(16);
 	(*pCurrPacket_).writeVector4(v);
+}
+
 }

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/Bundle.h

@@ -4,6 +4,9 @@
 
 #include "KBECommon.h"
 
+namespace KBEngine
+{
+
 class MemoryStream;
 class NetworkInterfaceBase;
 class Message;
@@ -145,3 +148,5 @@ class KBENGINEPLUGINS_API Bundle
 	Message* pMsgtype_;
 	int curMsgStreamIndex_;
 };
+
+}

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/ClientSDKUpdateUI.cpp

@@ -0,0 +1,62 @@
+#include "ClientSDKUpdateUI.h"
+#include "Engine.h"
+#include "KBEvent.h"
+#include "KBEngine.h"
+#include "KBEventTypes.h"
+#include "SlateOptMacros.h"
+
+BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
+void SClientSDKUpdateUI::Construct(const FArguments& args)
+{
+	FTextBlockStyle textStyle = FCoreStyle::Get().GetWidgetStyle< FTextBlockStyle >("NormalText");
+	textStyle.SetFont(FSlateFontInfo("Veranda", 26));
+	textStyle.SetColorAndOpacity(FLinearColor::White);
+
+	ChildSlot
+		[
+			SNew(SOverlay)
+			/*+ SOverlay::Slot()
+		.HAlign(HAlign_Center)
+		.VAlign(VAlign_Top)
+		[
+			SNew(STextBlock)
+			.ColorAndOpacity(FLinearColor::White)
+		.ShadowColorAndOpacity(FLinearColor::Black)
+		.ShadowOffset(FIntPoint(-1, 1))
+		.Font(FSlateFontInfo("Arial", 26))
+		.Text(FText::FromString("Main Menu"))
+		]*/
+	+ SOverlay::Slot()
+		.HAlign(HAlign_Center)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.Padding(20)
+			[
+				SNew(SButton)
+				.Text(FText::FromString("Update SDK"))
+				.TextStyle(&textStyle)
+				.ContentPadding(FMargin(30.0, 15.0))
+				.ButtonColorAndOpacity(FLinearColor::Green)
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Top)
+				.OnClicked(this, &SClientSDKUpdateUI::UpdateSDKClicked)
+			]
+		]
+		];
+}
+END_SLATE_FUNCTION_BUILD_OPTIMIZATION
+
+FReply SClientSDKUpdateUI::UpdateSDKClicked()
+{
+	if (GEngine)
+	{
+		GEngine->AddOnScreenDebugMessage(-1, 3.f, FColor::Yellow, TEXT("Update SDK!"));
+	}
+
+	UKBEventData_onDownloadSDK* pEventData = NewObject<UKBEventData_onDownloadSDK>();
+	pEventData->isDownload = true;
+	KBENGINE_EVENT_FIRE(KBEngine::KBEventTypes::onDownloadSDK, pEventData);
+	return FReply::Handled();
+}

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/ClientSDKUpdateUI.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "KBEnginePluginsPrivatePCH.h"
+
+
+class KBENGINEPLUGINS_API SClientSDKUpdateUI : public SCompoundWidget
+{
+
+public:
+	SLATE_BEGIN_ARGS(SClientSDKUpdateUI){}
+
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& args);
+
+	FReply UpdateSDKClicked();
+
+
+};

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/ClientSDKUpdater.cpp

@@ -9,8 +9,8 @@
 #include "FileHelper.h"
 #include "OutPutDeviceDebug.h"
 
-using namespace std;
-
+namespace KBEngine
+{
 
 ClientSDKUpdater::ClientSDKUpdater()
 {
@@ -246,11 +246,12 @@ void ClientSDKUpdater::moveToFile(FString fromFileName, FString toFileName)
 	PlatformFile.MoveFile(*toFileName, *fromFileName);
 }
 
-void  ClientSDKUpdater::copyDirectory(FString fromDicPath, FString toDicPath)
+void ClientSDKUpdater::copyDirectory(FString fromDicPath, FString toDicPath)
 {
 	FPaths::NormalizeDirectoryName(fromDicPath);
 	FPaths::NormalizeDirectoryName(toDicPath);
 	IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
 	PlatformFile.CopyDirectoryTree(*toDicPath, *fromDicPath, true);
 }
 
+}

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/ClientSDKUpdater.h

@@ -18,6 +18,9 @@
 /**
  * 
  */
+namespace KBEngine
+{
+
 class KBENGINEPLUGINS_API ClientSDKUpdater
 {
 public:
@@ -53,3 +56,5 @@ class KBENGINEPLUGINS_API ClientSDKUpdater
 
 	MemoryStream* pSdkFileStream = nullptr;
 };
+
+}

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/DataTypes.cpp

@@ -4,6 +4,10 @@
 #include "EntityDef.h"
 #include "KBDebug.h"
 #include "Runtime/Core/Public/Misc/Variant.h"
+#include "Bundle.h"
+
+namespace KBEngine
+{
 
 KBVar* DATATYPE_INT8::createFromStream(MemoryStream& stream)
 {
@@ -589,3 +593,5 @@ bool DATATYPE_FIXED_DICT::isSameType(KBVar& v)
 
 	return true;
 }
+
+}

kbe/res/sdk_templates/client/ue4/Source/KBEnginePlugins/Engine/DataTypes.h

@@ -5,13 +5,17 @@
 #include "KBECommon.h"
 #include "KBVar.h"
 
-class Bundle;
-class MemoryStream;
 
 /*
 	entitydef所支持的基本数据类型
 	改模块中的类抽象出了所有的支持类型并提供了这些类型的数据序列化成二进制数据与反序列化操作（主要用于网络通讯的打包与解包）
 */
+namespace KBEngine
+{
+
+class Bundle;
+class MemoryStream;
+
 class KBENGINEPLUGINS_API DATATYPE_BASE
 {
 public:
@@ -88,7 +92,7 @@ class KBENGINEPLUGINS_API DATATYPE_INT32 : public DATATYPE_BASE
 {
 public:
 	virtual KBVar* createFromStream(MemoryStream& stream) override;
-	virtual void addToStream(Bundle& stream, KBVar& v) override;
+	virtual void addToStream(KBEngine::Bundle& stream, KBVar& v) override;
 
 	virtual KBVar* parseDefaultValStr(const FString& v) override;
 
@@ -382,15 +386,4 @@ class KBENGINEPLUGINS_API DATATYPE_FIXED_DICT : public DATATYPE_BASE
 	TMap<FString, uint16> dicttype_map;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
+}