Skip to content

Commit

Permalink
Merge pull request #78 from Mara-Games-Studios/Night-fixes
Browse files Browse the repository at this point in the history
Night fixes
  • Loading branch information
Kiuh authored May 16, 2024
2 parents afe2f43 + 4f94019 commit 067dbe2
Show file tree
Hide file tree
Showing 47 changed files with 7,659 additions and 1,168 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 21a74f4cc0f4efa41a3da1d3681ebced
m_Address: Assets/Configs/LocalizationTables/LoadingSceens Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 5a5b8de6a4669184f8baed6ebb2e8fc8, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-be
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7b3cb85b6c936584bba27fd4a356899e
m_Address: LoadingSceens_be
m_ReadOnly: 1
m_SerializedLabels:
- Locale-be
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 5a5b8de6a4669184f8baed6ebb2e8fc8, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7cbd216285c2d4142b2a80f2e868f583
m_Address: LoadingSceens_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 5a5b8de6a4669184f8baed6ebb2e8fc8, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ MonoBehaviour:
m_SerializedLabels:
- Locale-ru
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 36df597f12696524f968a56484ac6c4a
m_Address: LoadingSceens_ru
m_ReadOnly: 1
m_SerializedLabels:
- Locale-ru
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 5a5b8de6a4669184f8baed6ebb2e8fc8, type: 2}
m_SchemaSet:
Expand Down
2 changes: 1 addition & 1 deletion Fantasy-Quest/Assets/AddressableAssetsData/link.xml.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3}
m_Name: LoadingSceens Shared Data
m_EditorClassIdentifier:
m_TableCollectionName: LoadingSceens
m_TableCollectionNameGuidString: 21a74f4cc0f4efa41a3da1d3681ebced
m_Entries:
- m_Id: 6596947968
m_Key: HihitunTitle
m_Metadata:
m_Items: []
- m_Id: 33457270784
m_Key: PovetnikTitle
m_Metadata:
m_Items: []
- m_Id: 100494831616
m_Key: PovetnikDescription
m_Metadata:
m_Items: []
- m_Id: 127053164544
m_Key: HihitunDescription
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
rid: 3407301119631163394
references:
version: 2
RefIds:
- rid: 3407301119631163394
type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization}
data:
m_CustomEpoch: 1715759398007

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3}
m_Name: LoadingSceens
m_EditorClassIdentifier:
m_SharedTableData: {fileID: 11400000, guid: 21a74f4cc0f4efa41a3da1d3681ebced, type: 2}
m_Tables:
- {fileID: 11400000, guid: 7b3cb85b6c936584bba27fd4a356899e, type: 2}
- {fileID: 11400000, guid: 7cbd216285c2d4142b2a80f2e868f583, type: 2}
- {fileID: 11400000, guid: 36df597f12696524f968a56484ac6c4a, type: 2}
m_Extensions: []
m_Group: String Table
references:
version: 2
RefIds: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
m_Name: LoadingSceens_be
m_EditorClassIdentifier:
m_LocaleId:
m_Code: be
m_SharedData: {fileID: 11400000, guid: 21a74f4cc0f4efa41a3da1d3681ebced, type: 2}
m_Metadata:
m_Items: []
m_TableData:
- m_Id: 100494831616
m_Localized: "\u041F\u0430\u0432\u0435\u0442\u043D\u0456\u043A \u2013 \u043C\u0456\u0444\u0456\u0447\u043D\u0430\u044F
\u0441\u044F\u0434\u0437\u0456\u0431\u043D\u0430\u044F \u0456\u0441\u0442\u043E\u0442\u0430
\u045E \u0432\u044B\u0433\u043B\u044F\u0434\u0437\u0435 \u0448\u0430\u0441\u0446\u0456\u043A\u0440\u044B\u043B\u0430\u0439
\u043F\u0442\u0443\u0448\u043A\u0456. \u0417'\u044F\u045E\u043B\u044F\u0435\u0446\u0446\u0430
\u043F\u0430\u0441\u043B\u0430\u043D\u0446\u0430\u043C \u0412\u0435\u043B\u0435\u0441\u0430,
\u044F\u043A\u0456 \u043D\u0430\u0437\u0456\u0440\u0430\u0435 \u0437\u0430
\u043F\u0440\u0430\u0432\u0456\u043B\u044C\u043D\u044B\u043C \u0432\u044F\u0434\u0437\u0435\u043D\u043D\u0435\u043C
\u0433\u0430\u0441\u043F\u0430\u0434\u0430\u0440\u043A\u0456"
m_Metadata:
m_Items: []
- m_Id: 127053164544
m_Localized: "\u0425\u0456\u0445\u0456\u0442\u0443\u043D \u2013 \u043D\u044F\u0447\u044B\u0441\u0446\u0456\u043A,
\u044F\u043A\u0456 \u0437'\u044F\u045E\u043B\u044F\u0435\u0446\u0446\u0430
\u0437\u0430 \u0441\u043F\u0456\u043D\u043E\u0439. \u041F\u0430\u0434\u043E\u0431\u043D\u044B
\u043D\u0430 \u043C\u0430\u043B\u0435\u043D\u044C\u043A\u0443\u044E \u043C\u0430\u043B\u043F\u0430\u0447\u043A\u0443
\u0437 \u0440\u0430\u0433\u0430\u043C\u0456. \u0426\u0435\u0448\u044B\u0446\u0446\u0430
\u0437 \u043D\u044F\u045E\u0434\u0430\u0447 \u043D\u0430\u0432\u0430\u043A\u043E\u043B\u044C\u043D\u044B\u0445,
\u043F\u0440\u044B \u0433\u044D\u0442\u044B\u043C \u043F\u0430\u0434\u0441\u0442\u0443\u043F\u043D\u0430
\u0441\u043C\u044F\u0435\u0446\u0446\u0430"
m_Metadata:
m_Items: []
- m_Id: 33457270784
m_Localized: "\u041F\u0430\u0432\u0435\u0442\u043D\u0456\u043A"
m_Metadata:
m_Items: []
- m_Id: 6596947968
m_Localized: "\u0425\u0456\u0445\u0456\u0442\u0443\u043D"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
m_Name: LoadingSceens_en
m_EditorClassIdentifier:
m_LocaleId:
m_Code: en
m_SharedData: {fileID: 11400000, guid: 21a74f4cc0f4efa41a3da1d3681ebced, type: 2}
m_Metadata:
m_Items: []
m_TableData:
- m_Id: 100494831616
m_Localized: Povetnik is a mythical manor spirit in the form of a six-winged
bird. It is the envoy of Veles, who oversees the proper management of the household
m_Metadata:
m_Items: []
- m_Id: 127053164544
m_Localized: Khihitun is an evil spirit that appears behind you. Looks like a
little monkey with horns. It rejoices at the failures of people around and
laughing insidiously
m_Metadata:
m_Items: []
- m_Id: 33457270784
m_Localized: Povetnik
m_Metadata:
m_Items: []
- m_Id: 6596947968
m_Localized: Khihitun
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3}
m_Name: LoadingSceens_ru
m_EditorClassIdentifier:
m_LocaleId:
m_Code: ru
m_SharedData: {fileID: 11400000, guid: 21a74f4cc0f4efa41a3da1d3681ebced, type: 2}
m_Metadata:
m_Items: []
m_TableData:
- m_Id: 100494831616
m_Localized: "\u041F\u043E\u0432\u0435\u0442\u043D\u0438\u043A \u2013 \u043C\u0438\u0444\u0438\u0447\u0435\u0441\u043A\u0438\u0439
\u0443\u0441\u0430\u0434\u0435\u0431\u043D\u044B\u0439 \u0434\u0443\u0445 \u0432
\u0432\u0438\u0434\u0435 \u0448\u0435\u0441\u0442\u0438\u043A\u0440\u044B\u043B\u043E\u0439
\u043F\u0442\u0438\u0446\u044B. \u042F\u0432\u043B\u044F\u0435\u0442\u0441\u044F
\u043F\u043E\u0441\u043B\u0430\u043D\u043D\u0438\u043A\u043E\u043C \u0412\u0435\u043B\u0435\u0441\u0430,
\u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u043D\u0430\u0431\u043B\u044E\u0434\u0430\u0435\u0442
\u0437\u0430 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u043C \u0432\u0435\u0434\u0435\u043D\u0438\u0435\u043C
\u0445\u043E\u0437\u044F\u0439\u0441\u0442\u0432\u0430"
m_Metadata:
m_Items: []
- m_Id: 127053164544
m_Localized: "\u0425\u0438\u0445\u0438\u0442\u0443\u043D \u2013 \u0437\u043B\u043E\u0439
\u0434\u0443\u0445, \u043F\u043E\u044F\u0432\u043B\u044F\u044E\u0449\u0438\u0439\u0441\u044F
\u0437\u0430 \u0441\u043F\u0438\u043D\u043E\u0439. \u041F\u043E\u0445\u043E\u0436
\u043D\u0430 \u043C\u0430\u043B\u0435\u043D\u044C\u043A\u0443\u044E \u043E\u0431\u0435\u0437\u044C\u044F\u043D\u043A\u0443
\u0441 \u0440\u043E\u0433\u0430\u043C\u0438. \u0420\u0430\u0434\u0443\u0435\u0442\u0441\u044F
\u043D\u0435\u0443\u0434\u0430\u0447\u0430\u043C \u043E\u043A\u0440\u0443\u0436\u0430\u044E\u0449\u0438\u0445,
\u043F\u0440\u0438 \u044D\u0442\u043E\u043C \u043A\u043E\u0432\u0430\u0440\u043D\u043E
\u0441\u043C\u0435\u0435\u0442\u0441\u044F"
m_Metadata:
m_Items: []
- m_Id: 33457270784
m_Localized: "\u041F\u043E\u0432\u0435\u0442\u043D\u0438\u043A"
m_Metadata:
m_Items: []
- m_Id: 6596947968
m_Localized: "\u0425\u0438\u0445\u0438\u0442\u0443\u043D "
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions Fantasy-Quest/Assets/CutScenes/House/DoorCutsceneTimeline.playable
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,22 @@ MonoBehaviour:
m_Markers:
m_Objects:
- {fileID: 6015176823888940971}
--- !u!114 &-4533609194532440286
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 0
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: b9926992bd4b1ab4389f53b9887dbe7f, type: 2}
--- !u!74 &-4412177060940056436
AnimationClip:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2807,6 +2823,7 @@ MonoBehaviour:
- {fileID: -3833212484549483710}
- {fileID: -4561483178532295381}
- {fileID: 5825030664162400393}
- {fileID: 8305064950967084264}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
Expand Down Expand Up @@ -4476,6 +4493,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &8305064950967084264
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b46e36075dd1c124a8422c228e75e1fb, type: 3}
m_Name: Signal Track (8)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects:
- {fileID: -4533609194532440286}
--- !u!114 &8391687855351701573
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
Loading

0 comments on commit 067dbe2

Please sign in to comment.