diff --git a/Assets/Resources/Games/clapTrap.prefab b/Assets/Resources/Games/clapTrap.prefab index cd0d623a5..8586edf38 100644 --- a/Assets/Resources/Games/clapTrap.prefab +++ b/Assets/Resources/Games/clapTrap.prefab @@ -93,6 +93,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8716013488938394720} + - component: {fileID: 1104292596363967421} m_Layer: 0 m_Name: clapTrapDoll m_TagString: Untagged @@ -119,6 +120,27 @@ Transform: m_Father: {fileID: 3661019275362709209} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1104292596363967421 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475607334542829873} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5cdf89287078bf64daa4aa6f0bd6ffc5, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &501019406668460042 GameObject: m_ObjectHideFlags: 0 @@ -387,7 +409,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5886563450507382169 Transform: m_ObjectHideFlags: 0 @@ -887,6 +909,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1498507413651556432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 328522097894352178} + - component: {fileID: 5439985685048989727} + m_Layer: 0 + m_Name: body_just.000 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &328522097894352178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498507413651556432} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -6.882, z: 0} + m_LocalScale: {x: 4.6000004, y: 4.6000004, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1536850935928157263} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5439985685048989727 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498507413651556432} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 50 + m_Sprite: {fileID: 21300000, guid: 875b64794cbb9e64596b509bac9e7593, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1797424800963142273 GameObject: m_ObjectHideFlags: 0 @@ -1319,6 +1425,7 @@ MonoBehaviour: stageRightRim: {fileID: 5448651794995354504} spotlight: {fileID: 5647144016595332616} spotlightMaterial: {fileID: 2100000, guid: f9b0a46270a30b749a1a102c764ff085, type: 2} + doll: {fileID: 1104292596363967421} dollHead: {fileID: 5832940965353651887} dollArms: {fileID: 2697103955869777452} dollBody: {fileID: 8675483483292880565} @@ -2352,6 +2459,7 @@ GameObject: - component: {fileID: 933194770163378234} - component: {fileID: 2091304079968540627} - component: {fileID: 6051233720251957680} + - component: {fileID: 900975874339545252} m_Layer: 0 m_Name: clapEffect m_TagString: Untagged @@ -2447,6 +2555,17 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!210 &900975874339545252 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6536782117351326483} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 --- !u!1 &7018331733407189603 GameObject: m_ObjectHideFlags: 0 @@ -3407,7 +3526,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 --- !u!1 &8792288725922535542 GameObject: m_ObjectHideFlags: 0 @@ -3423,7 +3542,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1536850935928157263 Transform: m_ObjectHideFlags: 0 @@ -3445,6 +3564,7 @@ Transform: - {fileID: 7218016160121281941} - {fileID: 4370611478144870709} - {fileID: 5685652638401946638} + - {fileID: 328522097894352178} m_Father: {fileID: 3661019275362709209} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture index a724bcdd0..8c4b7c141 100644 --- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1228 - m_Height: 691 + m_Width: 1057 + m_Height: 595 m_AntiAliasing: 2 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture index 44baf42de..0adc9aee6 100644 --- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1842 - m_Height: 1036 + m_Width: 1585 + m_Height: 892 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollHit.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollHit.anim new file mode 100644 index 000000000..f097bdd2a --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollHit.anim @@ -0,0 +1,277 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DollHit + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.12, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: -0.08, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 0, y: -0.036, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.12 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.08 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -0.036 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollHit.anim.meta b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollHit.anim.meta new file mode 100644 index 000000000..68b902225 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollHit.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80373861ce3e6d747ac79c5712d4de7a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollIdle.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollIdle.anim new file mode 100644 index 000000000..858d042fb --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollIdle.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DollIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollIdle.anim.meta b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollIdle.anim.meta new file mode 100644 index 000000000..7a75503e9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff0a678371aaf1149814f823c1a89014 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollMiss.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollMiss.anim new file mode 100644 index 000000000..c21757a43 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollMiss.anim @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DollMiss + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.21, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: -0.166, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 0, y: -0.07, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.21 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.166 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: -0.07 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollMiss.anim.meta b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollMiss.anim.meta new file mode 100644 index 000000000..e435680c9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/DollMiss.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9386f61681917a4fab6d158ed4053ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadTalk.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadTalk.anim index 987f95b4e..83473afa3 100644 --- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadTalk.anim +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/HeadTalk.anim @@ -143,6 +143,19 @@ AnimationClip: path: head classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + - time: 0.0625 + value: {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + - time: 0.1 + value: {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + - time: 0.1875 + value: {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + attribute: m_Sprite + path: head/shadow + classID: 212 + script: {fileID: 0} m_SampleRate: 80 m_WrapMode: 0 m_Bounds: @@ -185,6 +198,13 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1420187896 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: 504510680, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3} - {fileID: 504510680, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3} @@ -198,6 +218,10 @@ AnimationClip: - {fileID: 1909556052, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3} - {fileID: 1909556052, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3} - {fileID: 1909556052, guid: 1a99f23bb23515346b1c015c29d8eb4a, type: 3} + - {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + - {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + - {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} + - {fileID: 1909556052, guid: 3e979ecd58c1ff6448ed59c7d87b708f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/clapTrapDoll.controller b/Assets/Resources/Sprites/Games/ClapTrap/Animations/clapTrapDoll.controller new file mode 100644 index 000000000..6ac597b16 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/clapTrapDoll.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8796491338014239930 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DollIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: ff0a678371aaf1149814f823c1a89014, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-4526734911517594979 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8796491338014239930} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2211501459933813730} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9196288556766508250} + m_Position: {x: 270, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8796491338014239930} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: clapTrapDoll + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4526734911517594979} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2211501459933813730 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DollHit + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 80373861ce3e6d747ac79c5712d4de7a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &9196288556766508250 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DollMiss + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e9386f61681917a4fab6d158ed4053ce, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/clapTrapDoll.controller.meta b/Assets/Resources/Sprites/Games/ClapTrap/Animations/clapTrapDoll.controller.meta new file mode 100644 index 000000000..91f698c1d --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/clapTrapDoll.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cdf89287078bf64daa4aa6f0bd6ffc5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/Animations/sword.controller b/Assets/Resources/Sprites/Games/ClapTrap/Animations/sword.controller index 6b4018f2b..aa281d6b9 100644 --- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/sword.controller +++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/sword.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ObjHandClap + m_Name: swordHandHit m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -59,7 +59,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ObjHandMiss + m_Name: swordHandMiss m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.pdn b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.pdn new file mode 100644 index 000000000..a49a62d2a Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.pdn differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.pdn.meta b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.pdn.meta new file mode 100644 index 000000000..3882d5351 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.pdn.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1062f95749a509c40a0daa2d043310a8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png index 06b1e2f50..81059dd8b 100644 Binary files a/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png and b/Assets/Resources/Sprites/Games/ClapTrap/ClapTrapTrapperLit.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.000.png new file mode 100644 index 000000000..bbbb3aff7 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.000.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.000.png.meta new file mode 100644 index 000000000..07ad1fe11 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.000.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: c196148dde3e42b4a9a6c3be29993cd6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.001.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.001.png new file mode 100644 index 000000000..8537c4af2 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.001.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.001.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.001.png.meta new file mode 100644 index 000000000..31bf747cc --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.001.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: f4cf861846a1550438a27f1d6107e954 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.002.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.002.png new file mode 100644 index 000000000..aacdaf364 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.002.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.002.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.002.png.meta new file mode 100644 index 000000000..e5688045f --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.002.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: c3892367ee86de94b923ba5a2dcad9ab +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.003.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.003.png new file mode 100644 index 000000000..b789b3826 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.003.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.003.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.003.png.meta new file mode 100644 index 000000000..5a37812f4 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_just.003.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: cf5e80ea7578d2c48b9d3cabdc820f67 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.000.png new file mode 100644 index 000000000..9cfdb5b62 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.000.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.000.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.000.png.meta new file mode 100644 index 000000000..f36fbf3d5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.000.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: cbff1faa1bf457b4aa6803e10d45d49d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.001.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.001.png new file mode 100644 index 000000000..c2702bd8b Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.001.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.001.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.001.png.meta new file mode 100644 index 000000000..f6705387b --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.001.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 2880df58579bb3448a88a7de8de97cb0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.002.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.002.png new file mode 100644 index 000000000..8537c4af2 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.002.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.002.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.002.png.meta new file mode 100644 index 000000000..599956464 --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.002.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 875b64794cbb9e64596b509bac9e7593 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.003.png b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.003.png new file mode 100644 index 000000000..b789b3826 Binary files /dev/null and b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.003.png differ diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.003.png.meta b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.003.png.meta new file mode 100644 index 000000000..ac7b42fdb --- /dev/null +++ b/Assets/Resources/Sprites/Games/ClapTrap/references/body_miss.003.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: ac0e7112e27ad414d9f0308203fa6a1c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs index 57e005d66..6b18dac80 100644 --- a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs +++ b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs @@ -44,27 +44,28 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("background color", "Background Colors") { - function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.FadeBackgroundColor(e["bgColor"], e["fade"], e["spotlightTop"], e["spotlightBottom"], e["spotlightGlow"], e.length); }, + function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.BackgroundColor(e["bgColor"], e["bgColorEnd"], e["ease"], e.length, e.beat); }, defaultLength = 0.5f, resizable = true, parameters = new List() { - new Param("bgColor", ClapTrap.defaultBgColor, "Background", "The background color"), - new Param("fade", false, "Fade?", "Should the background color fade from the current color to the new one?"), - new Param("spotlightBottom", ClapTrap.defaultBgColor, "Spotlight Bottom", "The color at the bottom of the spotlight"), - new Param("spotlightTop", ClapTrap.glowSpotlight, "Spotlight Top", "The color at the top of the spotlight"), - new Param("spotlightGlow", ClapTrap.glowSpotlight, "Spotlight Glow", "The color that glows around the spotlight") + new Param("bgColor", ClapTrap.defaultBgColor, "Start Color", "Set the color at the start of the event"), + new Param("bgColorEnd", ClapTrap.defaultBgColor, "End Color", "Set the color at the end of the event."), + new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.") }, }, - new GameAction("hand color", "Hand Colors") + new GameAction("hand color", "Object Colors") { - function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.ChangeHandColor(e["stageLeftHandColor"], e["stageRightHandColor"]); }, + function = delegate { var e = eventCaller.currentEntity; ClapTrap.instance.ChangeHandColor(e["left"], e["right"], e["spotlightTop"], e["spotlightBottom"], e["spotlightGlow"]); }, defaultLength = 0.5f, parameters = new List() { - new Param("stageLeftHandColor", ClapTrap.defaultLeftColor, "Left Hand Color", "The color used on the dummy's hand (stage left)"), - new Param("stageRightHandColor", ClapTrap.defaultRightColor, "Right Hand Color", "The color used on the dummy's hand (stage right)") + new Param("left", ClapTrap.defaultLeftColor, "Left Hand", "The color used on the doll's right hand."), + new Param("right", ClapTrap.defaultRightColor, "Right Hand", "The color used on the doll's left hand."), + new Param("spotlightBottom", ClapTrap.defaultBgColor, "Spotlight Bottom", "The color at the bottom of the spotlight"), + new Param("spotlightTop", ClapTrap.glowSpotlight, "Spotlight Top", "The color at the top of the spotlight"), + new Param("spotlightGlow", ClapTrap.glowSpotlight, "Spotlight Glow", "The color that glows around the spotlight") }, }, @@ -146,6 +147,12 @@ namespace HeavenStudio.Games [Header("Colors")] public SpriteRenderer bg; + // i stole these from rhythm tweezers lol + private double colorStartBeat = -1; + private float colorLength = 0f; + private Color colorStart; //obviously put to the default color of the game + private Color colorEnd; + private Util.EasingFunction.Ease colorEase; //putting Util in case this game is using jukebox Tween bgColorTween; public SpriteRenderer stageLeft; @@ -161,6 +168,7 @@ namespace HeavenStudio.Games public Material spotlightMaterial; [Header("Animators")] + public Animator doll; public Animator dollHead; public Animator dollArms; public Animator dollBody; @@ -195,6 +203,8 @@ namespace HeavenStudio.Games spotlightMaterial.SetColor("_ColorDelta", defaultBgColor); backgroundColor = defaultBgColor; + colorStart = defaultBgColor; + colorEnd = defaultBgColor; } private void Update() @@ -213,6 +223,11 @@ namespace HeavenStudio.Games }); } + if (spotlight.activeSelf && currentSpotlightClaps == 0 && forceSpotlight == false) + { + spotlight.SetActive(false); + } + shadowHead.SetActive(spotlight.activeSelf); shadowLeftArm.SetActive(spotlight.activeSelf); shadowLeftGlove.SetActive(spotlight.activeSelf); @@ -222,13 +237,8 @@ namespace HeavenStudio.Games shadowRightGloveRim.SetActive(spotlight.activeSelf); if (spotlight.activeSelf) { dollBody.DoScaledAnimationAsync("BodyIdleLit", 0.5f); } - else { dollBody.DoScaledAnimationAsync("BodyIdle", 0.5f); } - - - if (spotlight.activeSelf && currentSpotlightClaps == 0 && forceSpotlight == false) - { - spotlight.SetActive(false); - bg.color = backgroundColor; + else { dollBody.DoScaledAnimationAsync("BodyIdle", 0.5f); + BackgroundColorUpdate(); } } @@ -324,9 +334,15 @@ namespace HeavenStudio.Games backgroundColor = color; } - public void FadeBackgroundColor(Color end, bool fade, Color topSpotlightColor, Color bottomSpotlightColor, Color glowSpotlightColor, float length) + public void BackgroundColor(Color start, Color end, int ease, float length, double beat) { - if (fade) + colorStartBeat = beat; + colorLength = length; + colorStart = start; + colorEnd = end; + colorEase = (Util.EasingFunction.Ease)ease; + + /*if (fade) { ChangeBackgroundColor(bg.color, 0f); ChangeBackgroundColor(end, length - 0.0001f); @@ -334,19 +350,32 @@ namespace HeavenStudio.Games else { ChangeBackgroundColor(end, 0f); - } - - spotlightMaterial.SetColor("_ColorAlpha", topSpotlightColor); - spotlightMaterial.SetColor("_ColorBravo", glowSpotlightColor); - spotlightMaterial.SetColor("_ColorDelta", bottomSpotlightColor); + }*/ } - public void ChangeHandColor(Color stageLeftHandColor, Color stageRightHandColor) + private void BackgroundColorUpdate() // stolen from tweezers too lol { - stageLeft.color = stageLeftHandColor; - stageLeftRim.color = stageLeftHandColor; - stageRight.color = stageRightHandColor; - stageRightRim.color = stageRightHandColor; + float normalizedBeat = Mathf.Clamp01(Conductor.instance.GetPositionFromBeat(colorStartBeat, colorLength)); + + var func = Util.EasingFunction.GetEasingFunction(colorEase); + + float newR = func(colorStart.r, colorEnd.r, normalizedBeat); + float newG = func(colorStart.g, colorEnd.g, normalizedBeat); + float newB = func(colorStart.b, colorEnd.b, normalizedBeat); + + bg.color = new Color(newR, newG, newB); + } + + public void ChangeHandColor(Color leftHand, Color rightHand, Color topSpot, Color bottomSpot, Color glowSpot) + { + stageLeft.color = leftHand; + stageLeftRim.color = leftHand; + stageRight.color = rightHand; + stageRightRim.color = rightHand; + + spotlightMaterial.SetColor("_ColorAlpha", topSpot); + spotlightMaterial.SetColor("_ColorBravo", glowSpot); + spotlightMaterial.SetColor("_ColorDelta", bottomSpot); } } diff --git a/Assets/Scripts/Games/ClapTrap/Sword.cs b/Assets/Scripts/Games/ClapTrap/Sword.cs index df47e548c..ac1c7d280 100644 --- a/Assets/Scripts/Games/ClapTrap/Sword.cs +++ b/Assets/Scripts/Games/ClapTrap/Sword.cs @@ -15,6 +15,7 @@ namespace HeavenStudio.Games.Scripts_ClapTrap private Animator dollHead; private Animator dollArms; + private ClapTrap game; @@ -52,7 +53,7 @@ namespace HeavenStudio.Games.Scripts_ClapTrap SoundByte.PlayOneShotGame($"clapTrap/barely{UnityEngine.Random.Range(1, 2)}"); dollHead.DoScaledAnimationAsync("HeadBarely", 0.5f); } - else if (state >= -0.01f && state <= 0.01f) + else if (state >= -0.2 && state <= 0.2) { SoundByte.PlayOneShotGame($"clapTrap/aceClap{UnityEngine.Random.Range(1, 4)}"); dollHead.DoScaledAnimationAsync("HeadHit", 0.5f); @@ -64,6 +65,7 @@ namespace HeavenStudio.Games.Scripts_ClapTrap } dollArms.DoScaledAnimationAsync("ArmsHit", 0.5f); + game.doll.DoScaledAnimationAsync("DollHit", 0.5f); game.clapEffect.DoScaledAnimationAsync("ClapEffect", 0.5f); gameObject.SetActive(true); @@ -79,6 +81,7 @@ namespace HeavenStudio.Games.Scripts_ClapTrap SoundByte.PlayOneShotGame($"clapTrap/miss"); dollHead.DoScaledAnimationAsync("HeadMiss", 0.5f); dollArms.DoScaledAnimationAsync("ArmsMiss", 0.5f); + game.doll.DoScaledAnimationAsync("DollMiss", 0.5f); gameObject.SetActive(true); GetComponent().DoScaledAnimationAsync("sword" + cueType + "Miss", 0.5f);