From a1675d40b6ba4450502f56fecc13208752b41abd Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 28 Apr 2019 18:12:27 +0200 Subject: [PATCH] Add Animator things --- Assets/Animations/PlayerStanding.anim | 71 +++++++++++++ Assets/Animations/PlayerStanding.anim.meta | 8 ++ Assets/Animations/PlayerWalking.anim | 89 ++++++++++++++++ Assets/Animations/PlayerWalking.anim.meta | 8 ++ Assets/Animators/Player.controller | 101 +++++++++++++++++++ Assets/Animators/Player.controller.meta | 8 ++ Assets/Scenes/Steffo.unity | 94 +++++++++++++++++ Assets/Scripts/EntityPlayer.cs | 8 +- Assets/Sprites/ChMov1.png.meta | 24 ++++- Assets/Sprites/ChMov2.png.meta | 24 ++++- Assets/Sprites/ChMov3.png.meta | 24 ++++- Assets/Sprites/ChMov4.png.meta | 24 ++++- Assets/Sprites/ChMov5.png.meta | 24 ++++- Assets/Sprites/ChMov6.png.meta | 24 ++++- Assets/Sprites/ChMov7.png.meta | 24 ++++- Assets/Sprites/ChMov8.png.meta | 24 ++++- Assets/Sprites/pg.png | 3 - Assets/Sprites/pg.png.meta | 112 --------------------- 18 files changed, 569 insertions(+), 125 deletions(-) create mode 100644 Assets/Animations/PlayerStanding.anim create mode 100644 Assets/Animations/PlayerStanding.anim.meta create mode 100644 Assets/Animations/PlayerWalking.anim create mode 100644 Assets/Animations/PlayerWalking.anim.meta create mode 100644 Assets/Animators/Player.controller create mode 100644 Assets/Animators/Player.controller.meta delete mode 100644 Assets/Sprites/pg.png delete mode 100644 Assets/Sprites/pg.png.meta diff --git a/Assets/Animations/PlayerStanding.anim b/Assets/Animations/PlayerStanding.anim new file mode 100644 index 0000000..3b2ee8d --- /dev/null +++ b/Assets/Animations/PlayerStanding.anim @@ -0,0 +1,71 @@ +%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: PlayerStanding + 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: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 549670c1841ca86489786415645ee012, type: 3} + - time: 1 + value: {fileID: 0} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 549670c1841ca86489786415645ee012, type: 3} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/PlayerStanding.anim.meta b/Assets/Animations/PlayerStanding.anim.meta new file mode 100644 index 0000000..1067f95 --- /dev/null +++ b/Assets/Animations/PlayerStanding.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 516cc9397e2eab74b985798ab523ad81 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerWalking.anim b/Assets/Animations/PlayerWalking.anim new file mode 100644 index 0000000..566df32 --- /dev/null +++ b/Assets/Animations/PlayerWalking.anim @@ -0,0 +1,89 @@ +%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: PlayerWalking + 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: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 549670c1841ca86489786415645ee012, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 796b3541eee3f0740a4db2b3eb64b8fa, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: b25cd947cc224704eba6acb2beeb7069, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 21301b9c1d12f0b4dbb230c96d975e13, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 81b351b7062de0743afbe875a4d751a8, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: ba7744e11e6301942b405cef140e58da, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 30bdfd874fb7f1d4f983f79abe7b7387, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 55f5efd5f3362e04fa72a946fdff4247, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 549670c1841ca86489786415645ee012, type: 3} + - {fileID: 21300000, guid: 796b3541eee3f0740a4db2b3eb64b8fa, type: 3} + - {fileID: 21300000, guid: b25cd947cc224704eba6acb2beeb7069, type: 3} + - {fileID: 21300000, guid: 21301b9c1d12f0b4dbb230c96d975e13, type: 3} + - {fileID: 21300000, guid: 81b351b7062de0743afbe875a4d751a8, type: 3} + - {fileID: 21300000, guid: ba7744e11e6301942b405cef140e58da, type: 3} + - {fileID: 21300000, guid: 30bdfd874fb7f1d4f983f79abe7b7387, type: 3} + - {fileID: 21300000, guid: 55f5efd5f3362e04fa72a946fdff4247, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666666 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/PlayerWalking.anim.meta b/Assets/Animations/PlayerWalking.anim.meta new file mode 100644 index 0000000..3f9de4e --- /dev/null +++ b/Assets/Animations/PlayerWalking.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c443a9cc7e893e4ba81e9f9ad984078 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators/Player.controller b/Assets/Animators/Player.controller new file mode 100644 index 0000000..67883c3 --- /dev/null +++ b/Assets/Animators/Player.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7437385820594347172 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerStanding + 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: 516cc9397e2eab74b985798ab523ad81, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-3917965558610327068 +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: 2114508889329877093} + m_Position: {x: 300, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7437385820594347172} + m_Position: {x: 335, y: 165, 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: 2114508889329877093} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3917965558610327068} + 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 &2114508889329877093 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerWalking + 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: 9c443a9cc7e893e4ba81e9f9ad984078, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animators/Player.controller.meta b/Assets/Animators/Player.controller.meta new file mode 100644 index 0000000..5214426 --- /dev/null +++ b/Assets/Animators/Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0244ec06741e55843a3d81c7be8ca98d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index ff4781b..1f35ed6 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Steffo.unity @@ -120,6 +120,100 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &301857496 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalPosition.x + value: 41.04119 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalPosition.y + value: 36.95943 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2935319493830293414, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e8ff38be23e53db40a793f6959c6f4ec, type: 3} +--- !u!1 &301857497 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, + type: 3} + m_PrefabInstance: {fileID: 301857496} + m_PrefabAsset: {fileID: 0} +--- !u!95 &301857498 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 301857497} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0244ec06741e55843a3d81c7be8ca98d, 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!1001 &8182065398405294977 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/EntityPlayer.cs b/Assets/Scripts/EntityPlayer.cs index 2b04105..b68b814 100644 --- a/Assets/Scripts/EntityPlayer.cs +++ b/Assets/Scripts/EntityPlayer.cs @@ -10,9 +10,11 @@ public enum ControlMode { public class EntityPlayer : Entity { protected ControlMode controlMode; + protected Animator animator; protected override void Start() { base.Start(); + animator = GetComponent(); controlMode = ControlMode.Move; } @@ -39,10 +41,12 @@ public class EntityPlayer : Entity if (Input.GetKeyDown(KeyCode.LeftArrow)) { hasAttacked = GetComponent().Attack(MapPosition + Vector2Int.left); + spriteRenderer.flipX = true; } else if (Input.GetKeyDown(KeyCode.RightArrow)) { hasAttacked = GetComponent().Attack(MapPosition + Vector2Int.right); + spriteRenderer.flipX = false; } else if (Input.GetKeyDown(KeyCode.UpArrow)) { @@ -66,7 +70,7 @@ public class EntityPlayer : Entity if (map.CanMoveTo(MapPosition + Vector2Int.left)) { transform.Translate(Vector3.left); hasMoved = true; - spriteRenderer.flipX = false; + spriteRenderer.flipX = true; } } else if (Input.GetKeyDown(KeyCode.RightArrow)) @@ -74,7 +78,7 @@ public class EntityPlayer : Entity if (map.CanMoveTo(MapPosition + Vector2Int.right)) { transform.Translate(Vector3.right); hasMoved = true; - spriteRenderer.flipX = true; + spriteRenderer.flipX = false; } } else if (Input.GetKeyDown(KeyCode.UpArrow)) diff --git a/Assets/Sprites/ChMov1.png.meta b/Assets/Sprites/ChMov1.png.meta index a10aaac..66c087a 100644 --- a/Assets/Sprites/ChMov1.png.meta +++ b/Assets/Sprites/ChMov1.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov2.png.meta b/Assets/Sprites/ChMov2.png.meta index f712d8c..ad0eb38 100644 --- a/Assets/Sprites/ChMov2.png.meta +++ b/Assets/Sprites/ChMov2.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov3.png.meta b/Assets/Sprites/ChMov3.png.meta index 3ab56bd..434cd8e 100644 --- a/Assets/Sprites/ChMov3.png.meta +++ b/Assets/Sprites/ChMov3.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov4.png.meta b/Assets/Sprites/ChMov4.png.meta index 417a0dd..7bb0363 100644 --- a/Assets/Sprites/ChMov4.png.meta +++ b/Assets/Sprites/ChMov4.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov5.png.meta b/Assets/Sprites/ChMov5.png.meta index 30451a0..b1ae9ee 100644 --- a/Assets/Sprites/ChMov5.png.meta +++ b/Assets/Sprites/ChMov5.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov6.png.meta b/Assets/Sprites/ChMov6.png.meta index 5b8a3b4..f6438c3 100644 --- a/Assets/Sprites/ChMov6.png.meta +++ b/Assets/Sprites/ChMov6.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov7.png.meta b/Assets/Sprites/ChMov7.png.meta index 6587263..f98568d 100644 --- a/Assets/Sprites/ChMov7.png.meta +++ b/Assets/Sprites/ChMov7.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/ChMov8.png.meta b/Assets/Sprites/ChMov8.png.meta index e2a16a8..3447166 100644 --- a/Assets/Sprites/ChMov8.png.meta +++ b/Assets/Sprites/ChMov8.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/pg.png b/Assets/Sprites/pg.png deleted file mode 100644 index a9a7c2a..0000000 --- a/Assets/Sprites/pg.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b36bff354ddbb8b852171dd7f9eb1e2c5279201d9cbb102b38d7fc27079fd067 -size 381 diff --git a/Assets/Sprites/pg.png.meta b/Assets/Sprites/pg.png.meta deleted file mode 100644 index 7c72237..0000000 --- a/Assets/Sprites/pg.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: 88f4c277892ae9449a57b321cd810bce -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - 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: 30 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: ed1284666de20434aaac0772ac619792 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: