Skip to content

Commit 73fea22

Browse files
uChemauChema
committed
Create cutscenes dialogue
1 parent 1815d11 commit 73fea22

32 files changed

+436
-79
lines changed

‎UOP1_Project/Assets/Scenes/Menus/MainMenu.unity

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -3017,88 +3017,13 @@ Mesh:
30173017
offset: 0
30183018
size: 0
30193019
path:
3020-
--- !u!1001 &1819241688
3021-
PrefabInstance:
3022-
m_ObjectHideFlags: 0
3023-
serializedVersion: 2
3024-
m_Modification:
3025-
m_TransformParent: {fileID: 2062283858}
3026-
m_Modifications:
3027-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3028-
type: 3}
3029-
propertyPath: m_RootOrder
3030-
value: 3
3031-
objectReference: {fileID: 0}
3032-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3033-
type: 3}
3034-
propertyPath: m_LocalPosition.x
3035-
value: -138.18
3036-
objectReference: {fileID: 0}
3037-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3038-
type: 3}
3039-
propertyPath: m_LocalPosition.y
3040-
value: -4.65
3041-
objectReference: {fileID: 0}
3042-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3043-
type: 3}
3044-
propertyPath: m_LocalPosition.z
3045-
value: -329.45
3046-
objectReference: {fileID: 0}
3047-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3048-
type: 3}
3049-
propertyPath: m_LocalRotation.w
3050-
value: 1
3051-
objectReference: {fileID: 0}
3052-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3053-
type: 3}
3054-
propertyPath: m_LocalRotation.x
3055-
value: 0
3056-
objectReference: {fileID: 0}
3057-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3058-
type: 3}
3059-
propertyPath: m_LocalRotation.y
3060-
value: 0
3061-
objectReference: {fileID: 0}
3062-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3063-
type: 3}
3064-
propertyPath: m_LocalRotation.z
3065-
value: 0
3066-
objectReference: {fileID: 0}
3067-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3068-
type: 3}
3069-
propertyPath: m_LocalEulerAnglesHint.x
3070-
value: 0
3071-
objectReference: {fileID: 0}
3072-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3073-
type: 3}
3074-
propertyPath: m_LocalEulerAnglesHint.y
3075-
value: 0
3076-
objectReference: {fileID: 0}
3077-
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3078-
type: 3}
3079-
propertyPath: m_LocalEulerAnglesHint.z
3080-
value: 0
3081-
objectReference: {fileID: 0}
3082-
- target: {fileID: 6901050648071473547, guid: 06f28a6070cb9874e9c46704d55cc784,
3083-
type: 3}
3084-
propertyPath: m_Name
3085-
value: Beach_Palms
3086-
objectReference: {fileID: 0}
3087-
m_RemovedComponents: []
3088-
m_SourcePrefab: {fileID: 100100000, guid: 06f28a6070cb9874e9c46704d55cc784, type: 3}
3089-
--- !u!4 &1819241689 stripped
3090-
Transform:
3091-
m_CorrespondingSourceObject: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3092-
type: 3}
3093-
m_PrefabInstance: {fileID: 1819241688}
3094-
m_PrefabAsset: {fileID: 0}
3095-
--- !u!43 &1844154644
3020+
--- !u!43 &1777060537
30963021
Mesh:
30973022
m_ObjectHideFlags: 0
30983023
m_CorrespondingSourceObject: {fileID: 0}
30993024
m_PrefabInstance: {fileID: 0}
31003025
m_PrefabAsset: {fileID: 0}
3101-
m_Name: pb_Mesh-53182
3026+
m_Name: pb_Mesh-7950
31023027
serializedVersion: 10
31033028
m_SubMeshes:
31043029
- serializedVersion: 2
@@ -3256,6 +3181,81 @@ Mesh:
32563181
offset: 0
32573182
size: 0
32583183
path:
3184+
--- !u!1001 &1819241688
3185+
PrefabInstance:
3186+
m_ObjectHideFlags: 0
3187+
serializedVersion: 2
3188+
m_Modification:
3189+
m_TransformParent: {fileID: 2062283858}
3190+
m_Modifications:
3191+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3192+
type: 3}
3193+
propertyPath: m_RootOrder
3194+
value: 3
3195+
objectReference: {fileID: 0}
3196+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3197+
type: 3}
3198+
propertyPath: m_LocalPosition.x
3199+
value: -138.18
3200+
objectReference: {fileID: 0}
3201+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3202+
type: 3}
3203+
propertyPath: m_LocalPosition.y
3204+
value: -4.65
3205+
objectReference: {fileID: 0}
3206+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3207+
type: 3}
3208+
propertyPath: m_LocalPosition.z
3209+
value: -329.45
3210+
objectReference: {fileID: 0}
3211+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3212+
type: 3}
3213+
propertyPath: m_LocalRotation.w
3214+
value: 1
3215+
objectReference: {fileID: 0}
3216+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3217+
type: 3}
3218+
propertyPath: m_LocalRotation.x
3219+
value: 0
3220+
objectReference: {fileID: 0}
3221+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3222+
type: 3}
3223+
propertyPath: m_LocalRotation.y
3224+
value: 0
3225+
objectReference: {fileID: 0}
3226+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3227+
type: 3}
3228+
propertyPath: m_LocalRotation.z
3229+
value: 0
3230+
objectReference: {fileID: 0}
3231+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3232+
type: 3}
3233+
propertyPath: m_LocalEulerAnglesHint.x
3234+
value: 0
3235+
objectReference: {fileID: 0}
3236+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3237+
type: 3}
3238+
propertyPath: m_LocalEulerAnglesHint.y
3239+
value: 0
3240+
objectReference: {fileID: 0}
3241+
- target: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3242+
type: 3}
3243+
propertyPath: m_LocalEulerAnglesHint.z
3244+
value: 0
3245+
objectReference: {fileID: 0}
3246+
- target: {fileID: 6901050648071473547, guid: 06f28a6070cb9874e9c46704d55cc784,
3247+
type: 3}
3248+
propertyPath: m_Name
3249+
value: Beach_Palms
3250+
objectReference: {fileID: 0}
3251+
m_RemovedComponents: []
3252+
m_SourcePrefab: {fileID: 100100000, guid: 06f28a6070cb9874e9c46704d55cc784, type: 3}
3253+
--- !u!4 &1819241689 stripped
3254+
Transform:
3255+
m_CorrespondingSourceObject: {fileID: 6901050648071473546, guid: 06f28a6070cb9874e9c46704d55cc784,
3256+
type: 3}
3257+
m_PrefabInstance: {fileID: 1819241688}
3258+
m_PrefabAsset: {fileID: 0}
32593259
--- !u!4 &1920039742 stripped
32603260
Transform:
32613261
m_CorrespondingSourceObject: {fileID: 6764045074441279190, guid: c475cd9c921a7f841aaefef83495e789,

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes.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.

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-CANDY.asset

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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: a0c0171b565b4074a9462307824be26c, type: 3}
13+
m_Name: CUT-CANDY
14+
m_EditorClassIdentifier:
15+
_lines: []
16+
_dialogueType: 0
17+
_endOfDialogueEvent: {fileID: 0}

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-CANDY.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.

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-LOSE.asset

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
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: a0c0171b565b4074a9462307824be26c, type: 3}
13+
m_Name: CUT-LOSE
14+
m_EditorClassIdentifier:
15+
_lines:
16+
- _actorID: 5
17+
_textList:
18+
- m_TableReference:
19+
m_TableCollectionName: Questline Dialogue
20+
m_TableEntryReference:
21+
m_KeyId: 0
22+
m_Key: L1-D1-CUT-WIN
23+
m_FallbackState: 0
24+
m_WaitForCompletion: 1
25+
- m_TableReference:
26+
m_TableCollectionName: Questline Dialogue
27+
m_TableEntryReference:
28+
m_KeyId: 0
29+
m_Key: L2-D1-CUT-WIN
30+
m_FallbackState: 0
31+
m_WaitForCompletion: 1
32+
- m_TableReference:
33+
m_TableCollectionName: Questline Dialogue
34+
m_TableEntryReference:
35+
m_KeyId: 0
36+
m_Key: L3-D1-CUT-WIN
37+
m_FallbackState: 0
38+
m_WaitForCompletion: 1
39+
- m_TableReference:
40+
m_TableCollectionName: Questline Dialogue
41+
m_TableEntryReference:
42+
m_KeyId: 0
43+
m_Key: L4-D1-CUT-WIN
44+
m_FallbackState: 0
45+
m_WaitForCompletion: 1
46+
- m_TableReference:
47+
m_TableCollectionName: Questline Dialogue
48+
m_TableEntryReference:
49+
m_KeyId: 0
50+
m_Key: L5-D1-CUT-WIN
51+
m_FallbackState: 0
52+
m_WaitForCompletion: 1
53+
- m_TableReference:
54+
m_TableCollectionName: Questline Dialogue
55+
m_TableEntryReference:
56+
m_KeyId: 0
57+
m_Key: L6-D1-CUT-WIN
58+
m_FallbackState: 0
59+
m_WaitForCompletion: 1
60+
- m_TableReference:
61+
m_TableCollectionName: Questline Dialogue
62+
m_TableEntryReference:
63+
m_KeyId: 0
64+
m_Key: L7-D1-CUT-WIN
65+
m_FallbackState: 0
66+
m_WaitForCompletion: 1
67+
_choices: []
68+
- _actorID: 1
69+
_textList:
70+
- m_TableReference:
71+
m_TableCollectionName: Questline Dialogue
72+
m_TableEntryReference:
73+
m_KeyId: 0
74+
m_Key: L1-D2-CUT-WIN
75+
m_FallbackState: 0
76+
m_WaitForCompletion: 1
77+
_choices: []
78+
- _actorID: 5
79+
_textList:
80+
- m_TableReference:
81+
m_TableCollectionName: Questline Dialogue
82+
m_TableEntryReference:
83+
m_KeyId: 0
84+
m_Key: L1-D3-CUT-WIN
85+
m_FallbackState: 0
86+
m_WaitForCompletion: 1
87+
- m_TableReference:
88+
m_TableCollectionName: Questline Dialogue
89+
m_TableEntryReference:
90+
m_KeyId: 0
91+
m_Key: L2-D3-CUT-WIN
92+
m_FallbackState: 0
93+
m_WaitForCompletion: 1
94+
- m_TableReference:
95+
m_TableCollectionName: Questline Dialogue
96+
m_TableEntryReference:
97+
m_KeyId: 0
98+
m_Key: L3-D3-CUT-WIN
99+
m_FallbackState: 0
100+
m_WaitForCompletion: 1
101+
- m_TableReference:
102+
m_TableCollectionName: Questline Dialogue
103+
m_TableEntryReference:
104+
m_KeyId: 0
105+
m_Key: L4-D3-CUT-WIN
106+
m_FallbackState: 0
107+
m_WaitForCompletion: 1
108+
- m_TableReference:
109+
m_TableCollectionName: Questline Dialogue
110+
m_TableEntryReference:
111+
m_KeyId: 0
112+
m_Key: L5-D3-CUT-WIN
113+
m_FallbackState: 0
114+
m_WaitForCompletion: 1
115+
_choices: []
116+
_dialogueType: 0
117+
_endOfDialogueEvent: {fileID: 0}

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-LOSE.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.

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-OPEN.asset

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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: a0c0171b565b4074a9462307824be26c, type: 3}
13+
m_Name: CUT-OPEN
14+
m_EditorClassIdentifier:
15+
_lines: []
16+
_dialogueType: 0
17+
_endOfDialogueEvent: {fileID: 0}

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-OPEN.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.

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-SLIME.asset

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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: a0c0171b565b4074a9462307824be26c, type: 3}
13+
m_Name: CUT-SLIME
14+
m_EditorClassIdentifier:
15+
_lines: []
16+
_dialogueType: 0
17+
_endOfDialogueEvent: {fileID: 0}

‎UOP1_Project/Assets/ScriptableObjects/Dialogue/Cutscenes/CUT-SLIME.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)