Skip to content

First commit with refactoring #42

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

Open
kakavlya wants to merge 6 commits into
base: master
Choose a base branch
from
Open

First commit with refactoring #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a03a0ba
First commit with refactoring
kakavlya Jun 14, 2021
e12ecd1
Revert "First commit with refactoring"
kakavlya Jun 14, 2021
fce8caa
Revert "Revert "First commit with refactoring""
kakavlya Jun 14, 2021
8009dae
Revert "Revert "Revert "First commit with refactoring"""
kakavlya Jun 14, 2021
04b6e2a
Revert "Revert "Revert "Revert "First commit with refactoring""""
kakavlya Jun 14, 2021
9b7f05f
Removed singleton and made fixes according to explanation.
kakavlya Jul 10, 2021
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
38 changes: 0 additions & 38 deletions Assets/Group1/Scripts/GameController.cs
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions Assets/Group1/Scripts/NewBehaviourScript1.cs
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions Assets/Group1/Scripts/e.cs
View file
Open in desktop

This file was deleted.

0 Assets/Group1.meta → Assets/Level.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Group1/Player.png → Assets/Level/Enemy.png
View file
Open in desktop
File renamed without changes
0 Assets/Group1/enemy.png.meta → Assets/Level/Enemy.png.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Group1/enemy.png → Assets/Level/Player.png
View file
Open in desktop
File renamed without changes
0 Assets/Group1/Player.png.meta → Assets/Level/Player.png.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Group1/Scenes.meta → Assets/Level/Scenes.meta
View file
Open in desktop
File renamed without changes.
119 changes: 86 additions & 33 deletions Assets/Group1/Scenes/KillAllEnemies.unity → Assets/Level/Scenes/KillAllEnemies.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GameObject:
- component: {fileID: 141422278}
- component: {fileID: 141422277}
m_Layer: 0
m_Name: enemy
m_Name: Enemy
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -142,6 +142,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3}
m_Name:
m_EditorClassIdentifier:
_radius: 4
--- !u!212 &141422278
SpriteRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -197,12 +198,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 141422275}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.59, y: 3.09, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.6699998, y: 2.53, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_Father: {fileID: 1844955163}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &170076733
GameObject:
Expand Down Expand Up @@ -368,9 +369,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3}
m_Name:
m_EditorClassIdentifier:
go: {fileID: 1054253062}
a: {fileID: 1761935009}
B:
_target: {fileID: 1054253062}
_player: {fileID: 1761935009}
_enemies:
- {fileID: 2083640146}
- {fileID: 1754708960}
- {fileID: 141422275}
Expand All @@ -386,7 +387,7 @@ GameObject:
- component: {fileID: 1054253064}
- component: {fileID: 1054253063}
m_Layer: 0
m_Name: New Sprite
m_Name: Enemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -447,12 +448,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1054253062}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 25, y: 25, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_Father: {fileID: 1844955163}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1578050036
GameObject:
Expand All @@ -466,7 +467,7 @@ GameObject:
- component: {fileID: 1578050039}
- component: {fileID: 1578050038}
m_Layer: 0
m_Name: enemy
m_Name: Enemy
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -484,6 +485,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3}
m_Name:
m_EditorClassIdentifier:
_radius: 4
--- !u!212 &1578050039
SpriteRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -539,12 +541,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1578050036}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.59, y: -1.34, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.6699998, y: -1.9000001, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_Father: {fileID: 1844955163}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1754708960
GameObject:
Expand All @@ -558,7 +560,7 @@ GameObject:
- component: {fileID: 1754708963}
- component: {fileID: 1754708962}
m_Layer: 0
m_Name: enemy
m_Name: Enemy
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -576,6 +578,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3}
m_Name:
m_EditorClassIdentifier:
_radius: 4
--- !u!212 &1754708963
SpriteRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -631,12 +634,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1754708960}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.59, y: 0.71, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.6699998, y: 0.14999998, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_Father: {fileID: 1844955163}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1761935009
GameObject:
Expand All @@ -649,8 +652,9 @@ GameObject:
- component: {fileID: 1761935011}
- component: {fileID: 1761935010}
- component: {fileID: 1761935012}
- component: {fileID: 1761935013}
m_Layer: 0
m_Name: New Sprite (1)
m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -716,7 +720,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1761935012
MonoBehaviour:
Expand All @@ -730,9 +734,57 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3}
m_Name:
m_EditorClassIdentifier:
spEed: 4
timer: 0
time: 0
_timePassed: 0
_elapsedTime: 1
_game: {fileID: 534669906}
--- !u!114 &1761935013
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1761935009}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3}
m_Name:
m_EditorClassIdentifier:
_speed: 3
--- !u!1 &1844955162
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1844955163}
m_Layer: 0
m_Name: Enemies
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1844955163
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1844955162}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2083640148}
- {fileID: 1754708964}
- {fileID: 141422279}
- {fileID: 1578050040}
- {fileID: 1054253064}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2083640146
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -745,7 +797,7 @@ GameObject:
- component: {fileID: 2083640147}
- component: {fileID: 2083640150}
m_Layer: 0
m_Name: enemy
m_Name: Enemy
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -806,12 +858,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083640146}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.13, y: 0.71, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.0500002, y: 0.14999998, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_Father: {fileID: 1844955163}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2083640150
MonoBehaviour:
Expand All @@ -825,3 +877,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3}
m_Name:
m_EditorClassIdentifier:
_radius: 4
0 ...s/Group1/Scenes/KillAllEnemies.unity.meta → ...ts/Level/Scenes/KillAllEnemies.unity.meta
View file
Open in desktop
File renamed without changes.
0 Assets/Group1/Scripts.meta → Assets/Level/Scripts.meta
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions Assets/Level/Scripts/Enemy.meta
View file
Open in desktop

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

Loading