diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index b979dba..6fad837 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx index 1859930..9c3046b 100644 --- a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx index 9da7eac..cbea38c 100644 --- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx Binary files differ diff --git a/DungeonShooting_Godot/resource/config/Weapon.json b/DungeonShooting_Godot/resource/config/Weapon.json index 8354ff8..afa027f 100644 --- a/DungeonShooting_Godot/resource/config/Weapon.json +++ b/DungeonShooting_Godot/resource/config/Weapon.json @@ -140,7 +140,7 @@ "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.5, - "AiBulletSpeedScale": 0.6, + "AiBulletSpeedScale": 0.5, "AiAmmoConsumptionProbability": 0 }, { @@ -284,7 +284,7 @@ "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.4, - "AiBulletSpeedScale": 0.6, + "AiBulletSpeedScale": 0.5, "AiAmmoConsumptionProbability": 0 }, { @@ -428,7 +428,7 @@ "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 1, - "AiBulletSpeedScale": 0.6, + "AiBulletSpeedScale": 0.5, "AiAmmoConsumptionProbability": 0 }, { @@ -572,7 +572,7 @@ "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.7, - "AiBulletSpeedScale": 0.6, + "AiBulletSpeedScale": 0.5, "AiAmmoConsumptionProbability": 0 }, { @@ -642,9 +642,81 @@ "__BeLoadedSound": "beLoaded0007", "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, + "__AiUseAttribute": "0010", + "AiTargetLockingTime": 0, + "AiBulletSpeedScale": 0, + "AiAmmoConsumptionProbability": 0 + }, + { + "Id": "0010", + "WeaponId": "", + "Name": "\u72D9\u51FB\u67AA", + "Icon": "res://resource/sprite/gun/gun4.png", + "Weight": 50, + "WeightType": 2, + "ContinuousShoot": false, + "AmmoCapacity": 10, + "MaxAmmoCapacity": 50, + "StandbyAmmoCapacity": 40, + "ReloadTime": 3, + "AloneReload": false, + "AloneReloadCount": 1, + "AloneReloadBeginIntervalTime": 0, + "AloneReloadFinishIntervalTime": 0, + "AloneReloadCanShoot": false, + "LooseShoot": false, + "MinChargeTime": 0, + "AutoBeLoaded": false, + "BeLoadedTime": 0.9, + "MinContinuousCount": 1, + "MaxContinuousCount": 1, + "TriggerInterval": 5, + "StartFiringSpeed": 150, + "FinalFiringSpeed": 150, + "FiringSpeedAddSpeed": 0, + "FiringSpeedBackSpeed": 0, + "MinFireBulletCount": 1, + "MaxFireBulletCount": 1, + "DelayedTime": 0, + "StartScatteringRange": 3, + "FinalScatteringRange": 60, + "ScatteringRangeAddValue": 40, + "ScatteringRangeBackSpeed": 40, + "ScatteringRangeBackDelayTime": 0.8, + "MinBacklash": 5, + "MaxBacklash": 7, + "BacklashRegressionSpeed": 20, + "UpliftAngle": 15, + "DefaultAngle": 0, + "UpliftAngleRestore": 1, + "BulletId": "bullet0001", + "BulletMaxHarm": 30, + "BulletMinHarm": 30, + "BulletMinDeviationAngle": 0, + "BulletMaxDeviationAngle": 0, + "BulletMaxSpeed": 600, + "BulletMinSpeed": 600, + "BulletMinDistance": 700, + "BulletMaxDistance": 900, + "ShellId": "shell0003", + "ThrowShellDelayTime": 0.2, + "ThrowCollisionSize": { + "X": 20, + "Y": 15 + }, + "__ShootSound": "shooting0008", + "__BeginReloadSound": "reloadBegin0009", + "BeginReloadSoundDelayTime": 0, + "__ReloadSound": "", + "ReloadSoundDelayTime": 0, + "__ReloadFinishSound": "beLoaded0007", + "ReloadFinishSoundAdvanceTime": 1, + "__BeLoadedSound": "beLoaded0007", + "BeLoadedSoundDelayTime": 0, + "__OtherSoundMap": null, "__AiUseAttribute": "", - "AiTargetLockingTime": 0.6, - "AiBulletSpeedScale": 0.6, + "AiTargetLockingTime": 1.5, + "AiBulletSpeedScale": 0.5, "AiAmmoConsumptionProbability": 0 }, { @@ -714,9 +786,81 @@ "__BeLoadedSound": "", "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, + "__AiUseAttribute": "0012", + "AiTargetLockingTime": 0, + "AiBulletSpeedScale": 0, + "AiAmmoConsumptionProbability": 0 + }, + { + "Id": "0012", + "WeaponId": "", + "Name": "\u51B2\u950B\u67AA", + "Icon": "res://resource/sprite/gun/gun4.png", + "Weight": 30, + "WeightType": 2, + "ContinuousShoot": false, + "AmmoCapacity": 20, + "MaxAmmoCapacity": 2600, + "StandbyAmmoCapacity": 2600, + "ReloadTime": 2.2, + "AloneReload": false, + "AloneReloadCount": 1, + "AloneReloadBeginIntervalTime": 0, + "AloneReloadFinishIntervalTime": 0, + "AloneReloadCanShoot": false, + "LooseShoot": false, + "MinChargeTime": 0, + "AutoBeLoaded": true, + "BeLoadedTime": 0.05, + "MinContinuousCount": 5, + "MaxContinuousCount": 5, + "TriggerInterval": 3.5, + "StartFiringSpeed": 700, + "FinalFiringSpeed": 700, + "FiringSpeedAddSpeed": 0, + "FiringSpeedBackSpeed": 0, + "MinFireBulletCount": 1, + "MaxFireBulletCount": 1, + "DelayedTime": 0, + "StartScatteringRange": 3, + "FinalScatteringRange": 40, + "ScatteringRangeAddValue": 2, + "ScatteringRangeBackSpeed": 40, + "ScatteringRangeBackDelayTime": 0.3, + "MinBacklash": 1, + "MaxBacklash": 2, + "BacklashRegressionSpeed": 35, + "UpliftAngle": 5, + "DefaultAngle": 0, + "UpliftAngleRestore": 1, + "BulletId": "bullet0002", + "BulletMaxHarm": 3, + "BulletMinHarm": 3, + "BulletMinDeviationAngle": 0, + "BulletMaxDeviationAngle": 0, + "BulletMaxSpeed": 320, + "BulletMinSpeed": 320, + "BulletMinDistance": 300, + "BulletMaxDistance": 400, + "ShellId": "shell0001", + "ThrowShellDelayTime": 0, + "ThrowCollisionSize": { + "X": 20, + "Y": 15 + }, + "__ShootSound": "shooting0002", + "__BeginReloadSound": "reloadBegin0005", + "BeginReloadSoundDelayTime": 0.2, + "__ReloadSound": "", + "ReloadSoundDelayTime": 0, + "__ReloadFinishSound": "beLoaded0016", + "ReloadFinishSoundAdvanceTime": 0.5, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, + "__OtherSoundMap": null, "__AiUseAttribute": "", "AiTargetLockingTime": 0.5, - "AiBulletSpeedScale": 0.6, + "AiBulletSpeedScale": 0.5, "AiAmmoConsumptionProbability": 0 } ] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/RoomConfig.json b/DungeonShooting_Godot/resource/map/RoomConfig.json index db72572..785217d 100644 --- a/DungeonShooting_Godot/resource/map/RoomConfig.json +++ b/DungeonShooting_Godot/resource/map/RoomConfig.json @@ -7,6 +7,18 @@ "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room1.json" }, { + "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room2.tscn", + "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room2.json" + }, + { + "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room3.tscn", + "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room3.json" + }, + { + "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room4.tscn", + "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room4.json" + }, + { "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room8.tscn", "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room8.json" } diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn index 0c61620..34a463c 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room1.tscn @@ -35,7 +35,7 @@ position = Vector2(115, 24) script = ExtResource("4_vkqhy") Type = 5 -ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:10)" +ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:12)" DelayTime = 2.0 BirthRect = Vector2i(50, 50) @@ -43,7 +43,7 @@ position = Vector2(116, -39) script = ExtResource("4_vkqhy") Type = 5 -ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:10)" +ItemExpression = "0003(ResidueAmmo:6,CurrAmmon:12)" WaveNumber = 2 BirthRect = Vector2i(50, 50) @@ -73,7 +73,7 @@ position = Vector2(117, 70) script = ExtResource("4_vkqhy") Type = 5 -ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:10)" +ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:7)" WaveNumber = 3 BirthRect = Vector2i(50, 50) @@ -81,7 +81,7 @@ position = Vector2(221, -27) script = ExtResource("4_vkqhy") Type = 5 -ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:10)" +ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:7)" WaveNumber = 3 BirthRect = Vector2i(50, 50) @@ -121,7 +121,7 @@ [node name="EnemyMark8" type="Node2D" parent="."] position = Vector2(118, 16) script = ExtResource("3_68nmn") -Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:10)" +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" Type = 4 ItemExpression = "0001" Layer = 1 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn new file mode 100644 index 0000000..a9c17b4 --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room2.tscn @@ -0,0 +1,163 @@ +[gd_scene load_steps=4 format=3 uid="uid://bnlsfk3dahtos"] + +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_ar45p"] +[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_v71xh"] +[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"] + +[node name="Room2" type="TileMap"] +tile_set = ExtResource("1_ar45p") +format = 2 +layer_0/tile_data = PackedInt32Array(131079, 0, 8, 65543, 0, 8, 7, 0, 8, -65529, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, 393219, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, -65533, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, -65534, 0, 8, 393217, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, -65535, 0, 8, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, -65536, 0, 8, 458751, 0, 8, 393215, 0, 8, 327679, 0, 8, 262143, 0, 8, 196607, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, -65538, 0, 8, -65537, 0, 8, 131069, 0, 8, 196605, 0, 8, 262141, 0, 8, 327677, 0, 8, 524287, 0, 8, -131072, 0, 8, 458752, 0, 8, -131071, 0, 8, -131070, 0, 8, -131069, 0, 8, -131068, 0, 8, -131067, 0, 8, -131066, 0, 8, -131065, 0, 8, -65528, 0, 8, 8, 0, 8, -131064, 0, 8, 65544, 0, 8, 131080, 0, 8, 1048600, 0, 8, 983064, 0, 8, 917528, 0, 8, 851992, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 851991, 0, 8, 1048598, 0, 8, 983062, 0, 8, 917526, 0, 8, 851990, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 65557, 0, 8, 21, 0, 8, -65515, 0, 8, -131051, 0, 8, -196587, 0, 8, -262123, 0, 8, -327659, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 458772, 0, 8, 65556, 0, 8, 20, 0, 8, -65516, 0, 8, -131052, 0, 8, -196588, 0, 8, -262124, 0, 8, -327660, 0, 8, 1048595, 0, 8, 983059, 0, 8, 917523, 0, 8, 851987, 0, 8, 786451, 0, 8, 720915, 0, 8, 655379, 0, 8, 589843, 0, 8, 524307, 0, 8, 458771, 0, 8, 65555, 0, 8, 19, 0, 8, -65517, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -327661, 0, 8, 1048594, 0, 8, 983058, 0, 8, 917522, 0, 8, 851986, 0, 8, 786450, 0, 8, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 458770, 0, 8, 65554, 0, 8, 18, 0, 8, -65518, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -327662, 0, 8, 1048593, 0, 8, 983057, 0, 8, 917521, 0, 8, 851985, 0, 8, 786449, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 458769, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -327663, 0, 8, 1048592, 0, 8, 983056, 0, 8, 917520, 0, 8, 851984, 0, 8, 786448, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, -131056, 0, 8, -196592, 0, 8, -262128, 0, 8, -327664, 0, 8, 1048591, 0, 8, 983055, 0, 8, 917519, 0, 8, 851983, 0, 8, 786447, 0, 8, 720911, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, -131057, 0, 8, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, 1048590, 0, 8, 983054, 0, 8, 917518, 0, 8, 851982, 0, 8, 786446, 0, 8, 720910, 0, 8, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, -65522, 0, 8, -131058, 0, 8, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, 1048589, 0, 8, 983053, 0, 8, 917517, 0, 8, 851981, 0, 8, 786445, 0, 8, 720909, 0, 8, 655373, 0, 8, 589837, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 1048588, 0, 8, 983052, 0, 8, 917516, 0, 8, 851980, 0, 8, 786444, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 327692, 0, 8, 262156, 0, 8, 196620, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, 1048587, 0, 8, 983051, 0, 8, 917515, 0, 8, 851979, 0, 8, 786443, 0, 8, 720907, 0, 8, 655371, 0, 8, 589835, 0, 8, 524299, 0, 8, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 262155, 0, 8, 196619, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, -65525, 0, 8, -131061, 0, 8, -196597, 0, 8, -262133, 0, 8, -327669, 0, 8, 786442, 0, 8, 720906, 0, 8, 655370, 0, 8, 589834, 0, 8, 524298, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 262154, 0, 8, 196618, 0, 8, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, -65526, 0, 8, -131062, 0, 8, -196598, 0, 8, -262134, 0, 8, -327670, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 131081, 0, 8, 65545, 0, 8, 9, 0, 8, -65527, 0, 8, -131063, 0, 8, -196599, 0, 8, -262135, 0, 8, -327671, 0, 8, 786440, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 524296, 0, 8, -196600, 0, 8, -262136, 0, 8, -327672, 0, 8, 786439, 0, 8, 720903, 0, 8, 655367, 0, 8, 589831, 0, 8, 524295, 0, 8, -196601, 0, 8, -262137, 0, 8, -327673, 0, 8, 786438, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, -196602, 0, 8, -262138, 0, 8, -327674, 0, 8, -196603, 0, 8, -262139, 0, 8, -327675, 0, 8, -196604, 0, 8, -262140, 0, 8, -327676, 0, 8, 1048576, 0, 8, 983040, 0, 8, 917504, 0, 8, 851968, 0, 8, 786432, 0, 8, 720896, 0, 8, 655360, 0, 8, 589824, 0, 8, 524288, 0, 8, 1114111, 0, 8, 1048575, 0, 8, 983039, 0, 8, 917503, 0, 8, 851967, 0, 8, 786431, 0, 8, 720895, 0, 8, 655359, 0, 8, 589823, 0, 8, 1114110, 0, 8, 1048574, 0, 8, 983038, 0, 8, 917502, 0, 8, 851966, 0, 8, 786430, 0, 8, 1114109, 0, 8, 1048573, 0, 8, 983037, 0, 8, 917501, 0, 8, 851965, 0, 8, 786429, 0, 8, 1114108, 0, 8, 1048572, 0, 8, 983036, 0, 8, 917500, 0, 8, 851964, 0, 8, 786428, 0, 8, 327676, 0, 8, 262140, 0, 8, 196604, 0, 8, 131068, 0, 8, 65532, 0, 8, -4, 0, 8, -65540, 0, 8, -65541, 196608, 3, -5, 196608, 3, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 786427, 196608, 3, 851963, 196608, 3, 917499, 196608, 3, 983035, 196608, 3, 1048571, 196608, 3, 1114107, 196608, 3, 1179645, 131072, 2, 1179644, 131072, 2, 1179643, 720896, 2, 1179646, 131072, 2, 1179647, 131072, 2, 1114112, 131072, 2, -393212, 131072, 7, -393211, 131072, 7, -393210, 131072, 7, -393209, 131072, 7, -393208, 131072, 7, -393207, 131072, 7, -393206, 131072, 7, -393205, 131072, 7, 1114123, 131072, 2, -393204, 131072, 7, 1114124, 131072, 2, -393203, 131072, 7, 1114125, 131072, 2, -393202, 131072, 7, 1114126, 131072, 2, -393201, 131072, 7, 1114127, 131072, 2, -393200, 131072, 7, 1114128, 131072, 2, -393199, 131072, 7, 1114129, 131072, 2, -393198, 131072, 7, 1114130, 131072, 2, -393197, 131072, 7, 1114131, 131072, 2, -393196, 131072, 7, 1114132, 131072, 2, -393195, 131072, 7, 1114133, 131072, 2, 1114134, 131072, 2, 1114135, 131072, 2, 1114136, 131072, 2, 851993, 65536, 3, 917529, 65536, 3, 983065, 65536, 3, 1048601, 65536, 3, 1114137, 851968, 2, 786437, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 786436, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 786435, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 1114114, 131072, 2, 1048578, 0, 8, 983042, 0, 8, 917506, 0, 8, 851970, 0, 8, 786434, 0, 8, 720898, 0, 8, 655362, 0, 8, 589826, 0, 8, 524290, 0, 8, 458754, 0, 8, 1114113, 131072, 2, 1048577, 0, 8, 983041, 0, 8, 917505, 0, 8, 851969, 0, 8, 786433, 0, 8, 720897, 0, 8, 655361, 0, 8, 589825, 0, 8, 524289, 0, 8, 458753, 0, 8, 65558, 65536, 3, 458774, 65536, 3, 131088, 65536, 2, 131089, 131072, 2, 131090, 131072, 2, 131091, 131072, 2, 131092, 131072, 2, 131093, 131072, 2, -65514, 65536, 3, 22, 65536, 3, -131050, 65536, 3, 131094, 851968, 2, -327658, 65536, 3, -262122, 65536, 3, -393194, 65536, 4, -196586, 65536, 3, 196624, 65536, 3, 262160, 65536, 3, 327696, 65536, 3, 393232, 65536, 7, 393233, 131072, 7, 393234, 131072, 7, 393235, 131072, 7, 393236, 131072, 7, 393237, 131072, 7, 524310, 65536, 3, 393238, 65536, 4, 589846, 65536, 3, 655382, 65536, 3, 720918, 65536, 7, 786454, 0, 8, 786456, 0, 8, 786455, 0, 8, 720919, 131072, 7, 720920, 131072, 7, 786457, 65536, 3, 720921, 65536, 4, 851971, 65536, 2, 851972, 131072, 2, 851973, 131072, 2, 851974, 131072, 2, 851975, 131072, 2, 851976, 131072, 2, 851977, 131072, 2, 851978, 196608, 2, 917514, 196608, 3, 983050, 196608, 3, 1048586, 196608, 3, 1114122, 720896, 2, 917507, 65536, 3, 983043, 65536, 3, 1048579, 65536, 3, 1114115, 851968, 2, -131077, 196608, 4, -131076, 131072, 7, -131075, 131072, 7, -131074, 131072, 7, -131073, 131072, 7, -196608, 131072, 7, -196607, 131072, 7, -196606, 131072, 7, -196605, 196608, 7, -262141, 196608, 3, -327677, 196608, 3, -393213, 196608, 4, 393213, 131072, 2, 393212, 131072, 2, 393211, 720896, 2, 393214, 196608, 2, 458750, 196608, 3, 524286, 196608, 3, 589822, 196608, 3, 655358, 196608, 3, 720894, 196608, 7, 720891, 196608, 4, 720892, 131072, 7, 720893, 131072, 7, 196612, 65536, 2, 196613, 131072, 2, 196614, 131072, 2, 196615, 131072, 2, 196616, 131072, 2, 196617, 196608, 2, 262148, 65536, 3, 327684, 65536, 3, 393220, 65536, 3, 458756, 65536, 7, 458757, 131072, 7, 458758, 131072, 7, 458759, 131072, 7, 458760, 131072, 7, 458761, 196608, 7, 262153, 196608, 3, 327689, 196608, 3, 393225, 196608, 3) +script = ExtResource("dungeonRoomTemplate") + +[node name="EnemyMark" type="Node2D" parent="."] +position = Vector2(2, 26) +script = ExtResource("3_v71xh") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark4" type="Node2D" parent="."] +position = Vector2(-10, 226) +script = ExtResource("3_v71xh") +Weapon1Id = "0004(ResidueAmmo:10,CurrAmmon:10)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 2.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark2" type="Node2D" parent="."] +position = Vector2(267, 197) +script = ExtResource("3_v71xh") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 3.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark3" type="Node2D" parent="."] +position = Vector2(188, -13) +script = ExtResource("3_v71xh") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 4.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark5" type="Node2D" parent="."] +position = Vector2(23, 114) +script = ExtResource("3_v71xh") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 2.0 +BirthRect = Vector2i(30, 30) +Altitude = 0 + +[node name="EnemyMark6" type="Node2D" parent="."] +position = Vector2(123, 172) +script = ExtResource("3_v71xh") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 3.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark7" type="Node2D" parent="."] +position = Vector2(284, 233) +script = ExtResource("3_v71xh") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 4.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark8" type="Node2D" parent="."] +position = Vector2(175, -30) +script = ExtResource("3_v71xh") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 5.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark9" type="Node2D" parent="."] +position = Vector2(91, 9) +script = ExtResource("3_v71xh") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark10" type="Node2D" parent="."] +position = Vector2(259, 153) +script = ExtResource("3_v71xh") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 2.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark11" type="Node2D" parent="."] +position = Vector2(253, -12) +script = ExtResource("3_v71xh") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 3.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark12" type="Node2D" parent="."] +position = Vector2(86, 176) +script = ExtResource("3_v71xh") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 4.0 +BirthRect = Vector2i(150, 50) +Altitude = 0 + +[node name="EnemyMark13" type="Node2D" parent="."] +position = Vector2(211, 79) +script = ExtResource("3_v71xh") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 5.0 +BirthRect = Vector2i(30, 50) +Altitude = 0 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn new file mode 100644 index 0000000..9148a89 --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room3.tscn @@ -0,0 +1,220 @@ +[gd_scene load_steps=4 format=3 uid="uid://wvv4lbvlarod"] + +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_jjauj"] +[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_u8a04"] +[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"] + +[node name="Room3" type="TileMap"] +tile_set = ExtResource("1_jjauj") +format = 2 +layer_0/tile_data = PackedInt32Array(786450, 0, 8, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 458770, 0, 8, 393234, 0, 8, 327698, 0, 8, 262162, 0, 8, 196626, 0, 8, 131090, 0, 8, 65554, 0, 8, 18, 0, 8, 786449, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 458769, 0, 8, 393233, 0, 8, 327697, 0, 8, 262161, 0, 8, 196625, 0, 8, 131089, 0, 8, 65553, 0, 8, 17, 0, 8, 786448, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 458768, 0, 8, 393232, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, 786447, 0, 8, 720911, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 458767, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, 786446, 0, 8, 720910, 0, 8, 655374, 0, 8, 589838, 0, 8, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, 786445, 0, 8, 720909, 0, 8, 655373, 0, 8, 589837, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, 786444, 0, 8, 720908, 0, 8, 655372, 0, 8, 589836, 0, 8, 524300, 0, 8, 786443, 0, 8, 720907, 0, 8, 655371, 0, 8, 589835, 0, 8, 524299, 0, 8, 786442, 0, 8, 720906, 0, 8, 655370, 0, 8, 589834, 0, 8, 524298, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 786440, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 786439, 0, 8, 720903, 0, 8, 655367, 0, 8, 589831, 0, 8, 786438, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 786437, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 786436, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 786435, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 393219, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 65539, 0, 8, 3, 0, 8, 786434, 0, 8, 720898, 0, 8, 655362, 0, 8, 589826, 0, 8, 524290, 0, 8, 458754, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 0, 8, 65538, 0, 8, 2, 0, 8, 786433, 0, 8, 720897, 0, 8, 655361, 0, 8, 589825, 0, 8, 524289, 0, 8, 458753, 0, 8, 393217, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, 786432, 0, 8, 720896, 0, 8, 655360, 0, 8, 589824, 0, 8, 524288, 0, 8, 458752, 0, 8, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, 131071, 196608, 3, 65535, 196608, 3, -1, 196608, 4, -65536, 131072, 7, -65535, 131072, 7, 196607, 196608, 3, 262143, 196608, 3, 327679, 196608, 3, 393215, 196608, 3, 458751, 196608, 3, 524287, 196608, 3, 589823, 196608, 3, 655359, 196608, 3, 720895, 196608, 3, 786431, 196608, 3, 851967, 196608, 3, 851969, 131072, 2, 851968, 131072, 2, 917503, 720896, 2, -65534, 131072, 7, 851970, 131072, 2, -65533, 131072, 7, 851971, 131072, 2, 851972, 196608, 2, 851973, 0, 8, 851974, 0, 8, 851975, 0, 8, 851976, 0, 8, 851977, 0, 8, 851978, 0, 8, -65523, 131072, 7, -65522, 131072, 7, -65521, 131072, 7, -65520, 131072, 7, -65519, 131072, 7, -65518, 131072, 7, 19, 65536, 3, 65555, 65536, 3, -65517, 65536, 4, 131091, 65536, 3, 196627, 65536, 3, 262163, 65536, 7, 327699, 0, 8, 393235, 0, 8, 458771, 0, 8, 524307, 0, 8, 589843, 0, 8, 655379, 0, 8, 720915, 0, 8, 786451, 0, 8, 851987, 0, 8, 1114135, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 851991, 0, 8, 786455, 0, 8, 720919, 0, 8, 655383, 0, 8, 589847, 0, 8, 524311, 0, 8, 458775, 0, 8, 393239, 0, 8, 327703, 0, 8, 1114134, 0, 8, 1048598, 0, 8, 983062, 0, 8, 917526, 0, 8, 851990, 0, 8, 786454, 0, 8, 720918, 0, 8, 655382, 0, 8, 589846, 0, 8, 524310, 0, 8, 458774, 0, 8, 393238, 0, 8, 327702, 0, 8, 1114133, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 393237, 0, 8, 327701, 0, 8, 1114132, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 458772, 0, 8, 393236, 0, 8, 327700, 0, 8, 1114122, 0, 8, 1048586, 0, 8, 983050, 0, 8, 917514, 0, 8, 1114121, 0, 8, 1048585, 0, 8, 983049, 0, 8, 917513, 0, 8, 1114120, 0, 8, 1048584, 0, 8, 983048, 0, 8, 917512, 0, 8, 1114119, 0, 8, 1048583, 0, 8, 983047, 0, 8, 917511, 0, 8, 1114118, 0, 8, 1048582, 0, 8, 983046, 0, 8, 917510, 0, 8, 1114117, 0, 8, 1048581, 0, 8, 983045, 0, 8, 917509, 0, 8, 917508, 196608, 3, 983044, 196608, 3, 1048580, 196608, 3, 1114116, 196608, 3, 1179654, 131072, 2, 1179653, 131072, 2, 1179652, 720896, 2, 1179655, 131072, 2, 1179656, 131072, 2, 1179657, 131072, 2, 1179658, 131072, 2, 262164, 131072, 7, 1179668, 131072, 2, 262165, 131072, 7, 1179669, 131072, 2, 262166, 131072, 7, 1179670, 131072, 2, 262167, 131072, 7, 1179671, 131072, 2, 327704, 65536, 3, 393240, 65536, 3, 262168, 65536, 4, 458776, 65536, 3, 524312, 65536, 3, 589848, 65536, 3, 655384, 65536, 3, 720920, 65536, 3, 786456, 65536, 3, 851992, 65536, 3, 917528, 65536, 3, 983064, 65536, 3, 1048600, 65536, 3, 1114136, 65536, 3, 1179672, 851968, 2, 458764, 0, 8, 393228, 0, 8, 327692, 0, 8, 262156, 0, 8, 196620, 0, 8, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 131072, 7, 458763, 0, 8, 393227, 0, 8, 327691, 0, 8, 458762, 0, 8, 393226, 0, 8, 327690, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 327687, 0, 8, 524294, 0, 8, 458758, 0, 8, 393222, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 65542, 0, 8, 6, 0, 8, -65530, 131072, 7, 524293, 0, 8, 458757, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, -65531, 131072, 7, 524292, 0, 8, 458756, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 131072, 7, 1179667, 131072, 2, 1114131, 0, 8, 1048595, 0, 8, 983059, 0, 8, 917523, 0, 8, 1179666, 131072, 2, 1114130, 0, 8, 1048594, 0, 8, 983058, 0, 8, 917522, 0, 8, 851986, 0, 8, 1179665, 131072, 2, 1114129, 0, 8, 1048593, 0, 8, 983057, 0, 8, 917521, 0, 8, 851985, 0, 8, 7, 65536, 3, 65543, 65536, 3, -65529, 65536, 4, 131079, 65536, 3, 196615, 65536, 3, 262151, 65536, 7, 262152, 131072, 7, 262153, 131072, 7, 262154, 131072, 7, 262155, 196608, 7, 65547, 196608, 3, 11, 196608, 3, -65525, 196608, 4, 131083, 196608, 3, 196619, 196608, 3, 851979, 65536, 2, 917515, 65536, 3, 983051, 65536, 3, 1048587, 65536, 3, 1114123, 65536, 3, 1179659, 851968, 2, 851980, 131072, 2, 851981, 131072, 2, 851982, 131072, 2, 851983, 131072, 2, 851984, 196608, 2, 917520, 196608, 3, 983056, 196608, 3, 1048592, 196608, 3, 1114128, 196608, 3, 1179664, 720896, 2) +script = ExtResource("dungeonRoomTemplate") + +[node name="EnemyMark" type="Node2D" parent="."] +position = Vector2(192, 146) +script = ExtResource("3_u8a04") +Weapon1Id = "0004(ResidueAmmo:10,CurrAmmon:10)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark2" type="Node2D" parent="."] +position = Vector2(111, 146) +script = ExtResource("3_u8a04") +Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 2.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark3" type="Node2D" parent="."] +position = Vector2(274, 148) +script = ExtResource("3_u8a04") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 3.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark4" type="Node2D" parent="."] +position = Vector2(328, 241) +script = ExtResource("3_u8a04") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark5" type="Node2D" parent="."] +position = Vector2(129, 251) +script = ExtResource("3_u8a04") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 2.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark6" type="Node2D" parent="."] +position = Vector2(56, 56) +script = ExtResource("3_u8a04") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 3.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark7" type="Node2D" parent="."] +position = Vector2(248, 55) +script = ExtResource("3_u8a04") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 4.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark8" type="Node2D" parent="."] +position = Vector2(324, 151) +script = ExtResource("3_u8a04") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 2.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark12" type="Node2D" parent="."] +position = Vector2(80, 151) +script = ExtResource("3_u8a04") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark9" type="Node2D" parent="."] +position = Vector2(56, 67) +script = ExtResource("3_u8a04") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 3.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark10" type="Node2D" parent="."] +position = Vector2(248, 71) +script = ExtResource("3_u8a04") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 4.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark11" type="Node2D" parent="."] +position = Vector2(64, 160) +script = ExtResource("3_u8a04") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark13" type="Node2D" parent="."] +position = Vector2(307, 138) +script = ExtResource("3_u8a04") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 2.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark14" type="Node2D" parent="."] +position = Vector2(156, 139) +script = ExtResource("3_u8a04") +Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:20)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 3.0 +BirthRect = Vector2i(80, 80) +Altitude = 0 + +[node name="EnemyMark15" type="Node2D" parent="."] +position = Vector2(43, 43) +script = ExtResource("3_u8a04") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 5.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark16" type="Node2D" parent="."] +position = Vector2(239, 44) +script = ExtResource("3_u8a04") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 6.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark17" type="Node2D" parent="."] +position = Vector2(122, 237) +script = ExtResource("3_u8a04") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 7.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark18" type="Node2D" parent="."] +position = Vector2(326, 219) +script = ExtResource("3_u8a04") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 8.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn new file mode 100644 index 0000000..78d6f90 --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn @@ -0,0 +1,195 @@ +[gd_scene load_steps=4 format=3 uid="uid://bunl6nluxu3qn"] + +[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_k1pu4"] +[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_tkueb"] +[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"] + +[node name="Room4" type="TileMap"] +tile_set = ExtResource("1_k1pu4") +format = 2 +layer_0/tile_data = PackedInt32Array(1179669, 0, 8, 1114133, 0, 8, 1048597, 0, 8, 983061, 0, 8, 917525, 0, 8, 851989, 0, 8, 786453, 0, 8, 720917, 0, 8, 655381, 0, 8, 589845, 0, 8, 524309, 0, 8, 458773, 0, 8, 393237, 0, 8, 327701, 0, 8, 262165, 0, 8, 196629, 0, 8, 131093, 0, 8, 65557, 0, 8, 21, 0, 8, 1179668, 0, 8, 1114132, 0, 8, 1048596, 0, 8, 983060, 0, 8, 917524, 0, 8, 851988, 0, 8, 786452, 0, 8, 720916, 0, 8, 655380, 0, 8, 589844, 0, 8, 524308, 0, 8, 458772, 0, 8, 393236, 0, 8, 327700, 0, 8, 262164, 0, 8, 196628, 0, 8, 131092, 0, 8, 65556, 0, 8, 20, 0, 8, 1179667, 0, 8, 1114131, 0, 8, 65555, 0, 8, 19, 0, 8, 1179666, 0, 8, 1114130, 0, 8, 65554, 0, 8, 18, 0, 8, 1179665, 0, 8, 1114129, 0, 8, 65553, 0, 8, 17, 0, 8, 1179664, 0, 8, 1114128, 0, 8, 65552, 0, 8, 16, 0, 8, 1179663, 0, 8, 1114127, 0, 8, 65551, 0, 8, 15, 0, 8, 1179662, 0, 8, 1114126, 0, 8, 65550, 0, 8, 14, 0, 8, 1179661, 0, 8, 1114125, 0, 8, 65549, 0, 8, 13, 0, 8, 1179660, 0, 8, 1114124, 0, 8, 65548, 0, 8, 12, 0, 8, 1179659, 0, 8, 1114123, 0, 8, 65547, 0, 8, 11, 0, 8, 1179658, 0, 8, 1114122, 0, 8, 65546, 0, 8, 10, 0, 8, 1179657, 0, 8, 1114121, 0, 8, 65545, 0, 8, 9, 0, 8, 1179656, 0, 8, 1114120, 0, 8, 65544, 0, 8, 8, 0, 8, 1179655, 0, 8, 1114119, 0, 8, 65543, 0, 8, 7, 0, 8, 1179654, 0, 8, 1114118, 0, 8, 65542, 0, 8, 6, 0, 8, 1179653, 0, 8, 1114117, 0, 8, 65541, 0, 8, 5, 0, 8, 1179652, 0, 8, 1114116, 0, 8, 65540, 0, 8, 4, 0, 8, 1179651, 0, 8, 1114115, 0, 8, 65539, 0, 8, 3, 0, 8, 1179650, 0, 8, 1114114, 0, 8, 65538, 0, 8, 2, 0, 8, 1179649, 0, 8, 1114113, 0, 8, 1048577, 0, 8, 983041, 0, 8, 917505, 0, 8, 851969, 0, 8, 786433, 0, 8, 720897, 0, 8, 655361, 0, 8, 589825, 0, 8, 524289, 0, 8, 458753, 0, 8, 393217, 0, 8, 327681, 0, 8, 262145, 0, 8, 196609, 0, 8, 131073, 0, 8, 65537, 0, 8, 1, 0, 8, 1179648, 0, 8, 1114112, 0, 8, 1048576, 0, 8, 983040, 0, 8, 917504, 0, 8, 851968, 0, 8, 786432, 0, 8, 720896, 0, 8, 655360, 0, 8, 589824, 0, 8, 524288, 0, 8, 458752, 0, 8, 393216, 0, 8, 327680, 0, 8, 262144, 0, 8, 196608, 0, 8, 131072, 0, 8, 65536, 0, 8, 0, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, -65536, 0, 8, -65535, 0, 8, 196607, 0, 8, 262143, 0, 8, 327679, 0, 8, 393215, 0, 8, 458751, 196608, 2, 524287, 196608, 3, 589823, 196608, 3, 655359, 196608, 3, 720895, 196608, 3, 786431, 196608, 3, 851967, 196608, 3, 917503, 196608, 7, 983039, 0, 8, 1048575, 0, 8, 1114111, 0, 8, 1179647, 0, 8, 1245183, 0, 8, 1245185, 0, 8, 1245184, 0, 8, 1310719, 0, 8, -65534, 0, 8, 1245186, 0, 8, -65533, 0, 8, 1245187, 0, 8, -65532, 0, 8, 1245188, 0, 8, -65531, 0, 8, 1245189, 65536, 2, -65530, 65536, 7, 1245190, 131072, 2, -65529, 131072, 7, 1245191, 131072, 2, -65528, 131072, 7, 1245192, 131072, 2, -65527, 131072, 7, 1245193, 131072, 2, -65526, 131072, 7, 1245194, 131072, 2, -65525, 131072, 7, 1245195, 131072, 2, -65524, 131072, 7, 1245196, 131072, 2, -65523, 131072, 7, 1245197, 131072, 2, -65522, 131072, 7, 1245198, 131072, 2, -65521, 196608, 7, 1245199, 131072, 2, -65520, 0, 8, 1245200, 196608, 2, -65519, 0, 8, 1245201, 0, 8, -65518, 0, 8, 1245202, 0, 8, -65517, 0, 8, 1245203, 0, 8, -65516, 0, 8, 1245204, 0, 8, -65515, 0, 8, 1245205, 0, 8, 22, 0, 8, 65558, 0, 8, -65514, 0, 8, 131094, 0, 8, 196630, 0, 8, 262166, 0, 8, 327702, 0, 8, 393238, 65536, 2, 458774, 65536, 3, 524310, 65536, 3, 589846, 65536, 3, 655382, 65536, 3, 720918, 65536, 3, 786454, 65536, 3, 851990, 65536, 7, 917526, 0, 8, 983062, 0, 8, 1048598, 0, 8, 1114134, 0, 8, 1179670, 0, 8, 1245206, 0, 8, -131067, 0, 8, -196603, 0, 8, -262139, 0, 8, -131068, 0, 8, -196604, 0, 8, -262140, 0, 8, -131069, 0, 8, -196605, 0, 8, -262141, 0, 8, -131070, 0, 8, -196606, 0, 8, -262142, 0, 8, -131071, 0, 8, -196607, 0, 8, -262143, 0, 8, -131072, 0, 8, -196608, 0, 8, -262144, 0, 8, -65537, 0, 8, -131073, 0, 8, -196609, 0, 8, 393214, 0, 8, 327678, 0, 8, 262142, 0, 8, 196606, 0, 8, 131070, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -131074, 0, 8, -196610, 0, 8, 393213, 0, 8, 327677, 0, 8, 262141, 0, 8, 196605, 0, 8, 131069, 0, 8, 65533, 0, 8, -3, 0, 8, -65539, 0, 8, -131075, 0, 8, -196611, 0, 8, 393212, 0, 8, 327676, 0, 8, 262140, 0, 8, 196604, 0, 8, 131068, 0, 8, 65532, 0, 8, -4, 0, 8, -65540, 0, 8, -131076, 0, 8, -196612, 0, 8, -131077, 196608, 3, -196613, 196608, 3, -262149, 196608, 4, -262148, 131072, 7, -262147, 131072, 7, -65541, 196608, 3, -5, 196608, 3, 65531, 196608, 3, 131067, 196608, 3, 196603, 196608, 3, 262139, 196608, 3, 327675, 196608, 3, 393211, 196608, 3, 458749, 131072, 2, 458748, 131072, 2, 458747, 720896, 2, -262146, 131072, 7, 458750, 131072, 2, -262145, 131072, 7, -327680, 131072, 7, -327679, 131072, 7, -327678, 131072, 7, -327677, 131072, 7, -327676, 131072, 7, -327675, 131072, 7, -262138, 65536, 3, -196602, 65536, 3, -327674, 65536, 4, -131066, 65536, 3, 262169, 0, 8, 196633, 0, 8, 131097, 0, 8, 65561, 0, 8, 25, 0, 8, -65511, 0, 8, -131047, 0, 8, -196583, 0, 8, -262119, 0, 8, 262168, 0, 8, 196632, 0, 8, 131096, 0, 8, 65560, 0, 8, 24, 0, 8, -65512, 0, 8, -131048, 0, 8, -196584, 0, 8, -262120, 0, 8, 262167, 0, 8, 196631, 0, 8, 131095, 0, 8, 65559, 0, 8, 23, 0, 8, -65513, 0, 8, -131049, 0, 8, -196585, 0, 8, -262121, 0, 8, -131050, 0, 8, -196586, 0, 8, -262122, 0, 8, -131051, 0, 8, -196587, 0, 8, -262123, 0, 8, -131052, 0, 8, -196588, 0, 8, -262124, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -196592, 0, 8, -262128, 0, 8, -327664, 131072, 7, -327663, 131072, 7, -327662, 131072, 7, -131056, 0, 8, -327661, 131072, 7, -327660, 131072, 7, -327659, 131072, 7, -327658, 131072, 7, -327657, 131072, 7, 327703, 0, 8, -327656, 131072, 7, 327704, 0, 8, -327655, 131072, 7, 327705, 0, 8, -262118, 65536, 3, -196582, 65536, 3, -327654, 65536, 4, -131046, 65536, 3, -65510, 65536, 3, 26, 65536, 3, 65562, 65536, 3, 131098, 65536, 3, 196634, 65536, 3, 262170, 65536, 3, 327706, 65536, 3, 393239, 131072, 2, 393240, 131072, 2, 393241, 131072, 2, 393242, 851968, 2, -196593, 196608, 3, -262129, 196608, 3, -327665, 196608, 4, -131057, 196608, 3, 1441796, 0, 8, 1376260, 0, 8, 1310724, 0, 8, 1441795, 0, 8, 1376259, 0, 8, 1310723, 0, 8, 1441794, 0, 8, 1376258, 0, 8, 1310722, 0, 8, 1441793, 0, 8, 1376257, 0, 8, 1310721, 0, 8, 1441792, 0, 8, 1376256, 0, 8, 1310720, 0, 8, 1507327, 0, 8, 1441791, 0, 8, 1376255, 0, 8, 1507326, 0, 8, 1441790, 0, 8, 1376254, 0, 8, 1310718, 0, 8, 1245182, 0, 8, 1179646, 0, 8, 1114110, 0, 8, 1048574, 0, 8, 983038, 0, 8, 1507325, 0, 8, 1441789, 0, 8, 1376253, 0, 8, 1310717, 0, 8, 1245181, 0, 8, 1179645, 0, 8, 1114109, 0, 8, 1048573, 0, 8, 983037, 0, 8, 1507324, 0, 8, 1441788, 0, 8, 1376252, 0, 8, 1310716, 0, 8, 1245180, 0, 8, 1179644, 0, 8, 1114108, 0, 8, 1048572, 0, 8, 983036, 0, 8, 1048571, 196608, 3, 983035, 196608, 3, 917499, 196608, 4, 917500, 131072, 7, 917501, 131072, 7, 1114107, 196608, 3, 1179643, 196608, 3, 1245179, 196608, 3, 1310715, 196608, 3, 1376251, 196608, 3, 1441787, 196608, 3, 1507323, 196608, 3, 1572861, 131072, 2, 1572860, 131072, 2, 1572859, 720896, 2, 917502, 131072, 7, 1572862, 131072, 2, 1572863, 131072, 2, 1507328, 131072, 2, 1507329, 131072, 2, 1507330, 131072, 2, 1507331, 131072, 2, 1507332, 131072, 2, 1310725, 65536, 3, 1376261, 65536, 3, 1441797, 65536, 3, 1507333, 851968, 2, 1441817, 0, 8, 1376281, 0, 8, 1310745, 0, 8, 1245209, 0, 8, 1179673, 0, 8, 1114137, 0, 8, 1048601, 0, 8, 983065, 0, 8, 917529, 0, 8, 1441816, 0, 8, 1376280, 0, 8, 1310744, 0, 8, 1245208, 0, 8, 1179672, 0, 8, 1114136, 0, 8, 1048600, 0, 8, 983064, 0, 8, 917528, 0, 8, 1441815, 0, 8, 1376279, 0, 8, 1310743, 0, 8, 1245207, 0, 8, 1179671, 0, 8, 1114135, 0, 8, 1048599, 0, 8, 983063, 0, 8, 917527, 0, 8, 1441814, 0, 8, 1376278, 0, 8, 1310742, 0, 8, 1441813, 0, 8, 1376277, 0, 8, 1310741, 0, 8, 1441812, 0, 8, 1376276, 0, 8, 1310740, 0, 8, 1441811, 0, 8, 1376275, 0, 8, 1310739, 0, 8, 1441810, 0, 8, 1376274, 0, 8, 1310738, 0, 8, 1441809, 0, 8, 1376273, 0, 8, 1310737, 0, 8, 1310736, 196608, 3, 1376272, 196608, 3, 1441808, 196608, 3, 1507346, 131072, 2, 1507345, 131072, 2, 1507344, 720896, 2, 1507347, 131072, 2, 1507348, 131072, 2, 1507349, 131072, 2, 1507350, 131072, 2, 851991, 131072, 7, 1507351, 131072, 2, 851992, 131072, 7, 1507352, 131072, 2, 851993, 131072, 7, 1507353, 131072, 2, 917530, 65536, 3, 983066, 65536, 3, 851994, 65536, 4, 1048602, 65536, 3, 1114138, 65536, 3, 1179674, 65536, 3, 1245210, 65536, 3, 1310746, 65536, 3, 1376282, 65536, 3, 1441818, 65536, 3, 1507354, 851968, 2, 458754, 65536, 3, 131088, 131072, 2, 851970, 65536, 3, 131075, 131072, 2, 131074, 65536, 2, 131076, 131072, 2, 131077, 131072, 2, 131078, 131072, 2, 131079, 131072, 2, 131080, 131072, 2, 131081, 131072, 2, 131082, 131072, 2, 131083, 131072, 2, 131084, 131072, 2, 131085, 131072, 2, 131086, 131072, 2, 131087, 131072, 2, 131089, 131072, 2, 131090, 131072, 2, 131091, 196608, 2, 196627, 196608, 3, 262163, 196608, 3, 327699, 196608, 3, 393235, 196608, 3, 458771, 196608, 3, 524307, 196608, 3, 589843, 196608, 3, 655379, 196608, 3, 720915, 196608, 3, 786451, 196608, 3, 851987, 196608, 3, 917523, 196608, 3, 983059, 196608, 3, 1048595, 196608, 7, 1048578, 65536, 7, 1048579, 131072, 7, 1048580, 131072, 7, 1048581, 131072, 7, 1048582, 131072, 7, 1048583, 131072, 7, 1048584, 131072, 7, 1048585, 131072, 7, 1048586, 131072, 7, 1048587, 131072, 7, 1048588, 131072, 7, 1048589, 131072, 7, 1048590, 131072, 7, 1048591, 131072, 7, 1048592, 131072, 7, 1048593, 131072, 7, 1048594, 131072, 7, 196610, 65536, 3, 262146, 65536, 3, 327682, 65536, 3, 393218, 65536, 3, 524290, 65536, 3, 589826, 65536, 3, 655362, 65536, 3, 720898, 65536, 3, 786434, 65536, 3, 917506, 65536, 3, 983042, 65536, 3) +script = ExtResource("dungeonRoomTemplate") + +[node name="EnemyMark" type="Node2D" parent="."] +script = ExtResource("3_tkueb") +Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark2" type="Node2D" parent="."] +position = Vector2(346, -8) +script = ExtResource("3_tkueb") +Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark3" type="Node2D" parent="."] +position = Vector2(359, 312) +script = ExtResource("3_tkueb") +Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark4" type="Node2D" parent="."] +position = Vector2(-8, 311) +script = ExtResource("3_tkueb") +Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark5" type="Node2D" parent="."] +script = ExtResource("3_tkueb") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark6" type="Node2D" parent="."] +position = Vector2(346, -8) +script = ExtResource("3_tkueb") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark7" type="Node2D" parent="."] +position = Vector2(359, 312) +script = ExtResource("3_tkueb") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark8" type="Node2D" parent="."] +position = Vector2(-8, 311) +script = ExtResource("3_tkueb") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark9" type="Node2D" parent="."] +script = ExtResource("3_tkueb") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark10" type="Node2D" parent="."] +position = Vector2(346, -8) +script = ExtResource("3_tkueb") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark11" type="Node2D" parent="."] +position = Vector2(359, 312) +script = ExtResource("3_tkueb") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark12" type="Node2D" parent="."] +position = Vector2(-8, 311) +script = ExtResource("3_tkueb") +Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark13" type="Node2D" parent="."] +script = ExtResource("3_tkueb") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark14" type="Node2D" parent="."] +position = Vector2(346, -8) +script = ExtResource("3_tkueb") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark15" type="Node2D" parent="."] +position = Vector2(359, 312) +script = ExtResource("3_tkueb") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 + +[node name="EnemyMark16" type="Node2D" parent="."] +position = Vector2(-8, 311) +script = ExtResource("3_tkueb") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(50, 50) +Altitude = 0 diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn index d4ef309..f888e92 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn +++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room8.tscn @@ -12,30 +12,204 @@ script = ExtResource("dungeonRoomTemplate") [node name="EnemyMark" type="Node2D" parent="."] +position = Vector2(17, 38) script = ExtResource("3_y6it6") -Weapon1Id = "0001(ResidueAmmo:30,CurrAmmon:10)" -Weapon2Id = "null; -0003(ResidueAmmo:12,CurrAmmon:12)" +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" Type = 4 -ItemExpression = "0001; -null" +ItemExpression = "0001" Layer = 1 +DelayTime = 1.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark3" type="Node2D" parent="."] +position = Vector2(198, 129) +script = ExtResource("3_y6it6") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +BirthRect = Vector2i(100, 100) Altitude = 0 [node name="ActivityMark" type="Node2D" parent="."] -position = Vector2(202, 95) +position = Vector2(116, 80) script = ExtResource("4_5ha7k") Type = 5 -ItemExpression = "0002(ResidueAmmo:15,CurrAmmon:0)" +ItemExpression = "0002(ResidueAmmo:7,CurrAmmon:7)" WaveNumber = 2 +DelayTime = 1.0 +BirthRect = Vector2i(150, 150) + +[node name="ActivityMark2" type="Node2D" parent="."] +position = Vector2(208, 101) +script = ExtResource("4_5ha7k") +Type = 5 +ItemExpression = "0001(ResidueAmmo:15,CurrAmmon:15)" +WaveNumber = 2 +DelayTime = 1.5 +BirthRect = Vector2i(150, 150) + +[node name="ActivityMark3" type="Node2D" parent="."] +position = Vector2(115, 64) +script = ExtResource("4_5ha7k") +Type = 5 +ItemExpression = "0003(ResidueAmmo:12,CurrAmmon:12)" +WaveNumber = 2 +DelayTime = 2.0 BirthRect = Vector2i(150, 150) [node name="EnemyMark2" type="Node2D" parent="."] -position = Vector2(56, 112) +position = Vector2(52, 123) script = ExtResource("3_y6it6") Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:7)" Type = 4 ItemExpression = "0001" Layer = 1 WaveNumber = 3 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark13" type="Node2D" parent="."] +position = Vector2(69, 35) +script = ExtResource("3_y6it6") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 1.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark14" type="Node2D" parent="."] +position = Vector2(224, 41) +script = ExtResource("3_y6it6") +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 2.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark15" type="Node2D" parent="."] +position = Vector2(218, 114) +script = ExtResource("3_y6it6") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 3 +DelayTime = 4.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark4" type="Node2D" parent="."] +position = Vector2(138, 89) +script = ExtResource("3_y6it6") +Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark5" type="Node2D" parent="."] +position = Vector2(27, 108) +script = ExtResource("3_y6it6") +Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 1.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark6" type="Node2D" parent="."] +position = Vector2(175, 110) +script = ExtResource("3_y6it6") +Weapon1Id = " +" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 2.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark7" type="Node2D" parent="."] +position = Vector2(35, 47) +script = ExtResource("3_y6it6") +Weapon1Id = "0003(ResidueAmmo:12,CurrAmmon:12)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 3.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark8" type="Node2D" parent="."] +position = Vector2(157, 38) +script = ExtResource("3_y6it6") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 4 +DelayTime = 5.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark9" type="Node2D" parent="."] +position = Vector2(5, 79) +script = ExtResource("3_y6it6") +Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 5 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark10" type="Node2D" parent="."] +position = Vector2(66, 125) +script = ExtResource("3_y6it6") +Weapon1Id = "0005(ResidueAmmo:10,CurrAmmon:0)" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 5 +DelayTime = 2.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark11" type="Node2D" parent="."] +position = Vector2(190, 104) +script = ExtResource("3_y6it6") +Weapon1Id = " +" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 5 +DelayTime = 3.0 +BirthRect = Vector2i(100, 100) +Altitude = 0 + +[node name="EnemyMark12" type="Node2D" parent="."] +position = Vector2(145, 43) +script = ExtResource("3_y6it6") +Weapon1Id = " +" +Type = 4 +ItemExpression = "0001" +Layer = 1 +WaveNumber = 5 +DelayTime = 4.0 +BirthRect = Vector2i(100, 100) Altitude = 0 diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room2.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room2.json new file mode 100644 index 0000000..ea48daf --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room2.json @@ -0,0 +1,154 @@ +{ + "Position": { + "X": -5, + "Y": -6 + }, + "Size": { + "X": 31, + "Y": 24 + }, + "DoorAreaInfos": [ + { + "Direction": 3, + "Start": 144, + "End": 432 + }, + { + "Direction": 1, + "Start": 48, + "End": 176 + }, + { + "Direction": 1, + "Start": 256, + "End": 368 + }, + { + "Direction": 2, + "Start": 16, + "End": 128 + }, + { + "Direction": 2, + "Start": 256, + "End": 480 + }, + { + "Direction": 0, + "Start": 272, + "End": 368 + } + ], + "NavigationList": [ + { + "Type": 0, + "Points": [ + { + "X": 72, + "Y": -72 + }, + { + "X": 344, + "Y": -72 + }, + { + "X": 344, + "Y": 32 + }, + { + "X": 248, + "Y": 32 + }, + { + "X": 248, + "Y": 120 + }, + { + "X": 344, + "Y": 120 + }, + { + "X": 344, + "Y": 200 + }, + { + "X": 392, + "Y": 200 + }, + { + "X": 392, + "Y": 272 + }, + { + "X": 184, + "Y": 272 + }, + { + "X": 184, + "Y": 208 + }, + { + "X": 40, + "Y": 208 + }, + { + "X": 40, + "Y": 272 + }, + { + "X": -56, + "Y": 272 + }, + { + "X": -56, + "Y": 184 + }, + { + "X": -8, + "Y": 184 + }, + { + "X": -8, + "Y": 80 + }, + { + "X": -56, + "Y": 80 + }, + { + "X": -56, + "Y": -24 + }, + { + "X": 72, + "Y": -24 + } + ] + }, + { + "Type": 1, + "Points": [ + { + "X": 56, + "Y": 48 + }, + { + "X": 168, + "Y": 48 + }, + { + "X": 168, + "Y": 136 + }, + { + "X": 56, + "Y": 136 + } + ] + } + ], + "GroupName": "testGroup", + "RoomType": 0, + "FileName": "Room2", + "Weight": 100 +} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room3.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room3.json new file mode 100644 index 0000000..c8f0091 --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room3.json @@ -0,0 +1,117 @@ +{ + "Position": { + "X": -1, + "Y": -1 + }, + "Size": { + "X": 26, + "Y": 20 + }, + "DoorAreaInfos": [ + { + "Direction": 3, + "Start": 16, + "End": 128 + }, + { + "Direction": 3, + "Start": 208, + "End": 320 + }, + { + "Direction": 1, + "Start": 16, + "End": 224 + }, + { + "Direction": 2, + "Start": 96, + "End": 192 + }, + { + "Direction": 2, + "Start": 288, + "End": 400 + }, + { + "Direction": 0, + "Start": 96, + "End": 304 + } + ], + "NavigationList": [ + { + "Type": 0, + "Points": [ + { + "X": 8, + "Y": 8 + }, + { + "X": 104, + "Y": 8 + }, + { + "X": 104, + "Y": 88 + }, + { + "X": 200, + "Y": 88 + }, + { + "X": 200, + "Y": 8 + }, + { + "X": 296, + "Y": 8 + }, + { + "X": 296, + "Y": 88 + }, + { + "X": 376, + "Y": 88 + }, + { + "X": 376, + "Y": 288 + }, + { + "X": 280, + "Y": 288 + }, + { + "X": 280, + "Y": 208 + }, + { + "X": 168, + "Y": 208 + }, + { + "X": 168, + "Y": 288 + }, + { + "X": 88, + "Y": 288 + }, + { + "X": 88, + "Y": 208 + }, + { + "X": 8, + "Y": 208 + } + ] + } + ], + "GroupName": "testGroup", + "RoomType": 0, + "FileName": "Room3", + "Weight": 100 +} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json new file mode 100644 index 0000000..634f49d --- /dev/null +++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json @@ -0,0 +1,164 @@ +{ + "Position": { + "X": -5, + "Y": -5 + }, + "Size": { + "X": 32, + "Y": 29 + }, + "DoorAreaInfos": [ + { + "Direction": 3, + "Start": 16, + "End": 176 + }, + { + "Direction": 1, + "Start": 16, + "End": 176 + }, + { + "Direction": 1, + "Start": 304, + "End": 448 + }, + { + "Direction": 2, + "Start": 16, + "End": 144 + }, + { + "Direction": 2, + "Start": 352, + "End": 496 + }, + { + "Direction": 0, + "Start": 304, + "End": 448 + }, + { + "Direction": 0, + "Start": 16, + "End": 176 + }, + { + "Direction": 3, + "Start": 336, + "End": 496 + } + ], + "NavigationList": [ + { + "Type": 0, + "Points": [ + { + "X": -56, + "Y": -56 + }, + { + "X": 88, + "Y": -56 + }, + { + "X": 88, + "Y": 8 + }, + { + "X": 264, + "Y": 8 + }, + { + "X": 264, + "Y": -56 + }, + { + "X": 408, + "Y": -56 + }, + { + "X": 408, + "Y": 96 + }, + { + "X": 344, + "Y": 96 + }, + { + "X": 344, + "Y": 232 + }, + { + "X": 408, + "Y": 232 + }, + { + "X": 408, + "Y": 368 + }, + { + "X": 280, + "Y": 368 + }, + { + "X": 280, + "Y": 304 + }, + { + "X": 72, + "Y": 304 + }, + { + "X": 72, + "Y": 368 + }, + { + "X": -56, + "Y": 368 + }, + { + "X": -56, + "Y": 232 + }, + { + "X": 8, + "Y": 232 + }, + { + "X": 8, + "Y": 96 + }, + { + "X": -56, + "Y": 96 + } + ] + }, + { + "Type": 1, + "Points": [ + { + "X": 24, + "Y": 32 + }, + { + "X": 328, + "Y": 32 + }, + { + "X": 328, + "Y": 280 + }, + { + "X": 24, + "Y": 280 + } + ] + } + ], + "GroupName": "testGroup", + "RoomType": 0, + "FileName": "Room4", + "Weight": 100 +} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/inlet/Room1.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/inlet/Room1.json index 6c3fba1..952528a 100644 --- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/inlet/Room1.json +++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/inlet/Room1.json @@ -1,38 +1,38 @@ { "Position": { - "X": -1, - "Y": -1 + "X": -1, + "Y": -1 }, "Size": { - "X": 12, - "Y": 8 + "X": 12, + "Y": 8 }, "DoorAreaInfos": [], "NavigationList": [ - { - "Type": 0, - "Points": [ - { - "X": 8, - "Y": 8 - }, - { - "X": 152, - "Y": 8 - }, - { - "X": 152, - "Y": 96 - }, - { - "X": 8, - "Y": 96 - } - ] - } + { + "Type": 0, + "Points": [ + { + "X": 8, + "Y": 8 + }, + { + "X": 152, + "Y": 8 + }, + { + "X": 152, + "Y": 96 + }, + { + "X": 8, + "Y": 96 + } + ] + } ], "GroupName": "testGroup", "RoomType": 1, "FileName": "Room1", "Weight": 100 -} \ No newline at end of file +} diff --git a/DungeonShooting_Godot/src/framework/map/image/ImageCanvas_Static.cs b/DungeonShooting_Godot/src/framework/map/image/ImageCanvas_Static.cs index ea8de22..9f1e3ff 100644 --- a/DungeonShooting_Godot/src/framework/map/image/ImageCanvas_Static.cs +++ b/DungeonShooting_Godot/src/framework/map/image/ImageCanvas_Static.cs @@ -214,8 +214,7 @@ } } while (_drawingQueueItems.Count > 0 && (DateTime.Now - startTime).TotalMilliseconds < step1Time); - GD.Print($"当前帧绘制完成数量: {index}, 绘制队列数量: {_drawingQueueItems.Count}, 用时: {(DateTime.Now - startTime).TotalMilliseconds}毫秒"); - + //GD.Print($"当前帧绘制完成数量: {index}, 绘制队列数量: {_drawingQueueItems.Count}, 用时: {(DateTime.Now - startTime).TotalMilliseconds}毫秒"); } //重绘画布 @@ -281,7 +280,7 @@ } } - GD.Print($"当前帧进入绘制绘队列数量: {index}, 待绘制队列数量: {_queueItems.Count}, 绘制队列数量: {_drawingQueueItems.Count}, 用时: {(DateTime.Now - startTime).TotalMilliseconds}毫秒"); + //GD.Print($"当前帧进入绘制绘队列数量: {index}, 待绘制队列数量: {_queueItems.Count}, 绘制队列数量: {_drawingQueueItems.Count}, 用时: {(DateTime.Now - startTime).TotalMilliseconds}毫秒"); } } diff --git a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs index 6cd9670..7c6c912 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs @@ -1408,7 +1408,7 @@ result.ShowIcon = ResourcePath.resource_sprite_ui_icon_icon_pickup_png; return result; } - else if (masterWeapon != null && masterWeapon.Attribute.WeightType == Attribute.WeightType) //替换武器 + else if (masterWeapon != null) //替换武器 // && masterWeapon.Attribute.WeightType == Attribute.WeightType) { //可以互动, 切换武器 result.CanInteractive = true; @@ -1615,7 +1615,7 @@ /// protected ActivityObject ThrowShell(string shellId, float speedScale = 1) { - var shellPosition = Master.MountPoint.Position + ShellPoint.Position; + var shellPosition = (Master != null ? Master.MountPoint.Position : Position) + ShellPoint.Position; var startPos = ShellPoint.GlobalPosition; var startHeight = -shellPosition.Y; startPos.Y += startHeight; @@ -1624,10 +1624,18 @@ var velocity = new Vector2(Utils.RandomRangeInt((int)(20 * speedScale), (int)(60 * speedScale)), 0).Rotated(direction * Mathf.Pi / 180); var rotate = Utils.RandomRangeInt((int)(-720 * speedScale), (int)(720 * speedScale)); var shell = Create(shellId); - shell.Rotation = Master.MountPoint.RealRotation; - shell.InheritVelocity(Master); + shell.Rotation = (Master != null ? Master.MountPoint.RealRotation : Rotation); + shell.InheritVelocity(Master != null ? Master : this); shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate); - Master.AffiliationArea.InsertItem(shell); + if (Master == null) + { + AffiliationArea.InsertItem(shell); + } + else + { + Master.AffiliationArea.InsertItem(shell); + } + return shell; } diff --git a/DungeonShooting_Godot/src/game/role/Player.cs b/DungeonShooting_Godot/src/game/role/Player.cs index 66d1ace..de9542c 100644 --- a/DungeonShooting_Godot/src/game/role/Player.cs +++ b/DungeonShooting_Godot/src/game/role/Player.cs @@ -174,6 +174,8 @@ protected override void OnDie() { GameCamera.Main.SetFollowTarget(null); + BasisVelocity = Vector2.Zero; + MoveController.ClearForce(); UiManager.Open_Settlement(); //GameApplication.Instance.World.ProcessMode = ProcessModeEnum.WhenPaused; }