Skip to content

M
man-in-the-mirror
You need to sign in or sign up before continuing.
Commit c85321b5 authored by 18신대성's avatar 18신대성
Browse files
Options

아웃라인 적용 완료

parent 3fd6ce06
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 84 deletions
Assets/Prefabs/MapObjects/mirror.prefab
View file @ c85321b5
......@@ -139,7 +139,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1244481854748732982}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fbf3575480402db40813e763382412fb, type: 3}
m_Name:
......
Assets/Prefabs/MapObjects/wall.prefab
View file @ c85321b5
......@@ -135,7 +135,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 337530617404887312}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fbf3575480402db40813e763382412fb, type: 3}
m_Name:
......
Assets/Prefabs/Objects/Mannequin/mannequin (4).prefab
View file @ c85321b5
......@@ -176,7 +176,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6169104080419908226}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fbf3575480402db40813e763382412fb, type: 3}
m_Name:
......@@ -823,7 +823,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6169104080419908260}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fbf3575480402db40813e763382412fb, type: 3}
m_Name:
......
Assets/Prefabs/Objects/camera.prefab
View file @ c85321b5
......@@ -738,7 +738,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6001025753464815801}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fbf3575480402db40813e763382412fb, type: 3}
m_Name:
......@@ -943,7 +943,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6001025753464815807}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fbf3575480402db40813e763382412fb, type: 3}
m_Name:
......
Assets/Scenes/PlayStage.unity
View file @ c85321b5
......@@ -579,41 +579,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 256306795}
m_CullTransparentMesh: 0
--- !u!84 &333500944
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &342512061
GameObject:
m_ObjectHideFlags: 0
......@@ -859,7 +824,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 1024
stopNaNPropagation: 1
finalBlitToCameraTarget: 1
finalBlitToCameraTarget: 0
antialiasingMode: 1
temporalAntialiasing:
jitterSpread: 0.75
......@@ -916,8 +881,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
lineThickness: 1.25
lineIntensity: 0.5
fillAmount: 0.2
lineColor0: {r: 1, g: 0, b: 0, a: 1}
fillAmount: 0.01
lineColor0: {r: 0, g: 0.745283, b: 0.2808248, a: 1}
lineColor1: {r: 0, g: 1, b: 0, a: 1}
lineColor2: {r: 0, g: 0, b: 1, a: 1}
additiveRendering: 0
......@@ -930,8 +895,8 @@ MonoBehaviour:
sourceCamera: {fileID: 534669904}
outlineCamera: {fileID: 1548020010}
outlineShaderMaterial: {fileID: 0}
renderTexture: {fileID: 942340553}
extraRenderTexture: {fileID: 333500944}
renderTexture: {fileID: 1751407643}
extraRenderTexture: {fileID: 740540897}
--- !u!1 &666076611
GameObject:
m_ObjectHideFlags: 0
......@@ -1063,6 +1028,41 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 666076611}
m_CullTransparentMesh: 0
--- !u!84 &740540897
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &770981479
GameObject:
m_ObjectHideFlags: 0
......@@ -1268,41 +1268,6 @@ RectTransform:
m_AnchoredPosition: {x: 895, y: -490}
m_SizeDelta: {x: 100, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!84 &942340553
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1015578410
GameObject:
m_ObjectHideFlags: 0
......@@ -1622,7 +1587,7 @@ Camera:
serializedVersion: 2
m_Bits: 0
m_RenderingPath: 1
m_TargetTexture: {fileID: 942340553}
m_TargetTexture: {fileID: 1751407643}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
......@@ -1814,6 +1779,41 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1745203029}
m_CullTransparentMesh: 0
--- !u!84 &1751407643
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1839944655
GameObject:
m_ObjectHideFlags: 0
......
Assets/Scripts/Player.cs
View file @ c85321b5
......@@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
using cakeslice;
public class Player : MonoBehaviour
{
......@@ -23,8 +24,10 @@ public class Player : MonoBehaviour
public GameObject selectPointer;
public VLight aimLight;
public bool canShoot = false;
private GameObject currentBullet;
private float lastShoot;
private Collider beforeRay = null;
/// <summary>
/// Set this player as the current player.
......@@ -47,6 +50,7 @@ public class Player : MonoBehaviour
GetComponent<NavMeshAgent>().enabled = false;
GetComponent<NavMeshObstacle>().enabled = true;
selectPointer.SetActive(false);
OffAllOutline();
StartCoroutine(MapManager.inst.Rebaker());
PlayerController.inst.currentPlayer = null;
}
......@@ -127,6 +131,7 @@ public class Player : MonoBehaviour
public void Shoot(BulletCode bulletCode)
{
OffAllOutline();
Bullet newBullet = MapManager.inst.bulletFactory.MakeBullet(bulletCode);
newBullet.transform.position = shootingFinger.transform.position;
newBullet.transform.LookAt(shootingArm.transform.forward + newBullet.transform.position);
......@@ -138,6 +143,39 @@ public class Player : MonoBehaviour
lastShoot = Time.time;
anim.SetTrigger("shoot");
}
public void OffAllOutline()
{
canShoot = false;
laser.GetComponent<LineRenderer>().startColor = Color.red;
laser.GetComponent<LineRenderer>().endColor = Color.red;
if (beforeRay != null)
{
if (beforeRay.tag.Equals("wall"))
{
beforeRay.GetComponent<Outline>().enabled = false;
}
else if (beforeRay.tag.Equals("Mirror"))
{
beforeRay.GetComponent<Outline>().enabled = false;
}
else if (beforeRay.tag.Equals("CameraTurret"))
{
foreach (var comp in beforeRay.GetComponentsInChildren<Outline>())
{
comp.enabled = false;
}
}
else if (beforeRay.tag.Equals("Mannequin"))
{
foreach (var comp in beforeRay.GetComponentsInChildren<Outline>())
{
comp.enabled = false;
}
}
beforeRay = null;
}
}
// Start is called before the first frame update
void Start()
{
......@@ -152,7 +190,86 @@ public class Player : MonoBehaviour
{
laser.transform.position = shootingFinger.transform.position;
if (currentBullet == null && lastShoot + 1f < Time.time) laser.SetActive(true);
Ray mouseRay = Camera.main.ScreenPointToRay(Input.mousePosition);
int layerMask = (-1) - (1 << LayerMask.NameToLayer("Scattered"));
RaycastHit hit;
bool isHit = Physics.Raycast(mouseRay, out hit, float.MaxValue, layerMask);
if (isHit && PlayerController.inst.bulletList.Count > 0 && beforeRay != hit.collider)
{
OffAllOutline();
beforeRay = hit.collider;
if (PlayerController.inst.bulletList[0] == BulletCode.True)
{
if (beforeRay.tag.Equals("Mirror"))
{
beforeRay.GetComponent<Outline>().enabled = true;
canShoot = true;
laser.GetComponent<LineRenderer>().startColor = Color.green;
laser.GetComponent<LineRenderer>().endColor = Color.green;
}
else if (beforeRay.tag.Equals("CameraTurret"))
{
foreach (var comp in beforeRay.GetComponentsInChildren<Outline>())
{
comp.enabled = true;
}
canShoot = true;
laser.GetComponent<LineRenderer>().startColor = Color.green;
laser.GetComponent<LineRenderer>().endColor = Color.green;
}
else if (beforeRay.tag.Equals("Mannequin") && beforeRay.GetComponent<Mannequin>().isWhite == false)
{
foreach (var comp in beforeRay.GetComponentsInChildren<Outline>())
{
comp.enabled = true;
}
canShoot = true;
laser.GetComponent<LineRenderer>().startColor = Color.green;
laser.GetComponent<LineRenderer>().endColor = Color.green;
}
}
else if (PlayerController.inst.bulletList[0] == BulletCode.False)
{
if (beforeRay.tag.Equals("Mirror"))
{
beforeRay.GetComponent<Outline>().enabled = true;
canShoot = true;
laser.GetComponent<LineRenderer>().startColor = Color.green;
laser.GetComponent<LineRenderer>().endColor = Color.green;
}
else if (beforeRay.tag.Equals("Mannequin") && beforeRay.GetComponent<Mannequin>().isWhite == true)
{
foreach (var comp in beforeRay.GetComponentsInChildren<Outline>())
{
comp.enabled = true;
}
canShoot = true;
laser.GetComponent<LineRenderer>().startColor = Color.green;
laser.GetComponent<LineRenderer>().endColor = Color.green;
}
}
else if (PlayerController.inst.bulletList[0] == BulletCode.Mirror)
{
if (beforeRay.tag.Equals("wall"))
{
beforeRay.GetComponent<Outline>().enabled = true;
canShoot = true;
laser.GetComponent<LineRenderer>().startColor = Color.green;
laser.GetComponent<LineRenderer>().endColor = Color.green;
}
}
}
else if (!isHit)
{
OffAllOutline();
beforeRay = null;
}
}
else if (laser.activeSelf)
{
OffAllOutline();
laser.SetActive(false);
}
else if (laser.activeSelf) laser.SetActive(false);
}
}
Assets/Scripts/PlayerController.cs
View file @ c85321b5
......@@ -195,7 +195,7 @@ public class PlayerController : SingletonBehaviour<PlayerController>
}
else if (GameManager.inst.isPlayerShooting && currentPlayer.laser.activeSelf)
{
if (bulletList.Count > 0)
if (bulletList.Count > 0 && currentPlayer.canShoot)
{
currentPlayer.Shoot(bulletList[0]);
}
......@@ -210,6 +210,7 @@ public class PlayerController : SingletonBehaviour<PlayerController>
else if (Input.GetMouseButtonDown(1) && GameManager.inst.isPlayerShooting)
{
StartCoroutine(Camera.main.GetComponent<CameraController>().ZoomOutFromPlayer(currentPlayer));
currentPlayer.OffAllOutline();
currentPlayer.shootingArm.rotation = currentPlayer.armRotation;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment