Tag 추가
InIslandPlayer, CombatCrewmate, FieldMinion, FieldBoss + MagicOrk의 fireball FX파티클 테스트용 추가 + Player 이동시 Crewmate 움직임 보정
This commit is contained in:
parent
bbc0836b6d
commit
14b950679f
@ -722,10 +722,6 @@ PrefabInstance:
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1010297108}
|
||||
- targetCorrespondingSourceObject: {fileID: 3388854588669550803, guid: fbe5f9d69cf27974fa4899b0bcf542c8,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1010297107}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3}
|
||||
--- !u!1 &131269471 stripped
|
||||
GameObject:
|
||||
@ -739,6 +735,130 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 473536186}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &161042470
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 348702644}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -44.91
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.24
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.4109502
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7305287201485691239, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RedOrc2 (3)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fe3183ccc4347734ea166dd7e385a8f7, type: 3}
|
||||
--- !u!224 &161042471 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 161042470}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &178837790 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2718910014188824470, guid: 14871bcccb7cf4e1d81bb38ec7a3a4e0,
|
||||
@ -1114,6 +1234,130 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 247736989}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &271958939
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 348702644}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -41.51
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 4.68
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.4109502
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7305287201485691239, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RedOrc2 (2)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fe3183ccc4347734ea166dd7e385a8f7, type: 3}
|
||||
--- !u!224 &271958940 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 271958939}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &295112140 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 413916, guid: e03ec6b6ff510d545ace4e5794f6fab9,
|
||||
@ -1134,6 +1378,11 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 392992923}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3122767183895819561, guid: 29ca6449d50d08140a003863be5291b1,
|
||||
type: 3}
|
||||
propertyPath: m_Radius
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4980758164501340593, guid: 29ca6449d50d08140a003863be5291b1,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -1242,13 +1491,18 @@ PrefabInstance:
|
||||
- target: {fileID: 7671700086832248929, guid: 29ca6449d50d08140a003863be5291b1,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 9
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7671700086832248929, guid: 29ca6449d50d08140a003863be5291b1,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7671700086832248929, guid: 29ca6449d50d08140a003863be5291b1,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: CombatCrewmate
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8923461577612787898, guid: 29ca6449d50d08140a003863be5291b1,
|
||||
type: 3}
|
||||
propertyPath: m_WalkableMask
|
||||
@ -1455,7 +1709,131 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!1001 &324327414
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 348702644}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -52.11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 27.91
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.4109502
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7305287201485691239, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RedOrc2 (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fe3183ccc4347734ea166dd7e385a8f7, type: 3}
|
||||
--- !u!224 &324327415 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 324327414}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &334724472
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1677,6 +2055,11 @@ Transform:
|
||||
- {fileID: 191659618}
|
||||
- {fileID: 1418191463}
|
||||
- {fileID: 1273151896}
|
||||
- {fileID: 1343204827}
|
||||
- {fileID: 324327415}
|
||||
- {fileID: 1917147000}
|
||||
- {fileID: 271958940}
|
||||
- {fileID: 161042471}
|
||||
m_Father: {fileID: 888439616}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &378439955
|
||||
@ -2133,11 +2516,26 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Viking
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: InIslandPlayer
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4818569613637124799, guid: 5d3f02c24a243a044bbddafc1652ee67,
|
||||
type: 3}
|
||||
propertyPath: m_Radius
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -2322,7 +2720,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!1001 &460905033
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3193,10 +3591,6 @@ PrefabInstance:
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1274110289}
|
||||
- targetCorrespondingSourceObject: {fileID: 6209097434605892902, guid: a003617243f099842ac3523a93f80e28,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1274110288}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a003617243f099842ac3523a93f80e28, type: 3}
|
||||
--- !u!1 &633494891 stripped
|
||||
GameObject:
|
||||
@ -4455,7 +4849,6 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 888439616}
|
||||
- component: {fileID: 888439617}
|
||||
- component: {fileID: 888439618}
|
||||
m_Layer: 0
|
||||
m_Name: StageMap
|
||||
@ -4486,38 +4879,6 @@ Transform:
|
||||
- {fileID: 1037586754}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &888439617
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 888439615}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e21653ba0089cfe46beca2cdf851abcd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<IslandName>k__BackingField: FirstIsland
|
||||
<HouseList>k__BackingField:
|
||||
- {fileID: 1274110287}
|
||||
- {fileID: 1010297106}
|
||||
- {fileID: 1344744312}
|
||||
<TowerList>k__BackingField:
|
||||
- {fileID: 7741239958606593187}
|
||||
- {fileID: 948936796}
|
||||
<UnitList>k__BackingField: []
|
||||
<EnemyList>k__BackingField: []
|
||||
<ExceptHouseList>k__BackingField:
|
||||
- {fileID: 7741239958606593187}
|
||||
- {fileID: 948936796}
|
||||
<TargetAllList>k__BackingField:
|
||||
- {fileID: 1274110287}
|
||||
- {fileID: 1010297106}
|
||||
- {fileID: 1344744312}
|
||||
- {fileID: 7741239958606593187}
|
||||
- {fileID: 948936796}
|
||||
<IslandCam>k__BackingField: {fileID: 982629707}
|
||||
--- !u!114 &888439618
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5033,6 +5394,7 @@ MonoBehaviour:
|
||||
<IsDredgeMode>k__BackingField: 0
|
||||
<IsTakeAim>k__BackingField: 0
|
||||
<IsAssaultMode>k__BackingField: 0
|
||||
<CurrentPlayerMode>k__BackingField: 0
|
||||
--- !u!4 &971043561
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5342,21 +5704,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 131269470}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1010297107
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 131269471}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
islandInfo: {fileID: 888439617}
|
||||
maxHp: 500
|
||||
currentHp: 0
|
||||
--- !u!65 &1010297108
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6417,12 +6764,12 @@ PrefabInstance:
|
||||
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -48.36
|
||||
value: -57.03
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 24.25
|
||||
value: 25.97
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
|
||||
type: 3}
|
||||
@ -6481,21 +6828,6 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 633494890}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1274110288
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 633494891}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
islandInfo: {fileID: 888439617}
|
||||
maxHp: 500
|
||||
currentHp: 0
|
||||
--- !u!65 &1274110289
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6893,6 +7225,130 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1343204826
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 348702644}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -48.36
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 28.28
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.4109502
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7305287201485691239, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RedOrc2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fe3183ccc4347734ea166dd7e385a8f7, type: 3}
|
||||
--- !u!224 &1343204827 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1343204826}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1344744312 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 664878819238250479, guid: 726da43882bc7cf4794b6164bb2acaa5,
|
||||
@ -6945,6 +7401,11 @@ PrefabInstance:
|
||||
propertyPath: avoidancePriority
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2617358470314884568, guid: f231da17ce5b9c84f91bf8ed73c2868e,
|
||||
type: 3}
|
||||
propertyPath: m_Radius
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3406431702509732489, guid: f231da17ce5b9c84f91bf8ed73c2868e,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
@ -7053,13 +7514,18 @@ PrefabInstance:
|
||||
- target: {fileID: 7216996033527228451, guid: f231da17ce5b9c84f91bf8ed73c2868e,
|
||||
type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 9
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7216996033527228451, guid: f231da17ce5b9c84f91bf8ed73c2868e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7216996033527228451, guid: f231da17ce5b9c84f91bf8ed73c2868e,
|
||||
type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: CombatCrewmate
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -7256,7 +7722,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!1001 &1375744721
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7339,10 +7805,6 @@ PrefabInstance:
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1375744724}
|
||||
- targetCorrespondingSourceObject: {fileID: 176149940216585557, guid: 726da43882bc7cf4794b6164bb2acaa5,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1375744723}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3}
|
||||
--- !u!1 &1375744722 stripped
|
||||
GameObject:
|
||||
@ -7350,21 +7812,6 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1375744721}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1375744723
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1375744722}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
islandInfo: {fileID: 888439617}
|
||||
maxHp: 500
|
||||
currentHp: 0
|
||||
--- !u!65 &1375744724
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -9141,6 +9588,130 @@ NavMeshObstacle:
|
||||
m_CarveOnlyStationary: 1
|
||||
m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002}
|
||||
m_TimeToStationary: 0.5
|
||||
--- !u!1001 &1917146999
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 348702644}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -50.58
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 32.13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.4109502
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7305287201485691239, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RedOrc2 (4)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fe3183ccc4347734ea166dd7e385a8f7, type: 3}
|
||||
--- !u!224 &1917147000 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2448285020775227713, guid: fe3183ccc4347734ea166dd7e385a8f7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1917146999}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1919805699
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -203,8 +203,12 @@ namespace BlueWaterProject
|
||||
{
|
||||
if (UseRigidbody)
|
||||
{
|
||||
var movement = GameManager.Inst.InIslandPlayer.Rb.velocity * (MoveSpd / GameManager.Inst.InIslandPlayer.MoveSpd);
|
||||
rb.velocity = new Vector3(movement.x, 0, movement.z);
|
||||
// var movement = GameManager.Inst.InIslandPlayer.Rb.velocity * (MoveSpd / GameManager.Inst.InIslandPlayer.MoveSpd);
|
||||
// rb.velocity = new Vector3(movement.x, 0, movement.z);
|
||||
|
||||
var predictedPos = GameManager.Inst.InIslandPlayer.Rb.position + GameManager.Inst.InIslandPlayer.Rb.velocity;
|
||||
var moveDir = (predictedPos - transform.position).normalized;
|
||||
rb.velocity = new Vector3(moveDir.x, 0, moveDir.z) * MoveSpd;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using EpicToonFX;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Pool;
|
||||
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BlueWaterProject
|
||||
@ -12,10 +14,57 @@ namespace BlueWaterProject
|
||||
#region Properties and variables
|
||||
|
||||
[Title("Weapon")]
|
||||
[SerializeField] private ParticleSystem fireballParticle;
|
||||
[SerializeField] private float fireballSpd = 10f;
|
||||
[SerializeField] private Vector3 shootPos;
|
||||
[SerializeField] private GameObject projectileObj;
|
||||
[SerializeField] private Transform shootLocation;
|
||||
[SerializeField] private float speed = 500f;
|
||||
|
||||
//private IObjectPool<WeaponParticle> weaponParticlePool;
|
||||
private Transform objectPoolLocation;
|
||||
|
||||
private Quaternion targetLookRotation;
|
||||
|
||||
private const int WEAPON_MAX_SIZE = 100;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Unity built-in methods
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
||||
//weaponParticlePool = new ObjectPool<WeaponParticle>(CreateWeapon, OnGetWeapon, OnReleaseWeapon, OnDestroyWeapon, maxSize:WEAPON_MAX_SIZE);
|
||||
}
|
||||
|
||||
protected override void Start()
|
||||
{
|
||||
base.Start();
|
||||
|
||||
var objectPoolData = FindAnyObjectByType<ObjectPoolData>();
|
||||
objectPoolLocation = objectPoolData.transform.Find("Particles/Fireballs");
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Interface
|
||||
|
||||
// IAnimatorBridge
|
||||
public override void AttackTiming()
|
||||
{
|
||||
if (!Target) return;
|
||||
|
||||
var myCenterPos = MyCollider.bounds.center;
|
||||
var targetDir = (Target.bounds.center - myCenterPos).normalized;
|
||||
// targetLookRotation = Quaternion.LookRotation(targetDir);
|
||||
|
||||
var projectile = Instantiate(projectileObj, shootLocation.transform.position, Quaternion.identity, objectPoolLocation).GetComponent<ETFXProjectileScript>();
|
||||
projectile.transform.LookAt(Target.bounds.center);
|
||||
projectile.power = Atk;
|
||||
projectile.GetComponent<Rigidbody>().AddForce(projectile.transform.forward * speed);
|
||||
|
||||
//weaponParticlePool.Get();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Custom methods
|
||||
@ -41,7 +90,26 @@ namespace BlueWaterProject
|
||||
yield return waitAtkCooldown;
|
||||
usedNormalAttackCoroutine = false;
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
// #region ObjectPool Function
|
||||
//
|
||||
// private WeaponParticle CreateWeapon()
|
||||
// {
|
||||
// var weapon = Instantiate(projectileObj, shootLocation.transform.position, targetLookRotation, objectPoolLocation).GetComponent<WeaponParticle>();
|
||||
// weapon.SetManagedPool(weaponParticlePool);
|
||||
// return weapon;
|
||||
// }
|
||||
//
|
||||
// private void OnGetWeapon(WeaponParticle weapon)
|
||||
// {
|
||||
// weapon.SetPower(Atk);
|
||||
// weapon.gameObject.SetActive(true);
|
||||
// }
|
||||
// private void OnReleaseWeapon(WeaponParticle weapon) => weapon.gameObject.SetActive(false);
|
||||
// private void OnDestroyWeapon(WeaponParticle weapon) => Destroy(weapon.gameObject);
|
||||
//
|
||||
// #endregion
|
||||
}
|
||||
}
|
@ -4,7 +4,7 @@ using UnityEngine;
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BlueWaterProject
|
||||
{
|
||||
public class ObjectPool : MonoBehaviour
|
||||
public class ObjectPoolData : MonoBehaviour
|
||||
{
|
||||
private void Awake()
|
||||
{
|
@ -16,7 +16,8 @@ namespace BlueWaterProject
|
||||
[SerializeField] private float checkRadius = 1f;
|
||||
[SerializeField] private LayerMask checkLayer;
|
||||
|
||||
[InlineButton("AddCrewmate", "Crewmate 추가")]
|
||||
[Title("Crewmate 생성")]
|
||||
[InfoBox("$CrewmateIndexInfoMessage")]
|
||||
[SerializeField] private int crewmateIndex;
|
||||
|
||||
private Collider[] colliders = new Collider[MAX_COLLIDER];
|
||||
@ -24,6 +25,8 @@ namespace BlueWaterProject
|
||||
private GameObject spawnPositionObj;
|
||||
private CinemachineVirtualCamera cinemachineVirtualCamera;
|
||||
|
||||
private string CrewmateIndexInfoMessage => $"0 ~ {GameManager.Inst.CrewmatePrefabList.Count - 1} 숫자를 입력해주세요.";
|
||||
|
||||
private const string PLAYER_NAME = "Player";
|
||||
private const string IN_ISLAND_PLAYER_NAME = "InIslandPlayer";
|
||||
private const int MAX_COLLIDER = 10;
|
||||
@ -91,11 +94,13 @@ namespace BlueWaterProject
|
||||
GameManager.Inst.InIslandPlayer = inIslandPlayer;
|
||||
}
|
||||
|
||||
[DisableIf("@crewmateIndex >= GameManager.Inst.CrewmatePrefabList.Count || crewmateIndex < 0")]
|
||||
[Button("Crewmate 추가")]
|
||||
private void AddCrewmate()
|
||||
{
|
||||
if (!GameManager.Inst.InIslandPlayer) return;
|
||||
|
||||
if (crewmateIndex >= GameManager.Inst.CrewmatePrefabList.Count)
|
||||
if (crewmateIndex >= GameManager.Inst.CrewmatePrefabList.Count || crewmateIndex < 0)
|
||||
{
|
||||
print("존재하지 않는 인덱스입니다.");
|
||||
return;
|
||||
|
58
BlueWater/Assets/02.Scripts/Weapon/WeaponParticle.cs
Normal file
58
BlueWater/Assets/02.Scripts/Weapon/WeaponParticle.cs
Normal file
@ -0,0 +1,58 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Pool;
|
||||
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BlueWaterProject
|
||||
{
|
||||
public class WeaponParticle : MonoBehaviour
|
||||
{
|
||||
#region properties and variables
|
||||
|
||||
[SerializeField] private List<string> targetTags;
|
||||
|
||||
[DisableIf("@true")]
|
||||
[SerializeField] private float power;
|
||||
|
||||
private IObjectPool<WeaponParticle> managedWeaponPool;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Unity built-in methods
|
||||
|
||||
private void OnParticleCollision(GameObject other)
|
||||
{
|
||||
// 여러 태그 중 하나와 일치하는지 확인
|
||||
foreach (var item in targetTags)
|
||||
{
|
||||
if (!other.CompareTag(item)) continue;
|
||||
|
||||
var iDamageable = other.GetComponent<IDamageable>();
|
||||
iDamageable?.TakeDamage(power);
|
||||
print("충돌");
|
||||
|
||||
Destroy(gameObject);
|
||||
return;
|
||||
}
|
||||
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Custom methods
|
||||
|
||||
public void SetPower(float value) => power = value;
|
||||
|
||||
#endregion
|
||||
|
||||
// #region ObjectPool function
|
||||
//
|
||||
// private void DestroyObject() => managedWeaponPool.Release(this);
|
||||
// public void SetManagedPool(IObjectPool<WeaponParticle> pool) => managedWeaponPool = pool;
|
||||
//
|
||||
// #endregion
|
||||
}
|
||||
}
|
11
BlueWater/Assets/02.Scripts/Weapon/WeaponParticle.cs.meta
Normal file
11
BlueWater/Assets/02.Scripts/Weapon/WeaponParticle.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 52a5789acf05f7448942846ed09cac2b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -3043,9 +3043,9 @@ GameObject:
|
||||
- component: {fileID: 2363107829687334772}
|
||||
- component: {fileID: 4358268934212833280}
|
||||
- component: {fileID: 8609741102290131020}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc1
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -3138,7 +3138,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -3211,7 +3211,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &8609741102290131020
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -320,37 +320,6 @@ Transform:
|
||||
- {fileID: 1037157117629966495}
|
||||
m_Father: {fileID: 8304616876847118944}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -30}
|
||||
--- !u!1 &549053786257392620
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7751354673028900355}
|
||||
m_Layer: 0
|
||||
m_Name: ShootPos
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7751354673028900355
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 549053786257392620}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.005, y: 0.431, z: 0.023}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3984402515734150855}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &582608418531650571
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2714,7 +2683,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7751354673028900355}
|
||||
- {fileID: 9194023695376127130}
|
||||
m_Father: {fileID: 5900184285731501723}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &254721607006302599
|
||||
@ -3266,9 +3235,9 @@ GameObject:
|
||||
- component: {fileID: 6930129211153151781}
|
||||
- component: {fileID: -1167329777120027977}
|
||||
- component: {fileID: 9066994917784352948}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc2
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -3361,7 +3330,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -3415,7 +3384,7 @@ MonoBehaviour:
|
||||
parentIndex:
|
||||
startIndex:
|
||||
variableStartIndex:
|
||||
JSONSerialization: '{"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"PropertyMapping":"UnityEngine.RectTransform/gameObject","PropertyMappingOwner":0},{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"AnimatiorObj","IsShared":true,"GameObjectmValue":1},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"MyCollider","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/MyCollider","PropertyMappingOwner":2},{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":"CurrentHp","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/CurrentHp","PropertyMappingOwner":3,"SinglemValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/Target","PropertyMappingOwner":4},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/DefensePos","PropertyMappingOwner":5,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/IsCombated","PropertyMappingOwner":6,"BooleanmValue":false},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/BeAttackedInIdle","PropertyMappingOwner":7,"BooleanmValue":false}]}'
|
||||
JSONSerialization: '{"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"PropertyMapping":"UnityEngine.RectTransform/gameObject","PropertyMappingOwner":0},{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"AnimatiorObj","IsShared":true,"GameObjectmValue":1},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"MyCollider","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/MyCollider","PropertyMappingOwner":2},{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":"CurrentHp","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/CurrentHp","PropertyMappingOwner":3,"SinglemValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/Target","PropertyMappingOwner":4},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/DefensePos","PropertyMappingOwner":5,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/IsCombated","PropertyMappingOwner":6,"BooleanmValue":false},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/BeAttackedInIdle","PropertyMappingOwner":7,"BooleanmValue":false}]}'
|
||||
fieldSerializationData:
|
||||
typeName: []
|
||||
fieldNameHash:
|
||||
@ -3434,7 +3403,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &9066994917784352948
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3539,8 +3508,9 @@ MonoBehaviour:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
fireball: {fileID: 19886636, guid: a1ff23b08e5882f4e8ff8c330ada4386, type: 3}
|
||||
fireballSpd: 10
|
||||
projectileObj: {fileID: 128572, guid: 4b3d82031c676054f915270a45f6077a, type: 3}
|
||||
shootLocation: {fileID: 9194023695376127130}
|
||||
speed: 500
|
||||
--- !u!1 &7383115429890845516
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3936,6 +3906,37 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 7c562f92f3b8b435d98ac3b65547b755, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8158806363816597071
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9194023695376127130}
|
||||
m_Layer: 0
|
||||
m_Name: ShootLocation
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9194023695376127130
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8158806363816597071}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.405, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3984402515734150855}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8238645255014490175
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -758,9 +758,9 @@ GameObject:
|
||||
- component: {fileID: 9108544501445661362}
|
||||
- component: {fileID: -3978147403962440111}
|
||||
- component: {fileID: 6282560669469550846}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc3
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -853,7 +853,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -926,7 +926,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &6282560669469550846
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3487,9 +3487,9 @@ GameObject:
|
||||
- component: {fileID: -7569077258846073743}
|
||||
- component: {fileID: 8496408188159438086}
|
||||
- component: {fileID: 2196957681397011159}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc4
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -3582,7 +3582,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -3655,7 +3655,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &2196957681397011159
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -410,9 +410,9 @@ GameObject:
|
||||
- component: {fileID: 3248850098236749556}
|
||||
- component: {fileID: 7115977468797542756}
|
||||
- component: {fileID: 7393140026034678934}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc5
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -505,7 +505,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -578,7 +578,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &7393140026034678934
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -213,6 +213,37 @@ Transform:
|
||||
- {fileID: 9108805933239421023}
|
||||
m_Father: {fileID: 5530433739977284558}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2075046517657386203
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5356746977973793392}
|
||||
m_Layer: 0
|
||||
m_Name: ShootLocation
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &5356746977973793392
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2075046517657386203}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: 0.012128323, w: 0.9999265}
|
||||
m_LocalPosition: {x: 0.016974181, y: 0.39573348, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1034341967466936821}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2080758280049121561
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1051,6 +1082,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7561651701379936681}
|
||||
- {fileID: 5356746977973793392}
|
||||
m_Father: {fileID: 8164623424710931734}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 60}
|
||||
--- !u!1 &3795753911447661076
|
||||
@ -1352,10 +1384,10 @@ GameObject:
|
||||
- component: {fileID: 3023628112371740998}
|
||||
- component: {fileID: -1896423302456577934}
|
||||
- component: {fileID: 7739119746575726469}
|
||||
- component: {fileID: 2769301904412587808}
|
||||
m_Layer: 10
|
||||
- component: {fileID: 7840501591079286990}
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc6
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -1448,7 +1480,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -1502,7 +1534,7 @@ MonoBehaviour:
|
||||
parentIndex:
|
||||
startIndex:
|
||||
variableStartIndex:
|
||||
JSONSerialization: '{"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"PropertyMapping":"UnityEngine.RectTransform/gameObject","PropertyMappingOwner":0},{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"AnimatiorObj","IsShared":true,"GameObjectmValue":1},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"MyCollider","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/MyCollider","PropertyMappingOwner":2},{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":"CurrentHp","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/CurrentHp","PropertyMappingOwner":3,"SinglemValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/Target","PropertyMappingOwner":4},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/DefensePos","PropertyMappingOwner":5,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/IsCombated","PropertyMappingOwner":6,"BooleanmValue":false},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"PropertyMapping":"BlueWaterProject.Ork/BeAttackedInIdle","PropertyMappingOwner":7,"BooleanmValue":false}]}'
|
||||
JSONSerialization: '{"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"PropertyMapping":"UnityEngine.RectTransform/gameObject","PropertyMappingOwner":0},{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"AnimatiorObj","IsShared":true,"GameObjectmValue":1},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"MyCollider","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/MyCollider","PropertyMappingOwner":2},{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":"CurrentHp","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/CurrentHp","PropertyMappingOwner":3,"SinglemValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/Target","PropertyMappingOwner":4},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/DefensePos","PropertyMappingOwner":5,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/IsCombated","PropertyMappingOwner":6,"BooleanmValue":false},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"PropertyMapping":"BlueWaterProject.MagicOrk/BeAttackedInIdle","PropertyMappingOwner":7,"BooleanmValue":false}]}'
|
||||
fieldSerializationData:
|
||||
typeName: []
|
||||
fieldNameHash:
|
||||
@ -1521,8 +1553,8 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
--- !u!114 &2769301904412587808
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &7840501591079286990
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1531,7 +1563,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 4240854641551087113}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 18b30939275b84144a72670e79cf80f8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 6dbbd3ef8f6ef3a469dc9c9bb3cf1f45, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isDrawGizmos: 1
|
||||
@ -1593,7 +1625,7 @@ MonoBehaviour:
|
||||
<IsDrawHelpCallRange>k__BackingField: 0
|
||||
<HelpLayer>k__BackingField:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1024
|
||||
m_Bits: 8192
|
||||
<HelpCallRange>k__BackingField: 15
|
||||
<HelpTargets>k__BackingField:
|
||||
- {fileID: 0}
|
||||
@ -1626,6 +1658,9 @@ MonoBehaviour:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
projectileObj: {fileID: 128572, guid: 4b3d82031c676054f915270a45f6077a, type: 3}
|
||||
shootLocation: {fileID: 5356746977973793392}
|
||||
speed: 500
|
||||
--- !u!1 &4480335555790412860
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -909,9 +909,9 @@ GameObject:
|
||||
- component: {fileID: -5052296866103006961}
|
||||
- component: {fileID: -6831754298179074086}
|
||||
- component: {fileID: -2084180978215187588}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc7
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -1004,7 +1004,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -1077,7 +1077,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &-2084180978215187588
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1140,9 +1140,9 @@ GameObject:
|
||||
- component: {fileID: 5790331302513465566}
|
||||
- component: {fileID: -4455303350671159704}
|
||||
- component: {fileID: 1132862912683712312}
|
||||
m_Layer: 10
|
||||
m_Layer: 13
|
||||
m_Name: RedOrc8
|
||||
m_TagString: Untagged
|
||||
m_TagString: FieldMinion
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
@ -1235,7 +1235,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.15
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.75
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.3, z: 0}
|
||||
@ -1308,7 +1308,7 @@ MonoBehaviour:
|
||||
byteDataArray:
|
||||
Version: 1.7.7
|
||||
gizmoViewMode: 2
|
||||
showBehaviorDesignerGizmo: 1
|
||||
showBehaviorDesignerGizmo: 0
|
||||
--- !u!114 &1132862912683712312
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
8
BlueWater/Assets/05.Prefabs/Weapon/OrkFireball.meta
Normal file
8
BlueWater/Assets/05.Prefabs/Weapon/OrkFireball.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c8b5e44253a72e74dba0ddc37c9b14c1
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a1ff23b08e5882f4e8ff8c330ada4386
|
||||
guid: 0b788a608fab3b049abb2c09688337c8
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
@ -0,0 +1,108 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &128572
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 450904}
|
||||
- component: {fileID: 13576440}
|
||||
- component: {fileID: 5479992}
|
||||
- component: {fileID: 11464288}
|
||||
m_Layer: 0
|
||||
m_Name: FireBallSoftBlueOBJ
|
||||
m_TagString: Missile
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &450904
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 128572}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 8.313633, y: 5.892903, z: -13.319157}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &13576440
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 128572}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.15
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &5479992
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 128572}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 1
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &11464288
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 128572}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: acd27932048c3254597a02078fa2cb26, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
impactParticle: {fileID: 1564713908722058, guid: 0b788a608fab3b049abb2c09688337c8,
|
||||
type: 3}
|
||||
projectileParticle: {fileID: 1438618567075492, guid: 4696ed6d640794642b1c01af68444200,
|
||||
type: 3}
|
||||
muzzleParticle: {fileID: 1458448907343064, guid: bc4155e80a221c446be915ff0332c546,
|
||||
type: 3}
|
||||
colliderRadius: 0.1
|
||||
collideOffset: 0.1
|
||||
targetLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1536
|
||||
power: 0
|
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4b3d82031c676054f915270a45f6077a
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4696ed6d640794642b1c01af68444200
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bc4155e80a221c446be915ff0332c546
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,5 +1,6 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using BlueWaterProject;
|
||||
|
||||
namespace EpicToonFX
|
||||
{
|
||||
@ -13,6 +14,9 @@ namespace EpicToonFX
|
||||
[Range(0f, 1f)] // This is an offset that moves the impact effect slightly away from the point of impact to reduce clipping of the impact effect
|
||||
public float collideOffset = 0.15f;
|
||||
|
||||
public LayerMask targetLayer;
|
||||
public float power;
|
||||
|
||||
void Start()
|
||||
{
|
||||
projectileParticle = Instantiate(projectileParticle, transform.position, transform.rotation) as GameObject;
|
||||
@ -46,7 +50,7 @@ namespace EpicToonFX
|
||||
|
||||
float detectionDistance = transform.GetComponent<Rigidbody>().velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame
|
||||
|
||||
if (Physics.SphereCast(transform.position, radius, direction, out hit, detectionDistance)) // Checks if collision will happen
|
||||
if (Physics.SphereCast(transform.position, radius, direction, out hit, detectionDistance, targetLayer)) // Checks if collision will happen
|
||||
{
|
||||
transform.position = hit.point + (hit.normal * collideOffset); // Move projectile to point of collision
|
||||
|
||||
@ -68,6 +72,8 @@ namespace EpicToonFX
|
||||
Destroy(projectileParticle, 3f); // Removes particle effect after delay
|
||||
Destroy(impactP, 3.5f); // Removes impact effect after delay
|
||||
Destroy(gameObject); // Removes the projectile
|
||||
|
||||
hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,14 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 560a88da2bbc70140bed167f0ba7fe37
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 254677
|
||||
packageName: Text Animator for Unity
|
||||
packageVersion: 2.0.2
|
||||
assetPath: Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage
|
||||
uploadId: 605767
|
@ -1,14 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fb01be13d6e88ca488dda82150319bfc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 254677
|
||||
packageName: Text Animator for Unity
|
||||
packageVersion: 2.0.2
|
||||
assetPath: Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage
|
||||
uploadId: 605767
|
@ -1,15 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 117dcc671050f5247bd8743b91ecaab7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 254677
|
||||
packageName: Text Animator for Unity
|
||||
packageVersion: 2.0.2
|
||||
assetPath: Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting -
|
||||
Integration.unitypackage
|
||||
uploadId: 605767
|
@ -3586,6 +3586,13 @@ AnimationClip:
|
||||
floatParameter: 0
|
||||
intParameter: 1
|
||||
messageOptions: 0
|
||||
- time: 0.25
|
||||
functionName: AttackTiming
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
- time: 0.41666666
|
||||
functionName: SetIsAttacking
|
||||
data:
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -35,76 +35,6 @@
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "experimental.enabled",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.toolbarIconGUI",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.showEditorNotifications",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.showSceneInfo",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.stripProBuilderScriptsOnBuild",
|
||||
"value": "{\"m_Value\":true}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.autoRecalculateCollisions",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "mesh.meshColliderIsConvex",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "mesh.newShapesSnapToGrid",
|
||||
"value": "{\"m_Value\":true}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "lightmapping.defaultLightmapUnwrapParameters",
|
||||
"value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}"
|
||||
},
|
||||
{
|
||||
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "uv.uvEditorGridSnapIncrement",
|
||||
"value": "{\"m_Value\":0.125}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.userMaterial",
|
||||
"value": "{\"m_Value\":{\"instanceID\":0}}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.defaultStaticEditorFlags",
|
||||
"value": "{\"m_Value\":0}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.newShapePivotLocation",
|
||||
"value": "{\"m_Value\":1}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.shadowCastingMode",
|
||||
"value": "{\"m_Value\":1}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.newShapeColliderType",
|
||||
"value": "{\"m_Value\":2}"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -3,7 +3,14 @@
|
||||
--- !u!78 &1
|
||||
TagManager:
|
||||
serializedVersion: 2
|
||||
tags: []
|
||||
tags:
|
||||
- Missile
|
||||
- Ground
|
||||
- Tower
|
||||
- InIslandPlayer
|
||||
- CombatCrewmate
|
||||
- FieldMinion
|
||||
- FieldBoss
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
|
Loading…
Reference in New Issue
Block a user