university add courses for basic school

This commit is contained in:
2024-05-23 22:18:20 +03:00
parent 02f5da669f
commit 83917edcc6
14 changed files with 374 additions and 112 deletions
@@ -41,10 +41,10 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6206602907352978179} - component: {fileID: 6206602907352978179}
- component: {fileID: 551020291880888998} - component: {fileID: 551020291880888998}
- component: {fileID: 9021321387954163439}
- component: {fileID: 8564375915706749027} - component: {fileID: 8564375915706749027}
- component: {fileID: 3089612110179737376}
m_Layer: 6 m_Layer: 6
m_Name: Door 1 m_Name: Door
m_TagString: Respawn m_TagString: Respawn
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@@ -83,19 +83,6 @@ MonoBehaviour:
_scene: City _scene: City
_spawnPointInSceneName: _spawnPointInSceneName:
_exitName: Door _exitName: Door
--- !u!114 &9021321387954163439
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8076283811992641635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58e5a6d4728f393419100a54758a4e62, type: 3}
m_Name:
m_EditorClassIdentifier:
color: {r: 147, g: 142, b: 142, a: 1}
--- !u!65 &8564375915706749027 --- !u!65 &8564375915706749027
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -115,8 +102,21 @@ BoxCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 1, y: 2.5, z: 0.21} m_Size: {x: 1, y: 2.5, z: 0.26052928}
m_Center: {x: 0, y: -0.21, z: 0.26} m_Center: {x: 0, y: -0.21000004, z: 0.0048371553}
--- !u!114 &3089612110179737376
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8076283811992641635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58e5a6d4728f393419100a54758a4e62, type: 3}
m_Name:
m_EditorClassIdentifier:
color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &5498373112918124621 --- !u!1001 &5498373112918124621
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
+10 -10
View File
@@ -657,8 +657,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 6.2596, y: 0}
m_SizeDelta: {x: 0, y: 0.0000038146973} m_SizeDelta: {x: 282.3803, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7013805289888593169 --- !u!222 &7013805289888593169
CanvasRenderer: CanvasRenderer:
@@ -846,17 +846,17 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 30.98
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -871,7 +871,7 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -18.41
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1186,17 +1186,17 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 74.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1211,7 +1211,7 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -18.41
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
+280 -59
View File
@@ -31,7 +31,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 6648371948412499500} - {fileID: 6648371948412499500}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@@ -52,6 +51,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_title: {fileID: 560729084887753269} _title: {fileID: 560729084887753269}
_description: {fileID: 24535701213815296} _description: {fileID: 24535701213815296}
_timeText: {fileID: 8964904394040295682}
_btnCancel: {fileID: 7013805291510916669} _btnCancel: {fileID: 7013805291510916669}
_btnOk: {fileID: 8583321522316129160} _btnOk: {fileID: 8583321522316129160}
_slider: {fileID: 9037883202313765211} _slider: {fileID: 9037883202313765211}
@@ -87,12 +87,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2425753779336024065} m_Father: {fileID: 2425753779336024065}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.515, y: 0} m_AnchoredPosition: {x: 136.515, y: -25.42825}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 233.03, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8491863560958911165 --- !u!222 &8491863560958911165
CanvasRenderer: CanvasRenderer:
@@ -165,15 +164,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 1 m_isOrthographic: 1
m_isCullingEnabled: 0 m_isCullingEnabled: 0
@@ -235,7 +236,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1262496910311591056} - {fileID: 1262496910311591056}
m_Father: {fileID: 4420034352028103760} m_Father: {fileID: 4420034352028103760}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@@ -273,7 +273,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 7603384751293631954} m_Father: {fileID: 7603384751293631954}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@@ -349,7 +348,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4420034352028103760} m_Father: {fileID: 4420034352028103760}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25} m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75} m_AnchorMax: {x: 1, y: 0.75}
@@ -425,7 +423,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2699753101015367018} m_Father: {fileID: 2699753101015367018}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@@ -504,11 +501,10 @@ RectTransform:
m_Children: m_Children:
- {fileID: 4008705464510672580} - {fileID: 4008705464510672580}
m_Father: {fileID: 6648371948412499500} m_Father: {fileID: 6648371948412499500}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.1939, y: 0} m_AnchoredPosition: {x: 154.1939, y: -20}
m_SizeDelta: {x: 308.3878, y: 40} m_SizeDelta: {x: 308.3878, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5677520149483722787 --- !u!114 &5677520149483722787
@@ -621,12 +617,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 9160857369077829901} m_Father: {fileID: 9160857369077829901}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 42.16, y: 0} m_AnchoredPosition: {x: 42.16, y: -20}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 44.32, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3221867121941074007 --- !u!222 &3221867121941074007
CanvasRenderer: CanvasRenderer:
@@ -699,15 +694,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 1 m_isOrthographic: 1
m_isCullingEnabled: 0 m_isCullingEnabled: 0
@@ -770,20 +767,20 @@ RectTransform:
m_GameObject: {fileID: 5218368191141696415} m_GameObject: {fileID: 5218368191141696415}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 9160857369077829901} - {fileID: 9160857369077829901}
- {fileID: 2425753779336024065} - {fileID: 2425753779336024065}
- {fileID: 4336120826843412153}
- {fileID: 3731607605728727607} - {fileID: 3731607605728727607}
- {fileID: 6625822166793868106} - {fileID: 6625822166793868106}
m_Father: {fileID: 8958716429631575486} m_Father: {fileID: 8958716429631575486}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -12.505005}
m_SizeDelta: {x: 0, y: 230} m_SizeDelta: {x: 0, y: 246.6733}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1664532225261082893 --- !u!222 &1664532225261082893
CanvasRenderer: CanvasRenderer:
@@ -926,11 +923,10 @@ RectTransform:
- {fileID: 7013805291510916670} - {fileID: 7013805291510916670}
- {fileID: 8583321522316129163} - {fileID: 8583321522316129163}
m_Father: {fileID: 6648371948412499500} m_Father: {fileID: 6648371948412499500}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.1939, y: 0} m_AnchoredPosition: {x: 154.1939, y: -215.0994}
m_SizeDelta: {x: 308.3878, y: 50} m_SizeDelta: {x: 308.3878, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1843006956921425075 --- !u!114 &1843006956921425075
@@ -1005,11 +1001,10 @@ RectTransform:
m_Children: m_Children:
- {fileID: 4420034352028103760} - {fileID: 4420034352028103760}
m_Father: {fileID: 6648371948412499500} m_Father: {fileID: 6648371948412499500}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.1939, y: 0} m_AnchoredPosition: {x: 154.1939, y: -155.0994}
m_SizeDelta: {x: 308.3878, y: 70} m_SizeDelta: {x: 308.3878, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8585709775089406178 --- !u!114 &8585709775089406178
@@ -1086,11 +1081,10 @@ RectTransform:
- {fileID: 7603384751293631954} - {fileID: 7603384751293631954}
- {fileID: 2699753101015367018} - {fileID: 2699753101015367018}
m_Father: {fileID: 3731607605728727607} m_Father: {fileID: 3731607605728727607}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.1939, y: 0} m_AnchoredPosition: {x: 154.1939, y: -35}
m_SizeDelta: {x: 288.3878, y: 20} m_SizeDelta: {x: 288.3878, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9037883202313765211 --- !u!114 &9037883202313765211
@@ -1158,6 +1152,157 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalFit: 0 m_HorizontalFit: 0
m_VerticalFit: 0 m_VerticalFit: 0
--- !u!1 &7040246787655538537
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4174071985391046181}
- component: {fileID: 8804580449613874997}
- component: {fileID: 8964904394040295682}
- component: {fileID: 2877043470873319468}
m_Layer: 5
m_Name: TimeText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4174071985391046181
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7040246787655538537}
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: []
m_Father: {fileID: 4336120826843412153}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136.515, y: -14.62145}
m_SizeDelta: {x: 233.03, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8804580449613874997
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7040246787655538537}
m_CullTransparentMesh: 1
--- !u!114 &8964904394040295682
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7040246787655538537}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: some text will be here
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 36
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 3.21837, z: 0, w: 2.299994}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2877043470873319468
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7040246787655538537}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &7719555890808645937 --- !u!1 &7719555890808645937
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1188,7 +1333,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 4052679398454499807} - {fileID: 4052679398454499807}
m_Father: {fileID: 4420034352028103760} m_Father: {fileID: 4420034352028103760}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25} m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75} m_AnchorMax: {x: 1, y: 0.75}
@@ -1227,12 +1371,11 @@ RectTransform:
m_Children: m_Children:
- {fileID: 6941263978451190051} - {fileID: 6941263978451190051}
m_Father: {fileID: 6648371948412499500} m_Father: {fileID: 6648371948412499500}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.1939, y: 0} m_AnchoredPosition: {x: 154.1939, y: -65.42827}
m_SizeDelta: {x: 0, y: 70} m_SizeDelta: {x: 273.03, y: 50.8565}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6806840113668947922 --- !u!114 &6806840113668947922
MonoBehaviour: MonoBehaviour:
@@ -1274,6 +1417,84 @@ MonoBehaviour:
m_ChildScaleWidth: 0 m_ChildScaleWidth: 0
m_ChildScaleHeight: 0 m_ChildScaleHeight: 0
m_ReverseArrangement: 1 m_ReverseArrangement: 1
--- !u!1 &9009449899051804504
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4336120826843412153}
- component: {fileID: 5845155822554842268}
- component: {fileID: 3976806391231776118}
m_Layer: 5
m_Name: TimeBlock
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4336120826843412153
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9009449899051804504}
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: 4174071985391046181}
m_Father: {fileID: 6648371948412499500}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 154.1939, y: -105.47795}
m_SizeDelta: {x: 273.03, y: 29.2429}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5845155822554842268
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9009449899051804504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &3976806391231776118
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9009449899051804504}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 20
m_Right: 20
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 1
--- !u!1001 &4885670798789882735 --- !u!1001 &4885670798789882735
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1302,17 +1523,17 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 32.27
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1322,12 +1543,12 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 17.91 value: 21.135
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -18.965
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1387,7 +1608,7 @@ PrefabInstance:
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1397,7 +1618,7 @@ PrefabInstance:
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1467,7 +1688,7 @@ PrefabInstance:
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1637,17 +1858,17 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 77.91
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1657,12 +1878,12 @@ PrefabInstance:
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 36.165 value: 43.955
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703089782041, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -18.965
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516703338386376, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1722,7 +1943,7 @@ PrefabInstance:
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1732,7 +1953,7 @@ PrefabInstance:
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
@@ -1787,7 +2008,7 @@ PrefabInstance:
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910,
type: 3} type: 3}
+8 -9
View File
@@ -32,11 +32,10 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3806516703338386383} m_Father: {fileID: 3806516703338386383}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 21.18, y: 0} m_AnchoredPosition: {x: 25.22, y: -18.965}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3806516703089782043 --- !u!222 &3806516703089782043
@@ -94,8 +93,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 20 m_fontSize: 25
m_fontSizeBase: 20 m_fontSizeBase: 25
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
@@ -110,15 +109,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 1 m_isOrthographic: 1
m_isCullingEnabled: 0 m_isCullingEnabled: 0
@@ -185,7 +186,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 3806516703089782041} - {fileID: 3806516703089782041}
m_Father: {fileID: 3806516704876462308} m_Father: {fileID: 3806516704876462308}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
@@ -317,7 +317,6 @@ RectTransform:
m_Children: m_Children:
- {fileID: 3806516703338386383} - {fileID: 3806516703338386383}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
+14 -9
View File
@@ -884,7 +884,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06, - target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3} type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 251.46 value: 142.25093
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06, - target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3} type: 3}
@@ -899,7 +899,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06, - target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -2.5054 value: -3.5975
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06, - target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3} type: 3}
@@ -998,6 +998,11 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 3682155555161930313} m_TransformParent: {fileID: 3682155555161930313}
m_Modifications: m_Modifications:
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalScale.x
value: 159.17497
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524, - target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@@ -1011,7 +1016,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524, - target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.48 value: -0.6117
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524, - target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3} type: 3}
@@ -1275,12 +1280,12 @@ PrefabInstance:
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.35 value: 1.99
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: -0.7071068 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
@@ -1290,12 +1295,12 @@ PrefabInstance:
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0.7071068 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
@@ -1305,7 +1310,7 @@ PrefabInstance:
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 270 value: 180
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a, - target: {fileID: 168138393772344589, guid: 910e671451e1bf94e9bba00c3809c94a,
type: 3} type: 3}
@@ -3549,7 +3554,7 @@ Transform:
m_GameObject: {fileID: 1994430549} m_GameObject: {fileID: 1994430549}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.371, y: 1.05, z: -2.48} m_LocalPosition: {x: 0.371, y: 1.96, z: -2.48}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
+8 -3
View File
@@ -18,7 +18,7 @@ public class Player : BaseCharacter
private List<EducationInfoSO> _completedCourses = new(); private List<EducationInfoSO> _completedCourses = new();
public EducationInfoSO ActiveCourse { get; set; } public EducationInfoSO ActiveCourse { get; set; }
public EducationSkill Education { get; set; } public EducationSkill Education { get; set; }
private int _educationPoints = 0;
private ContainerItem _containerItem; private ContainerItem _containerItem;
private string _locationName; private string _locationName;
@@ -160,8 +160,13 @@ public class Player : BaseCharacter
ActiveCourse.PlayerProgress += time.Hours; ActiveCourse.PlayerProgress += time.Hours;
if (ActiveCourse.PlayerProgress >= ActiveCourse.Duration) if (ActiveCourse.PlayerProgress >= ActiveCourse.Duration)
{ {
Education++; _educationPoints++;
print($"Congratulation player finish curse {ActiveCourse.Description} and his education now {Education.ToString()}"); if(_educationPoints == 2)
{
Education++;
print($"Congratulation player finish {Education - 1} and his education now {Education}");
}
_completedCourses.Add(ActiveCourse);
ActiveCourse = null; ActiveCourse = null;
} }
} }
+1 -1
View File
@@ -15,7 +15,7 @@ public class Bed : BaseInteractableObject
private void OnAnimationFinished() private void OnAnimationFinished()
{ {
GameManager.Instance.UI.ShowTimeSliderDialog("Go to sleep", "Sleep until", OnCancel, OnConfirm); GameManager.Instance.UI.ShowTimeSliderDialog("Sleep", "Wake up in", OnCancel, OnConfirm);
} }
private void OnCancel() private void OnCancel()
{ {
@@ -1,6 +1,5 @@
using Assets.Scripts.Interfaces; using Assets.Scripts.Interfaces;
using System; using System;
using Unity.VisualScripting;
using UnityEngine; using UnityEngine;
public class SecretaryDesk : BaseInteractableObject public class SecretaryDesk : BaseInteractableObject
@@ -23,7 +22,7 @@ public class SecretaryDesk : BaseInteractableObject
GameManager.Instance.UI.ShowTabOptionsDialog(_dialogSO, null, OnConfirm); GameManager.Instance.UI.ShowTabOptionsDialog(_dialogSO, null, OnConfirm);
break; break;
case RadialMenuActions.Learn: case RadialMenuActions.Learn:
GameManager.Instance.UI.ShowTimeSliderDialog("Learn", "learn until", OnCancel, OnLearnConfirm); GameManager.Instance.UI.ShowTimeSliderDialog("Learn", $"learn {_player.ActiveCourse.name} in next", OnCancel, OnLearnConfirm);
break; break;
} }
} }
@@ -34,10 +33,12 @@ public class SecretaryDesk : BaseInteractableObject
GameManager.Instance.Time.OnFastForwardEnd += OnFastForwardEnd; GameManager.Instance.Time.OnFastForwardEnd += OnFastForwardEnd;
_player.Learn(time); _player.Learn(time);
} }
private void OnCancel() private void OnCancel()
{ {
OnFastForwardEnd(); OnFastForwardEnd();
} }
private void OnFastForwardEnd() private void OnFastForwardEnd()
{ {
_player.SetPlayerActing(PlayerStates.Awake); _player.SetPlayerActing(PlayerStates.Awake);
@@ -16,3 +16,4 @@ MonoBehaviour:
Icon: {fileID: 21300000, guid: aef64b4574ccbc74897f2d9cd98cdf12, type: 3} Icon: {fileID: 21300000, guid: aef64b4574ccbc74897f2d9cd98cdf12, type: 3}
OptionsList: OptionsList:
- {fileID: 11400000, guid: b2f41f944cd1f3f4f82130491c97d5da, type: 2} - {fileID: 11400000, guid: b2f41f944cd1f3f4f82130491c97d5da, type: 2}
- {fileID: 11400000, guid: e6b1a370027e47b4baf047386f663e02, type: 2}
@@ -0,0 +1,20 @@
%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: 3ba71c02cddb93d408c7c1b2f9846099, type: 3}
m_Name: Literarure
m_EditorClassIdentifier:
Icon: {fileID: 21300000, guid: 03db7f2d5bccf674c95ce74426db7fbb, type: 3}
Description: 'Literature '
Duration: 5
EnrollPrice: 10
Skill: 0
PlayerProgress: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b2f41f944cd1f3f4f82130491c97d5da
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b2f41f944cd1f3f4f82130491c97d5da guid: e6b1a370027e47b4baf047386f663e02
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000
+3 -1
View File
@@ -10,6 +10,8 @@ public class TimeSliderUI : MonoBehaviour
[SerializeField] [SerializeField]
private TextMeshProUGUI _description; private TextMeshProUGUI _description;
[SerializeField] [SerializeField]
private TextMeshProUGUI _timeText;
[SerializeField]
private Button _btnCancel; private Button _btnCancel;
[SerializeField] [SerializeField]
private Button _btnOk; private Button _btnOk;
@@ -55,7 +57,7 @@ public class TimeSliderUI : MonoBehaviour
if (gameObject.activeSelf) if (gameObject.activeSelf)
{ {
_time = TimeSpan.FromHours(time); _time = TimeSpan.FromHours(time);
_description.text = $"{_time.Hours} hours"; _timeText.text = $"{_time.Hours} hours";
} }
} }