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
O
Overbrewed
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
Overbrewed
Commits
47d7ab88
Commit
47d7ab88
authored
Sep 22, 2019
by
Sebastian
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
c3700e6e
58d7d137
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
23 deletions
+23
-23
Assets/_Game/Prefabs/Characters/PlayerBase.prefab
Assets/_Game/Prefabs/Characters/PlayerBase.prefab
+1
-1
Assets/_Game/Prefabs/Characters/Zoey/Zoey01 - Normal.prefab
Assets/_Game/Prefabs/Characters/Zoey/Zoey01 - Normal.prefab
+22
-22
No files found.
Assets/_Game/Prefabs/Characters/PlayerBase.prefab
View file @
47d7ab88
...
...
@@ -56,7 +56,7 @@ CapsuleCollider:
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Radius
:
1
.2
m_Radius
:
1
m_Height
:
3.7
m_Direction
:
1
m_Center
:
{
x
:
-0
,
y
:
1.9
,
z
:
-0
}
...
...
Assets/_Game/Prefabs/Characters/Zoey/Zoey01 - Normal.prefab
View file @
47d7ab88
...
...
@@ -7,17 +7,6 @@ PrefabInstance:
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
2540871366519533209
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
pauseUI
value
:
objectReference
:
{
fileID
:
2943840637881449754
,
guid
:
dce39da393c0f7a418125660ed1b6b0e
,
type
:
3
}
-
target
:
{
fileID
:
2246359746009092559
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
m_Name
value
:
Zoey01 - Normal
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2246359746009092546
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
...
...
@@ -58,10 +47,10 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224635974600909255
1
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
-
target
:
{
fileID
:
224635974600909255
9
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
m
axSpeed
value
:
15
propertyPath
:
m
_Name
value
:
Zoey01 - Normal
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
819723048979823498
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
...
...
@@ -109,10 +98,10 @@ PrefabInstance:
propertyPath
:
bazookaObject
value
:
objectReference
:
{
fileID
:
5444298071215797549
}
-
target
:
{
fileID
:
3080749807010099088
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
-
target
:
{
fileID
:
2246359746009092551
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
m
_Parameters.widthMultiplier
value
:
0.07
propertyPath
:
m
axSpeed
value
:
15
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2974867582589736910
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
...
...
@@ -162,6 +151,17 @@ PrefabInstance:
propertyPath
:
m_LocalPosition.z
value
:
1.434
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
3080749807010099088
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
m_Parameters.widthMultiplier
value
:
0.07
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2540871366519533209
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
propertyPath
:
pauseUI
value
:
objectReference
:
{
fileID
:
2943840637881449754
,
guid
:
dce39da393c0f7a418125660ed1b6b0e
,
type
:
3
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
c3eb2edaef43e224ca51c90aeafa8817
,
type
:
3
}
---
!u!4
&753752997387957846
stripped
...
...
@@ -187,6 +187,11 @@ PrefabInstance:
propertyPath
:
m_IsActive
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-6057140222963153312
,
guid
:
bc55129f69ef8d74a9d760c728d05136
,
type
:
3
}
propertyPath
:
m_Controller
value
:
objectReference
:
{
fileID
:
9100000
,
guid
:
ec3bbddd93707e54cb32a6adc517434c
,
type
:
2
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
bc55129f69ef8d74a9d760c728d05136
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
@@ -242,11 +247,6 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-6057140222963153312
,
guid
:
bc55129f69ef8d74a9d760c728d05136
,
type
:
3
}
propertyPath
:
m_Controller
value
:
objectReference
:
{
fileID
:
9100000
,
guid
:
ec3bbddd93707e54cb32a6adc517434c
,
type
:
2
}
-
target
:
{
fileID
:
2542210109152263593
,
guid
:
bc55129f69ef8d74a9d760c728d05136
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[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