end sequence

2018-09-02 20:34:58 +02:00 · 2018-09-02 20:34:58 +02:00 · dccc963fa7
commit dccc963fa7
parent 9cca220015
14 changed files with 3 additions and 0 deletions
--- a/Content/CreditsWidget.uasset
+++ b/Content/CreditsWidget.uasset
--- a/Content/GMTK.uasset
+++ b/Content/GMTK.uasset
--- a/Content/Geometry/Meshes/Plane_010.uasset
+++ b/Content/Geometry/Meshes/Plane_010.uasset
--- a/Content/Geometry/Meshes/Plane_021.uasset
+++ b/Content/Geometry/Meshes/Plane_021.uasset
--- a/Content/Geometry/Meshes/Plane_022.uasset
+++ b/Content/Geometry/Meshes/Plane_022.uasset
--- a/Content/Geometry/Meshes/Plane_023.uasset
+++ b/Content/Geometry/Meshes/Plane_023.uasset
--- a/Content/Geometry/Meshes/Plane_037.uasset
+++ b/Content/Geometry/Meshes/Plane_037.uasset
--- a/Content/Geometry/Meshes/Plane_038.uasset
+++ b/Content/Geometry/Meshes/Plane_038.uasset
--- a/Content/NPC_BP.uasset
+++ b/Content/NPC_BP.uasset
--- a/Content/TheEnd.uasset
+++ b/Content/TheEnd.uasset
--- a/Content/train.umap
+++ b/Content/train.umap
--- a/Content/train_BuiltData.uasset
+++ b/Content/train_BuiltData.uasset
--- a/Source/SevenStars/NPC.cpp
+++ b/Source/SevenStars/NPC.cpp
@ -142,6 +142,7 @@ FString ANPC::GetDialogue_Zyxel(int index, bool Left)
 		ret = ZyxelState2_0[NPC_CurrentIndexLeft];
 		if (NPC_CurrentIndexLeft < ZyxelState2_0.Num() - 1)
 			NPC_CurrentIndexLeft++;
+		EndGame = true;
 	}
 	else if (index == 2 && !Left) {
 		ret = ZyxelState2_1[NPC_CurrentIndexRight];
--- a/Source/SevenStars/NPC.h
+++ b/Source/SevenStars/NPC.h
@ -78,6 +78,8 @@ public:
 	UPROPERTY(BlueprintReadWrite, EditAnywhere)
 	bool Naioli_State2_Trigger_Naioli_1 = false;

+	UPROPERTY(BlueprintReadWrite, EditAnywhere)
+	bool EndGame = false;

 	TArray<FString> ZyxelState0_0;
 	TArray<FString> ZyxelState0_1;