From 75c114a14e2ab4a155b4f50205f9b7c75ad2fc45 Mon Sep 17 00:00:00 2001 From: Madhav Kapa Date: Thu, 15 Jun 2023 15:49:00 +0530 Subject: [PATCH] pistol 1?? --- Assets/DefaultPrefabObjects.asset | 6 ++-- .../Levels/Level0/CeilLightMaterial.mat | 2 +- .../SteamManager.unitypackage.meta} | 2 +- Assets/Prefabs/GunPrefabs/Pistol1.prefab | 32 ++++++++++++++++++- Assets/Prefabs/Items/LowPolyScifiGun.prefab | 32 ++++++++++++++++++- ...Muzzle_2020.3_URP_v1.0.1.unitypackage.meta | 7 ---- 6 files changed, 67 insertions(+), 14 deletions(-) rename Assets/{VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta => Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta} (74%) delete mode 100644 Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index 439051b..ce40c6f 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -14,9 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: _prefabs: - {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + - {fileID: 2567458756038211005, guid: 6e7c21afe51065e4aae8fa80f880f1e5, type: 3} - {fileID: 1069525110278255243, guid: 5e611af8f39b09a4f9b479a29f3460ff, type: 3} - - {fileID: -2750772001946868067, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} - - {fileID: -3687221924445419690, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} + - {fileID: 6649839674135743142, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} + - {fileID: -5190615940012992767, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - {fileID: -3690528308152583234, guid: 148456ca1eee0994eb0165cb943e8322, type: 3} - {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3} - {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3} @@ -26,4 +27,3 @@ MonoBehaviour: - {fileID: 3624261834906416601, guid: 4e1673ccc2acac543871855a0e8bed71, type: 3} - {fileID: 201277550, guid: d904f93bc171bb144ba33c5155282f6f, type: 3} - {fileID: 27039729695437543, guid: f820efff6a2871447b961fc755212ba3, type: 3} - - {fileID: 2567458756038211005, guid: 6e7c21afe51065e4aae8fa80f880f1e5, type: 3} diff --git a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat index 715777f..354b23f 100644 --- a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat +++ b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat @@ -206,7 +206,7 @@ Material: - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 42 + - _StencilWriteMaskMV: 40 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 diff --git a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta b/Assets/Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta similarity index 74% rename from Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta rename to Assets/Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta index a4d019d..7890e6c 100644 --- a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta +++ b/Assets/Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96a44475794fb6445a6f3c4b9ee13966 +guid: a9c34549a246d47439b106bb23f71dff DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/GunPrefabs/Pistol1.prefab b/Assets/Prefabs/GunPrefabs/Pistol1.prefab index 4be288c..b6ccf62 100644 --- a/Assets/Prefabs/GunPrefabs/Pistol1.prefab +++ b/Assets/Prefabs/GunPrefabs/Pistol1.prefab @@ -476,6 +476,7 @@ GameObject: m_Component: - component: {fileID: 2870092814380004342} - component: {fileID: 7836552235224166431} + - component: {fileID: 6649839674135743142} m_Layer: 2 m_Name: Pistol1 m_TagString: Untagged @@ -515,7 +516,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _componentIndexCache: 255 - _addedNetworkObject: {fileID: 0} + _addedNetworkObject: {fileID: 6649839674135743142} _networkObjectCache: {fileID: 0} aimMode: 2 targetingLight: {fileID: 935129114346117162} @@ -532,6 +533,35 @@ MonoBehaviour: ignoreLayers: serializedVersion: 2 m_Bits: 114 +--- !u!114 &6649839674135743142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3215375081412045132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: [] + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 14512926296781124355 + _sceneNetworkObjects: [] --- !u!1 &6499420578328911065 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Items/LowPolyScifiGun.prefab b/Assets/Prefabs/Items/LowPolyScifiGun.prefab index 2953bce..54533d5 100644 --- a/Assets/Prefabs/Items/LowPolyScifiGun.prefab +++ b/Assets/Prefabs/Items/LowPolyScifiGun.prefab @@ -345,6 +345,7 @@ GameObject: m_Component: - component: {fileID: 5589360669647008002} - component: {fileID: 469778866924712683} + - component: {fileID: -5190615940012992767} m_Layer: 2 m_Name: LowPolyScifiGun m_TagString: Untagged @@ -383,7 +384,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _componentIndexCache: 255 - _addedNetworkObject: {fileID: 0} + _addedNetworkObject: {fileID: -5190615940012992767} _networkObjectCache: {fileID: 0} aimMode: 2 targetingLight: {fileID: 7403853081934682846} @@ -400,3 +401,32 @@ MonoBehaviour: ignoreLayers: serializedVersion: 2 m_Bits: 0 +--- !u!114 &-5190615940012992767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5105592443209329592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: [] + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 4172314216740162334 + _sceneNetworkObjects: [] diff --git a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta deleted file mode 100644 index e4693ea..0000000 --- a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0957b521a08374f4aa508231735153bc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: