diff --git a/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab b/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab index fb7086d..64e8e0c 100644 --- a/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab +++ b/Plunderblock/Assets/PrefabsKevin/Bullet/Bullet.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2236690362668407759 +--- !u!1 &939049122039926632 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,11 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6471294721422210942} - - component: {fileID: 1039406839055562914} - - component: {fileID: 8585144232124012140} - - component: {fileID: 432803407619611053} - - component: {fileID: 3112159470577689136} + - component: {fileID: 3286218375903244322} + - component: {fileID: 7689678004430099734} m_Layer: 0 m_Name: Bullet m_TagString: Untagged @@ -20,36 +17,146 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6471294721422210942 +--- !u!4 &3286218375903244322 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2236690362668407759} + m_GameObject: {fileID: 939049122039926632} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.486, y: 2.4244237, z: -9.61718} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6605893028012961459} + - {fileID: 2485312180149050413} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &7689678004430099734 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 939049122039926632} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &1549001692297207422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2485312180149050413} + - component: {fileID: 8748796222335991794} + m_Layer: 0 + m_Name: BulletPhysics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2485312180149050413 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549001692297207422} + 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_Children: [] + m_Father: {fileID: 3286218375903244322} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8748796222335991794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549001692297207422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf678ed456c71c949b0b1a2b01e9f32b, type: 3} + m_Name: + m_EditorClassIdentifier: + parent: {fileID: 939049122039926632} + dataBullet: {fileID: 11400000, guid: 215ad7d91b06f2741b40dc3806033238, type: 2} + rb: {fileID: 0} +--- !u!1 &4152829191026619603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6605893028012961459} + - component: {fileID: 2983324350416316771} + - component: {fileID: 72733985193673993} + - component: {fileID: 631762951054164996} + m_Layer: 0 + m_Name: BulletMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6605893028012961459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4152829191026619603} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 3286218375903244322} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1039406839055562914 +--- !u!33 &2983324350416316771 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2236690362668407759} + m_GameObject: {fileID: 4152829191026619603} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8585144232124012140 +--- !u!23 &72733985193673993 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2236690362668407759} + m_GameObject: {fileID: 4152829191026619603} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -85,13 +192,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &432803407619611053 +--- !u!135 &631762951054164996 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2236690362668407759} + m_GameObject: {fileID: 4152829191026619603} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -106,15 +213,3 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &3112159470577689136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2236690362668407759} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9e1d27c11e7949e4fa59cefee3928ca4, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Plunderblock/Assets/Scenes/KevinSceneGun.unity b/Plunderblock/Assets/Scenes/KevinSceneGun.unity index 2ca7ec0..4779a6b 100644 --- a/Plunderblock/Assets/Scenes/KevinSceneGun.unity +++ b/Plunderblock/Assets/Scenes/KevinSceneGun.unity @@ -228,114 +228,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1136230260 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1136230261} - - component: {fileID: 1136230263} - m_Layer: 0 - m_Name: BulletPhysics - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1136230261 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1136230260} - 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_Children: [] - m_Father: {fileID: 1798285045} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1136230263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1136230260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf678ed456c71c949b0b1a2b01e9f32b, type: 3} - m_Name: - m_EditorClassIdentifier: - parent: {fileID: 1798285044} - bulletScript: {fileID: 11400000, guid: 4a62dca8041fc5c48944492b0df9ef56, type: 2} - rb: {fileID: 0} ---- !u!1 &1798285044 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1798285045} - - component: {fileID: 1798285046} - m_Layer: 0 - m_Name: Bullet - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1798285045 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1798285044} - 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_Children: - - {fileID: 8689930185367856273} - - {fileID: 1136230261} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1798285046 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1798285044} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1 &1827603663 GameObject: m_ObjectHideFlags: 0 @@ -522,111 +414,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &2834977838573963842 -SphereCollider: +--- !u!1001 &3184073952171808938 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4493518470831622176} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &3403254802882505549 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4493518470831622176} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &4493518470831622176 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8689930185367856273} - - component: {fileID: 3403254802882505549} - - component: {fileID: 6229307335543506307} - - component: {fileID: 2834977838573963842} - m_Layer: 0 - m_Name: BulletMesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &6229307335543506307 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4493518470831622176} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!4 &8689930185367856273 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4493518470831622176} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1798285045} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 939049122039926632, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_Name + value: Bullet + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286218375903244322, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5bd04146a95212e41bc2c52b7079e131, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -634,4 +478,4 @@ SceneRoots: - {fileID: 2061567907} - {fileID: 1827603665} - {fileID: 430367789} - - {fileID: 1798285045} + - {fileID: 3184073952171808938} diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs b/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs index a99fcde..4a7dba3 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/BulletMoving.cs @@ -6,9 +6,9 @@ public class BulletMoving : MonoBehaviour { public GameObject parent; - public BulletScript bulletScript; - - public Rigidbody rb; + public DataBullet dataBullet; + [SerializeField] + private Rigidbody rb; private // Start is called before the first frame update @@ -20,6 +20,6 @@ public class BulletMoving : MonoBehaviour // Update is called once per frame void Update() { - rb.velocity = bulletScript.direction * bulletScript.speed; + rb.velocity = dataBullet.direction * dataBullet.speed; } } diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletScript.cs b/Plunderblock/Assets/Scripts/ScriptsKevin/DataBullet.cs similarity index 66% rename from Plunderblock/Assets/Scripts/ScriptsKevin/BulletScript.cs rename to Plunderblock/Assets/Scripts/ScriptsKevin/DataBullet.cs index ed0500a..10852e1 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletScript.cs +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/DataBullet.cs @@ -4,13 +4,17 @@ using UnityEditor; using UnityEngine; [CreateAssetMenu(fileName = "BulletScriptableObject", menuName = "BulletScriptableObject", order = 0)] -public class BulletScript : ScriptableObject +public class DataBullet : ScriptableObject { - public int damage = 10; + public float damage = 10; public float speed = 5f; public Vector3 direction = new Vector3(); public int ammo; + + public void setDamage(float damage){ + this.damage = damage; + } } diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/BulletScript.cs.meta b/Plunderblock/Assets/Scripts/ScriptsKevin/DataBullet.cs.meta similarity index 100% rename from Plunderblock/Assets/Scripts/ScriptsKevin/BulletScript.cs.meta rename to Plunderblock/Assets/Scripts/ScriptsKevin/DataBullet.cs.meta diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletScriptableObject.asset b/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletData1.asset similarity index 93% rename from Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletScriptableObject.asset rename to Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletData1.asset index 7ebff38..e75c660 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletScriptableObject.asset +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletData1.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9e1d27c11e7949e4fa59cefee3928ca4, type: 3} - m_Name: BulletScriptableObject + m_Name: BulletData1 m_EditorClassIdentifier: damage: 10 speed: 2 diff --git a/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletScriptableObject.asset.meta b/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletData1.asset.meta similarity index 79% rename from Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletScriptableObject.asset.meta rename to Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletData1.asset.meta index 047013e..fc88675 100644 --- a/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletScriptableObject.asset.meta +++ b/Plunderblock/Assets/Scripts/ScriptsKevin/ScriptableObjects/BulletData1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a62dca8041fc5c48944492b0df9ef56 +guid: 215ad7d91b06f2741b40dc3806033238 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000