diff --git a/components/Scenes/World.tscn b/components/Scenes/World.tscn index eb16a7c..5f4248b 100644 --- a/components/Scenes/World.tscn +++ b/components/Scenes/World.tscn @@ -63,8 +63,8 @@ _data = { &"bigLaser": SubResource("Animation_kii8h") } -[sub_resource type="CircleShape2D" id="CircleShape2D_4hkht"] -radius = 57.3149 +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_lu72f"] +normal = Vector2(0, 1) [node name="world" type="Node2D"] y_sort_enabled = true @@ -100,9 +100,21 @@ scale = Vector2(5, 5) texture = ExtResource("4_oy4jj") metadata/_edit_lock_ = true -[node name="star1" type="CollisionShape2D" parent="map"] -position = Vector2(-2057, 1298) -shape = SubResource("CircleShape2D_4hkht") +[node name="borderTop" type="CollisionShape2D" parent="map"] +position = Vector2(0, -1800) +shape = SubResource("WorldBoundaryShape2D_lu72f") -[node name="shan2" type="CollisionPolygon2D" parent="map"] -polygon = PackedVector2Array(-2419, 1803, 2429, 1825, 2392, -366, 2867, -318, 2723, 2241, -2879, 2193, -2797, -2582, 2959, -2528, 2858, -347, 2420, -337, 2441, -1834, -2438, -1792) +[node name="borderTop2" type="CollisionShape2D" parent="map"] +position = Vector2(0, 1800) +rotation = 3.1415927 +shape = SubResource("WorldBoundaryShape2D_lu72f") + +[node name="borderTop3" type="CollisionShape2D" parent="map"] +position = Vector2(2400, 0) +rotation = 1.5707964 +shape = SubResource("WorldBoundaryShape2D_lu72f") + +[node name="borderTop4" type="CollisionShape2D" parent="map"] +position = Vector2(-2400, 0) +rotation = -1.5707964 +shape = SubResource("WorldBoundaryShape2D_lu72f") diff --git a/components/Weapons/RedCrystal.tscn b/components/Weapons/RedCrystal.tscn index b735299..1e4599b 100644 --- a/components/Weapons/RedCrystal.tscn +++ b/components/Weapons/RedCrystal.tscn @@ -12,8 +12,8 @@ displayName = "红水晶簇" typeTopic = 1 costBeachball = 400 store = { -"atk": 45, -"count": 3, +"atk": 30, +"count": 2, "percent": 0.5, "radius": 150.0 } @@ -25,7 +25,6 @@ storeType = { } descriptionTemplate = "发射[b]红水晶[/b],在3秒后以$radius的半径爆炸,造成$atk点伤害并向随机方向发射1~$count个[b]水晶碎片[/b],造成$percent基础伤害。" cooldown = 1000.0 -debugRebuild = true [node name="attack" parent="sounds" index="0"] stream = ExtResource("4_qt0vq") diff --git a/scripts/Contents/Weapons/RedCrystal.gd b/scripts/Contents/Weapons/RedCrystal.gd index 3872e9c..0fb4973 100644 --- a/scripts/Contents/Weapons/RedCrystal.gd +++ b/scripts/Contents/Weapons/RedCrystal.gd @@ -5,7 +5,7 @@ class_name RedCrystalWeapon func update(to: int, origin: Dictionary, _entity: EntityBase): origin["atk"] += 5 * to * soulLevel origin["radius"] += 1 * to * soulLevel - origin["count"] = 2 + 1 * soulLevel + origin["count"] = 1 + 1 * soulLevel origin["percent"] += 0.25 * (soulLevel - 1) return origin func attack(entity: EntityBase):