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
71c15b22
Commit
71c15b22
authored
Jul 02, 2019
by
18손재민
Committed by
15박보승
Jul 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
이제 카메라 터렛이 벽을 넘어 공격하지 않음
parent
6f0aa517
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
Maps.meta
Assets/Maps.meta
+0
-8
Briefcase.cs
Assets/Scripts/Interactors/Briefcase.cs
+8
-1
CameraTurret.cs
Assets/Scripts/Interactors/CameraTurret.cs
+2
-2
PlayerController.cs
Assets/Scripts/PlayerController.cs
+5
-0
No files found.
Assets/Maps.meta
deleted
100644 → 0
View file @
6f0aa517
fileFormatVersion: 2
guid: 47baf9abe59c90a4d914127b0527c24f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Interactors/Briefcase.cs
View file @
71c15b22
...
...
@@ -6,6 +6,7 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
{
[
SerializeField
]
private
Floor
floor
=
null
;
private
BulletCode
dropBullet
;
public
Vector2Int
Position
{
get
{
return
floor
!=
null
?
floor
.
mapPos
:
throw
new
UnassignedReferenceException
(
"Floor of Interactor is not assigned"
);
}
}
public
GameObject
GetObject
()
...
...
@@ -26,9 +27,15 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
PlayerController
.
inst
.
OnPlayerMove
+=
Interact
;
}
public
void
SetBullet
(
BulletCode
_dropBullet
)
{
dropBullet
=
_dropBullet
;
}
public
void
Interact
(
Vector2Int
position
)
{
Debug
.
Log
(
Position
+
" "
+
position
);
PlayerController
.
inst
.
bulletList
.
Add
(
dropBullet
);
if
(
Position
==
position
)
{
if
(
GameManager
.
aCase
>=
0
)
...
...
Assets/Scripts/Interactors/CameraTurret.cs
View file @
71c15b22
...
...
@@ -26,9 +26,9 @@ public class CameraTurret : MonoBehaviour, IObject, IBreakable, IPlayerInteracto
public
void
Interact
(
Vector2Int
pos
)
{
if
(
Position
.
IsInAdjacentArea
(
pos
,
1
))
if
(
Position
.
IsInAdjacentArea
(
pos
,
1
)
&&
MapManager
.
inst
.
currentMap
.
GetWallAtPos
((
Vector2
)(
Position
+
pos
)
/
2
)
==
null
)
{
Debug
.
Log
(
Position
.
x
+
" "
+
Position
.
y
+
" Stage Restart!"
);
Debug
.
Log
(
Position
.
x
+
" "
+
Position
.
y
+
" Stage Restart!"
);
//TODO : Restart Level
}
}
...
...
Assets/Scripts/PlayerController.cs
View file @
71c15b22
...
...
@@ -112,6 +112,11 @@ public class PlayerController : SingletonBehaviour<PlayerController>
}
}
public
void
AddBullet
(
BulletCode
newBullet
)
{
bulletList
.
Add
(
newBullet
);
}
//For test
public
string
GetCurrentBullet
()
{
...
...
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