mark/wirm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

game: sorry guys i taking so long

Browse source
This commit is contained in:
rezazfn 2025-02-11 16:35:16 +08:00
parent e0a5f93752
commit b22d01792d
5 changed files with 98 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
Game/Assets/Scenes/House.unity
View file

@ -9358,6 +9358,51 @@ Mesh:
offset: 0
size: 0
path:
--- !u!1 &146568760
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 146568762}
- component: {fileID: 146568761}
m_Layer: 0
m_Name: StorylineManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &146568761
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 146568760}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b46ba12a5ba4d8d46852e7051b32010e, type: 3}
m_Name:
m_EditorClassIdentifier:
storyText: {fileID: 1214791149}
--- !u!4 &146568762
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 146568760}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 76.28422, y: 20.929104, z: 1067.3794}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &148744220
GameObject:
m_ObjectHideFlags: 0
@ -87650,17 +87695,29 @@ PrefabInstance:
propertyPath: brushingSound
value:
objectReference: {fileID: 8300000, guid: 9cf02b0277ad0324389ae25a9fefe8ba, type: 3}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalScale.x
value: 0.25107583
objectReference: {fileID: 0}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalScale.y
value: 0.3045724
objectReference: {fileID: 0}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalScale.z
value: 0.3045724
objectReference: {fileID: 0}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalPosition.x
value: -0.184021
value: -0.27845782
objectReference: {fileID: 0}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalPosition.y
value: -0.16044998
value: -0.082519144
objectReference: {fileID: 0}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalPosition.z
value: 0.31433105
value: 0.37292
objectReference: {fileID: 0}
- target: {fileID: 3017716152663212623, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3}
propertyPath: m_LocalRotation.w
@ -93577,7 +93634,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5354983387486670972, guid: f613a0df25f051f47b193948df92dc54, type: 3}
propertyPath: m_LocalPosition.y
value: -0.78404236
value: -0.67499924
objectReference: {fileID: 0}
- target: {fileID: 5354983387486670972, guid: f613a0df25f051f47b193948df92dc54, type: 3}
propertyPath: m_LocalPosition.z
@ -146757,17 +146814,29 @@ PrefabInstance:
propertyPath: m_Mesh
value:
objectReference: {fileID: 387999044}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalScale.x
value: 1.3188087
objectReference: {fileID: 0}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalScale.y
value: 1.3188087
objectReference: {fileID: 0}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalScale.z
value: 0.98539644
objectReference: {fileID: 0}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalPosition.x
value: 1.45
value: 1.452
objectReference: {fileID: 0}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalPosition.y
value: -1.6067562
value: -1.533
objectReference: {fileID: 0}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalPosition.z
value: 0.55
value: 0.4781
objectReference: {fileID: 0}
- target: {fileID: 8101131182664332959, guid: f08520c74595f984ca1507db4e8aaa41, type: 3}
propertyPath: m_LocalRotation.w
@ -148731,17 +148800,29 @@ PrefabInstance:
propertyPath: m_Mesh
value:
objectReference: {fileID: 173538277}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalScale.x
value: 1.1923051
objectReference: {fileID: 0}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalScale.y
value: 1.1923051
objectReference: {fileID: 0}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalScale.z
value: 1.1923051
objectReference: {fileID: 0}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalPosition.x
value: 1.2070619
value: 1.1625022
objectReference: {fileID: 0}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalPosition.y
value: -1.1291008
value: -0.9634992
objectReference: {fileID: 0}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalPosition.z
value: 0.95640683
value: 0.96275
objectReference: {fileID: 0}
- target: {fileID: 2809847234280436330, guid: fcdb0711d946d6e42800b822f96dd67e, type: 3}
propertyPath: m_LocalRotation.w
@ -151365,7 +151446,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5354983387486670972, guid: f613a0df25f051f47b193948df92dc54, type: 3}
propertyPath: m_LocalPosition.y
value: -0.78404236
value: -0.675
objectReference: {fileID: 0}
- target: {fileID: 5354983387486670972, guid: f613a0df25f051f47b193948df92dc54, type: 3}
propertyPath: m_LocalPosition.z
@ -152827,3 +152908,4 @@ SceneRoots:
- {fileID: 745726886}
- {fileID: 2031915432}
- {fileID: 1312419882}
- {fileID: 146568762}

3
Game/Assets/Scripts/BedroomTask.cs
View file

@ -16,7 +16,6 @@ public class BedroomTask : MonoBehaviour
{
private GameManager gameManager;
private PostProcessingManager postProcessingManager;
private StorylineManager storylineManager;
[Header("Task Requirement Values")]
// To track how much trash has been collected so far
@ -229,7 +228,7 @@ public class BedroomTask : MonoBehaviour
// Unlocks the door after the clips and update the story
UnlockDoor();
storylineManager.EnqueueMessage("They finally left... just as soon as I finished cleaning. I can leave the room now.", 7f);
storyText.text = "They finally left... just as soon as I finished cleaning. I can leave the room now.";
StartCoroutine(ClearMessageAfterSeconds(7f));
}

5
Game/Assets/Scripts/BroomSweeping.cs
View file

@ -13,7 +13,6 @@ public class BroomSweeping : MonoBehaviour
{
private GameManager gameManager;
private PostProcessingManager postProcessingManager;
private StorylineManager storylineManager;
// To track how much trash has been collected so far
public int dirtSweeped = 0;
@ -42,7 +41,9 @@ public class BroomSweeping : MonoBehaviour
GameManager.Instance.FloorSweepedTaskComplete();
storyPanelUI.SetActive(true);
storylineManager.EnqueueMessage("I hope the house is clean enough now so I don't get scolded later...", 7f)
storyText.text = "I hope the house is clean enough now so I don't get scolded later...";
StartCoroutine(ClearMessageAfterSeconds(7f));
}
}

1
Game/Assets/Scripts/BrushTeeth.cs
View file

@ -16,7 +16,6 @@ using TMPro;
public class BrushTeeth : MonoBehaviour
{
private GameManager gameManager;
private StorylineManager storylineManager;
public Slider progressBar; // Reference to the Slider (progress bar)
public float progressTime = 5f; // Time for the progress bar to complete

6
Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json
View file

@ -9,7 +9,7 @@
{
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.lastMeshSelectMode",
"value": "{\"m_Value\":2}"
"value": "{\"m_Value\":8}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
@ -184,11 +184,7 @@
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize",
<<<<<<< Updated upstream
"value": "{\"m_Value\":{\"x\":0.248779296875,\"y\":-0.09796714782714844,\"z\":0.2877197265625}}"
=======
"value": "{\"m_Value\":{\"x\":-0.4071826934814453,\"y\":0.2012939453125,\"z\":-0.5807037353515625}}"
>>>>>>> Stashed changes
},
{
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",