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
1c58d0e5
Commit
1c58d0e5
authored
Jul 14, 2019
by
18신대성
Committed by
15박보승
Jul 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
잭슨 선택시 표시 구현
parent
59a48425
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
177 additions
and
0 deletions
+177
-0
selected.png
Assets/Models/texture/selected.png
+0
-0
selected.png.meta
Assets/Models/texture/selected.png.meta
+91
-0
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+82
-0
Player.cs
Assets/Scripts/Player.cs
+4
-0
No files found.
Assets/Models/texture/selected.png
0 → 100644
View file @
1c58d0e5
3.02 KB
Assets/Models/texture/selected.png.meta
0 → 100644
View file @
1c58d0e5
fileFormatVersion: 2
guid: b67152367e43ad94980ecf339e4ac4c2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/MapObjects/jackson.prefab
View file @
1c58d0e5
...
@@ -1345,6 +1345,7 @@ Transform:
...
@@ -1345,6 +1345,7 @@ Transform:
-
{
fileID
:
494213313239497099
}
-
{
fileID
:
494213313239497099
}
-
{
fileID
:
494213313239497179
}
-
{
fileID
:
494213313239497179
}
-
{
fileID
:
7259129854443835404
}
-
{
fileID
:
7259129854443835404
}
-
{
fileID
:
5896328348636738805
}
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
@@ -1438,6 +1439,7 @@ MonoBehaviour:
...
@@ -1438,6 +1439,7 @@ MonoBehaviour:
armRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
armRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
anim
:
{
fileID
:
0
}
anim
:
{
fileID
:
0
}
currentFloor
:
{
fileID
:
0
}
currentFloor
:
{
fileID
:
0
}
selectPointer
:
{
fileID
:
6250617794677575084
}
---
!u!1
&494213313239918029
---
!u!1
&494213313239918029
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
@@ -2648,3 +2650,83 @@ LineRenderer:
...
@@ -2648,3 +2650,83 @@ LineRenderer:
generateLightingData
:
0
generateLightingData
:
0
m_UseWorldSpace
:
0
m_UseWorldSpace
:
0
m_Loop
:
0
m_Loop
:
0
---
!u!1
&6250617794677575084
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
5896328348636738805
}
-
component
:
{
fileID
:
4084167584915691795
}
m_Layer
:
0
m_Name
:
select
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
0
---
!u!4
&5896328348636738805
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6250617794677575084
}
m_LocalRotation
:
{
x
:
-0.7071068
,
y
:
0
,
z
:
0
,
w
:
0.7071068
}
m_LocalPosition
:
{
x
:
0
,
y
:
0.1
,
z
:
-0
}
m_LocalScale
:
{
x
:
0.5
,
y
:
0.5
,
z
:
0.5
}
m_Children
:
[]
m_Father
:
{
fileID
:
494213313239497131
}
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
-90
,
y
:
0
,
z
:
0
}
---
!u!212
&4084167584915691795
SpriteRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6250617794677575084
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_ReceiveGI
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
1
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
b67152367e43ad94980ecf339e4ac4c2
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
0.4009434
,
b
:
0.4009434
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
2
,
y
:
2
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
Assets/Scripts/Player.cs
View file @
1c58d0e5
...
@@ -20,6 +20,8 @@ public class Player : MonoBehaviour
...
@@ -20,6 +20,8 @@ public class Player : MonoBehaviour
public
Floor
currentFloor
;
public
Floor
currentFloor
;
public
GameObject
selectPointer
;
/// <summary>
/// <summary>
/// Set this player as the current player.
/// Set this player as the current player.
/// </summary>
/// </summary>
...
@@ -27,6 +29,7 @@ public class Player : MonoBehaviour
...
@@ -27,6 +29,7 @@ public class Player : MonoBehaviour
public
IEnumerator
SetCurrentPlayer
()
public
IEnumerator
SetCurrentPlayer
()
{
{
GetComponent
<
NavMeshObstacle
>().
enabled
=
false
;
GetComponent
<
NavMeshObstacle
>().
enabled
=
false
;
selectPointer
.
SetActive
(
true
);
yield
return
null
;
yield
return
null
;
GetComponent
<
NavMeshAgent
>().
enabled
=
true
;
GetComponent
<
NavMeshAgent
>().
enabled
=
true
;
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
...
@@ -39,6 +42,7 @@ public class Player : MonoBehaviour
...
@@ -39,6 +42,7 @@ public class Player : MonoBehaviour
{
{
GetComponent
<
NavMeshAgent
>().
enabled
=
false
;
GetComponent
<
NavMeshAgent
>().
enabled
=
false
;
GetComponent
<
NavMeshObstacle
>().
enabled
=
true
;
GetComponent
<
NavMeshObstacle
>().
enabled
=
true
;
selectPointer
.
SetActive
(
false
);
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
PlayerController
.
inst
.
currentPlayer
=
null
;
PlayerController
.
inst
.
currentPlayer
=
null
;
}
}
...
...
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