Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
b570609c
Commit
b570609c
authored
Feb 11, 2019
by
mmaluschnig
Browse files
character dialogue doesnt auto despawn
parent
9d9a2f13
Changes
2
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
b570609c
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/DaytimeScripts/Character
Speech/SilasSpeech
.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/DaytimeScripts/Character
Interactions
.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezeCameraFollow.cs"
Line=
"37"
Column=
"3"
/>
...
...
@@ -12,6 +12,7 @@
<File
FileName=
"Assets/Scripts/PieScripts/PieTutorial.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/TriggerManager.cs"
Line=
"143"
Column=
"32"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs"
Line=
"28"
Column=
"49"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterInteractions.cs"
Line=
"71"
Column=
"81"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterInteractions.cs
View file @
b570609c
...
...
@@ -126,7 +126,8 @@ public class CharacterInteractions : MonoBehaviour {
}
//sets the text of a given text box and sets it to active.
void
setText
(
Text
box
,
string
text
,
float
uptime
,
string
[]
replies
){
speechBoxTimer
=
Time
.
time
+
uptime
;
//speechBoxTimer = Time.time + uptime;
speechBoxTimer
=
Mathf
.
Infinity
;
wasInteracting
=
true
;
DialogueUI
.
gameObject
.
SetActive
(
true
);
updateFaceCamDisplay
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment