Skip to content

refactor(2DSpaceShooter): cleanup project files, apply Unity best practices #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2021
Merged

refactor(2DSpaceShooter): cleanup project files, apply Unity best practices #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Basic/2DSpaceShooter/Assets/Sounds.meta → Basic/2DSpaceShooter/Assets/Audio.meta
View file
Open in desktop
File renamed without changes.
0 ...DSpaceShooter/Assets/Sounds/explosion.wav → ...2DSpaceShooter/Assets/Audio/explosion.wav
View file
Open in desktop
File renamed without changes.
0 .../2DSpaceShooter/Assets/explosion.wav.meta → ...ceShooter/Assets/Audio/explosion.wav.meta
View file
Open in desktop
File renamed without changes.
0 .../2DSpaceShooter/Assets/Sounds/powerup.wav → ...c/2DSpaceShooter/Assets/Audio/powerup.wav
View file
Open in desktop
File renamed without changes.
0 Basic/2DSpaceShooter/Assets/powerup.wav.meta → ...paceShooter/Assets/Audio/powerup.wav.meta
View file
Open in desktop
File renamed without changes.
0 Basic/2DSpaceShooter/Assets/Sounds/shoot.wav → Basic/2DSpaceShooter/Assets/Audio/shoot.wav
View file
Open in desktop
File renamed without changes.
0 Basic/2DSpaceShooter/Assets/shoot.wav.meta → ...DSpaceShooter/Assets/Audio/shoot.wav.meta
View file
Open in desktop
File renamed without changes.
0 ...c/2DSpaceShooter/Assets/Sounds/thrust.wav → Basic/2DSpaceShooter/Assets/Audio/thrust.wav
View file
Open in desktop
File renamed without changes.
0 Basic/2DSpaceShooter/Assets/thrust.wav.meta → ...SpaceShooter/Assets/Audio/thrust.wav.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../Resources/bouncy walls.physicsMaterial2D → ...s/Materials/BouncyWalls.physicsMaterial2D
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ PhysicsMaterial2D:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bouncy walls
m_Name: BouncyWalls
friction: 0
bounciness: 0.8
0 ...ssets/bouncy walls.physicsMaterial2D.meta → ...erials/BouncyWalls.physicsMaterial2D.meta
View file
Open in desktop
File renamed without changes.
29 changes: 0 additions & 29 deletions Basic/2DSpaceShooter/Assets/Materials/asteroid.mat
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Basic/2DSpaceShooter/Assets/Materials/asteroid.mat.meta
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Basic/2DSpaceShooter/Assets/Materials/background.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: background
m_Name: Background
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
Expand Down
29 changes: 0 additions & 29 deletions Basic/2DSpaceShooter/Assets/Materials/block.mat
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Basic/2DSpaceShooter/Assets/Materials/block.mat.meta
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Basic/2DSpaceShooter/Assets/Materials/box.mat
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Basic/2DSpaceShooter/Assets/Materials/box.mat.meta
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Basic/2DSpaceShooter/Assets/Materials/dirt.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dirt
m_Name: Dirt
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
Expand Down
62 changes: 59 additions & 3 deletions Basic/2DSpaceShooter/Assets/Materials/explosion.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: explosion
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_Name: Explosion
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
Expand All @@ -19,12 +19,68 @@ Material:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8d11f5c92a441fb4a99439fe9bebd939, type: 3}
m_Texture: {fileID: 2800000, guid: 03cfae05487dd49ccbd555872c174222, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- PixelSnap: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnableExternalAlpha: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
6 changes: 5 additions & 1 deletion Basic/2DSpaceShooter/Assets/Materials/explosion.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Basic/2DSpaceShooter/Assets/Materials/metal.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: metal
m_Name: Metal
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
Expand Down
29 changes: 0 additions & 29 deletions Basic/2DSpaceShooter/Assets/Materials/ship.mat
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Basic/2DSpaceShooter/Assets/Materials/ship.mat.meta
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Basic/2DSpaceShooter/Assets/Materials/space.mat
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Basic/2DSpaceShooter/Assets/Materials/space.mat.meta
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ...ceShooter/Assets/Resources/Materials.meta → Basic/2DSpaceShooter/Assets/Prefabs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...eShooter/Assets/Resources/asteroid.prefab → ...aceShooter/Assets/Prefabs/Asteroid.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 7964421087909880783}
- component: {fileID: 7837779245142776376}
m_Layer: 0
m_Name: asteroid
m_Name: Asteroid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
0 ...ter/Assets/Resources/asteroid.prefab.meta → ...ooter/Assets/Prefabs/Asteroid.prefab.meta
View file
Open in desktop
File renamed without changes.
17 changes: 2 additions & 15 deletions ...paceShooter/Assets/Resources/block.prefab → ...DSpaceShooter/Assets/Prefabs/Block.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ GameObject:
- component: {fileID: 400000}
- component: {fileID: 21200000}
- component: {fileID: 6100000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: block
m_TagString: Untagged
m_Name: Block
m_TagString: Obstacle
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
Expand Down Expand Up @@ -110,15 +109,3 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.77, y: 0.76}
m_EdgeRadius: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4fd2cd3e23a0294aabd78ebd058a662, type: 3}
m_Name:
m_EditorClassIdentifier:
0 ...hooter/Assets/Resources/block.prefab.meta → ...eShooter/Assets/Prefabs/Block.prefab.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...eShooter/Assets/Resources/Bullet2D.prefab → ...SpaceShooter/Assets/Prefabs/Bullet.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: -4113703611147433057}
- component: {fileID: -2419440837048175228}
m_Layer: 0
m_Name: Bullet2D
m_Name: Bullet
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
0 ...ter/Assets/Resources/Bullet2D.prefab.meta → ...Shooter/Assets/Prefabs/Bullet.prefab.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Shooter/Assets/Resources/Explosion.prefab → ...ceShooter/Assets/Prefabs/Explosion.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4765,7 +4765,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 58d6dcd92eee84e4eb9fc94075750b68, type: 2}
- {fileID: 2100000, guid: 02a050df0d344dd479ce8ccfe8991338, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
0 ...er/Assets/Resources/Explosion.prefab.meta → ...oter/Assets/Prefabs/Explosion.prefab.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Shooter/Assets/Resources/powerup 1.prefab → ...paceShooter/Assets/Prefabs/Powerup.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GameObject:
- component: {fileID: 8200000}
- component: {fileID: -3020370375573540695}
m_Layer: 0
m_Name: powerup 1
m_Name: Powerup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
0 ...er/Assets/Resources/powerup 1.prefab.meta → ...hooter/Assets/Prefabs/Powerup.prefab.meta
View file
Open in desktop
File renamed without changes.
Loading