Commit 1fe64d95 authored by 18신대성's avatar 18신대성

잭슨 트리거콜라이더 작게 만들고, 마네킹 색변화이펙트 구현

parent 6cd3df57
fileFormatVersion: 2
guid: 0d4bab5090b490148a48dfd27fff63ad
ModelImporter:
serializedVersion: 26
internalIDToNameTable: []
externalObjects: {}
materials:
importMaterials: 0
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.9
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.9
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
...@@ -1417,10 +1417,10 @@ CapsuleCollider: ...@@ -1417,10 +1417,10 @@ CapsuleCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
m_Radius: 0.3 m_Radius: 0.11
m_Height: 2 m_Height: 1.6
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: 1.115, z: 0} m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &6489731509539496108 --- !u!114 &6489731509539496108
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -923,6 +923,10 @@ MonoBehaviour: ...@@ -923,6 +923,10 @@ MonoBehaviour:
- {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2} - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
- {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2} - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
floor: {fileID: 0} floor: {fileID: 0}
scatteredWhite: {fileID: 5456794606668127487, guid: 458570b22c320e64cbcc9fc2697b020c,
type: 3}
scatteredBlack: {fileID: 945496939717725773, guid: bccc798dc7da0764d8964f801ee4d1bc,
type: 3}
isWhite: 0 isWhite: 0
--- !u!208 &-8359977218413576816 --- !u!208 &-8359977218413576816
NavMeshObstacle: NavMeshObstacle:
......
fileFormatVersion: 2
guid: bccc798dc7da0764d8964f801ee4d1bc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 458570b22c320e64cbcc9fc2697b020c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -8,6 +8,11 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor ...@@ -8,6 +8,11 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
[SerializeField] private Material[] mannequinMaterial = new Material[2]; [SerializeField] private Material[] mannequinMaterial = new Material[2];
[SerializeField] private Floor floor; [SerializeField] private Floor floor;
private Color _color; private Color _color;
[Space(15)]
public GameObject scatteredWhite;
public GameObject scatteredBlack;
public Color Color { public Color Color {
get get
{ {
...@@ -47,6 +52,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor ...@@ -47,6 +52,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
{ {
Color = Color.white; Color = Color.white;
isWhite = true; isWhite = true;
Instantiate(scatteredBlack, transform);
if (GameManager.white >= 0) if (GameManager.white >= 0)
MapManager.inst.currentMap.clearConditions[GameManager.white].IsDone(1); MapManager.inst.currentMap.clearConditions[GameManager.white].IsDone(1);
if (GameManager.black >= 0) if (GameManager.black >= 0)
...@@ -56,6 +62,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor ...@@ -56,6 +62,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
{ {
Color = Color.black; Color = Color.black;
isWhite = false; isWhite = false;
Instantiate(scatteredWhite, transform);
if (GameManager.black >= 0) if (GameManager.black >= 0)
MapManager.inst.currentMap.clearConditions[GameManager.black].IsDone(1); MapManager.inst.currentMap.clearConditions[GameManager.black].IsDone(1);
if (GameManager.white >= 0) if (GameManager.white >= 0)
......
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