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
b4394627
Commit
b4394627
authored
5 years ago
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
테스트 맵 만들고 빌드함
parent
1a0a6f48
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
2787 additions
and
225 deletions
+2787
-225
Collect All Case.prefab
Assets/Collect All Case.prefab
+2758
-0
Collect All Case.prefab.meta
Assets/Collect All Case.prefab.meta
+7
-0
Editor.meta
Assets/Editor.meta
+8
-0
MapEditor.cs
Assets/Editor/MapEditor.cs
+1
-1
MapEditor.cs.meta
Assets/Editor/MapEditor.cs.meta
+0
-0
case.prefab
Assets/Prefabs/Objects/case.prefab
+1
-1
TestTools.prefab
Assets/Prefabs/TestTools.prefab
+3
-215
SampleScene.unity
Assets/Scenes/SampleScene.unity
+1
-1
Map.cs
Assets/Scripts/Map/Map.cs
+1
-1
TestTools.cs
Assets/Scripts/TestTools.cs
+0
-5
EditorBuildSettings.asset
ProjectSettings/EditorBuildSettings.asset
+4
-1
GraphicsSettings.asset
ProjectSettings/GraphicsSettings.asset
+3
-0
No files found.
Assets/Collect All Case.prefab
0 → 100644
View file @
b4394627
This diff is collapsed.
Click to expand it.
Assets/Collect All Case.prefab.meta
0 → 100644
View file @
b4394627
fileFormatVersion: 2
guid: 3d35fd3e6a494bc42921ce1cd03fc637
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
Click to expand it.
Assets/Editor.meta
0 → 100644
View file @
b4394627
fileFormatVersion: 2
guid: ef75a379c7ec93a4d85966c580bcc286
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
Click to expand it.
Assets/
Scripts/Map
Editor/MapEditor.cs
→
Assets/Editor/MapEditor.cs
View file @
b4394627
...
...
@@ -66,7 +66,7 @@ public class MapEditor : SingletonBehaviour<MapEditor>
int
yMax
=
y
%
2
==
0
?
y
/
2
-
1
:
y
/
2
;
for
(
int
i
=
0
;
i
<
mapEditorTiles
.
transform
.
childCount
;
i
++)
Destroy
(
mapEditorTiles
.
transform
.
GetChild
(
i
).
gameObject
);
currentMap
.
maxMapSize
=
Mathf
.
Max
(
x
,
y
);
currentMap
.
maxMapSize
=
5
*
Mathf
.
Max
(
x
,
y
);
for
(
int
i
=
-
x
/
2
;
i
<=
xMax
;
i
++)
for
(
int
j
=
-
y
/
2
;
j
<=
yMax
;
j
++)
Instantiate
(
tile
,
new
Vector3
(
i
,
-
0.3f
,
j
),
Quaternion
.
identity
,
mapEditorTiles
.
transform
).
GetComponent
<
MapEditorTile
>().
mapPos
=
new
Vector2
(
i
,
j
);
...
...
This diff is collapsed.
Click to expand it.
Assets/
Scripts/Map
Editor/MapEditor.cs.meta
→
Assets/Editor/MapEditor.cs.meta
View file @
b4394627
File moved
This diff is collapsed.
Click to expand it.
Assets/Prefabs/Objects/case.prefab
View file @
b4394627
...
...
@@ -27,7 +27,7 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2534561534465535505
}
m_LocalRotation
:
{
x
:
0
,
y
:
0.38268343
,
z
:
0
,
w
:
0.92387956
}
m_LocalPosition
:
{
x
:
0
,
y
:
0.5
,
z
:
0
}
m_LocalPosition
:
{
x
:
0
,
y
:
1
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Prefabs/TestTools.prefab
View file @
b4394627
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1
&738553008
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
738553009
}
-
component
:
{
fileID
:
738553011
}
-
component
:
{
fileID
:
738553010
}
m_Layer
:
5
m_Name
:
Text
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&738553009
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
738553008
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1397994405
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
0
}
m_AnchorMax
:
{
x
:
1
,
y
:
1
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
0
,
y
:
0
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&738553011
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
738553008
}
m_CullTransparentMesh
:
0
---
!u!114
&738553010
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
738553008
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
708705254
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
0.19607843
,
g
:
0.19607843
,
b
:
0.19607843
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData
:
m_Font
:
{
fileID
:
10102
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_FontSize
:
14
m_FontStyle
:
0
m_BestFit
:
0
m_MinSize
:
10
m_MaxSize
:
40
m_Alignment
:
4
m_AlignByGeometry
:
0
m_RichText
:
1
m_HorizontalOverflow
:
0
m_VerticalOverflow
:
0
m_LineSpacing
:
1
m_Text
:
Save current map
---
!u!1
&1397994404
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1397994405
}
-
component
:
{
fileID
:
1397994408
}
-
component
:
{
fileID
:
1397994407
}
-
component
:
{
fileID
:
1397994406
}
m_Layer
:
5
m_Name
:
Save
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&1397994405
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1397994404
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
738553009
}
m_Father
:
{
fileID
:
1444571407667829093
}
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
1
}
m_AnchorMax
:
{
x
:
0
,
y
:
1
}
m_AnchoredPosition
:
{
x
:
120
,
y
:
-786
}
m_SizeDelta
:
{
x
:
160
,
y
:
30
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&1397994408
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1397994404
}
m_CullTransparentMesh
:
0
---
!u!114
&1397994407
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1397994404
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-765806418
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite
:
{
fileID
:
10905
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_Type
:
1
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
---
!u!114
&1397994406
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1397994404
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
1392445389
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Navigation
:
m_Mode
:
3
m_SelectOnUp
:
{
fileID
:
0
}
m_SelectOnDown
:
{
fileID
:
0
}
m_SelectOnLeft
:
{
fileID
:
0
}
m_SelectOnRight
:
{
fileID
:
0
}
m_Transition
:
1
m_Colors
:
m_NormalColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_HighlightedColor
:
{
r
:
0.9607843
,
g
:
0.9607843
,
b
:
0.9607843
,
a
:
1
}
m_PressedColor
:
{
r
:
0.78431374
,
g
:
0.78431374
,
b
:
0.78431374
,
a
:
1
}
m_SelectedColor
:
{
r
:
0.9607843
,
g
:
0.9607843
,
b
:
0.9607843
,
a
:
1
}
m_DisabledColor
:
{
r
:
0.78431374
,
g
:
0.78431374
,
b
:
0.78431374
,
a
:
0.5019608
}
m_ColorMultiplier
:
1
m_FadeDuration
:
0.1
m_SpriteState
:
m_HighlightedSprite
:
{
fileID
:
0
}
m_PressedSprite
:
{
fileID
:
0
}
m_SelectedSprite
:
{
fileID
:
0
}
m_DisabledSprite
:
{
fileID
:
0
}
m_AnimationTriggers
:
m_NormalTrigger
:
Normal
m_HighlightedTrigger
:
Highlighted
m_PressedTrigger
:
Pressed
m_SelectedTrigger
:
Highlighted
m_DisabledTrigger
:
Disabled
m_Interactable
:
1
m_TargetGraphic
:
{
fileID
:
1397994407
}
m_OnClick
:
m_PersistentCalls
:
m_Calls
:
-
m_Target
:
{
fileID
:
1615184088
}
m_MethodName
:
SaveMap
m_Mode
:
1
m_Arguments
:
m_ObjectArgument
:
{
fileID
:
0
}
m_ObjectArgumentAssemblyTypeName
:
UnityEngine.Object, UnityEngine
m_IntArgument
:
0
m_FloatArgument
:
0
m_StringArgument
:
m_BoolArgument
:
0
m_CallState
:
2
m_TypeName
:
UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
---
!u!1
&356685241964599882
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -601,7 +390,7 @@ RectTransform:
-
{
fileID
:
1444571408998523810
}
-
{
fileID
:
1444571409017468568
}
m_Father
:
{
fileID
:
1444571407667829093
}
m_RootOrder
:
5
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
1
}
m_AnchorMax
:
{
x
:
0
,
y
:
1
}
...
...
@@ -745,7 +534,6 @@ RectTransform:
-
{
fileID
:
4609862474233688060
}
-
{
fileID
:
3620727262082854988
}
-
{
fileID
:
2610587022237466576
}
-
{
fileID
:
1397994405
}
-
{
fileID
:
808025336958670646
}
-
{
fileID
:
1444571407224148019
}
-
{
fileID
:
1444571408487427164
}
...
...
@@ -1140,7 +928,7 @@ RectTransform:
-
{
fileID
:
1444571409082407055
}
-
{
fileID
:
1444571409048073019
}
m_Father
:
{
fileID
:
1444571407667829093
}
m_RootOrder
:
6
m_RootOrder
:
5
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0
,
y
:
1
}
m_AnchorMax
:
{
x
:
0
,
y
:
1
}
...
...
@@ -2995,7 +2783,7 @@ RectTransform:
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
1444571407667829093
}
m_RootOrder
:
4
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
1
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
1
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Scenes/SampleScene.unity
View file @
b4394627
...
...
@@ -1138,7 +1138,7 @@ PrefabInstance:
type
:
3
}
propertyPath
:
stage.Array.data[0]
value
:
objectReference
:
{
fileID
:
2496973653136699540
,
guid
:
dbb2e09c19fe5ad49b11a6b95e5ac9e8
,
objectReference
:
{
fileID
:
3529117415661273963
,
guid
:
3d35fd3e6a494bc42921ce1cd03fc637
,
type
:
3
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
11285456de5f1854d947bea83275646f
,
type
:
3
}
...
...
This diff is collapsed.
Click to expand it.
Assets/Scripts/Map/Map.cs
View file @
b4394627
...
...
@@ -218,7 +218,7 @@ public class Map : MonoBehaviour
switch
(
objType
)
{
case
ObjType
.
Briefcase
:
objectGrid
.
Add
(
pos
,
Instantiate
(
MapManager
.
inst
.
briefCase
,
new
Vector3
(
pos
.
x
,
0
,
pos
.
y
),
Quaternion
.
identity
,
objects
.
transform
).
GetComponent
<
IObject
>());
objectGrid
.
Add
(
pos
,
Instantiate
(
MapManager
.
inst
.
briefCase
,
new
Vector3
(
pos
.
x
,
0
.35f
,
pos
.
y
),
Quaternion
.
identity
,
objects
.
transform
).
GetComponent
<
IObject
>());
if
(
GameManager
.
aCase
>=
0
)
clearConditions
[
GameManager
.
aCase
].
IsDone
(
0
,
1
);
break
;
...
...
This diff is collapsed.
Click to expand it.
Assets/Scripts/TestTools.cs
View file @
b4394627
...
...
@@ -44,11 +44,6 @@ public class TestTools : MonoBehaviour
{
MapManager
.
inst
.
currentMap
.
RemoveObject
(
new
Vector2Int
(
int
.
Parse
(
xInput
.
text
),
int
.
Parse
(
yInput
.
text
)));
}
public
void
SaveMap
()
{
MapEditor
.
inst
.
SaveMap
(
MapManager
.
inst
.
currentMap
);
}
public
void
LoadMap
()
{
MapManager
.
inst
.
LoadMap
(
MapManager
.
inst
.
stage
[
1
]);
...
...
This diff is collapsed.
Click to expand it.
ProjectSettings/EditorBuildSettings.asset
View file @
b4394627
...
...
@@ -4,5 +4,8 @@
EditorBuildSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Scenes
:
[]
m_Scenes
:
-
enabled
:
1
path
:
Assets/Scenes/SampleScene.unity
guid
:
2efa712d359ce2746829d35c55eff0d5
m_configObjects
:
{}
This diff is collapsed.
Click to expand it.
ProjectSettings/GraphicsSettings.asset
View file @
b4394627
...
...
@@ -36,6 +36,9 @@ GraphicsSettings:
-
{
fileID
:
10753
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
10770
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
10783
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
16000
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
16001
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
-
{
fileID
:
17000
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_PreloadedShaders
:
[]
m_SpritesDefaultMaterial
:
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
...
...
This diff is collapsed.
Click to expand it.
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