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
8ba3fda8
Commit
8ba3fda8
authored
Aug 06, 2019
by
18신대성
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
벽 파괴이펙트 구현 및 카메라 파괴이펙트 수정
parent
7e399e25
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
2439 additions
and
831 deletions
+2439
-831
camera_scattered.fbx.meta
Assets/Models/camera_scattered.fbx.meta
+16
-1
wall_scattered.fbx
Assets/Models/wall_scattered.fbx
+0
-0
wall_scattered.fbx.meta
Assets/Models/wall_scattered.fbx.meta
+100
-0
wall.prefab
Assets/Prefabs/MapObjects/wall.prefab
+2
-0
wall_scattered.prefab
Assets/Prefabs/MapObjects/wall_scattered.prefab
+1475
-0
wall_scattered.prefab.meta
Assets/Prefabs/MapObjects/wall_scattered.prefab.meta
+7
-0
camera.prefab
Assets/Prefabs/Objects/camera.prefab
+1
-1
camera_scattered.prefab
Assets/Prefabs/Objects/camera_scattered.prefab
+741
-741
ModelScene.unity
Assets/Scenes/ModelScene.unity
+87
-87
CameraController.cs
Assets/Scripts/CameraController.cs
+1
-1
Map.cs
Assets/Scripts/Map/Map.cs
+1
-0
NormalWall.cs
Assets/Scripts/Map/NormalWall.cs
+8
-0
No files found.
Assets/Models/camera_scattered.fbx.meta
View file @
8ba3fda8
...
...
@@ -3,7 +3,22 @@ guid: 890eee527f56e734e8227b222686a95f
ModelImporter:
serializedVersion: 26
internalIDToNameTable: []
externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Black
second: {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Silver
second: {fileID: 2100000, guid: 9a0f6bd4dc4e6d541bc1723faccc4a08, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: White
second: {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
materials:
importMaterials: 1
materialName: 0
...
...
Assets/Models/wall_scattered.fbx
0 → 100644
View file @
8ba3fda8
File added
Assets/Models/wall_scattered.fbx.meta
0 → 100644
View file @
8ba3fda8
fileFormatVersion: 2
guid: 98f2fc1fb1fd88a408a541afe652f13d
ModelImporter:
serializedVersion: 26
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: White.002
second: {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 0.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.5
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/MapObjects/wall.prefab
View file @
8ba3fda8
...
...
@@ -125,3 +125,5 @@ MonoBehaviour:
mapPos
:
{
x
:
0
,
y
:
0
}
len
:
1
type
:
1
scatteredWall
:
{
fileID
:
9006064965186749716
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
Assets/Prefabs/MapObjects/wall_scattered.prefab
0 → 100644
View file @
8ba3fda8
This diff is collapsed.
Click to expand it.
Assets/Prefabs/MapObjects/wall_scattered.prefab.meta
0 → 100644
View file @
8ba3fda8
fileFormatVersion: 2
guid: eebda1dc9612e574aa33c3b9f8ded4f1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Objects/camera.prefab
View file @
8ba3fda8
...
...
@@ -807,7 +807,7 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
floor
:
{
fileID
:
0
}
scatteredTurret
:
{
fileID
:
4194399530101458971
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
scatteredTurret
:
{
fileID
:
5867490533518071498
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
type
:
3
}
---
!u!208
&7514060783340336889
NavMeshObstacle
:
...
...
Assets/Prefabs/Objects/camera_scattered.prefab
View file @
8ba3fda8
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Assets/Scenes/ModelScene.unity
View file @
8ba3fda8
...
...
@@ -120,75 +120,6 @@ NavMeshSettings:
debug
:
m_Flags
:
0
m_NavMeshData
:
{
fileID
:
0
}
---
!u!1001
&134727451
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
6001025753464815805
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_Name
value
:
camera
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
6001025753464593565
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
df6f1d8b9377ec346af4255abe290fbb
,
type
:
3
}
---
!u!1
&1018969727
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -356,8 +287,8 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1323233638
}
m_LocalRotation
:
{
x
:
0.
024982104
,
y
:
0.96886235
,
z
:
-0.22053653
,
w
:
0.10975173
}
m_LocalPosition
:
{
x
:
0.21893045
,
y
:
0.97954035
,
z
:
1.2093842
}
m_LocalRotation
:
{
x
:
0.
36331266
,
y
:
0.046998836
,
z
:
-0.018253522
,
w
:
0.9303021
}
m_LocalPosition
:
{
x
:
-0.4068426
,
y
:
1.8951384
,
z
:
-1.6483006
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
...
...
@@ -456,72 +387,141 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1001
&
9108301810198932530
---
!u!1001
&
1766882213
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
4194399530101458971
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
337530617404887312
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_Name
value
:
camera_scattered (1)
value
:
wall
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0.3
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
337530617404788016
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
a4dcd71ec9f819f4e88c7b5ac24f4b0d
,
type
:
3
}
---
!u!1001
&1142248856957432683
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
9006064965186749716
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_Name
value
:
wall_scattered
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
895893063964408328
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
-
target
:
{
fileID
:
5377475553280063239
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
d6c0cb697ea7bd341a7e3b0968a8a273
,
type
:
3
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
eebda1dc9612e574aa33c3b9f8ded4f1
,
type
:
3
}
Assets/Scripts/CameraController.cs
View file @
8ba3fda8
...
...
@@ -13,7 +13,7 @@ public class CameraController : MonoBehaviour
float
mapFov
=
20f
;
float
rotationX
=
0
;
float
rotationY
=
0
;
float
sensitivity
=
30
;
float
sensitivity
=
45
;
[
SerializeField
]
Vector3
centerPos
=
new
Vector3
(
0
,
0
,
0
);
...
...
Assets/Scripts/Map/Map.cs
View file @
8ba3fda8
...
...
@@ -189,6 +189,7 @@ public class Map : MonoBehaviour
}
if
(
wallGrid
.
ContainsKey
(
pos
))
{
(
wallGrid
[
pos
]
as
NormalWall
).
Break
();
RemoveWall
(
pos
);
wallGrid
.
Add
(
pos
,
Instantiate
(
MapManager
.
inst
.
mirror
,
new
Vector3
(
pos
.
x
,
0
,
pos
.
y
),
Quaternion
.
identity
,
walls
.
transform
).
GetComponent
<
Wall
>());
wallGrid
[
pos
].
mapPos
=
pos
;
...
...
Assets/Scripts/Map/NormalWall.cs
View file @
8ba3fda8
...
...
@@ -4,6 +4,14 @@ using UnityEngine;
public
class
NormalWall
:
Wall
,
IBulletInteractor
{
[
Space
(
15
)]
public
GameObject
scatteredWall
;
public
void
Break
()
{
Instantiate
(
scatteredWall
,
transform
.
position
+
new
Vector3
(
0
,
0.3f
),
transform
.
rotation
);
}
public
void
Interact
(
Bullet
bullet
)
{
if
(
bullet
is
MirrorBullet
)
...
...
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