From 72ffddcacc52947407ad7c658a1480de0a519d9f Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Thu, 13 Aug 2020 22:00:38 +0300 Subject: [PATCH] Revert "Move SniperRifle to Items" This reverts commit 58475bc11e7b19580a411960cb75b66d38de7a99. --- Assets/Items.meta | 8 -------- Assets/{Items => Player}/SniperRifle.meta | 0 Assets/{Items => Player}/SniperRifle/Animation.meta | 0 .../Animation/GunAnimatorController.controller | 0 .../Animation/GunAnimatorController.controller.meta | 0 .../SniperRifle/Animation/GunIdle.anim | 0 .../SniperRifle/Animation/GunIdle.anim.meta | 0 .../SniperRifle/Animation/GunShot.anim | 0 .../SniperRifle/Animation/GunShot.anim.meta | 0 .../SniperRifle/Animation/GunWalk.anim | 0 .../SniperRifle/Animation/GunWalk.anim.meta | 0 Assets/{Items => Player}/SniperRifle/Laser.prefab | 0 .../{Items => Player}/SniperRifle/Laser.prefab.meta | 0 Assets/{Items => Player}/SniperRifle/Materials.meta | 0 .../SniperRifle/Materials/Gear.png | Bin .../SniperRifle/Materials/Gear.png.meta | 0 .../SniperRifle/Materials/RifleMetal.mat | 0 .../SniperRifle/Materials/RifleMetal.mat.meta | 0 .../SniperRifle/Materials/Scope.mat | 0 .../SniperRifle/Materials/Scope.mat.meta | 0 .../Materials/ScopeRenderTexture.renderTexture | 0 .../Materials/ScopeRenderTexture.renderTexture.meta | 0 .../SniperRifle/Materials/ScopeShader.shadergraph | 0 .../Materials/ScopeShader.shadergraph.meta | 0 .../SniperRifle/Materials/ShootLaserTrail.mat | 0 .../SniperRifle/Materials/ShootLaserTrail.mat.meta | 0 Assets/{Items => Player}/SniperRifle/Sfx.meta | 0 .../{Items => Player}/SniperRifle/Sfx/LaserFast.mp3 | Bin .../SniperRifle/Sfx/LaserFast.mp3.meta | 0 .../{Items => Player}/SniperRifle/Sfx/LaserShot.ogg | Bin .../SniperRifle/Sfx/LaserShot.ogg.meta | 0 .../SniperRifle/Sfx/LaserWithRecovery.mp3 | Bin .../SniperRifle/Sfx/LaserWithRecovery.mp3.meta | 0 .../SniperRifle/Sfx/LaserWithRecoveryEdited.ogg | Bin .../Sfx/LaserWithRecoveryEdited.ogg.meta | 0 .../{Items => Player}/SniperRifle/SniperRifle.fbx | Bin .../SniperRifle/SniperRifle.fbx.meta | 0 37 files changed, 8 deletions(-) delete mode 100644 Assets/Items.meta rename Assets/{Items => Player}/SniperRifle.meta (100%) rename Assets/{Items => Player}/SniperRifle/Animation.meta (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunAnimatorController.controller (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunAnimatorController.controller.meta (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunIdle.anim (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunIdle.anim.meta (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunShot.anim (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunShot.anim.meta (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunWalk.anim (100%) rename Assets/{Items => Player}/SniperRifle/Animation/GunWalk.anim.meta (100%) rename Assets/{Items => Player}/SniperRifle/Laser.prefab (100%) rename Assets/{Items => Player}/SniperRifle/Laser.prefab.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials/Gear.png (100%) rename Assets/{Items => Player}/SniperRifle/Materials/Gear.png.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials/RifleMetal.mat (100%) rename Assets/{Items => Player}/SniperRifle/Materials/RifleMetal.mat.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials/Scope.mat (100%) rename Assets/{Items => Player}/SniperRifle/Materials/Scope.mat.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials/ScopeRenderTexture.renderTexture (100%) rename Assets/{Items => Player}/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials/ScopeShader.shadergraph (100%) rename Assets/{Items => Player}/SniperRifle/Materials/ScopeShader.shadergraph.meta (100%) rename Assets/{Items => Player}/SniperRifle/Materials/ShootLaserTrail.mat (100%) rename Assets/{Items => Player}/SniperRifle/Materials/ShootLaserTrail.mat.meta (100%) rename Assets/{Items => Player}/SniperRifle/Sfx.meta (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserFast.mp3 (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserFast.mp3.meta (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserShot.ogg (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserShot.ogg.meta (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserWithRecovery.mp3 (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserWithRecovery.mp3.meta (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg (100%) rename Assets/{Items => Player}/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta (100%) rename Assets/{Items => Player}/SniperRifle/SniperRifle.fbx (100%) rename Assets/{Items => Player}/SniperRifle/SniperRifle.fbx.meta (100%) diff --git a/Assets/Items.meta b/Assets/Items.meta deleted file mode 100644 index ae444b4..0000000 --- a/Assets/Items.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d2ea894750ef4154e8dec3a92b49ca7c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Items/SniperRifle.meta b/Assets/Player/SniperRifle.meta similarity index 100% rename from Assets/Items/SniperRifle.meta rename to Assets/Player/SniperRifle.meta diff --git a/Assets/Items/SniperRifle/Animation.meta b/Assets/Player/SniperRifle/Animation.meta similarity index 100% rename from Assets/Items/SniperRifle/Animation.meta rename to Assets/Player/SniperRifle/Animation.meta diff --git a/Assets/Items/SniperRifle/Animation/GunAnimatorController.controller b/Assets/Player/SniperRifle/Animation/GunAnimatorController.controller similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunAnimatorController.controller rename to Assets/Player/SniperRifle/Animation/GunAnimatorController.controller diff --git a/Assets/Items/SniperRifle/Animation/GunAnimatorController.controller.meta b/Assets/Player/SniperRifle/Animation/GunAnimatorController.controller.meta similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunAnimatorController.controller.meta rename to Assets/Player/SniperRifle/Animation/GunAnimatorController.controller.meta diff --git a/Assets/Items/SniperRifle/Animation/GunIdle.anim b/Assets/Player/SniperRifle/Animation/GunIdle.anim similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunIdle.anim rename to Assets/Player/SniperRifle/Animation/GunIdle.anim diff --git a/Assets/Items/SniperRifle/Animation/GunIdle.anim.meta b/Assets/Player/SniperRifle/Animation/GunIdle.anim.meta similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunIdle.anim.meta rename to Assets/Player/SniperRifle/Animation/GunIdle.anim.meta diff --git a/Assets/Items/SniperRifle/Animation/GunShot.anim b/Assets/Player/SniperRifle/Animation/GunShot.anim similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunShot.anim rename to Assets/Player/SniperRifle/Animation/GunShot.anim diff --git a/Assets/Items/SniperRifle/Animation/GunShot.anim.meta b/Assets/Player/SniperRifle/Animation/GunShot.anim.meta similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunShot.anim.meta rename to Assets/Player/SniperRifle/Animation/GunShot.anim.meta diff --git a/Assets/Items/SniperRifle/Animation/GunWalk.anim b/Assets/Player/SniperRifle/Animation/GunWalk.anim similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunWalk.anim rename to Assets/Player/SniperRifle/Animation/GunWalk.anim diff --git a/Assets/Items/SniperRifle/Animation/GunWalk.anim.meta b/Assets/Player/SniperRifle/Animation/GunWalk.anim.meta similarity index 100% rename from Assets/Items/SniperRifle/Animation/GunWalk.anim.meta rename to Assets/Player/SniperRifle/Animation/GunWalk.anim.meta diff --git a/Assets/Items/SniperRifle/Laser.prefab b/Assets/Player/SniperRifle/Laser.prefab similarity index 100% rename from Assets/Items/SniperRifle/Laser.prefab rename to Assets/Player/SniperRifle/Laser.prefab diff --git a/Assets/Items/SniperRifle/Laser.prefab.meta b/Assets/Player/SniperRifle/Laser.prefab.meta similarity index 100% rename from Assets/Items/SniperRifle/Laser.prefab.meta rename to Assets/Player/SniperRifle/Laser.prefab.meta diff --git a/Assets/Items/SniperRifle/Materials.meta b/Assets/Player/SniperRifle/Materials.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials.meta rename to Assets/Player/SniperRifle/Materials.meta diff --git a/Assets/Items/SniperRifle/Materials/Gear.png b/Assets/Player/SniperRifle/Materials/Gear.png similarity index 100% rename from Assets/Items/SniperRifle/Materials/Gear.png rename to Assets/Player/SniperRifle/Materials/Gear.png diff --git a/Assets/Items/SniperRifle/Materials/Gear.png.meta b/Assets/Player/SniperRifle/Materials/Gear.png.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials/Gear.png.meta rename to Assets/Player/SniperRifle/Materials/Gear.png.meta diff --git a/Assets/Items/SniperRifle/Materials/RifleMetal.mat b/Assets/Player/SniperRifle/Materials/RifleMetal.mat similarity index 100% rename from Assets/Items/SniperRifle/Materials/RifleMetal.mat rename to Assets/Player/SniperRifle/Materials/RifleMetal.mat diff --git a/Assets/Items/SniperRifle/Materials/RifleMetal.mat.meta b/Assets/Player/SniperRifle/Materials/RifleMetal.mat.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials/RifleMetal.mat.meta rename to Assets/Player/SniperRifle/Materials/RifleMetal.mat.meta diff --git a/Assets/Items/SniperRifle/Materials/Scope.mat b/Assets/Player/SniperRifle/Materials/Scope.mat similarity index 100% rename from Assets/Items/SniperRifle/Materials/Scope.mat rename to Assets/Player/SniperRifle/Materials/Scope.mat diff --git a/Assets/Items/SniperRifle/Materials/Scope.mat.meta b/Assets/Player/SniperRifle/Materials/Scope.mat.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials/Scope.mat.meta rename to Assets/Player/SniperRifle/Materials/Scope.mat.meta diff --git a/Assets/Items/SniperRifle/Materials/ScopeRenderTexture.renderTexture b/Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture similarity index 100% rename from Assets/Items/SniperRifle/Materials/ScopeRenderTexture.renderTexture rename to Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture diff --git a/Assets/Items/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta b/Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta rename to Assets/Player/SniperRifle/Materials/ScopeRenderTexture.renderTexture.meta diff --git a/Assets/Items/SniperRifle/Materials/ScopeShader.shadergraph b/Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph similarity index 100% rename from Assets/Items/SniperRifle/Materials/ScopeShader.shadergraph rename to Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph diff --git a/Assets/Items/SniperRifle/Materials/ScopeShader.shadergraph.meta b/Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials/ScopeShader.shadergraph.meta rename to Assets/Player/SniperRifle/Materials/ScopeShader.shadergraph.meta diff --git a/Assets/Items/SniperRifle/Materials/ShootLaserTrail.mat b/Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat similarity index 100% rename from Assets/Items/SniperRifle/Materials/ShootLaserTrail.mat rename to Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat diff --git a/Assets/Items/SniperRifle/Materials/ShootLaserTrail.mat.meta b/Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat.meta similarity index 100% rename from Assets/Items/SniperRifle/Materials/ShootLaserTrail.mat.meta rename to Assets/Player/SniperRifle/Materials/ShootLaserTrail.mat.meta diff --git a/Assets/Items/SniperRifle/Sfx.meta b/Assets/Player/SniperRifle/Sfx.meta similarity index 100% rename from Assets/Items/SniperRifle/Sfx.meta rename to Assets/Player/SniperRifle/Sfx.meta diff --git a/Assets/Items/SniperRifle/Sfx/LaserFast.mp3 b/Assets/Player/SniperRifle/Sfx/LaserFast.mp3 similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserFast.mp3 rename to Assets/Player/SniperRifle/Sfx/LaserFast.mp3 diff --git a/Assets/Items/SniperRifle/Sfx/LaserFast.mp3.meta b/Assets/Player/SniperRifle/Sfx/LaserFast.mp3.meta similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserFast.mp3.meta rename to Assets/Player/SniperRifle/Sfx/LaserFast.mp3.meta diff --git a/Assets/Items/SniperRifle/Sfx/LaserShot.ogg b/Assets/Player/SniperRifle/Sfx/LaserShot.ogg similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserShot.ogg rename to Assets/Player/SniperRifle/Sfx/LaserShot.ogg diff --git a/Assets/Items/SniperRifle/Sfx/LaserShot.ogg.meta b/Assets/Player/SniperRifle/Sfx/LaserShot.ogg.meta similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserShot.ogg.meta rename to Assets/Player/SniperRifle/Sfx/LaserShot.ogg.meta diff --git a/Assets/Items/SniperRifle/Sfx/LaserWithRecovery.mp3 b/Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3 similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserWithRecovery.mp3 rename to Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3 diff --git a/Assets/Items/SniperRifle/Sfx/LaserWithRecovery.mp3.meta b/Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3.meta similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserWithRecovery.mp3.meta rename to Assets/Player/SniperRifle/Sfx/LaserWithRecovery.mp3.meta diff --git a/Assets/Items/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg b/Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg rename to Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg diff --git a/Assets/Items/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta b/Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta similarity index 100% rename from Assets/Items/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta rename to Assets/Player/SniperRifle/Sfx/LaserWithRecoveryEdited.ogg.meta diff --git a/Assets/Items/SniperRifle/SniperRifle.fbx b/Assets/Player/SniperRifle/SniperRifle.fbx similarity index 100% rename from Assets/Items/SniperRifle/SniperRifle.fbx rename to Assets/Player/SniperRifle/SniperRifle.fbx diff --git a/Assets/Items/SniperRifle/SniperRifle.fbx.meta b/Assets/Player/SniperRifle/SniperRifle.fbx.meta similarity index 100% rename from Assets/Items/SniperRifle/SniperRifle.fbx.meta rename to Assets/Player/SniperRifle/SniperRifle.fbx.meta