Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
man-in-the-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MIM
man-in-the-mirror
Commits
09ca015c
Commit
09ca015c
authored
May 15, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Jackson 애니메이션 넣기 Wip. 거울 wip
parent
7bf9ab38
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
2542 additions
and
8 deletions
+2542
-8
floor.prefab
Assets/Prefabs/MapObjects/floor.prefab
+3
-2
Test.meta
Assets/Prefabs/Test.meta
+8
-0
jackson.prefab
Assets/Prefabs/Test/jackson.prefab
+2482
-0
jackson.prefab.meta
Assets/Prefabs/Test/jackson.prefab.meta
+7
-0
jackson.prefab
Assets/Prefabs/jackson.prefab
+3
-3
SampleScene.unity
Assets/Scenes/SampleScene.unity
+29
-1
NavMesh-NavMesh 1.asset
Assets/Scenes/SampleScene/NavMesh-NavMesh 1.asset
+0
-0
NavMesh-NavMesh 1.asset.meta
Assets/Scenes/SampleScene/NavMesh-NavMesh 1.asset.meta
+8
-0
CameraController.cs
Assets/Scripts/CameraController.cs
+1
-1
MapManager.cs
Assets/Scripts/MapManager.cs
+1
-1
No files found.
Assets/Prefabs/MapObjects/floor.prefab
View file @
09ca015c
...
...
@@ -90,8 +90,8 @@ BoxCollider:
m_IsTrigger
:
0
m_Enabled
:
1
serializedVersion
:
2
m_Size
:
{
x
:
1.0000005
,
y
:
0.2
0000361
,
z
:
1.0000007
}
m_Center
:
{
x
:
-0.000000029802322
,
y
:
0
,
z
:
0
}
m_Size
:
{
x
:
1.0000005
,
y
:
0.2
,
z
:
1
}
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!114
&19711883686801522
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
@@ -104,3 +104,4 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
5b47a59601255854ea2822508c284e85
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
mapPos
:
{
x
:
0
,
y
:
0
}
Assets/Prefabs/Test.meta
0 → 100644
View file @
09ca015c
fileFormatVersion: 2
guid: 1c24887609748c44290aecf8a05574d6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Test/jackson.prefab
0 → 100644
View file @
09ca015c
This diff is collapsed.
Click to expand it.
Assets/Prefabs/Test/jackson.prefab.meta
0 → 100644
View file @
09ca015c
fileFormatVersion: 2
guid: 449b2ca4d925da541bb45c84b63aab98
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/jackson.prefab
View file @
09ca015c
...
...
@@ -1568,10 +1568,10 @@ NavMeshAgent:
m_Enabled
:
0
m_AgentTypeID
:
0
m_Radius
:
0.5
m_Speed
:
5
m_Acceleration
:
1
000
m_Speed
:
0.2
5
m_Acceleration
:
6
000
avoidancePriority
:
50
m_AngularSpeed
:
300
m_AngularSpeed
:
300
0
m_StoppingDistance
:
0
m_AutoTraverseOffMeshLink
:
1
m_AutoBraking
:
1
...
...
Assets/Scenes/SampleScene.unity
View file @
09ca015c
...
...
@@ -100,7 +100,7 @@ NavMeshSettings:
agentRadius
:
0.03
agentHeight
:
2
agentSlope
:
45
agentClimb
:
0
.4
agentClimb
:
0
ledgeDropHeight
:
0
maxJumpAcrossDistance
:
0
minRegionArea
:
2
...
...
@@ -574,6 +574,11 @@ PrefabInstance:
propertyPath
:
m_Name
value
:
MapManager
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6014610519130626400
,
guid
:
11285456de5f1854d947bea83275646f
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6014610519130626206
,
guid
:
11285456de5f1854d947bea83275646f
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
@@ -634,6 +639,18 @@ PrefabInstance:
propertyPath
:
surface
value
:
objectReference
:
{
fileID
:
2102809461
}
-
target
:
{
fileID
:
3268100033343711389
,
guid
:
11285456de5f1854d947bea83275646f
,
type
:
3
}
propertyPath
:
player
value
:
objectReference
:
{
fileID
:
494213313239918027
,
guid
:
449b2ca4d925da541bb45c84b63aab98
,
type
:
3
}
-
target
:
{
fileID
:
3268100033343711389
,
guid
:
11285456de5f1854d947bea83275646f
,
type
:
3
}
propertyPath
:
stage.Array.data[0]
value
:
objectReference
:
{
fileID
:
2496973653136699540
,
guid
:
dbb2e09c19fe5ad49b11a6b95e5ac9e8
,
type
:
3
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
11285456de5f1854d947bea83275646f
,
type
:
3
}
---
!u!1001
&7277015660625800392
...
...
@@ -648,6 +665,17 @@ PrefabInstance:
propertyPath
:
m_Name
value
:
NavMesh
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7277015661519863740
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7277015661519863741
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_NavMeshData
value
:
objectReference
:
{
fileID
:
23800000
,
guid
:
e7eb2fe133fb4eb45bffdded306b23f4
,
type
:
2
}
-
target
:
{
fileID
:
7277015661519863742
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
Assets/Scenes/SampleScene/NavMesh-NavMesh 1.asset
0 → 100644
View file @
09ca015c
File added
Assets/Scenes/SampleScene/NavMesh-NavMesh 1.asset.meta
0 → 100644
View file @
09ca015c
fileFormatVersion: 2
guid: e7eb2fe133fb4eb45bffdded306b23f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/CameraController.cs
View file @
09ca015c
...
...
@@ -101,7 +101,7 @@ public class CameraController : MonoBehaviour
{
if
(!
PlayerController
.
inst
.
isPlayerShooting
)
{
CameraMove
();
//
CameraMove();
CameraDrag
();
}
}
...
...
Assets/Scripts/MapManager.cs
View file @
09ca015c
...
...
@@ -24,7 +24,7 @@ public class MapManager : SingletonBehaviour<MapManager>
currentMap
.
transform
.
position
=
new
Vector3
(
0
,
0
,
0
);
surface
.
BuildNavMesh
();
for
(
int
i
=
0
;
i
<
currentMap
.
startFloors
.
Count
;
i
++)
players
.
Add
(
Instantiate
(
player
,
currentMap
.
startFloors
[
i
].
transform
.
position
+
new
Vector3
(
0
,
1.15
f
,
0
),
Quaternion
.
identity
));
players
.
Add
(
Instantiate
(
player
,
currentMap
.
startFloors
[
i
].
transform
.
position
+
new
Vector3
(
0
,
0.1
f
,
0
),
Quaternion
.
identity
));
}
public
IEnumerator
Rebaker
()
{
...
...
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