diff --git a/Assets/Animations/Crow/Crow.controller b/Assets/Animations/Crow/Crow.controller index 8b09eed..ec7cbb2 100644 --- a/Assets/Animations/Crow/Crow.controller +++ b/Assets/Animations/Crow/Crow.controller @@ -61,7 +61,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -96,7 +96,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -4997883480733216339, guid: f33e0b3b8cad1984b9d447b6aa8e16b9, type: 3} + m_Motion: {fileID: -4997883480733216339, guid: aae39a2542433d04681acfa2a86b7413, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/GameData/Action/Abilities/Vector Fence.asset b/Assets/GameData/Action/Abilities/Vector Fence.asset index 57bb620..8666996 100644 --- a/Assets/GameData/Action/Abilities/Vector Fence.asset +++ b/Assets/GameData/Action/Abilities/Vector Fence.asset @@ -19,8 +19,8 @@ MonoBehaviour: abilityDuration: 5 abilityCooldownTime: 3 abilityApplicationRadius: 15 - prefab: {fileID: 9694722736535169, guid: 9b94ed8895919e84aa669628b0761eaf, type: 3} - wallLength: 8 - wallWidth: 0.01 + prefab: {fileID: 2913764722185399564, guid: c0412480114e1c24abd7f313d3559786, type: 3} + wallLength: 10 + wallWidth: 1 wallHeight: 2 scaleUpDuration: 1 diff --git a/Assets/GameData/NetworkPrefabs.asset b/Assets/GameData/NetworkPrefabs.asset index 8360ccf..01ea449 100644 --- a/Assets/GameData/NetworkPrefabs.asset +++ b/Assets/GameData/NetworkPrefabs.asset @@ -80,7 +80,7 @@ MonoBehaviour: SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} - Override: 0 - Prefab: {fileID: 9694722736535169, guid: 9b94ed8895919e84aa669628b0761eaf, type: 3} + Prefab: {fileID: 2913764722185399564, guid: c0412480114e1c24abd7f313d3559786, type: 3} SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Models/Crow/DiveV2.fbx b/Assets/Models/Crow/DiveV2.fbx new file mode 100644 index 0000000..e7e6d53 Binary files /dev/null and b/Assets/Models/Crow/DiveV2.fbx differ diff --git a/Assets/Models/Crow/DiveV2.fbx.meta b/Assets/Models/Crow/DiveV2.fbx.meta new file mode 100644 index 0000000..4b5997b --- /dev/null +++ b/Assets/Models/Crow/DiveV2.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: aae39a2542433d04681acfa2a86b7413 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/RadiusAbility.mat b/Assets/Models/RadiusAbility.mat new file mode 100644 index 0000000..d89b114 --- /dev/null +++ b/Assets/Models/RadiusAbility.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RadiusAbility + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4454263972ac84242b5af0212232f9b6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4454263972ac84242b5af0212232f9b6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0.029001867, g: 0.8426533, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &5871270413733145299 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Models/RadiusAbility.mat.meta b/Assets/Models/RadiusAbility.mat.meta new file mode 100644 index 0000000..03666e9 --- /dev/null +++ b/Assets/Models/RadiusAbility.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fb3b39faafc2974fb2f65c3fdf57691 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/UV sphere1.fbx b/Assets/Models/UV sphere1.fbx new file mode 100644 index 0000000..9e6ebbf Binary files /dev/null and b/Assets/Models/UV sphere1.fbx differ diff --git a/Assets/Models/UV sphere1.fbx.meta b/Assets/Models/UV sphere1.fbx.meta new file mode 100644 index 0000000..58ee94d --- /dev/null +++ b/Assets/Models/UV sphere1.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 03a427b0ee9ee2241a558c791942f550 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/VectorFence.meta b/Assets/Models/VectorFence.meta new file mode 100644 index 0000000..845c013 --- /dev/null +++ b/Assets/Models/VectorFence.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c283ce4dc3ca54947b678229b5e3a2e6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/VectorFence/Fence.mat b/Assets/Models/VectorFence/Fence.mat new file mode 100644 index 0000000..7061201 --- /dev/null +++ b/Assets/Models/VectorFence/Fence.mat @@ -0,0 +1,134 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fence + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: d80cca36ff7ab3344aa829422cbb4b46, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: e9820e9a8c8f8944abb5494d27d8c558, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d80cca36ff7ab3344aa829422cbb4b46, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &69967255101907696 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Models/VectorFence/Fence.mat.meta b/Assets/Models/VectorFence/Fence.mat.meta new file mode 100644 index 0000000..4c9ec33 --- /dev/null +++ b/Assets/Models/VectorFence/Fence.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ca9ba0dda9d7224a90e02b58b46b0e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/VectorFence/Wall.fbx b/Assets/Models/VectorFence/Wall.fbx new file mode 100644 index 0000000..5e94c81 Binary files /dev/null and b/Assets/Models/VectorFence/Wall.fbx differ diff --git a/Assets/Models/VectorFence/Wall.fbx.meta b/Assets/Models/VectorFence/Wall.fbx.meta new file mode 100644 index 0000000..f3938eb --- /dev/null +++ b/Assets/Models/VectorFence/Wall.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 5e9a00482b0540d4ba0506e492ae4c9e +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 100 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/VectorFence/Wall.png b/Assets/Models/VectorFence/Wall.png new file mode 100644 index 0000000..c0afd07 Binary files /dev/null and b/Assets/Models/VectorFence/Wall.png differ diff --git a/Assets/Models/VectorFence/Wall.png.meta b/Assets/Models/VectorFence/Wall.png.meta new file mode 100644 index 0000000..72e453a --- /dev/null +++ b/Assets/Models/VectorFence/Wall.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: d80cca36ff7ab3344aa829422cbb4b46 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/VectorFence/wall_normal.png b/Assets/Models/VectorFence/wall_normal.png new file mode 100644 index 0000000..e0e7bb8 Binary files /dev/null and b/Assets/Models/VectorFence/wall_normal.png differ diff --git a/Assets/Models/VectorFence/wall_normal.png.meta b/Assets/Models/VectorFence/wall_normal.png.meta new file mode 100644 index 0000000..ec714ab --- /dev/null +++ b/Assets/Models/VectorFence/wall_normal.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: e9820e9a8c8f8944abb5494d27d8c558 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Abilities/RadiusIndicator.prefab b/Assets/Prefabs/Abilities/RadiusIndicator.prefab new file mode 100644 index 0000000..90e47e1 --- /dev/null +++ b/Assets/Prefabs/Abilities/RadiusIndicator.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5073345019512663201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2777477261022030377} + m_Layer: 0 + m_Name: RadiusIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2777477261022030377 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073345019512663201} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4687263860059193176} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5081811734158104755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2777477261022030377} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5fb3b39faafc2974fb2f65c3fdf57691, type: 2} + - target: {fileID: 919132149155446097, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + propertyPath: m_Name + value: UV sphere1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} +--- !u!4 &4687263860059193176 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 03a427b0ee9ee2241a558c791942f550, type: 3} + m_PrefabInstance: {fileID: 5081811734158104755} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Abilities/RadiusIndicator.prefab.meta b/Assets/Prefabs/Abilities/RadiusIndicator.prefab.meta new file mode 100644 index 0000000..431c4a2 --- /dev/null +++ b/Assets/Prefabs/Abilities/RadiusIndicator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 37e3c89fabd00354a819afc27d72585e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Abilities/VectorFence.prefab b/Assets/Prefabs/Abilities/VectorFence.prefab new file mode 100644 index 0000000..0479ec9 --- /dev/null +++ b/Assets/Prefabs/Abilities/VectorFence.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2913764722185399564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4839726717759838640} + - component: {fileID: 1360000291139012928} + - component: {fileID: 2537432419071869850} + - component: {fileID: 3705995021349099314} + - component: {fileID: 2839643003722153248} + - component: {fileID: 887502323443815574} + m_Layer: 0 + m_Name: VectorFence + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4839726717759838640 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2913764722185399564} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1094605448312870338} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1360000291139012928 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2913764722185399564} + m_Material: {fileID: 13400000, guid: 0d12993c8fabfeb4e971a0197446a3ba, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.21, y: 1, z: 0.5} + m_Center: {x: 0, y: 0, z: 0} +--- !u!208 &2537432419071869850 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2913764722185399564} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.605, y: 0.5, z: 0.25} + m_MoveThreshold: 0.01 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!114 &3705995021349099314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2913764722185399564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 3760018721 + InScenePlacedSourceGlobalObjectIdHash: 0 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 +--- !u!114 &2839643003722153248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2913764722185399564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a951069c9ff70a479b426f4310ca775, type: 3} + m_Name: + m_EditorClassIdentifier: + Ability: {fileID: 11400000, guid: 834f18926d3364d40ab9894f716b4e3b, type: 2} + m_Agents: [] + searchRadius: 5 +--- !u!114 &887502323443815574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2913764722185399564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} + m_Name: + m_EditorClassIdentifier: + UseUnreliableDeltas: 0 + SyncPositionX: 0 + SyncPositionY: 0 + SyncPositionZ: 0 + SyncRotAngleX: 0 + SyncRotAngleY: 0 + SyncRotAngleZ: 0 + SyncScaleX: 0 + SyncScaleY: 1 + SyncScaleZ: 0 + PositionThreshold: 0.001 + RotAngleThreshold: 0.01 + ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 0 + InLocalSpace: 0 + Interpolate: 1 + SlerpPosition: 0 +--- !u!1001 &628930161979961897 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4839726717759838640} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalScale.x + value: 0.13 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalPosition.y + value: -0.57 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3ca9ba0dda9d7224a90e02b58b46b0e9, type: 2} + - target: {fileID: 919132149155446097, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + propertyPath: m_Name + value: Wall + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} +--- !u!4 &1094605448312870338 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5e9a00482b0540d4ba0506e492ae4c9e, type: 3} + m_PrefabInstance: {fileID: 628930161979961897} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Abilities/VectorFence.prefab.meta b/Assets/Prefabs/Abilities/VectorFence.prefab.meta new file mode 100644 index 0000000..1f50357 --- /dev/null +++ b/Assets/Prefabs/Abilities/VectorFence.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0412480114e1c24abd7f313d3559786 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Character/PlayerAvatar.prefab b/Assets/Prefabs/Character/PlayerAvatar.prefab index f0c0034..80ea8cc 100644 --- a/Assets/Prefabs/Character/PlayerAvatar.prefab +++ b/Assets/Prefabs/Character/PlayerAvatar.prefab @@ -1,89 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3201343961422696852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9134920137223146164} - - component: {fileID: 90011182543570099} - - component: {fileID: 4741201442211952944} - m_Layer: 3 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &9134920137223146164 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3201343961422696852} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.02, z: 0} - m_LocalScale: {x: 1, y: 0.3, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6009713983291384766} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &90011182543570099 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3201343961422696852} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &4741201442211952944 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3201343961422696852} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - - {fileID: 2100000, guid: 3a415e4b90d5e7346a544b94fa0f34bd, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &9073758047842524076 GameObject: m_ObjectHideFlags: 0 @@ -152,7 +68,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_ClientVisualsAnimator: {fileID: 1829276847453002016} m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2} ---- !u!1001 &2846064494856670853 +--- !u!1001 &1604529912481146835 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -160,18 +76,77 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6009713983291384766} m_Modifications: - - target: {fileID: 1322199249233456991, guid: bfc4217c8584ae04385dcac0be33d77e, type: 3} - propertyPath: m_Materials.Array.size - value: 2 + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1322199249233456991, guid: bfc4217c8584ae04385dcac0be33d77e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - - target: {fileID: 1322199249233456991, guid: bfc4217c8584ae04385dcac0be33d77e, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 3a415e4b90d5e7346a544b94fa0f34bd, type: 2} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5073345019512663201, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_Name + value: RadiusIndicator + objectReference: {fileID: 0} + - target: {fileID: 5073345019512663201, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} +--- !u!4 &3517306559314791930 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2777477261022030377, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + m_PrefabInstance: {fileID: 1604529912481146835} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5777075014631279474 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5073345019512663201, guid: 37e3c89fabd00354a819afc27d72585e, type: 3} + m_PrefabInstance: {fileID: 1604529912481146835} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2846064494856670853 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6009713983291384766} + m_Modifications: - target: {fileID: 3764456690617734740, guid: bfc4217c8584ae04385dcac0be33d77e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -405,30 +380,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4427112597162199222, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} - insertIndex: -1 - addedObject: {fileID: 1299794463882230052} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} ---- !u!1 &301708961561843197 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4427112597162199222, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} - m_PrefabInstance: {fileID: 4134200829793049931} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1299794463882230052 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301708961561843197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.1 --- !u!4 &2580402896402371906 stripped Transform: m_CorrespondingSourceObject: {fileID: 1914257455311964169, guid: d3e4ffd5da62ee94e9eccf3ab52ec129, type: 3} @@ -586,7 +539,7 @@ PrefabInstance: addedObject: {fileID: 1387471517613578449} - targetCorrespondingSourceObject: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} insertIndex: -1 - addedObject: {fileID: 9134920137223146164} + addedObject: {fileID: 3517306559314791930} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 4600110157238723781, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3} insertIndex: -1 @@ -1081,7 +1034,7 @@ MonoBehaviour: abilitiesUI: [] currentAbilityIndicator: {fileID: 92142163933926358} wallIndicator: {fileID: 1257869342993333690} - radiusIndicator: {fileID: 3201343961422696852} + radiusIndicator: {fileID: 5777075014631279474} validPlacementMaterial: {fileID: 2100000, guid: 3a415e4b90d5e7346a544b94fa0f34bd, type: 2} invalidPlacementMaterial: {fileID: 2100000, guid: 17c37eab78656344ebb7bb5c1657b81c, type: 2} wallRotationSpeed: 1.2 diff --git a/Assets/Scenes/BossRoom/DungeonEntrance.unity b/Assets/Scenes/BossRoom/DungeonEntrance.unity index 11fe355..4d7be27 100644 --- a/Assets/Scenes/BossRoom/DungeonEntrance.unity +++ b/Assets/Scenes/BossRoom/DungeonEntrance.unity @@ -123,6 +123,54 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &23828395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 23828396} + - component: {fileID: 23828397} + m_Layer: 0 + m_Name: Cylinder (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &23828396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23828395} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.54, y: 2.71, z: 7.22} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &23828397 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23828395} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 1, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 --- !u!1 &286165426 GameObject: m_ObjectHideFlags: 0 @@ -163,6 +211,13 @@ Transform: - {fileID: 249976107358570836} - {fileID: 5590359088119101749} - {fileID: 1202519841281415540} + - {fileID: 1727201761} + - {fileID: 1006116860} + - {fileID: 477647223} + - {fileID: 1889561964} + - {fileID: 23828396} + - {fileID: 586197737} + - {fileID: 1799421584} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &286165428 @@ -179,10 +234,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Platforms: [] numberOfPlayers: 5 - platforms: [] - platformTransforms: [] - centerPoint: {fileID: 0} - shapeRadius: 5 --- !u!114 &286165429 MonoBehaviour: m_ObjectHideFlags: 0 @@ -204,144 +255,102 @@ MonoBehaviour: SpawnWithObservers: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 ---- !u!1001 &787159444 -PrefabInstance: +--- !u!1 &477647222 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5590359088119101749} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) (1) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 787159447} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &787159445 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 787159444} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1 &787159446 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 787159444} + serializedVersion: 6 + m_Component: + - component: {fileID: 477647223} + - component: {fileID: 477647224} + m_Layer: 0 + m_Name: Cylinder (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &477647223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &787159447 -MonoBehaviour: + m_GameObject: {fileID: 477647222} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.98, y: 2.71, z: -3.33} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &477647224 +NavMeshObstacle: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 787159446} + m_GameObject: {fileID: 477647222} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &787159448 stripped + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!1 &586197736 GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 787159444} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 586197737} + - component: {fileID: 586197738} + m_Layer: 0 + m_Name: Cylinder (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &586197737 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586197736} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.91, y: 2.71, z: 5.21} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &586197738 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586197736} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 --- !u!1 &949745746 GameObject: m_ObjectHideFlags: 0 @@ -460,558 +469,54 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &993879967 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1223475210011116500} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) (1) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 993879970} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &993879968 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 993879967} - m_PrefabAsset: {fileID: 0} ---- !u!1 &993879969 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 993879967} - m_PrefabAsset: {fileID: 0} ---- !u!114 &993879970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 993879969} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &993879971 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 993879967} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1307373269 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6996768595326639848} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) (1) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 1307373272} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &1307373270 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1307373269} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1307373271 stripped +--- !u!1 &1006116859 GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1307373269} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1307373272 -MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307373271} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &1307373273 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1307373269} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1314893371 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 249976107358570836} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) (1) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 1314893374} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &1314893372 stripped + serializedVersion: 6 + m_Component: + - component: {fileID: 1006116860} + - component: {fileID: 1006116861} + m_Layer: 0 + m_Name: Cylinder (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1006116860 Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1314893371} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1314893373 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1314893371} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1314893374 -MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314893373} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &1314893375 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1314893371} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1399809035 -PrefabInstance: - m_ObjectHideFlags: 0 + m_GameObject: {fileID: 1006116859} serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5195700795859028913} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) (1) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 1399809038} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &1399809036 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1399809035} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1399809037 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1399809035} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1399809038 -MonoBehaviour: + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.8, y: 2.71, z: 5.05} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &1006116861 +NavMeshObstacle: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1399809037} + m_GameObject: {fileID: 1006116859} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &1399809039 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1399809035} - m_PrefabAsset: {fileID: 0} + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 --- !u!1 &1415641637 GameObject: m_ObjectHideFlags: 0 @@ -1118,144 +623,150 @@ Transform: m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1444336604 -PrefabInstance: +--- !u!1 &1727201760 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3169561862507413951} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 9.999999 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 9.999999 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 9.999999 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 1444336607} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &1444336605 stripped + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1727201761} + - component: {fileID: 1727201762} + m_Layer: 0 + m_Name: Cylinder (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1727201761 Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1444336604} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727201760} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.8154, y: 2.71, z: -3.2554} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &1727201762 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1 &1444336606 stripped + m_GameObject: {fileID: 1727201760} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!1 &1799421583 GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1444336604} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &1444336607 -MonoBehaviour: + serializedVersion: 6 + m_Component: + - component: {fileID: 1799421584} + - component: {fileID: 1799421585} + m_Layer: 0 + m_Name: Cylinder (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1799421584 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444336606} + m_GameObject: {fileID: 1799421583} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6, y: 2.71, z: 0.37} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &1799421585 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1799421583} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &1444336608 stripped + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!1 &1889561963 GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 1444336604} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1889561964} + - component: {fileID: 1889561965} + m_Layer: 0 + m_Name: Cylinder (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1889561964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1889561963} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.8, y: 2.71, z: 0.44} + m_LocalScale: {x: 2.7692316, y: 2.7692316, z: 2.7692316} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 286165427} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &1889561965 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1889561963} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 --- !u!1 &2085312385 GameObject: m_ObjectHideFlags: 0 @@ -1305,144 +816,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2121383717 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1326862948614608678} - m_Modifications: - - target: {fileID: 1318935079978438871, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133223516629, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Name - value: CFXR3 Magic Aura A (Runic) (1) - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.x - value: 9.999999 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.y - value: 9.999999 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalScale.z - value: 9.999999 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.y - value: -0.6 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133390621043, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3280519133430969737, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Intensity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7893921968227561089, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - insertIndex: -1 - addedObject: {fileID: 2121383720} - m_SourcePrefab: {fileID: 100100000, guid: a71be3e7990efb040a07565c43cbb198, type: 3} ---- !u!4 &2121383718 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3280519133390621042, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 2121383717} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2121383719 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133430969738, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 2121383717} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2121383720 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2121383719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &2121383721 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3280519133390621005, guid: a71be3e7990efb040a07565c43cbb198, type: 3} - m_PrefabInstance: {fileID: 2121383717} - m_PrefabAsset: {fileID: 0} --- !u!33 &216885776115017224 MeshFilter: m_ObjectHideFlags: 0 @@ -1509,7 +882,6 @@ GameObject: - component: {fileID: 249976107358570838} - component: {fileID: 249976107358570841} - component: {fileID: 249976107358570840} - - component: {fileID: 249976107358570842} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 (1) m_TagString: Untagged @@ -1529,8 +901,7 @@ Transform: m_LocalPosition: {x: 4.9100003, y: -0.19446063, z: 5.1362114} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1314893372} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &249976107358570837 @@ -1568,10 +939,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 1314893375} + barrierObject: {fileID: 586197736} --- !u!64 &249976107358570839 MeshCollider: m_ObjectHideFlags: 0 @@ -1629,20 +997,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &249976107358570842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248836275302926266} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!33 &1189011597376318600 MeshFilter: m_ObjectHideFlags: 0 @@ -1724,7 +1078,6 @@ GameObject: - component: {fileID: 1223475210011116502} - component: {fileID: 1223475210011116505} - component: {fileID: 1223475210011116504} - - component: {fileID: 1223475210011116506} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 (3) m_TagString: Untagged @@ -1744,8 +1097,7 @@ Transform: m_LocalPosition: {x: -4.7962, y: -0.19446063, z: 0.42381167} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 993879968} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1223475210011116501 @@ -1783,10 +1135,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 993879971} + barrierObject: {fileID: 1889561963} --- !u!64 &1223475210011116503 MeshCollider: m_ObjectHideFlags: 0 @@ -1844,20 +1193,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1223475210011116506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222362877196586298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!1 &1245558867416036815 GameObject: m_ObjectHideFlags: 0 @@ -1940,7 +1275,6 @@ GameObject: - component: {fileID: 1326862948614608680} - component: {fileID: 1326862948614608683} - component: {fileID: 1326862948614608682} - - component: {fileID: 1326862948614608684} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 (5) m_TagString: Untagged @@ -1960,8 +1294,7 @@ Transform: m_LocalPosition: {x: -3.7965999, y: -0.19446063, z: 5.035412} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 2121383718} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1326862948614608679 @@ -1999,10 +1332,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 2121383721} + barrierObject: {fileID: 1006116859} --- !u!64 &1326862948614608681 MeshCollider: m_ObjectHideFlags: 0 @@ -2060,20 +1390,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1326862948614608684 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1325723386991991240} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!33 &3136216454265548515 MeshFilter: m_ObjectHideFlags: 0 @@ -2140,7 +1456,6 @@ GameObject: - component: {fileID: 3169561862507413953} - component: {fileID: 3169561862507413956} - component: {fileID: 3169561862507413955} - - component: {fileID: 3169561862507413957} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 (6) m_TagString: Untagged @@ -2160,8 +1475,7 @@ Transform: m_LocalPosition: {x: -1.8309999, y: -0.19446063, z: -3.259588} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1444336605} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3169561862507413952 @@ -2199,10 +1513,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 1444336608} + barrierObject: {fileID: 1727201760} --- !u!64 &3169561862507413954 MeshCollider: m_ObjectHideFlags: 0 @@ -2260,20 +1571,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &3169561862507413957 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3166196630092877649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!1 &5194562349502858591 GameObject: m_ObjectHideFlags: 0 @@ -2290,7 +1587,6 @@ GameObject: - component: {fileID: 5215249593494578415} - component: {fileID: 5215249593494578418} - component: {fileID: 5215249593494578417} - - component: {fileID: 5215249593494578419} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 (2) m_TagString: Untagged @@ -2310,8 +1606,7 @@ Transform: m_LocalPosition: {x: 0.5882, y: -0.19446063, z: 7.215212} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1399809036} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &5208245287638280169 @@ -2399,10 +1694,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 1399809039} + barrierObject: {fileID: 23828395} --- !u!64 &5215249593494578416 MeshCollider: m_ObjectHideFlags: 0 @@ -2460,20 +1752,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5215249593494578419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5194562349502858591} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!4 &5590359088119101749 Transform: m_ObjectHideFlags: 0 @@ -2486,8 +1764,7 @@ Transform: m_LocalPosition: {x: 5.9768, y: -0.19446063, z: 0.36501193} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 787159445} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5591479862615341019 @@ -2506,7 +1783,6 @@ GameObject: - component: {fileID: 5615547279758710379} - component: {fileID: 5615547279758710382} - component: {fileID: 5615547279758710381} - - component: {fileID: 5615547279758710383} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 m_TagString: Untagged @@ -2599,10 +1875,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 787159448} + barrierObject: {fileID: 1799421583} --- !u!64 &5615547279758710380 MeshCollider: m_ObjectHideFlags: 0 @@ -2660,20 +1933,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5615547279758710383 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5591479862615341019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!1 &6995672694789591046 GameObject: m_ObjectHideFlags: 0 @@ -2690,7 +1949,6 @@ GameObject: - component: {fileID: 7017483914677023158} - component: {fileID: 7017483914677023161} - component: {fileID: 7017483914677023160} - - component: {fileID: 7017483914677023162} m_Layer: 0 m_Name: SM_Env_Hell_Circle_01 (4) m_TagString: Untagged @@ -2710,8 +1968,7 @@ Transform: m_LocalPosition: {x: 2.978, y: -0.19446063, z: -3.343588} m_LocalScale: {x: 0.189, y: 0.189, z: 0.189} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1307373270} + m_Children: [] m_Father: {fileID: 286165427} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &7008782796086964912 @@ -2799,10 +2056,7 @@ MonoBehaviour: m_EditorClassIdentifier: PlatformID: m_InternalValue: 0 - toBeSwapped: 0 - scoreMultiplier: 1 - swapeeID: 0 - OccupiedFX: {fileID: 1307373273} + barrierObject: {fileID: 477647222} --- !u!64 &7017483914677023159 MeshCollider: m_ObjectHideFlags: 0 @@ -2860,20 +2114,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7017483914677023162 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6995672694789591046} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed44dc3c5c8107d499c6223ba1366b68, type: 3} - m_Name: - m_EditorClassIdentifier: - outlineMaterial: {fileID: 2100000, guid: 7d59a0e48d5e5a34bbc8919ff8e3cecd, type: 2} - outlineWidth: 0.2 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Gameplay/CrowManager.cs b/Assets/Scripts/Gameplay/CrowManager.cs index 591f850..1f9003b 100644 --- a/Assets/Scripts/Gameplay/CrowManager.cs +++ b/Assets/Scripts/Gameplay/CrowManager.cs @@ -87,6 +87,7 @@ public class CrowManager : NetworkBehaviour if (currentCrow != null) { + currentCrow.Movement.SetSpeedModifier(1f); currentCrow.SetAsCrow(false); // Clear old crow } @@ -94,6 +95,7 @@ public class CrowManager : NetworkBehaviour currentCrow.SetAsCrow(true); Debug.Log($"{currentCrow.name} is now the Crow."); + currentCrow.Movement.SetSpeedModifier(1.5f); // Notify all clients about the new crow NotifyCrowChangeClientRpc(currentCrow.OwnerClientId); } diff --git a/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs b/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs index c07f390..1276675 100644 --- a/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs +++ b/Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharacter.cs @@ -281,6 +281,17 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character if (IsServer) { IsOnAPlatform = status; // Update on the server + if (status) + { + Debug.Log($"[ServerChar] Setting CurrentPlatformId = {platformId}"); + CurrentPlatformId = platformId; + } + else + { + Debug.Log($"[ServerChar] Setting PreviousPlatformId = {platformId}"); + PreviousPlatformId = platformId; + CurrentPlatformId = null; + } UpdatePlatformStatusClientRpc(status, platformId); // Notify all clients } else @@ -296,10 +307,12 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects.Character IsSwapping = false; if (status) { + Debug.Log($"[ServerChar] Setting CurrentPlatformId = {platformId}"); CurrentPlatformId = platformId; } else { + Debug.Log($"[ServerChar] Setting PreviousPlatformId = {platformId}"); PreviousPlatformId = platformId; CurrentPlatformId = null; } diff --git a/Assets/Scripts/Gameplay/Platform.cs b/Assets/Scripts/Gameplay/Platform.cs index 1d50707..7c642fd 100644 --- a/Assets/Scripts/Gameplay/Platform.cs +++ b/Assets/Scripts/Gameplay/Platform.cs @@ -1,3 +1,5 @@ +using System.Collections; +using System.Linq; using Unity.BossRoom.Gameplay.GameplayObjects.Character; using Unity.Netcode; using UnityEngine; @@ -14,15 +16,10 @@ namespace Unity.Multiplayer.Samples.BossRoom private NetworkVariable occupierId = new NetworkVariable(0, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Server); private Collider platformCollider; private Animator animator; - public void scoreMultiplierResetterInitiator() - { - Invoke(nameof(scoreMultiplierResetter), 2); - } - public void scoreMultiplierResetter() - { - toBeSwapped = false; - scoreMultiplier = 1; - } + private float occupationTime = 0f; + private float penaltyInterval = 3f; // Interval for penalty deduction + private Coroutine penaltyCoroutine; + [SerializeField] private GameObject barrierObject; private void Awake() { platformCollider = GetComponent(); @@ -67,7 +64,7 @@ namespace Unity.Multiplayer.Samples.BossRoom DOTween.Play(PlatformID); } - public void Pause() + public void PausePlatformAnimation() { if (IsServer) { @@ -96,58 +93,154 @@ namespace Unity.Multiplayer.Samples.BossRoom { animator.speed = 1f; } - public bool toBeSwapped = false; - public float scoreMultiplier = 1.0f; - public ulong swapeeID; - public GameObject OccupiedFX; - public void Occupy(ServerCharacter player,ulong swapeeIDCheck) + + public void Occupy(ServerCharacter player) { - if (!IsServer || IsOccupied) + if (!IsServer) + { + Debug.LogWarning($"[Occupy] Attempted to occupy platform {PlatformID.Value} on a non-server instance."); + return; + } + + if (IsOccupied) { + Debug.LogWarning($"[Occupy] Platform {PlatformID.Value} is already occupied. Player {player.OwnerClientId} cannot occupy."); return; } - OccupiedFX.SetActive(true); - player.m_OccupiedPlatform = this; - Debug.Log("Player "+player.NetworkObjectId + "Platform:" + PlatformID + " occupied"); - Pause(); - bool giveScore = player.PreviousPlatformId != PlatformID.Value; - float score = (player.TargetPlatformId == PlatformID.Value) ? 10 : 20; + IsOccupied = true; + occupierId.Value = player.OwnerClientId; + player.OnArrivalOnPlatform(PlatformID.Value); + + Debug.Log($"[Occupy] Player {player.OwnerClientId} is occupying platform {PlatformID.Value}."); + + PausePlatformAnimation(); + + bool giveScore = player.PreviousPlatformId.HasValue && player.PreviousPlatformId.Value != PlatformID.Value; + Debug.Log($"[Occupy] GiveScore check: PreviousPlatformId = {player.PreviousPlatformId}, CurrentPlatformId = {PlatformID.Value}, Result = {giveScore}"); if (giveScore) { - if (toBeSwapped&&swapeeID==swapeeIDCheck) + bool isOnTargetedPlatform = player.TargetPlatformId.HasValue && player.TargetPlatformId.Value == this.PlatformID.Value; + Debug.Log($"[Occupy] Is on targeted platform: {isOnTargetedPlatform}"); + + Platform platformB = isOnTargetedPlatform + ? PlatformManager.Instance.GetPlatformById(player.TargetPlatformId.Value) + : PlatformManager.Instance.GetPlatformById(this.PlatformID.Value); + + if (!player.PreviousPlatformId.HasValue) { - toBeSwapped = false; - score *= scoreMultiplier; - Debug.Log("Swap Score Multiplier: " + scoreMultiplier); + Debug.LogError($"[Occupy] Error: player.PreviousPlatformId is null! Cannot calculate distance."); + return; } - ScoreManager.Instance.AddPlayerScore(player.OwnerClientId, (int)score); + + Platform platformA = PlatformManager.Instance.GetPlatformById(player.PreviousPlatformId.Value); + + if (platformA == null || platformB == null) + { + Debug.LogError($"[Occupy] Platform lookup failed: platformA ({player.PreviousPlatformId.Value}) or platformB ({(isOnTargetedPlatform ? player.TargetPlatformId.Value : this.PlatformID.Value)}) is null!"); + return; + } + + int multiplier = (int)Vector3.Distance(platformA.transform.position, platformB.transform.position); + Debug.Log($"[Occupy] Distance multiplier: {multiplier} (from {platformA.PlatformID.Value} to {platformB.PlatformID.Value})"); + + int score = (player.TargetPlatformId.HasValue && player.TargetPlatformId.Value == PlatformID.Value) ? 10 : 20; + score *= multiplier; + Debug.Log($"[Occupy] Calculated score for player {player.OwnerClientId}: {score}"); + + ScoreManager.Instance.AddPlayerScore(player.OwnerClientId, score); } + + Debug.Log($"[Occupy] Player {player.OwnerClientId} successfully occupied platform {PlatformID.Value}. Starting penalty coroutine."); - IsOccupied = true; - occupierId.Value = player.OwnerClientId; - player.OnArrivalOnPlatform(PlatformID.Value); + penaltyCoroutine = StartCoroutine(HandleOccupationPenalty(player)); + EnableBarrier(); + Debug.Log($"[Occupy] Barrier enabled for platform {PlatformID.Value}."); } + private IEnumerator HandleOccupationPenalty(ServerCharacter player) + { + occupationTime = 0f; + + while (IsOccupied) + { + occupationTime += Time.deltaTime; + + if (occupationTime >= 10f) + { + yield return new WaitForSeconds(penaltyInterval); + + // Deduct points + ScoreManager.Instance.SubtractPlayerScore(player.OwnerClientId, 10); + Debug.Log($"Player {player.OwnerClientId} lost 10 points for occupying the platform too long."); + } + + yield return null; + } + } + public void Vacate(ServerCharacter player) { if (!IsServer || !IsOccupied || occupierId.Value != player.OwnerClientId) { return; } - OccupiedFX.SetActive(false); Resume(); IsOccupied = false; occupierId.Value = 0; player.OnLeavingPlatform(PlatformID.Value); + DisableBarrier(); + if (penaltyCoroutine != null) + { + StopCoroutine(penaltyCoroutine); + penaltyCoroutine = null; + } + } + private void EnableBarrier() + { + var excludedClient = NetworkManager.Singleton.LocalClientId; + + var clientRpcParams = new ClientRpcParams + { + Send = new ClientRpcSendParams + { + TargetClientIds = NetworkManager.Singleton.ConnectedClientsIds + .Where(clientId => clientId != excludedClient) + .ToArray() + } + }; + + EnableBarrierClientRpc(clientRpcParams); + } + + private void DisableBarrier() + { + DisableBarrierClientRpc(); + } + + [ClientRpc] + private void EnableBarrierClientRpc(ClientRpcParams clientRpcParams = default) + { + if (barrierObject != null) + { + barrierObject.SetActive(true); + } } + [ClientRpc] + private void DisableBarrierClientRpc() + { + if (barrierObject != null) + { + barrierObject.SetActive(false); + } + } private void OnTriggerEnter(Collider other) { if (IsServer && other.TryGetComponent(out var player) && !IsOccupied) { - Occupy(player, other.GetComponent().OwnerClientId); + Occupy(player); } } @@ -165,114 +258,3 @@ namespace Unity.Multiplayer.Samples.BossRoom } } } - - -//using Unity.BossRoom.Gameplay.GameplayObjects.Character; -//using Unity.Netcode; -//using UnityEngine; -//using DG.Tweening; -//using Unity.Netcode.Components; - -//namespace Unity.Multiplayer.Samples.BossRoom -//{ -// [RequireComponent(typeof(Collider))] -// public class Platform : NetworkBehaviour -// { -// public NetworkVariable PlatformID = new NetworkVariable(0); -// public bool IsOccupied { get; private set; } - -// private NetworkVariable occupierId = new NetworkVariable(0, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Server); -// private Collider platformCollider; -// private Animator animator; -// private void Awake() -// { -// platformCollider = GetComponent(); -// if (!platformCollider.isTrigger) -// platformCollider.isTrigger = true; - -// animator = GetComponent(); -// } -// private void Start() -// { -// Invoke(nameof(ColliderEnabler),2); -// } -// public void AssignID(int id) -// { -// if (IsServer) PlatformID.Value = id; -// } -// void ColliderEnabler() -// { -// platformCollider.enabled = true; -// } -// public void StartRotation() => transform.DOLocalRotate(Vector3.up, 120).SetSpeedBased(true).SetId(PlatformID).SetLoops(-1, LoopType.Incremental); - -// private void PauseRotation() => DOTween.Pause(PlatformID); -// private void ResumeRotation() => DOTween.Play(PlatformID); - -// public void Pause() -// { -// if (IsOwner) -// { -// animator.speed = 0f; -// PauseServerRpc(); -// } -// } - -// public void Resume() -// { -// if (IsOwner) -// { -// animator.speed = 1f; -// ResumeServerRpc(); -// } -// } - -// [ServerRpc] -// private void PauseServerRpc() => PauseClientRpc(); -// [ClientRpc] -// private void PauseClientRpc() => animator.speed = 0f; - -// [ServerRpc] -// private void ResumeServerRpc() => ResumeClientRpc(); -// [ClientRpc] -// private void ResumeClientRpc() => animator.speed = 1f; - -// public void Occupy(ServerCharacter player) -// { -// if (!IsServer || IsOccupied) return; -// Pause(); -// bool giveScore = player.PreviousPlatformId != PlatformID.Value; -// int score = (player.TargetPlatformId == PlatformID.Value) ? 10 : 20; - -// if (giveScore) ScoreManager.Instance.AddPlayerScore(player.OwnerClientId, score); - -// IsOccupied = true; -// occupierId.Value = player.OwnerClientId; -// player.OnArrivalOnPlatform(PlatformID.Value); -// } - -// public void Vacate(ServerCharacter player) -// { -// if (!IsServer || !IsOccupied || occupierId.Value != player.OwnerClientId) return; - -// Resume(); -// IsOccupied = false; -// occupierId.Value = 0; -// player.OnLeavingPlatform(PlatformID.Value); -// } - -// private void OnTriggerEnter(Collider other) -// { -// if (IsServer && other.TryGetComponent(out var player) && !IsOccupied) -// Occupy(player); -// } - -// private void OnTriggerExit(Collider other) -// { -// if (IsServer && other.TryGetComponent(out var player)) -// Vacate(player); -// } - -// public ulong GetOccupierId() => occupierId.Value; -// } -//} diff --git a/Assets/Scripts/Gameplay/ScoreManager.cs b/Assets/Scripts/Gameplay/ScoreManager.cs index c9dd26f..a357f3a 100644 --- a/Assets/Scripts/Gameplay/ScoreManager.cs +++ b/Assets/Scripts/Gameplay/ScoreManager.cs @@ -77,9 +77,8 @@ public class ScoreManager : NetworkBehaviour [ClientRpc] public void UpdatePlayerScoreClientRpc(ulong ownerClientId, int newScore) { - if (playerNames.ContainsKey(ownerClientId)) + if (playerNames.TryGetValue(ownerClientId, out var playerName)) { - string playerName = playerNames[ownerClientId]; Debug.Log($"[ScoreManager] Received score update for Player {ownerClientId} (Name: {playerName}): {newScore}"); Scoreboard.instance.UpdateScoreboard(playerName, newScore); } @@ -101,9 +100,9 @@ public class ScoreManager : NetworkBehaviour public void SubtractPlayerScore(ulong ownerClientId, int scoreToSubtract) { - if (playerScores.ContainsKey(ownerClientId)) + if (playerScores.TryGetValue(ownerClientId, out var score)) { - int newScore = Mathf.Max(0, playerScores[ownerClientId] - scoreToSubtract); + int newScore = Mathf.Max(0, score - scoreToSubtract); UpdatePlayerScore(ownerClientId, newScore); } } diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs index 0bdd8bf..2ff1a41 100644 --- a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs +++ b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs @@ -534,14 +534,29 @@ namespace Unity.BossRoom.Gameplay.UserInput if (Input.GetKeyDown(KeyCode.E)) // Dash'N'Crash { + if (!m_ServerCharacter.IsCrow) + { + m_UIMessageFeed.DisplayMessage("You must be the Crow to activate this ability"); + return; + } ActivateAbilityIfAllowed(GameDataSource.Instance.DashNCrashAbilityKey, "Abilities are only for crow"); } if (Input.GetKeyDown(KeyCode.R)) // Freeze Throw { + if (m_ServerCharacter.IsCrow) + { + m_UIMessageFeed.DisplayMessage("Ability not available for crow"); + return; + } ActivateAbilityIfAllowed(GameDataSource.Instance.FreezeThrowAbilityKey); } if (Input.GetKeyDown(KeyCode.F)) // Vector Wall { + if (m_ServerCharacter.IsCrow) + { + m_UIMessageFeed.DisplayMessage("Ability not available for crow"); + return; + } ActivateAbilityIfAllowed(GameDataSource.Instance.VectorWallAbilityKey); } } @@ -597,19 +612,19 @@ namespace Unity.BossRoom.Gameplay.UserInput return; } - if (abilityKey == GameDataSource.Instance.DashNCrashAbilityKey && !m_ServerCharacter.IsCrow) - { - if (errorMessage != null) - { - m_UIMessageFeed.DisplayMessage(errorMessage); - } - Debug.Log("You must be the Crow to activate this ability."); - return; - } - else - { - Debug.Log("abilitykey: " + abilityKey); - } + // if (abilityKey == GameDataSource.Instance.DashNCrashAbilityKey && !m_ServerCharacter.IsCrow) + // { + // if (errorMessage != null) + // { + // m_UIMessageFeed.DisplayMessage(errorMessage); + // } + // Debug.Log("You must be the Crow to activate this ability."); + // return; + // } + // else + // { + // Debug.Log("abilitykey: " + abilityKey); + // } m_UIMessageFeed.DisplayMessage("Activated Ability mode"); m_AbilitySystem.ActivateAbilityByKey(abilityKey); diff --git a/Assets/Textures/Aod-particle.png b/Assets/Textures/Aod-particle.png new file mode 100644 index 0000000..8f771a2 Binary files /dev/null and b/Assets/Textures/Aod-particle.png differ diff --git a/Assets/Textures/Aod-particle.png.meta b/Assets/Textures/Aod-particle.png.meta new file mode 100644 index 0000000..56c0fe6 --- /dev/null +++ b/Assets/Textures/Aod-particle.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 4454263972ac84242b5af0212232f9b6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: