diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
index 86823dc..c3267c9 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 1da2165..c890281 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 1272beb..ed47d6d 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 3a63b28..5e197fd 100644
--- a/DungeonShooting_Godot/resource/config/Weapon.json
+++ b/DungeonShooting_Godot/resource/config/Weapon.json
@@ -935,7 +935,80 @@
},
"__ShootSound": "shooting0007",
"__BeginReloadSound": "reloadBegin0006",
- "BeginReloadSoundDelayTime": 0,
+ "BeginReloadSoundDelayTime": 0.2,
+ "__ReloadSound": "",
+ "ReloadSoundDelayTime": 0,
+ "__ReloadFinishSound": "beLoaded0017",
+ "ReloadFinishSoundAdvanceTime": 0.65,
+ "__BeLoadedSound": "",
+ "BeLoadedSoundDelayTime": 0,
+ "__OtherSoundMap": null,
+ "__AiUseAttribute": "0014",
+ "AiTargetLockingTime": 0,
+ "AiBulletSpeedScale": 0,
+ "AiAmmoConsumptionProbability": 0
+ },
+ {
+ "Id": "0014",
+ "WeaponId": "",
+ "Remark": "\u6C64\u59C6\u900A\u51B2\u950B\u67AA",
+ "Icon": "res://resource/sprite/gun/gun4.png",
+ "Weight": 40,
+ "WeightType": 2,
+ "ContinuousShoot": false,
+ "AmmoCapacity": 60,
+ "MaxAmmoCapacity": 600,
+ "StandbyAmmoCapacity": 540,
+ "ReloadTime": 2.2,
+ "AloneReload": false,
+ "AloneReloadCount": 1,
+ "AloneReloadBeginIntervalTime": 0,
+ "AloneReloadFinishIntervalTime": 0,
+ "AloneReloadCanShoot": false,
+ "LooseShoot": false,
+ "MinChargeTime": 0,
+ "ManualBeLoaded": false,
+ "AutoManualBeLoaded": false,
+ "BeLoadedTime": 0,
+ "MinContinuousCount": 10,
+ "MaxContinuousCount": 10,
+ "TriggerInterval": 5,
+ "StartFiringSpeed": 200,
+ "FinalFiringSpeed": 200,
+ "FiringSpeedAddSpeed": 0,
+ "FiringSpeedBackSpeed": 0,
+ "MinFireBulletCount": 1,
+ "MaxFireBulletCount": 1,
+ "DelayedTime": 0,
+ "StartScatteringRange": 10,
+ "FinalScatteringRange": 30,
+ "ScatteringRangeAddValue": 3,
+ "ScatteringRangeBackSpeed": 50,
+ "ScatteringRangeBackDelayTime": 0.3,
+ "MinBacklash": 1,
+ "MaxBacklash": 2,
+ "BacklashRegressionSpeed": 35,
+ "UpliftAngle": 5,
+ "DefaultAngle": 0,
+ "UpliftAngleRestore": 1,
+ "BulletId": "bullet0003",
+ "BulletMaxHarm": 3,
+ "BulletMinHarm": 3,
+ "BulletMinDeviationAngle": 0,
+ "BulletMaxDeviationAngle": 0,
+ "BulletMaxSpeed": 300,
+ "BulletMinSpeed": 330,
+ "BulletMinDistance": 270,
+ "BulletMaxDistance": 360,
+ "ShellId": "shell0001",
+ "ThrowShellDelayTime": 0,
+ "ThrowCollisionSize": {
+ "X": 20,
+ "Y": 15
+ },
+ "__ShootSound": "shooting0007",
+ "__BeginReloadSound": "reloadBegin0006",
+ "BeginReloadSoundDelayTime": 0.2,
"__ReloadSound": "",
"ReloadSoundDelayTime": 0,
"__ReloadFinishSound": "beLoaded0017",
@@ -944,8 +1017,8 @@
"BeLoadedSoundDelayTime": 0,
"__OtherSoundMap": null,
"__AiUseAttribute": "",
- "AiTargetLockingTime": 0,
- "AiBulletSpeedScale": 0,
+ "AiTargetLockingTime": 0.5,
+ "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 785217d..c718336 100644
--- a/DungeonShooting_Godot/resource/map/RoomConfig.json
+++ b/DungeonShooting_Godot/resource/map/RoomConfig.json
@@ -19,6 +19,14 @@
"ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room4.json"
},
{
+ "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room5.tscn",
+ "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room5.json"
+ },
+ {
+ "ScenePath": "res://resource/map/tileMaps/testGroup/battle/Room6.tscn",
+ "ConfigPath": "res://resource/map/tiledata/testGroup/battle/Room6.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/Room4.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn
index 875a067..aa32fb9 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room4.tscn
@@ -10,49 +10,6 @@
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, 0, 8, -65530, 65536, 7, 1245190, 65536, 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, 196608, 2, -65520, 0, 8, 1245200, 0, 8, -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, 0, 8, 1376261, 0, 8, 1441797, 0, 8, 1507333, 131072, 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, 0, 8, 1376272, 0, 8, 1441808, 0, 8, 1507346, 131072, 2, 1507345, 131072, 2, 1507344, 131072, 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, 7, 131088, 0, 8, 851970, 65536, 7, 131075, 0, 8, 131074, 0, 8, 131076, 0, 8, 131077, 0, 8, 131078, 65536, 2, 131079, 196608, 2, 131080, 0, 8, 131081, 0, 8, 131082, 0, 8, 131083, 0, 8, 131084, 0, 8, 131085, 0, 8, 131086, 65536, 2, 131087, 196608, 2, 131089, 0, 8, 131090, 0, 8, 131091, 0, 8, 196627, 0, 8, 262163, 0, 8, 327699, 0, 8, 393235, 196608, 2, 458771, 196608, 7, 524307, 0, 8, 589843, 0, 8, 655379, 0, 8, 720915, 0, 8, 786451, 196608, 2, 851987, 196608, 7, 917523, 0, 8, 983059, 0, 8, 1048595, 0, 8, 1048578, 0, 8, 1048579, 0, 8, 1048580, 0, 8, 1048581, 0, 8, 1048582, 65536, 7, 1048583, 196608, 7, 1048584, 0, 8, 1048585, 0, 8, 1048586, 0, 8, 1048587, 0, 8, 1048588, 0, 8, 1048589, 0, 8, 1048590, 65536, 7, 1048591, 196608, 7, 1048592, 0, 8, 1048593, 0, 8, 1048594, 0, 8, 196610, 0, 8, 262146, 0, 8, 327682, 0, 8, 393218, 65536, 2, 524290, 0, 8, 589826, 0, 8, 655362, 0, 8, 720898, 0, 8, 786434, 65536, 2, 917506, 0, 8, 983042, 0, 8, 983045, 0, 8, 917509, 0, 8, 983044, 0, 8, 917508, 0, 8, 983043, 0, 8, 917507, 0, 8, 851971, 131072, 7, 851972, 131072, 7, 851973, 131072, 7, 917510, 65536, 3, 983046, 65536, 3, 851974, 65536, 4, 1310726, 65536, 3, 1376262, 65536, 3, 1441798, 65536, 3, 1507334, 851968, 2, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 393219, 131072, 2, 393220, 131072, 2, 393221, 131072, 2, 196614, 65536, 3, 262150, 65536, 3, 327686, 65536, 3, 393222, 851968, 2, 327698, 0, 8, 262162, 0, 8, 196626, 0, 8, 327697, 0, 8, 262161, 0, 8, 196625, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 196623, 196608, 3, 262159, 196608, 3, 327695, 196608, 3, 393233, 131072, 2, 393232, 131072, 2, 393231, 720896, 2, 393234, 131072, 2, 983058, 0, 8, 917522, 0, 8, 983057, 0, 8, 917521, 0, 8, 983056, 0, 8, 917520, 0, 8, 983055, 196608, 3, 917519, 196608, 3, 851983, 196608, 4, 851984, 131072, 7, 851985, 131072, 7, 1310735, 196608, 3, 851986, 131072, 7, 1376271, 196608, 3, 1441807, 196608, 3, 1507343, 720896, 2, 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, 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, 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, 983050, 0, 8, 917514, 0, 8, 851978, 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, 983049, 0, 8, 917513, 0, 8, 851977, 0, 8, 786441, 0, 8, 720905, 0, 8, 655369, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 327689, 0, 8, 262153, 0, 8, 196617, 0, 8, 983048, 0, 8, 917512, 0, 8, 851976, 0, 8, 786440, 0, 8, 720904, 0, 8, 655368, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 196615, 196608, 3, 262151, 196608, 3, 327687, 196608, 3, 393223, 196608, 3, 458759, 196608, 7, 524295, 0, 8, 589831, 0, 8, 655367, 0, 8, 720903, 0, 8, 786439, 196608, 2, 851975, 196608, 3, 917511, 196608, 3, 983047, 196608, 3, 196622, 65536, 3, 262158, 65536, 3, 327694, 65536, 3, 393230, 65536, 3, 458766, 65536, 7, 524302, 0, 8, 589838, 0, 8, 655374, 0, 8, 720910, 0, 8, 786446, 65536, 2, 851982, 65536, 3, 917518, 65536, 3, 983054, 65536, 3, 720914, 0, 8, 655378, 0, 8, 589842, 0, 8, 524306, 0, 8, 720913, 0, 8, 655377, 0, 8, 589841, 0, 8, 524305, 0, 8, 720912, 0, 8, 655376, 0, 8, 589840, 0, 8, 524304, 0, 8, 720911, 0, 8, 655375, 0, 8, 589839, 0, 8, 524303, 0, 8, 720902, 0, 8, 655366, 0, 8, 589830, 0, 8, 524294, 0, 8, 720901, 0, 8, 655365, 0, 8, 589829, 0, 8, 524293, 0, 8, 720900, 0, 8, 655364, 0, 8, 589828, 0, 8, 524292, 0, 8, 720899, 0, 8, 655363, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 131072, 7, 786435, 131072, 2, 458756, 131072, 7, 786436, 131072, 2, 458757, 131072, 7, 786437, 131072, 2, 458758, 131072, 7, 786438, 131072, 2, 458767, 131072, 7, 786447, 131072, 2, 458768, 131072, 7, 786448, 131072, 2, 458769, 131072, 7, 786449, 131072, 2, 458770, 131072, 7, 786450, 131072, 2)
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)"
@@ -100,6 +57,18 @@
BirthRect = Vector2i(50, 50)
Altitude = 0
+[node name="EnemyMark17" type="Node2D" parent="."]
+position = Vector2(176, 165)
+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)"
@@ -147,6 +116,18 @@
BirthRect = Vector2i(50, 50)
Altitude = 0
+[node name="EnemyMark18" type="Node2D" parent="."]
+position = Vector2(175, 166)
+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:0,CurrAmmon:10)"
@@ -193,3 +174,15 @@
DelayTime = 1.0
BirthRect = Vector2i(50, 50)
Altitude = 0
+
+[node name="EnemyMark19" type="Node2D" parent="."]
+position = Vector2(175, 164)
+script = ExtResource("3_tkueb")
+Weapon1Id = "0005(ResidueAmmo:0,CurrAmmon:10)"
+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/Room5.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room5.tscn
new file mode 100644
index 0000000..001a211
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room5.tscn
@@ -0,0 +1,124 @@
+[gd_scene load_steps=4 format=3 uid="uid://cllr044e4g3cg"]
+
+[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_657ry"]
+[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_epa54"]
+[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
+
+[node name="Room5" type="TileMap"]
+tile_set = ExtResource("1_657ry")
+format = 2
+layer_0/tile_data = PackedInt32Array(65538, 0, 8, 2, 0, 8, -65534, 0, 8, -65535, 0, 8, -65536, 0, 8, 131071, 0, 8, 65535, 0, 8, -1, 0, 8, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -65537, 0, 8, -131072, 0, 8, 131070, 0, 8, 196607, 0, 8, 196606, 0, 8, -131071, 0, 8, -131070, 0, 8, -65533, 0, 8, 3, 0, 8, -131069, 0, 8, 65539, 0, 8, 327696, 0, 8, 262160, 0, 8, 196624, 0, 8, 131088, 0, 8, 65552, 0, 8, 16, 0, 8, -65520, 0, 8, 327695, 0, 8, 262159, 0, 8, 196623, 0, 8, 131087, 0, 8, 65551, 0, 8, 15, 0, 8, -65521, 0, 8, 327694, 0, 8, 262158, 0, 8, 196622, 0, 8, 131086, 0, 8, 65550, 0, 8, 14, 0, 8, -65522, 0, 8, 327693, 0, 8, 262157, 0, 8, 196621, 0, 8, 131085, 0, 8, 65549, 0, 8, 13, 0, 8, -65523, 0, 8, 589835, 0, 8, 524299, 0, 8, 458763, 0, 8, 393227, 0, 8, 589834, 0, 8, 524298, 0, 8, 458762, 0, 8, 393226, 0, 8, 589833, 0, 8, 524297, 0, 8, 458761, 0, 8, 393225, 0, 8, 589832, 0, 8, 524296, 0, 8, 458760, 0, 8, 393224, 0, 8, 589831, 0, 8, 524295, 0, 8, 458759, 0, 8, 393223, 0, 8, 589830, 0, 8, 524294, 0, 8, 458758, 0, 8, 393222, 0, 8, 589829, 0, 8, 524293, 0, 8, 458757, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 589828, 0, 8, 524292, 0, 8, 458756, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 589827, 0, 8, 524291, 0, 8, 458755, 0, 8, 393219, 0, 8, 327683, 0, 8, 327682, 0, 8, 393215, 0, 8, 327679, 0, 8, 262143, 0, 8, 262142, 0, 8, 327678, 0, 8, 393214, 0, 8, 655363, 0, 8, -131068, 0, 8, 655364, 0, 8, 655365, 0, 8, 655366, 0, 8, 655367, 0, 8, 655368, 0, 8, 655369, 0, 8, 655370, 0, 8, 655371, 0, 8, -131060, 0, 8, -131059, 0, 8, -131058, 0, 8, -131057, 0, 8, -131056, 0, 8, -65519, 65536, 3, 17, 65536, 3, -131055, 65536, 3, 65553, 65536, 3, 131089, 65536, 3, 196625, 65536, 3, 262161, 65536, 3, 327697, 65536, 3, 524302, 0, 8, 458766, 0, 8, 393230, 0, 8, 524301, 0, 8, 458765, 0, 8, 393229, 0, 8, 524300, 0, 8, 458764, 0, 8, 393228, 0, 8, 589837, 131072, 2, 589836, 65536, 2, 589838, 131072, 2, 393231, 65536, 2, 458767, 65536, 3, 524303, 65536, 3, 589839, 851968, 2, 524290, 0, 8, 458754, 0, 8, 393218, 0, 8, 524289, 0, 8, 458753, 0, 8, 524288, 0, 8, 458752, 0, 8, 589823, 0, 8, 524287, 0, 8, 458751, 0, 8, 524286, 0, 8, 458750, 0, 8, 589822, 0, 8, 589824, 131072, 2, 655359, 131072, 2, 655358, 131072, 2, 589825, 131072, 2, 589826, 196608, 2, -196592, 0, 8, -262128, 0, 8, -327664, 0, 8, -196593, 0, 8, -262129, 0, 8, -327665, 0, 8, -196594, 0, 8, -262130, 0, 8, -327666, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, -262133, 0, 8, -327669, 0, 8, -262134, 0, 8, -327670, 0, 8, -262135, 0, 8, -327671, 0, 8, -262136, 0, 8, -327672, 0, 8, -262137, 0, 8, -327673, 0, 8, -262138, 0, 8, -327674, 0, 8, -262139, 0, 8, -327675, 0, 8, -196604, 0, 8, -262140, 0, 8, -327676, 0, 8, -196605, 0, 8, -262141, 0, 8, -327677, 0, 8, -196606, 0, 8, -262142, 0, 8, -327678, 0, 8, -65539, 196608, 3, -3, 196608, 3, -393214, 131072, 7, -393213, 131072, 7, -393212, 131072, 7, -393211, 131072, 7, -393210, 131072, 7, -393209, 131072, 7, -393208, 131072, 7, -393207, 131072, 7, -393206, 131072, 7, -393205, 131072, 7, -393204, 131072, 7, -393203, 131072, 7, -393202, 131072, 7, -393201, 131072, 7, -393200, 131072, 7, -327663, 65536, 3, -262127, 65536, 3, -393199, 65536, 4, -196591, 65536, 3, 131084, 0, 8, 65548, 0, 8, 12, 0, 8, -65524, 0, 8, 131083, 0, 8, 65547, 0, 8, 11, 0, 8, 131082, 0, 8, 65546, 0, 8, 10, 0, 8, 9, 0, 8, 8, 0, 8, 7, 0, 8, 6, 0, 8, 131077, 0, 8, 65541, 0, 8, 5, 0, 8, 131076, 0, 8, 65540, 0, 8, 4, 0, 8, -65532, 0, 8, 131081, 0, 8, 65545, 0, 8, 131080, 0, 8, 65544, 0, 8, 131079, 0, 8, 65543, 0, 8, 131078, 0, 8, 65542, 0, 8, 196614, 0, 8, 196615, 0, 8, -196603, 65536, 2, -196602, 131072, 2, -196601, 131072, 2, -196600, 131072, 2, -196599, 131072, 2, -196598, 131072, 2, -196597, 196608, 2, -131061, 196608, 3, -65525, 196608, 7, -65531, 65536, 7, -65530, 131072, 7, -65529, 131072, 7, -65528, 131072, 7, -65527, 131072, 7, -65526, 131072, 7, -131067, 65536, 3, 327686, 0, 8, 327687, 0, 8, 262150, 0, 8, 393232, 131072, 2, 393233, 851968, 2, 655372, 65536, 3, 655362, 196608, 3, 65533, 196608, 3, 131069, 196608, 3, 196605, 196608, 3, 262141, 196608, 3, 327677, 196608, 3, 393213, 196608, 3, 458749, 196608, 3, 524285, 196608, 3, 589821, 196608, 3, 327688, 0, 8, 262152, 0, 8, 196616, 0, 8, 262151, 0, 8, 196617, 65536, 2, 262153, 65536, 3, 327689, 65536, 7, 196618, 131072, 2, 196619, 131072, 2, 196620, 196608, 2, 262156, 196608, 3, 327692, 196608, 7, 327690, 131072, 7, 327691, 131072, 7, 393217, 0, 8, 327681, 0, 8, 65537, 0, 8, 1, 0, 8, 393216, 0, 8, 327680, 0, 8, 65536, 0, 8, 0, 0, 8, 131072, 65536, 2, 131073, 131072, 2, 131074, 131072, 2, 131075, 196608, 2, 196611, 196608, 3, 262147, 196608, 7, 262144, 65536, 7, 262145, 131072, 7, 262146, 131072, 7, 196608, 65536, 3, 655357, 720896, 2, -262143, 196608, 3, -327679, 196608, 3, -393215, 196608, 4, -196607, 196608, 7, -131075, 196608, 4, -131074, 131072, 7, -131073, 131072, 7, -196608, 131072, 7, 720900, 131072, 2, 720899, 131072, 2, 720898, 720896, 2, 720901, 131072, 2, 720902, 131072, 2, 720903, 131072, 2, 720904, 131072, 2, 720905, 131072, 2, 720906, 131072, 2, 720907, 131072, 2, 720908, 851968, 2)
+script = ExtResource("dungeonRoomTemplate")
+
+[node name="EnemyMark" type="Node2D" parent="."]
+position = Vector2(105, 107)
+script = ExtResource("3_epa54")
+Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+BirthRect = Vector2i(50, 100)
+Altitude = 0
+
+[node name="EnemyMark2" type="Node2D" parent="."]
+position = Vector2(232, -12)
+script = ExtResource("3_epa54")
+Weapon1Id = "0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+DelayTime = 1.0
+BirthRect = Vector2i(50, 100)
+Altitude = 0
+
+[node name="EnemyMark3" type="Node2D" parent="."]
+position = Vector2(17, 3)
+script = ExtResource("3_epa54")
+Weapon1Id = "0006(ResidueAmmo:20,CurrAmmon:0)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+DelayTime = 2.0
+BirthRect = Vector2i(50, 50)
+Altitude = 0
+
+[node name="EnemyMark4" type="Node2D" parent="."]
+position = Vector2(100, 48)
+script = ExtResource("3_epa54")
+Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+BirthRect = Vector2i(50, 50)
+Altitude = 0
+
+[node name="EnemyMark5" type="Node2D" parent="."]
+position = Vector2(33, 116)
+script = ExtResource("3_epa54")
+Weapon1Id = "0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+DelayTime = 1.0
+BirthRect = Vector2i(100, 50)
+Altitude = 0
+
+[node name="EnemyMark6" type="Node2D" parent="."]
+position = Vector2(123, 143)
+script = ExtResource("3_epa54")
+Weapon1Id = "0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+DelayTime = 2.0
+BirthRect = Vector2i(100, 50)
+Altitude = 0
+
+[node name="EnemyMark7" type="Node2D" parent="."]
+position = Vector2(189, 28)
+script = ExtResource("3_epa54")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 3
+BirthRect = Vector2i(100, 30)
+Altitude = 0
+
+[node name="EnemyMark8" type="Node2D" parent="."]
+position = Vector2(189, 28)
+script = ExtResource("3_epa54")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 3
+BirthRect = Vector2i(100, 30)
+Altitude = 0
+
+[node name="EnemyMark9" type="Node2D" parent="."]
+position = Vector2(25, -3)
+script = ExtResource("3_epa54")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 3
+DelayTime = 1.0
+BirthRect = Vector2i(70, 30)
+Altitude = 0
+
+[node name="EnemyMark10" type="Node2D" parent="."]
+position = Vector2(155, -61)
+script = ExtResource("3_epa54")
+Weapon1Id = "0002(ResidueAmmo:7,CurrAmmon:7)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 3
+DelayTime = 2.0
+BirthRect = Vector2i(200, 15)
+Altitude = 0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn
new file mode 100644
index 0000000..31f9ee9
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/battle/Room6.tscn
@@ -0,0 +1,130 @@
+[gd_scene load_steps=4 format=3 uid="uid://d1os2i60rnd0i"]
+
+[ext_resource type="TileSet" uid="uid://b00g22o1cqhe8" path="res://resource/map/tileset/TileSet1.tres" id="1_83m2u"]
+[ext_resource type="Script" path="res://src/framework/map/mark/EnemyMark.cs" id="3_g5jtq"]
+[ext_resource type="Script" path="res://src/framework/map/DungeonRoomTemplate.cs" id="dungeonRoomTemplate"]
+
+[node name="Room6" type="TileMap"]
+tile_set = ExtResource("1_83m2u")
+format = 2
+layer_0/tile_data = PackedInt32Array(393226, 0, 8, 327690, 0, 8, 10, 0, 8, 393225, 0, 8, 327689, 0, 8, 65545, 0, 8, 9, 0, 8, 393224, 0, 8, 327688, 0, 8, 262152, 0, 8, 65544, 0, 8, 8, 0, 8, 393223, 0, 8, 327687, 0, 8, 262151, 0, 8, 393222, 0, 8, 327686, 0, 8, 262150, 0, 8, 196614, 0, 8, 131078, 0, 8, 393221, 0, 8, 327685, 0, 8, 262149, 0, 8, 196613, 0, 8, 131077, 0, 8, 393220, 0, 8, 327684, 0, 8, 262148, 0, 8, 196612, 0, 8, 131076, 0, 8, 393219, 0, 8, 327683, 0, 8, 262147, 0, 8, 196611, 0, 8, 131075, 0, 8, 393218, 0, 8, 327682, 0, 8, 262146, 0, 8, 196610, 0, 8, 131074, 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, 65534, 0, 8, -2, 0, 8, -65538, 0, 8, -65537, 0, 8, -131072, 0, 8, 131070, 0, 8, 196606, 196608, 2, 262142, 196608, 3, 327678, 196608, 3, 393214, 196608, 3, 458750, 196608, 3, 458752, 131072, 2, 524287, 131072, 2, 524286, 720896, 2, -131071, 0, 8, 458753, 131072, 2, 458754, 131072, 2, 458755, 131072, 2, 458756, 131072, 2, 458757, 131072, 2, 458758, 131072, 2, 458759, 131072, 2, 458760, 131072, 2, 458761, 131072, 2, 458762, 131072, 2, -65525, 0, 8, 11, 0, 8, 327691, 0, 8, 393227, 0, 8, 458763, 131072, 2, 65555, 0, 8, 19, 0, 8, -65517, 0, 8, -131053, 0, 8, -196589, 0, 8, -262125, 0, 8, -327661, 0, 8, 65554, 0, 8, 18, 0, 8, -65518, 0, 8, -131054, 0, 8, -196590, 0, 8, -262126, 0, 8, -327662, 0, 8, 65553, 0, 8, 17, 0, 8, -65519, 0, 8, -131055, 0, 8, -196591, 0, 8, -262127, 0, 8, -327663, 0, 8, 65552, 0, 8, 16, 0, 8, -327664, 0, 8, 65551, 0, 8, 15, 0, 8, -327665, 0, 8, 14, 0, 8, -327666, 0, 8, 13, 0, 8, -65523, 0, 8, -131059, 0, 8, -196595, 0, 8, -262131, 0, 8, -327667, 0, 8, 12, 0, 8, -65524, 0, 8, -131060, 0, 8, -196596, 0, 8, -262132, 0, 8, -327668, 0, 8, -262133, 0, 8, -327669, 0, 8, -262134, 0, 8, -327670, 0, 8, -262135, 0, 8, -327671, 0, 8, -262136, 0, 8, -327672, 0, 8, -262137, 0, 8, -327673, 0, 8, -262138, 0, 8, -327674, 0, 8, -262139, 0, 8, -327675, 0, 8, -262140, 0, 8, -327676, 0, 8, -262141, 0, 8, -327677, 0, 8, -262142, 0, 8, -327678, 0, 8, -196607, 0, 8, -262143, 0, 8, -327679, 0, 8, -196608, 0, 8, -262144, 0, 8, -327680, 0, 8, -131073, 0, 8, -196609, 0, 8, -262145, 0, 8, -131074, 0, 8, -196610, 0, 8, -262146, 0, 8, -196611, 196608, 3, -262147, 196608, 3, -327683, 196608, 4, -327682, 131072, 7, -327681, 131072, 7, -131075, 196608, 3, -65539, 196608, 3, -3, 196608, 3, 65533, 196608, 3, 131069, 196608, 3, 196605, 720896, 2, -393216, 131072, 7, -393215, 131072, 7, -393214, 131072, 7, -393213, 131072, 7, -393212, 131072, 7, -393211, 131072, 7, -393210, 131072, 7, -393209, 131072, 7, -393208, 131072, 7, -393207, 131072, 7, -393206, 131072, 7, -393205, 131072, 7, -393204, 131072, 7, -393203, 131072, 7, -393202, 131072, 7, -393201, 131072, 7, 131087, 0, 8, -393200, 131072, 7, 131088, 0, 8, -393199, 131072, 7, 131089, 0, 8, -393198, 131072, 7, 131090, 65536, 2, -393197, 131072, 7, 131091, 131072, 2, -327660, 65536, 3, -262124, 65536, 3, -393196, 65536, 4, -196588, 65536, 3, -131052, 65536, 3, -65516, 65536, 3, 20, 65536, 3, 65556, 65536, 3, 131092, 851968, 2, 65543, 0, 8, 7, 0, 8, 65542, 0, 8, 6, 0, 8, -131061, 0, 8, -196597, 0, 8, -196598, 0, 8, -196599, 0, 8, -196600, 0, 8, -196605, 0, 8, -196606, 0, 8, -131070, 65536, 2, 131086, 0, 8, 65550, 0, 8, 131085, 0, 8, 65549, 0, 8, 65548, 0, 8, 262155, 0, 8, 65547, 0, 8, 65546, 0, 8, 196623, 0, 8, 196622, 0, 8, 196621, 0, 8, 262156, 0, 8, 327692, 0, 8, 196624, 0, 8, -65530, 131072, 7, -65529, 131072, 7, 131079, 65536, 2, -65528, 131072, 7, -65527, 131072, 7, 196615, 65536, 7, 65539, 131072, 7, -65526, 196608, 7, -131062, 196608, 2, -131069, 131072, 2, -131064, 131072, 2, -131063, 131072, 2, -65534, 65536, 3, 2, 65536, 3, 65538, 65536, 7, 131080, 131072, 2, 131081, 131072, 2, 196616, 131072, 7, 393228, 0, 8, 458764, 131072, 2, 458765, 131072, 2, -262128, 0, 8, -262129, 0, 8, -262130, 0, 8, -196594, 65536, 2, -131058, 65536, 3, -65522, 65536, 7, -196593, 131072, 2, -196592, 196608, 2, -131056, 196608, 3, -65520, 196608, 7, -65521, 131072, 7, 196625, 0, 8, 196626, 65536, 3, 262162, 65536, 3, 262153, 65536, 7, 196617, 65536, 4, 262154, 196608, 7, 196618, 196608, 4, 196619, 131072, 7, 196620, 196608, 7, 131084, 196608, 2, 131082, 131072, 2, 131083, 131072, 2, -196603, 131072, 2, -196602, 131072, 2, -196601, 196608, 2, -131065, 720896, 2, -196604, 65536, 2, -131068, 851968, 2, 65540, 196608, 7, 65541, 0, 8, 5, 0, 8, -65531, 131072, 7, 4, 196608, 3, -65532, 196608, 4, 262161, 0, 8, 262160, 0, 8, 393231, 0, 8, 327695, 0, 8, 262159, 0, 8, 393230, 0, 8, 327694, 0, 8, 262158, 0, 8, 393229, 0, 8, 327693, 0, 8, 262157, 0, 8, 458766, 131072, 2, 458767, 131072, 2, 458768, 851968, 2, 327698, 851968, 2, 327696, 65536, 2, 327697, 131072, 2, 393232, 65536, 3)
+script = ExtResource("dungeonRoomTemplate")
+EnableEdit = true
+
+[node name="EnemyMark" type="Node2D" parent="."]
+position = Vector2(51, 77)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
+0002(ResidueAmmo:7,CurrAmmon:7)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+BirthRect = Vector2i(100, 60)
+Altitude = 0
+
+[node name="EnemyMark2" type="Node2D" parent="."]
+position = Vector2(-1, -23)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
+0002(ResidueAmmo:7,CurrAmmon:7)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+DelayTime = 1.0
+BirthRect = Vector2i(30, 60)
+Altitude = 0
+
+[node name="EnemyMark3" type="Node2D" parent="."]
+position = Vector2(200, -27)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
+0002(ResidueAmmo:7,CurrAmmon:7);
+0003(ResidueAmmo:12,CurrAmmon:12)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+DelayTime = 3.0
+BirthRect = Vector2i(20, 60)
+Altitude = 0
+
+[node name="EnemyMark4" type="Node2D" parent="."]
+position = Vector2(261, 43)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0001(ResidueAmmo:15,CurrAmmon:15);
+0002(ResidueAmmo:7,CurrAmmon:7);
+0003(ResidueAmmo:12,CurrAmmon:12)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+DelayTime = 3.0
+BirthRect = Vector2i(20, 60)
+Altitude = 0
+
+[node name="EnemyMark5" type="Node2D" parent="."]
+position = Vector2(233, 61)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
+0006(ResidueAmmo:20,CurrAmmon:20);
+0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+BirthRect = Vector2i(20, 90)
+Altitude = 0
+
+[node name="EnemyMark6" type="Node2D" parent="."]
+position = Vector2(155, 19)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
+0006(ResidueAmmo:20,CurrAmmon:20);
+0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+DelayTime = 1.0
+BirthRect = Vector2i(100, 10)
+Altitude = 0
+
+[node name="EnemyMark7" type="Node2D" parent="."]
+position = Vector2(75, -61)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
+0006(ResidueAmmo:20,CurrAmmon:20);
+0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+DelayTime = 2.0
+BirthRect = Vector2i(100, 10)
+Altitude = 0
+
+[node name="EnemyMark8" type="Node2D" parent="."]
+position = Vector2(47, 69)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
+0006(ResidueAmmo:20,CurrAmmon:20);
+0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+DelayTime = 3.0
+BirthRect = Vector2i(100, 50)
+Altitude = 0
+
+[node name="EnemyMark9" type="Node2D" parent="."]
+position = Vector2(178, -54)
+script = ExtResource("3_g5jtq")
+Weapon1Id = "0005(ResidueAmmo:5,CurrAmmon:5);
+0006(ResidueAmmo:20,CurrAmmon:20);
+0007(ResidueAmmo:30,CurrAmmon:30)"
+Type = 4
+ItemExpression = "0001"
+Layer = 1
+WaveNumber = 2
+DelayTime = 4.0
+BirthRect = Vector2i(70, 20)
+Altitude = 0
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
index c251cda..381e5d5 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
+++ b/DungeonShooting_Godot/resource/map/tileMaps/testGroup/inlet/Room1.tscn
@@ -23,13 +23,6 @@
ItemExpression = "0003"
WaveNumber = 2
-[node name="ActivityMark22" type="Node2D" parent="."]
-position = Vector2(63, 73)
-script = ExtResource("3_m4jrh")
-Type = 5
-ItemExpression = "0007"
-WaveNumber = 2
-
[node name="ActivityMark8" type="Node2D" parent="."]
position = Vector2(126, 41)
script = ExtResource("3_m4jrh")
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json
index 634f49d..464869f 100644
--- a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json
+++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room4.json
@@ -98,19 +98,19 @@
"Y": 368
},
{
- "X": 280,
+ "X": 264,
"Y": 368
},
{
- "X": 280,
+ "X": 264,
"Y": 304
},
{
- "X": 72,
+ "X": 88,
"Y": 304
},
{
- "X": 72,
+ "X": 88,
"Y": 368
},
{
@@ -139,19 +139,114 @@
"Type": 1,
"Points": [
{
+ "X": 88,
+ "Y": 32
+ },
+ {
+ "X": 136,
+ "Y": 32
+ },
+ {
+ "X": 136,
+ "Y": 136
+ },
+ {
"X": 24,
+ "Y": 136
+ },
+ {
+ "X": 24,
+ "Y": 96
+ },
+ {
+ "X": 88,
+ "Y": 96
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 216,
"Y": 32
},
{
- "X": 328,
+ "X": 264,
"Y": 32
},
{
+ "X": 264,
+ "Y": 96
+ },
+ {
"X": 328,
+ "Y": 96
+ },
+ {
+ "X": 328,
+ "Y": 136
+ },
+ {
+ "X": 216,
+ "Y": 136
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 24,
+ "Y": 192
+ },
+ {
+ "X": 136,
+ "Y": 192
+ },
+ {
+ "X": 136,
"Y": 280
},
{
+ "X": 88,
+ "Y": 280
+ },
+ {
+ "X": 88,
+ "Y": 232
+ },
+ {
"X": 24,
+ "Y": 232
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 216,
+ "Y": 192
+ },
+ {
+ "X": 328,
+ "Y": 192
+ },
+ {
+ "X": 328,
+ "Y": 232
+ },
+ {
+ "X": 264,
+ "Y": 232
+ },
+ {
+ "X": 264,
+ "Y": 280
+ },
+ {
+ "X": 216,
"Y": 280
}
]
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room5.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room5.json
new file mode 100644
index 0000000..5e6371c
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room5.json
@@ -0,0 +1,154 @@
+{
+ "Position": {
+ "X": -3,
+ "Y": -6
+ },
+ "Size": {
+ "X": 21,
+ "Y": 18
+ },
+ "DoorAreaInfos": [
+ {
+ "Direction": 0,
+ "Start": 16,
+ "End": 192
+ },
+ {
+ "Direction": 3,
+ "Start": 80,
+ "End": 320
+ },
+ {
+ "Direction": 1,
+ "Start": 64,
+ "End": 240
+ },
+ {
+ "Direction": 2,
+ "Start": 96,
+ "End": 240
+ }
+ ],
+ "NavigationList": [
+ {
+ "Type": 0,
+ "Points": [
+ {
+ "X": 40,
+ "Y": -72
+ },
+ {
+ "X": 264,
+ "Y": -72
+ },
+ {
+ "X": 264,
+ "Y": 96
+ },
+ {
+ "X": 232,
+ "Y": 96
+ },
+ {
+ "X": 232,
+ "Y": 144
+ },
+ {
+ "X": 184,
+ "Y": 144
+ },
+ {
+ "X": 184,
+ "Y": 176
+ },
+ {
+ "X": 56,
+ "Y": 176
+ },
+ {
+ "X": 56,
+ "Y": 144
+ },
+ {
+ "X": -24,
+ "Y": 144
+ },
+ {
+ "X": -24,
+ "Y": -24
+ },
+ {
+ "X": 40,
+ "Y": -24
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 72,
+ "Y": -48
+ },
+ {
+ "X": 200,
+ "Y": -48
+ },
+ {
+ "X": 200,
+ "Y": 8
+ },
+ {
+ "X": 72,
+ "Y": 8
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": -8,
+ "Y": 32
+ },
+ {
+ "X": 72,
+ "Y": 32
+ },
+ {
+ "X": 72,
+ "Y": 88
+ },
+ {
+ "X": -8,
+ "Y": 88
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 136,
+ "Y": 48
+ },
+ {
+ "X": 216,
+ "Y": 48
+ },
+ {
+ "X": 216,
+ "Y": 104
+ },
+ {
+ "X": 136,
+ "Y": 104
+ }
+ ]
+ }
+ ],
+ "GroupName": "testGroup",
+ "RoomType": 0,
+ "FileName": "Room5",
+ "Weight": 100
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room6.json b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room6.json
new file mode 100644
index 0000000..7d83388
--- /dev/null
+++ b/DungeonShooting_Godot/resource/map/tiledata/testGroup/battle/Room6.json
@@ -0,0 +1,186 @@
+{
+ "Position": {
+ "X": -3,
+ "Y": -6
+ },
+ "Size": {
+ "X": 24,
+ "Y": 14
+ },
+ "DoorAreaInfos": [
+ {
+ "Direction": 3,
+ "Start": 16,
+ "End": 368
+ },
+ {
+ "Direction": 0,
+ "Start": 16,
+ "End": 128
+ },
+ {
+ "Direction": 2,
+ "Start": 32,
+ "End": 272
+ },
+ {
+ "Direction": 1,
+ "Start": 16,
+ "End": 128
+ }
+ ],
+ "NavigationList": [
+ {
+ "Type": 0,
+ "Points": [
+ {
+ "X": -24,
+ "Y": -72
+ },
+ {
+ "X": 312,
+ "Y": -72
+ },
+ {
+ "X": 312,
+ "Y": 32
+ },
+ {
+ "X": 280,
+ "Y": 32
+ },
+ {
+ "X": 280,
+ "Y": 80
+ },
+ {
+ "X": 248,
+ "Y": 80
+ },
+ {
+ "X": 248,
+ "Y": 112
+ },
+ {
+ "X": -8,
+ "Y": 112
+ },
+ {
+ "X": -8,
+ "Y": 32
+ },
+ {
+ "X": -24,
+ "Y": 32
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 56,
+ "Y": -48
+ },
+ {
+ "X": 136,
+ "Y": -48
+ },
+ {
+ "X": 136,
+ "Y": -32
+ },
+ {
+ "X": 184,
+ "Y": -32
+ },
+ {
+ "X": 184,
+ "Y": 8
+ },
+ {
+ "X": 88,
+ "Y": 8
+ },
+ {
+ "X": 88,
+ "Y": 40
+ },
+ {
+ "X": 24,
+ "Y": 40
+ },
+ {
+ "X": 24,
+ "Y": -32
+ },
+ {
+ "X": 56,
+ "Y": -32
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 216,
+ "Y": -48
+ },
+ {
+ "X": 280,
+ "Y": -48
+ },
+ {
+ "X": 280,
+ "Y": 8
+ },
+ {
+ "X": 216,
+ "Y": 8
+ }
+ ]
+ },
+ {
+ "Type": 1,
+ "Points": [
+ {
+ "X": 104,
+ "Y": 32
+ },
+ {
+ "X": 216,
+ "Y": 32
+ },
+ {
+ "X": 216,
+ "Y": 72
+ },
+ {
+ "X": 184,
+ "Y": 72
+ },
+ {
+ "X": 184,
+ "Y": 88
+ },
+ {
+ "X": 136,
+ "Y": 88
+ },
+ {
+ "X": 136,
+ "Y": 72
+ },
+ {
+ "X": 104,
+ "Y": 72
+ }
+ ]
+ }
+ ],
+ "GroupName": "testGroup",
+ "RoomType": 0,
+ "FileName": "Room6",
+ "Weight": 100
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/theme/mainTheme.tres b/DungeonShooting_Godot/resource/theme/mainTheme.tres
index 6243ca5..895ea5d 100644
--- a/DungeonShooting_Godot/resource/theme/mainTheme.tres
+++ b/DungeonShooting_Godot/resource/theme/mainTheme.tres
@@ -352,7 +352,7 @@
[sub_resource type="ImageTexture" id="58"]
-[sub_resource type="Image" id="Image_p1bsv"]
+[sub_resource type="Image" id="Image_wuwj5"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 66, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 66, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 39, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 39, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 1, 255, 255, 255, 39, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 39, 255, 255, 255, 1, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -362,7 +362,7 @@
}
[sub_resource type="ImageTexture" id="60"]
-image = SubResource("Image_p1bsv")
+image = SubResource("Image_wuwj5")
[sub_resource type="StyleBoxTexture" id="61"]
content_margin_left = 2.0
@@ -372,7 +372,7 @@
texture = SubResource("60")
region_rect = Rect2(0, 0, 12, 12)
-[sub_resource type="Image" id="Image_s40kn"]
+[sub_resource type="Image" id="Image_nrr6i"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 248, 248, 248, 0, 248, 248, 248, 164, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 164, 248, 248, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, 247, 247, 0, 247, 247, 247, 97, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 248, 248, 248, 186, 247, 247, 247, 97, 247, 247, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 191, 191, 191, 4, 247, 247, 247, 98, 248, 248, 248, 167, 248, 248, 248, 167, 247, 247, 247, 98, 191, 191, 191, 4, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 191, 191, 0, 247, 247, 247, 0, 248, 248, 248, 0, 248, 248, 248, 0, 247, 247, 247, 0, 191, 191, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -382,7 +382,7 @@
}
[sub_resource type="ImageTexture" id="63"]
-image = SubResource("Image_s40kn")
+image = SubResource("Image_nrr6i")
[sub_resource type="StyleBoxTexture" id="64"]
content_margin_left = 2.0
@@ -392,7 +392,7 @@
texture = SubResource("63")
region_rect = Rect2(0, 0, 12, 12)
-[sub_resource type="Image" id="Image_4htof"]
+[sub_resource type="Image" id="Image_qxe4e"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 173, 173, 0, 173, 173, 173, 163, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 163, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 172, 172, 0, 172, 172, 172, 96, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 173, 173, 173, 185, 172, 172, 172, 96, 172, 172, 172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 127, 127, 127, 4, 173, 173, 173, 97, 173, 173, 173, 166, 173, 173, 173, 166, 173, 173, 173, 97, 127, 127, 127, 4, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 173, 173, 173, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -402,7 +402,7 @@
}
[sub_resource type="ImageTexture" id="66"]
-image = SubResource("Image_4htof")
+image = SubResource("Image_qxe4e")
[sub_resource type="StyleBoxTexture" id="67"]
content_margin_left = 2.0
@@ -412,7 +412,7 @@
texture = SubResource("66")
region_rect = Rect2(0, 0, 12, 12)
-[sub_resource type="Image" id="Image_28mrc"]
+[sub_resource type="Image" id="Image_iplm4"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 16, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 16, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 16, 255, 255, 255, 16, 255, 255, 255, 4, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -422,7 +422,7 @@
}
[sub_resource type="ImageTexture" id="69"]
-image = SubResource("Image_28mrc")
+image = SubResource("Image_iplm4")
[sub_resource type="StyleBoxTexture" id="70"]
content_margin_left = 0.0
@@ -446,7 +446,7 @@
content_margin_right = 4.0
content_margin_bottom = 4.0
-[sub_resource type="Image" id="Image_cs85u"]
+[sub_resource type="Image" id="Image_trdur"]
data = {
"data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 228, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 228, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 18, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 17, 255, 255, 255, 186, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 191, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 187, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 187, 255, 255, 255, 229, 255, 255, 255, 188, 255, 255, 255, 18, 255, 255, 255, 19, 255, 255, 255, 188, 255, 255, 255, 229, 255, 255, 255, 186, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 17, 255, 255, 255, 185, 255, 255, 255, 229, 255, 255, 255, 189, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 189, 255, 255, 255, 229, 255, 255, 255, 185, 255, 255, 255, 17, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 229, 255, 255, 255, 190, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 190, 255, 255, 255, 229, 255, 255, 255, 76, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 77, 255, 255, 255, 19, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 77, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
"format": "RGBA8",
@@ -456,7 +456,7 @@
}
[sub_resource type="ImageTexture" id="56"]
-image = SubResource("Image_cs85u")
+image = SubResource("Image_trdur")
[sub_resource type="StyleBoxFlat" id="57"]
content_margin_left = 6.0