diff --git a/Content/CreditsWidget.uasset b/Content/CreditsWidget.uasset new file mode 100644 index 0000000..be78767 Binary files /dev/null and b/Content/CreditsWidget.uasset differ diff --git a/Content/GMTK.uasset b/Content/GMTK.uasset new file mode 100644 index 0000000..d559052 Binary files /dev/null and b/Content/GMTK.uasset differ diff --git a/Content/Geometry/Meshes/Plane_010.uasset b/Content/Geometry/Meshes/Plane_010.uasset index d14674d..931eec9 100644 Binary files a/Content/Geometry/Meshes/Plane_010.uasset and b/Content/Geometry/Meshes/Plane_010.uasset differ diff --git a/Content/Geometry/Meshes/Plane_021.uasset b/Content/Geometry/Meshes/Plane_021.uasset index c50606e..792aec4 100644 Binary files a/Content/Geometry/Meshes/Plane_021.uasset and b/Content/Geometry/Meshes/Plane_021.uasset differ diff --git a/Content/Geometry/Meshes/Plane_022.uasset b/Content/Geometry/Meshes/Plane_022.uasset index 8a64b84..3c88986 100644 Binary files a/Content/Geometry/Meshes/Plane_022.uasset and b/Content/Geometry/Meshes/Plane_022.uasset differ diff --git a/Content/Geometry/Meshes/Plane_023.uasset b/Content/Geometry/Meshes/Plane_023.uasset index 80aad25..8391bf2 100644 Binary files a/Content/Geometry/Meshes/Plane_023.uasset and b/Content/Geometry/Meshes/Plane_023.uasset differ diff --git a/Content/Geometry/Meshes/Plane_037.uasset b/Content/Geometry/Meshes/Plane_037.uasset index e3fc34c..d56ead2 100644 Binary files a/Content/Geometry/Meshes/Plane_037.uasset and b/Content/Geometry/Meshes/Plane_037.uasset differ diff --git a/Content/Geometry/Meshes/Plane_038.uasset b/Content/Geometry/Meshes/Plane_038.uasset index 87c101f..c968d1d 100644 Binary files a/Content/Geometry/Meshes/Plane_038.uasset and b/Content/Geometry/Meshes/Plane_038.uasset differ diff --git a/Content/NPC_BP.uasset b/Content/NPC_BP.uasset index a20b06f..02928f2 100644 Binary files a/Content/NPC_BP.uasset and b/Content/NPC_BP.uasset differ diff --git a/Content/TheEnd.uasset b/Content/TheEnd.uasset new file mode 100644 index 0000000..c859e44 Binary files /dev/null and b/Content/TheEnd.uasset differ diff --git a/Content/train.umap b/Content/train.umap index c23d59f..3de3e08 100644 Binary files a/Content/train.umap and b/Content/train.umap differ diff --git a/Content/train_BuiltData.uasset b/Content/train_BuiltData.uasset index 84804ab..c1bb5ed 100644 Binary files a/Content/train_BuiltData.uasset and b/Content/train_BuiltData.uasset differ diff --git a/Source/SevenStars/NPC.cpp b/Source/SevenStars/NPC.cpp index 25a253a..6043189 100644 --- 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]; diff --git a/Source/SevenStars/NPC.h b/Source/SevenStars/NPC.h index 7ffad00..0f0c447 100644 --- 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 ZyxelState0_0; TArray ZyxelState0_1;