Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Best Enemies Forever
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
S
Sommersemester 2019
Unity
Best Enemies Forever
Commits
d5d28e5d
Commit
d5d28e5d
authored
Sep 22, 2019
by
Games@thm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stuff
parent
4bed95c8
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
15067 additions
and
19923 deletions
+15067
-19923
Assets/Tilemap/Brush/Collectable_Brush.asset
Assets/Tilemap/Brush/Collectable_Brush.asset
+1
-1
Assets/_Game/Data/Actions.meta
Assets/_Game/Data/Actions.meta
+8
-0
Assets/_Game/Physics/Materials/Box_Material.physicsMaterial2D
...ts/_Game/Physics/Materials/Box_Material.physicsMaterial2D
+1
-1
Assets/_Game/Prefabs/Light/Working Light.prefab
Assets/_Game/Prefabs/Light/Working Light.prefab
+1
-1
Assets/_Game/Prefabs/Player/Player.prefab
Assets/_Game/Prefabs/Player/Player.prefab
+1
-2
Assets/_Game/Scenes/Levels/Level_0.unity
Assets/_Game/Scenes/Levels/Level_0.unity
+1
-1
Assets/_Game/Scenes/Levels/Level_6.unity
Assets/_Game/Scenes/Levels/Level_6.unity
+7007
-10119
Assets/_Game/Scenes/Levels/Level_6.unity.meta
Assets/_Game/Scenes/Levels/Level_6.unity.meta
+1
-1
Assets/_Game/Scenes/Levels/Level_7.unity
Assets/_Game/Scenes/Levels/Level_7.unity
+5701
-0
Assets/_Game/Scenes/Levels/Level_7.unity.meta
Assets/_Game/Scenes/Levels/Level_7.unity.meta
+1
-1
Assets/_Game/Scenes/Levels/Level_8.unity
Assets/_Game/Scenes/Levels/Level_8.unity
+1603
-8887
Assets/_Game/Scenes/Levels/Level_8.unity.meta
Assets/_Game/Scenes/Levels/Level_8.unity.meta
+7
-0
Assets/_Game/Scenes/Levels_Tests/Level_1_Test.unity
Assets/_Game/Scenes/Levels_Tests/Level_1_Test.unity
+6
-6
Assets/_Game/Scenes/Levels_Tests/Level_5_test.unity
Assets/_Game/Scenes/Levels_Tests/Level_5_test.unity
+645
-819
Assets/_Game/Scenes/Levels_Tests/Level_6_test.unity
Assets/_Game/Scenes/Levels_Tests/Level_6_test.unity
+80
-84
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+3
-0
No files found.
Assets/Tilemap/Brush/Collectable_Brush.asset
View file @
d5d28e5d
...
...
@@ -36,6 +36,6 @@ MonoBehaviour:
m_Pivot
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_CanChangeZPosition
:
0
m_Prefabs
:
-
{
fileID
:
5614064296286347725
,
guid
:
2fb35a3837c41a948ac614ed054b1245
,
type
:
3
}
-
{
fileID
:
693092424377557188
,
guid
:
2fb35a3837c41a948ac614ed054b1245
,
type
:
3
}
m_PerlinScale
:
0.5
m_Anchor
:
{
x
:
0.5
,
y
:
0.5
,
z
:
0.5
}
Assets/_Game/Data/Actions.meta
0 → 100644
View file @
d5d28e5d
fileFormatVersion: 2
guid: c29aa0de4bb26a945ae50fd6de53f7ec
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Physics/Materials/Box_Material.physicsMaterial2D
View file @
d5d28e5d
...
...
@@ -7,5 +7,5 @@ PhysicsMaterial2D:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Box_Material
friction
:
0
friction
:
1
bounciness
:
0.2
Assets/_Game/Prefabs/Light/Working Light.prefab
View file @
d5d28e5d
...
...
@@ -47,7 +47,7 @@ MonoBehaviour:
m_BlendStyleIndex
:
0
m_FalloffIntensity
:
0.5
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_Intensity
:
0
m_Intensity
:
1
m_LightVolumeOpacity
:
0
m_ApplyToSortingLayers
:
000000002f29dbe43daa6a015ddad9dd91a77e512ff823d7d52a08736d1f0bc7f50dc471
m_LightCookieSprite
:
{
fileID
:
0
}
...
...
Assets/_Game/Prefabs/Player/Player.prefab
View file @
d5d28e5d
...
...
@@ -279,7 +279,7 @@ BoxCollider2D:
m_GameObject
:
{
fileID
:
3084560207374511915
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_Material
:
{
fileID
:
6200000
,
guid
:
aeb3d66660a7201429153cbf685040ef
,
type
:
2
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
...
...
@@ -367,7 +367,6 @@ MonoBehaviour:
m_EditorClassIdentifier
:
_tags
:
-
{
fileID
:
11400000
,
guid
:
a69d10ef5237b1c4087f87965c659df6
,
type
:
2
}
-
{
fileID
:
0
}
---
!u!114
&3084560205364937137
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
Assets/_Game/Scenes/Levels/Level_0.unity
View file @
d5d28e5d
...
...
@@ -3563,7 +3563,7 @@ PrefabInstance:
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
-1
0
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
...
...
Assets/_Game/Scenes/Levels/Level_6.unity
View file @
d5d28e5d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/Levels/Level_6.unity.meta
View file @
d5d28e5d
fileFormatVersion: 2
guid:
44078f07811ad3e479800a376a695a17
guid:
39487ef1a0b19f0418138fe054f6fa25
DefaultImporter:
externalObjects: {}
userData:
...
...
Assets/_Game/Scenes/Levels/Level_7.unity
0 → 100644
View file @
d5d28e5d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/Levels/
Crap
.unity.meta
→
Assets/_Game/Scenes/Levels/
Level_7
.unity.meta
View file @
d5d28e5d
fileFormatVersion: 2
guid:
d564ff5e870407e47bf9c6dd44e6f474
guid:
f9d998af01d34324fa3756812b0c28d6
DefaultImporter:
externalObjects: {}
userData:
...
...
Assets/_Game/Scenes/Levels/
Crap
.unity
→
Assets/_Game/Scenes/Levels/
Level_8
.unity
View file @
d5d28e5d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/Levels/Level_8.unity.meta
0 → 100644
View file @
d5d28e5d
fileFormatVersion: 2
guid: 44078f07811ad3e479800a376a695a17
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/Levels_Tests/Level_1_Test.unity
View file @
d5d28e5d
...
...
@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData
:
0
m_TrainingDataDestination
:
TrainingData
m_LightingDataAsset
:
{
fileID
:
0
}
m_UseShadowmask
:
1
m_UseShadowmask
:
0
---
!u!196
&4
NavMeshSettings
:
serializedVersion
:
2
...
...
@@ -656,11 +656,6 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1137017617915017827
,
guid
:
195835b83616a6f4ab298b9684af5727
,
type
:
3
}
propertyPath
:
_tags.Array.size
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1137017617915017825
,
guid
:
195835b83616a6f4ab298b9684af5727
,
type
:
3
}
propertyPath
:
TagPlayer2
...
...
@@ -673,6 +668,11 @@ PrefabInstance:
value
:
objectReference
:
{
fileID
:
11400000
,
guid
:
674df06fa0b942d49871851d43cf713c
,
type
:
2
}
-
target
:
{
fileID
:
1137017617915017827
,
guid
:
195835b83616a6f4ab298b9684af5727
,
type
:
3
}
propertyPath
:
_tags.Array.size
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2668928506298788669
,
guid
:
195835b83616a6f4ab298b9684af5727
,
type
:
3
}
propertyPath
:
m_ApplyToSortingLayers.Array.size
...
...
Assets/_Game/Scenes/Levels_Tests/Level_5_test.unity
View file @
d5d28e5d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/Levels_Tests/Level_6_test.unity
View file @
d5d28e5d
...
...
@@ -729,7 +729,7 @@ PrefabInstance:
-
target
:
{
fileID
:
7065370973928967965
,
guid
:
09266e4114124974598b82a3eb8fa4dc
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
8
value
:
7
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7065370973928967965
,
guid
:
09266e4114124974598b82a3eb8fa4dc
,
type
:
3
}
...
...
@@ -798,7 +798,7 @@ PrefabInstance:
-
target
:
{
fileID
:
1137017617239168229
,
guid
:
195835b83616a6f4ab298b9684af5727
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
1
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1137017617239168229
,
guid
:
195835b83616a6f4ab298b9684af5727
,
type
:
3
}
...
...
@@ -947,7 +947,7 @@ Transform:
m_LocalScale
:
{
x
:
119.3061
,
y
:
70.189354
,
z
:
9.987954
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
3
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1001
&546090341
PrefabInstance
:
...
...
@@ -999,7 +999,7 @@ PrefabInstance:
-
target
:
{
fileID
:
7061724010377381308
,
guid
:
d5ff09ff003fa294c819a3ab95c52e68
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
6
value
:
5
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7061724010377381308
,
guid
:
d5ff09ff003fa294c819a3ab95c52e68
,
type
:
3
}
...
...
@@ -1337,6 +1337,75 @@ Transform:
type
:
3
}
m_PrefabInstance
:
{
fileID
:
559781088
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&869130011
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
3804210540415544516
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_Name
value
:
Main Camera
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
2.9
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
-1.9
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
9
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
---
!u!1
&944518671
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -1502,7 +1571,7 @@ PrefabInstance:
-
target
:
{
fileID
:
1232958144072125810
,
guid
:
31fc766ecf4087f4aad1da05a14dcc21
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
5
value
:
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1232958144072125810
,
guid
:
31fc766ecf4087f4aad1da05a14dcc21
,
type
:
3
}
...
...
@@ -1571,7 +1640,7 @@ PrefabInstance:
-
target
:
{
fileID
:
321453252782740785
,
guid
:
959ba5cffc3bf0e4c8e2d65518c82017
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
7
value
:
6
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
321453252782740785
,
guid
:
959ba5cffc3bf0e4c8e2d65518c82017
,
type
:
3
}
...
...
@@ -4014,80 +4083,6 @@ Transform:
type
:
3
}
m_PrefabInstance
:
{
fileID
:
1680883547
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&1683298539
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
3804210540415544516
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_Name
value
:
'
Main
Camera
'
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
8.91
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
-2.29
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
-10
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544523
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3804210540415544522
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
propertyPath
:
orthographic size
value
:
11.324451
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
7e7c168756c78f24c9542cba8a302829
,
type
:
3
}
---
!u!1
&1685057804
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -4138,7 +4133,7 @@ Transform:
-
{
fileID
:
1731970744
}
-
{
fileID
:
249572692
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
4
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1001
&1697073841
PrefabInstance
:
...
...
@@ -4714,7 +4709,7 @@ PrefabInstance:
-
target
:
{
fileID
:
1979424224205209627
,
guid
:
980e132f14f63894baf3700533737497
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
9
value
:
8
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1979424224205209627
,
guid
:
980e132f14f63894baf3700533737497
,
type
:
3
}
...
...
@@ -5170,7 +5165,7 @@ PrefabInstance:
-
target
:
{
fileID
:
3683866412138282202
,
guid
:
4f68f60268476974db03de44c33664ec
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
2
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3683866412138282202
,
guid
:
4f68f60268476974db03de44c33664ec
,
type
:
3
}
...
...
@@ -5346,7 +5341,8 @@ PrefabInstance:
propertyPath
:
_tags.Array.size
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
-
{
fileID
:
-2374575964167716041
,
guid
:
c0da4ac874a4cbf478deff7a581e4f35
,
type
:
3
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
c0da4ac874a4cbf478deff7a581e4f35
,
type
:
3
}
---
!u!4
&2058679364
stripped
Transform
:
...
...
ProjectSettings/EditorBuildSettings.asset
View file @
d5d28e5d
...
...
@@ -35,6 +35,9 @@ EditorBuildSettings:
-
enabled
:
1
path
:
Assets/_Game/Scenes/Levels/Level_5.unity
guid
:
f8be958a9e4f68f46886542468398dab
-
enabled
:
1
path
:
Assets/_Game/Scenes/Levels/Level_6.unity
guid
:
39487ef1a0b19f0418138fe054f6fa25
-
enabled
:
1
path
:
Assets/_Game/Scenes/Story/Story_Intro.unity
guid
:
4dcc897868e2e2d449ca1b17e21c259e
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment