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
S
Supergame Box
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
Supergame Box
Commits
fd5e9843
Commit
fd5e9843
authored
Sep 21, 2019
by
Markus Schlösser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Peng
parent
66897df0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
108 additions
and
11 deletions
+108
-11
Assets/_Game/MainMenu/Data/Actual Games/Peng.asset
Assets/_Game/MainMenu/Data/Actual Games/Peng.asset
+17
-0
Assets/_Game/MainMenu/Data/Actual Games/Peng.asset.meta
Assets/_Game/MainMenu/Data/Actual Games/Peng.asset.meta
+8
-0
Assets/_Game/MainMenu/MainMenu.unity
Assets/_Game/MainMenu/MainMenu.unity
+1
-1
Assets/_Game/Peng/Peng.unity
Assets/_Game/Peng/Peng.unity
+78
-9
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+3
-0
ProjectSettings/QualitySettings.asset
ProjectSettings/QualitySettings.asset
+1
-1
No files found.
Assets/_Game/MainMenu/Data/Actual Games/Peng.asset
0 → 100644
View file @
fd5e9843
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
84c523596ac9b3048a65aa0732219edd
,
type
:
3
}
m_Name
:
Peng
m_EditorClassIdentifier
:
scenePath
:
Assets/_Game/Peng/Peng.unity
displayName
:
Peng
sprite
:
{
fileID
:
21300000
,
guid
:
e84467181d1171044a1690885b9a036f
,
type
:
3
}
Assets/_Game/MainMenu/Data/Actual Games/Peng.asset.meta
0 → 100644
View file @
fd5e9843
fileFormatVersion: 2
guid: d441c37be1a7c7f44bf12fcb36e16e49
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/MainMenu/MainMenu.unity
View file @
fd5e9843
...
...
@@ -730,7 +730,7 @@ MonoBehaviour:
-
{
fileID
:
11400000
,
guid
:
a303eeabcc42b454e9498a98a2c46484
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
3050f242b6d1b7b40bae99d6432cc741
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
3050f242b6d1b7b40bae99d6432cc741
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
3050f242b6d1b7b40bae99d6432cc741
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
d441c37be1a7c7f44bf12fcb36e16e49
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
3050f242b6d1b7b40bae99d6432cc741
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
3050f242b6d1b7b40bae99d6432cc741
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
3050f242b6d1b7b40bae99d6432cc741
,
type
:
2
}
...
...
Assets/_Game/Peng/Peng.unity
View file @
fd5e9843
...
...
@@ -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
...
...
@@ -188,7 +188,7 @@ PrefabInstance:
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
65bdab27d82e26c4591a721f62e9c84c
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
5
value
:
6
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
65bdab27d82e26c4591a721f62e9c84c
,
type
:
3
}
...
...
@@ -257,7 +257,7 @@ PrefabInstance:
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
9a90598608a991a4ab323c001920e021
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
3
value
:
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
9a90598608a991a4ab323c001920e021
,
type
:
3
}
...
...
@@ -351,7 +351,7 @@ PrefabInstance:
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
65bdab27d82e26c4591a721f62e9c84c
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
6
value
:
7
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
65bdab27d82e26c4591a721f62e9c84c
,
type
:
3
}
...
...
@@ -523,11 +523,11 @@ MonoBehaviour:
breakBeforeColorGrading
:
0
m_BeforeTransparentBundles
:
[]
m_BeforeStackBundles
:
-
assemblyQualifiedName
:
Scanlines,
Assembly-CSharp
, Version=0.0.0.0, Culture=neutral,
-
assemblyQualifiedName
:
Scanlines,
Supergame.PostProcessing
, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
m_AfterStackBundles
:
-
assemblyQualifiedName
:
CrtDistortion,
Assembly-CSharp, Version=0.0.0.0, Culture=neutral
,
PublicKeyToken=null
-
assemblyQualifiedName
:
CrtDistortion,
Supergame.PostProcessing, Version=0.0.0.0
,
Culture=neutral,
PublicKeyToken=null
---
!u!1
&733772100
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -609,7 +609,7 @@ Transform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
2
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!58
&733772103
CircleCollider2D
:
...
...
@@ -711,7 +711,7 @@ PrefabInstance:
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
9a90598608a991a4ab323c001920e021
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
4
value
:
5
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2051455081406380522
,
guid
:
9a90598608a991a4ab323c001920e021
,
type
:
3
}
...
...
@@ -740,6 +740,75 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
9a90598608a991a4ab323c001920e021
,
type
:
3
}
---
!u!1001
&2075184963
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
7974195246117068452
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_Name
value
:
Return to Main Menu
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2801783352397115576
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
51d7f77f62fe8f3418a499f55d5d5b6a
,
type
:
3
}
---
!u!1001
&5462054124155160216
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
ProjectSettings/EditorBuildSettings.asset
View file @
fd5e9843
...
...
@@ -17,4 +17,7 @@ EditorBuildSettings:
-
enabled
:
1
path
:
Assets/_Game/Tertis/Scenes/Tertis.unity
guid
:
9872d304a5d64b54c9d668eb81e20b69
-
enabled
:
1
path
:
Assets/_Game/Peng/Peng.unity
guid
:
2640b24037f31db489ade4bb30098a84
m_configObjects
:
{}
ProjectSettings/QualitySettings.asset
View file @
fd5e9843
...
...
@@ -126,7 +126,7 @@ QualitySettings:
skinWeights
:
2
textureQuality
:
0
anisotropicTextures
:
0
antiAliasing
:
4
antiAliasing
:
0
softParticles
:
0
softVegetation
:
1
realtimeReflectionProbes
:
0
...
...
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