diff --git a/Assets/01_Scenes/Chapter1.unity b/Assets/01_Scenes/Chapter1.unity index 044cefe..4c36915 100644 --- a/Assets/01_Scenes/Chapter1.unity +++ b/Assets/01_Scenes/Chapter1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfd8a84f922ca0a117fd79ee5a48786f2e313dcc07774cb5e8c9d4bd0290b497 -size 44586 +oid sha256:c272d126643e74ab4b2444f8d4c6b6334ff86bcba82fd8f9f7137f1028ef8c46 +size 47490 diff --git a/Assets/04_Models/Characters/MayaFey/Prefabs/MayaFey.prefab b/Assets/04_Models/Characters/MayaFey/Prefabs/MayaFey.prefab index 3f2d679..ade5620 100644 --- a/Assets/04_Models/Characters/MayaFey/Prefabs/MayaFey.prefab +++ b/Assets/04_Models/Characters/MayaFey/Prefabs/MayaFey.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7be8037d71797af7673b6d74125fe19534cdb217c85a6198264d3df324ddd33f -size 26875 +oid sha256:8c0c34b193dfec27529e75ba2681a447d0cb70385d02dd9a13968afb051c3a90 +size 26902 diff --git a/Assets/04_Models/Locations/DetentionCenter/Prefabs/DetentionCenter.prefab b/Assets/04_Models/Locations/DetentionCenter/Prefabs/DetentionCenter.prefab index 7ed4351..659124c 100644 --- a/Assets/04_Models/Locations/DetentionCenter/Prefabs/DetentionCenter.prefab +++ b/Assets/04_Models/Locations/DetentionCenter/Prefabs/DetentionCenter.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b26ff6e1687978d57e81cfa36ef32878dc1596276d0cdc29f2f1b010e2e690e -size 3516 +oid sha256:10cc0721be493f1647df6a84471a6792199d9ed4f82da66f3140933d82571721 +size 3525 diff --git a/Assets/04_Models/Locations/LawOffice/Prefabs/LawOffice.prefab b/Assets/04_Models/Locations/LawOffice/Prefabs/LawOffice.prefab index b4b1ae3..43d81dd 100644 --- a/Assets/04_Models/Locations/LawOffice/Prefabs/LawOffice.prefab +++ b/Assets/04_Models/Locations/LawOffice/Prefabs/LawOffice.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a4e7b5bda54171f0da69595f3be6dd8b8c7ac5fc089be37fd99f850549d2097 -size 3513 +oid sha256:0fdd13ca27c24d13861cceec5f74508dabf4dbdf39aa01605ca7dd20650cca5e +size 3522 diff --git a/Assets/07_Data/DialogGraph/Chapter1_Intro.dlg b/Assets/07_Data/DialogGraph/Chapter1_Intro.dlg index 1bffeec..0e7b4e7 100644 --- a/Assets/07_Data/DialogGraph/Chapter1_Intro.dlg +++ b/Assets/07_Data/DialogGraph/Chapter1_Intro.dlg @@ -70,6 +70,7 @@ MonoBehaviour: - Progress - Pose - PoseTarget + - SceneScreen m_ValueList: - rid: 1798538364032909553 - rid: 1798538364032909554 @@ -88,6 +89,7 @@ MonoBehaviour: - rid: 1798538364032909568 - rid: 1798538364032909647 - rid: 1798538364032909670 + - rid: 1798538446909211049 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -235,6 +237,7 @@ MonoBehaviour: - Progress - Pose - PoseTarget + - SceneScreen m_ValueList: - rid: 1798538364032909592 - rid: 1798538364032909593 @@ -253,6 +256,7 @@ MonoBehaviour: - rid: 1798538364032909607 - rid: 1798538364032909648 - rid: 1798538364032909671 + - rid: 1798538446909211050 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -461,6 +465,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210626 - rid: 1798538446909210627 @@ -479,6 +484,7 @@ MonoBehaviour: - rid: 1798538446909210640 - rid: 1798538446909210641 - rid: 1798538446909210642 + - rid: 1798538446909211051 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -641,6 +647,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210647 - rid: 1798538446909210648 @@ -659,6 +666,7 @@ MonoBehaviour: - rid: 1798538446909210661 - rid: 1798538446909210662 - rid: 1798538446909210663 + - rid: 1798538446909211052 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -821,6 +829,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210667 - rid: 1798538446909210668 @@ -839,6 +848,7 @@ MonoBehaviour: - rid: 1798538446909210681 - rid: 1798538446909210682 - rid: 1798538446909210683 + - rid: 1798538446909211053 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1002,6 +1012,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210687 - rid: 1798538446909210688 @@ -1020,6 +1031,7 @@ MonoBehaviour: - rid: 1798538446909210701 - rid: 1798538446909210702 - rid: 1798538446909210703 + - rid: 1798538446909211054 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1150,6 +1162,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210707 - rid: 1798538446909210708 @@ -1168,6 +1181,7 @@ MonoBehaviour: - rid: 1798538446909210721 - rid: 1798538446909210722 - rid: 1798538446909210723 + - rid: 1798538446909211055 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1330,6 +1344,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210727 - rid: 1798538446909210728 @@ -1348,6 +1363,7 @@ MonoBehaviour: - rid: 1798538446909210741 - rid: 1798538446909210742 - rid: 1798538446909210743 + - rid: 1798538446909211056 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1544,6 +1560,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210787 - rid: 1798538446909210788 @@ -1562,6 +1579,7 @@ MonoBehaviour: - rid: 1798538446909210801 - rid: 1798538446909210802 - rid: 1798538446909210803 + - rid: 1798538446909211057 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1724,6 +1742,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210807 - rid: 1798538446909210808 @@ -1742,6 +1761,7 @@ MonoBehaviour: - rid: 1798538446909210821 - rid: 1798538446909210822 - rid: 1798538446909210823 + - rid: 1798538446909211058 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -1907,6 +1927,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210827 - rid: 1798538446909210828 @@ -1925,6 +1946,7 @@ MonoBehaviour: - rid: 1798538446909210841 - rid: 1798538446909210842 - rid: 1798538446909210843 + - rid: 1798538446909211059 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2088,6 +2110,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210847 - rid: 1798538446909210848 @@ -2106,6 +2129,7 @@ MonoBehaviour: - rid: 1798538446909210861 - rid: 1798538446909210862 - rid: 1798538446909210863 + - rid: 1798538446909211060 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2272,6 +2296,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210867 - rid: 1798538446909210868 @@ -2290,6 +2315,7 @@ MonoBehaviour: - rid: 1798538446909210881 - rid: 1798538446909210882 - rid: 1798538446909210883 + - rid: 1798538446909211061 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2452,6 +2478,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210887 - rid: 1798538446909210888 @@ -2470,6 +2497,7 @@ MonoBehaviour: - rid: 1798538446909210901 - rid: 1798538446909210902 - rid: 1798538446909210903 + - rid: 1798538446909211062 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2633,6 +2661,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210907 - rid: 1798538446909210908 @@ -2651,6 +2680,7 @@ MonoBehaviour: - rid: 1798538446909210921 - rid: 1798538446909210922 - rid: 1798538446909210923 + - rid: 1798538446909211063 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2815,6 +2845,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210927 - rid: 1798538446909210928 @@ -2833,6 +2864,7 @@ MonoBehaviour: - rid: 1798538446909210941 - rid: 1798538446909210942 - rid: 1798538446909210943 + - rid: 1798538446909211064 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -2997,6 +3029,7 @@ MonoBehaviour: - Typewriter - Affection - Progress + - SceneScreen m_ValueList: - rid: 1798538446909210947 - rid: 1798538446909210948 @@ -3015,6 +3048,7 @@ MonoBehaviour: - rid: 1798538446909210961 - rid: 1798538446909210962 - rid: 1798538446909210963 + - rid: 1798538446909211065 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -3176,6 +3210,82 @@ MonoBehaviour: m_PortDirection: 1 m_PortOrientation: 0 m_Title: + - rid: 1798538446909211047 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211048 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211049 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211050 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211051 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211052 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211053 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211054 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211055 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211056 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 21300000, guid: fc917cdb1c91c45458770a22de62074b, type: 3} + - rid: 1798538446909211057 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 21300000, guid: fc917cdb1c91c45458770a22de62074b, type: 3} + - rid: 1798538446909211058 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211059 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211060 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211061 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211062 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211063 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211064 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 1798538446909211065 + type: {class: 'Constant`1[[UnityEngine.Sprite, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} - rid: 4848514907161231424 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -3223,6 +3333,7 @@ MonoBehaviour: - SideSprite - Pose - PoseTarget + - SceneScreen m_ValueList: - rid: 4848514907161231446 - rid: 4848514907161231447 @@ -3241,6 +3352,7 @@ MonoBehaviour: - rid: 1798538364032909467 - rid: 1798538364032909646 - rid: 1798538364032909669 + - rid: 1798538446909211048 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -3837,6 +3949,7 @@ MonoBehaviour: - SideSprite - Pose - PoseTarget + - SceneScreen m_ValueList: - rid: 6600512887158735088 - rid: 6600512887158735093 @@ -3855,6 +3968,7 @@ MonoBehaviour: - rid: 1798538364032909464 - rid: 1798538364032909645 - rid: 1798538364032909668 + - rid: 1798538446909211047 m_InputPortInfos: expandedPortsById: m_KeyList: [] diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6d49bef..e86bfa8 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23fc56b484aa3d7edf5914cd3591f7a823ccef5e3f3496f8a51f30388ead63dc -size 657 +oid sha256:806fa52095ba0ac48dbaef48ce7ceaa88d6c61439521bcbc916d198de9c788ab +size 757