From a1b7e0f960940c5226ddb3f4ca33d7640dc692c8 Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Tue, 16 Jun 2020 22:07:59 -0500 Subject: [PATCH] Removed charge point color, pulse animation added --- Assets/Animations/Charge-Point-Pulse.anim | 323 ++++++++++++++++++ .../Animations/Charge-Point-Pulse.anim.meta | 8 + .../SpaceshipConstructionKit2-264.controller | 72 ++++ ...ceshipConstructionKit2-264.controller.meta | 8 + .../SpaceshipConstructionKit2-262.png | 4 +- .../SpaceshipConstructionKit2-263.png | 4 +- .../SpaceshipConstructionKit2-264.png | 4 +- Assets/Prefabs/Charge Point.prefab | 26 +- 8 files changed, 440 insertions(+), 9 deletions(-) create mode 100644 Assets/Animations/Charge-Point-Pulse.anim create mode 100644 Assets/Animations/Charge-Point-Pulse.anim.meta create mode 100644 Assets/Animations/SpaceshipConstructionKit2-264.controller create mode 100644 Assets/Animations/SpaceshipConstructionKit2-264.controller.meta diff --git a/Assets/Animations/Charge-Point-Pulse.anim b/Assets/Animations/Charge-Point-Pulse.anim new file mode 100644 index 0000000..7309781 --- /dev/null +++ b/Assets/Animations/Charge-Point-Pulse.anim @@ -0,0 +1,323 @@ +%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: Charge-Point-Pulse + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + 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: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + 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: 1 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Charge-Point-Pulse.anim.meta b/Assets/Animations/Charge-Point-Pulse.anim.meta new file mode 100644 index 0000000..9c06df4 --- /dev/null +++ b/Assets/Animations/Charge-Point-Pulse.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 342565cd9546322439a86766cd8e4e20 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/SpaceshipConstructionKit2-264.controller b/Assets/Animations/SpaceshipConstructionKit2-264.controller new file mode 100644 index 0000000..378bdfe --- /dev/null +++ b/Assets/Animations/SpaceshipConstructionKit2-264.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8333342787379322518 +AnimatorStateMachine: + serializedVersion: 5 + 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: -7726866873294389505} + m_Position: {x: 200, y: 0, 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: -7726866873294389505} +--- !u!1102 &-7726866873294389505 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Charge-Point-Pulse + 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: 342565cd9546322439a86766cd8e4e20, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SpaceshipConstructionKit2-264 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8333342787379322518} + 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} diff --git a/Assets/Animations/SpaceshipConstructionKit2-264.controller.meta b/Assets/Animations/SpaceshipConstructionKit2-264.controller.meta new file mode 100644 index 0000000..b71b0ea --- /dev/null +++ b/Assets/Animations/SpaceshipConstructionKit2-264.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40d3b20d153e1364aaf53e91610cfdd6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-262.png b/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-262.png index b46ea95..d6e93e2 100644 --- a/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-262.png +++ b/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-262.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:897b68a32854f4a528ac3db9a03c577a68b1f35e62589ee10d55ac58340f745b -size 1590 +oid sha256:70deecbf88b459fa177190caeee4dd5f40a6b2f85290478c5bf9927bdb86252b +size 200 diff --git a/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-263.png b/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-263.png index 111c96b..4d9245b 100644 --- a/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-263.png +++ b/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-263.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6e605a2bb53438fa3985fff39bd3ed791dfe9cb23acde1532660708cd1c146d -size 2142 +oid sha256:5648fffa19bcf6f03a4b21bfe310a514a389c69ac79b0ec051ff882c4c7821f6 +size 530 diff --git a/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-264.png b/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-264.png index 19182b5..2edc4ab 100644 --- a/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-264.png +++ b/Assets/Images/Ship-Parts/SpaceshipConstructionKit2-264.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a19b6f4f603294f9a83b11d2117774fd5e388eb296a7312c316e015458dd1091 -size 2932 +oid sha256:8f683a1192c3ad6e351b7051a8098cfc70d0f0ae3d85a852ed89bba1e75b2712 +size 580 diff --git a/Assets/Prefabs/Charge Point.prefab b/Assets/Prefabs/Charge Point.prefab index 77ec203..54ae2ad 100644 --- a/Assets/Prefabs/Charge Point.prefab +++ b/Assets/Prefabs/Charge Point.prefab @@ -91,6 +91,7 @@ GameObject: m_Component: - component: {fileID: 7792043218584221543} - component: {fileID: 5538812306110336721} + - component: {fileID: 3382789460232467777} m_Layer: 0 m_Name: SpaceshipConstructionKit2-264 m_TagString: Untagged @@ -152,7 +153,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 55ffc37bf232a114296c1b0be3f2195f, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -162,6 +163,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &3382789460232467777 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145088882057884965} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 40d3b20d153e1364aaf53e91610cfdd6, 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 &2507568647583135351 GameObject: m_ObjectHideFlags: 0 @@ -395,7 +415,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 1ca5a05e9ec5d5844963c11a32da5293, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 0.764151, g: 0.47902495, b: 0.43614277, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -635,7 +655,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 1ca5a05e9ec5d5844963c11a32da5293, type: 3} - m_Color: {r: 1, g: 0.10838403, b: 0, a: 1} + m_Color: {r: 0.764151, g: 0.47902495, b: 0.43614277, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0