穴の判定追加
This commit is contained in:
kimura
parent
04abc13fa4
commit
02fa1b8161
|
|
@ -336,6 +336,80 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &2116348896259355144
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1534764298133588176}
|
||||
- component: {fileID: 1099241547759812047}
|
||||
- component: {fileID: 7579635455155827063}
|
||||
m_Layer: 0
|
||||
m_Name: WallCollider
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1534764298133588176
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2116348896259355144}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6547169326961555051}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1099241547759812047
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2116348896259355144}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b62a13975f3446e1b15bf182305ce742, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemType: 3
|
||||
point: 0
|
||||
effect: {fileID: 0}
|
||||
--- !u!61 &7579635455155827063
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2116348896259355144}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 2.464157, y: -0.29294157}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 0.56, y: 0.56}
|
||||
newSize: {x: 1.5, y: 1.5}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1.7018661, y: 6.5957174}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1 &3506260383647136063
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1596,6 +1670,80 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &9202194284233474589
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2593939739011402922}
|
||||
- component: {fileID: 5868678615845785858}
|
||||
- component: {fileID: 6483093989930334763}
|
||||
m_Layer: 0
|
||||
m_Name: HoleCollider
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2593939739011402922
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9202194284233474589}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6547169326961555051}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5868678615845785858
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9202194284233474589}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b62a13975f3446e1b15bf182305ce742, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemType: 2
|
||||
point: 0
|
||||
effect: {fileID: 0}
|
||||
--- !u!61 &6483093989930334763
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9202194284233474589}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: -0.30281544, y: 3.0435905}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 0.56, y: 0.56}
|
||||
newSize: {x: 1.5, y: 1.5}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 3.8188686, y: 0.64767385}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1001 &4896317741957177885
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1613,20 +1761,35 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: Obstacle hole
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4498234376221693369, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: HitCollider
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 3
|
||||
value: 4.9299707
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 3
|
||||
value: 1.2895794
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
propertyPath: m_Offset.x
|
||||
value: -0.022976398
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4498234376221693374, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
propertyPath: m_Offset.y
|
||||
value: -3.2332087
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4888696605717816911, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
|
|
@ -1732,61 +1895,9 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4896317741957177885}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &9052172984657770404 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4498234376221693369, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
--- !u!4 &6547169326961555051 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1814670119296341110, guid: b82d5b841abe54f95aee9a8a5a023f6a,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4896317741957177885}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!61 &5895574189566282252
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9052172984657770404}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: -0.03, y: -0.67}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 3, y: 1.66}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!61 &8766766892135053376
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9052172984657770404}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: -0.04, y: 0.83}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 2.12, y: 1.31}
|
||||
m_EdgeRadius: 0
|
||||
|
|
|
|||
|
|
@ -263,14 +263,26 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
// }
|
||||
}
|
||||
#endif
|
||||
switch (item.ItemType)
|
||||
{
|
||||
case StageItem.Type.Obstacle:
|
||||
if (player.IsHit)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (item.ItemType == StageItem.Type.Obstacle)
|
||||
{
|
||||
player.Hit(x.ClosestPoint(playerTransform.position));
|
||||
x.enabled = false;
|
||||
break;
|
||||
case StageItem.Type.Item1:
|
||||
break;
|
||||
case StageItem.Type.Hole:
|
||||
player.Hole();
|
||||
break;
|
||||
case StageItem.Type.Wall:
|
||||
player.Wall();
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
}).AddTo(this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
{
|
||||
Item1,
|
||||
Obstacle,
|
||||
Hole,
|
||||
Wall,
|
||||
}
|
||||
|
||||
[SerializeField] private Type itemType;
|
||||
|
|
@ -30,7 +32,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
if (effect != null) effect.SetActive(true);
|
||||
break;
|
||||
case Type.Obstacle:
|
||||
break;
|
||||
case Type.Hole:
|
||||
case Type.Wall:
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue