diff --git a/SSLR/Assets/NpcModels/Prefabs/female1.prefab b/SSLR/Assets/NpcModels/Prefabs/female1.prefab index 405097b..6c0ce53 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female1.prefab @@ -26,7 +26,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1692671664246150363} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_AnchoredPosition: {x: -3.9, y: 68.9} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &322580841787843017 CanvasRenderer: @@ -95,8 +95,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -160,7 +160,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2000346362657350778} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -168,8 +168,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_AnchoredPosition: {x: -3.9, y: 68.9} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5770207069609613006 CanvasRenderer: @@ -229,8 +229,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -294,7 +294,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3150398875706432459} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -302,8 +302,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_AnchoredPosition: {x: -3.9, y: 68.9} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1855148609368397035 CanvasRenderer: @@ -360,11 +360,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -428,7 +428,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3555193730874591599} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -436,8 +436,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_AnchoredPosition: {x: -3.9, y: 68.9} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8133283277727311817 CanvasRenderer: @@ -497,8 +497,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -886,7 +886,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7757978678784222606} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -894,8 +894,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_AnchoredPosition: {x: -3.9, y: 68.9} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1244347579232716980 CanvasRenderer: @@ -955,8 +955,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/female2.prefab b/SSLR/Assets/NpcModels/Prefabs/female2.prefab index a3fe0b7..3de50b6 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female2.prefab @@ -279,7 +279,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &970647882142178616 CanvasRenderer: @@ -339,8 +339,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -413,7 +413,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &854209402013112476 CanvasRenderer: @@ -473,8 +473,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -547,7 +547,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3975886191227617519 CanvasRenderer: @@ -604,11 +604,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -681,7 +681,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5582968973015716294 CanvasRenderer: @@ -741,8 +741,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -895,7 +895,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3413055671717217210 CanvasRenderer: @@ -955,8 +955,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/female3.prefab b/SSLR/Assets/NpcModels/Prefabs/female3.prefab index c9a0d51..461cb72 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female3.prefab @@ -115,7 +115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9060420829422300991 CanvasRenderer: @@ -175,8 +175,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -351,7 +351,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4504608390759558998 CanvasRenderer: @@ -411,8 +411,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -485,7 +485,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6493632776848031341 CanvasRenderer: @@ -545,8 +545,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -619,7 +619,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8404635977595556979 CanvasRenderer: @@ -679,8 +679,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -895,7 +895,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7886427509450606925 CanvasRenderer: @@ -952,11 +952,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male1.prefab b/SSLR/Assets/NpcModels/Prefabs/male1.prefab index 2c8f81a..b4cc44a 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male1.prefab @@ -137,7 +137,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4875027739337246550 CanvasRenderer: @@ -194,11 +194,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -271,7 +271,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3257475772846170132 CanvasRenderer: @@ -331,8 +331,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -405,7 +405,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8287094685470926235 CanvasRenderer: @@ -465,8 +465,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -681,7 +681,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5948050647262527081 CanvasRenderer: @@ -741,8 +741,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -815,7 +815,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2049232374860641181 CanvasRenderer: @@ -875,8 +875,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male2.prefab b/SSLR/Assets/NpcModels/Prefabs/male2.prefab index b0cf713..52ae138 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male2.prefab @@ -115,7 +115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4851785765988905970 CanvasRenderer: @@ -172,11 +172,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -249,7 +249,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4538732058994983262 CanvasRenderer: @@ -309,8 +309,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -485,7 +485,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5763591158721275401 CanvasRenderer: @@ -545,8 +545,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -619,7 +619,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &365130976023635856 CanvasRenderer: @@ -679,8 +679,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -895,7 +895,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6025505449809243599 CanvasRenderer: @@ -955,8 +955,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male3.prefab b/SSLR/Assets/NpcModels/Prefabs/male3.prefab index de0212f..9b174a7 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male3.prefab @@ -115,7 +115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1112440720885034107 CanvasRenderer: @@ -175,8 +175,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -249,7 +249,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8127971194500228073 CanvasRenderer: @@ -309,8 +309,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -383,7 +383,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8805091866428434712 CanvasRenderer: @@ -443,8 +443,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -619,7 +619,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8537197680452492871 CanvasRenderer: @@ -676,11 +676,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -753,7 +753,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &848429071109210366 CanvasRenderer: @@ -813,8 +813,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male4.prefab b/SSLR/Assets/NpcModels/Prefabs/male4.prefab index 35e4066..eaf6e3b 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male4.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male4.prefab @@ -257,7 +257,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2071973268271196572 CanvasRenderer: @@ -317,8 +317,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -391,7 +391,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &105262479765952413 CanvasRenderer: @@ -451,8 +451,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -525,7 +525,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1285177831642050818 CanvasRenderer: @@ -582,11 +582,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -659,7 +659,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4236885392900144000 CanvasRenderer: @@ -719,8 +719,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -793,7 +793,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1985659671101844960 CanvasRenderer: @@ -853,8 +853,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male5.prefab b/SSLR/Assets/NpcModels/Prefabs/male5.prefab index 5446079..61fcd4a 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male5.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male5.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6534513198814960133 CanvasRenderer: @@ -95,8 +95,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -413,7 +413,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &805701450867029128 CanvasRenderer: @@ -473,8 +473,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -627,7 +627,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4994859104933376208 CanvasRenderer: @@ -684,11 +684,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -761,7 +761,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8117066614234304589 CanvasRenderer: @@ -821,8 +821,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -895,7 +895,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3231034043003886641 CanvasRenderer: @@ -955,8 +955,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male6.prefab b/SSLR/Assets/NpcModels/Prefabs/male6.prefab index 0942eee..4a2434f 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male6.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male6.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3685834218747559269 CanvasRenderer: @@ -92,11 +92,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -169,7 +169,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3197198195538956187 CanvasRenderer: @@ -229,8 +229,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -547,7 +547,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5582719300550358539 CanvasRenderer: @@ -607,8 +607,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -681,7 +681,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8650357969000662865 CanvasRenderer: @@ -741,8 +741,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -895,7 +895,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7225391252187525549 CanvasRenderer: @@ -955,8 +955,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/NpcModels/Prefabs/male7.prefab b/SSLR/Assets/NpcModels/Prefabs/male7.prefab index dc4fa0a..17880e5 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male7.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male7.prefab @@ -177,7 +177,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8418446169660964497 CanvasRenderer: @@ -237,8 +237,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -311,7 +311,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &686720578225362601 CanvasRenderer: @@ -371,8 +371,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -445,7 +445,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2074506192022790284 CanvasRenderer: @@ -505,8 +505,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -579,7 +579,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4432995450976289886 CanvasRenderer: @@ -639,8 +639,8 @@ MonoBehaviour: m_fontSize: 128 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 @@ -713,7 +713,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0, y: 68.4053} - m_SizeDelta: {x: 1087.7485, y: 667.1677} + m_SizeDelta: {x: 1023.7, y: 622.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1720840777353737484 CanvasRenderer: @@ -770,11 +770,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 128 + m_fontSize: 72 m_fontSizeBase: 128 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 + m_enableAutoSizing: 1 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 diff --git a/SSLR/Assets/Scenes/LiviPlayground.unity b/SSLR/Assets/Scenes/LiviPlayground.unity index 27e2f8c..8e6321a 100644 --- a/SSLR/Assets/Scenes/LiviPlayground.unity +++ b/SSLR/Assets/Scenes/LiviPlayground.unity @@ -1216,6 +1216,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 171824071} m_CullTransparentMesh: 1 +--- !u!1 &201719675 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8751568781875945595, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} + m_PrefabInstance: {fileID: 101598008} + m_PrefabAsset: {fileID: 0} --- !u!1 &204271907 GameObject: m_ObjectHideFlags: 0 @@ -2032,6 +2037,7 @@ GameObject: - component: {fileID: 272065565} - component: {fileID: 272065564} - component: {fileID: 272065568} + - component: {fileID: 272065569} m_Layer: 5 m_Name: PlayerDialogue m_TagString: Untagged @@ -2116,7 +2122,7 @@ RectTransform: m_Children: - {fileID: 1341287578} - {fileID: 1098954591} - - {fileID: 2007606248} + - {fileID: 1409671559} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 39.148, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2143,6 +2149,31 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_RaycastTriggerInteraction: 1 +--- !u!114 &272065569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272065563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43ab94a182a72874bb0ca70a941888af, type: 3} + m_Name: + m_EditorClassIdentifier: + playerDialogue: {fileID: 272065563} + welcomeButton: {fileID: 1341287577} + questionPanel: {fileID: 1098954590} + responsePanel: {fileID: 1409671558} + playerQuestionOneText: {fileID: 1887540466} + playerQuestionTwoText: {fileID: 1284755197} + playerQuestionThreeText: {fileID: 1918802128} + playerResponseText: {fileID: 264455403} + welcomeTick: {fileID: 1930049738} + situationTick: {fileID: 341360408} + serviceTick: {fileID: 972086447} + takeDocumentsTick: {fileID: 675043657} + giveDocumentsTick: {fileID: 201719675} --- !u!1 &278641001 GameObject: m_ObjectHideFlags: 0 @@ -2651,6 +2682,11 @@ Transform: - {fileID: 1318173677} m_Father: {fileID: 1298003772} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &341360408 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8319687667164330763, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} + m_PrefabInstance: {fileID: 101598008} + m_PrefabAsset: {fileID: 0} --- !u!1 &344229307 GameObject: m_ObjectHideFlags: 0 @@ -5028,12 +5064,6 @@ MonoBehaviour: shiftStarted: 0 currentNPC: {fileID: 0} currentNPCCorrectDepartment: - buttonsPressedBefore: 0 - playerQuestionOneText: {fileID: 1887540466} - playerQuestionTwoText: {fileID: 1284755197} - playerQuestionThreeText: {fileID: 1918802128} - playerResponse: {fileID: 264455403} - playerDialogue: {fileID: 272065563} --- !u!114 &520849217 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5645,6 +5675,11 @@ MonoBehaviour: m_OnKeyboardFocusChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &675043657 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4601194076290656434, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} + m_PrefabInstance: {fileID: 101598008} + m_PrefabAsset: {fileID: 0} --- !u!1 &676885931 GameObject: m_ObjectHideFlags: 0 @@ -8411,7 +8446,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 943865090} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 272065569} + m_TargetAssemblyTypeName: PlayerDialogueInteraction, Assembly-CSharp + m_MethodName: OnQuestionSelected + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 1 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &943865090 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8673,6 +8720,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970254691} m_CullTransparentMesh: 1 +--- !u!1 &972086447 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4082152673421047575, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} + m_PrefabInstance: {fileID: 101598008} + m_PrefabAsset: {fileID: 0} --- !u!1 &972666704 GameObject: m_ObjectHideFlags: 0 @@ -13236,10 +13288,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1341287577} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 272065569} + m_TargetAssemblyTypeName: PlayerDialogueInteraction, Assembly-CSharp + m_MethodName: WelcomePressed + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -13248,30 +13300,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1098954590} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 1930049738} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 --- !u!114 &1341287580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13534,6 +13562,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1391353276} m_CullTransparentMesh: 1 +--- !u!1 &1409671558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1409671559} + - component: {fileID: 1409671561} + - component: {fileID: 1409671560} + m_Layer: 5 + m_Name: Response + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1409671559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409671558} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2007606248} + m_Father: {fileID: 272065567} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1409671560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409671558} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1409671561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409671558} + m_CullTransparentMesh: 1 --- !u!1 &1429469729 GameObject: m_ObjectHideFlags: 0 @@ -14449,7 +14553,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1507994917} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 272065569} + m_TargetAssemblyTypeName: PlayerDialogueInteraction, Assembly-CSharp + m_MethodName: OnQuestionSelected + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1507994917 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18733,7 +18849,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1981807128} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 272065569} + m_TargetAssemblyTypeName: PlayerDialogueInteraction, Assembly-CSharp + m_MethodName: OnQuestionSelected + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 2 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1981807128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18798,13 +18926,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2007606247} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 264455402} - m_Father: {fileID: 272065567} + m_Father: {fileID: 1409671559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/SSLR/Assets/Scripts/GameManager.cs b/SSLR/Assets/Scripts/GameManager.cs index b40c6b0..400629f 100644 --- a/SSLR/Assets/Scripts/GameManager.cs +++ b/SSLR/Assets/Scripts/GameManager.cs @@ -28,21 +28,7 @@ public class GameManager : MonoBehaviour /// public GameObject currentNPC; public string currentNPCCorrectDepartment; - - public bool buttonsPressedBefore; - - /// - /// References for player-npc dialogue - /// - [Header("NPC Dialogue")] - public TextMeshProUGUI playerQuestionOneText; - public TextMeshProUGUI playerQuestionTwoText; - public TextMeshProUGUI playerQuestionThreeText; - - public TextMeshProUGUI playerResponse; - - public GameObject playerDialogue; - + /// /// Do Not Destroy on Load /// @@ -57,9 +43,7 @@ public class GameManager : MonoBehaviour { Destroy(gameObject); } - - playerDialogue.SetActive(false); - } + } /// /// Setting NPC in front of desk as current diff --git a/SSLR/Assets/Scripts/NPCMovementRework.cs b/SSLR/Assets/Scripts/NPCMovementRework.cs index 20da672..45f5e99 100644 --- a/SSLR/Assets/Scripts/NPCMovementRework.cs +++ b/SSLR/Assets/Scripts/NPCMovementRework.cs @@ -80,7 +80,7 @@ public class NpcMovementRework : MonoBehaviour GameManager.instance.SetCurrentNPC(this.gameObject); npcSpeechBubble.SetActive(true); - GameManager.instance.playerDialogue.SetActive(true); + PlayerDialogueInteraction.instance.playerDialogue.SetActive(true); yield return new WaitUntil(() => npcData != null); @@ -148,14 +148,10 @@ public class NpcMovementRework : MonoBehaviour npcWelcomeText.text = "Hello"; initialStatementText.text = npcData.initialStatement; - GameManager.instance.playerQuestionOneText.text = npcData.question1; - GameManager.instance.playerQuestionTwoText.text = npcData.question2; - GameManager.instance.playerQuestionThreeText.text = npcData.question3; - npcAnswerOneText.text = npcData.answer1; npcAnswerTwoText.text = npcData.answer2; npcAnswerThreeText.text = npcData.answer3; - - GameManager.instance.playerResponse.text = npcData.response3; + + PlayerDialogueInteraction.instance.SetPlayerQuestions(npcData.question1, npcData.question2, npcData.question3); } } \ No newline at end of file diff --git a/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs b/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs index 39e9571..6a6f9d4 100644 --- a/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs +++ b/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs @@ -7,33 +7,127 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; public class PlayerDialogueInteraction : MonoBehaviour { - [Header("Checklist Ticks")] + public static PlayerDialogueInteraction instance; + + /// + /// References for player-npc dialogue + /// + [Header("Player UI")] + public GameObject playerDialogue; + public GameObject welcomeButton; + public GameObject questionPanel; + public GameObject responsePanel; + + public TextMeshProUGUI playerQuestionOneText; + public TextMeshProUGUI playerQuestionTwoText; + public TextMeshProUGUI playerQuestionThreeText; + public TextMeshProUGUI playerResponseText; + + private bool question1Asked = false; + private bool question2Asked = false; + private bool question3Asked = false; + + [Header("Checklist UI")] public GameObject welcomeTick; public GameObject situationTick; + public GameObject serviceTick; public GameObject takeDocumentsTick; - public GameObject servicesTick; public GameObject giveDocumentsTick; - /// - /// Resets checklist when npc is finished - /// - public void ResetChecklist() + void Awake() { - welcomeTick.SetActive(false); - situationTick.SetActive(false); - takeDocumentsTick.SetActive(false); - servicesTick.SetActive(false); - giveDocumentsTick.SetActive(false); + if (instance == null) + { + instance = this; + } + else + { + Destroy(gameObject); + } + + ResetDialogue(); + ResetChecklist(); } public void ResetDialogue() { - GameManager.instance.playerDialogue.SetActive(false); + playerDialogue.SetActive(false); + questionPanel.SetActive(false); + responsePanel.SetActive(false); + + welcomeButton.SetActive(true); + + question1Asked = false; + question2Asked = false; + question3Asked = false; + } + + public void ResetChecklist() + { + welcomeTick.SetActive(false); + situationTick.SetActive(false); + serviceTick.SetActive(false); + giveDocumentsTick.SetActive(false); + takeDocumentsTick.SetActive(false); + } + + public void SetPlayerQuestions(string q1, string q2, string q3) + { + playerQuestionOneText.text = q1; + playerQuestionTwoText.text = q2; + playerQuestionThreeText.text = q3; + } + + public void WelcomePressed() + { + questionPanel.SetActive(true); + welcomeButton.SetActive(false); + welcomeTick.SetActive(true); + + GameManager.instance.currentNPC.GetComponent().npcWelcomeText.gameObject.SetActive(false); + GameManager.instance.currentNPC.GetComponent().initialStatementText.gameObject.SetActive(true); + } + + public void OnQuestionSelected(int questionIndex) + { + if (questionIndex == 1) + { + GameManager.instance.currentNPC.GetComponent().npcAnswerOneText.gameObject.SetActive(true); + GameManager.instance.currentNPC.GetComponent().npcAnswerTwoText.gameObject.SetActive(false); + GameManager.instance.currentNPC.GetComponent().npcAnswerThreeText.gameObject.SetActive(false); + + question1Asked = true; + } + else if (questionIndex == 2) + { + GameManager.instance.currentNPC.GetComponent().npcAnswerOneText.gameObject.SetActive(false); + GameManager.instance.currentNPC.GetComponent().npcAnswerTwoText.gameObject.SetActive(true); + GameManager.instance.currentNPC.GetComponent().npcAnswerThreeText.gameObject.SetActive(false); + + question2Asked = true; + } + else if (questionIndex == 3) + { + GameManager.instance.currentNPC.GetComponent().npcAnswerOneText.gameObject.SetActive(false); + GameManager.instance.currentNPC.GetComponent().npcAnswerTwoText.gameObject.SetActive(false); + GameManager.instance.currentNPC.GetComponent().npcAnswerThreeText.gameObject.SetActive(true); + + question3Asked = true; + } + + CheckAllQuestionsAsked(); + } + + void CheckAllQuestionsAsked() + { + if (question1Asked && question2Asked && question3Asked) + { + situationTick.SetActive(true); + } } - - }