diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill.meta diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Darknessball.prefab b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Darknessball.prefab similarity index 59% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Darknessball.prefab rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Darknessball.prefab index 77834a6c..e7066216 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Darknessball.prefab +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Darknessball.prefab @@ -11,6 +11,9 @@ GameObject: - component: {fileID: 759552675758406580} - component: {fileID: 7492690471538067993} - component: {fileID: 721481636574888361} + - component: {fileID: -3275633907703003897} + - component: {fileID: 9113494596136640624} + - component: {fileID: -7794782427701892011} m_Layer: 0 m_Name: Darknessball m_TagString: Untagged @@ -28,8 +31,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -106,3 +109,77 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &-3275633907703003897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 589444956133359262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46951a2e33fdd5a409f1579de9b7acfa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!50 &9113494596136640624 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 589444956133359262} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!70 &-7794782427701892011 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 589444956133359262} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 0.33, y: 0.32} + m_Direction: 1 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Darknessball.prefab.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Darknessball.prefab.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Darknessball.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Darknessball.prefab.meta diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Fireball.prefab b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Fireball.prefab similarity index 59% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Fireball.prefab rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Fireball.prefab index 4e098b44..d7f3caf4 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Fireball.prefab +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Fireball.prefab @@ -11,6 +11,9 @@ GameObject: - component: {fileID: 7275089485906890891} - component: {fileID: 4707210132887916293} - component: {fileID: 8358053220907271229} + - component: {fileID: -409206718854825505} + - component: {fileID: 7592981806478228525} + - component: {fileID: 7577941235322895627} m_Layer: 0 m_Name: Fireball m_TagString: Untagged @@ -28,8 +31,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -106,3 +109,77 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &-409206718854825505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328494989662859589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26dd04ed34a3c4042bfbe12766af2d60, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!70 &7592981806478228525 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328494989662859589} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 0.25, y: 0.21} + m_Direction: 1 +--- !u!50 &7577941235322895627 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328494989662859589} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Fireball.prefab.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Fireball.prefab.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Fireball.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Fireball.prefab.meta diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Iceball.prefab b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Iceball.prefab similarity index 59% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Iceball.prefab rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Iceball.prefab index c3568b3f..cf0ce98b 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Iceball.prefab +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Iceball.prefab @@ -11,6 +11,9 @@ GameObject: - component: {fileID: 6892128790266366542} - component: {fileID: 1317263097951514820} - component: {fileID: 3514874755737400832} + - component: {fileID: -3377048296267459566} + - component: {fileID: 1179248653527079395} + - component: {fileID: 4076849194862890134} m_Layer: 0 m_Name: Iceball m_TagString: Untagged @@ -28,8 +31,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -902.5496, y: -540, z: 0} - m_LocalScale: {x: 3.0594902, y: 3.0594902, z: 3.0594902} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -106,3 +109,77 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &-3377048296267459566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2209934716239183953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa5541b68c81e2347960b5eeaf373bf4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!70 &1179248653527079395 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2209934716239183953} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 0.25, y: 0.21} + m_Direction: 1 +--- !u!50 &4076849194862890134 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2209934716239183953} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Iceball.prefab.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Iceball.prefab.meta similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Character Skill/Iceball.prefab.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Skill/Iceball.prefab.meta