lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix school dialog option

Browse Source
This commit is contained in:
Vova
2023-12-18 22:55:58 +02:00
parent d9b84788e1
commit 22149e24c8
5 changed files with 210 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/City.unity
+164
View File
@@ -1823,6 +1823,37 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &295257493
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 295257494}
m_Layer: 6
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &295257494
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 295257493}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0.022, z: -0.492}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1235608283}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1 &311736547 --- !u!1 &311736547
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5955,6 +5986,53 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1198886760} m_GameObject: {fileID: 1198886760}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1235608278 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
m_PrefabInstance: {fileID: 2144684259}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1235608279
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235608278}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.02, y: 0.019999998, z: 0.23793408}
m_Center: {x: 0, y: 3.7858092e-10, z: -0.108967036}
--- !u!114 &1235608280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235608278}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05e7f5c95d24c174ba832e4264e9d224, type: 3}
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 295257494}
_dialogSO: {fileID: 11400000, guid: 40d509fd76291394285fd38512792c46, type: 2}
--- !u!4 &1235608283 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
m_PrefabInstance: {fileID: 2144684259}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1278044913 --- !u!1 &1278044913
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -8744,6 +8822,91 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2134327492} m_GameObject: {fileID: 2134327492}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &2144684259
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalPosition.x
value: 146.513
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalPosition.y
value: 7.403
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalPosition.z
value: 239.346
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.70710677
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.00012290479
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.00012394787
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -89.98
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 990
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_Name
value: desk (1)
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
insertIndex: -1
addedObject: {fileID: 295257494}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
insertIndex: -1
addedObject: {fileID: 1235608280}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
insertIndex: -1
addedObject: {fileID: 1235608279}
m_SourcePrefab: {fileID: 100100000, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3}
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -8758,3 +8921,4 @@ SceneRoots:
- {fileID: 495189437} - {fileID: 495189437}
- {fileID: 1291994925} - {fileID: 1291994925}
- {fileID: 764085430} - {fileID: 764085430}
- {fileID: 2144684259}
Assets/Scenes/School.unity
+31 -2
View File
@@ -532,6 +532,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: desk (1) value: desk (1)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: m_AddedGameObjects:
@@ -544,6 +549,10 @@ PrefabInstance:
type: 3} type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 202296547} addedObject: {fileID: 202296547}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9bd342097a69da64daea3e6f3814ad3e,
type: 3}
insertIndex: -1
addedObject: {fileID: 202296548}
m_SourcePrefab: {fileID: 100100000, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9bd342097a69da64daea3e6f3814ad3e, type: 3}
--- !u!1 &202296545 stripped --- !u!1 &202296545 stripped
GameObject: GameObject:
@@ -571,7 +580,27 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_interactionPoint: {fileID: 1086470460} _interactionPoint: {fileID: 1086470460}
_dialogSO: {fileID: 11400000, guid: 40d509fd76291394285fd38512792c46, type: 2} _dialogSO: {fileID: 11400000, guid: 40d509fd76291394285fd38512792c46, type: 2}
_dialogOptionsSO: {fileID: 0} --- !u!65 &202296548
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 202296545}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.02, y: 0.019999998, z: 0.23793408}
m_Center: {x: 0, y: 3.7858092e-10, z: -0.108967036}
--- !u!1001 &385599245 --- !u!1001 &385599245
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2303,7 +2332,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1086470460} - component: {fileID: 1086470460}
m_Layer: 0 m_Layer: 6
m_Name: GameObject m_Name: GameObject
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
Assets/Scripts/ScriptableObjects/DialogOptions/School/HighSchool.asset
+2 -1
View File
@@ -14,4 +14,5 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Title: Hight School Title: Hight School
Icon: {fileID: 21300000, guid: aef64b4574ccbc74897f2d9cd98cdf12, type: 3} Icon: {fileID: 21300000, guid: aef64b4574ccbc74897f2d9cd98cdf12, type: 3}
OptionsList: [] OptionsList:
- {fileID: 11400000, guid: b2f41f944cd1f3f4f82130491c97d5da, type: 2}
Assets/Scripts/UIElements/EducationItemUI.cs
+7 -7
View File
@@ -31,16 +31,16 @@ public class EducationItemUI : MonoBehaviour, IDialogItemUI ,IPointerEnterHandl
_price.text = $"{_item.EnrollPrice}$"; _price.text = $"{_item.EnrollPrice}$";
_icon.sprite = item.Icon; _icon.sprite = item.Icon;
_button.enabled = true; _button.enabled = true;
_button.onClick.AddListener(() => {
if (_button.enabled)
{
_parent.OnItemSelected(this);
}
});
} }
public void Click()
{
if (_button.enabled)
{
_parent.OnItemSelected(this);
}
}
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData)
{ {
Assets/Scripts/UIElements/JobItemUITemplate.cs
+6 -10
View File
@@ -28,17 +28,13 @@ public class JobItemUITemplate : MonoBehaviour, IDialogItemUI ,IPointerEnterHan
_sallary.text = $"{_item.Salary}$"; _sallary.text = $"{_item.Salary}$";
_icon.sprite = item.Icon; _icon.sprite = item.Icon;
_button.enabled = Player.Instance.Education>= _item.MinimumEducationSkill; _button.enabled = Player.Instance.Education>= _item.MinimumEducationSkill;
_button.onClick.AddListener(() => {
if (_button.enabled)
{
_parent.OnItemSelected(this);
}
});
} }
public void Click()
{
if (_button.enabled)
{
_parent.OnItemSelected(this);
}
}
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData)
{ {
if (!_button.enabled) { print("Not enough education"); } if (!_button.enabled) { print("Not enough education"); }