add first scene

This commit is contained in:
ilia 2022-01-29 19:49:41 +03:00
parent ddb545af92
commit e7a790e476
4 changed files with 349 additions and 8 deletions

View File

@ -548,7 +548,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: 80b0022f819bfb64c92e6c29dabac2ab, type: 3}
m_FontSize: 48
m_FontStyle: 0
m_BestFit: 0
@ -569,6 +569,123 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 117754087}
m_CullTransparentMesh: 1
--- !u!1001 &135233322
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2148957336611936570, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_TagString
value: dialog_name
objectReference: {fileID: 0}
- target: {fileID: 3325112468942497453, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_TagString
value: dialog_content
objectReference: {fileID: 0}
- target: {fileID: 4160254509032735793, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_Name
value: DialogUI
objectReference: {fileID: 0}
- target: {fileID: 4160254509032735793, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_TagString
value: dialog_canvas
objectReference: {fileID: 0}
- target: {fileID: 4538792827991390899, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 7275707779469296087, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_Text
value: "\u0442\u0435\u043A\u0441\u0442"
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8388759118598599283, guid: 88023f41040889540a768e767f764802, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88023f41040889540a768e767f764802, type: 3}
--- !u!1 &157084330
GameObject:
m_ObjectHideFlags: 0
@ -737,6 +854,36 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176398102}
m_CullTransparentMesh: 1
--- !u!1 &224981043
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 224981044}
m_Layer: 0
m_Name: LearningSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &224981044
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 224981043}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 615.87775, y: 725.3071, z: -8560.654}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &290448063
GameObject:
m_ObjectHideFlags: 0
@ -857,6 +1004,11 @@ Transform:
m_Father: {fileID: 75246282}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!223 &308993803 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 5912114814553077733, guid: 88023f41040889540a768e767f764802, type: 3}
m_PrefabInstance: {fileID: 135233322}
m_PrefabAsset: {fileID: 0}
--- !u!1 &371240245
GameObject:
m_ObjectHideFlags: 0
@ -1343,6 +1495,7 @@ GameObject:
m_Component:
- component: {fileID: 705507995}
- component: {fileID: 705507994}
- component: {fileID: 705507996}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
@ -1426,6 +1579,14 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!81 &705507996
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
m_Enabled: 1
--- !u!1 &884581141
GameObject:
m_ObjectHideFlags: 0
@ -2506,6 +2667,178 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1245505701}
m_CullTransparentMesh: 1
--- !u!1 &1346116723
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1346116727}
- component: {fileID: 1346116726}
- component: {fileID: 1346116725}
- component: {fileID: 1346116724}
- component: {fileID: 1346116728}
m_Layer: 0
m_Name: DialogPlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1346116724
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346116723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab0d44d772833f14ebb91e4f233d7612, type: 3}
m_Name:
m_EditorClassIdentifier:
_captainAvatar: {fileID: 7798839904708177174, guid: fdc4a3b308b524944aec017148206a92, type: 3}
_pilotAvatar: {fileID: 3750784060721673617, guid: 47c26c516e4ad5f4ab294bbeca7ecbed, type: 3}
_voiceAssistantAvatar: {fileID: 7510593660513518191, guid: 360074e5f0b89134dae58f5d8d0c50c6, type: 3}
_canvasOverlay: {fileID: 308993803}
--- !u!82 &1346116725
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346116723}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &1346116726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346116723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b07eea804daaf34c82c90e97894d546, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1346116727
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346116723}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 759.4261, y: 844.65283, z: -8135.201}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1346116728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346116723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b978931a400d89f43ae64dc52b44da92, type: 3}
m_Name:
m_EditorClassIdentifier:
_audioPlayer: {fileID: 1346116726}
_audioVisualizer: {fileID: 1346116724}
--- !u!1 &1389911890
GameObject:
m_ObjectHideFlags: 0
@ -2855,7 +3188,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1605665776
GameObject:
@ -3880,7 +4213,7 @@ RectTransform:
- {fileID: 1131753690}
- {fileID: 157084331}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

View File

@ -10,6 +10,7 @@ public class AudioPlayer : MonoBehaviour
private bool _play;
void Awake()
{
Debug.Log("fuck you");
_audioPlayer = gameObject.GetComponent<AudioSource>();
_stopsCommits = new List<AudioPlayerStopsCommit>();
}

View File

@ -18,10 +18,7 @@ public static class DialogData{
"Подробности высланы вам на почту, проверьте",
Roles.CAPTAIN,
Resources.Load<AudioClip>("audio/капитан/подробности высланы")
)
};
public static DialogDataClass[] SecondSceneFirstAction = {
),
new DialogDataClass(
"Файл доставлен, в нем обнаружены повреждения",
Roles.VOICE_ASSISTANT,
@ -33,6 +30,10 @@ public static class DialogData{
Resources.Load<AudioClip>("audio/пилот/о черт, опять этот баг")
)
};
public static DialogDataClass[] SecondSceneFirstAction = {
};
public static DialogDataClass[] SecondSceneSecondAction = {
new DialogDataClass(
"В этот раз файл поврежден очень сильно, надо его открыть и посмотреть что в нем сохранилось",

View File

@ -15,6 +15,10 @@ public class DialogPlayer : MonoBehaviour
int _idx = 0;
Replica _currentReplica;
bool _isDialogPlaying = true;
bool getIsDialogPlaying(){
return _isDialogPlaying;
}
void changeDialogData(DialogDataClass[] dialogData){
_dialogData = dialogData;
@ -69,7 +73,9 @@ public class DialogPlayer : MonoBehaviour
// Update is called once per frame
void Update()
{
if (_idx >= _dialogData.Length-1) return;
if (_idx >= _dialogData.Length-1) {
_isDialogPlaying = false;
}
if (_currentReplica.getIsEnded()) {
_idx++;
_currentReplica = createReplica();