diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000000000000000000000000000000000..ddb6ff85a307649b2e4b11175a6b4fa3ac3b20f9
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+ "recommendations": [
+ "visualstudiotoolsforunity.vstuc"
+ ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000000000000000000000000000000000..da60e25ae2b5a8148bbe8f2c810b85bd395e8f59
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,10 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Attach to Unity",
+ "type": "vstuc",
+ "request": "attach"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..8c3b1c66c5da82944e0b41c2bb3b7562174fad05
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,55 @@
+{
+ "files.exclude": {
+ "**/.DS_Store": true,
+ "**/.git": true,
+ "**/.gitmodules": true,
+ "**/*.booproj": true,
+ "**/*.pidb": true,
+ "**/*.suo": true,
+ "**/*.user": true,
+ "**/*.userprefs": true,
+ "**/*.unityproj": true,
+ "**/*.dll": true,
+ "**/*.exe": true,
+ "**/*.pdf": true,
+ "**/*.mid": true,
+ "**/*.midi": true,
+ "**/*.wav": true,
+ "**/*.gif": true,
+ "**/*.ico": true,
+ "**/*.jpg": true,
+ "**/*.jpeg": true,
+ "**/*.png": true,
+ "**/*.psd": true,
+ "**/*.tga": true,
+ "**/*.tif": true,
+ "**/*.tiff": true,
+ "**/*.3ds": true,
+ "**/*.3DS": true,
+ "**/*.fbx": true,
+ "**/*.FBX": true,
+ "**/*.lxo": true,
+ "**/*.LXO": true,
+ "**/*.ma": true,
+ "**/*.MA": true,
+ "**/*.obj": true,
+ "**/*.OBJ": true,
+ "**/*.asset": true,
+ "**/*.cubemap": true,
+ "**/*.flare": true,
+ "**/*.mat": true,
+ "**/*.meta": true,
+ "**/*.prefab": true,
+ "**/*.unity": true,
+ "build/": true,
+ "Build/": true,
+ "Library/": true,
+ "library/": true,
+ "obj/": true,
+ "Obj/": true,
+ "ProjectSettings/": true,
+ "temp/": true,
+ "Temp/": true
+ },
+ "dotnet.defaultSolution": "if3210-2024-unity-son.sln"
+}
\ No newline at end of file
diff --git a/Assets/FollowPlayer.cs b/Assets/FollowPlayer.cs
new file mode 100644
index 0000000000000000000000000000000000000000..13074c394de7917159d69b4df8e3d6b6af40a875
--- /dev/null
+++ b/Assets/FollowPlayer.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AI;
+
+public class FollowPlayer : MonoBehaviour
+{
+ public Transform target;
+ NavMeshAgent nav;
+ // Start is called before the first frame update
+ void Start()
+ {
+ nav = GetComponent<NavMeshAgent>();
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ nav.SetDestination(target.position);
+ }
+}
diff --git a/Assets/FollowPlayer.cs.meta b/Assets/FollowPlayer.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4df4e13986bc566d25fae505fc538a8f6024a57a
--- /dev/null
+++ b/Assets/FollowPlayer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6569ccc570d7b194c88b6e42863593da
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Pet.meta b/Assets/Models/Pet.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2bc9fe8c910d788f0480c7bcb6a261f67cb9d906
--- /dev/null
+++ b/Assets/Models/Pet.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b8115113d961144395d482a23e91b53
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Pet/Cinnamoroll_low.fbx b/Assets/Models/Pet/Cinnamoroll_low.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..390421f1fd3ab39273516929785f9f52c69c5bb7
Binary files /dev/null and b/Assets/Models/Pet/Cinnamoroll_low.fbx differ
diff --git a/Assets/Models/Pet/Cinnamoroll_low.fbx.meta b/Assets/Models/Pet/Cinnamoroll_low.fbx.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ab2c1594ff68c37eae93e2c8ecf28bd87c47a836
--- /dev/null
+++ b/Assets/Models/Pet/Cinnamoroll_low.fbx.meta
@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 11f74985abe6ccd4ab9572c250aa3635
+ModelImporter:
+ serializedVersion: 22200
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 0
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 1
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importPhysicalCameras: 1
+ importVisibility: 1
+ importBlendShapes: 1
+ importCameras: 1
+ importLights: 1
+ nodeNameCollisionStrategy: 1
+ fileIdsGeneration: 2
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ keepQuads: 0
+ weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ optimizeBones: 1
+ meshOptimizationFlags: -1
+ indexFormat: 0
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 1
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ strictVertexDataChecks: 0
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 4
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
+ importAnimation: 1
+ humanDescription:
+ serializedVersion: 3
+ human: []
+ skeleton: []
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ globalScale: 1
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 1
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
+ animationType: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ importBlendShapeDeformPercent: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Pet/Starmie.fbx b/Assets/Models/Pet/Starmie.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..0872ef2f64d4d8b5327098550df04d1428345c8f
Binary files /dev/null and b/Assets/Models/Pet/Starmie.fbx differ
diff --git a/Assets/Models/Pet/Starmie.fbx.meta b/Assets/Models/Pet/Starmie.fbx.meta
new file mode 100644
index 0000000000000000000000000000000000000000..02446c43cf6ece2876722f5363e92863bbedf3ec
--- /dev/null
+++ b/Assets/Models/Pet/Starmie.fbx.meta
@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: a7df5177a5a5d194399ba69cf4d03f94
+ModelImporter:
+ serializedVersion: 22200
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 0
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 1
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importPhysicalCameras: 1
+ importVisibility: 1
+ importBlendShapes: 1
+ importCameras: 1
+ importLights: 1
+ nodeNameCollisionStrategy: 1
+ fileIdsGeneration: 2
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ keepQuads: 0
+ weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ optimizeBones: 1
+ meshOptimizationFlags: -1
+ indexFormat: 0
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 1
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ strictVertexDataChecks: 0
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 4
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
+ importAnimation: 1
+ humanDescription:
+ serializedVersion: 3
+ human: []
+ skeleton: []
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ globalScale: 1
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 1
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
+ animationType: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ importBlendShapeDeformPercent: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Cutscene01/Timeline.prefab b/Assets/Scenes/Cutscene01/Timeline.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..ad28f885256b0c9a1ccc2612ed10ae7ca21613f4
--- /dev/null
+++ b/Assets/Scenes/Cutscene01/Timeline.prefab
@@ -0,0 +1,51 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5187789860036990128
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4130361173433057444}
+ - component: {fileID: 4223443287167445501}
+ m_Layer: 0
+ m_Name: Timeline
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4130361173433057444
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5187789860036990128}
+ serializedVersion: 2
+ 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: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!320 &4223443287167445501
+PlayableDirector:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5187789860036990128}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_PlayableAsset: {fileID: 11400000, guid: f1f98b99854059e43ba00ac48341196d, type: 2}
+ m_InitialState: 1
+ m_WrapMode: 2
+ m_DirectorUpdateMode: 1
+ m_InitialTime: 0
+ m_SceneBindings: []
+ m_ExposedReferences:
+ m_References: []
diff --git a/Assets/Scenes/Cutscene01/Timeline.prefab.meta b/Assets/Scenes/Cutscene01/Timeline.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fb638aef397ea88fa91afe0e83192324eb41bd4e
--- /dev/null
+++ b/Assets/Scenes/Cutscene01/Timeline.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9418290a0bf15d840a89abe260c7d378
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index 9134de5718c22e2f8de754048c9deb0b024c53d3..952c212aa01e1a3098ba734b88cc9904edfd955a 100644
--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -138,7 +138,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8301220
Transform:
@@ -228,7 +228,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &23611506
Transform:
@@ -281,7 +281,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &33603859
Transform:
@@ -637,7 +637,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &85931479
Transform:
@@ -1193,7 +1193,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 3
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &179260348
Transform:
@@ -1738,7 +1738,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &221163884
Transform:
@@ -1925,7 +1925,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &230531971
Transform:
@@ -1978,7 +1978,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &233776680
Transform:
@@ -2318,7 +2318,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &320585867
Transform:
@@ -3133,7 +3133,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &395807659
Transform:
@@ -3223,7 +3223,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &403409533
Transform:
@@ -3373,7 +3373,15 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
+<<<<<<< HEAD
m_AnchoredPosition: {x: 0, y: -1537536}
+=======
+<<<<<<< HEAD
+ m_AnchoredPosition: {x: 0, y: -299008}
+=======
+ m_AnchoredPosition: {x: 0, y: -1525564}
+>>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
+>>>>>>> 08137840c4c4d43995d45db099c536b9c471fc1d
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &435589487
@@ -3510,7 +3518,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &466807435
Transform:
@@ -3987,7 +3995,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &521434604
Transform:
@@ -4121,7 +4129,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &543183296
Transform:
@@ -4268,7 +4276,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &561969061
Transform:
@@ -4666,7 +4674,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &583587551
Transform:
@@ -4778,7 +4786,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &593653909
Transform:
@@ -4884,7 +4892,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &610195627
Transform:
@@ -4937,7 +4945,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &625150003
Transform:
@@ -5318,7 +5326,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &682336871
Transform:
@@ -5448,7 +5456,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &693521448
Transform:
@@ -5576,7 +5584,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &703827269
Transform:
@@ -6732,7 +6740,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &818136669
Transform:
@@ -6786,7 +6794,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &837799652
Transform:
@@ -7398,7 +7406,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &943920583
Transform:
@@ -8300,7 +8308,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1039700113
Transform:
@@ -8515,7 +8523,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1071234795
Transform:
@@ -8774,7 +8782,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1114460012
Transform:
@@ -8961,7 +8969,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1125536030
Transform:
@@ -9630,7 +9638,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1212966711
Transform:
@@ -10004,7 +10012,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1265858857
Transform:
@@ -10209,7 +10217,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1297588072
Transform:
@@ -10329,7 +10337,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1358361851
Transform:
@@ -10440,7 +10448,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 3
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1368760591
Transform:
@@ -10638,7 +10646,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1375507108
Transform:
@@ -10825,7 +10833,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1393175493
Transform:
@@ -11232,7 +11240,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1470087878
Transform:
@@ -11605,7 +11613,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1534050576
Transform:
@@ -11691,7 +11699,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1557367704
Transform:
@@ -11913,7 +11921,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1570746569
Transform:
@@ -11966,7 +11974,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1576606531
Transform:
@@ -12004,6 +12012,77 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.7346778, y: 1.3247411, z: 3.543157}
m_Center: {x: 0.2625594, y: 0.57711565, z: -0.97821546}
+<<<<<<< HEAD
+--- !u!1001 &1589767388
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_Name
+ value: Hellephant
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.9549279
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00000023841858
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.4052334
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1589767391}
+ - targetCorrespondingSourceObject: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1589767390}
+ m_SourcePrefab: {fileID: 100100000, guid: b77f122f451a2394898a24191c26107c, type: 3}
+--- !u!1 &1589767389 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
+ m_PrefabInstance: {fileID: 1589767388}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1589767390
+=======
--- !u!1 &1589103964
GameObject:
m_ObjectHideFlags: 0
@@ -12042,11 +12121,22 @@ RectTransform:
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1589103966
+>>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+ m_GameObject: {fileID: 1589767389}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6569ccc570d7b194c88b6e42863593da, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!195 &1589767391
+NavMeshAgent:
+=======
m_GameObject: {fileID: 1589103964}
m_Enabled: 1
m_EditorHideFlags: 0
@@ -12132,12 +12222,32 @@ MonoBehaviour:
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1589103967
CanvasRenderer:
+>>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+ m_GameObject: {fileID: 1589767389}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 1.44
+ m_Speed: 3.5
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 120
+ m_StoppingDistance: 0
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 2
+ m_BaseOffset: 0.94
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+=======
m_GameObject: {fileID: 1589103964}
m_CullTransparentMesh: 1
+>>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
--- !u!1 &1591569080
GameObject:
m_ObjectHideFlags: 0
@@ -12384,7 +12494,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1605324595
Transform:
@@ -13106,7 +13216,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1724547737
Transform:
@@ -13431,7 +13541,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1754613884
Transform:
@@ -13884,7 +13994,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1762411324
Transform:
@@ -13968,7 +14078,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1792627269
Transform:
@@ -14023,7 +14133,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1805142385
Transform:
@@ -14242,7 +14352,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1836036864
Transform:
@@ -14527,7 +14637,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1879170045
Transform:
@@ -14632,7 +14742,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1882290308
Transform:
@@ -14817,7 +14927,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1906343028
Transform:
@@ -14937,7 +15047,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1941167243
Transform:
@@ -14991,7 +15101,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1965662092
Transform:
@@ -15163,7 +15273,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1978917667
Transform:
@@ -15668,7 +15778,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &2068631235
GameObject:
@@ -16014,7 +16124,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 4294967295
+ m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2135469468
Transform:
@@ -16198,6 +16308,10 @@ SceneRoots:
- {fileID: 1871034396}
- {fileID: 944601035}
- {fileID: 983902636}
+<<<<<<< HEAD
+ - {fileID: 1589767388}
+=======
- {fileID: 706766591}
- {fileID: 307935225}
- {fileID: 840882477}
+>>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
diff --git a/Assets/Scripts/Pet.meta b/Assets/Scripts/Pet.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d061ec00eb591bff905aa3302e35938e97bafe65
--- /dev/null
+++ b/Assets/Scripts/Pet.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9fd9f81ca0f8c994888bf566249dc236
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: