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
736fc963
Commit
736fc963
authored
Feb 12, 2019
by
nedboy3
Browse files
minor changes to intro scene to stop players from going the wrong way
parent
98b01539
Changes
2
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/Assets/Scenes/IntroScene.unity
View file @
736fc963
...
...
@@ -1534,7 +1534,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 258363426}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 4.5, z: -10
.146484
}
m_LocalPosition: {x: 0, y: 4.5, z: -10
00
}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 503603553}
...
...
@@ -1550,7 +1550,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 6492c1c2b65dd475ebbe25ebcae4f780, type: 3}
m_PlayOnAwake:
1
m_PlayOnAwake:
0
m_Volume: 0.25
m_Pitch: 1
Loop: 1
...
...
@@ -1816,6 +1816,7 @@ GameObject:
m_Component:
- component: {fileID: 382599333}
- component: {fileID: 382599334}
- component: {fileID: 382599335}
m_Layer: 0
m_Name: Fence_1 (3)
m_TagString: Untagged
...
...
@@ -1830,7 +1831,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 382599332}
m_LocalRotation: {x: 0.02769416, y: 0.647262, z: -0.03256354, w: -0.7610681}
m_LocalPosition: {x: -4
3
, y: -1.5, z: -18.97}
m_LocalPosition: {x: -4
5.31
, y: -1.5, z: -18.97}
m_LocalScale: {x: 5.29, y: 3.6999998, z: 1}
m_Children: []
m_Father: {fileID: 1230210401}
...
...
@@ -1882,6 +1883,31 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &382599335
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 382599332}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 6.21, y: 0.44}
newSize: {x: 6.21, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 6.21, y: 0.44}
m_EdgeRadius: 0
--- !u!1 &421719281
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -2520,7 +2546,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.92, z: -10}
m_LocalPosition: {x: 0, y: 2.92, z: -10
00
}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/PaperSpeech.cs
View file @
736fc963
...
...
@@ -110,6 +110,10 @@ public class PaperSpeech : MonoBehaviour, Character {
private
void
Start
()
{
conversation
.
Enqueue
(
"You feel compelled to read the piece of paper by pressing the W or up arrow key."
);
responseQueue
.
Enqueue
(
new
string
[]
{
"response 1"
});
conversation
.
Enqueue
(
"You feel compelled to read the piece of paper by pressing the W or up arrow key."
);
responseQueue
.
Enqueue
(
new
string
[]
{
"response 1"
});
...
...
mmaluschnig
@mmaluschnig
mentioned in commit
c907c842
·
Feb 12, 2019
mentioned in commit
c907c842
mentioned in commit c907c84239d3df38f48d18cd687c92aef9bd48fd
Toggle commit list
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