Skip to content

Commit 433caee

Browse files
committed
Добавлены диалоги coffee1
1 parent 9719093 commit 433caee

18 files changed

+467
-15
lines changed

Assets/DialogueSystem/DialogueBarController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class DialogueBarController : MonoBehaviour
77
{
88
public TMP_Text characterNameComp;
99
public TMP_Text textComp;
10-
public float textSpeed = 0.05f;
10+
public float textSpeed = 0.0f;
1111

1212
private int phraseIndex = -1;
1313
private GameScene currentScene;

Assets/DialogueSystem/Dialogues/Day1/ChooseCoffee.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ MonoBehaviour:
1313
m_Name: ChooseCoffee
1414
m_EditorClassIdentifier:
1515
labels:
16-
- text: "\u0417\u0430\u0439\u0442\u0438 \u0432 \u043A\u043E\u0444\u0435\u0439\u043D\u044E"
17-
nextScene: {fileID: 11400000, guid: 224e7e6e71a2ffa4cbb663e539709dbf, type: 2}
1816
- text: "\u0418\u0434\u0442\u0438 \u043D\u0435 \u0431\u043E\u0434\u0440\u044B\u043C"
17+
nextScene: {fileID: 11400000, guid: 224e7e6e71a2ffa4cbb663e539709dbf, type: 2}
18+
- text: "\u0417\u0430\u0439\u0442\u0438 \u0432 \u043A\u043E\u0444\u0435\u0439\u043D\u044E"
1919
nextScene: {fileID: 11400000, guid: 48b5463542c10934ebdcfc5c3f57f918, type: 2}
2020
bgm: {fileID: 0}

Assets/DialogueSystem/Dialogues/Day1/Coffee1/SkipCoffee.asset renamed to Assets/DialogueSystem/Dialogues/Day1/Coffee1/1SkipCoffee.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 83f15d0b2f15f754f96e42321a6e2c5f, type: 3}
13-
m_Name: SkipCoffee
13+
m_Name: 1SkipCoffee
1414
m_EditorClassIdentifier:
1515
phrases:
1616
- text: "*\u041F\u0440\u0435\u043F\u043E\u0434 \u041F\u0440\u0435\u043F\u043E\u0434\u043E\u0432\u0438\u0447
@@ -25,4 +25,4 @@ MonoBehaviour:
2525
bgm: {fileID: 0}
2626
hideCharacter: 0
2727
Background: {fileID: 0}
28-
nextScene: {fileID: 0}
28+
nextScene: {fileID: 11400000, guid: f4f8ae59599e8854b81105db41936a0a, type: 2}

Assets/DialogueSystem/Dialogues/Day1/Coffee1/SkipCoffee.asset.meta renamed to Assets/DialogueSystem/Dialogues/Day1/Coffee1/1SkipCoffee.asset.meta

File renamed without changes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 83f15d0b2f15f754f96e42321a6e2c5f, type: 3}
13+
m_Name: 2GoToBus
14+
m_EditorClassIdentifier:
15+
phrases:
16+
- text: "\u0414\u0435\u043D\u044C \u043F\u0440\u0435\u0434\u0432\u0435\u0449\u0430\u0435\u0442
17+
\u0431\u044B\u0442\u044C \u0443\u0436\u0430\u0441\u043D\u043E \u0441\u043B\u043E\u0436\u043D\u044B\u043C
18+
\u0438 \u0440\u0443\u0442\u0438\u043D\u043D\u044B\u043C"
19+
speaker: {fileID: 11400000, guid: b96e2977a56d11b4d98abcf3cbeeb345, type: 2}
20+
animation: {fileID: 0}
21+
bgm: {fileID: 0}
22+
hideCharacter: 0
23+
Background: {fileID: 0}
24+
nextScene: {fileID: 11400000, guid: 58c3c570cd2cf1c40bfd57c2f7bed760, type: 2}

Assets/DialogueSystem/Dialogues/Day1/Coffee1/2GoToBus.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 83f15d0b2f15f754f96e42321a6e2c5f, type: 3}
13+
m_Name: 3InBus
14+
m_EditorClassIdentifier:
15+
phrases:
16+
- text: "*\u0412\u043A\u043B\u044E\u0447\u0438\u043B \u0442\u0435\u043B\u0435\u0444\u043E\u043D*"
17+
speaker: {fileID: 11400000, guid: b96e2977a56d11b4d98abcf3cbeeb345, type: 2}
18+
animation: {fileID: 0}
19+
bgm: {fileID: 0}
20+
hideCharacter: 1
21+
- text: "\u0422\u0430\u0430\u0430\u0430\u043A, \u0447\u0442\u043E \u0431\u044B
22+
\u043F\u043E\u0441\u043B\u0443\u0448\u0430\u0442\u044C."
23+
speaker: {fileID: 11400000, guid: b96e2977a56d11b4d98abcf3cbeeb345, type: 2}
24+
animation: {fileID: 0}
25+
bgm: {fileID: 0}
26+
hideCharacter: 0
27+
Background: {fileID: 0}
28+
nextScene: {fileID: 11400000, guid: 67cc663af3a07ca47adb8132f7241728, type: 2}

Assets/DialogueSystem/Dialogues/Day1/Coffee1/3InBus.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d041a7f41f45f854cbf55f9d1fac52de, type: 3}
13+
m_Name: 4ChooseMusic
14+
m_EditorClassIdentifier:
15+
labels:
16+
- text: "\u041A\u043B\u0430\u0441\u0441\u0438\u043A\u0430"
17+
nextScene: {fileID: 11400000, guid: 8bfcc65595738134f8a633ae01caf575, type: 2}
18+
- text: "\u041C\u0435\u0442\u0430\u043B\u043B\u0438\u043A\u0430"
19+
nextScene: {fileID: 0}
20+
- text: "\u0414\u0430\u0439\u0442\u0435 \u0442\u0430\u043D\u043A"
21+
nextScene: {fileID: 0}
22+
bgm: {fileID: 0}

Assets/DialogueSystem/Dialogues/Day1/Coffee1/4ChooseMusic.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)