diff --git a/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta index 4f1ed3d19204d99637f7b8d32b211c9a75b607d0..a04b3d4ecabdcfb5167b9779861e08e8fdce8943 100644 --- a/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@Death.fbx.meta @@ -1,84 +1,154 @@ fileFormatVersion: 2 -guid: 11046fc6bf2733d4d8c55fbf61741f4b +guid: 3446299ea8161824aa26187412d69ede +timeCreated: 1482915024 +licenseType: Store ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} + serializedVersion: 19 + fileIDToRecycleName: + 100000: Ankle_L + 100002: Ankle_R + 100004: Body + 100006: Chest_M + 100008: Elbow_L + 100010: Elbow_R + 100012: Eye_L + 100014: Eye_R + 100016: EyeEnd_L + 100018: EyeEnd_R + 100020: Head_M + 100022: HeadEnd_M + 100024: Hip_L + 100026: Hip_R + 100028: IndexFinger1_L + 100030: IndexFinger1_R + 100032: IndexFinger2_L + 100034: IndexFinger2_R + 100036: Jaw_M + 100038: Knee_L + 100040: Knee_R + 100042: MiddleFinger1_L + 100044: MiddleFinger1_R + 100046: MiddleFinger2_L + 100048: MiddleFinger2_R + 100050: Neck_M + 100052: Root_M + 100054: Scapula_L + 100056: Scapula_R + 100058: Shoulder_L + 100060: Shoulder_R + 100062: ShoulderPart1_L + 100064: ShoulderPart1_R + 100066: ShoulderPart2_L + 100068: ShoulderPart2_R + 100070: Spine1_M + 100072: ThumbFinger1_L + 100074: ThumbFinger1_R + 100076: ThumbFinger2_L + 100078: ThumbFinger2_R + 100080: //RootNode + 100082: Toes_L + 100084: Toes_R + 100086: ToesEnd_L + 100088: ToesEnd_R + 100090: Wrist_L + 100092: Wrist_R + 400000: Ankle_L + 400002: Ankle_R + 400004: Body + 400006: Chest_M + 400008: Elbow_L + 400010: Elbow_R + 400012: Eye_L + 400014: Eye_R + 400016: EyeEnd_L + 400018: EyeEnd_R + 400020: Head_M + 400022: HeadEnd_M + 400024: Hip_L + 400026: Hip_R + 400028: IndexFinger1_L + 400030: IndexFinger1_R + 400032: IndexFinger2_L + 400034: IndexFinger2_R + 400036: Jaw_M + 400038: Knee_L + 400040: Knee_R + 400042: MiddleFinger1_L + 400044: MiddleFinger1_R + 400046: MiddleFinger2_L + 400048: MiddleFinger2_R + 400050: Neck_M + 400052: Root_M + 400054: Scapula_L + 400056: Scapula_R + 400058: Shoulder_L + 400060: Shoulder_R + 400062: ShoulderPart1_L + 400064: ShoulderPart1_R + 400066: ShoulderPart2_L + 400068: ShoulderPart2_R + 400070: Spine1_M + 400072: ThumbFinger1_L + 400074: ThumbFinger1_R + 400076: ThumbFinger2_L + 400078: ThumbFinger2_R + 400080: //RootNode + 400082: Toes_L + 400084: Toes_R + 400086: ToesEnd_L + 400088: ToesEnd_R + 400090: Wrist_L + 400092: Wrist_R + 4300000: Body + 7400000: Take 001 + 9500000: //RootNode + 13700000: Body materials: - materialImportMode: 2 + importMaterials: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 1 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 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 + optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] importAnimation: 1 + copyAvatar: 0 humanDescription: - serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -88,18 +158,11 @@ ModelImporter: 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 - remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta b/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta index 69d63d99443b2fd895ab94f9c609561dc92140fe..22771df6c2d3243e796bc5861c8ea21551e4cd49 100644 --- a/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@GetHit.fbx.meta @@ -1,84 +1,156 @@ fileFormatVersion: 2 -guid: 8ba7ad0ad85ff4b45831baaab1ed9b51 +guid: a8b3cfb4d36cd22418c848a0431ee9dd +timeCreated: 1482915029 +licenseType: Store ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} + serializedVersion: 19 + fileIDToRecycleName: + 100000: Ankle_L + 100002: Ankle_R + 100004: Body + 100006: Chest_M + 100008: Elbow_L + 100010: Elbow_R + 100012: Eye_L + 100014: Eye_R + 100016: EyeEnd_L + 100018: EyeEnd_R + 100020: Head_M + 100022: HeadEnd_M + 100024: Hip_L + 100026: Hip_R + 100028: IndexFinger1_L + 100030: IndexFinger1_R + 100032: IndexFinger2_L + 100034: IndexFinger2_R + 100036: Jaw_M + 100038: Knee_L + 100040: Knee_R + 100042: left + 100044: MiddleFinger1_L + 100046: MiddleFinger1_R + 100048: MiddleFinger2_L + 100050: MiddleFinger2_R + 100052: Neck_M + 100054: Root_M + 100056: Scapula_L + 100058: Scapula_R + 100060: Shoulder_L + 100062: Shoulder_R + 100064: ShoulderPart1_L + 100066: ShoulderPart1_R + 100068: ShoulderPart2_L + 100070: ShoulderPart2_R + 100072: Spine1_M + 100074: ThumbFinger1_L + 100076: ThumbFinger1_R + 100078: ThumbFinger2_L + 100080: ThumbFinger2_R + 100082: //RootNode + 100084: Toes_L + 100086: Toes_R + 100088: ToesEnd_L + 100090: ToesEnd_R + 100092: Wrist_L + 100094: Wrist_R + 400000: Ankle_L + 400002: Ankle_R + 400004: Body + 400006: Chest_M + 400008: Elbow_L + 400010: Elbow_R + 400012: Eye_L + 400014: Eye_R + 400016: EyeEnd_L + 400018: EyeEnd_R + 400020: Head_M + 400022: HeadEnd_M + 400024: Hip_L + 400026: Hip_R + 400028: IndexFinger1_L + 400030: IndexFinger1_R + 400032: IndexFinger2_L + 400034: IndexFinger2_R + 400036: Jaw_M + 400038: Knee_L + 400040: Knee_R + 400042: left + 400044: MiddleFinger1_L + 400046: MiddleFinger1_R + 400048: MiddleFinger2_L + 400050: MiddleFinger2_R + 400052: Neck_M + 400054: Root_M + 400056: Scapula_L + 400058: Scapula_R + 400060: Shoulder_L + 400062: Shoulder_R + 400064: ShoulderPart1_L + 400066: ShoulderPart1_R + 400068: ShoulderPart2_L + 400070: ShoulderPart2_R + 400072: Spine1_M + 400074: ThumbFinger1_L + 400076: ThumbFinger1_R + 400078: ThumbFinger2_L + 400080: ThumbFinger2_R + 400082: //RootNode + 400084: Toes_L + 400086: Toes_R + 400088: ToesEnd_L + 400090: ToesEnd_R + 400092: Wrist_L + 400094: Wrist_R + 4300000: Body + 7400000: Take 001 + 9500000: //RootNode + 13700000: Body materials: - materialImportMode: 2 + importMaterials: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 1 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 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 + optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] importAnimation: 1 + copyAvatar: 0 humanDescription: - serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -88,18 +160,11 @@ ModelImporter: 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 - remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta index 24e842bc366364bfa9eaef2e8cf2d6cdd6a31529..0c8a864262293e5132cfbfcd9f7e28457169bab6 100644 --- a/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@Idle.fbx.meta @@ -1,84 +1,156 @@ fileFormatVersion: 2 -guid: 30709076baec42d46b1984bc4267f733 +guid: 3e99ec06c5efc9d4089299d760d40f7c +timeCreated: 1482915027 +licenseType: Store ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} + serializedVersion: 19 + fileIDToRecycleName: + 100000: Ankle_L + 100002: Ankle_R + 100004: Body + 100006: Chest_M + 100008: Elbow_L + 100010: Elbow_R + 100012: Eye_L + 100014: Eye_R + 100016: EyeEnd_L + 100018: EyeEnd_R + 100020: Head_M + 100022: HeadEnd_M + 100024: Hip_L + 100026: Hip_R + 100028: IndexFinger1_L + 100030: IndexFinger1_R + 100032: IndexFinger2_L + 100034: IndexFinger2_R + 100036: Jaw_M + 100038: Knee_L + 100040: Knee_R + 100042: left + 100044: MiddleFinger1_L + 100046: MiddleFinger1_R + 100048: MiddleFinger2_L + 100050: MiddleFinger2_R + 100052: Neck_M + 100054: Root_M + 100056: Scapula_L + 100058: Scapula_R + 100060: Shoulder_L + 100062: Shoulder_R + 100064: ShoulderPart1_L + 100066: ShoulderPart1_R + 100068: ShoulderPart2_L + 100070: ShoulderPart2_R + 100072: Spine1_M + 100074: ThumbFinger1_L + 100076: ThumbFinger1_R + 100078: ThumbFinger2_L + 100080: ThumbFinger2_R + 100082: //RootNode + 100084: Toes_L + 100086: Toes_R + 100088: ToesEnd_L + 100090: ToesEnd_R + 100092: Wrist_L + 100094: Wrist_R + 400000: Ankle_L + 400002: Ankle_R + 400004: Body + 400006: Chest_M + 400008: Elbow_L + 400010: Elbow_R + 400012: Eye_L + 400014: Eye_R + 400016: EyeEnd_L + 400018: EyeEnd_R + 400020: Head_M + 400022: HeadEnd_M + 400024: Hip_L + 400026: Hip_R + 400028: IndexFinger1_L + 400030: IndexFinger1_R + 400032: IndexFinger2_L + 400034: IndexFinger2_R + 400036: Jaw_M + 400038: Knee_L + 400040: Knee_R + 400042: left + 400044: MiddleFinger1_L + 400046: MiddleFinger1_R + 400048: MiddleFinger2_L + 400050: MiddleFinger2_R + 400052: Neck_M + 400054: Root_M + 400056: Scapula_L + 400058: Scapula_R + 400060: Shoulder_L + 400062: Shoulder_R + 400064: ShoulderPart1_L + 400066: ShoulderPart1_R + 400068: ShoulderPart2_L + 400070: ShoulderPart2_R + 400072: Spine1_M + 400074: ThumbFinger1_L + 400076: ThumbFinger1_R + 400078: ThumbFinger2_L + 400080: ThumbFinger2_R + 400082: //RootNode + 400084: Toes_L + 400086: Toes_R + 400088: ToesEnd_L + 400090: ToesEnd_R + 400092: Wrist_L + 400094: Wrist_R + 4300000: Body + 7400000: Take 001 + 9500000: //RootNode + 13700000: Body materials: - materialImportMode: 2 + importMaterials: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 1 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 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 + optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] importAnimation: 1 + copyAvatar: 0 humanDescription: - serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -88,18 +160,11 @@ ModelImporter: 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 - remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Animation/Titan@Run.fbx b/Assets/Creatures Titan/Animation/Titan@Run.fbx new file mode 100644 index 0000000000000000000000000000000000000000..183ab6be6e5cb44566f5c3fca2673bdf6d727627 --- /dev/null +++ b/Assets/Creatures Titan/Animation/Titan@Run.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5ab9e981ea61aec417be21703e11b4362771a045d225bb0daead125c5919047 +size 2311434 diff --git a/Assets/Creatures Titan/Animation/Titan@Run.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Run.fbx.meta new file mode 100644 index 0000000000000000000000000000000000000000..0c1756f90054c4cd64c1bb89f3863cd64e68c986 --- /dev/null +++ b/Assets/Creatures Titan/Animation/Titan@Run.fbx.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: ebe5b89bf3bbf1d4fb606899d6850a67 +timeCreated: 1482915034 +licenseType: Store +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: Ankle_L + 100002: Ankle_R + 100004: Body + 100006: Chest_M + 100008: Elbow_L + 100010: Elbow_R + 100012: Eye_L + 100014: Eye_R + 100016: EyeEnd_L + 100018: EyeEnd_R + 100020: Head_M + 100022: HeadEnd_M + 100024: Hip_L + 100026: Hip_R + 100028: IndexFinger1_L + 100030: IndexFinger1_R + 100032: IndexFinger2_L + 100034: IndexFinger2_R + 100036: Jaw_M + 100038: Knee_L + 100040: Knee_R + 100042: left + 100044: MiddleFinger1_L + 100046: MiddleFinger1_R + 100048: MiddleFinger2_L + 100050: MiddleFinger2_R + 100052: Neck_M + 100054: Root_M + 100056: Scapula_L + 100058: Scapula_R + 100060: Shoulder_L + 100062: Shoulder_R + 100064: ShoulderPart1_L + 100066: ShoulderPart1_R + 100068: ShoulderPart2_L + 100070: ShoulderPart2_R + 100072: Spine1_M + 100074: ThumbFinger1_L + 100076: ThumbFinger1_R + 100078: ThumbFinger2_L + 100080: ThumbFinger2_R + 100082: //RootNode + 100084: Toes_L + 100086: Toes_R + 100088: ToesEnd_L + 100090: ToesEnd_R + 100092: Wrist_L + 100094: Wrist_R + 400000: Ankle_L + 400002: Ankle_R + 400004: Body + 400006: Chest_M + 400008: Elbow_L + 400010: Elbow_R + 400012: Eye_L + 400014: Eye_R + 400016: EyeEnd_L + 400018: EyeEnd_R + 400020: Head_M + 400022: HeadEnd_M + 400024: Hip_L + 400026: Hip_R + 400028: IndexFinger1_L + 400030: IndexFinger1_R + 400032: IndexFinger2_L + 400034: IndexFinger2_R + 400036: Jaw_M + 400038: Knee_L + 400040: Knee_R + 400042: left + 400044: MiddleFinger1_L + 400046: MiddleFinger1_R + 400048: MiddleFinger2_L + 400050: MiddleFinger2_R + 400052: Neck_M + 400054: Root_M + 400056: Scapula_L + 400058: Scapula_R + 400060: Shoulder_L + 400062: Shoulder_R + 400064: ShoulderPart1_L + 400066: ShoulderPart1_R + 400068: ShoulderPart2_L + 400070: ShoulderPart2_R + 400072: Spine1_M + 400074: ThumbFinger1_L + 400076: ThumbFinger1_R + 400078: ThumbFinger2_L + 400080: ThumbFinger2_R + 400082: //RootNode + 400084: Toes_L + 400086: Toes_R + 400088: ToesEnd_L + 400090: ToesEnd_R + 400092: Wrist_L + 400094: Wrist_R + 4300000: Body + 7400000: Take 001 + 9500000: //RootNode + 13700000: Body + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta b/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta index 6ff3401474e99396f898e2e2dbf56910ffe52d43..55d462a8a3ef3d0e0345a5b38b7d8dbf20957b3a 100644 --- a/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta +++ b/Assets/Creatures Titan/Animation/Titan@Walk.fbx.meta @@ -1,20 +1,320 @@ fileFormatVersion: 2 -guid: 3a5de04eed4571b4fb81bdd4488666ce +guid: af57220899fe7f942bcb29e993d89983 ModelImporter: serializedVersion: 21300 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 1: 100000 + second: Ankle_L + - first: + 1: 100002 + second: Ankle_R + - first: + 1: 100004 + second: Body + - first: + 1: 100006 + second: Chest_M + - first: + 1: 100008 + second: Elbow_L + - first: + 1: 100010 + second: Elbow_R + - first: + 1: 100012 + second: Eye_L + - first: + 1: 100014 + second: Eye_R + - first: + 1: 100016 + second: EyeEnd_L + - first: + 1: 100018 + second: EyeEnd_R + - first: + 1: 100020 + second: Head_M + - first: + 1: 100022 + second: HeadEnd_M + - first: + 1: 100024 + second: Hip_L + - first: + 1: 100026 + second: Hip_R + - first: + 1: 100028 + second: IndexFinger1_L + - first: + 1: 100030 + second: IndexFinger1_R + - first: + 1: 100032 + second: IndexFinger2_L + - first: + 1: 100034 + second: IndexFinger2_R + - first: + 1: 100036 + second: Jaw_M + - first: + 1: 100038 + second: Knee_L + - first: + 1: 100040 + second: Knee_R + - first: + 1: 100042 + second: left + - first: + 1: 100044 + second: MiddleFinger1_L + - first: + 1: 100046 + second: MiddleFinger1_R + - first: + 1: 100048 + second: MiddleFinger2_L + - first: + 1: 100050 + second: MiddleFinger2_R + - first: + 1: 100052 + second: Neck_M + - first: + 1: 100054 + second: Root_M + - first: + 1: 100056 + second: Scapula_L + - first: + 1: 100058 + second: Scapula_R + - first: + 1: 100060 + second: Shoulder_L + - first: + 1: 100062 + second: Shoulder_R + - first: + 1: 100064 + second: ShoulderPart1_L + - first: + 1: 100066 + second: ShoulderPart1_R + - first: + 1: 100068 + second: ShoulderPart2_L + - first: + 1: 100070 + second: ShoulderPart2_R + - first: + 1: 100072 + second: Spine1_M + - first: + 1: 100074 + second: ThumbFinger1_L + - first: + 1: 100076 + second: ThumbFinger1_R + - first: + 1: 100078 + second: ThumbFinger2_L + - first: + 1: 100080 + second: ThumbFinger2_R + - first: + 1: 100082 + second: //RootNode + - first: + 1: 100084 + second: Toes_L + - first: + 1: 100086 + second: Toes_R + - first: + 1: 100088 + second: ToesEnd_L + - first: + 1: 100090 + second: ToesEnd_R + - first: + 1: 100092 + second: Wrist_L + - first: + 1: 100094 + second: Wrist_R + - first: + 4: 400000 + second: Ankle_L + - first: + 4: 400002 + second: Ankle_R + - first: + 4: 400004 + second: Body + - first: + 4: 400006 + second: Chest_M + - first: + 4: 400008 + second: Elbow_L + - first: + 4: 400010 + second: Elbow_R + - first: + 4: 400012 + second: Eye_L + - first: + 4: 400014 + second: Eye_R + - first: + 4: 400016 + second: EyeEnd_L + - first: + 4: 400018 + second: EyeEnd_R + - first: + 4: 400020 + second: Head_M + - first: + 4: 400022 + second: HeadEnd_M + - first: + 4: 400024 + second: Hip_L + - first: + 4: 400026 + second: Hip_R + - first: + 4: 400028 + second: IndexFinger1_L + - first: + 4: 400030 + second: IndexFinger1_R + - first: + 4: 400032 + second: IndexFinger2_L + - first: + 4: 400034 + second: IndexFinger2_R + - first: + 4: 400036 + second: Jaw_M + - first: + 4: 400038 + second: Knee_L + - first: + 4: 400040 + second: Knee_R + - first: + 4: 400042 + second: left + - first: + 4: 400044 + second: MiddleFinger1_L + - first: + 4: 400046 + second: MiddleFinger1_R + - first: + 4: 400048 + second: MiddleFinger2_L + - first: + 4: 400050 + second: MiddleFinger2_R + - first: + 4: 400052 + second: Neck_M + - first: + 4: 400054 + second: Root_M + - first: + 4: 400056 + second: Scapula_L + - first: + 4: 400058 + second: Scapula_R + - first: + 4: 400060 + second: Shoulder_L + - first: + 4: 400062 + second: Shoulder_R + - first: + 4: 400064 + second: ShoulderPart1_L + - first: + 4: 400066 + second: ShoulderPart1_R + - first: + 4: 400068 + second: ShoulderPart2_L + - first: + 4: 400070 + second: ShoulderPart2_R + - first: + 4: 400072 + second: Spine1_M + - first: + 4: 400074 + second: ThumbFinger1_L + - first: + 4: 400076 + second: ThumbFinger1_R + - first: + 4: 400078 + second: ThumbFinger2_L + - first: + 4: 400080 + second: ThumbFinger2_R + - first: + 4: 400082 + second: //RootNode + - first: + 4: 400084 + second: Toes_L + - first: + 4: 400086 + second: Toes_R + - first: + 4: 400088 + second: ToesEnd_L + - first: + 4: 400090 + second: ToesEnd_R + - first: + 4: 400092 + second: Wrist_L + - first: + 4: 400094 + second: Wrist_R + - first: + 43: 4300000 + second: Body + - first: + 74: 7400000 + second: Walk + - first: + 95: 9500000 + second: //RootNode + - first: + 137: 13700000 + second: Body externalObjects: {} materials: - materialImportMode: 2 + materialImportMode: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 1 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -31,8 +331,37 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] - isReadable: 0 + clipAnimations: + - serializedVersion: 16 + name: Walk + takeName: Take 001 + internalID: 7400000 + firstFrame: 0 + lastFrame: 43 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 1 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 @@ -40,12 +369,12 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importVisibility: 1 + importVisibility: 0 importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 + importCameras: 0 + importLights: 0 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 @@ -58,11 +387,11 @@ ModelImporter: minBoneWeight: 0.001 optimizeBones: 1 meshOptimizationFlags: -1 - indexFormat: 0 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 + secondaryUVMarginMethod: 0 secondaryUVMinLightmapResolution: 40 secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 @@ -71,8 +400,8 @@ ModelImporter: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] @@ -92,14 +421,14 @@ ModelImporter: rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 - skeletonHasParents: 1 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Materials/Titan.mat b/Assets/Creatures Titan/Materials/Titan.mat index 9e9a9ee991ce083be58d0ef30e4564a1c5a664d5..0e3f26c3ef7e02550513082886f36036943696af 100644 Binary files a/Assets/Creatures Titan/Materials/Titan.mat and b/Assets/Creatures Titan/Materials/Titan.mat differ diff --git a/Assets/Creatures Titan/Mesh/Titan.fbx.meta b/Assets/Creatures Titan/Mesh/Titan.fbx.meta index 7f78d3d9431abdf3c557af444ffced8dabf0afaa..99da3549abdbac34b264a6823a1d1e5a8043f206 100644 --- a/Assets/Creatures Titan/Mesh/Titan.fbx.meta +++ b/Assets/Creatures Titan/Mesh/Titan.fbx.meta @@ -1,84 +1,155 @@ fileFormatVersion: 2 -guid: d7c8cdb8307a714418115e26c292596b +guid: 24c4300f68c986241af51004b72b03f2 +timeCreated: 1482915035 +licenseType: Store ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} + serializedVersion: 19 + fileIDToRecycleName: + 100000: Ankle_L + 100002: Ankle_R + 100004: Body + 100006: Chest_M + 100008: Elbow_L + 100010: Elbow_R + 100012: Eye_L + 100014: Eye_R + 100016: EyeEnd_L + 100018: EyeEnd_R + 100020: Head_M + 100022: HeadEnd_M + 100024: Hip_L + 100026: Hip_R + 100028: IndexFinger1_L + 100030: IndexFinger1_R + 100032: IndexFinger2_L + 100034: IndexFinger2_R + 100036: Jaw_M + 100038: Knee_L + 100040: Knee_R + 100042: left + 100044: MiddleFinger1_L + 100046: MiddleFinger1_R + 100048: MiddleFinger2_L + 100050: MiddleFinger2_R + 100052: Neck_M + 100054: Root_M + 100056: Scapula_L + 100058: Scapula_R + 100060: Shoulder_L + 100062: Shoulder_R + 100064: ShoulderPart1_L + 100066: ShoulderPart1_R + 100068: ShoulderPart2_L + 100070: ShoulderPart2_R + 100072: Spine1_M + 100074: ThumbFinger1_L + 100076: ThumbFinger1_R + 100078: ThumbFinger2_L + 100080: ThumbFinger2_R + 100082: //RootNode + 100084: Toes_L + 100086: Toes_R + 100088: ToesEnd_L + 100090: ToesEnd_R + 100092: Wrist_L + 100094: Wrist_R + 400000: Ankle_L + 400002: Ankle_R + 400004: Body + 400006: Chest_M + 400008: Elbow_L + 400010: Elbow_R + 400012: Eye_L + 400014: Eye_R + 400016: EyeEnd_L + 400018: EyeEnd_R + 400020: Head_M + 400022: HeadEnd_M + 400024: Hip_L + 400026: Hip_R + 400028: IndexFinger1_L + 400030: IndexFinger1_R + 400032: IndexFinger2_L + 400034: IndexFinger2_R + 400036: Jaw_M + 400038: Knee_L + 400040: Knee_R + 400042: left + 400044: MiddleFinger1_L + 400046: MiddleFinger1_R + 400048: MiddleFinger2_L + 400050: MiddleFinger2_R + 400052: Neck_M + 400054: Root_M + 400056: Scapula_L + 400058: Scapula_R + 400060: Shoulder_L + 400062: Shoulder_R + 400064: ShoulderPart1_L + 400066: ShoulderPart1_R + 400068: ShoulderPart2_L + 400070: ShoulderPart2_R + 400072: Spine1_M + 400074: ThumbFinger1_L + 400076: ThumbFinger1_R + 400078: ThumbFinger2_L + 400080: ThumbFinger2_R + 400082: //RootNode + 400084: Toes_L + 400086: Toes_R + 400088: ToesEnd_L + 400090: ToesEnd_R + 400092: Wrist_L + 400094: Wrist_R + 4300000: Body + 9500000: //RootNode + 13700000: Body materials: - materialImportMode: 2 + importMaterials: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 1 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 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 + optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] importAnimation: 1 + copyAvatar: 0 humanDescription: - serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -88,18 +159,11 @@ ModelImporter: 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 - remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Stand/Mesh/Materials/Stand.mat b/Assets/Creatures Titan/Stand/Mesh/Materials/Stand.mat index 1143a187c199fa1125a446605f35130a079d47a8..88e70708e2e3b1f8f6c9edfb65bb9b50bc4cbbf2 100644 Binary files a/Assets/Creatures Titan/Stand/Mesh/Materials/Stand.mat and b/Assets/Creatures Titan/Stand/Mesh/Materials/Stand.mat differ diff --git a/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta b/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta index 4f25d2427f08ee5016b69551ecf0bdab21fee3d4..93e5e5bdbd1809adfc46d6b59117efbac82744eb 100644 --- a/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta +++ b/Assets/Creatures Titan/Stand/Mesh/Stand.obj.meta @@ -1,84 +1,63 @@ fileFormatVersion: 2 -guid: 20eda2ee143769049a583ff1726e95cf +guid: 41aa2a342415afc47b835fe30f10d5de +timeCreated: 1482915036 +licenseType: Store ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} + serializedVersion: 19 + fileIDToRecycleName: + 100000: Cylinder001 + 100002: //RootNode + 400000: Cylinder001 + 400002: //RootNode + 2300000: Cylinder001 + 3300000: Cylinder001 + 4300000: Cylinder001 materials: - materialImportMode: 2 + importMaterials: 1 materialName: 0 materialSearch: 1 - materialLocation: 1 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - removeConstantScaleCurves: 1 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 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 meshCompression: 0 addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 + optimizeMeshForGPU: 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 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] importAnimation: 1 + copyAvatar: 0 humanDescription: - serializedVersion: 3 human: [] skeleton: [] armTwist: 0.5 @@ -88,18 +67,11 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 0 humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: assetBundleName: diff --git a/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta b/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta index 35145b6637c110939f6c76c58b0431944c84ddde..e8edb69885b0e487f6de323b4165d0b8cf6b26c0 100644 --- a/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__Albedo.tga.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 -guid: c8604d22d2d0eef4291639ccbb7e7203 +guid: 65226824c0943324db930ef4b908c9b4 +timeCreated: 1482914995 +licenseType: Store TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,103 +20,40 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: 1 + textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta b/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta index b085d493d40f29ce2148cf2ec0d3db63b3864437..c215041f788753c42f17e83e974e1b9dee0c4a56 100644 --- a/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__Ao.tga.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 -guid: 89e27bf124be53e4d93089cc0316b402 +guid: ee4cbbe4851fb65488d9c46ee3bad6ad +timeCreated: 1482915015 +licenseType: Store TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,103 +20,40 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: 1 + textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta b/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta index 15534710908b43b5c3b2ea906fbaff330a729090..0d37fedb8e32022d2c6380ab891e5a838dd4218c 100644 --- a/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__Metallic.tga.meta @@ -1,18 +1,17 @@ fileFormatVersion: 2 -guid: eb9bfd2599c83024bac0cac93f88a72c +guid: 3cc3e2c2a3cb9604caa7c563c9b90877 +timeCreated: 1482914983 +licenseType: Store TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 linearTexture: 0 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,103 +20,40 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: 1 + textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + textureType: -1 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Texture/Titan__normals.tga.meta b/Assets/Creatures Titan/Texture/Titan__normals.tga.meta index cf5bf89465cb9fe7a6f9403b145c36f2a1ae0bd9..cee732af9ccb2ec89fd7618eabf91b79641459a3 100644 --- a/Assets/Creatures Titan/Texture/Titan__normals.tga.meta +++ b/Assets/Creatures Titan/Texture/Titan__normals.tga.meta @@ -1,123 +1,59 @@ fileFormatVersion: 2 -guid: 21fca420d99ed9e45a3aa79b4b5be941 +guid: 83ad6b9b9e4e7c04dab853ce9eeaf873 +timeCreated: 1482915007 +licenseType: Store TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 + linearTexture: 1 + correctGamma: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 - externalNormalMap: 0 + externalNormalMap: 1 heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 - generateCubemap: 6 + generateCubemap: 0 cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: 1 + textureFormat: -1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 nPOTScale: 1 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + spritePixelsToUnits: 100 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + textureType: 1 + buildTargetSettings: [] spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Creatures Titan/Titan.controller b/Assets/Creatures Titan/Titan.controller index 272f4c5aa13ec04a2deda522e07e1d772174c103..57dcf88da39049fdf09cc606b44cef7d419ef8c2 100644 Binary files a/Assets/Creatures Titan/Titan.controller and b/Assets/Creatures Titan/Titan.controller differ diff --git a/Assets/Creatures Titan/Titan.unity b/Assets/Creatures Titan/Titan.unity index 3511a16add2eced150434ba1cb6265e0bedc080f..aac2a70009179fb1d4993231f67225a86de53c07 100644 Binary files a/Assets/Creatures Titan/Titan.unity and b/Assets/Creatures Titan/Titan.unity differ diff --git a/Assets/Prefabs/Titan.prefab b/Assets/Prefabs/Titan.prefab index 1dd96c7e038f0965827102e3ea42483e8d4fdfd7..8fca80e1add3c608f033795e6bf0121f67f53dd0 100644 --- a/Assets/Prefabs/Titan.prefab +++ b/Assets/Prefabs/Titan.prefab @@ -1286,14 +1286,14 @@ GameObject: m_Component: - component: {fileID: 7250609702778708478} - component: {fileID: 7250609702788582988} - - component: {fileID: 7250609702778708428} - - component: {fileID: 7250609702778708429} - - component: {fileID: 7250609702778708467} - - component: {fileID: 7250609702778708465} - - component: {fileID: 7250609702778708471} - - component: {fileID: 7250609702778708469} - - component: {fileID: 7250609702778708475} - - component: {fileID: 7250609702778708473} + - component: {fileID: 6740959744618859462} + - component: {fileID: 8678448281798818299} + - component: {fileID: 7351833707558433270} + - component: {fileID: 263222732460000471} + - component: {fileID: 7707683979748166448} + - component: {fileID: 8460762743723167307} + - component: {fileID: 1805753016817988104} + - component: {fileID: 2301380300054905384} m_Layer: 3 m_Name: Titan m_TagString: Untagged @@ -1343,7 +1343,7 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!54 &7250609702778708428 +--- !u!54 &6740959744618859462 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1359,7 +1359,7 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 84 m_CollisionDetection: 0 ---- !u!136 &7250609702778708429 +--- !u!136 &8678448281798818299 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1369,11 +1369,24 @@ CapsuleCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - m_Radius: 1 - m_Height: 2.5 + m_Radius: 0.5 + m_Height: 1.5 m_Direction: 1 - m_Center: {x: 0, y: 1.2, z: 0} ---- !u!195 &7250609702778708467 + m_Center: {x: 0, y: 0.8, z: 0} +--- !u!135 &7351833707558433270 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7250609702779207134} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.8 + m_Center: {x: 0, y: 0.8, z: 0} +--- !u!195 &263222732460000471 NavMeshAgent: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1382,8 +1395,8 @@ NavMeshAgent: m_GameObject: {fileID: 7250609702779207134} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 1.2 - m_Speed: 6 + m_Radius: 0.3 + m_Speed: 2.5 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -1391,24 +1404,11 @@ NavMeshAgent: m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 - m_Height: 2 + m_Height: 1.1 m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 ---- !u!135 &7250609702778708465 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7250609702779207134} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 1.2 - m_Center: {x: 0, y: 1.2, z: 0} ---- !u!82 &7250609702778708471 +--- !u!82 &7707683979748166448 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1418,7 +1418,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 24300002, guid: 8434b04884c414ac6b468e10945685e6, type: 2} - m_audioClip: {fileID: 8300000, guid: fce027b40770a44298a6f5a4233bfb04, type: 3} + m_audioClip: {fileID: 8300000, guid: 1d4840678e677424b8921716c72397ea, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -1504,7 +1504,7 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!114 &7250609702778708469 +--- !u!114 &8460762743723167307 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1513,10 +1513,12 @@ MonoBehaviour: m_GameObject: {fileID: 7250609702779207134} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94f6618a0da65fa45b24d5105d5d8422, type: 3} + m_Script: {fileID: 11500000, guid: e15099f5ee559584089d5851df572def, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7250609702778708475 + timeBetweenAttacks: 0.5 + attackDamage: 30 +--- !u!114 &1805753016817988104 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1525,12 +1527,10 @@ MonoBehaviour: m_GameObject: {fileID: 7250609702779207134} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e15099f5ee559584089d5851df572def, type: 3} + m_Script: {fileID: 11500000, guid: 94f6618a0da65fa45b24d5105d5d8422, type: 3} m_Name: m_EditorClassIdentifier: - timeBetweenAttacks: 0.5 - attackDamage: 20 ---- !u!114 &7250609702778708473 +--- !u!114 &2301380300054905384 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1542,7 +1542,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47fb397d2d047f541a1dc3c4c2d3bfaa, type: 3} m_Name: m_EditorClassIdentifier: - startingHealth: 3500 + startingHealth: 100 currentHealth: 0 sinkSpeed: 2.5 deathClip: {fileID: 8300000, guid: 8c615fd0429f34edf85539d70279360d, type: 3} diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index 335c7789b001269b50c6a90232eae400622d0747..9dc2b3c6c36b06525cf50c8f3f8a794ac46d4c32 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -1021,86 +1021,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 214125933} m_CullTransparentMesh: 1 ---- !u!1 &227527627 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 227527628} - - component: {fileID: 227527630} - - component: {fileID: 227527629} - m_Layer: 5 - m_Name: GameOverText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &227527628 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227527627} - 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: 491809538} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &227527629 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227527627} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.31132078, g: 0.31132078, b: 0.31132078, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 56 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 5 - m_MaxSize: 56 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Game Overr ---- !u!222 &227527630 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227527627} - m_CullTransparentMesh: 0 --- !u!1 &273049125 GameObject: m_ObjectHideFlags: 0 @@ -2106,8 +2026,6 @@ RectTransform: - {fileID: 1201013129} - {fileID: 1013198296} - {fileID: 2030411491} - - {fileID: 1005111342} - - {fileID: 227527628} - {fileID: 1444128284} - {fileID: 1314518863} - {fileID: 870789544} @@ -3579,7 +3497,7 @@ RectTransform: - {fileID: 1514059679} - {fileID: 840802841} m_Father: {fileID: 491809538} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3597,7 +3515,6 @@ GameObject: - component: {fileID: 870789544} - component: {fileID: 870789547} - component: {fileID: 870789546} - - component: {fileID: 870789545} m_Layer: 5 m_Name: PauseMenu m_TagString: Untagged @@ -3621,28 +3538,13 @@ RectTransform: - {fileID: 1576092395} - {fileID: 273049126} m_Father: {fileID: 491809538} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -6.0000305} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &870789545 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 870789543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 17a5add5b2e834a49bd2b43d9eebdbb4, type: 3} - m_Name: - m_EditorClassIdentifier: - sm: {fileID: 0} - pdm: {fileID: 0} - delaySeconds: 5 --- !u!114 &870789546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9148,82 +9050,6 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1005111341 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1005111342} - - component: {fileID: 1005111344} - - component: {fileID: 1005111343} - m_Layer: 5 - m_Name: ScreenFade - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1005111342 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005111341} - 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: 491809538} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1005111343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005111341} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1005111344 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005111341} - m_CullTransparentMesh: 0 --- !u!1 &1013198295 GameObject: m_ObjectHideFlags: 0 @@ -10395,7 +10221,7 @@ RectTransform: - {fileID: 649544088} - {fileID: 679650415} m_Father: {fileID: 491809538} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10524,7 +10350,7 @@ RectTransform: - {fileID: 819070688} - {fileID: 1678682908} m_Father: {fileID: 491809538} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11599,6 +11425,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: coins: 50 + coinsLatest: 0 currentPet: name: buffType: @@ -11609,12 +11436,12 @@ MonoBehaviour: isPetAlive: 0 isShopOpen: 0 isShopping: 0 - isEnemySpawning: 1 + isEnemyActive: 1 petFactory: {fileID: 734232483} currentWeapon: 0 availableWeapon: 01000000 hudManager: {fileID: 491809539} - enemyManager: {fileID: 164778954} + enemySpawner: {fileID: 164778954} --- !u!114 &1644740160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11902,7 +11729,7 @@ RectTransform: - {fileID: 1446248592} - {fileID: 36682392} m_Father: {fileID: 491809538} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12932,7 +12759,7 @@ RectTransform: - {fileID: 1460883477} - {fileID: 1647225471} m_Father: {fileID: 491809538} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity index b913e6fe539e3ace043e097cb4098f393aa007b7..d7fccf9f4b43156c237179bb33d62ce22eda77db 100644 --- a/Assets/Scenes/Level_02.unity +++ b/Assets/Scenes/Level_02.unity @@ -1021,86 +1021,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 214125933} m_CullTransparentMesh: 1 ---- !u!1 &227527627 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 227527628} - - component: {fileID: 227527630} - - component: {fileID: 227527629} - m_Layer: 5 - m_Name: GameOverText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &227527628 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227527627} - 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: 491809538} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &227527629 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227527627} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.31132078, g: 0.31132078, b: 0.31132078, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 56 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 5 - m_MaxSize: 56 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Game Overr ---- !u!222 &227527630 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227527627} - m_CullTransparentMesh: 0 --- !u!1 &281270165 GameObject: m_ObjectHideFlags: 0 @@ -1622,8 +1542,6 @@ RectTransform: - {fileID: 1201013129} - {fileID: 1013198296} - {fileID: 2030411491} - - {fileID: 1005111342} - - {fileID: 227527628} - {fileID: 1444128284} - {fileID: 1314518863} - {fileID: 1764071969} @@ -3020,7 +2938,7 @@ RectTransform: - {fileID: 1514059679} - {fileID: 840802841} m_Father: {fileID: 491809538} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8709,82 +8627,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 999659690} m_CullTransparentMesh: 0 ---- !u!1 &1005111341 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1005111342} - - component: {fileID: 1005111344} - - component: {fileID: 1005111343} - m_Layer: 5 - m_Name: ScreenFade - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1005111342 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005111341} - 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: 491809538} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1005111343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005111341} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1005111344 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1005111341} - m_CullTransparentMesh: 0 --- !u!1 &1013198295 GameObject: m_ObjectHideFlags: 0 @@ -9741,7 +9583,7 @@ RectTransform: - {fileID: 649544088} - {fileID: 679650415} m_Father: {fileID: 491809538} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9793,7 +9635,7 @@ RectTransform: m_Children: - {fileID: 1465308813} m_Father: {fileID: 491809538} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10157,7 +9999,7 @@ RectTransform: - {fileID: 819070688} - {fileID: 1678682908} m_Father: {fileID: 491809538} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11236,11 +11078,12 @@ MonoBehaviour: isShopOpen: 1 isShopping: 0 isEnemyActive: 1 + isBoss: 0 petFactory: {fileID: 734232483} currentWeapon: 0 availableWeapon: 01000000 hudManager: {fileID: 491809539} - enemySpawner: {fileID: 0} + enemySpawner: {fileID: 164778954} --- !u!114 &1644740160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11394,7 +11237,7 @@ RectTransform: - {fileID: 1446248592} - {fileID: 36682392} m_Father: {fileID: 491809538} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12015,7 +11858,7 @@ RectTransform: - {fileID: 1579637355} - {fileID: 1705535179} m_Father: {fileID: 491809538} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12728,7 +12571,7 @@ RectTransform: - {fileID: 1758932610} - {fileID: 1831479366} m_Father: {fileID: 491809538} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity index b755c93bd4609026dc8f6928eff0af21aacfb1fa..da8b998a28a457508dc699a6421fff8d393efa12 100644 --- a/Assets/Scenes/Level_Final.unity +++ b/Assets/Scenes/Level_Final.unity @@ -258,6 +258,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15848817} m_CullTransparentMesh: 1 +--- !u!1 &48557432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 48557433} + - component: {fileID: 48557435} + - component: {fileID: 48557434} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &48557433 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48557432} + 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: 1411943329} + - {fileID: 844235007} + - {fileID: 605263431} + m_Father: {fileID: 989723333} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 8.917175} + m_SizeDelta: {x: -416.3809, y: -235.1854} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &48557434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48557432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.12941177, g: 0.10196079, b: 0.21960786, a: 0.4117647} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300002, guid: 691c72ed2864a3f42a2479bbe70525cc, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &48557435 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48557432} + m_CullTransparentMesh: 0 --- !u!1 &56306803 GameObject: m_ObjectHideFlags: 0 @@ -637,7 +716,7 @@ RectTransform: - {fileID: 136513749} - {fileID: 1122634084} m_Father: {fileID: 491809538} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1098,7 +1177,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 214125933} m_CullTransparentMesh: 1 ---- !u!1 &268888276 +--- !u!1 &243575546 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1106,44 +1185,134 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 268888278} - - component: {fileID: 268888277} - m_Layer: 0 - m_Name: PlayerDataManager + - component: {fileID: 243575547} + - component: {fileID: 243575549} + - component: {fileID: 243575548} + m_Layer: 5 + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &268888277 +--- !u!224 &243575547 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243575546} + 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: 1471692288} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 300, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &243575548 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 268888276} + m_GameObject: {fileID: 243575546} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - availableSlot: 000000 ---- !u!4 &268888278 -Transform: + 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: Main Menu + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 10348e50183ba494ca1e7adc5dbe4980, type: 2} + m_sharedMaterial: {fileID: 8615086766700028954, guid: 10348e50183ba494ca1e7adc5dbe4980, 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 16 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &243575549 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 268888276} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &491809534 + m_GameObject: {fileID: 243575546} + m_CullTransparentMesh: 0 +--- !u!1 &258682411 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1151,55 +1320,234 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 491809538} - - component: {fileID: 491809537} - - component: {fileID: 491809536} - - component: {fileID: 491809535} - - component: {fileID: 491809539} + - component: {fileID: 258682412} + - component: {fileID: 258682415} + - component: {fileID: 258682414} + - component: {fileID: 258682413} m_Layer: 5 - m_Name: HUDCanvas + m_Name: ResumeButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &491809535 +--- !u!224 &258682412 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258682411} + 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: 1674623366} + m_Father: {fileID: 989723333} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000061035, y: 1} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &258682413 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 491809534} + m_GameObject: {fileID: 258682411} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &491809536 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0} + m_HighlightedColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0.019607844} + m_PressedColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0.039215688} + m_SelectedColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0.039215688} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.2 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 258682414} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1644740160} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: ResumeGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &258682414 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 491809534} + m_GameObject: {fileID: 258682411} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1024, y: 720} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &258682415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258682411} + m_CullTransparentMesh: 0 +--- !u!1 &268888276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 268888278} + - component: {fileID: 268888277} + m_Layer: 0 + m_Name: PlayerDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &268888277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268888276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5625387bc6ce43499c09f0bc30929dd, type: 3} + m_Name: + m_EditorClassIdentifier: + availableSlot: 000000 +--- !u!4 &268888278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268888276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 433.55936, y: 202.03241, z: -250.63673} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &491809534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491809538} + - component: {fileID: 491809537} + - component: {fileID: 491809536} + - component: {fileID: 491809535} + - component: {fileID: 491809539} + m_Layer: 5 + m_Name: HUDCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &491809535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491809534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &491809536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491809534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1024, y: 720} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 @@ -1245,10 +1593,10 @@ RectTransform: - {fileID: 2030411491} - {fileID: 1444128284} - {fileID: 1314518863} - - {fileID: 1764071969} - {fileID: 124801772} - {fileID: 991378527} - {fileID: 1093198193} + - {fileID: 989723333} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1339,7 +1687,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Zomhellephant + m_text: Titan m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 91906345d5ae42a4ca879c3f6c4b65fb, type: 2} m_sharedMaterial: {fileID: -2196506104538577691, guid: 91906345d5ae42a4ca879c3f6c4b65fb, type: 2} @@ -1625,6 +1973,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 581386413} m_CullTransparentMesh: 1 +--- !u!1 &605263430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 605263431} + - component: {fileID: 605263433} + - component: {fileID: 605263432} + m_Layer: 5 + m_Name: GameTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &605263431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605263430} + 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: 48557433} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 3, y: -74.999985} + m_SizeDelta: {x: 729.127, y: 114.912} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &605263432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605263430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: acafc0d571ebc1c46ac0d5bdb80762d4, type: 3} + m_FontSize: 42 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: GAME PAUSED +--- !u!222 &605263433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 605263430} + m_CullTransparentMesh: 0 --- !u!1 &649544087 GameObject: m_ObjectHideFlags: 0 @@ -1836,6 +2264,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 679650414} m_CullTransparentMesh: 1 +--- !u!1001 &748860720 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2301380300054905384, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: enemyType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2301380300054905384, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: healthSlider + value: + objectReference: {fileID: 1733139686} + - target: {fileID: 2301380300054905384, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: startingHealth + value: 3000 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalRotation.w + value: -0.42261827 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9063079 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7250609702779207134, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} + propertyPath: m_Name + value: Titan + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} --- !u!1 &806967236 GameObject: m_ObjectHideFlags: 0 @@ -2048,7 +2545,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!1 &879336556 +--- !u!1 &844235006 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2056,23 +2553,99 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 879336557} - - component: {fileID: 879336559} - - component: {fileID: 879336558} + - component: {fileID: 844235007} + - component: {fileID: 844235009} + - component: {fileID: 844235008} m_Layer: 5 - m_Name: CompleteMark + m_Name: Background (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &879336557 +--- !u!224 &844235007 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 879336556} + m_GameObject: {fileID: 844235006} + 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: 48557433} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -41.501972} + m_SizeDelta: {x: -66.04999, y: -149.05399} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &844235008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844235006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.16078432, g: 0.1137255, b: 0.2509804, a: 0.48235294} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300002, guid: 691c72ed2864a3f42a2479bbe70525cc, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &844235009 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844235006} + m_CullTransparentMesh: 0 +--- !u!1 &879336556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 879336557} + - component: {fileID: 879336559} + - component: {fileID: 879336558} + m_Layer: 5 + m_Name: CompleteMark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &879336557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 879336556} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} @@ -7394,6 +7967,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 931794853} m_CullTransparentMesh: 1 +--- !u!1 &989723332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 989723333} + - component: {fileID: 989723335} + - component: {fileID: 989723334} + m_Layer: 5 + m_Name: PauseMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &989723333 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989723332} + 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: 48557433} + - {fileID: 258682412} + - {fileID: 1471692288} + m_Father: {fileID: 491809538} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -6.0000305} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &989723334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989723332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &989723335 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989723332} + m_CullTransparentMesh: 0 --- !u!1 &991378526 GameObject: m_ObjectHideFlags: 0 @@ -7427,7 +8079,7 @@ RectTransform: m_Children: - {fileID: 931794854} m_Father: {fileID: 491809538} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7546,141 +8198,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991378526} m_CullTransparentMesh: 1 ---- !u!1 &999659690 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 999659691} - - component: {fileID: 999659693} - - component: {fileID: 999659692} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &999659691 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 999659690} - 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: 1644560531} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &999659692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 999659690} - 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: Exit - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 16 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 9 - m_fontSizeMax: 16 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 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: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &999659693 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 999659690} - m_CullTransparentMesh: 0 --- !u!1 &1029574649 GameObject: m_ObjectHideFlags: 0 @@ -8082,7 +8599,7 @@ RectTransform: - {fileID: 1146729426} - {fileID: 1029574650} m_Father: {fileID: 491809538} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9113,7 +9630,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385379977} m_CullTransparentMesh: 0 ---- !u!1 &1444128283 +--- !u!1 &1411943328 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9121,8 +9638,84 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1444128284} - - component: {fileID: 1444128285} + - component: {fileID: 1411943329} + - component: {fileID: 1411943331} + - component: {fileID: 1411943330} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1411943329 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1411943328} + 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: 48557433} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -25.560303, y: -25.560303} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1411943330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1411943328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.84705883} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300002, guid: 5362fbfb8a7d67b499bebb4e286cea71, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1411943331 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1411943328} + m_CullTransparentMesh: 0 +--- !u!1 &1444128283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1444128284} + - component: {fileID: 1444128285} m_Layer: 5 m_Name: Shop m_TagString: Untagged @@ -9284,6 +9877,140 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1471692287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1471692288} + - component: {fileID: 1471692291} + - component: {fileID: 1471692290} + - component: {fileID: 1471692289} + m_Layer: 5 + m_Name: ExitButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1471692288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471692287} + 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: 243575547} + m_Father: {fileID: 989723333} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000032425, y: -76} + m_SizeDelta: {x: 500, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1471692289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471692287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0} + m_HighlightedColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0.019607844} + m_PressedColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0.039215688} + m_SelectedColor: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 0.039215688} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.2 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1471692290} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1644740160} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: GoToMainMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1471692290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471692287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1471692291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471692287} + m_CullTransparentMesh: 0 --- !u!1 &1558343256 GameObject: m_ObjectHideFlags: 0 @@ -9412,86 +10139,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1579637354 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1579637355} - - component: {fileID: 1579637357} - - component: {fileID: 1579637356} - m_Layer: 5 - m_Name: TextPause - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1579637355 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579637354} - 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: 1764071969} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 166} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1579637356 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579637354} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Paused ---- !u!222 &1579637357 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579637354} - m_CullTransparentMesh: 0 --- !u!1 &1583886736 GameObject: m_ObjectHideFlags: 0 @@ -9721,7 +10368,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625102853} m_CullTransparentMesh: 1 ---- !u!1 &1644560530 +--- !u!1 &1644740156 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9729,149 +10376,15 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1644560531} - - component: {fileID: 1644560534} - - component: {fileID: 1644560533} - - component: {fileID: 1644560532} - m_Layer: 5 - m_Name: ExitButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1644560531 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644560530} - 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: 999659691} - m_Father: {fileID: 1705535179} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 11} - m_SizeDelta: {x: 300, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1644560532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644560530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 0} - m_HighlightedColor: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 0.3529412} - m_PressedColor: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 0.7058824} - m_SelectedColor: {r: 0.41509432, g: 0.41509432, b: 0.41509432, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.2 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1644560533} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1644740160} - m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp - m_MethodName: GoToMainMenu - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1644560533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644560530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1644560534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644560530} - m_CullTransparentMesh: 0 ---- !u!1 &1644740156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1644740158} - - component: {fileID: 1644740157} - - component: {fileID: 1644740159} - - component: {fileID: 1644740163} - - component: {fileID: 1644740160} - - component: {fileID: 1644740161} - - component: {fileID: 1644740162} - m_Layer: 0 - m_Name: GameManager + - component: {fileID: 1644740158} + - component: {fileID: 1644740157} + - component: {fileID: 1644740159} + - component: {fileID: 1644740163} + - component: {fileID: 1644740160} + - component: {fileID: 1644740161} + - component: {fileID: 1644740162} + m_Layer: 0 + m_Name: GameManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9929,11 +10442,12 @@ MonoBehaviour: isShopOpen: 1 isShopping: 0 isEnemyActive: 0 + isBoss: 0 petFactory: {fileID: 1713238116} currentWeapon: 0 availableWeapon: 01000000 hudManager: {fileID: 491809539} - enemySpawner: {fileID: 7250609702671589678} + enemySpawner: {fileID: 0} --- !u!114 &1644740160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9946,7 +10460,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f79daad02ad1f44c9bbd82941cfa86f, type: 3} m_Name: m_EditorClassIdentifier: - pauseMenu: {fileID: 1764071968} + pauseMenu: {fileID: 989723332} --- !u!114 &1644740161 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9993,6 +10507,141 @@ MonoBehaviour: inputText: {fileID: 1146729427} animPlayer: {fileID: 1186615828} animSpeedControl: 1 +--- !u!1 &1674623365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1674623366} + - component: {fileID: 1674623368} + - component: {fileID: 1674623367} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1674623366 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674623365} + 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: 258682412} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 300, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1674623367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674623365} + 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: Resume + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 10348e50183ba494ca1e7adc5dbe4980, type: 2} + m_sharedMaterial: {fileID: 8615086766700028954, guid: 10348e50183ba494ca1e7adc5dbe4980, 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 16 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1674623368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674623365} + m_CullTransparentMesh: 0 --- !u!1 &1678682907 GameObject: m_ObjectHideFlags: 0 @@ -10129,44 +10778,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1678682907} m_CullTransparentMesh: 1 ---- !u!1 &1705535178 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1705535179} - m_Layer: 5 - m_Name: PausedMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1705535179 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1705535178} - 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: 1857233381} - - {fileID: 1644560531} - m_Father: {fileID: 1764071969} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1713238115 GameObject: m_ObjectHideFlags: 0 @@ -10342,6 +10953,10 @@ PrefabInstance: propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: ce45a11a59435024bb833eba326b39f1, type: 2} + - target: {fileID: 9500000, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} + propertyPath: m_ApplyRootMotion + value: 1 + objectReference: {fileID: 0} - target: {fileID: 13700000, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} propertyPath: m_Mesh value: @@ -10439,84 +11054,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &1764071968 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1764071969} - - component: {fileID: 1764071971} - - component: {fileID: 1764071970} - m_Layer: 5 - m_Name: PauseMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1764071969 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1764071968} - 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: 1579637355} - - {fileID: 1705535179} - m_Father: {fileID: 491809538} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 640, y: 480} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1764071970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1764071968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df5dbb97b18b9a74085c586c68441d8a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1764071971 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1764071968} - m_CullTransparentMesh: 0 --- !u!1 &1823714612 GameObject: m_ObjectHideFlags: 0 @@ -10580,174 +11117,22 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &1823714615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1823714612} - 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!1 &1823918978 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1823918979} - - component: {fileID: 1823918981} - - component: {fileID: 1823918980} - m_Layer: 5 - m_Name: CoinImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1823918979 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1823918978} - 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: 108465975} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 42, y: 32} - m_SizeDelta: {x: 32, y: 32} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1823918980 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1823918978} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 49b953915f907b84b85274cc0dc98a03, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1823918981 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1823918978} - m_CullTransparentMesh: 1 ---- !u!1 &1853576961 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1853576962} - - component: {fileID: 1853576964} - - component: {fileID: 1853576963} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1853576962 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853576961} - 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: 806967237} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1853576963 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853576961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1853576964 -CanvasRenderer: + m_ReverseArrangement: 0 +--- !u!114 &1823714615 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1853576961} - m_CullTransparentMesh: 1 ---- !u!1 &1857233380 + m_GameObject: {fileID: 1823714612} + 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!1 &1823918978 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10755,101 +11140,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1857233381} - - component: {fileID: 1857233384} - - component: {fileID: 1857233383} - - component: {fileID: 1857233382} + - component: {fileID: 1823918979} + - component: {fileID: 1823918981} + - component: {fileID: 1823918980} m_Layer: 5 - m_Name: ResumeButton + m_Name: CoinImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1857233381 +--- !u!224 &1823918979 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857233380} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1823918978} + 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: 1859301095} - m_Father: {fileID: 1705535179} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 108465975} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 48} - m_SizeDelta: {x: 300, y: 25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 42, y: 32} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1857233382 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857233380} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 0} - m_HighlightedColor: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 0.3529412} - m_PressedColor: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 0.7058824} - m_SelectedColor: {r: 0.41509432, g: 0.41509432, b: 0.41509432, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.2 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1857233383} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1644740160} - m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp - m_MethodName: ResumeGame - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1857233383 +--- !u!114 &1823918980 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857233380} + m_GameObject: {fileID: 1823918978} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -10857,14 +11184,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 49b953915f907b84b85274cc0dc98a03, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10873,15 +11200,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1857233384 +--- !u!222 &1823918981 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857233380} - m_CullTransparentMesh: 0 ---- !u!1 &1859301094 + m_GameObject: {fileID: 1823918978} + m_CullTransparentMesh: 1 +--- !u!1 &1853576961 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10889,46 +11216,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1859301095} - - component: {fileID: 1859301097} - - component: {fileID: 1859301096} + - component: {fileID: 1853576962} + - component: {fileID: 1853576964} + - component: {fileID: 1853576963} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1859301095 +--- !u!224 &1853576962 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1859301094} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1853576961} + 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: 1857233381} + m_Father: {fileID: 806967237} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 25} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1859301096 +--- !u!114 &1853576963 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1859301094} + m_GameObject: {fileID: 1853576961} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -10939,83 +11266,24 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Resume - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 16 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 9 - m_fontSizeMax: 16 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 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: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1859301097 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1853576964 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1859301094} - m_CullTransparentMesh: 0 + m_GameObject: {fileID: 1853576961} + m_CullTransparentMesh: 1 --- !u!1 &1864229085 GameObject: m_ObjectHideFlags: 0 @@ -11862,73 +12130,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114283110} m_CullTransparentMesh: 1 ---- !u!1001 &7250609702671589677 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7250609702778708473, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: enemyType - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708473, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: healthSlider - value: - objectReference: {fileID: 1733139686} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalPosition.x - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalRotation.w - value: -0.42261827 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalRotation.y - value: 0.9063079 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 230 - objectReference: {fileID: 0} - - target: {fileID: 7250609702778708478, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7250609702779207134, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - propertyPath: m_Name - value: Titan - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} ---- !u!1 &7250609702671589678 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7250609702779207134, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3} - m_PrefabInstance: {fileID: 7250609702671589677} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index b1620336092aec0312a9b0c4eb24fe88321313dd..2b6d6c877c17b59f4e13d971cb228a6c852c14d7 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -2146,7 +2146,7 @@ Animator: m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 10358ef45631f4a428a83b9a61a18472, type: 2} - m_CullingMode: 0 + m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 diff --git a/Assets/Scripts/Enemy/BossHealth.cs b/Assets/Scripts/Enemy/BossHealth.cs index 7b59bc00880749ab50fe1731b68075a335071ad5..61fce31c93957e941aeb72e224dfc84668c248b5 100644 --- a/Assets/Scripts/Enemy/BossHealth.cs +++ b/Assets/Scripts/Enemy/BossHealth.cs @@ -32,7 +32,24 @@ public class BossHealth : EnemyHealth        }    } + void Death () +   { +       //set isdead +       isDead = true; + +       //SetCapcollider ke trigger +       capsuleCollider.isTrigger = true; + +       //trigger play animation Dead +       anim.SetTrigger("Dead"); + +       //Play Sound Dead +       enemyAudio.clip = deathClip; +       enemyAudio.Play(); + UpdateActiveQuestStatus(); +   } + void UpdateActiveQuestStatus() { - BossQuestManager.questManager.UpdateQuestStatus("Zomhellephant"); + BossQuestManager.questManager.UpdateQuestStatus("Titan"); } } \ No newline at end of file diff --git a/Assets/Scripts/Enemy/EnemyHealth.cs b/Assets/Scripts/Enemy/EnemyHealth.cs index ab207c56dcf094e1eb0b49db5b9ba18183f43e03..b0487ec540c00120b83ad7148ac427ee110601f6 100644 --- a/Assets/Scripts/Enemy/EnemyHealth.cs +++ b/Assets/Scripts/Enemy/EnemyHealth.cs @@ -106,7 +106,7 @@ public class EnemyHealth : MonoBehaviour QuestManager.questManager.UpdateQuestStatus("Hellephant"); break; case EnemyType.Titan: - QuestManager.questManager.UpdateQuestStatus("Titan"); + BossQuestManager.questManager.UpdateQuestStatus("Titan"); break; default: Debug.Log("enemy type is not defined"); diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 823f50bbc5c49dae1dc0f4ff0043eea82b85a7e5..12d444b3421d6640933ee2c91b64ee1eb186749e 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -18,6 +18,7 @@ public class GameManager : MonoBehaviour public bool isShopOpen = true; // shop only open after finishing quest public bool isShopping = false; // sedang berbelanja public bool isEnemyActive = true; + public bool isBoss = false; public PetFactory petFactory; // Weapon @@ -37,7 +38,9 @@ public class GameManager : MonoBehaviour private void Awake() { - enemySpawner.SetActive(isEnemyActive); + if (!isBoss) { + enemySpawner.SetActive(isEnemyActive); + } if (gameManager == null) { gameManager = this; diff --git a/Assets/Scripts/Managers/BossQuestManager.cs b/Assets/Scripts/Managers/BossQuestManager.cs index ba7743ef22453527f126b74f7f2f086afeaa0c0f..4aea36adba2d7025f974c842814418bd713b4e80 100644 --- a/Assets/Scripts/Managers/BossQuestManager.cs +++ b/Assets/Scripts/Managers/BossQuestManager.cs @@ -4,6 +4,10 @@ using UnityEngine; public class BossQuestManager : QuestManager { + void Awake() { + GameManager gameManager = FindObjectOfType<GameManager>(); + gameManager.isBoss = true; + } void Start() { quests[0] = GenerateQuest(); ShowQuestToUI(); diff --git a/Assets/Scripts/Managers/QuestManager.cs b/Assets/Scripts/Managers/QuestManager.cs index 8b365c642e9a13c368e2cc4de953f1603f0a8e57..2a9572316f244f812a76917d8fae06fb011a3b4b 100644 --- a/Assets/Scripts/Managers/QuestManager.cs +++ b/Assets/Scripts/Managers/QuestManager.cs @@ -25,6 +25,11 @@ public class QuestManager : MonoBehaviour protected void Awake() { + GameManager gameManager = FindObjectOfType<GameManager>(); + if (gameManager != null) + { + gameManager.isBoss = false; + } if (questManager == null) { questManager = this; diff --git a/Assets/Scripts/Menu/CheatMenu.cs b/Assets/Scripts/Menu/CheatMenu.cs index 319c052ba1336d1968b1642e7c5aeeb02f6205a4..c39a92e0ed9b52fb31607f534bbed08aeda146fd 100644 --- a/Assets/Scripts/Menu/CheatMenu.cs +++ b/Assets/Scripts/Menu/CheatMenu.cs @@ -46,7 +46,7 @@ public class CheatMenu : MonoBehaviour public void toggleBoolCheat(string cheatInput) { // make bool hitkill, nodamage, etc cheat true if false and vice versa - if (cheatInput == "1hitkill") { + if (cheatInput == "rambo") { hitkill = !hitkill; } else if (cheatInput == "immortal") { nodamage = !nodamage; diff --git a/Assets/Scripts/Shop/ShopTrigger.cs b/Assets/Scripts/Shop/ShopTrigger.cs index b496f9b36e741dc3aca4d0e7aaf5a058edf26537..6df5b3f8daff8ed9ca2b422ea602806ee4b6a44f 100644 --- a/Assets/Scripts/Shop/ShopTrigger.cs +++ b/Assets/Scripts/Shop/ShopTrigger.cs @@ -29,7 +29,9 @@ public class ShopTrigger : MonoBehaviour shopTimerUI.SetActive(false); shopUI.SetActive(false); GameManager.gameManager.isShopping = false; - GameManager.gameManager.TriggerSpawningEnemy(); + if (!GameManager.gameManager.isBoss) { + GameManager.gameManager.TriggerSpawningEnemy(); + } } } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 3c2735aee76e56358328136beec0b7711c1ae7cc..bbc77ab80ea862e64b0eeaff9ede4a6a06ebdd14 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -26,4 +26,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/QuestOver.unity guid: a9f84df88a552ad42a2d3916e4ceb3f4 + - enabled: 1 + path: Assets/Scenes/GameOver.unity + guid: 61604cf4c54f4704f8b6558f4a81ec64 m_configObjects: {}