diff --git a/DungeonShooting_Godot/excel/ActivityBase.xlsx b/DungeonShooting_Godot/excel/ActivityBase.xlsx index 49ee83e..a839ad2 100644 --- a/DungeonShooting_Godot/excel/ActivityBase.xlsx +++ b/DungeonShooting_Godot/excel/ActivityBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/BulletBase.xlsx b/DungeonShooting_Godot/excel/BulletBase.xlsx index bdc5175..e3f1e11 100644 --- a/DungeonShooting_Godot/excel/BulletBase.xlsx +++ b/DungeonShooting_Godot/excel/BulletBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/EnemyBase.xlsx b/DungeonShooting_Godot/excel/EnemyBase.xlsx index 89c0096..e54451e 100644 --- a/DungeonShooting_Godot/excel/EnemyBase.xlsx +++ b/DungeonShooting_Godot/excel/EnemyBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/WeaponBase.xlsx b/DungeonShooting_Godot/excel/WeaponBase.xlsx index 9aff6cb..d4ad41a 100644 --- a/DungeonShooting_Godot/excel/WeaponBase.xlsx +++ b/DungeonShooting_Godot/excel/WeaponBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn index 9fe3cb3..4dfced6 100644 --- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0007.tscn @@ -50,7 +50,7 @@ material = SubResource("ShaderMaterial_v77gw") [node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] -modulate = Color(1.8, 1.8, 1.8, 1) +modulate = Color(2, 2, 2, 1) material = SubResource("ShaderMaterial_r6pkp") sprite_frames = ExtResource("3_c1ec6") diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn new file mode 100644 index 0000000..838ada7 --- /dev/null +++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0008.tscn @@ -0,0 +1,66 @@ +[gd_scene load_steps=8 format=3 uid="uid://d3dcmte122p6t"] + +[ext_resource type="Script" path="res://src/game/activity/bullet/normal/ColorBullet.cs" id="1_qqm5l"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="2_t3qw6"] +[ext_resource type="SpriteFrames" uid="uid://ubdvau75andr" path="res://resource/spriteFrames/bullet/Bullet0008.tres" id="3_aoni0"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_v77gw"] +resource_local_to_scene = true +shader = ExtResource("2_t3qw6") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1.0 +shader_parameter/modulate = Color(1, 1, 1, 1) +shader_parameter/show_outline = false +shader_parameter/outline_color = Color(0, 0, 0, 1) +shader_parameter/outline_rainbow = false +shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_jypdq"] +resource_local_to_scene = true +shader = ExtResource("2_t3qw6") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0.0 +shader_parameter/modulate = Color(1, 1, 1, 1) +shader_parameter/show_outline = false +shader_parameter/outline_color = Color(0, 0, 0, 1) +shader_parameter/outline_rainbow = false +shader_parameter/outline_use_blend = false +shader_parameter/grey = 0.0 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_5x14b"] +size = Vector2(22, 3) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_72d75"] +size = Vector2(22, 3) + +[node name="Bullet0008" type="CharacterBody2D" node_paths=PackedStringArray("CollisionArea", "CollisionShape2D", "Particles2D", "ShadowSprite", "AnimatedSprite", "Collision")] +collision_layer = 2 +collision_mask = 0 +script = ExtResource("1_qqm5l") +CollisionArea = NodePath("AnimatedSprite/CollisionArea") +CollisionShape2D = NodePath("AnimatedSprite/CollisionArea/CollisionShape2D") +Particles2D = [] +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" type="Sprite2D" parent="."] +z_index = -1 +material = SubResource("ShaderMaterial_v77gw") + +[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."] +modulate = Color(1.6, 1.6, 1.6, 1) +material = SubResource("ShaderMaterial_jypdq") +sprite_frames = ExtResource("3_aoni0") + +[node name="CollisionArea" type="Area2D" parent="AnimatedSprite"] +collision_layer = 0 +collision_mask = 0 +monitorable = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="AnimatedSprite/CollisionArea"] +shape = SubResource("RectangleShape2D_5x14b") + +[node name="Collision" type="CollisionShape2D" parent="."] +shape = SubResource("RectangleShape2D_72d75") diff --git a/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn b/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn new file mode 100644 index 0000000..278775a --- /dev/null +++ b/DungeonShooting_Godot/prefab/weapon/Weapon0011.tscn @@ -0,0 +1,61 @@ +[gd_scene load_steps=8 format=3 uid="uid://c17ol2s34ehp7"] + +[ext_resource type="PackedScene" uid="uid://cxltmhhp4rbyk" path="res://prefab/weapon/WeaponTemplate.tscn" id="1_fgcwf"] +[ext_resource type="Script" path="res://src/game/activity/weapon/gun/Gun.cs" id="2_m84k4"] +[ext_resource type="Shader" path="res://resource/material/Blend.gdshader" id="3_4rq0j"] +[ext_resource type="SpriteFrames" uid="uid://xvfg1a0xj7ng" path="res://resource/spriteFrames/weapon/Weapon0011.tres" id="4_bnkqc"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_m6bme"] +resource_local_to_scene = true +shader = ExtResource("3_4rq0j") +shader_parameter/blend = Color(0, 0, 0, 0.470588) +shader_parameter/schedule = 1.0 +shader_parameter/modulate = Color(1, 1, 1, 1) +shader_parameter/show_outline = true +shader_parameter/outline_color = Color(0, 0, 0, 1) +shader_parameter/outline_rainbow = false +shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_fqjj0"] +resource_local_to_scene = true +shader = ExtResource("3_4rq0j") +shader_parameter/blend = Color(1, 1, 1, 1) +shader_parameter/schedule = 0.0 +shader_parameter/modulate = Color(1, 1, 1, 1) +shader_parameter/show_outline = true +shader_parameter/outline_color = Color(0, 0, 0, 1) +shader_parameter/outline_rainbow = false +shader_parameter/outline_use_blend = true +shader_parameter/grey = 0.0 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_iq77m"] +size = Vector2(20, 8) + +[node name="Weapon0011" node_paths=PackedStringArray("FirePoint", "ShellPoint", "AnimationPlayer", "ShadowSprite", "AnimatedSprite", "Collision") instance=ExtResource("1_fgcwf")] +script = ExtResource("2_m84k4") +FirePoint = NodePath("AnimatedSprite/FirePoint") +ShellPoint = NodePath("AnimatedSprite/ShellPoint") +AnimationPlayer = NodePath("AnimationPlayer") +ShadowSprite = NodePath("ShadowSprite") +AnimatedSprite = NodePath("AnimatedSprite") +Collision = NodePath("Collision") + +[node name="ShadowSprite" parent="." index="0"] +material = SubResource("ShaderMaterial_m6bme") + +[node name="AnimatedSprite" parent="." index="1"] +material = SubResource("ShaderMaterial_fqjj0") +position = Vector2(3, -1) +sprite_frames = ExtResource("4_bnkqc") + +[node name="ShellPoint" parent="AnimatedSprite" index="0"] +position = Vector2(-4, -2) + +[node name="FirePoint" parent="AnimatedSprite" index="1"] +position = Vector2(15, -0.5) + +[node name="Collision" parent="." index="2"] +visible = true +position = Vector2(3, 0) +shape = SubResource("RectangleShape2D_iq77m") diff --git a/DungeonShooting_Godot/resource/config/ActivityBase.json b/DungeonShooting_Godot/resource/config/ActivityBase.json index d5e4bf7..f4b0604 100644 --- a/DungeonShooting_Godot/resource/config/ActivityBase.json +++ b/DungeonShooting_Godot/resource/config/ActivityBase.json @@ -182,6 +182,20 @@ "ShowInMapEditor": true }, { + "Id": "weapon0011", + "Type": 5, + "Name": "weapon0011", + "Quality": 5, + "Price": 0, + "Intro": "", + "Details": "", + "IsStatic": false, + "__Material": "", + "Prefab": "res://prefab/weapon/Weapon0011.tscn", + "Icon": "res://resource/sprite/weapon/weapon0011/Weapon0011.png", + "ShowInMapEditor": true + }, + { "Id": "weapon0013", "Type": 5, "Name": "P90", @@ -308,6 +322,20 @@ "ShowInMapEditor": false }, { + "Id": "bullet0008", + "Type": 6, + "Name": "", + "Quality": 0, + "Price": 0, + "Intro": "", + "Details": "", + "IsStatic": false, + "__Material": "0003", + "Prefab": "res://prefab/bullet/normal/Bullet0008.tscn", + "Icon": "", + "ShowInMapEditor": false + }, + { "Id": "shell0001", "Type": 7, "Name": "", diff --git a/DungeonShooting_Godot/resource/config/BulletBase.json b/DungeonShooting_Godot/resource/config/BulletBase.json index c4e5105..6c5d4f9 100644 --- a/DungeonShooting_Godot/resource/config/BulletBase.json +++ b/DungeonShooting_Godot/resource/config/BulletBase.json @@ -281,6 +281,41 @@ ] }, { + "Id": "0009", + "Name": "\u5B50\u5F395", + "Type": 1, + "Prefab": "bullet0008", + "HarmRange": [ + 4 + ], + "RepelRange": [ + 15 + ], + "DeviationAngleRange": [ + 0 + ], + "SpeedRange": [ + 350, + 380 + ], + "LifeTimeRange": [ + -1 + ], + "DistanceRange": [ + 400, + 450 + ], + "VerticalSpeed": [ + 0 + ], + "BounceCount": [ + 0 + ], + "Penetration": [ + 0 + ] + }, + { "Id": "1001", "Name": "\u6FC0\u51491", "Type": 2, diff --git a/DungeonShooting_Godot/resource/config/EnemyBase.json b/DungeonShooting_Godot/resource/config/EnemyBase.json index 3c402ce..657b2b7 100644 --- a/DungeonShooting_Godot/resource/config/EnemyBase.json +++ b/DungeonShooting_Godot/resource/config/EnemyBase.json @@ -20,7 +20,7 @@ "Id": "0002", "__Activity": "enemy0002", "Remark": "\u654C\u4EBA2", - "Hp": 20, + "Hp": 25, "MoveSpeed": 120, "Acceleration": 1500, "Friction": 900, diff --git a/DungeonShooting_Godot/resource/config/WeaponBase.json b/DungeonShooting_Godot/resource/config/WeaponBase.json index 609b751..357052f 100644 --- a/DungeonShooting_Godot/resource/config/WeaponBase.json +++ b/DungeonShooting_Godot/resource/config/WeaponBase.json @@ -52,7 +52,7 @@ "__Bullet": "0001", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -126,7 +126,7 @@ "__Bullet": "0001", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -200,7 +200,7 @@ "__Bullet": "0002", "__Shell": "shell0002", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0.2, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -274,7 +274,7 @@ "__Bullet": "0002", "__Shell": "shell0002", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0.2, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -348,7 +348,7 @@ "__Bullet": "0001", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -422,7 +422,7 @@ "__Bullet": "0001", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -642,7 +642,7 @@ "__Bullet": "0004", "__Shell": "shell0003", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0.2, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -716,7 +716,7 @@ "__Bullet": "0004", "__Shell": "shell0003", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0.2, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -790,7 +790,7 @@ "__Bullet": "0002", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -864,7 +864,7 @@ "__Bullet": "0002", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -938,7 +938,7 @@ "__Bullet": "0003", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1012,7 +1012,7 @@ "__Bullet": "0003", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1086,7 +1086,7 @@ "__Bullet": "1001", "__Shell": "", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1160,7 +1160,7 @@ "__Bullet": "1001", "__Shell": "", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1234,7 +1234,7 @@ "__Bullet": "0005", "__Shell": "shell0004", "ReloadThrowShell": true, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0.46, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1308,7 +1308,7 @@ "__Bullet": "0005", "__Shell": "shell0004", "ReloadThrowShell": true, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0.46, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1382,7 +1382,7 @@ "__Bullet": "0007", "__Shell": "", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1456,7 +1456,7 @@ "__Bullet": "0007", "__Shell": "", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1478,6 +1478,154 @@ "__AiAttackAttr": "0009" }, { + "Id": "0011", + "Remark": "weapon0011", + "__Activity": "weapon0011", + "Weight": 30, + "WeightType": 2, + "IsMelee": false, + "ContinuousShoot": true, + "AmmoCapacity": 20, + "MaxAmmoCapacity": 600, + "StandbyAmmoCapacity": 580, + "ReloadTime": 1.8, + "AloneReload": false, + "AloneReloadCount": 1, + "AloneReloadBeginIntervalTime": 0, + "AloneReloadFinishIntervalTime": 0, + "AloneReloadCanShoot": false, + "LooseShoot": false, + "MinChargeTime": 0, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, + "BeLoadedTime": 0, + "ContinuousCountRange": [ + 1 + ], + "TriggerInterval": 0, + "StartFiringSpeed": 700, + "FinalFiringSpeed": 700, + "FiringSpeedAddSpeed": 0, + "FiringSpeedBackSpeed": 0, + "FiringSpeedBackTime": 0, + "FireBulletCountRange": [ + 1 + ], + "DelayedTime": 0, + "StartScatteringRange": 3, + "FinalScatteringRange": 30, + "ScatteringRangeAddValue": 2, + "ScatteringRangeBackSpeed": 40, + "ScatteringRangeBackDelayTime": 0.3, + "CameraShake": 2, + "BacklashRange": [ + 1, + 2 + ], + "BacklashRegressionSpeed": 35, + "UpliftAngle": 5, + "DefaultAngle": 0, + "UpliftAngleRestore": 1, + "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn", + "__Bullet": "0009", + "__Shell": "", + "ReloadThrowShell": false, + "ThrowShellCount": 0, + "ThrowShellDelayTime": 0, + "CanMeleeAttack": true, + "MeleeAttackHarmRange": [ + 10 + ], + "MeleeAttackRepelRange": [ + 100 + ], + "__ShootSound": "shooting0002", + "__BeginReloadSound": "reloadBegin0005", + "BeginReloadSoundDelayTime": 0, + "__ReloadSound": "", + "ReloadSoundDelayTime": 0, + "__ReloadFinishSound": "beLoaded0016", + "ReloadFinishSoundAdvanceTime": 0.6, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, + "__OtherSoundMap": null, + "__AiAttackAttr": "" + }, + { + "Id": "0011_ai", + "Remark": "weapon0011", + "__Activity": "", + "Weight": 30, + "WeightType": 2, + "IsMelee": false, + "ContinuousShoot": false, + "AmmoCapacity": 20, + "MaxAmmoCapacity": 600, + "StandbyAmmoCapacity": 580, + "ReloadTime": 1.8, + "AloneReload": false, + "AloneReloadCount": 1, + "AloneReloadBeginIntervalTime": 0, + "AloneReloadFinishIntervalTime": 0, + "AloneReloadCanShoot": false, + "LooseShoot": false, + "MinChargeTime": 0, + "ManualBeLoaded": false, + "AutoManualBeLoaded": false, + "BeLoadedTime": 0, + "ContinuousCountRange": [ + 5 + ], + "TriggerInterval": 3, + "StartFiringSpeed": 700, + "FinalFiringSpeed": 700, + "FiringSpeedAddSpeed": 0, + "FiringSpeedBackSpeed": 0, + "FiringSpeedBackTime": 0, + "FireBulletCountRange": [ + 1 + ], + "DelayedTime": 0, + "StartScatteringRange": 3, + "FinalScatteringRange": 30, + "ScatteringRangeAddValue": 2, + "ScatteringRangeBackSpeed": 30, + "ScatteringRangeBackDelayTime": 0.3, + "CameraShake": 2, + "BacklashRange": [ + 1, + 2 + ], + "BacklashRegressionSpeed": 35, + "UpliftAngle": 5, + "DefaultAngle": 0, + "UpliftAngleRestore": 1, + "FireEffect": "res://prefab/effect/weapon/ShotFire0001.tscn", + "__Bullet": "0009", + "__Shell": "", + "ReloadThrowShell": false, + "ThrowShellCount": 0, + "ThrowShellDelayTime": 0, + "CanMeleeAttack": true, + "MeleeAttackHarmRange": [ + 10 + ], + "MeleeAttackRepelRange": [ + 100 + ], + "__ShootSound": "shooting0002", + "__BeginReloadSound": "reloadBegin0005", + "BeginReloadSoundDelayTime": 0, + "__ReloadSound": "", + "ReloadSoundDelayTime": 0, + "__ReloadFinishSound": "beLoaded0016", + "ReloadFinishSoundAdvanceTime": 0.6, + "__BeLoadedSound": "", + "BeLoadedSoundDelayTime": 0, + "__OtherSoundMap": null, + "__AiAttackAttr": "0004" + }, + { "Id": "0013", "Remark": "P90", "__Activity": "weapon0013", @@ -1530,7 +1678,7 @@ "__Bullet": "0003", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ @@ -1604,7 +1752,7 @@ "__Bullet": "0003", "__Shell": "shell0001", "ReloadThrowShell": false, - "ThrowShellCount": 0, + "ThrowShellCount": 1, "ThrowShellDelayTime": 0, "CanMeleeAttack": true, "MeleeAttackHarmRange": [ 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 4a8139c..78189d4 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/Start/Preinstall.json @@ -1 +1,397 @@ -[{"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}]}]]}] \ No newline at end of file +[ + { + "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 diff --git a/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0008.png b/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0008.png new file mode 100644 index 0000000..274f521 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0008.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0008.png.import b/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0008.png.import new file mode 100644 index 0000000..75e0859 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0008.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cf6jtee53ru6t" +path="res://.godot/imported/bullet0008.png-ee2d2af8fd8c07d5f50b667ec409caea.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/bullet/normal/bullet0008.png" +dest_files=["res://.godot/imported/bullet0008.png-ee2d2af8fd8c07d5f50b667ec409caea.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/Weapon0011.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/Weapon0011.png new file mode 100644 index 0000000..63eb45e --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/Weapon0011.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/Weapon0011.png.import b/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/Weapon0011.png.import new file mode 100644 index 0000000..8eb64d2 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/Weapon0011.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2nw07bxifdv6" +path="res://.godot/imported/Weapon0011.png-4508f5f36303362ac300f62d27601f6d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/sprite/weapon/weapon0011/Weapon0011.png" +dest_files=["res://.godot/imported/Weapon0011.png-4508f5f36303362ac300f62d27601f6d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/gun10.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/gun10.png deleted file mode 100644 index 2c86bab..0000000 --- a/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/gun10.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/gun10.png.import b/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/gun10.png.import deleted file mode 100644 index e51858e..0000000 --- a/DungeonShooting_Godot/resource/sprite/weapon/weapon0011/gun10.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://mnc7p56vjvd2" -path="res://.godot/imported/gun10.png-f740f5104fd9c145ecc2e63b27a6fb04.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resource/sprite/weapon/weapon0011/gun10.png" -dest_files=["res://.godot/imported/gun10.png-f740f5104fd9c145ecc2e63b27a6fb04.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0008.tres b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0008.tres new file mode 100644 index 0000000..caf8579 --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0008.tres @@ -0,0 +1,14 @@ +[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://ubdvau75andr"] + +[ext_resource type="Texture2D" uid="uid://cf6jtee53ru6t" path="res://resource/sprite/bullet/normal/bullet0008.png" id="1_dwc4l"] + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_dwc4l") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] diff --git a/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0011.tres b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0011.tres new file mode 100644 index 0000000..9619c42 --- /dev/null +++ b/DungeonShooting_Godot/resource/spriteFrames/weapon/Weapon0011.tres @@ -0,0 +1,14 @@ +[gd_resource type="SpriteFrames" load_steps=2 format=3 uid="uid://xvfg1a0xj7ng"] + +[ext_resource type="Texture2D" uid="uid://d2nw07bxifdv6" path="res://resource/sprite/weapon/weapon0011/Weapon0011.png" id="1_d6ft8"] + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_d6ft8") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] diff --git a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs index 49dcf5b..b3955d7 100644 --- a/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs +++ b/DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs @@ -74,6 +74,11 @@ /// public const string Id_weapon0010 = "weapon0010"; /// + /// 名称: weapon0011
+ /// 简介: + /// + public const string Id_weapon0011 = "weapon0011"; + /// /// 名称: P90
/// 简介: /// @@ -122,6 +127,11 @@ /// 名称:
/// 简介: /// + public const string Id_bullet0008 = "bullet0008"; + /// + /// 名称:
+ /// 简介: + /// public const string Id_shell0001 = "shell0001"; /// /// 名称:
diff --git a/DungeonShooting_Godot/src/game/activity/bullet/normal/ColorBullet.cs b/DungeonShooting_Godot/src/game/activity/bullet/normal/ColorBullet.cs new file mode 100644 index 0000000..3ffbd3c --- /dev/null +++ b/DungeonShooting_Godot/src/game/activity/bullet/normal/ColorBullet.cs @@ -0,0 +1,28 @@ + +using Godot; + +[Tool] +public partial class ColorBullet : Bullet +{ + public override void OnInit() + { + base.OnInit(); + SetRandomColor(); + } + + public override void OnLeavePool() + { + base.OnLeavePool(); + SetRandomColor(); + } + + private void SetRandomColor() + { + //随机颜色 + var color = new Color(Utils.Random.RandomRangeFloat(0, 1), Utils.Random.RandomRangeFloat(0, 1), Utils.Random.RandomRangeFloat(0, 1)); + color.R += 0.6f; + color.G += 0.6f; + color.B += 0.6f; + Modulate = color; + } +} \ No newline at end of file diff --git a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs index 93a1a83..9ae2b7a 100644 --- a/DungeonShooting_Godot/src/game/manager/ResourcePath.cs +++ b/DungeonShooting_Godot/src/game/manager/ResourcePath.cs @@ -174,6 +174,7 @@ public const string prefab_weapon_Weapon0008_tscn = "res://prefab/weapon/Weapon0008.tscn"; public const string prefab_weapon_Weapon0009_tscn = "res://prefab/weapon/Weapon0009.tscn"; public const string prefab_weapon_Weapon0010_tscn = "res://prefab/weapon/Weapon0010.tscn"; + public const string prefab_weapon_Weapon0011_tscn = "res://prefab/weapon/Weapon0011.tscn"; public const string prefab_weapon_Weapon0013_tscn = "res://prefab/weapon/Weapon0013.tscn"; public const string prefab_weapon_Weapon0014_tscn = "res://prefab/weapon/Weapon0014.tscn"; public const string prefab_weapon_WeaponTemplate_tscn = "res://prefab/weapon/WeaponTemplate.tscn"; @@ -466,7 +467,7 @@ public const string resource_sprite_weapon_weapon0009_Weapon0009_reload_png = "res://resource/sprite/weapon/weapon0009/Weapon0009_reload.png"; public const string resource_sprite_weapon_weapon0010_Weapon0010_png = "res://resource/sprite/weapon/weapon0010/Weapon0010.png"; public const string resource_sprite_weapon_weapon0010_Weapon0010_reloading_png = "res://resource/sprite/weapon/weapon0010/Weapon0010_reloading.png"; - public const string resource_sprite_weapon_weapon0011_gun10_png = "res://resource/sprite/weapon/weapon0011/gun10.png"; + public const string resource_sprite_weapon_weapon0011_Weapon0011_png = "res://resource/sprite/weapon/weapon0011/Weapon0011.png"; public const string resource_sprite_weapon_weapon0012_bow_png = "res://resource/sprite/weapon/weapon0012/bow.png"; public const string resource_sprite_weapon_weapon0013_weapon0013_png = "res://resource/sprite/weapon/weapon0013/weapon0013.png"; public const string resource_sprite_weapon_weapon0013_weapon0014export_png = "res://resource/sprite/weapon/weapon0013/weapon0014-export.png"; @@ -528,6 +529,7 @@ public const string resource_spriteFrames_weapon_Weapon0008_tres = "res://resource/spriteFrames/weapon/Weapon0008.tres"; public const string resource_spriteFrames_weapon_Weapon0009_tres = "res://resource/spriteFrames/weapon/Weapon0009.tres"; public const string resource_spriteFrames_weapon_Weapon0010_tres = "res://resource/spriteFrames/weapon/Weapon0010.tres"; + public const string resource_spriteFrames_weapon_Weapon0011_tres = "res://resource/spriteFrames/weapon/Weapon0011.tres"; public const string resource_spriteFrames_weapon_Weapon0013_tres = "res://resource/spriteFrames/weapon/Weapon0013.tres"; public const string resource_spriteFrames_weapon_Weapon0014_tres = "res://resource/spriteFrames/weapon/Weapon0014.tres"; public const string resource_theme_mainTheme_tres = "res://resource/theme/mainTheme.tres"; diff --git a/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs b/DungeonShooting_Godot/src/game/ui/mapEditorMapMark/EditorMarkCell.cs index 155885f..46ed76a 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; }