From 60b75081aaa3f219b326eb6731dfc8feff1fe070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?18=EC=8B=A0=EB=8C=80=EC=84=B1?= <esc990720@korea.ac.kr>
Date: Wed, 3 Jul 2019 21:30:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=A5=98=EA=B0=80=EB=B0=A9=EC=9D=B4?=
=?UTF-8?q?=20=EB=8F=8C=EC=95=84=EA=B0=80=EA=B3=A0,=20=EC=95=84=EB=9E=98?=
=?UTF-8?q?=EC=97=90=20=EC=B4=9D=EC=95=8C=EC=97=90=20=EB=94=B0=EB=9D=BC=20?=
=?UTF-8?q?=EC=83=89=EA=B9=94=EC=9D=B4=20=EB=B3=80=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Models/Animation/case_idle.anim | 53 ++++++++++
Assets/Models/Animation/case_idle.anim.meta | 8 ++
Assets/Prefabs/Objects/case.prefab | 101 +++++++++++++++++++-
Assets/Scripts/Interactors/Briefcase.cs | 17 ++++
Assets/Scripts/Map/Map.cs | 2 +-
5 files changed, 178 insertions(+), 3 deletions(-)
create mode 100644 Assets/Models/Animation/case_idle.anim
create mode 100644 Assets/Models/Animation/case_idle.anim.meta
diff --git a/Assets/Models/Animation/case_idle.anim b/Assets/Models/Animation/case_idle.anim
new file mode 100644
index 0000000..08c2591
--- /dev/null
+++ b/Assets/Models/Animation/case_idle.anim
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: case_rotate
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings: []
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Models/Animation/case_idle.anim.meta b/Assets/Models/Animation/case_idle.anim.meta
new file mode 100644
index 0000000..d58b845
--- /dev/null
+++ b/Assets/Models/Animation/case_idle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5699b28a48756f24b99b5c99a701bc3d
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Objects/case.prefab b/Assets/Prefabs/Objects/case.prefab
index 756381c..b03eaa7 100644
--- a/Assets/Prefabs/Objects/case.prefab
+++ b/Assets/Prefabs/Objects/case.prefab
@@ -1,5 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &256812563257164782
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6644778239092870404}
+ - component: {fileID: 6376510568108478465}
+ - component: {fileID: 4433976770430682297}
+ m_Layer: 0
+ m_Name: Cylinder
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6644778239092870404
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256812563257164782}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.000000034465, y: -0.3, z: -0.000000034465}
+ m_LocalScale: {x: 0.59114, y: 0.017734198, z: 0.59114}
+ m_Children: []
+ m_Father: {fileID: 2534561534465045041}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6376510568108478465
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256812563257164782}
+ m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4433976770430682297
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 256812563257164782}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
--- !u!1 &2534561534465535505
GameObject:
m_ObjectHideFlags: 0
@@ -14,6 +92,7 @@ GameObject:
- component: {fileID: -2850530927027858165}
- component: {fileID: -4559840392902712278}
- component: {fileID: -954323813722370706}
+ - component: {fileID: 8140745163849209613}
m_Layer: 0
m_Name: case
m_TagString: Untagged
@@ -31,10 +110,11 @@ Transform:
m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
+ m_Children:
+ - {fileID: 6644778239092870404}
m_Father: {fileID: 0}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 134.6009, z: 0}
--- !u!33 &2534561534464242193
MeshFilter:
m_ObjectHideFlags: 0
@@ -110,6 +190,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
floor: {fileID: 0}
dropBullet: 3
+ table: {fileID: 256812563257164782}
--- !u!208 &-954323813722370706
NavMeshObstacle:
m_ObjectHideFlags: 0
@@ -126,3 +207,19 @@ NavMeshObstacle:
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0.030000001, z: 0}
m_TimeToStationary: 0.5
+--- !u!111 &8140745163849209613
+Animation:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2534561534465535505}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Animation: {fileID: 7400000, guid: 5699b28a48756f24b99b5c99a701bc3d, type: 2}
+ m_Animations:
+ - {fileID: 7400000, guid: 5699b28a48756f24b99b5c99a701bc3d, type: 2}
+ m_WrapMode: 0
+ m_PlayAutomatically: 1
+ m_AnimatePhysics: 0
+ m_CullingType: 0
diff --git a/Assets/Scripts/Interactors/Briefcase.cs b/Assets/Scripts/Interactors/Briefcase.cs
index de269a3..5b74b27 100644
--- a/Assets/Scripts/Interactors/Briefcase.cs
+++ b/Assets/Scripts/Interactors/Briefcase.cs
@@ -7,6 +7,7 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
[SerializeField]
private Floor floor = null;
public BulletCode dropBullet;
+ public GameObject table;
public Vector2Int Position { get { return floor != null ? floor.mapPos : throw new UnassignedReferenceException("Floor of Interactor is not assigned"); } }
public GameObject GetObject()
@@ -30,6 +31,22 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
public void SetBullet(BulletCode _dropBullet)
{
dropBullet = _dropBullet;
+ if (dropBullet == BulletCode.False)
+ {
+ table.GetComponent<MeshRenderer>().material.color = Color.red;
+ }
+ else if (dropBullet == BulletCode.Mirror)
+ {
+ table.GetComponent<MeshRenderer>().material.color = Color.gray;
+ }
+ else if (dropBullet == BulletCode.True)
+ {
+ table.GetComponent<MeshRenderer>().material.color = Color.green;
+ }
+ else
+ {
+ table.SetActive(false);
+ }
}
private void OnDestroy()
diff --git a/Assets/Scripts/Map/Map.cs b/Assets/Scripts/Map/Map.cs
index b168cc6..d015695 100644
--- a/Assets/Scripts/Map/Map.cs
+++ b/Assets/Scripts/Map/Map.cs
@@ -245,7 +245,7 @@ public class Map : MonoBehaviour
public void CreateObject(Vector2Int pos, ObjType objType, BulletCode _dropBullet)
{
CreateObject(pos, objType);
- GetObjectAtPos(pos).GetObject().GetComponent<Briefcase>().dropBullet = _dropBullet;
+ GetObjectAtPos(pos).GetObject().GetComponent<Briefcase>().SetBullet(_dropBullet);
}
/// <summary>
/// Remove Object at position.
--
2.22.0