git rekt — RPG.git: 9639697424c1e8744f7291270ed4fcc647c4eee7

fix bug in dialoguemanager

Marco Andronaco andronacomarco@gmail.com

Thu, 16 Apr 2020 21:06:58 +0200

commit

9639697424c1e8744f7291270ed4fcc647c4eee7

parent

6c05a2dbbbf1a595de392cda9fc6b624274a08d9

5 files changed, 239 insertions(+), 38 deletions(-)

jump to

Assets/Prefabs/Overworld/Girl.prefab

Assets/Prefabs/Overworld/Ninja.prefab

Assets/Scenes/Level0.unity

Assets/Scripts/Menu/EndGameManager.cs

Assets/Scripts/Overworld/Dialogue/DialogueManager.cs

M Assets/Prefabs/Overworld/Girl.prefab → Assets/Prefabs/Overworld/Girl.prefab

@@ -774,15 +774,15 @@ sound: {fileID: 0}
     sentences:
     - "Hey, you. You're finally awake. You were trying to cross the border, right?
       Walked right into that Orc ambush and got easily defeated.\r"
-    - "Well, it's your lucky day. I found you unconscious and I brought you here to
-      heal your wounds, now you should be ready to get revenge.\r"
-    - "Your friend's waiting for you outside, she must be worried sick about you!\r"
-    - "What? Your third friend? Sorry, I only found and rescued two people, you guys
-      basically owe me your life from now on.\r"
-    - "So, you want to climb Peek Galeer? Then you need to prepare for battle. A lot
-      of weird orcs and mutants have been swarming the place recently, but as long
-      as you stay together you should be fine.\r"
-    - "Now go, adventurer, good luck with your revenge! I'll be waiting for my cut
+    - Well, it's your lucky day. I found you unconscious and I brought you here to
+      heal your wounds, now you should be ready to go.
+    - "What? You want to climb Peek Galeer? Then you need to prepare for battle. A
+      lot of weird orcs and mutants have been swarming the place recently, but as
+      long as you stay together you should be fine.\r"
+    - 'The real problem would be that demon Brady... He''s the cause of all our worries:
+      he spawned all these orcs and mutants just for fun!'
+    - Just be careful if you meet him, he looks stupid but he's pretty strong in battle.
+    - "Now go, adventurer, good luck with your revenge!\nI'll be waiting for my cut
       here when you return... Just kidding!\r"
 --- !u!1 &2625315890171242048
 GameObject:

M Assets/Prefabs/Overworld/Ninja.prefab → Assets/Prefabs/Overworld/Ninja.prefab

@@ -856,6 +856,7 @@ - component: {fileID: 930593615016250822}
   - component: {fileID: 7088703437182787772}
   - component: {fileID: 4229293667042246600}
   - component: {fileID: 4229293667042246603}
+  - component: {fileID: 5024940287250160533}
   m_Layer: 0
   m_Name: Ninja
   m_TagString: Untagged
@@ -926,6 +927,26 @@ m_Radius: 0.68253994
   m_Height: 1.4452276
   m_Direction: 1
   m_Center: {x: 0, y: 0.69036865, z: 0.34213257}
+--- !u!114 &5024940287250160533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229293667042246613}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc004005c600e4ba9dbb255e17a4ae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  dialogue:
+    name: Weird Ninja
+    sound: {fileID: 0}
+    sentences:
+    - Ayy, be safe out there kiddo.
+    - 'Huh? Dude, that girl is my wife!
+
+      Don''t get any weird ideas or I''ll kick your ass into the moon!'
 --- !u!1 &4287883664195207820
 GameObject:
   m_ObjectHideFlags: 0

M Assets/Scenes/Level0.unity → Assets/Scenes/Level0.unity

@@ -4967,6 +4967,75 @@ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
+--- !u!1001 &162096784
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5314719787374066515, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_Name
+      value: EnemyOrc (5)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 414.1401
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 39.992676
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 404.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dea3e7077f79f5e47b43f757fbb07736, type: 3}
 --- !u!1 &170076733
 GameObject:
   m_ObjectHideFlags: 0
@@ -15913,31 +15982,6 @@ m_CorrespondingSourceObject: {fileID: 6787417573460627128, guid: b9089e56c5ff80b419c7f4aba9c5c421,
     type: 3}
   m_PrefabInstance: {fileID: 6787417573422268987}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1101436813 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4229293667042246613, guid: d404fce89add42444a6153c64c1aba5b,
-    type: 3}
-  m_PrefabInstance: {fileID: 5300900833277874266}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1101436814
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1101436813}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc004005c600e4ba9dbb255e17a4ae, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  dialogue:
-    name: Weird Ninja
-    sound: {fileID: 0}
-    sentences:
-    - Ayy, be safe out there kiddo.
-    - Huh? Dude, that girl is my wife, don't get any weird ideas or I'll kick your
-      ass into the moon!
 --- !u!1001 &1118474337
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16533,6 +16577,75 @@ m_CorrespondingSourceObject: {fileID: 6787417571924370538, guid: b9089e56c5ff80b419c7f4aba9c5c421,
     type: 3}
   m_PrefabInstance: {fileID: 6787417573422268987}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1534959298
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4656789200949370965, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_Name
+      value: EnemyMutant (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 340.74637
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 39.992676
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 336.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900961860923272654, guid: db490d779116a5d42b480d64e32e1a48,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: db490d779116a5d42b480d64e32e1a48, type: 3}
 --- !u!1 &1590214685
 GameObject:
   m_ObjectHideFlags: 0
@@ -17102,6 +17215,75 @@ m_Children: []
   m_Father: {fileID: 95955590}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2123940817
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5314719787374066515, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_Name
+      value: EnemyOrc (6)
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 312.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 37.67737
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 267.57
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5314719787374066518, guid: dea3e7077f79f5e47b43f757fbb07736,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dea3e7077f79f5e47b43f757fbb07736, type: 3}
 --- !u!23 &670810584377561121
 MeshRenderer:
   m_ObjectHideFlags: 0

M Assets/Scripts/Menu/EndGameManager.cs → Assets/Scripts/Menu/EndGameManager.cs

@@ -12,9 +12,6 @@ [SerializeField] private Text highscoreName = null;
     [SerializeField] private Text[] nameObjects = null;
     [SerializeField] private Text[] scoreObjects = null;
     [SerializeField] private Text scoreText = null;
-    
-    [Header("Good Guys")]
-    [SerializeField] private GameObject[] goodGuys = null;
 
     private Leaderboard leaderboard;
     private int userScore;

M Assets/Scripts/Overworld/Dialogue/DialogueManager.cs → Assets/Scripts/Overworld/Dialogue/DialogueManager.cs

@@ -99,7 +99,8 @@ {
         setInputEnabled(true);
         UI.stopText();
         animator.SetBool("IsOpen", false);
-        actionAfterDialogue();
+        if(actionAfterDialogue != null)
+            actionAfterDialogue();
         actionAfterDialogue = null;
         StartCoroutine(CoolDown(0.3f));
     }

all repos — RPG @ 9639697424c1e8744f7291270ed4fcc647c4eee7

Fully functional 3D turn based role playing game coded in C# and base Unity.