Emil_Shanaty/No-Time-To-Rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: functional riffle and inventory for bullets

Browse Source
This commit is contained in:
KOSMOGOR
2025-04-26 13:53:06 +03:00
parent 1b106e4e18
commit df5602dc00
8 changed files with 258 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/Player.prefab
+71 -16
View File
@@ -133,6 +133,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3053641561535516023}
- {fileID: 7306251229952926972}
m_Father: {fileID: 6890030909251295590}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &1094126809165627842
@@ -458,22 +459,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 4506534449155536579}
m_Modifications:
- target: {fileID: 1042172676018165636, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1042172676018165636, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1042172676018165636, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1587861691790886941, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
propertyPath: m_Name
value: Muzzle
objectReference: {fileID: 0}
- target: {fileID: 2812489602185112801, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
propertyPath: m_Name
value: Pistol_0.1
@@ -528,3 +513,73 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3}
m_PrefabInstance: {fileID: 444904299868781356}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6803844382836373506
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4506534449155536579}
m_Modifications:
- target: {fileID: 1283704224102497885, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1283704224102497885, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 3477561828804200004, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_Name
value: Rifle_0.3
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalPosition.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalPosition.y
value: -0.3
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalPosition.z
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalRotation.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
--- !u!4 &7306251229952926972 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3}
m_PrefabInstance: {fileID: 6803844382836373506}
m_PrefabAsset: {fileID: 0}
Assets/Prefabs/Weapons/Pistol_0.1.prefab
+7 -6
View File
@@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 1042172676018165636}
m_Layer: 0
m_Name: muzzle
m_Name: Muzzle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -24,13 +24,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1587861691790886941}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0.035, y: -0.0003, z: -0.0015}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3191971078612809307}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1001 &3154368798760636848
PrefabInstance:
m_ObjectHideFlags: 0
@@ -53,15 +53,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
propertyPath: m_LocalRotation.w
@@ -142,6 +142,7 @@ MonoBehaviour:
projectilePrefab: {fileID: 1562924000103655330, guid: bfe7100930f24fd52b5b66832f59cfa8, type: 3}
spawnPosition: {fileID: 1042172676018165636}
fireRate: 1
currentDelay: 0
--- !u!4 &3191971078612809307 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d734c466a893eb24080a9ca70b7b501d, type: 3}
Assets/Prefabs/Weapons/Rifle_0.3.prefab
+77 -2
View File
@@ -1,5 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7460370745949417932
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1283704224102497885}
m_Layer: 0
m_Name: Muzzle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1283704224102497885
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7460370745949417932}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0.06, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4253958408851774718}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &4360506843749432085
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8,6 +39,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
propertyPath: m_LocalScale.x
value: 15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
propertyPath: m_LocalScale.y
value: 15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
propertyPath: m_LocalScale.z
value: 15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -54,6 +97,38 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
insertIndex: -1
addedObject: {fileID: 1283704224102497885}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
insertIndex: -1
addedObject: {fileID: 1683623121582132765}
m_SourcePrefab: {fileID: 100100000, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
--- !u!1 &3477561828804200004 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
m_PrefabInstance: {fileID: 4360506843749432085}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1683623121582132765
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3477561828804200004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4cc7bc1baad25a9459ee673b6d502363, type: 3}
m_Name:
m_EditorClassIdentifier:
projectilePrefab: {fileID: 1562924000103655330, guid: bfe7100930f24fd52b5b66832f59cfa8, type: 3}
spawnPosition: {fileID: 1283704224102497885}
fireRate: 3
currentDelay: 0
--- !u!4 &4253958408851774718 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 873975b0a04c6cf40968163e886b6680, type: 3}
m_PrefabInstance: {fileID: 4360506843749432085}
m_PrefabAsset: {fileID: 0}