diff --git a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json index 78189d4..2d1d0d5 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json @@ -1,397 +1 @@ -[ - { - "Name": "Preinstall1", - "Weight": 100, - "Remark": "", - "AutoFill": true, - "WaveList": [ - [ - { - "Position": { - "X": 39, - "Y": 8 - }, - "Size": { - "X": 0, - "Y": 0 - }, - "SpecialMarkType": 1, - "DelayTime": 0, - "MarkList": [] - }, - { - "Position": { - "X": -16, - "Y": -18 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0001", - "Weight": 100, - "Attr": { - "CurrAmmon": "30", - "ResidueAmmo": "210" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 66, - "Y": 6 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0009", - "Weight": 100, - "Attr": { - "CurrAmmon": "1", - "ResidueAmmo": "25" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 66, - "Y": 47 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0010", - "Weight": 100, - "Attr": { - "CurrAmmon": "10", - "ResidueAmmo": "120" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 47, - "Y": -32 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0008", - "Weight": 100, - "Attr": { - "CurrAmmon": "10", - "ResidueAmmo": "120" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 23, - "Y": 37 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "prop0010", - "Weight": 100, - "Attr": null, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 2, - "Y": 18 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "prop0005", - "Weight": 100, - "Attr": null, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 24, - "Y": -30 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0006", - "Weight": 100, - "Attr": { - "CurrAmmon": "20", - "ResidueAmmo": "300" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 40, - "Y": -10 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0003", - "Weight": 100, - "Attr": { - "CurrAmmon": "12", - "ResidueAmmo": "90" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 2, - "Y": -37 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0007", - "Weight": 100, - "Attr": { - "CurrAmmon": "60", - "ResidueAmmo": "300" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": -2, - "Y": 47 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0002", - "Weight": 100, - "Attr": { - "CurrAmmon": "7", - "ResidueAmmo": "70" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 29, - "Y": 63 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0013", - "Weight": 100, - "Attr": { - "CurrAmmon": "50", - "ResidueAmmo": "250" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": -30, - "Y": 39 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "prop0003", - "Weight": 100, - "Attr": null, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": -19, - "Y": 71 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "prop0003", - "Weight": 100, - "Attr": null, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 48, - "Y": 29 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0004", - "Weight": 100, - "Attr": { - "CurrAmmon": "180", - "ResidueAmmo": "90" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": 20, - "Y": 94 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0014", - "Weight": 100, - "Attr": { - "CurrAmmon": "5", - "ResidueAmmo": "60" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - }, - { - "Position": { - "X": -14, - "Y": 97 - }, - "Size": { - "X": 16, - "Y": 16 - }, - "SpecialMarkType": 0, - "DelayTime": 0, - "MarkList": [ - { - "Id": "weapon0011", - "Weight": 100, - "Attr": { - "CurrAmmon": "20", - "ResidueAmmo": "300" - }, - "Altitude": 8, - "VerticalSpeed": 0 - } - ] - } - ] - ] - } -] \ No newline at end of file +[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":false,"WaveList":[[{"Position":{"X":39,"Y":8},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]},{"Position":{"X":-16,"Y":-18},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0001","Weight":100,"Attr":{"CurrAmmon":"30","ResidueAmmo":"210"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":66,"Y":6},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0009","Weight":100,"Attr":{"CurrAmmon":"1","ResidueAmmo":"25"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":66,"Y":47},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0010","Weight":100,"Attr":{"CurrAmmon":"10","ResidueAmmo":"120"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":47,"Y":-32},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0008","Weight":100,"Attr":{"CurrAmmon":"10","ResidueAmmo":"120"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":23,"Y":37},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0010","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":2,"Y":18},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0005","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":24,"Y":-30},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0006","Weight":100,"Attr":{"CurrAmmon":"20","ResidueAmmo":"300"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":40,"Y":-10},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0003","Weight":100,"Attr":{"CurrAmmon":"12","ResidueAmmo":"90"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":2,"Y":-37},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0007","Weight":100,"Attr":{"CurrAmmon":"60","ResidueAmmo":"300"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-2,"Y":47},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0002","Weight":100,"Attr":{"CurrAmmon":"7","ResidueAmmo":"70"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":29,"Y":63},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0013","Weight":100,"Attr":{"CurrAmmon":"50","ResidueAmmo":"250"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-30,"Y":39},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0003","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-19,"Y":71},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"prop0003","Weight":100,"Attr":null,"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":48,"Y":29},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0004","Weight":100,"Attr":{"CurrAmmon":"180","ResidueAmmo":"90"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":20,"Y":94},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0014","Weight":100,"Attr":{"CurrAmmon":"5","ResidueAmmo":"60"},"Altitude":8,"VerticalSpeed":0}]},{"Position":{"X":-14,"Y":97},"Size":{"X":16,"Y":16},"SpecialMarkType":0,"DelayTime":0,"MarkList":[{"Id":"weapon0011","Weight":100,"Attr":{"CurrAmmon":"20","ResidueAmmo":"300"},"Altitude":8,"VerticalSpeed":0}]}]]}] \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs index 46ed76a..ed605f4 100644 --- a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs +++ b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs @@ -109,7 +109,7 @@ public override int OnSort(UiCell other) { - if (Data.Preloading == other.Data.Preloading) + if (Data.Preloading && other.Data.Preloading) { return 0; }