升级到UE4 4.18.1

kbengine · kbengine · commit 77564ce50e37 · 2017-11-21T11:26:24.000+08:00
diff --git a/Source/kbengine_ue4_demo.Target.cs b/Source/kbengine_ue4_demo.Target.cs
@@ -5,21 +5,9 @@
 
 public class kbengine_ue4_demoTarget : TargetRules
 {
-	public kbengine_ue4_demoTarget(TargetInfo Target)
+	public kbengine_ue4_demoTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
-	}
-
-	//
-	// TargetRules interface.
-	//
-
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.Add("kbengine_ue4_demo");
+		ExtraModuleNames.Add("kbengine_ue4_demo");
 	}
 }
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Account.cpp b/Source/kbengine_ue4_demo/kbe_scripts/Account.cpp
@@ -1,7 +1,6 @@
+#include "Account.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "interfaces/GameObject.h"
-#include "Account.h"
 #include "KBEngine.h"
 #include "LogicEvents.h"
 
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Account.h b/Source/kbengine_ue4_demo/kbe_scripts/Account.h
@@ -3,7 +3,7 @@
 #pragma once
 #include "KBECommon.h"
 
-class GameObject;
+#include "interfaces/GameObject.h"
 
 /*
 	��Ӧentity_defs/
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Avatar.cpp b/Source/kbengine_ue4_demo/kbe_scripts/Avatar.cpp
@@ -1,15 +1,7 @@
+#include "Avatar.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
 #include "LogicEvents.h"
-#include "interfaces/GameObject.h"
-#include "interfaces/Motion.h"
-#include "interfaces/Combat.h"
-#include "interfaces/State.h"
-#include "interfaces/Flags.h"
-#include "interfaces/Spell.h"
-#include "interfaces/SkillBox.h"
-#include "interfaces/Teleport.h"
-#include "Avatar.h"
 
 /*
 	ÿ��ʵ�嶼��Ҫ���Լ�ע�ᣬ��ʽΪ
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Avatar.h b/Source/kbengine_ue4_demo/kbe_scripts/Avatar.h
@@ -3,14 +3,14 @@
 #pragma once
 #include "KBECommon.h"
 
-class GameObject;
-class Combat;
-class Motion;
-class State;
-class Flags;
-class Spell;
-class SkillBox;
-class Teleport;
+#include "interfaces/GameObject.h"
+#include "interfaces/Motion.h"
+#include "interfaces/Combat.h"
+#include "interfaces/State.h"
+#include "interfaces/Flags.h"
+#include "interfaces/Spell.h"
+#include "interfaces/SkillBox.h"
+#include "interfaces/Teleport.h"
 
 /*
 	��Ӧentity_defs/
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Gate.cpp b/Source/kbengine_ue4_demo/kbe_scripts/Gate.cpp
@@ -1,8 +1,6 @@
+#include "Gate.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "interfaces/GameObject.h"
-#include "interfaces/NPCObject.h"
-#include "Gate.h"
 
 /*
 	ÿ��ʵ�嶼��Ҫ���Լ�ע�ᣬ��ʽΪ
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Gate.h b/Source/kbengine_ue4_demo/kbe_scripts/Gate.h
@@ -3,8 +3,8 @@
 #pragma once
 #include "KBECommon.h"
 
-class GameObject;
-class NPCObject;
+#include "interfaces/GameObject.h"
+#include "interfaces/NPCObject.h"
 
 /*
 	��Ӧentity_defs/
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/LogicEvents.cpp b/Source/kbengine_ue4_demo/kbe_scripts/LogicEvents.cpp
@@ -1,3 +1,4 @@
-#include "kbengine_ue4_demo.h"
 #include "LogicEvents.h"
+#include "kbengine_ue4_demo.h"
+
 
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Monster.cpp b/Source/kbengine_ue4_demo/kbe_scripts/Monster.cpp
@@ -1,13 +1,6 @@
+#include "Monster.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "interfaces/GameObject.h"
-#include "interfaces/NPCObject.h"
-#include "interfaces/Motion.h"
-#include "interfaces/Combat.h"
-#include "interfaces/State.h"
-#include "interfaces/Flags.h"
-#include "interfaces/Spell.h"
-#include "Monster.h"
 
 /*
 	ÿ��ʵ�嶼��Ҫ���Լ�ע�ᣬ��ʽΪ
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/Monster.h b/Source/kbengine_ue4_demo/kbe_scripts/Monster.h
@@ -3,13 +3,13 @@
 #pragma once
 #include "KBECommon.h"
 
-class GameObject;
-class NPCObject;
-class Combat;
-class Motion;
-class State;
-class Flags;
-class Spell;
+#include "interfaces/GameObject.h"
+#include "interfaces/NPCObject.h"
+#include "interfaces/Motion.h"
+#include "interfaces/Combat.h"
+#include "interfaces/State.h"
+#include "interfaces/Flags.h"
+#include "interfaces/Spell.h"
 
 /*
 	��Ӧentity_defs/
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/NPC.cpp b/Source/kbengine_ue4_demo/kbe_scripts/NPC.cpp
@@ -1,9 +1,7 @@
+#include "NPC.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "interfaces/GameObject.h"
-#include "interfaces/NPCObject.h"
-#include "interfaces/Motion.h"
-#include "NPC.h"
+
 
 /*
 	ÿ��ʵ�嶼��Ҫ���Լ�ע�ᣬ��ʽΪ
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/NPC.h b/Source/kbengine_ue4_demo/kbe_scripts/NPC.h
@@ -3,9 +3,10 @@
 #pragma once
 #include "KBECommon.h"
 
-class GameObject;
-class NPCObject;
-class Motion;
+#include "interfaces/GameObject.h"
+#include "interfaces/NPCObject.h"
+#include "interfaces/Motion.h"
+
 
 /*
 	��Ӧentity_defs/
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Combat.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Combat.cpp
@@ -1,6 +1,6 @@
+#include "Combat.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "Combat.h"
 #include "kbe_scripts/LogicEvents.h"
 
 Combat::Combat(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Dialog.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Dialog.cpp
@@ -1,6 +1,6 @@
+#include "Dialog.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "Dialog.h"
 #include "kbe_scripts/LogicEvents.h"
 
 Dialog::Dialog(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Flags.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Flags.cpp
@@ -1,6 +1,6 @@
+#include "Flags.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "Flags.h"
 #include "kbe_scripts/LogicEvents.h"
 
 Flags::Flags(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/GameObject.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/GameObject.cpp
@@ -1,6 +1,5 @@
-#include "kbengine_ue4_demo.h"
-#include "Entity.h"
 #include "GameObject.h"
+#include "kbengine_ue4_demo.h"
 #include "kbe_scripts/LogicEvents.h"
 
 GameObject::GameObject():
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/GameObject.h b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/GameObject.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-class Entity;
+#include "Entity.h"
 
 /*
 	��Ӧentity_defs/interfaces/
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Motion.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Motion.cpp
@@ -1,6 +1,6 @@
+#include "Motion.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "Motion.h"
 #include "kbe_scripts/LogicEvents.h"
 
 Motion::Motion(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/NPCObject.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/NPCObject.cpp
@@ -1,6 +1,6 @@
+#include "NPCObject.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "NPCObject.h"
 #include "kbe_scripts/LogicEvents.h"
 
 NPCObject::NPCObject(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/SkillBox.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/SkillBox.cpp
@@ -1,6 +1,6 @@
+#include "SkillBox.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "SkillBox.h"
 #include "kbe_scripts/LogicEvents.h"
 
 SkillBox::SkillBox(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Spell.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Spell.cpp
@@ -1,6 +1,6 @@
+#include "Spell.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "Spell.h"
 #include "kbe_scripts/LogicEvents.h"
 
 Spell::Spell(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/State.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/State.cpp
@@ -1,6 +1,6 @@
+#include "State.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "State.h"
 #include "kbe_scripts/LogicEvents.h"
 
 State::State(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Teleport.cpp b/Source/kbengine_ue4_demo/kbe_scripts/interfaces/Teleport.cpp
@@ -1,6 +1,6 @@
+#include "Teleport.h"
 #include "kbengine_ue4_demo.h"
 #include "Entity.h"
-#include "Teleport.h"
 #include "kbe_scripts/LogicEvents.h"
 
 Teleport::Teleport(Entity* entity) :
diff --git a/Source/kbengine_ue4_demo/kbengine_ue4_demo.Build.cs b/Source/kbengine_ue4_demo/kbengine_ue4_demo.Build.cs
@@ -4,8 +4,10 @@
 
 public class kbengine_ue4_demo : ModuleRules
 {
-	public kbengine_ue4_demo(TargetInfo Target)
-	{
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay", "KBEnginePlugins" });
+	public kbengine_ue4_demo(ReadOnlyTargetRules Target) : base(Target)
+    {
+        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+
+        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay", "KBEnginePlugins" });
 	}
 }
diff --git a/Source/kbengine_ue4_demo/ue4_scripts/GameEntity.cpp b/Source/kbengine_ue4_demo/ue4_scripts/GameEntity.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "kbengine_ue4_demo.h"
 #include "GameEntity.h"
+#include "kbengine_ue4_demo.h"
 #include "GameModeWorld.h"
 #include "KBEngine.h"
 #include "Entity.h"
diff --git a/Source/kbengine_ue4_demo/ue4_scripts/GameModeDemoBase.cpp b/Source/kbengine_ue4_demo/ue4_scripts/GameModeDemoBase.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "kbengine_ue4_demo.h"
 #include "GameModeDemoBase.h"
+#include "kbengine_ue4_demo.h"
 #include "KBEngine.h"
 
 AGameModeDemoBase::AGameModeDemoBase(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
diff --git a/Source/kbengine_ue4_demo/ue4_scripts/GameModeLogin.cpp b/Source/kbengine_ue4_demo/ue4_scripts/GameModeLogin.cpp
@@ -1,8 +1,8 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
+#include "GameModeLogin.h"
 #include "kbengine_ue4_demo.h"
 #include "KBEngine.h"
-#include "GameModeLogin.h"
 
 AGameModeLogin::AGameModeLogin(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
 {
diff --git a/Source/kbengine_ue4_demo/ue4_scripts/GameModeSelectAvatar.cpp b/Source/kbengine_ue4_demo/ue4_scripts/GameModeSelectAvatar.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "kbengine_ue4_demo.h"
 #include "GameModeSelectAvatar.h"
+#include "kbengine_ue4_demo.h"
 #include "KBEngine.h"
 
 AGameModeSelectAvatar::AGameModeSelectAvatar(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer)
diff --git a/Source/kbengine_ue4_demo/ue4_scripts/GameModeWorld.cpp b/Source/kbengine_ue4_demo/ue4_scripts/GameModeWorld.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "kbengine_ue4_demo.h"
 #include "GameModeWorld.h"
+#include "kbengine_ue4_demo.h"
 #include "KBEngine.h"
 #include "Entity.h"
 #include "GameEntity.h"
diff --git a/Source/kbengine_ue4_demo/ue4_scripts/PlayerCharacter.cpp b/Source/kbengine_ue4_demo/ue4_scripts/PlayerCharacter.cpp
@@ -1,8 +1,8 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
+#include "PlayerCharacter.h"
 #include "kbengine_ue4_demo.h"
 #include "Kismet/HeadMountedDisplayFunctionLibrary.h"
-#include "PlayerCharacter.h"
 
 //////////////////////////////////////////////////////////////////////////
 // APlayerCharacter
diff --git a/Source/kbengine_ue4_demoEditor.Target.cs b/Source/kbengine_ue4_demoEditor.Target.cs
@@ -5,21 +5,9 @@
 
 public class kbengine_ue4_demoEditorTarget : TargetRules
 {
-	public kbengine_ue4_demoEditorTarget(TargetInfo Target)
+	public kbengine_ue4_demoEditorTarget(TargetInfo Target): base(Target)
 	{
 		Type = TargetType.Editor;
-	}
-
-	//
-	// TargetRules interface.
-	//
-
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.Add("kbengine_ue4_demo");
+		ExtraModuleNames.Add("kbengine_ue4_demo");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,9 @@`
`5`	`5`
`6`	`6`	`public class kbengine_ue4_demoTarget : TargetRules`
`7`	`7`	`{`
`8`		`- public kbengine_ue4_demoTarget(TargetInfo Target)`
	`8`	`+ public kbengine_ue4_demoTarget(TargetInfo Target) : base(Target)`
`9`	`9`	`{`
`10`	`10`	`Type = TargetType.Game;`
`11`		`- }`
`12`		`-`
`13`		`- //`
`14`		`- // TargetRules interface.`
`15`		`- //`
`16`		`-`
`17`		`- public override void SetupBinaries(`
`18`		`- TargetInfo Target,`
`19`		`- ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,`
`20`		`- ref List<string> OutExtraModuleNames`
`21`		`- )`
`22`		`- {`
`23`		`- OutExtraModuleNames.Add("kbengine_ue4_demo");`
	`11`	`+ ExtraModuleNames.Add("kbengine_ue4_demo");`
`24`	`12`	`}`
`25`	`13`	`}`