diff --git a/Assets/Thread.prefab b/Assets/Thread.prefab index 9a57f59..4054754 100644 --- a/Assets/Thread.prefab +++ b/Assets/Thread.prefab @@ -29,7 +29,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 83.62, y: -8.22, z: -7.05} - m_LocalScale: {x: 7, y: 7, z: 7} + m_LocalScale: {x: 12, y: 12, z: 12} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/_Scenes/BossStage.unity b/Assets/_Scenes/BossStage.unity index 212bca8..be55244 100644 --- a/Assets/_Scenes/BossStage.unity +++ b/Assets/_Scenes/BossStage.unity @@ -145,7 +145,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: 102.555145 + value: 80.55 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -153,7 +153,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.z - value: 34.26478 + value: 25.76 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.w @@ -215,7 +215,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalPosition.x - value: 108.4 + value: 101.18 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalPosition.y @@ -223,7 +223,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalPosition.z - value: 58.29 + value: 62.18 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalRotation.w @@ -700,12 +700,13 @@ MonoBehaviour: k__BackingField: 5 ceilingAnchor: {fileID: 1626958826} groundAnchor: {fileID: 1519524653} - k__BackingField: 10 + k__BackingField: 30 k__BackingField: 5 k__BackingField: 8 k__BackingField: 0.2 k__BackingField: 0.8 - k__BackingField: 3 + k__BackingField: 10 + k__BackingField: 2.5 warningMarkerPrefab: {fileID: 4416133559060049660, guid: bbba2f965a48a1f41aa3aa75745eafc0, type: 3} webPrefab: {fileID: 7127456385706922585, guid: 6cee7cb816e34c1478e31e98e258a22a, type: 3} --- !u!195 &139010308 @@ -1589,11 +1590,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 60.58514 + value: 40.8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y - value: 30.174751 + value: 21.1 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.z @@ -1659,11 +1660,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalScale.z - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: -15.8 + value: -2.3648567 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -1671,11 +1672,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.z - value: -60.535217 + value: -57.9 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.w - value: 0.98599327 + value: 0.9455186 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.x @@ -1683,7 +1684,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.y - value: 0.16678526 + value: 0.32556805 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.z @@ -1695,7 +1696,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 19.202 + value: 38 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -1946,7 +1947,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.z - value: 31.8 + value: 21.04 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.w @@ -2090,7 +2091,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalPosition.z - value: -54.2 + value: -45.49 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalRotation.w @@ -2242,7 +2243,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 121.48514 + value: 100.2 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y @@ -2474,7 +2475,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalPosition.x - value: 152.42 + value: 127.3 objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalPosition.y @@ -2486,7 +2487,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalRotation.w - value: 0.904105 + value: 0.9484926 objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalRotation.x @@ -2494,7 +2495,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalRotation.y - value: 0.4273104 + value: 0.3167995 objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalRotation.z @@ -2506,7 +2507,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 50.594 + value: 36.939 objectReference: {fileID: 0} - target: {fileID: 7381026132218615509, guid: 6ae681f7302880d4c880f0d3c06f4459, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -2548,7 +2549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7800531689008218332, guid: 129cd1571416ef9439076e67e91502d1, type: 3} propertyPath: m_LocalPosition.x - value: 150.24 + value: 126.33 objectReference: {fileID: 0} - target: {fileID: 7800531689008218332, guid: 129cd1571416ef9439076e67e91502d1, type: 3} propertyPath: m_LocalPosition.y @@ -2556,7 +2557,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7800531689008218332, guid: 129cd1571416ef9439076e67e91502d1, type: 3} propertyPath: m_LocalPosition.z - value: -41.64 + value: -27.87 objectReference: {fileID: 0} - target: {fileID: 7800531689008218332, guid: 129cd1571416ef9439076e67e91502d1, type: 3} propertyPath: m_LocalRotation.w @@ -3227,6 +3228,10 @@ PrefabInstance: propertyPath: m_Name value: rock4 (13) objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalScale.x value: 15 @@ -3603,7 +3608,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2293669797296705486, guid: 5c41c6baf722cc1478511f65e03e5be5, type: 3} propertyPath: m_LocalPosition.x - value: 56.44 + value: 50.81 objectReference: {fileID: 0} - target: {fileID: 2293669797296705486, guid: 5c41c6baf722cc1478511f65e03e5be5, type: 3} propertyPath: m_LocalPosition.y @@ -3611,7 +3616,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2293669797296705486, guid: 5c41c6baf722cc1478511f65e03e5be5, type: 3} propertyPath: m_LocalPosition.z - value: 46.28 + value: 37.1 objectReference: {fileID: 0} - target: {fileID: 2293669797296705486, guid: 5c41c6baf722cc1478511f65e03e5be5, type: 3} propertyPath: m_LocalRotation.w @@ -3743,7 +3748,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 104.555145 + value: 83.54 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y @@ -3751,7 +3756,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.z - value: -26.535221 + value: -25.13 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalRotation.w @@ -3883,7 +3888,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: -35.21486 + value: -28.17 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y @@ -4496,11 +4501,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 62.40514 + value: 64.53 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y - value: 18.25475 + value: 30.3 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.z @@ -4651,7 +4656,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.z - value: 41.63478 + value: 29.48 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalRotation.w @@ -4705,7 +4710,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1030989063, guid: abc00000000014917668085838676610, type: 3} propertyPath: m_LocalScale.x - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1030989063, guid: abc00000000014917668085838676610, type: 3} propertyPath: m_LocalScale.y @@ -4713,11 +4718,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1030989063, guid: abc00000000014917668085838676610, type: 3} propertyPath: m_LocalScale.z - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1030989063, guid: abc00000000014917668085838676610, type: 3} propertyPath: m_LocalPosition.x - value: 79.7 + value: 87.7 objectReference: {fileID: 0} - target: {fileID: 1030989063, guid: abc00000000014917668085838676610, type: 3} propertyPath: m_LocalPosition.y @@ -4914,7 +4919,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: 94.085144 + value: 69.83 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -4922,7 +4927,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.z - value: -65.53522 + value: -53.81 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.w @@ -4988,7 +4993,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: 103.98514 + value: 82.4 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -4996,7 +5001,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.z - value: -76.63522 + value: -47.58 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalRotation.w @@ -5781,6 +5786,10 @@ PrefabInstance: propertyPath: m_Name value: rock4 (11) objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalScale.x value: 15 @@ -5795,15 +5804,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 114.00514 + value: 138.8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y - value: 23.87475 + value: 12 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.z - value: -57.33522 + value: -80.4 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalRotation.w @@ -6261,7 +6270,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 23.285145 + value: 11.3 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y @@ -6447,7 +6456,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.x - value: 121.48514 + value: 95.92 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.y @@ -6521,7 +6530,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: 96.545135 + value: 73.64 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -6907,7 +6916,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: 52.48514 + value: 44.8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -6977,7 +6986,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalPosition.x - value: 160.69 + value: 137.92 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalPosition.y @@ -6989,31 +6998,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalRotation.w - value: 0.58637244 + value: 0.5763528 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0.14910994 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalRotation.y - value: 0.81004155 + value: 0.79619926 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.10793769 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 20.106 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 108.2 + value: 109.427 objectReference: {fileID: 0} - target: {fileID: 1077043634566485173, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 6.913 objectReference: {fileID: 0} - target: {fileID: 1458160364811997277, guid: cb54601bec56a2c47b6032cdacd32e60, type: 3} propertyPath: m_Name @@ -7323,23 +7332,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalScale.x - value: 30 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalScale.y - value: 30 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalScale.z - value: 30 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalPosition.x - value: 158.65 + value: 135.35 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalPosition.y - value: 14.12 + value: 21.11 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalPosition.z @@ -7347,31 +7356,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.50467855 + value: 0.39200762 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalRotation.x - value: 0.44750485 + value: 0.54886633 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalRotation.y - value: 0.5523846 + value: 0.4282176 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalRotation.z - value: 0.48980644 + value: 0.6014196 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -5.131 + value: -4.862 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90.62 + value: 88.231 objectReference: {fileID: 0} - target: {fileID: 8247934736652583955, guid: 1da579bc30f41054eac61ecca254cd6b, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 83.1 + value: 109.093 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -7409,7 +7418,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 24be8e1643b8a474fbb57fcda8a1c454, type: 3} propertyPath: m_LocalPosition.x - value: 71.94225 + value: 68.3 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 24be8e1643b8a474fbb57fcda8a1c454, type: 3} propertyPath: m_LocalPosition.y @@ -7543,6 +7552,10 @@ PrefabInstance: propertyPath: m_Name value: cliff (9) objectReference: {fileID: 0} + - target: {fileID: 100000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalScale.x value: 10 @@ -7557,7 +7570,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.x - value: 116.88513 + value: 100.67 objectReference: {fileID: 0} - target: {fileID: 400000, guid: d9d1fbfcf69364ffd8f9c6ade9ce90fe, type: 3} propertyPath: m_LocalPosition.y @@ -7823,6 +7836,10 @@ PrefabInstance: propertyPath: m_Name value: rock4 (12) objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalScale.x value: 15 @@ -7845,7 +7862,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalPosition.z - value: -86.33522 + value: -78.35 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 84376f2a0948947b5a6dfe814a1100a0, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/_Scenes/BossStage/NavMesh-SM_Building_Floor.asset b/Assets/_Scenes/BossStage/NavMesh-SM_Building_Floor.asset index ced76df..3bfa0fc 100644 Binary files a/Assets/_Scenes/BossStage/NavMesh-SM_Building_Floor.asset and b/Assets/_Scenes/BossStage/NavMesh-SM_Building_Floor.asset differ diff --git a/Assets/_Scripts/BossController.cs b/Assets/_Scripts/BossController.cs index 4332baa..ffa4f78 100644 --- a/Assets/_Scripts/BossController.cs +++ b/Assets/_Scripts/BossController.cs @@ -19,18 +19,18 @@ public class BossController : MonoBehaviour, IDamageble [SerializeField] public Transform ceilingAnchor; [SerializeField] public Transform groundAnchor; - [field: SerializeField] public float AttackRadius { get; private set; } = 10f; - [field: SerializeField] public float JumpRoarDuration { get; private set; } = 5f; + [field: SerializeField] public float AttackRadius { get; private set; } = 15f; + [field: SerializeField] public float JumpRoarDuration { get; private set; } = 2f; [field: SerializeField] public float CeilingAttackDuration { get; private set; } = 8.0f; - - [Tooltip("★新設:糸を降らせる時間間隔(秒)。数値を小さくする(例: 0.1)ほど弾数が激増して密度が上がります")] [field: SerializeField] public float CeilingShotInterval { get; private set; } = 0.2f; - - [Tooltip("★新設:地面に赤マーク(予兆)が出てから、本物の糸が降ってくるまでのタイムラグ(秒)")] [field: SerializeField] public float WebWarningDelay { get; private set; } = 0.8f; - - [Tooltip("★新設:地面に生成された糸が消えずに残り続ける時間(秒)")] [field: SerializeField] public float WebDuration { get; private set; } = 3.0f; + + [Tooltip("★新設:すでに糸がある場所から、最低何メートル離すか(被り防止の半径)")] + [field: SerializeField] public float WebAvoidanceRadius { get; private set; } = 2.5f; + + // ★新設:現在ステージ上に存在している(または予兆がある)糸の座標リスト + public List ActiveWebPositions { get; private set; } = new List(); [SerializeField] private GameObject warningMarkerPrefab; [SerializeField] private GameObject webPrefab; @@ -163,6 +163,10 @@ public class BossController : MonoBehaviour, IDamageble private System.Collections.IEnumerator SpawnWebRoutine(Vector3 pos, float delay, float duration) { + // 1. 生成する座標をアクティブリストに登録(この場所への他の割り込みを禁止する) + ActiveWebPositions.Add(pos); + + // 2. 地面に予兆マークを生成 GameObject marker = null; if (warningMarkerPrefab != null) { @@ -172,14 +176,23 @@ public class BossController : MonoBehaviour, IDamageble yield return new WaitForSeconds(delay); if (marker != null) Destroy(marker); + // 3. 本物の糸オブジェクトを生成(X軸90度回転) if (webPrefab != null) { Quaternion webRotation = Quaternion.Euler(270f, 0f, 0f); - GameObject web = Instantiate(webPrefab, pos + new Vector3(0, 0.5f, 0), webRotation); - - Destroy(web, duration); + + // ★持続時間(duration)が終わるまで待機してからDestroyする形に変更 + yield return new WaitForSeconds(duration); + if (web != null) Destroy(web); } + else + { + yield return new WaitForSeconds(duration); + } + + // 4. 糸が消滅したので、リストから座標を削除してスペースを解放する + ActiveWebPositions.Remove(pos); } public void ResetAllAnimationTriggers() diff --git a/Assets/_Scripts/SpiderIdleState.cs b/Assets/_Scripts/SpiderIdleState.cs index 18b7eca..51c86cb 100644 --- a/Assets/_Scripts/SpiderIdleState.cs +++ b/Assets/_Scripts/SpiderIdleState.cs @@ -265,17 +265,41 @@ public class SpiderCeilingAttackState : SpiderStateBase } } - private void ExecuteRandomWebAttack() + private void ExecuteRandomWebAttack() { - // インスペクターで設定された半径(AttackRadius)を基準にランダム座標を計算 - Vector2 randomCircle = Random.insideUnitCircle * boss.AttackRadius; - Vector3 targetGroundPos = new Vector3( - boss.groundAnchor.position.x + randomCircle.x, - boss.groundAnchor.position.y, - boss.groundAnchor.position.z + randomCircle.y - ); + Vector3 targetGroundPos = Vector3.zero; + int maxAttempts = 15; // 無限ループ(フリーズ)を防止するための最大再抽選回数 + + for (int i = 0; i < maxAttempts; i++) + { + // 1. 一旦ランダムな座標を算出 + Vector2 randomCircle = Random.insideUnitCircle * boss.AttackRadius; + targetGroundPos = new Vector3( + boss.groundAnchor.position.x + randomCircle.x, + boss.groundAnchor.position.y, + boss.groundAnchor.position.z + randomCircle.y + ); - // ★リファクタリング:予兆マークのディレイや糸の生存時間もインスペクターと完全連動 + // 2. 現在アクティブなすべての糸との距離を計測する + bool isTooClose = false; + foreach (Vector3 existingPos in boss.ActiveWebPositions) + { + // 設定された回避半径(WebAvoidanceRadius)より近い既存の糸があるか? + if (Vector3.Distance(targetGroundPos, existingPos) < boss.WebAvoidanceRadius) + { + isTooClose = true; + break; // 被り検知、この座標は使えないのでチェックを抜けて再抽選へ + } + } + + // 3. 誰とも被っていなければ、このクリーンな座標で確定 + if (!isTooClose) + { + break; + } + } + + // 確定した(または上限に達して安全が担保された)座標へ向けて発射命令 boss.SpawnWarningAndWeb(targetGroundPos, boss.WebWarningDelay, boss.WebDuration); } }