From f13edb7f1a3d4ac87ec313638f0d4b7a966179fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=A8=E8=90=BD=E5=9F=BA=E5=9B=B4=E8=99=BE?=
 <3161880837@qq.com>
Date: Fri, 29 Aug 2025 07:58:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(FieldStore):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E6=8E=89=E8=90=BD=E7=89=A9?=
 =?UTF-8?q?=E9=87=8D=E5=8A=9B=E7=9B=B8=E5=85=B3=E6=9E=9A=E4=B8=BE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构EntityBase.gd中的字段分组，提升代码可读性
---
 scripts/Statemachine/EntityBase.gd | 26 ++++++++++++++++----------
 scripts/Tools/FieldStore.gd        | 10 ++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/scripts/Statemachine/EntityBase.gd b/scripts/Statemachine/EntityBase.gd
index 82ab6a6..b6a715a 100644
--- a/scripts/Statemachine/EntityBase.gd
+++ b/scripts/Statemachine/EntityBase.gd
@@ -8,25 +8,31 @@ signal healthChanged(health: float)
 signal energyChanged(energy: float)
 
 var fields = {
+	# 数值上限
 	FieldStore.Entity.MAX_HEALTH: 100,
-	FieldStore.Entity.DAMAGE_MULTIPILER: 1,
+	FieldStore.Entity.MAX_ENERGY: 200,
+	FieldStore.Entity.EXTRA_APPLE_MAX: 0,
+	FieldStore.Entity.EXTRA_BULLET_COUNT: 0,
+	# 速度
 	FieldStore.Entity.MOVEMENT_SPEED: 1,
 	FieldStore.Entity.ATTACK_SPEED: 1,
-	FieldStore.Entity.CRIT_RATE: 0.05,
+	# 伤害
+	FieldStore.Entity.DAMAGE_MULTIPILER: 1,
 	FieldStore.Entity.CRIT_DAMAGE: 1,
+	# 概率相关
+	FieldStore.Entity.CRIT_RATE: 0.05,
 	FieldStore.Entity.PENERATE: 0,
 	FieldStore.Entity.OFFSET_SHOOT: 3,
-	FieldStore.Entity.HEAL_ABILITY: 1,
-	FieldStore.Entity.EXTRA_APPLE_MAX: 0,
-	FieldStore.Entity.ENERGY_MULTIPILER: 1,
-	FieldStore.Entity.PENARATION_RESISTANCE: 0,
-	FieldStore.Entity.PRICE_REDUCTION: 0,
-	FieldStore.Entity.EXTRA_BULLET_COUNT: 0,
 	FieldStore.Entity.DROP_APPLE_RATE: 0,
+	FieldStore.Entity.PENARATION_RESISTANCE: 0,
+	FieldStore.Entity.LUCK_VALUE: 1,
+	# 倍率
+	FieldStore.Entity.HEAL_ABILITY: 1,
+	FieldStore.Entity.ENERGY_MULTIPILER: 1,
+	FieldStore.Entity.PRICE_REDUCTION: 0,
+	# 饲料
 	FieldStore.Entity.FEED_COUNT_SHOW: 3,
 	FieldStore.Entity.FEED_COUNT_CAN_MADE: 1,
-	FieldStore.Entity.MAX_ENERGY: 200,
-	FieldStore.Entity.LUCK_VALUE: 1
 }
 var inventory = {
 	ItemStore.ItemType.BASEBALL: 100,
diff --git a/scripts/Tools/FieldStore.gd b/scripts/Tools/FieldStore.gd
index 7095141..cd62c97 100644
--- a/scripts/Tools/FieldStore.gd
+++ b/scripts/Tools/FieldStore.gd
@@ -26,8 +26,6 @@ enum Entity {
 	FEED_COUNT_CAN_MADE,
 	MAX_ENERGY,
 	LUCK_VALUE,
-	DROPPED_ITEM_GRAVITY_MULTIPILER,
-	DROPPED_ITEM_GRAVITY_INFLUENCE_BY_DISTANCE_MULTIPILER
 }
 static var entityMap = {
 	Entity.MAX_HEALTH: "生命上限",
@@ -45,12 +43,10 @@ static var entityMap = {
 	Entity.PRICE_REDUCTION: "饲料降价",
 	Entity.EXTRA_BULLET_COUNT: "额外子弹",
 	Entity.DROP_APPLE_RATE: "苹果掉落率",
-	Entity.FEED_COUNT_SHOW: "可选饲料数量",
-	Entity.FEED_COUNT_CAN_MADE: "可制作饲料数量",
+	Entity.FEED_COUNT_SHOW: "饲料列表",
+	Entity.FEED_COUNT_CAN_MADE: "可制作饲料",
 	Entity.MAX_ENERGY: "能量上限",
 	Entity.LUCK_VALUE: "幸运值",
-	Entity.DROPPED_ITEM_GRAVITY_MULTIPILER: "掉落物重力倍率",
-	Entity.DROPPED_ITEM_GRAVITY_INFLUENCE_BY_DISTANCE_MULTIPILER: "掉落物重力受距离影响"
 }
 static var entityMapType = {
 	Entity.MAX_HEALTH: DataType.VALUE,
@@ -72,8 +68,6 @@ static var entityMapType = {
 	Entity.FEED_COUNT_CAN_MADE: DataType.VALUE,
 	Entity.MAX_ENERGY: DataType.VALUE,
 	Entity.LUCK_VALUE: DataType.VALUE,
-	Entity.DROPPED_ITEM_GRAVITY_MULTIPILER: DataType.PERCENT,
-	Entity.DROPPED_ITEM_GRAVITY_INFLUENCE_BY_DISTANCE_MULTIPILER: DataType.VALUE
 }
 static var entityMaxValueMap = {
 	Entity.CRIT_RATE: 1,