diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityBase.xlsx
index 4decea8..d3b7076 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/AiAttackAttr.xlsx b/DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx
index fb0eb59..acd57ac 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 04648f8..87cf1eb 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 1858468..24e3964 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 e0141a0..22f8761 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 c22dc44..7e826d4 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.807435
+frame_progress = 0.167868
[node name="CollisionArea" type="Area2D" parent="."]
collision_layer = 0
diff --git a/DungeonShooting_Godot/resource/config/BulletBase.json b/DungeonShooting_Godot/resource/config/BulletBase.json
index d7d3c3c..9186624 100644
--- a/DungeonShooting_Godot/resource/config/BulletBase.json
+++ b/DungeonShooting_Godot/resource/config/BulletBase.json
@@ -83,6 +83,33 @@
},
{
"Id": "0004",
+ "Name": "\u72D9\u51FB\u67AA\u5B50\u5F39",
+ "Type": 1,
+ "Prefab": "bullet0001",
+ "HarmRange": [
+ 20
+ ],
+ "RepelRnage": [
+ 200
+ ],
+ "DeviationAngleRange": [
+ 0
+ ],
+ "SpeedRange": [
+ 600,
+ 600
+ ],
+ "LifeTimeRange": [
+ -1
+ ],
+ "DistanceRange": [
+ 600,
+ 600
+ ],
+ "UseGravity": false
+ },
+ {
+ "Id": "0005",
"Name": "\u69B4\u5F39\u70AE",
"Type": 1,
"Prefab": "bullet0004",
@@ -130,8 +157,8 @@
-1
],
"DistanceRange": [
- 270,
- 360
+ 600,
+ 600
],
"UseGravity": false
},
diff --git a/DungeonShooting_Godot/resource/config/WeaponBase.json b/DungeonShooting_Godot/resource/config/WeaponBase.json
index 5082181..1f569e1 100644
--- a/DungeonShooting_Godot/resource/config/WeaponBase.json
+++ b/DungeonShooting_Godot/resource/config/WeaponBase.json
@@ -645,7 +645,7 @@
"DefaultAngle": 0,
"UpliftAngleRestore": 1,
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
- "__Bullet": "0001",
+ "__Bullet": "0004",
"__Shell": "shell0003",
"ThrowShellDelayTime": 0.2,
"ThrowCollisionSize": {
@@ -720,7 +720,7 @@
"DefaultAngle": 0,
"UpliftAngleRestore": 1,
"FireEffect": "res://prefab/effect/weapon/ShotFire.tscn",
- "__Bullet": "0001",
+ "__Bullet": "0004",
"__Shell": "shell0003",
"ThrowShellDelayTime": 0.2,
"ThrowCollisionSize": {
@@ -1245,7 +1245,7 @@
"DefaultAngle": 0,
"UpliftAngleRestore": 1,
"FireEffect": "res://prefab/effect/weapon/ShotFire2.tscn",
- "__Bullet": "0004",
+ "__Bullet": "0005",
"__Shell": "",
"ThrowShellDelayTime": 0,
"ThrowCollisionSize": {
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle4/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle4/Preview.png
index 7b08a19..952d28b 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle4/Preview.png
+++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle4/Preview.png
Binary files differ
diff --git a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png
index e502322..d64d95a 100644
--- a/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png
+++ b/DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png
Binary files differ
diff --git a/DungeonShooting_Godot/src/config/ExcelConfig_BulletBase.cs b/DungeonShooting_Godot/src/config/ExcelConfig_BulletBase.cs
index b1bc443..6514d3f 100644
--- a/DungeonShooting_Godot/src/config/ExcelConfig_BulletBase.cs
+++ b/DungeonShooting_Godot/src/config/ExcelConfig_BulletBase.cs
@@ -70,6 +70,7 @@
///
/// 子弹最大存在时间,单位:秒
/// 如果值小于等于0时子弹无限期存在
+ /// 只有Type为1时才需要填写
/// 格式为[value]或者[min,max]
///
[JsonInclude]
diff --git a/DungeonShooting_Godot/src/game/activity/bullet/laser/Laser.cs b/DungeonShooting_Godot/src/game/activity/bullet/laser/Laser.cs
index 3e7b34e..fbd2791 100644
--- a/DungeonShooting_Godot/src/game/activity/bullet/laser/Laser.cs
+++ b/DungeonShooting_Godot/src/game/activity/bullet/laser/Laser.cs
@@ -47,6 +47,7 @@
public void InitData(BulletData data, uint attackLayer, float width)
{
+ BulletData = data;
AttackLayer = attackLayer;
Position = data.Position;
diff --git a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
index c7a7f06..8edeeb8 100644
--- a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
+++ b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
@@ -1949,8 +1949,8 @@
Weapon = this,
BulletBase = bullet,
TriggerRole = TriggerRole,
- MinHarm = Utils.GetConfigRangeStart(Attribute.Bullet.HarmRange),
- MaxHarm = Utils.GetConfigRangeEnd(Attribute.Bullet.HarmRange),
+ MinHarm = Utils.GetConfigRangeStart(bullet.HarmRange),
+ MaxHarm = Utils.GetConfigRangeEnd(bullet.HarmRange),
MaxDistance = Utils.Random.RandomConfigRange(bullet.DistanceRange),
FlySpeed = Utils.Random.RandomConfigRange(bullet.SpeedRange),
Position = FirePoint.GlobalPosition,
@@ -1986,13 +1986,13 @@
Weapon = this,
BulletBase = bullet,
TriggerRole = TriggerRole,
- MinHarm = Utils.GetConfigRangeStart(Attribute.Bullet.HarmRange),
- MaxHarm = Utils.GetConfigRangeEnd(Attribute.Bullet.HarmRange),
+ MinHarm = Utils.GetConfigRangeStart(bullet.HarmRange),
+ MaxHarm = Utils.GetConfigRangeEnd(bullet.HarmRange),
MaxDistance = Utils.Random.RandomConfigRange(bullet.DistanceRange),
Position = FirePoint.GlobalPosition,
};
- var deviationAngle = Utils.Random.RandomConfigRange(Attribute.Bullet.DeviationAngleRange);
+ var deviationAngle = Utils.Random.RandomConfigRange(bullet.DeviationAngleRange);
if (TriggerRole != null)
{
deviationAngle = TriggerRole.RoleState.CallCalcBulletDeviationAngleEvent(this, deviationAngle);
@@ -2002,6 +2002,7 @@
//创建激光
var laser = ResourceManager.LoadAndInstantiate(bullet.Prefab);
laser.AddToActivityRoot(RoomLayerEnum.YSortLayer);
+ laser.InitData(data, GetAttackLayer(), 3);
return laser;
}