diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx
index f8e954a..140a58a 100644
--- a/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx
+++ b/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx
index 85c292e..fbedd99 100644
--- a/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx
+++ b/DungeonShooting_Godot/excel/excelFile/ActivityMaterial.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx b/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx
index 7fe6091..41be8b6 100644
--- a/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx
+++ b/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx b/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx
index 85ac351..1d30cae 100644
--- a/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx
+++ b/DungeonShooting_Godot/excel/excelFile/BulletBase.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx
index 6731e42..4d36202 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/WeaponBase.xlsx b/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx
index 3ebfc6c..5eff21a 100644
--- a/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx
+++ b/DungeonShooting_Godot/excel/excelFile/WeaponBase.xlsx
Binary files differ
diff --git a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn
index 98bed69..cc18c95 100644
--- a/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn
+++ b/DungeonShooting_Godot/prefab/bullet/normal/Bullet0004.tscn
@@ -45,7 +45,7 @@
material = SubResource("ShaderMaterial_p0wfd")
sprite_frames = ExtResource("3_bttus")
animation = &"move"
-frame_progress = 0.273277
+frame_progress = 0.0471243
[node name="CollisionArea" type="Area2D" parent="AnimatedSprite"]
collision_layer = 0
diff --git a/DungeonShooting_Godot/resource/config/AiAttackAttr.json b/DungeonShooting_Godot/resource/config/AiAttackAttr.json
index cbd0016..89ba5e9 100644
--- a/DungeonShooting_Godot/resource/config/AiAttackAttr.json
+++ b/DungeonShooting_Godot/resource/config/AiAttackAttr.json
@@ -75,5 +75,16 @@
"AttackLockAngle": true,
"BulletSpeedScale": 1,
"AmmoConsumptionProbability": 0
+ },
+ {
+ "Id": "0008",
+ "Remark": "\u69B4\u5F39\u70AE",
+ "FiringStand": true,
+ "ShowSubline": true,
+ "LockingTime": 1.5,
+ "LockAngleTime": 0.5,
+ "AttackLockAngle": true,
+ "BulletSpeedScale": 0.85,
+ "AmmoConsumptionProbability": 0
}
]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/config/BulletBase.json b/DungeonShooting_Godot/resource/config/BulletBase.json
index d4f399d..babab79 100644
--- a/DungeonShooting_Godot/resource/config/BulletBase.json
+++ b/DungeonShooting_Godot/resource/config/BulletBase.json
@@ -142,7 +142,7 @@
"Type": 1,
"Prefab": "bullet0004",
"HarmRange": [
- 5
+ 30
],
"RepelRnage": [
0
diff --git a/DungeonShooting_Godot/resource/config/WeaponBase.json b/DungeonShooting_Godot/resource/config/WeaponBase.json
index e3e7806..7d1cb71 100644
--- a/DungeonShooting_Godot/resource/config/WeaponBase.json
+++ b/DungeonShooting_Godot/resource/config/WeaponBase.json
@@ -49,6 +49,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0001",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -124,6 +125,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0001",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -199,6 +201,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0002",
"__Shell": "shell0002",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0.2,
"ThrowCollisionSize": {
"X": 20,
@@ -274,6 +277,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0002",
"__Shell": "shell0002",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0.2,
"ThrowCollisionSize": {
"X": 20,
@@ -349,6 +353,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0001",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -424,6 +429,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0001",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -498,6 +504,7 @@
"FireEffect": "",
"__Bullet": "2001",
"__Shell": "",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -572,6 +579,7 @@
"FireEffect": "",
"__Bullet": "2001",
"__Shell": "",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -647,6 +655,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0004",
"__Shell": "shell0003",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0.2,
"ThrowCollisionSize": {
"X": 20,
@@ -722,6 +731,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0004",
"__Shell": "shell0003",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0.2,
"ThrowCollisionSize": {
"X": 20,
@@ -797,6 +807,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0002",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -872,6 +883,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0002",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -947,6 +959,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0003",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -1022,6 +1035,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0003",
"__Shell": "shell0001",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -1097,6 +1111,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
"__Bullet": "1001",
"__Shell": "",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -1172,6 +1187,7 @@
"FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
"__Bullet": "1001",
"__Shell": "",
+ "ReloadThrowShell": false,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -1204,10 +1220,10 @@
"Weight": 40,
"WeightType": 1,
"ContinuousShoot": false,
- "AmmoCapacity": 10,
- "MaxAmmoCapacity": 240,
- "StandbyAmmoCapacity": 120,
- "ReloadTime": 1.8,
+ "AmmoCapacity": 1,
+ "MaxAmmoCapacity": 50,
+ "StandbyAmmoCapacity": 25,
+ "ReloadTime": 2.5,
"AloneReload": false,
"AloneReloadCount": 1,
"AloneReloadBeginIntervalTime": 0,
@@ -1222,17 +1238,17 @@
1
],
"TriggerInterval": 0,
- "StartFiringSpeed": 300,
- "FinalFiringSpeed": 300,
+ "StartFiringSpeed": 60,
+ "FinalFiringSpeed": 60,
"FiringSpeedAddSpeed": 0,
"FiringSpeedBackSpeed": 0,
"FireBulletCountRange": [
1
],
"DelayedTime": 0,
- "StartScatteringRange": 0,
- "FinalScatteringRange": 20,
- "ScatteringRangeAddValue": 4,
+ "StartScatteringRange": 3,
+ "FinalScatteringRange": 8,
+ "ScatteringRangeAddValue": 5,
"ScatteringRangeBackSpeed": 40,
"ScatteringRangeBackDelayTime": 0.5,
"CameraShake": 2,
@@ -1240,13 +1256,14 @@
2,
3
],
- "BacklashRegressionSpeed": 25,
- "UpliftAngle": 13,
+ "BacklashRegressionSpeed": 20,
+ "UpliftAngle": 16,
"DefaultAngle": 0,
- "UpliftAngleRestore": 1,
+ "UpliftAngleRestore": 3,
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
"__Bullet": "0005",
- "__Shell": "",
+ "__Shell": "shell0001",
+ "ReloadThrowShell": true,
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
"X": 20,
@@ -1259,17 +1276,93 @@
"MeleeAttackRepelRnage": [
100
],
- "__ShootSound": "shooting0010",
- "__BeginReloadSound": "reloadBegin0011",
+ "__ShootSound": "",
+ "__BeginReloadSound": "",
"BeginReloadSoundDelayTime": 0,
"__ReloadSound": "",
"ReloadSoundDelayTime": 0,
- "__ReloadFinishSound": "reloadFinish0003",
- "ReloadFinishSoundAdvanceTime": 0.8,
+ "__ReloadFinishSound": "",
+ "ReloadFinishSoundAdvanceTime": 0,
"__BeLoadedSound": "",
"BeLoadedSoundDelayTime": 0,
"__OtherSoundMap": null,
- "__AiUseAttribute": "0016",
+ "__AiUseAttribute": "0018",
"__AiAttackAttr": ""
+ },
+ {
+ "Id": "0018",
+ "__Activity": "",
+ "Remark": "\u69B4\u5F39\u53D1\u5C04\u5668",
+ "Weight": 40,
+ "WeightType": 1,
+ "ContinuousShoot": false,
+ "AmmoCapacity": 1,
+ "MaxAmmoCapacity": 50,
+ "StandbyAmmoCapacity": 25,
+ "ReloadTime": 2.5,
+ "AloneReload": false,
+ "AloneReloadCount": 1,
+ "AloneReloadBeginIntervalTime": 0,
+ "AloneReloadFinishIntervalTime": 0,
+ "AloneReloadCanShoot": false,
+ "LooseShoot": false,
+ "MinChargeTime": 0,
+ "ManualBeLoaded": false,
+ "AutoManualBeLoaded": false,
+ "BeLoadedTime": 0,
+ "ContinuousCountRange": [
+ 1
+ ],
+ "TriggerInterval": 5,
+ "StartFiringSpeed": 60,
+ "FinalFiringSpeed": 60,
+ "FiringSpeedAddSpeed": 0,
+ "FiringSpeedBackSpeed": 0,
+ "FireBulletCountRange": [
+ 1
+ ],
+ "DelayedTime": 0,
+ "StartScatteringRange": 3,
+ "FinalScatteringRange": 8,
+ "ScatteringRangeAddValue": 5,
+ "ScatteringRangeBackSpeed": 40,
+ "ScatteringRangeBackDelayTime": 0.5,
+ "CameraShake": 2,
+ "BacklashRange": [
+ 2,
+ 3
+ ],
+ "BacklashRegressionSpeed": 20,
+ "UpliftAngle": 16,
+ "DefaultAngle": 0,
+ "UpliftAngleRestore": 3,
+ "FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
+ "__Bullet": "0005",
+ "__Shell": "shell0001",
+ "ReloadThrowShell": true,
+ "ThrowShellDelayTime": 0,
+ "ThrowCollisionSize": {
+ "X": 20,
+ "Y": 15
+ },
+ "CanMeleeAttack": true,
+ "MeleeAttackHarmRange": [
+ 10
+ ],
+ "MeleeAttackRepelRnage": [
+ 100
+ ],
+ "__ShootSound": "",
+ "__BeginReloadSound": "",
+ "BeginReloadSoundDelayTime": 0,
+ "__ReloadSound": "",
+ "ReloadSoundDelayTime": 0,
+ "__ReloadFinishSound": "",
+ "ReloadFinishSoundAdvanceTime": 0,
+ "__BeLoadedSound": "",
+ "BeLoadedSoundDelayTime": 0,
+ "__OtherSoundMap": null,
+ "__AiUseAttribute": "",
+ "__AiAttackAttr": "0008"
}
]
\ No newline at end of file
diff --git a/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0004.png b/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0004.png
index 0340c18..bf06757 100644
--- a/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0004.png
+++ b/DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0004.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0004.tres b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0004.tres
index d3bc716..8ca35b7 100644
--- a/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0004.tres
+++ b/DungeonShooting_Godot/resource/spriteFrames/bullet/Bullet0004.tres
@@ -6,41 +6,41 @@
atlas = ExtResource("1_qrd7l")
region = Rect2(0, 0, 5, 5)
-[sub_resource type="AtlasTexture" id="AtlasTexture_fbk6r"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_k2jqk"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(0, 0, 5, 5)
+region = Rect2(0, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_ppiqe"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_p5if5"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(5, 0, 5, 5)
+region = Rect2(7, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_aympx"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_a88dp"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(10, 0, 5, 5)
+region = Rect2(14, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_u5kch"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_ewrr5"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(15, 0, 5, 5)
+region = Rect2(21, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_jiimt"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_imjsl"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(20, 0, 5, 5)
+region = Rect2(28, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_wtb8v"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_rkdnv"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(25, 0, 5, 5)
+region = Rect2(35, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_45dah"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_hdnbo"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(30, 0, 5, 5)
+region = Rect2(42, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_s472h"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_l6nrt"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(35, 0, 5, 5)
+region = Rect2(49, 0, 7, 7)
-[sub_resource type="AtlasTexture" id="AtlasTexture_xy2vr"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_h6vsu"]
atlas = ExtResource("1_qrd7l")
-region = Rect2(40, 0, 5, 5)
+region = Rect2(56, 0, 7, 7)
[resource]
animations = [{
@@ -54,31 +54,31 @@
}, {
"frames": [{
"duration": 1.0,
-"texture": SubResource("AtlasTexture_fbk6r")
+"texture": SubResource("AtlasTexture_k2jqk")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_ppiqe")
+"texture": SubResource("AtlasTexture_p5if5")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_aympx")
+"texture": SubResource("AtlasTexture_a88dp")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_u5kch")
+"texture": SubResource("AtlasTexture_ewrr5")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_jiimt")
+"texture": SubResource("AtlasTexture_imjsl")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_wtb8v")
+"texture": SubResource("AtlasTexture_rkdnv")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_45dah")
+"texture": SubResource("AtlasTexture_hdnbo")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_s472h")
+"texture": SubResource("AtlasTexture_l6nrt")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_xy2vr")
+"texture": SubResource("AtlasTexture_h6vsu")
}],
"loop": true,
"name": &"move",
diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs b/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs
index f89a4ea..af7f188 100644
--- a/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs
+++ b/DungeonShooting_Godot/src/config/ExcelConfig_WeaponBase.cs
@@ -263,6 +263,13 @@
public ActivityBase Shell;
///
+ /// 是否在换弹时才抛壳
+ ///
+ ///
+ [JsonInclude]
+ public bool ReloadThrowShell;
+
+ ///
/// 投抛弹壳的延时时间, 在射击或者上膛后会触发抛弹壳效果
/// 如果为0, 则不自动抛弹
///
@@ -411,6 +418,7 @@
inst.FireEffect = FireEffect;
inst.Bullet = Bullet;
inst.Shell = Shell;
+ inst.ReloadThrowShell = ReloadThrowShell;
inst.ThrowShellDelayTime = ThrowShellDelayTime;
inst.ThrowCollisionSize = ThrowCollisionSize;
inst.CanMeleeAttack = CanMeleeAttack;