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
Suck It
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
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
W
Wintersemester 2018-2019
Unity
Suck It
Commits
0c97d2dd
Commit
0c97d2dd
authored
Mar 30, 2019
by
mthiele2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stuff
parent
121ae80c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
38 deletions
+21
-38
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
+19
-29
Assets/_Game/Scenes/Max-Level.unity
Assets/_Game/Scenes/Max-Level.unity
+2
-2
Assets/_Game/Scripts/Player/PlayerAttacks/Fire/Player_FireProjectile.cs___jb_tmp___.meta
...yerAttacks/Fire/Player_FireProjectile.cs___jb_tmp___.meta
+0
-7
No files found.
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
View file @
0c97d2dd
...
...
@@ -11,9 +11,9 @@ GameObject:
-
component
:
{
fileID
:
5673243409365295940
}
-
component
:
{
fileID
:
8382647395794564539
}
-
component
:
{
fileID
:
707565156377968333
}
-
component
:
{
fileID
:
6258883857105394474
}
-
component
:
{
fileID
:
3289220650684677341
}
-
component
:
{
fileID
:
7928429373142515012
}
-
component
:
{
fileID
:
8237559276284760939
}
m_Layer
:
12
m_Name
:
WaterAttack
m_TagString
:
Water
...
...
@@ -30,7 +30,7 @@ Transform:
m_GameObject
:
{
fileID
:
7588789901055592565
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1.5
,
y
:
1.5
,
z
:
1
}
m_LocalScale
:
{
x
:
6
,
y
:
6
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
...
...
@@ -74,7 +74,7 @@ SpriteRenderer:
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
dc92df69ab762f6429dbc7390caa5856
,
type
:
3
}
m_Color
:
{
r
:
0.9673407
,
g
:
0.9671146
,
b
:
0.9716981
,
a
:
1
}
m_FlipX
:
0
m_FlipX
:
1
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
1
,
y
:
1
}
...
...
@@ -104,32 +104,6 @@ Rigidbody2D:
m_SleepingMode
:
1
m_CollisionDetection
:
0
m_Constraints
:
4
---
!u!61
&6258883857105394474
BoxCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7588789901055592565
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
0
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0.5
,
y
:
0.5
}
oldSize
:
{
x
:
0.46777344
,
y
:
0.17675781
}
newSize
:
{
x
:
1
,
y
:
1
}
adaptiveTilingThreshold
:
0.5
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
1
,
y
:
1
}
m_EdgeRadius
:
0
---
!u!114
&3289220650684677341
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
@@ -164,3 +138,19 @@ Animator:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!70
&8237559276284760939
CapsuleCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
7588789901055592565
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
-0.008341174
,
y
:
-0.00032437945
}
m_Size
:
{
x
:
0.21489131
,
y
:
0.12061167
}
m_Direction
:
1
Assets/_Game/Scenes/Max-Level.unity
View file @
0c97d2dd
...
...
@@ -32517,12 +32517,12 @@ PrefabInstance:
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.x
value:
43.9
5
value:
125.
5
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_LocalPosition.y
value:
37.9
8
value:
76.
8
objectReference: {fileID: 0}
- target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
Assets/_Game/Scripts/Player/PlayerAttacks/Fire/Player_FireProjectile.cs___jb_tmp___.meta
deleted
100644 → 0
View file @
121ae80c
fileFormatVersion: 2
guid: 9b3708a150515924597eab237f7f37fb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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