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
53412f4b
Commit
53412f4b
authored
Jun 25, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
맵 에디터에 총알 추가 wip
parent
95715b17
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
476 additions
and
8 deletions
+476
-8
MapEditorCanvas.prefab
Assets/Prefabs/MapEditor/MapEditorCanvas.prefab
+428
-6
MapEditor.unity
Assets/Scenes/MapEditor.unity
+43
-1
MapEditor.cs
Assets/Scripts/MapEditor/MapEditor.cs
+4
-0
PlayerController.cs
Assets/Scripts/PlayerController.cs
+1
-1
No files found.
Assets/Prefabs/MapEditor/MapEditorCanvas.prefab
View file @
53412f4b
This diff is collapsed.
Click to expand it.
Assets/Scenes/MapEditor.unity
View file @
53412f4b
...
...
@@ -253,6 +253,48 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1491349555
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_Name
value
:
Add Truth Bullet
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
939019771
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_Name
value
:
Add False Bulltet
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
771201811
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_Name
value
:
Add Mirror Bullet
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1737354433
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_Text
value
:
Add Mirror Bullet
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
591598819
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value
:
AddBulletToPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
591598819
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1491349557
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value
:
AddBulletToPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1491349557
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6056193433934831073
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value
:
AddBulletToPlayer
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6056193433934831073
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
06619682524bc5149b5c3092da0722f2
,
type
:
3
}
---
!u!1
&797716766
...
...
@@ -341,7 +383,7 @@ Transform:
m_GameObject
:
{
fileID
:
797716766
}
m_LocalRotation
:
{
x
:
0.40821788
,
y
:
-0.23456968
,
z
:
0.10938163
,
w
:
0.8754261
}
m_LocalPosition
:
{
x
:
0
,
y
:
3
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
0.99999994
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
2
...
...
Assets/Scripts/MapEditor/MapEditor.cs
View file @
53412f4b
...
...
@@ -96,6 +96,10 @@ public class MapEditor : SingletonBehaviour<MapEditor>
else
modeSign
.
text
=
sign
+
" Destroy"
;
}
public
void
AddBulletToPlayer
(
int
bulletMode
)
{
PlayerController
.
inst
.
bulletList
.
Add
((
BulletCode
)
bulletMode
);
}
private
void
Awake
()
{
...
...
Assets/Scripts/PlayerController.cs
View file @
53412f4b
...
...
@@ -8,7 +8,7 @@ public class PlayerController : SingletonBehaviour<PlayerController>
{
public
Player
currentPlayer
;
public
bool
isPlayerMoving
,
isPlayerShooting
,
isZooming
;
p
rivate
List
<
BulletCode
>
bulletList
=
new
List
<
BulletCode
>();
p
ublic
List
<
BulletCode
>
bulletList
=
new
List
<
BulletCode
>();
private
int
bulletCount
=
0
;
private
Vector2Int
prePos
;
public
Vector2Int
MapPos
...
...
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