diff --git a/components/Characters/MTY.tscn b/components/Characters/MTY.tscn index 1f3d8e6..1c54900 100644 --- a/components/Characters/MTY.tscn +++ b/components/Characters/MTY.tscn @@ -87,7 +87,7 @@ position = Vector2(0, -27) scale = Vector2(1.1823181, 1.1823181) sprite_frames = SubResource("SpriteFrames_hjlm2") animation = &"walk" -frame_progress = 0.5124606 +frame_progress = 0.5383854 [node name="hitbox" parent="texture/hurtbox" index="0"] position = Vector2(0, -26.5) @@ -95,3 +95,4 @@ shape = SubResource("RectangleShape2D_fdkbo") [node name="statebar" parent="." index="4"] position = Vector2(0, -195) +longer = true diff --git a/components/Feeds/Fish.tscn b/components/Feeds/Fish.tscn index fbdfa6f..a8bedd3 100644 --- a/components/Feeds/Fish.tscn +++ b/components/Feeds/Fish.tscn @@ -1,15 +1,15 @@ -[gd_scene load_steps=3 format=3 uid="uid://ch8010vm2lpby"] +[gd_scene format=3 uid="uid://ch8010vm2lpby"] [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_wb8r8"] [ext_resource type="Texture2D" uid="uid://p5wms8lrj23a" path="res://resources/feeds/fish-a.svg" id="2_mefkw"] -[node name="Fish" instance=ExtResource("1_wb8r8")] +[node name="Fish" unique_id=1838989230 instance=ExtResource("1_wb8r8")] avatarTexture = ExtResource("2_mefkw") displayName = "小丑鱼" quality = 4 topic = 9 -fields = Array[int]([27, 19, 17]) -fieldValues = Array[float]([1.0, -0.1, -20.0]) +fields = Array[int]([27, 19, 10]) +fieldValues = Array[float]([1.0, -0.1, -0.05]) costs = Array[int]([2, 3]) costCounts = Array[int]([1, 2500]) diff --git a/components/Summons/HJM.tscn b/components/Summons/HJM.tscn index 89940a3..d0f5e4e 100644 --- a/components/Summons/HJM.tscn +++ b/components/Summons/HJM.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://m4y40dm14s2k"] +[gd_scene format=3 uid="uid://m4y40dm14s2k"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_06nhw"] [ext_resource type="Script" uid="uid://bpu0sko7fthdk" path="res://scripts/Contents/Summons/HJM.gd" id="2_7ry3q"] @@ -45,9 +45,10 @@ animations = [{ "speed": 15.0 }] -[node name="HJM" instance=ExtResource("1_06nhw")] +[node name="HJM" unique_id=1606708235 instance=ExtResource("1_06nhw")] script = ExtResource("2_7ry3q") attraction = 0.1 +displayName = "耄耋" useStatic = true [node name="texture" parent="." index="3"] @@ -64,4 +65,4 @@ frame_progress = 0.20121677 [node name="hitbox" parent="texture/hurtbox" index="0"] position = Vector2(-4, 13) -[node name="normal" type="Node2D" parent="texture/weapons" index="0"] +[node name="normal" type="Node2D" parent="texture/weapons" index="0" unique_id=832452867] diff --git a/components/Summons/LGBTFlag.tscn b/components/Summons/LGBTFlag.tscn index a684651..806d53d 100644 --- a/components/Summons/LGBTFlag.tscn +++ b/components/Summons/LGBTFlag.tscn @@ -23,6 +23,7 @@ size = Vector2(112, 70) [node name="LGBTFlag" unique_id=1526099188 instance=ExtResource("1_fktqv")] script = ExtResource("2_6d456") attraction = 1.0 +displayName = "彩虹旗" [node name="texture" parent="." index="3"] sprite_frames = SubResource("SpriteFrames_r6sud") diff --git a/components/Summons/Shield.tscn b/components/Summons/Shield.tscn index a8e9b8e..4d703a7 100644 --- a/components/Summons/Shield.tscn +++ b/components/Summons/Shield.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://bjuf0n8y5fxw4"] +[gd_scene format=3 uid="uid://bjuf0n8y5fxw4"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_xnsmi"] [ext_resource type="Script" uid="uid://fc3pppnguup" path="res://scripts/Contents/Summons/Shield.gd" id="2_1x6ja"] @@ -33,10 +33,11 @@ shader_parameter/alpha = 0.2999999932944 [sub_resource type="CircleShape2D" id="CircleShape2D_ddbxg"] radius = 150.0 -[node name="Sheild" instance=ExtResource("1_xnsmi")] +[node name="Sheild" unique_id=1046961314 instance=ExtResource("1_xnsmi")] collision_priority = 2.0 script = ExtResource("2_1x6ja") attraction = 0.0 +displayName = "音元盾" [node name="texture" parent="." index="3"] sprite_frames = SubResource("SpriteFrames_1x6ja") @@ -44,14 +45,14 @@ sprite_frames = SubResource("SpriteFrames_1x6ja") [node name="staticBackground" parent="texture" index="0"] position = Vector2(0, 50) -[node name="circle" type="Node2D" parent="texture/staticBackground" index="0"] +[node name="circle" type="Node2D" parent="texture/staticBackground" index="0" unique_id=1421224208] material = SubResource("ShaderMaterial_ddbxg") script = ExtResource("4_cg4js") size = Vector2(300, 300) color = Color(1, 0.76694965, 0, 1) metadata/_custom_type_script = "uid://cgb01lelfg73p" -[node name="circle2" type="Node2D" parent="texture/staticBackground" index="1"] +[node name="circle2" type="Node2D" parent="texture/staticBackground" index="1" unique_id=283148199] material = SubResource("ShaderMaterial_cg4js") script = ExtResource("4_cg4js") size = Vector2(300, 300) diff --git a/components/Weapons/HJM.tscn b/components/Weapons/HJM.tscn index fa82c05..0497ee9 100644 --- a/components/Weapons/HJM.tscn +++ b/components/Weapons/HJM.tscn @@ -21,7 +21,7 @@ storeType = { } descriptionTemplate = "召唤[b]抓狂的哈基米[/b],跟踪敌人,每$time秒造成$atk点伤害。" sources = Array[String](["Internet"]) -needEnergy = 75.0 +needEnergy = 50.0 cooldown = 1000.0 [node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] @@ -38,5 +38,11 @@ displayName = "耄耋" quality = 0 typeTopic = 4 +[node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] +text = "Internet" + [node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] text = "[center]召唤[b]抓狂的哈基米[/b],跟踪敌人,每[color=cyan]0.25[/color]秒造成[color=cyan]7[/color]点伤害。[/center]" + +[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] +visible = false diff --git a/components/Weapons/LGBT.tscn b/components/Weapons/LGBT.tscn index 9694af2..f5d2aa5 100644 --- a/components/Weapons/LGBT.tscn +++ b/components/Weapons/LGBT.tscn @@ -1,11 +1,11 @@ -[gd_scene load_steps=5 format=3 uid="uid://wl8u5m52708w"] +[gd_scene format=3 uid="uid://wl8u5m52708w"] [ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_jwtmd"] [ext_resource type="Script" uid="uid://cj72d1ckmojex" path="res://scripts/Contents/Weapons/LGBTWeapon.gd" id="2_0tyah"] [ext_resource type="Texture2D" uid="uid://cwfyi61xkt4bt" path="res://resources/weapons/lgbt.jpeg" id="2_ou6jo"] [ext_resource type="AudioStream" uid="uid://bgo8p1l77xrbe" path="res://resources/sounds/effect/Magic Spell.wav" id="4_c5xse"] -[node name="LGBT" instance=ExtResource("1_jwtmd")] +[node name="LGBT" unique_id=1938660022 instance=ExtResource("1_jwtmd")] offset_bottom = 346.0 script = ExtResource("2_0tyah") avatarTexture = ExtResource("2_ou6jo") @@ -27,27 +27,29 @@ storeType = { "trace": 0.0 } descriptionTemplate = "召唤[b]彩虹旗[/b],每$angle发射1/$count条以$power效率追踪$trace秒的[b]七彩光标[/b],每条造成$atk点伤害。" -needEnergy = 95.0 +needEnergy = 50.0 cooldown = 1000.0 -debugRebuild = true -[node name="attack" parent="sounds" index="0"] +[node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_c5xse") -[node name="avatar" parent="container/info" index="0"] +[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] texture = ExtResource("2_ou6jo") -[node name="energy" parent="container/info/infos/energyInfo" index="1"] +[node name="energy" parent="container/info/infos/energyInfo" parent_id_path=PackedInt32Array(644675021) index="1" unique_id=1664028115] text = "95.0" -[node name="beachball" parent="container/info/infos" index="1"] +[node name="beachball" parent="container/info/infos" parent_id_path=PackedInt32Array(492799150) index="1" unique_id=653442983] count = 200 -[node name="name" parent="container/info/displays" index="0"] +[node name="name" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="0" unique_id=1576068972] displayName = "彩虹旗" typeTopic = 4 -[node name="description" parent="container" index="2"] +[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] size_flags_vertical = 3 -text = "[center]召唤[b]彩虹旗[/b],每[color=cyan]35.0°[/color]发射1/[color=cyan]1[/color]条以[color=cyan]2%[/color]效率追踪[color=cyan]1.00[/color]秒的[b]七彩光标[/b],每条造成[color=cyan]15[/color]点伤害。[/center]" +text = "[center]召唤[b]彩虹旗[/b],每[color=cyan]35.0°[/color]发射1/[color=cyan]1[/color]条以[color=cyan]2.0%[/color]效率追踪[color=cyan]1.00[/color]秒的[b]七彩光标[/b],每条造成[color=cyan]15[/color]点伤害。[/center]" autowrap_mode = 2 + +[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] +visible = false diff --git a/scripts/Contents/Bullets/Parrier.gd b/scripts/Contents/Bullets/Parrier.gd index 444ec78..c2b43ab 100644 --- a/scripts/Contents/Bullets/Parrier.gd +++ b/scripts/Contents/Bullets/Parrier.gd @@ -29,7 +29,7 @@ func succeedToHit(_dmg: float, entity: EntityBase): eff.shot() entity.impluse((effSpawn - position).normalized() * 450) func hitBullet(bullet: BulletBase): # 当前子弹与其他子弹相撞 - if !is_instance_valid(bullet.launcher): return + if !is_instance_valid(launcher): return if BulletTool.canDamage(bullet, launcher): # 其他子弹可以使当前子弹的发射者受伤吗? if parryiedTimes < maxParryTimes && MathTool.rate(parryRate): # 一个刀光最多格挡多少个敌方子弹? parryiedTimes += 1 diff --git a/scripts/Contents/Characters/MTY.gd b/scripts/Contents/Characters/MTY.gd index e84e921..9e48857 100644 --- a/scripts/Contents/Characters/MTY.gd +++ b/scripts/Contents/Characters/MTY.gd @@ -4,9 +4,9 @@ class_name MTY func register(): fields[FieldStore.Entity.MAX_HEALTH] = 400 fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.9 - attackCooldownMap[0] = 2000 - attackCooldownMap[1] = 750 - attackCooldownMap[2] = 450 + attackCooldownMap[0] = 4000 + attackCooldownMap[1] = 1500 + attackCooldownMap[2] = 500 sprintMultiplier = 5 func spawn(): texture.play("walk") @@ -19,7 +19,7 @@ func attack(type: int): trySprint() elif type == 1: var track = getTrackingAnchor() - var bullet = BulletTool.findClosetBulletCanDamage(track, get_tree(), self , 400) + var bullet = BulletTool.findClosetBulletCanDamage(track, get_tree(), self , 450) if is_instance_valid(bullet): BulletBase.generate(ComponentManager.getBullet("Parrier"), self , track, track.angle_to_point(bullet.position)) elif type == 2: diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index a47d84c..cc4b5ae 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -31,7 +31,7 @@ static var WAVE_NORMAL = [ Wave.create("KukeMC", 0, 0, true, 19, INF, 20), Wave.create("Bear", 0, 0, true, 29, INF, 23), ] -static var WAVE_TESTBOSS_ALL = [ +static var WAVE_TESTBOSS = [ Wave.create("Deepsea", 0, 0, true, 0, INF, 6), Wave.create("Kernyr", 0, 0, true, 1, INF, 6), Wave.create("CyberCat", 0, 0, true, 2, INF, 6), @@ -39,18 +39,9 @@ static var WAVE_TESTBOSS_ALL = [ Wave.create("KukeMC", 0, 0, true, 4, INF, 6), Wave.create("Bear", 0, 0, true, 5, INF, 6), ] -static var WAVE_TESTBOSS_KUKE = [ - Wave.create("KukeMC", 0, 0, true, 0, INF, 1), -] -static var WAVE_TESTBOSS_BEAR = [ - Wave.create("Bear", 0, 0, true, 0, INF, 1), -] -static var WAVE_TESTBOSS_CHICK = [ - Wave.create("Chick", 0, 0, true, 0, INF, 1), -] static var WAVE_JUSTJOKE = [ - # Wave.create("Kernyr", 0, 0, true, 0, INF, 1), - # Wave.create("CyberCat", 0, 0, true, 0, INF, 1), + Wave.create("Kernyr", 0, 0, true, 0, INF, 1), + Wave.create("CyberCat", 0, 0, true, 0, INF, 1), Wave.create("Deepsea", 0, 0, true, 0, INF, 1) ] static var WAVE_MOWING = [ @@ -60,10 +51,10 @@ static var WAVE_MOWING = [ Wave.create("MTY", 1, 5, false, 0, INF, 1), ] static var WAVE_TESTMOB = [ - Wave.create("MTY", 1, 1, false, 0, INF, 1) + Wave.create("MTY", 1, 10, false, 0, INF, 1) ] static var WAVE_EMPTY = [] -static var waveReleaseConfig = [WAVE_TESTBOSS_ALL, 1] +static var waveReleaseConfig = [WAVE_TESTBOSS, 1] static var waveDebugConfig = [WAVE_TESTMOB, 1] static var current: int = startWith(waveReleaseConfig[1]) if WorldManager.isRelease() else startWith(waveDebugConfig[1]) diff --git a/scripts/Statemachine/EntityBase.gd b/scripts/Statemachine/EntityBase.gd index f274fab..9320b14 100644 --- a/scripts/Statemachine/EntityBase.gd +++ b/scripts/Statemachine/EntityBase.gd @@ -200,8 +200,8 @@ func _physics_process(_delta: float) -> void: ai() elif isSummon(): ai() - velocity += inertia - inertia *= 0.9 + velocity += inertia + inertia *= 0.9 move_and_slide() var collision = get_last_slide_collision() if is_instance_valid(collision): diff --git a/scripts/Statemachine/EntityStateBar.gd b/scripts/Statemachine/EntityStateBar.gd index c607106..f215066 100644 --- a/scripts/Statemachine/EntityStateBar.gd +++ b/scripts/Statemachine/EntityStateBar.gd @@ -2,11 +2,16 @@ extends CanvasItem class_name EntityStateBar @export var entity: EntityBase +@export var longer: bool = false @onready var healthBar: ColorBar = $"%health" @onready var levelLabel: Label = $"%level" @onready var levelLabels: HBoxContainer = $"%levelLabel" +func _ready(): + if longer: + healthBar.size.x *= 2 + healthBar.position.x *= 2 func forceSync(): healthBar.maxValue = entity.fields[FieldStore.Entity.MAX_HEALTH] healthBar.currentValue = entity.health