diff --git a/Checkers/Assets/Animations/CrownAnimation.anim b/Checkers/Assets/Animations/CrownAnimation.anim index 1dea159..1071484 100644 --- a/Checkers/Assets/Animations/CrownAnimation.anim +++ b/Checkers/Assets/Animations/CrownAnimation.anim @@ -45,7 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0, y: 0, z: 0} + value: {x: -0, y: 0.4, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -54,7 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 3 - value: {x: 0, y: 0.1, z: 0} + value: {x: 0, y: 0.5, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -63,7 +63,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 6 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.4, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -162,7 +162,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -171,7 +171,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3 - value: 0.1 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -180,7 +180,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 6 - value: 0 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Checkers/Assets/Prefabs/Crown.prefab b/Checkers/Assets/Prefabs/Crown.prefab index 88c7cbf..a87432a 100644 --- a/Checkers/Assets/Prefabs/Crown.prefab +++ b/Checkers/Assets/Prefabs/Crown.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1534303541487452323 +--- !u!1 &3246049399796633620 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3131303703923751329} + - component: {fileID: 8876876591202024197} + - component: {fileID: 1303063787946964218} + - component: {fileID: 793507752655241966} + - component: {fileID: 1203326796781820809} m_Layer: 0 m_Name: Crown m_TagString: Untagged @@ -16,93 +19,315 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3131303703923751329 +--- !u!4 &8876876591202024197 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1534303541487452323} + m_GameObject: {fileID: 3246049399796633620} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2074884125096780056} + - {fileID: 2213738449493228015} + - {fileID: 8396063262967974319} + - {fileID: 6151006003646600680} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &7492433026231441949 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 3131303703923751329} - m_Modifications: - - target: {fileID: 3246049399796633620, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_Name - value: Crown - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 16e6bf03b896b054c97bf91c12fe547a, type: 3} ---- !u!4 &2074884125096780056 stripped +--- !u!33 &1303063787946964218 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3246049399796633620} + m_Mesh: {fileID: 4300000, guid: bb19f2465d7e6b94daac28c1cc6051c4, type: 3} +--- !u!23 &793507752655241966 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3246049399796633620} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: dafd37aadf1ed4b419e1c2cb0978a124, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!95 &1203326796781820809 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3246049399796633620} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 79aad7ae1e36d9344b3001dd33b43ff9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8279880604627031561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2213738449493228015} + - component: {fileID: 2426336614459858665} + - component: {fileID: 8267534859264447775} + m_Layer: 0 + m_Name: Solid3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2213738449493228015 Transform: - m_CorrespondingSourceObject: {fileID: 8876876591202024197, guid: 16e6bf03b896b054c97bf91c12fe547a, - type: 3} - m_PrefabInstance: {fileID: 7492433026231441949} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279880604627031561} + 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_Children: [] + m_Father: {fileID: 8876876591202024197} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2426336614459858665 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279880604627031561} + m_Mesh: {fileID: 4300000, guid: bb19f2465d7e6b94daac28c1cc6051c4, type: 3} +--- !u!23 &8267534859264447775 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8279880604627031561} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: dafd37aadf1ed4b419e1c2cb0978a124, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!1 &8446261884884121593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6151006003646600680} + - component: {fileID: 4534792278824367638} + - component: {fileID: 3348356827841038648} + m_Layer: 0 + m_Name: Solid5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6151006003646600680 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8446261884884121593} + 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_Children: [] + m_Father: {fileID: 8876876591202024197} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4534792278824367638 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8446261884884121593} + m_Mesh: {fileID: 4300004, guid: bb19f2465d7e6b94daac28c1cc6051c4, type: 3} +--- !u!23 &3348356827841038648 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8446261884884121593} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: dafd37aadf1ed4b419e1c2cb0978a124, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!1 &8598077351362955742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8396063262967974319} + - component: {fileID: 5716854771910817261} + - component: {fileID: 7643709453804888348} + m_Layer: 0 + m_Name: Solid4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8396063262967974319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8598077351362955742} + 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_Children: [] + m_Father: {fileID: 8876876591202024197} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5716854771910817261 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8598077351362955742} + m_Mesh: {fileID: 4300002, guid: bb19f2465d7e6b94daac28c1cc6051c4, type: 3} +--- !u!23 &7643709453804888348 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8598077351362955742} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: dafd37aadf1ed4b419e1c2cb0978a124, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 diff --git a/Checkers/Assets/Prefabs/Pawn.prefab b/Checkers/Assets/Prefabs/Pawn.prefab index 2a2c421..c107da8 100644 --- a/Checkers/Assets/Prefabs/Pawn.prefab +++ b/Checkers/Assets/Prefabs/Pawn.prefab @@ -195,12 +195,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: beb018fdfe0e8d54097718fb0ffd9498, type: 3} m_Name: m_EditorClassIdentifier: - PawnColor: 0 - IsKing: 0 CrownHeight: 0.4 CrownAppearanceSmoothing: 5 PositionDifferenceTolerance: 0.01 - Crown: {fileID: 1534303541487452323, guid: 2489dd16575ee0741a1e7e32886a283f, type: 3} + Crown: {fileID: 3246049399796633620, guid: 2489dd16575ee0741a1e7e32886a283f, type: 3} PromotionParticles: {fileID: 2816544923751914441, guid: 7342a11b65baa0346a1133b3bf406709, type: 3} PawnSelection: {fileID: 8418305190555947777, guid: 28e53d17c72331b4f8d05bc9156ca239,