Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Sommersemester 2019
Unity
Overbrewed
Commits
0360332c
Commit
0360332c
authored
Sep 22, 2019
by
Sebastian
Browse files
Merge remote-tracking branch 'origin/master'
parents
9c803572
592a96cd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Assets/
Demigiant/DOTween/Editor
.meta
→
Assets/
_Game/Imports/fonts/__MACOSX
.meta
View file @
0360332c
fileFormatVersion: 2
fileFormatVersion: 2
guid:
2cdc087867a94f948a66639756a8a3e3
guid:
74fd32b8a82a08841abd27b278fdf4b0
folderAsset: yes
folderAsset: yes
DefaultImporter:
DefaultImporter:
externalObjects: {}
externalObjects: {}
...
...
Assets/_Game/Scenes/Credits.unity
View file @
0360332c
...
@@ -407,10 +407,10 @@ RectTransform:
...
@@ -407,10 +407,10 @@ RectTransform:
m_Father
:
{
fileID
:
366235576
}
m_Father
:
{
fileID
:
366235576
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
.5
}
m_AnchorMax
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
1
,
y
:
0
.5
}
m_AnchoredPosition
:
{
x
:
400
,
y
:
225.09
}
m_AnchoredPosition
:
{
x
:
-3.600006
,
y
:
10.800018
}
m_SizeDelta
:
{
x
:
252.1
,
y
:
1
47
}
m_SizeDelta
:
{
x
:
-603.8
,
y
:
1
14.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!114
&697258949
---
!u!114
&697258949
MonoBehaviour
:
MonoBehaviour
:
...
...
Assets/_Game/
VFX/TapFluid/Scripts
.meta
→
Assets/_Game/
Scripts/UI/Assembly-CSharp.csproj
.meta
View file @
0360332c
fileFormatVersion: 2
fileFormatVersion: 2
guid: 0e1551d854a4a8247877583fdb2fba9a
guid: 938fe1540aa4aac42981219f8e6e8caf
folderAsset: yes
DefaultImporter:
DefaultImporter:
externalObjects: {}
externalObjects: {}
userData:
userData:
...
...
Assets/_Game/
VFX/TapFluid/Shaders
.meta
→
Assets/_Game/
Scripts/UI/UI.sln
.meta
View file @
0360332c
fileFormatVersion: 2
fileFormatVersion: 2
guid: 2a0fa2311110f744ea309bab75e9f600
guid: bc3f13c3a929b244eb70dfac58545015
folderAsset: yes
DefaultImporter:
DefaultImporter:
externalObjects: {}
externalObjects: {}
userData:
userData:
...
...
Assets/_Game/VFX/TapFluid/Textures.meta
deleted
100644 → 0
View file @
9c803572
fileFormatVersion: 2
guid: 696677aa871f3804781570d7d57a564c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Write
Preview
Supports
Markdown
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