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
T
Touch me if you can
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
Touch me if you can
Commits
5960751d
Commit
5960751d
authored
Sep 21, 2019
by
Patrick Stengel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
the final neyt next next System overhaul
parent
77c428eb
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
2121 additions
and
149 deletions
+2121
-149
Assets/_Game/Prefabs/UI.meta
Assets/_Game/Prefabs/UI.meta
+8
-0
Assets/_Game/Prefabs/UI/PlayerTag.prefab
Assets/_Game/Prefabs/UI/PlayerTag.prefab
+178
-0
Assets/_Game/Prefabs/UI/PlayerTag.prefab.meta
Assets/_Game/Prefabs/UI/PlayerTag.prefab.meta
+7
-0
Assets/_Game/Scenes/InGameUI.unity
Assets/_Game/Scenes/InGameUI.unity
+764
-0
Assets/_Game/Scenes/InGameUI.unity.meta
Assets/_Game/Scenes/InGameUI.unity.meta
+7
-0
Assets/_Game/Scenes/MainLevel.unity
Assets/_Game/Scenes/MainLevel.unity
+533
-129
Assets/_Game/Scenes/MainLevelSwitched.unity
Assets/_Game/Scenes/MainLevelSwitched.unity
+574
-0
Assets/_Game/Scripts/Camera.meta
Assets/_Game/Scripts/Camera.meta
+8
-0
Assets/_Game/Scripts/Camera/CameraFollowMovement.cs
Assets/_Game/Scripts/Camera/CameraFollowMovement.cs
+21
-0
Assets/_Game/Scripts/Camera/CameraFollowMovement.cs.meta
Assets/_Game/Scripts/Camera/CameraFollowMovement.cs.meta
+11
-0
Assets/_Game/Scripts/GameManager/GameHandler.cs
Assets/_Game/Scripts/GameManager/GameHandler.cs
+2
-0
Assets/_Game/Scripts/Observer/Countdown.cs
Assets/_Game/Scripts/Observer/Countdown.cs
+0
-15
Assets/_Game/Scripts/UI/CharacterCustomization.cs
Assets/_Game/Scripts/UI/CharacterCustomization.cs
+1
-0
Assets/_Game/Scripts/UI/PlayerTags.cs
Assets/_Game/Scripts/UI/PlayerTags.cs
+2
-3
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+5
-2
No files found.
Assets/_Game/Prefabs/UI.meta
0 → 100644
View file @
5960751d
fileFormatVersion: 2
guid: 6de4aea1d19a51b4da8b810082d30f95
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Prefabs/UI/PlayerTag.prefab
0 → 100644
View file @
5960751d
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1
&4287269793653179316
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4979490206211125694
}
-
component
:
{
fileID
:
537870465706917231
}
-
component
:
{
fileID
:
3150255801453280764
}
-
component
:
{
fileID
:
2008477302556361684
}
m_Layer
:
5
m_Name
:
PlayerTag
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&4979490206211125694
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4287269793653179316
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
-18.691284
,
y
:
-2.4674377
}
m_SizeDelta
:
{
x
:
200
,
y
:
50
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&537870465706917231
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4287269793653179316
}
m_CullTransparentMesh
:
0
---
!u!114
&3150255801453280764
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4287269793653179316
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
f4688fdb7df04437aeb418b961361dc5
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text
:
New Text
m_isRightToLeft
:
0
m_fontAsset
:
{
fileID
:
11400000
,
guid
:
8f586378b4e144a9851e7b34d9b748ee
,
type
:
2
}
m_sharedMaterial
:
{
fileID
:
2180264
,
guid
:
8f586378b4e144a9851e7b34d9b748ee
,
type
:
2
}
m_fontSharedMaterials
:
[]
m_fontMaterial
:
{
fileID
:
0
}
m_fontMaterials
:
[]
m_fontColor32
:
serializedVersion
:
2
rgba
:
4294967295
m_fontColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_enableVertexGradient
:
0
m_colorMode
:
3
m_fontColorGradient
:
topLeft
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
topRight
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
bottomLeft
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
bottomRight
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_fontColorGradientPreset
:
{
fileID
:
0
}
m_spriteAsset
:
{
fileID
:
0
}
m_tintAllSprites
:
0
m_overrideHtmlColors
:
0
m_faceColor
:
serializedVersion
:
2
rgba
:
4294967295
m_outlineColor
:
serializedVersion
:
2
rgba
:
4278190080
m_fontSize
:
36
m_fontSizeBase
:
36
m_fontWeight
:
400
m_enableAutoSizing
:
0
m_fontSizeMin
:
18
m_fontSizeMax
:
72
m_fontStyle
:
0
m_textAlignment
:
257
m_characterSpacing
:
0
m_wordSpacing
:
0
m_lineSpacing
:
0
m_lineSpacingMax
:
0
m_paragraphSpacing
:
0
m_charWidthMaxAdj
:
0
m_enableWordWrapping
:
1
m_wordWrappingRatios
:
0.4
m_overflowMode
:
0
m_firstOverflowCharacterIndex
:
-1
m_linkedTextComponent
:
{
fileID
:
0
}
m_isLinkedTextComponent
:
0
m_isTextTruncated
:
0
m_enableKerning
:
1
m_enableExtraPadding
:
0
checkPaddingRequired
:
0
m_isRichText
:
1
m_parseCtrlCharacters
:
1
m_isOrthographic
:
1
m_isCullingEnabled
:
0
m_ignoreRectMaskCulling
:
0
m_ignoreCulling
:
1
m_horizontalMapping
:
0
m_verticalMapping
:
0
m_uvLineOffset
:
0
m_geometrySortingOrder
:
0
m_VertexBufferAutoSizeReduction
:
1
m_firstVisibleCharacter
:
0
m_useMaxVisibleDescender
:
1
m_pageToDisplay
:
1
m_margin
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
m_textInfo
:
textComponent
:
{
fileID
:
3150255801453280764
}
characterCount
:
8
spriteCount
:
0
spaceCount
:
1
wordCount
:
2
linkCount
:
0
lineCount
:
1
pageCount
:
1
materialCount
:
1
m_isUsingLegacyAnimationComponent
:
0
m_isVolumetricText
:
0
m_spriteAnimator
:
{
fileID
:
0
}
m_hasFontAssetChanged
:
0
m_subTextObjects
:
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
-
{
fileID
:
0
}
m_baseMaterial
:
{
fileID
:
0
}
m_maskOffset
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
---
!u!114
&2008477302556361684
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4287269793653179316
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
6a24ac252658c014ca1ebf474572bc02
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
player
:
-1
bodyTag
:
tag
:
{
fileID
:
0
}
data
:
{
fileID
:
0
}
character
:
{
fileID
:
0
}
offset
:
{
x
:
0
,
y
:
1
,
z
:
0
}
Assets/_Game/Prefabs/UI/PlayerTag.prefab.meta
0 → 100644
View file @
5960751d
fileFormatVersion: 2
guid: c7c81494d91977b4ab6e5e21dbb5530e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/InGameUI.unity
0 → 100644
View file @
5960751d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/InGameUI.unity.meta
0 → 100644
View file @
5960751d
fileFormatVersion: 2
guid: 2d82b416b9dd4b947824ee48c81f7e12
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/MainLevel.unity
View file @
5960751d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/MainLevelSwitched.unity
View file @
5960751d
This diff is collapsed.
Click to expand it.
Assets/_Game/Scripts/Camera.meta
0 → 100644
View file @
5960751d
fileFormatVersion: 2
guid: 9237b512751da1745bd5dfebe51f8e0b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/Camera/CameraFollowMovement.cs
0 → 100644
View file @
5960751d
using
System
;
using
UnityEngine
;
namespace
_Game.Scripts.Camera
{
public
class
CameraFollowMovement
:
MonoBehaviour
{
private
Transform
_head
,
_body
;
private
void
OnEnable
()
{
_head
=
GameObject
.
FindWithTag
(
"HeadPlayer"
).
transform
;
_body
=
GameObject
.
FindWithTag
(
"BodyPlayer"
).
transform
;
}
private
void
Update
()
{
var
target
=
(
_head
.
position
+
_body
.
position
)
/
2
;
Debug
.
DrawLine
(
transform
.
position
,
target
);
target
=
new
Vector3
(
0
,
target
.
y
,
target
.
z
)
-
transform
.
position
;
var
rotation
=
Quaternion
.
LookRotation
(
target
,
Vector3
.
up
);
transform
.
rotation
=
Quaternion
.
RotateTowards
(
transform
.
rotation
,
rotation
.
normalized
,
5
);
}
}
}
Assets/_Game/Scripts/Camera/CameraFollowMovement.cs.meta
0 → 100644
View file @
5960751d
fileFormatVersion: 2
guid: d718df83990771b47be6e1ec9df7498b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/GameManager/GameHandler.cs
View file @
5960751d
...
...
@@ -74,11 +74,13 @@ namespace _Game.Scripts.GameManager {
if
(
data
.
IsSwitched
)
{
data
.
IsSwitched
=
false
;
SceneManager
.
LoadScene
(
"MainLevel"
);
SceneManager
.
LoadScene
(
"InGameUI"
,
LoadSceneMode
.
Additive
);
SceneManager
.
LoadScene
(
"DelayTimer"
,
LoadSceneMode
.
Additive
);
}
else
{
data
.
IsSwitched
=
true
;
SceneManager
.
LoadScene
(
"MainLevelSwitched"
);
SceneManager
.
LoadScene
(
"InGameUI"
,
LoadSceneMode
.
Additive
);
SceneManager
.
LoadScene
(
"DelayTimer"
,
LoadSceneMode
.
Additive
);
}
}
...
...
Assets/_Game/Scripts/Observer/Countdown.cs
View file @
5960751d
...
...
@@ -11,20 +11,6 @@ namespace _Game.Scripts.Observer {
set
=>
duration
=
value
;
}
private
Action
_onStart
;
public
void
RegisterOnStart
(
Action
action
)
{
_onStart
+=
action
;
}
public
void
UnregisterOnStart
(
Action
action
)
{
_onStart
+=
action
;
}
public
void
ClearOnStart
()
{
_onStart
=
null
;
}
private
float
_countdownTime
=
0
;
private
bool
_isCounting
=
false
;
public
bool
IsCounting
=>
_isCounting
;
...
...
@@ -38,7 +24,6 @@ namespace _Game.Scripts.Observer {
public
virtual
IEnumerator
StartCountdown
()
{
_isCounting
=
false
;
if
(!
_isCounting
)
{
//_onStart.Invoke();
_isCounting
=
true
;
_countdownTime
=
0
;
while
(
_countdownTime
<=
1
)
{
...
...
Assets/_Game/Scripts/UI/CharacterCustomization.cs
View file @
5960751d
...
...
@@ -48,6 +48,7 @@ public class CharacterCustomization : MonoBehaviour {
data
.
player1
.
Reset
(
player1InputField
.
text
,
Color
.
green
);
data
.
player2
.
Reset
(
player2InputField
.
text
,
Color
.
red
);
SceneManager
.
LoadScene
(
"MainLevel"
);
SceneManager
.
LoadScene
(
"InGameUI"
,
LoadSceneMode
.
Additive
);
SceneManager
.
LoadScene
(
"DelayTimer"
,
LoadSceneMode
.
Additive
);
}
...
...
Assets/_Game/Scripts/UI/PlayerTags.cs
View file @
5960751d
using
System
;
using
_Game.Scripts.GameManager
;
using
_Game.Scripts.GameManager
;
using
TMPro
;
using
UnityEngine
;
...
...
@@ -29,7 +28,7 @@ namespace _Game.Scripts.UI {
private
void
Update
()
{
transform
.
position
=
Camera
.
main
.
WorldToScreenPoint
(
Character
.
position
+
offset
);
transform
.
position
=
UnityEngine
.
Camera
.
main
.
WorldToScreenPoint
(
Character
.
position
+
offset
);
}
private
void
SetTag
()
{
...
...
ProjectSettings/EditorBuildSettings.asset
View file @
5960751d
...
...
@@ -8,10 +8,10 @@ EditorBuildSettings:
-
enabled
:
1
path
:
Assets/_Game/Scenes/StartMenu.unity
guid
:
cf3ac5edbc0205f4d909350ec45aafb7
-
enabled
:
1
-
enabled
:
0
path
:
Assets/_Game/Scenes/WinScene.unity
guid
:
29cd94e807707ca4e86227d74ad5d7e6
-
enabled
:
1
-
enabled
:
0
path
:
Assets/_Game/Scenes/TestLevel.unity
guid
:
44c310e98527ea7408bb817d10f10c3d
-
enabled
:
1
...
...
@@ -35,6 +35,9 @@ EditorBuildSettings:
-
enabled
:
1
path
:
Assets/_Game/Scenes/MainLevelSwitched.unity
guid
:
5169fd1db4d78d24589c198534e062f6
-
enabled
:
1
path
:
Assets/_Game/Scenes/InGameUI.unity
guid
:
2d82b416b9dd4b947824ee48c81f7e12
m_configObjects
:
com.unity.input.settings
:
{
fileID
:
11400000
,
guid
:
928db2de36c1dc143b7d06ecb808281a
,
type
:
2
}
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