diff --git a/components/Debug/FeedFilter.tscn b/components/Debug/FeedFilter.tscn index 911d75a..d72ab26 100644 --- a/components/Debug/FeedFilter.tscn +++ b/components/Debug/FeedFilter.tscn @@ -5,3 +5,5 @@ [node name="FeedFilter" type="HBoxContainer" unique_id=1769176018] theme_override_constants/separation = 0 script = ExtResource("1_feedfilter") +targetFields = Array[int]([14]) +clickToRefresh = true diff --git a/components/Feeds/A-Applr.tscn b/components/Feeds/A-Applr.tscn index f9dfaaf..8608485 100644 --- a/components/Feeds/A-Applr.tscn +++ b/components/Feeds/A-Applr.tscn @@ -1,25 +1,24 @@ -[gd_scene load_steps=5 format=3 uid="uid://uu0s26ehdr4h"] +[gd_scene format=3 uid="uid://uu0s26ehdr4h"] [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_cwqpr"] -[ext_resource type="Texture2D" uid="uid://ckr8tw7fsa7qx" path="res://resources/weapons/AcidWind.png" id="2_cq26m"] [ext_resource type="Texture2D" uid="uid://c2q4cf4ivu7o7" path="res://resources/feeds/apple.png" id="2_l1ph2"] [ext_resource type="PackedScene" uid="uid://dgxvgsipl0gr1" path="res://components/Weapons/CursorKnife.tscn" id="3_powvs"] -[node name="Applr" instance=ExtResource("1_cwqpr")] +[node name="Applr" unique_id=1383006342 instance=ExtResource("1_cwqpr")] avatarTexture = ExtResource("2_l1ph2") displayName = "焦糖苹果" quality = 2 topic = 8 fields = Array[int]([14]) -fieldValues = Array[float]([0.01]) +fieldValues = Array[float]([0.003]) weapons = Array[PackedScene]([ExtResource("3_powvs")]) costs = Array[int]([0, 2]) costCounts = Array[int]([500, 1]) -[node name="avatar" parent="container/info" index="0"] -texture = ExtResource("2_cq26m") +[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="0" unique_id=239110315] +texture = ExtResource("2_l1ph2") -[node name="name" parent="container/info" index="1"] -displayName = "酸蚀风暴" +[node name="name" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="1" unique_id=1202819558] +displayName = "焦糖苹果" quality = 2 topic = 8 diff --git a/components/Feeds/FruitSalad.tscn b/components/Feeds/FruitSalad.tscn index e7dba68..9b56509 100644 --- a/components/Feeds/FruitSalad.tscn +++ b/components/Feeds/FruitSalad.tscn @@ -1,22 +1,22 @@ -[gd_scene load_steps=3 format=3 uid="uid://d3oh03276434b"] +[gd_scene format=3 uid="uid://d3oh03276434b"] [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_mvycn"] [ext_resource type="Texture2D" uid="uid://bdknu6rkkpoyd" path="res://resources/feeds/fruitsalad.svg" id="2_2oxe7"] -[node name="FruitSalad" instance=ExtResource("1_mvycn")] +[node name="FruitSalad" unique_id=453318050 instance=ExtResource("1_mvycn")] avatarTexture = ExtResource("2_2oxe7") displayName = "水果沙拉" quality = 0 topic = 5 fields = Array[int]([4, 14]) -fieldValues = Array[float]([0.04, 0.02]) +fieldValues = Array[float]([0.04, 0.006]) costs = Array[int]([1]) costCounts = Array[int]([200]) -[node name="avatar" parent="container/info" index="0"] +[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="0" unique_id=239110315] texture = ExtResource("2_2oxe7") -[node name="name" parent="container/info" index="1"] +[node name="name" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="1" unique_id=1202819558] displayName = "水果沙拉" quality = 0 topic = 5 diff --git a/components/Feeds/Strawberry.tscn b/components/Feeds/Strawberry.tscn index b88877d..84733a1 100644 --- a/components/Feeds/Strawberry.tscn +++ b/components/Feeds/Strawberry.tscn @@ -1,20 +1,20 @@ -[gd_scene load_steps=3 format=3 uid="uid://cjcefxdt72d0k"] +[gd_scene format=3 uid="uid://cjcefxdt72d0k"] [ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_wr2cd"] [ext_resource type="Texture2D" uid="uid://cbyfpwrg2e3ns" path="res://resources/feeds/strawberry-a.svg" id="2_82amy"] -[node name="Strawberry" instance=ExtResource("1_wr2cd")] +[node name="Strawberry" unique_id=604791747 instance=ExtResource("1_wr2cd")] avatarTexture = ExtResource("2_82amy") displayName = "草莓" quality = 3 fields = Array[int]([14]) -fieldValues = Array[float]([0.04]) +fieldValues = Array[float]([0.012]) costs = Array[int]([1]) costCounts = Array[int]([400]) -[node name="avatar" parent="container/info" index="0"] +[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="0" unique_id=239110315] texture = ExtResource("2_82amy") -[node name="name" parent="container/info" index="1"] +[node name="name" parent="container/info" parent_id_path=PackedInt32Array(1288419607) index="1" unique_id=1202819558] displayName = "草莓" quality = 3 diff --git a/scripts/Contents/Panels/GameOver.gd b/scripts/Contents/Panels/GameOver.gd index c7d2633..bef42bc 100644 --- a/scripts/Contents/Panels/GameOver.gd +++ b/scripts/Contents/Panels/GameOver.gd @@ -25,8 +25,8 @@ func beforeOpen(args: Array = []): audio.play() var reasonTemplate = MathTool.randomChoiceFrom(GameRule.deadReasons) deadreason.text = ("[color=gray]" + reasonTemplate + "凶手是[b]%s[/b]的[b]%s[/b]。[/color]") % args - OutGameStorage.inventory[ItemStore.ItemType.CRYSTAL] += UIState.player.inventory[ItemStore.ItemType.CRYSTAL] - OutGameStorage.inventory[ItemStore.ItemType.DIAMOND] += UIState.player.inventory[ItemStore.ItemType.DIAMOND] + for item in OutGameStorage.inventory: + OutGameStorage.inventory[item] += UIState.player.inventory[item] func afterOpen(_args: Array = []): returnBtn.disabled = false exitBtn.disabled = false diff --git a/scripts/Tools/GameRule.gd b/scripts/Tools/GameRule.gd index 53a7a23..3057ba0 100644 --- a/scripts/Tools/GameRule.gd +++ b/scripts/Tools/GameRule.gd @@ -9,7 +9,7 @@ static var damageOffset: float = MathTool.percent(20) # 伤害随机浮动比例 static var beachballOffset: float = MathTool.percent(30) # 棒球掉落数随机浮动比例 static var damageLabelSpawnOffset: float = 30 # 伤害标签生成位置的随机偏移 static var itemDroppedSpawnOffset: float = 30 # 掉落物生成位置的随机偏移 -static var appleDropRate: float = MathTool.percent(3) # 苹果掉落概率 +static var appleDropRate: float = MathTool.percent(2) # 苹果掉落概率 static var refreshCountIncreaseCount: Vector2i = Vector2i(0, 3) # 刷新所需的棒球数量的增加的数量 static var entityCountBoostPerWave: float = MathTool.percent(2) # 每波敌人数量增加的百分比，倍数级 static var itemShowLifetime: int = 1500 # 物品展示组件如果设置了自动隐藏，那么隐藏前可以存活的时间 diff --git a/scripts/Tools/OutGameStorage.gd b/scripts/Tools/OutGameStorage.gd index 4202d67..f27817a 100644 --- a/scripts/Tools/OutGameStorage.gd +++ b/scripts/Tools/OutGameStorage.gd @@ -6,9 +6,12 @@ static var upgradableFieldsCost = { } static var upgradableFieldsAdvance = { FieldStore.Entity.MAX_HEALTH: 10, + FieldStore.Entity.MAX_ENERGY: 15, FieldStore.Entity.DAMAGE_MULTIPILER: 0.1, FieldStore.Entity.ATTACK_SPEED: 0.05, - FieldStore.Entity.PRICE_REDUCTION: 0.02, + FieldStore.Entity.PRICE_REDUCTION: 0.03, + FieldStore.Entity.LUCK_VALUE: 1, + FieldStore.Entity.DROP_APPLE_RATE: 0.007 } static var upgradableFieldsValue = ArrayTool.fill(upgradableFieldsAdvance, func(_k): return 0) static var upgradableFieldsLevel = ArrayTool.fill(upgradableFieldsAdvance, func(_k): return 0)