diff --git a/Assets/Models/FootHillsTerrain1.asset b/Assets/Models/FootHillsTerrain1.asset index 36ae65a..2b2741f 100644 Binary files a/Assets/Models/FootHillsTerrain1.asset and b/Assets/Models/FootHillsTerrain1.asset differ diff --git a/Assets/Models/KR_Model_Cannon_v04_Vang.fbx b/Assets/Models/KR_Model_Cannon_v04_Vang.fbx deleted file mode 100644 index 3225d4a..0000000 Binary files a/Assets/Models/KR_Model_Cannon_v04_Vang.fbx and /dev/null differ diff --git a/Assets/Models/KR_Model_Cannon_v04_Vang.fbx.meta b/Assets/Models/KR_Model_Cannon_v04_Vang.fbx.meta deleted file mode 100644 index b00eef1..0000000 --- a/Assets/Models/KR_Model_Cannon_v04_Vang.fbx.meta +++ /dev/null @@ -1,102 +0,0 @@ -fileFormatVersion: 2 -guid: 53877de4fd638e14f9b39228d3cb71d7 -ModelImporter: - serializedVersion: 20200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 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 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - 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 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/KR_Model_Cannon_v05_Vang.fbx b/Assets/Models/KR_Model_Cannon_v05_Vang.fbx deleted file mode 100644 index b9f375d..0000000 Binary files a/Assets/Models/KR_Model_Cannon_v05_Vang.fbx and /dev/null differ diff --git a/Assets/Models/KR_Model_Cannon_v05_Vang.fbx.meta b/Assets/Models/KR_Model_Cannon_v05_Vang.fbx.meta deleted file mode 100644 index 03005b2..0000000 --- a/Assets/Models/KR_Model_Cannon_v05_Vang.fbx.meta +++ /dev/null @@ -1,102 +0,0 @@ -fileFormatVersion: 2 -guid: 2603914839da4d34d8ea1e186bf46941 -ModelImporter: - serializedVersion: 20200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 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 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - 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 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Environment/Boulder Spawn.prefab b/Assets/Prefabs/Environment/Boulder Spawn.prefab index d84dd2c..6d85b9f 100644 --- a/Assets/Prefabs/Environment/Boulder Spawn.prefab +++ b/Assets/Prefabs/Environment/Boulder Spawn.prefab @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!65 &6459817490327951936 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758052024324752872} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 5, y: 4.5, z: 5} + m_Center: {x: 0, y: 0.85, z: 0} --- !u!1 &8808368135834717663 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +41,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 380, y: 39, z: 370} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 6981128743512235858} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45,6 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RespawnTimer: 10 + boulderScaleMultiplier: 1 spawnForce: {x: -4000, y: 0, z: 0} SpawnLocation: {x: 380, y: 40, z: 370} BoulderPrefab: {fileID: 1779316379582440844, guid: e19c0f39cc7704141bb264ff339eb336, type: 3} @@ -65,3 +80,82 @@ MonoBehaviour: PrefabHashGenerator: Boulder Spawn AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 +--- !u!1001 &7452132367481551033 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8808368135834717660} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: df38f360a83debc4791370d4f45810bc, type: 3} + propertyPath: m_Name + value: KR_Model_Cannon_v03_Vang + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df38f360a83debc4791370d4f45810bc, type: 3} +--- !u!1 &7758052024324752872 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: df38f360a83debc4791370d4f45810bc, type: 3} + m_PrefabInstance: {fileID: 7452132367481551033} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6981128743512235858 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: df38f360a83debc4791370d4f45810bc, type: 3} + m_PrefabInstance: {fileID: 7452132367481551033} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index cbce370..c2b2427 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -4099,6 +4099,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: -18.2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 4 @@ -25068,6 +25108,7 @@ MonoBehaviour: kickItem: {fileID: 0} grapple: {fileID: 0} Glide: {fileID: 0} + boxHighlight: {fileID: 0} --- !u!114 &358007096 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37218,6 +37259,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: -13.71 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 8 @@ -42393,6 +42474,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: 18.28 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 11 @@ -42537,10 +42638,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 12 objectReference: {fileID: 0} + - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.x value: -2430 @@ -42551,7 +42668,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z - value: 480 + value: 496.81 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.w @@ -43321,7 +43438,7 @@ Transform: - {fileID: 1188861600} - {fileID: 1264280564} m_Father: {fileID: 709008595} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &657836623 GameObject: @@ -45764,6 +45881,7 @@ Transform: - {fileID: 1428014568} - {fileID: 928045005} - {fileID: 1425694277} + - {fileID: 1078582483} - {fileID: 1390509359} - {fileID: 1346309750} - {fileID: 655697233} @@ -45802,7 +45920,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} propertyPath: m_LocalScale.x @@ -47172,13 +47290,57 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 307271120} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.x + value: -9.4 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 15 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.x - value: -3690 + value: -3688.1 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y @@ -47190,19 +47352,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.w - value: 0.92387956 + value: 0.89412624 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.z - value: -0.38268343 + value: -0.447815 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -47214,7 +47376,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -45 + value: -53.207 objectReference: {fileID: 0} - target: {fileID: 8808368135834717661, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: RespawnTimer @@ -60362,6 +60524,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: -12.03 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 9 @@ -66381,6 +66583,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: -12.18 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 3 @@ -70159,8 +70401,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1568477347} - m_Father: {fileID: 0} - m_RootOrder: 25 + m_Father: {fileID: 709008595} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1079762654 GameObject: @@ -85535,7 +85777,7 @@ Transform: - {fileID: 2045429587} - {fileID: 166513088} m_Father: {fileID: 709008595} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1346396436 PrefabInstance: @@ -87263,7 +87505,7 @@ Transform: - {fileID: 1501821779} - {fileID: 732632362} m_Father: {fileID: 709008595} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1373399631 GameObject: @@ -88339,7 +88581,7 @@ Transform: m_Children: - {fileID: 8032614863045686036} m_Father: {fileID: 709008595} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1390551462 PrefabInstance: @@ -113848,7 +114090,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 17.77, y: 90, z: 0} --- !u!114 &1664207033 MonoBehaviour: @@ -118767,6 +119009,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 475082019} m_Modifications: + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.x + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 5 @@ -123459,6 +123741,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 475082019} m_Modifications: + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.x + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 4 @@ -139459,10 +139781,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 33053106} m_Modifications: + - target: {fileID: 6459817490327951936, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: 17.3 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.x value: -2325 @@ -141235,7 +141581,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_LocalPosition.x @@ -141431,7 +141777,7 @@ Transform: m_LocalScale: {x: 100, y: 1000, z: 18} m_Children: [] m_Father: {fileID: 709008595} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!1 &1455841435449095223 GameObject: @@ -141830,7 +142176,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_LocalPosition.x @@ -143067,6 +143413,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 709008595} m_Modifications: + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.x + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.y + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalScale.z + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 6981128743512235858, guid: 0d288120830514244bc113d85efa9b4d, type: 3} + propertyPath: m_LocalPosition.z + value: 47.3 + objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_RootOrder value: 10 @@ -143077,7 +143447,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.y - value: 39 + value: 40 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalPosition.z @@ -143085,7 +143455,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.x @@ -143093,7 +143463,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalRotation.z @@ -143105,7 +143475,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 8808368135834717660, guid: 0d288120830514244bc113d85efa9b4d, type: 3} propertyPath: m_LocalEulerAnglesHint.z