From 11ddf9fe1fabe65f2f1c306d9842645a4dea795f Mon Sep 17 00:00:00 2001
From: gechangfu <gechangfu@kunpo.cc>
Date: Wed, 30 Jul 2025 19:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 excel/ability.xlsx                            | Bin 17163 -> 17195 bytes
 excel/anim.xlsx                               | Bin 16323 -> 16329 bytes
 excel/attribute.xlsx                          | Bin 12561 -> 12535 bytes
 excel/enemy.xlsx                              | Bin 9060 -> 9056 bytes
 excel/level.xlsx                              | Bin 10188 -> 10150 bytes
 src/ReplicatedStorage/Json/Ability.json       |   3 +-
 src/ReplicatedStorage/Json/Animation.json     |   3 +-
 src/ReplicatedStorage/Json/Attributes.json    |   2 +-
 src/ReplicatedStorage/Json/Enemy.json         |   6 +-
 src/ReplicatedStorage/Json/Level.json         |  80 ++++-----
 .../Modules/BehavioursClient/Attack.luau      |  48 ++++++
 src/ServerStorage/Base/Behaviour.luau         |  26 ++-
 .../Modules/Behaviours/Attack.luau            | 121 +++++++++++++
 .../Modules/Behaviours/Move.luau              |  25 ++-
 src/ServerStorage/Proxy/ArchiveProxy.luau     |   1 -
 src/ServerStorage/Proxy/MobsProxy/AI.luau     |  12 +-
 src/ServerStorage/Proxy/MobsProxy/init.luau   |   5 +-
 .../Proxy/PlayerFightProxy/init.luau          |   7 +-
 .../ClientMain/Camera.client.luau             |   2 +-
 .../ClientMain/MobAnim.luau                   | 159 ++++++++++++++++++
 .../PerformanceClient/DamageBoard.luau        |   4 +-
 .../ClientMain/PerformanceClient/init.luau    |   1 -
 .../ClientMain/PlayerControl.luau             |  55 ++++--
 src/StarterPlayerScripts/UI/UIManager.luau    |   8 +
 .../UI/Windows/MainWindow/init.luau           |  10 +-
 25 files changed, 495 insertions(+), 83 deletions(-)
 create mode 100644 src/ReplicatedStorage/Modules/BehavioursClient/Attack.luau
 create mode 100644 src/ServerStorage/Modules/Behaviours/Attack.luau
 create mode 100644 src/StarterPlayerScripts/ClientMain/MobAnim.luau

diff --git a/excel/ability.xlsx b/excel/ability.xlsx
index 5cd47c131717f5f60fc0619eeeec1d3b26deae84..032866438e68b9f1b2a74e9eb3b2d9b3d540220f 100644
GIT binary patch
delta 3690
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
OV!jxhrC-xK9{L~Ab)y6T

delta 3624
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

diff --git a/excel/anim.xlsx b/excel/anim.xlsx
index 52ebc72280a03b014f146dc4d5df39291832e83b..e880a3c94d4ea7baee7bff0103e392db7d2eb64f 100644
GIT binary patch
delta 2854
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

delta 2862
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

diff --git a/excel/attribute.xlsx b/excel/attribute.xlsx
index 371cd9136b516416d35afc0b9232e60b938c439a..abf472103e66f44d7b6bda439269ab186fb0dfbe 100644
GIT binary patch
delta 4540
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

delta 4573
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

diff --git a/excel/enemy.xlsx b/excel/enemy.xlsx
index 32f8ea287375ecc2e41b5b38ba001013942acbe7..acac0856dc2ff78309e9c80249b80c4065f131cc 100644
GIT binary patch
delta 2147
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
Z0001cll&q+0{k75JR>3o${+v$008pY^>+XO

delta 2138
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
Q03MS#BO(UQAOHXW0O#fMSpWb4

diff --git a/excel/level.xlsx b/excel/level.xlsx
index e9f07bce065ebd695c6545599b25ee74168e2578..bbbc993ac3fc1ff622de4c1810f27002626cc7ab 100644
GIT binary patch
delta 3571
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

delta 3616
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
SoF2<<e1x1dQ1kTR(*FU7gVz!O

diff --git a/src/ReplicatedStorage/Json/Ability.json b/src/ReplicatedStorage/Json/Ability.json
index 60dfbfc..d0bac1e 100644
--- a/src/ReplicatedStorage/Json/Ability.json
+++ b/src/ReplicatedStorage/Json/Ability.json
@@ -1,3 +1,4 @@
 [
-{"id":20000,"type":1,"icon":1,"behaviourName":"SwordWave","upgradeCost":[30000,5,10],"upgradeValue":[10,200],"recycle":[30000,100]}
+{"id":20000,"type":1,"icon":1,"behaviourName":"Attack","upgradeCost":[30000,5,0],"upgradeValue":[10,0],"recycle":[30000,0]},
+{"id":20001,"type":1,"icon":1,"behaviourName":"SwordWave","upgradeCost":[30000,5,10],"upgradeValue":[10,200],"recycle":[30000,100]}
 ]
\ No newline at end of file
diff --git a/src/ReplicatedStorage/Json/Animation.json b/src/ReplicatedStorage/Json/Animation.json
index 7f1d70f..4fa1d14 100644
--- a/src/ReplicatedStorage/Json/Animation.json
+++ b/src/ReplicatedStorage/Json/Animation.json
@@ -1,3 +1,4 @@
 [
-{"id":1,"name":"SwordWave","rbxId":"133335766636767","priority":"Action"}
+{"id":1,"name":"SwordWave","rbxId":"133335766636767","priority":"Action"},
+{"id":2,"name":"Attack","rbxId":"17283773476","priority":"Action"}
 ]
\ No newline at end of file
diff --git a/src/ReplicatedStorage/Json/Attributes.json b/src/ReplicatedStorage/Json/Attributes.json
index 419a1fa..68a54b0 100644
--- a/src/ReplicatedStorage/Json/Attributes.json
+++ b/src/ReplicatedStorage/Json/Attributes.json
@@ -14,7 +14,7 @@
 {"id":13,"type":1,"effectAttribute":"shadowDef","battleValue":[1,10],"iconId":13},
 {"id":14,"type":2,"effectAttribute":"attackRate","battleValue":[1,10],"iconId":14},
 {"id":15,"type":2,"effectAttribute":"hpRate","battleValue":[1,10],"iconId":15},
-{"id":16,"type":2,"effectAttribute":"atkSpeed","battleValue":[1,10],"iconId":16},
+{"id":16,"type":1,"effectAttribute":"atkSpeed","battleValue":[1,10],"iconId":16},
 {"id":20,"type":2,"effectAttribute":"critRate","battleValue":[1,10],"iconId":17},
 {"id":21,"type":2,"effectAttribute":"critDamageRate","battleValue":[1,10],"iconId":18},
 {"id":22,"type":2,"effectAttribute":"atkSpeedRate","battleValue":[1,10],"iconId":19},
diff --git a/src/ReplicatedStorage/Json/Enemy.json b/src/ReplicatedStorage/Json/Enemy.json
index e29a0d2..3a16439 100644
--- a/src/ReplicatedStorage/Json/Enemy.json
+++ b/src/ReplicatedStorage/Json/Enemy.json
@@ -1,5 +1,5 @@
 [
-{"id":1,"type":1,"name":1,"attack":83,"hp":400,"walkSpeed":10,"attackSpeed":1,"model":"Thief"},
-{"id":2,"type":1,"name":2,"attack":30,"hp":300,"walkSpeed":10,"attackSpeed":1,"model":"Thief"},
-{"id":1000,"type":2,"name":1000,"attack":240,"hp":2000,"walkSpeed":20,"attackSpeed":1,"model":"Thief"}
+{"id":1,"type":1,"name":1,"attack":83,"hp":400,"walkSpeed":8,"attackSpeed":1,"model":"Thief"},
+{"id":2,"type":1,"name":2,"attack":30,"hp":300,"walkSpeed":8,"attackSpeed":1,"model":"Thief"},
+{"id":1000,"type":2,"name":1000,"attack":240,"hp":2000,"walkSpeed":4,"attackSpeed":1,"model":"Thief"}
 ]
\ No newline at end of file
diff --git a/src/ReplicatedStorage/Json/Level.json b/src/ReplicatedStorage/Json/Level.json
index 5dc7665..9905731 100644
--- a/src/ReplicatedStorage/Json/Level.json
+++ b/src/ReplicatedStorage/Json/Level.json
@@ -1,52 +1,52 @@
 [
-{"id":1,"type":1,"timeLimit":null,"atkBonus":500,"hpBonus":500,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":2,"type":1,"timeLimit":null,"atkBonus":520,"hpBonus":520,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":3,"type":1,"timeLimit":null,"atkBonus":540,"hpBonus":540,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":4,"type":1,"timeLimit":null,"atkBonus":560,"hpBonus":560,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":1,"type":1,"timeLimit":null,"atkBonus":500,"hpBonus":500,"wave":[[10,1,1,50,1,1]]},
+{"id":2,"type":1,"timeLimit":null,"atkBonus":520,"hpBonus":520,"wave":[[10,1,1,50,1,1]]},
+{"id":3,"type":1,"timeLimit":null,"atkBonus":540,"hpBonus":540,"wave":[[10,1,1,50,1,1]]},
+{"id":4,"type":1,"timeLimit":null,"atkBonus":560,"hpBonus":560,"wave":[[10,1,1,50,1,1]]},
 {"id":5,"type":2,"timeLimit":60,"atkBonus":1050,"hpBonus":1050,"wave":[[10,1000,1]]},
-{"id":6,"type":1,"timeLimit":null,"atkBonus":600,"hpBonus":600,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":7,"type":1,"timeLimit":null,"atkBonus":620,"hpBonus":620,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":8,"type":1,"timeLimit":null,"atkBonus":640,"hpBonus":640,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":9,"type":1,"timeLimit":null,"atkBonus":660,"hpBonus":660,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":6,"type":1,"timeLimit":null,"atkBonus":600,"hpBonus":600,"wave":[[10,1,1,50,1,1]]},
+{"id":7,"type":1,"timeLimit":null,"atkBonus":620,"hpBonus":620,"wave":[[10,1,1,50,1,1]]},
+{"id":8,"type":1,"timeLimit":null,"atkBonus":640,"hpBonus":640,"wave":[[10,1,1,50,1,1]]},
+{"id":9,"type":1,"timeLimit":null,"atkBonus":660,"hpBonus":660,"wave":[[10,1,1,50,1,1]]},
 {"id":10,"type":2,"timeLimit":60,"atkBonus":1100,"hpBonus":1100,"wave":[[10,1000,1]]},
-{"id":11,"type":1,"timeLimit":null,"atkBonus":700,"hpBonus":700,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":12,"type":1,"timeLimit":null,"atkBonus":720,"hpBonus":720,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":13,"type":1,"timeLimit":null,"atkBonus":740,"hpBonus":740,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":14,"type":1,"timeLimit":null,"atkBonus":760,"hpBonus":760,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":11,"type":1,"timeLimit":null,"atkBonus":700,"hpBonus":700,"wave":[[10,1,1,50,1,1]]},
+{"id":12,"type":1,"timeLimit":null,"atkBonus":720,"hpBonus":720,"wave":[[10,1,1,50,1,1]]},
+{"id":13,"type":1,"timeLimit":null,"atkBonus":740,"hpBonus":740,"wave":[[10,1,1,50,1,1]]},
+{"id":14,"type":1,"timeLimit":null,"atkBonus":760,"hpBonus":760,"wave":[[10,1,1,50,1,1]]},
 {"id":15,"type":2,"timeLimit":60,"atkBonus":1150,"hpBonus":1150,"wave":[[10,1000,1]]},
-{"id":16,"type":1,"timeLimit":null,"atkBonus":800,"hpBonus":800,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":17,"type":1,"timeLimit":null,"atkBonus":820,"hpBonus":820,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":18,"type":1,"timeLimit":null,"atkBonus":840,"hpBonus":840,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":19,"type":1,"timeLimit":null,"atkBonus":860,"hpBonus":860,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":16,"type":1,"timeLimit":null,"atkBonus":800,"hpBonus":800,"wave":[[10,1,1,50,1,1]]},
+{"id":17,"type":1,"timeLimit":null,"atkBonus":820,"hpBonus":820,"wave":[[10,1,1,50,1,1]]},
+{"id":18,"type":1,"timeLimit":null,"atkBonus":840,"hpBonus":840,"wave":[[10,1,1,50,1,1]]},
+{"id":19,"type":1,"timeLimit":null,"atkBonus":860,"hpBonus":860,"wave":[[10,1,1,50,1,1]]},
 {"id":20,"type":2,"timeLimit":60,"atkBonus":1250,"hpBonus":1250,"wave":[[10,1000,1]]},
-{"id":21,"type":1,"timeLimit":null,"atkBonus":900,"hpBonus":900,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":22,"type":1,"timeLimit":null,"atkBonus":920,"hpBonus":920,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":23,"type":1,"timeLimit":null,"atkBonus":940,"hpBonus":940,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":24,"type":1,"timeLimit":null,"atkBonus":960,"hpBonus":960,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":21,"type":1,"timeLimit":null,"atkBonus":900,"hpBonus":900,"wave":[[10,1,1,50,1,1]]},
+{"id":22,"type":1,"timeLimit":null,"atkBonus":920,"hpBonus":920,"wave":[[10,1,1,50,1,1]]},
+{"id":23,"type":1,"timeLimit":null,"atkBonus":940,"hpBonus":940,"wave":[[10,1,1,50,1,1]]},
+{"id":24,"type":1,"timeLimit":null,"atkBonus":960,"hpBonus":960,"wave":[[10,1,1,50,1,1]]},
 {"id":25,"type":2,"timeLimit":60,"atkBonus":1350,"hpBonus":1350,"wave":[[10,1000,1]]},
-{"id":26,"type":1,"timeLimit":null,"atkBonus":1000,"hpBonus":1000,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":27,"type":1,"timeLimit":null,"atkBonus":1020,"hpBonus":1020,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":28,"type":1,"timeLimit":null,"atkBonus":1040,"hpBonus":1040,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":29,"type":1,"timeLimit":null,"atkBonus":1060,"hpBonus":1060,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":26,"type":1,"timeLimit":null,"atkBonus":1000,"hpBonus":1000,"wave":[[10,1,1,50,1,1]]},
+{"id":27,"type":1,"timeLimit":null,"atkBonus":1020,"hpBonus":1020,"wave":[[10,1,1,50,1,1]]},
+{"id":28,"type":1,"timeLimit":null,"atkBonus":1040,"hpBonus":1040,"wave":[[10,1,1,50,1,1]]},
+{"id":29,"type":1,"timeLimit":null,"atkBonus":1060,"hpBonus":1060,"wave":[[10,1,1,50,1,1]]},
 {"id":30,"type":2,"timeLimit":60,"atkBonus":1500,"hpBonus":1500,"wave":[[10,1000,1]]},
-{"id":31,"type":1,"timeLimit":null,"atkBonus":1100,"hpBonus":1100,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":32,"type":1,"timeLimit":null,"atkBonus":1120,"hpBonus":1120,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":33,"type":1,"timeLimit":null,"atkBonus":1140,"hpBonus":1140,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":34,"type":1,"timeLimit":null,"atkBonus":1160,"hpBonus":1160,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":31,"type":1,"timeLimit":null,"atkBonus":1100,"hpBonus":1100,"wave":[[10,1,1,50,1,1]]},
+{"id":32,"type":1,"timeLimit":null,"atkBonus":1120,"hpBonus":1120,"wave":[[10,1,1,50,1,1]]},
+{"id":33,"type":1,"timeLimit":null,"atkBonus":1140,"hpBonus":1140,"wave":[[10,1,1,50,1,1]]},
+{"id":34,"type":1,"timeLimit":null,"atkBonus":1160,"hpBonus":1160,"wave":[[10,1,1,50,1,1]]},
 {"id":35,"type":2,"timeLimit":60,"atkBonus":2000,"hpBonus":2000,"wave":[[10,1000,1]]},
-{"id":36,"type":1,"timeLimit":null,"atkBonus":1200,"hpBonus":1200,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":37,"type":1,"timeLimit":null,"atkBonus":1220,"hpBonus":1220,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":38,"type":1,"timeLimit":null,"atkBonus":1240,"hpBonus":1240,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":39,"type":1,"timeLimit":null,"atkBonus":1260,"hpBonus":1260,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":36,"type":1,"timeLimit":null,"atkBonus":1200,"hpBonus":1200,"wave":[[10,1,1,50,1,1]]},
+{"id":37,"type":1,"timeLimit":null,"atkBonus":1220,"hpBonus":1220,"wave":[[10,1,1,50,1,1]]},
+{"id":38,"type":1,"timeLimit":null,"atkBonus":1240,"hpBonus":1240,"wave":[[10,1,1,50,1,1]]},
+{"id":39,"type":1,"timeLimit":null,"atkBonus":1260,"hpBonus":1260,"wave":[[10,1,1,50,1,1]]},
 {"id":40,"type":2,"timeLimit":60,"atkBonus":2500,"hpBonus":2500,"wave":[[10,1000,1]]},
-{"id":41,"type":1,"timeLimit":null,"atkBonus":1300,"hpBonus":1300,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":42,"type":1,"timeLimit":null,"atkBonus":1320,"hpBonus":1320,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":43,"type":1,"timeLimit":null,"atkBonus":1340,"hpBonus":1340,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":44,"type":1,"timeLimit":null,"atkBonus":1360,"hpBonus":1360,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":41,"type":1,"timeLimit":null,"atkBonus":1300,"hpBonus":1300,"wave":[[10,1,1,50,1,1]]},
+{"id":42,"type":1,"timeLimit":null,"atkBonus":1320,"hpBonus":1320,"wave":[[10,1,1,50,1,1]]},
+{"id":43,"type":1,"timeLimit":null,"atkBonus":1340,"hpBonus":1340,"wave":[[10,1,1,50,1,1]]},
+{"id":44,"type":1,"timeLimit":null,"atkBonus":1360,"hpBonus":1360,"wave":[[10,1,1,50,1,1]]},
 {"id":45,"type":2,"timeLimit":60,"atkBonus":3000,"hpBonus":3000,"wave":[[10,1000,1]]},
-{"id":46,"type":1,"timeLimit":null,"atkBonus":1400,"hpBonus":1400,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":47,"type":1,"timeLimit":null,"atkBonus":1420,"hpBonus":1420,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":48,"type":1,"timeLimit":null,"atkBonus":1440,"hpBonus":1440,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
-{"id":49,"type":1,"timeLimit":null,"atkBonus":1460,"hpBonus":1460,"wave":[[10,1,1,50,1,1,100,1,1,150,1,1,200,1,1,250,1,1]]},
+{"id":46,"type":1,"timeLimit":null,"atkBonus":1400,"hpBonus":1400,"wave":[[10,1,1,50,1,1]]},
+{"id":47,"type":1,"timeLimit":null,"atkBonus":1420,"hpBonus":1420,"wave":[[10,1,1,50,1,1]]},
+{"id":48,"type":1,"timeLimit":null,"atkBonus":1440,"hpBonus":1440,"wave":[[10,1,1,50,1,1]]},
+{"id":49,"type":1,"timeLimit":null,"atkBonus":1460,"hpBonus":1460,"wave":[[10,1,1,50,1,1]]},
 {"id":50,"type":2,"timeLimit":60,"atkBonus":3500,"hpBonus":3500,"wave":[[10,1000,1]]}
 ]
\ No newline at end of file
diff --git a/src/ReplicatedStorage/Modules/BehavioursClient/Attack.luau b/src/ReplicatedStorage/Modules/BehavioursClient/Attack.luau
new file mode 100644
index 0000000..077c237
--- /dev/null
+++ b/src/ReplicatedStorage/Modules/BehavioursClient/Attack.luau
@@ -0,0 +1,48 @@
+-- 剑气
+
+--> Services
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
+
+--> Dependencies
+local BehaviourClient = require(ReplicatedStorage.Base.BehaviourClient)
+
+--> Variables
+local PrefabFolder = ReplicatedStorage:WaitForChild("Prefabs")
+-- local Prefab_Attack = PrefabFolder:WaitForChild("Projectiles"):WaitForChild("Attack")
+
+--------------------------------------------------------------------------------
+
+local Attack = {}
+Attack.__index = Attack
+setmetatable(Attack, {__index = BehaviourClient})
+
+function Attack:Init(CasterPlayer: Player, CastInfo: table, DelayTime: number, CastState: boolean)
+    local self = BehaviourClient:Init(CasterPlayer, CastInfo, DelayTime, CastState)
+    setmetatable(self, Attack)
+
+    -- 加载动画
+    self:LoadAnimationByName("Attack")
+    return self
+end
+
+function Attack:Show(CasterPlayer: Player, CastInfo: table, DelayTime: number, CastState: boolean)
+    self.EffectDispatcher:ShowAnimation(self.Player, DelayTime, self:GetAnimationByName("Attack"))
+end
+
+function Attack:Destroy()
+    if self.ShowTask then
+        task.cancel(self.ShowTask)
+        self.ShowTask = nil
+    end
+    if self.Tween then
+        self.Tween:Cancel()
+        self.Tween = nil
+    end
+    if self.Projectile then
+        self.Projectile:Destroy()
+        self.Projectile = nil
+    end
+    BehaviourClient.Destroy(self)
+end
+
+return Attack
\ No newline at end of file
diff --git a/src/ServerStorage/Base/Behaviour.luau b/src/ServerStorage/Base/Behaviour.luau
index a75d6bb..c96cb84 100644
--- a/src/ServerStorage/Base/Behaviour.luau
+++ b/src/ServerStorage/Base/Behaviour.luau
@@ -12,6 +12,16 @@ local RE_CleanPlayerPerformance = ReplicatedStorage:FindFirstChild("Events"):Fin
 --> Dependencies
 local TypeList = require(ServerStorage.Base.TypeList)
 local Communicate = require(ServerStorage.Modules.Tools.Communicate)
+local Utils = require(ReplicatedStorage.Tools.Utils)
+
+--> Json
+local JsonAttributes = require(ReplicatedStorage.Json.Attributes)
+
+--> 临时维护一个属性数据表，用于记录属性类型
+local AttributesNameData = {}
+for _, Attribute in JsonAttributes do
+    AttributesNameData[Attribute.effectAttribute] = Utils:DeepCopyTable(Attribute)
+end
 
 --------------------------------------------------------------------------------
 
@@ -54,7 +64,6 @@ end
 
 -- 检查行为前先清理之前遗留的引用数据
 function Behaviour:CheckClean()
-
     if self.Mobs then
         for _, Mob in self.Mobs do
             self.Mobs[Mob] = nil
@@ -69,6 +78,21 @@ function Behaviour:CheckClean()
     end
 end
 
+function Behaviour:GetAttributeValue(AttributeName: string)
+    local AttributeValue = self.Character.Instance:FindFirstChild("Attributes"):GetAttribute(AttributeName)
+    if not AttributeValue then return nil end
+    -- 处理对应的值
+    local AttributeData = AttributesNameData[AttributeName]
+    if not AttributeData then return nil end
+
+    local typeValue = AttributeData.type
+    if typeValue == 1 then
+        return AttributeValue
+    elseif typeValue == 2 then
+        return AttributeValue / 100
+    end
+end
+
 -- 启动冷却时间清除计时
 function Behaviour:StartCooldownTask()
     self.Cooldown = self.OrgCooldown
diff --git a/src/ServerStorage/Modules/Behaviours/Attack.luau b/src/ServerStorage/Modules/Behaviours/Attack.luau
new file mode 100644
index 0000000..092c555
--- /dev/null
+++ b/src/ServerStorage/Modules/Behaviours/Attack.luau
@@ -0,0 +1,121 @@
+-- 移动行为
+
+--> Services
+local ServerStorage = game:GetService("ServerStorage")
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
+
+--> Dependencies
+local TypeList = require(ServerStorage.Base.TypeList)
+local Behaviour = require(ServerStorage.Base.Behaviour)
+local MobsProxy = require(ServerStorage.Proxy.MobsProxy)
+local DamageProxy = require(ServerStorage.Proxy.DamageProxy)
+local Utils = require(ReplicatedStorage.Tools.Utils)
+
+--------------------------------------------------------------------------------
+
+local Attack = {}
+Attack.__index = Attack
+setmetatable(Attack, {__index = Behaviour})
+
+local CAST_DISTANCE = 8
+local COOLDOWN = 1
+local ATTRIBUTE_LIST = {
+    {Name = "attack", ElementType = DamageProxy.ElementType.NONE},
+    {Name = "fireAtk", ElementType = DamageProxy.ElementType.FIRE},
+    {Name = "iceAtk", ElementType = DamageProxy.ElementType.ICE},
+    {Name = "lightAtk", ElementType = DamageProxy.ElementType.LIGHT},
+    {Name = "shadowAtk", ElementType = DamageProxy.ElementType.SHADOW},
+
+}
+
+function Attack:Init(PlayerAI, Character: TypeList.Character, Player: Player)
+    local self = Behaviour:Init(PlayerAI, Character, script.Name)
+    self.Player = Player
+    self.Mobs = nil
+    setmetatable(self, Attack)
+    self.OrgCooldown = COOLDOWN
+    -- self:StartCooldownTask()
+    
+    -- 客户端表现
+    self:SendPerformanceEvent("Init", self.Player, script.Name, true, {})
+    return self
+end
+
+function Attack:Check(CheckInfo: table)
+    if Behaviour.CheckStat(self) then return -1, self.CheckData end
+    self:CheckClean()
+
+    self.Mobs = MobsProxy:GetPlayerMobs(self.Player)
+    if not self.Mobs then return end
+
+
+    local closestMob, minDistance = nil, CAST_DISTANCE
+    for _, Mob in self.Mobs do
+        if Mob.Instance and Mob.Instance.PrimaryPart then
+            local dist = (Mob.Instance.PrimaryPart.Position - self.Character.Instance.PrimaryPart.Position).Magnitude
+            if dist < minDistance then
+                minDistance = dist
+                closestMob = Mob
+            end
+        end
+    end
+
+    self.CheckData = {}
+    if closestMob then
+        self.CheckData["ClosestCharacter"] = closestMob
+        return 50, self.CheckData
+    end
+
+    -- 返回优先级，执行数据
+    return -1, self.CheckData
+end
+
+function Attack:Execute()
+    self.ExeTask = task.spawn(function ()
+        self:ChangeExecutingState(true)
+        -- cd放前面之后发送事件才能正常记录cd
+        -- self:StartCooldownTask()
+
+        -- 停止移动
+        self.Character.Humanoid:MoveTo(self.Character.Root.Position)
+        -- 朝向目标
+        local HumanoidRootPart = self.Character.Root
+        local TargetPosition = self.CheckData["ClosestCharacter"].Instance.PrimaryPart.Position
+
+        if HumanoidRootPart then
+            HumanoidRootPart.CFrame = CFrame.lookAt(HumanoidRootPart.Position, TargetPosition)
+        end
+
+        local atkSpeed = self:GetAttributeValue("atkSpeed")
+        if not atkSpeed then warn("atkSpeed not found") return end
+        
+        -- 表现部分
+        self:SendPerformanceEvent("Show", self.Player, self.ScriptName, true, {
+            { UniqueId = self.PlayerAI:GetBehaviourUniqueId() }
+        })
+        -- 攻击前摇
+        task.wait(atkSpeed)
+
+        -- TODO: 之后这里可以提前做暴击判定
+
+        -- 伤害逻辑计算部分
+        local damageData = {}
+        for _, attribute in ATTRIBUTE_LIST do
+            local attributeValue = self:GetAttributeValue(attribute.Name)
+            if attributeValue then
+                table.insert(damageData, {
+                    Damage = attributeValue,
+                    Type = DamageProxy.DamageType.NORMAL,
+                    Tag = DamageProxy.DamageTag.NORMAL,
+                    ElementType = attribute.ElementType,
+                })
+            end
+        end
+        DamageProxy:TakeDamage(self.Character, self.CheckData["ClosestCharacter"], damageData)
+        
+        -- task.wait(atkSpeed / 2)
+        self:ChangeExecutingState(false)
+    end)
+end
+
+return Attack
\ No newline at end of file
diff --git a/src/ServerStorage/Modules/Behaviours/Move.luau b/src/ServerStorage/Modules/Behaviours/Move.luau
index a8989d0..94d0f37 100644
--- a/src/ServerStorage/Modules/Behaviours/Move.luau
+++ b/src/ServerStorage/Modules/Behaviours/Move.luau
@@ -14,6 +14,8 @@ local Move = {}
 Move.__index = Move
 setmetatable(Move, {__index = Behaviour})
 
+local ATTACK_DISTANCE = 8
+
 function Move:Init(PlayerAI, Character: TypeList.Character, Player: Player)
     local self = Behaviour:Init(PlayerAI, Character, script.Name)
     self.Player = Player
@@ -41,8 +43,11 @@ function Move:Check(CheckInfo: table)
 
     self.CheckData = {}
     if closestMob then
-        self.CheckData["ClosestCharacter"] = closestMob
-        return 10, self.CheckData
+        local distance = (closestMob.Instance.PrimaryPart.Position - self.Character.Instance.PrimaryPart.Position).Magnitude
+        if distance > ATTACK_DISTANCE then
+            self.CheckData["ClosestCharacter"] = closestMob
+            return 10, self.CheckData
+        end
     end
 
     -- 返回优先级，执行数据
@@ -50,10 +55,22 @@ function Move:Check(CheckInfo: table)
 end
 
 function Move:Execute()
+    if self.ExeTask then task.cancel(self.ExeTask) end
     self.ExeTask = task.spawn(function ()
         self:ChangeExecutingState(true)
-        self.Character.Humanoid:MoveTo(self.CheckData["ClosestCharacter"].Instance:GetPivot().Position)
-        task.wait(0.5)
+
+        -- 新移动朝向
+        local TargetCharacter = self.CheckData["ClosestCharacter"].Instance
+        local TargetPosition = TargetCharacter:GetPivot().Position
+        local CharacterPosition = self.Character.Instance:GetPivot().Position
+        local Direction = (TargetPosition - CharacterPosition).Unit
+        local MoveToPosition = TargetPosition - (Direction * ATTACK_DISTANCE)
+
+        self.Character.Humanoid:MoveTo(MoveToPosition)
+
+        -- 旧内容
+        -- self.Character.Humanoid:MoveTo(self.CheckData["ClosestCharacter"].Instance:GetPivot().Position)
+        task.wait(0.2)
         self:ChangeExecutingState(false)
     end)
 end
diff --git a/src/ServerStorage/Proxy/ArchiveProxy.luau b/src/ServerStorage/Proxy/ArchiveProxy.luau
index 9a89920..687dbb0 100644
--- a/src/ServerStorage/Proxy/ArchiveProxy.luau
+++ b/src/ServerStorage/Proxy/ArchiveProxy.luau
@@ -86,7 +86,6 @@ local function LoadData(Player: Player): (boolean, any)
 	
 	if Success and Response then
 		print(("DataManager: User %s's data loaded into the game."):format(Player.Name))
-		print(Response)
 	else
 		print(("DataManager: User %s had no data to load from."):format(Player.Name))
 	end
diff --git a/src/ServerStorage/Proxy/MobsProxy/AI.luau b/src/ServerStorage/Proxy/MobsProxy/AI.luau
index cc77bf9..04a760b 100644
--- a/src/ServerStorage/Proxy/MobsProxy/AI.luau
+++ b/src/ServerStorage/Proxy/MobsProxy/AI.luau
@@ -67,9 +67,7 @@ task.defer(function()
 					local Enemy = Mob.Humanoid
 					
 					-- Simulation
-					if Mob.Root.Anchored then
-						Mob.Root.Anchored = false
-					end
+					if Mob.Root.Anchored then Mob.Root.Anchored = false end
 					if not Mob.Root:GetNetworkOwner() then
 						Mob.Root:SetNetworkOwner(Player)
 						task.wait(0.05) -- Give physics more time so it doesn't appear as choppy
@@ -78,9 +76,12 @@ task.defer(function()
 					-- Tracking
 					if Player and Enemy and PlayerRole then
 						if PlayerRole.Stats.Died then return end
-						if distance > 5 then
+						if distance > 8 then
+							Enemy:SetAttribute("AttackState", "Idle")
 							Enemy:MoveTo(Player.Character:GetPivot().Position, Player.Character.PrimaryPart)
 						else
+							Enemy:SetAttribute("AttackState", "Hit")
+							Mob.Root.Anchored = true
 							Mob.ExecutingState = true
 							-- 停止移动
 							Enemy:MoveTo(MobInstance:GetPivot().Position)
@@ -92,7 +93,7 @@ task.defer(function()
 							if not Player then return end
 							if PlayerRole.Stats.Died then return end
 
-							if AI:GetModelDistance(MobInstance, Player.Character) <= 5 then
+							if AI:GetModelDistance(MobInstance, Player.Character) <= 8 then
 								-- 调用伤害模块
 								DamageProxy:TakeDamage(Mob, Mob.PlayerRole, {
 									{
@@ -104,6 +105,7 @@ task.defer(function()
 								})
 							end
 							Mob.ExecutingState = false
+							Enemy:SetAttribute("AttackState", "Idle")
 						end
 					end
 				else
diff --git a/src/ServerStorage/Proxy/MobsProxy/init.luau b/src/ServerStorage/Proxy/MobsProxy/init.luau
index 94db091..0f3f4be 100644
--- a/src/ServerStorage/Proxy/MobsProxy/init.luau
+++ b/src/ServerStorage/Proxy/MobsProxy/init.luau
@@ -99,7 +99,10 @@ function MobsProxy:CreateMob(Player: Player, MobId: number, AtkBonus: number?, H
     AI:StartTracking(Mob)
     -- 关卡系数
     if AtkBonus then Mob:ChangeAttributeValue("attack", math.floor(Mob.Config.attack * (AtkBonus / 1000))) end
-    if HpBonus then Mob:ChangeAttributeValue("hp", math.floor(Mob.Config.hp * (HpBonus / 1000))) end
+    if HpBonus then
+        Mob:ChangeAttributeValue("hp", math.floor(Mob.Config.hp * (HpBonus / 1000)))
+        Mob:ChangeAttributeValue("maxhp", math.floor(Mob.Config.maxhp * (HpBonus / 1000)))
+    end
     MobsProxy.pData[Player.UserId][Mob.Instance] = Mob
     return Mob
 end
diff --git a/src/ServerStorage/Proxy/PlayerFightProxy/init.luau b/src/ServerStorage/Proxy/PlayerFightProxy/init.luau
index c9b8af4..8bf3b1a 100644
--- a/src/ServerStorage/Proxy/PlayerFightProxy/init.luau
+++ b/src/ServerStorage/Proxy/PlayerFightProxy/init.luau
@@ -65,6 +65,7 @@ function PlayerRole.new(Player: Player, CharacterId: number)
     return self
 end
 
+
 function PlayerRole:Died()
     self:ChangeState("Died", true)
     self.Humanoid.WalkSpeed = 0
@@ -119,7 +120,6 @@ function PlayerFightProxy:UpdatePlayerFightData(Player: Player)
     local AbilityProxy = require(ServerStorage.Proxy.AbilityProxy)
     local GemProxy = require(ServerStorage.Proxy.GemProxy)
 
-
     local AttributesData = {}
 
     -- 计算角色基础属性值 + 装备属性值 + 宝石属性值，赋值属性
@@ -178,8 +178,9 @@ function PlayerFightProxy:UpdatePlayerFightData(Player: Player)
     for _, behaviourName in behaviourNameList do
         playerAI:AddBehaviour(behaviourName)
     end
-    -- playerAI:AddBehaviour("Move")
-    playerAI:AddBehaviour("SwordWave")
+    playerAI:AddBehaviour("Move")
+    -- playerAI:AddBehaviour("SwordWave")
+    playerAI:AddBehaviour("Attack")
 
 
     -- 给前端发送技能信息
diff --git a/src/StarterPlayerScripts/ClientMain/Camera.client.luau b/src/StarterPlayerScripts/ClientMain/Camera.client.luau
index c9fea3a..fb9d04d 100644
--- a/src/StarterPlayerScripts/ClientMain/Camera.client.luau
+++ b/src/StarterPlayerScripts/ClientMain/Camera.client.luau
@@ -5,7 +5,7 @@ local RunService = game:GetService("RunService")
 local player = Players.LocalPlayer
 local camera = workspace.CurrentCamera
 
-local CAMERA_DISTANCE = 20
+local CAMERA_DISTANCE = 30
 local CAMERA_HEIGHT = 40
 local CAMERA_ANGLE = math.rad(-45)
 local SCREEN_OFFSET = 5
diff --git a/src/StarterPlayerScripts/ClientMain/MobAnim.luau b/src/StarterPlayerScripts/ClientMain/MobAnim.luau
new file mode 100644
index 0000000..d439f1c
--- /dev/null
+++ b/src/StarterPlayerScripts/ClientMain/MobAnim.luau
@@ -0,0 +1,159 @@
+--[[
+	Evercyan @ March 2023
+	MobClient
+	
+	Unlike MobLib which handles server-sided code, and most of it in general, we run
+	some code on the client for things such as custom health overlays & overwriting humanoid state types.
+	
+	If you want to edit mob code to add new behavior or edit existing behavior, you likely want to refer
+	to the server-sided code under ServerStorage.
+]]
+
+--> Services
+local CollectionService = game:GetService("CollectionService")
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
+local Players = game:GetService("Players")
+
+--> Player
+local Player = Players.LocalPlayer
+
+--> Dependencies
+local Tween = require(ReplicatedStorage.Modules.Tween)
+local Maid = require(ReplicatedStorage.Modules.Maid)
+
+--> Variables
+local Mobs = {}
+
+-- Folder
+local ClientMainPrefabs = Player.PlayerScripts.ClientMainPrefabs
+
+--------------------------------------------------------------------------------
+
+-- WaitForChild keeps yielding, even if the Instance is removed.
+-- Using this for safe yielding with StreamingEnabled!
+local function safeWait(Item: Instance, Name: string): Instance?
+	if not Item then
+		return
+	elseif Item:FindFirstChild(Name) then
+		return Item:FindFirstChild(Name)
+	end
+	
+	local ItemAdded = Instance.new("BindableEvent")
+	local Maid = Maid.new()
+	
+	Maid:Add(Item.ChildAdded:Connect(function(Child)
+		if Child.Name == Name then
+			ItemAdded:Fire(Child)
+			ItemAdded:Destroy()
+			Maid:Destroy()
+		end
+	end))
+	Maid:Add(Item.Destroying:Connect(function()
+		ItemAdded:Fire()
+		ItemAdded:Destroy()
+		Maid:Destroy()
+	end))
+	
+	return ItemAdded.Event:Wait()
+end
+
+-- Creates an "AnimationTrack" instance which is stored on the client for playing
+local function LoadAnimationTrack(MobInstance: Model, Name: string, Priority: string) : AnimationTrack?
+	local Humanoid = MobInstance:FindFirstChild("Humanoid") :: Humanoid
+	local Animator = Humanoid and Humanoid:FindFirstChild("Animator") :: Animator
+	if not Animator then return nil end
+	
+	local Animation
+	Animation = ClientMainPrefabs.MobClient.DefaultAnimations[Name]
+	
+	local AnimationTrack = Animator:LoadAnimation(Animation)
+	AnimationTrack.Priority = Enum.AnimationPriority[Priority or "Core"]
+	
+	return AnimationTrack
+end
+
+local function PerMob(MobInstance: Model)
+	if Mobs[MobInstance] then return end
+	
+	local Humanoid = safeWait(MobInstance, "Humanoid") :: Humanoid
+	local Root = safeWait(MobInstance, "HumanoidRootPart") :: BasePart
+	if not Humanoid or not Root then return end
+	
+	local Maid = Maid.new()
+	
+	-- Set humanoid states (helps prevent falling down & useless calculations - you're unlikely to have an enemy climbing without pathfinding)
+	for _, EnumName in {"FallingDown", "Seated", "Flying", "Swimming", "Climbing"} do
+		local HumanoidStateType = Enum.HumanoidStateType[EnumName]
+		Humanoid:SetStateEnabled(HumanoidStateType, false)
+		if Humanoid:GetState() == HumanoidStateType then
+			Humanoid:ChangeState(Enum.HumanoidStateType.Running)
+		end
+	end
+	
+	-- Animations / Behavior ---------------------------------------------------
+	
+	local AnimationTracks = {
+		Running = LoadAnimationTrack(MobInstance, "Running", "Core"),
+		Jumping = LoadAnimationTrack(MobInstance, "Jumping", "Movement"),
+		Hit = LoadAnimationTrack(MobInstance, "Hit", "Action")
+	}
+	
+	Maid:Add(Humanoid.Running:Connect(function(Speed)
+		if Speed > 0.01 then
+			local Percent = Speed/Humanoid.WalkSpeed
+			if not AnimationTracks.Running.IsPlaying then
+				AnimationTracks.Running:Play()
+			end
+			AnimationTracks.Running:AdjustSpeed(Percent)
+		else
+			AnimationTracks.Running:Stop()
+		end
+	end))
+	
+	Maid:Add(Humanoid.Jumping:Connect(function()
+		AnimationTracks.Jumping.TimePosition = 0
+		if not AnimationTracks.Jumping.IsPlaying then
+			AnimationTracks.Jumping:Play()
+		end
+	end))
+	
+	-- Maid:Add(Humanoid.Died:Once(function()
+	-- 	Root:ApplyImpulse(-Root.CFrame.LookVector * Root.AssemblyMass*50) -- Ragdoll Impulse
+	-- end))
+	
+	Maid:Add(Root:GetPropertyChangedSignal("Anchored"):Connect(function()
+		if Root.Anchored then
+			AnimationTracks.Running:Stop()
+		end
+	end))
+
+    -- TODO: 攻击动画之后要做延迟处理和攻速处理
+    Maid:Add(Humanoid:GetAttributeChangedSignal("AttackState"):Connect(function()
+        if Humanoid:GetAttribute("AttackState") == "Hit" then
+            if AnimationTracks.Hit.IsPlaying then
+                AnimationTracks.Hit.TimePosition = 0
+            else
+                AnimationTracks.Hit:Play()
+            end
+        else
+            AnimationTracks.Hit:Stop()
+        end
+    end))
+	
+	local Mob = {}
+	Mob.Instance = MobInstance
+	Mob.AnimationTracks = AnimationTracks
+	Mobs[MobInstance] = Mob
+	
+	Maid:Add(MobInstance.Destroying:Connect(function()
+		Mobs[MobInstance] = nil
+		Maid:Destroy()
+	end))
+end
+
+CollectionService:GetInstanceAddedSignal("Mob"):Connect(PerMob)
+for _, MobInstance in CollectionService:GetTagged("Mob") do
+	task.spawn(PerMob, MobInstance)
+end
+
+return {}
\ No newline at end of file
diff --git a/src/StarterPlayerScripts/ClientMain/PerformanceClient/DamageBoard.luau b/src/StarterPlayerScripts/ClientMain/PerformanceClient/DamageBoard.luau
index acf16c2..bff133f 100644
--- a/src/StarterPlayerScripts/ClientMain/PerformanceClient/DamageBoard.luau
+++ b/src/StarterPlayerScripts/ClientMain/PerformanceClient/DamageBoard.luau
@@ -35,8 +35,8 @@ end
 
 function DamageBoard:CreateNormalDamageBoard(DamageDetail: table)
     local DamageInitPos = DamageDetail.DamagePosition
-    local BiasPos = Vector3.new(0, 4, 0)
-    local MultPos = Vector3.new(0, 1.5, 0)
+    local BiasPos = Vector3.new(0, 6, 0)
+    local MultPos = Vector3.new(0, 1, 0)
 
     -- 根据元素类型排序
     local DamageInfos = DamageDetail["DamageInfos"]
diff --git a/src/StarterPlayerScripts/ClientMain/PerformanceClient/init.luau b/src/StarterPlayerScripts/ClientMain/PerformanceClient/init.luau
index 7ddccf5..f62a98c 100644
--- a/src/StarterPlayerScripts/ClientMain/PerformanceClient/init.luau
+++ b/src/StarterPlayerScripts/ClientMain/PerformanceClient/init.luau
@@ -56,7 +56,6 @@ RE_PerformanceEvent.OnClientEvent:Connect(function(ServerTime: number, CastTag:
 
     local delayTime = ServerTime - tick()
     if CastTag == "Init" then
-        -- print("Init", BehaviourName)
         -- 暂时就新增一个表，不调用初始化，因为服务端不是多个new做的，而是多次调用
         if not PerformanceClient.pData[UserId][BehaviourName] then
             PerformanceClient.pData[UserId][BehaviourName] = {}
diff --git a/src/StarterPlayerScripts/ClientMain/PlayerControl.luau b/src/StarterPlayerScripts/ClientMain/PlayerControl.luau
index 42588c4..464eb66 100644
--- a/src/StarterPlayerScripts/ClientMain/PlayerControl.luau
+++ b/src/StarterPlayerScripts/ClientMain/PlayerControl.luau
@@ -2,30 +2,57 @@ local UserInputService = game:GetService("UserInputService")
 
 local PlayerControl = {}
 
--- 监听按键按下
-function PlayerControl.ListenMoveKeyDown(onKeyDown)
-    UserInputService.InputBegan:Connect(function(input, gameProcessed)
-        if gameProcessed then return end
-        if input.UserInputType == Enum.UserInputType.Keyboard then
-            local key = input.KeyCode
-            if key == Enum.KeyCode.W or key == Enum.KeyCode.A or key == Enum.KeyCode.S or key == Enum.KeyCode.D then
-                onKeyDown(key)
-            end
-        end
-    end)
-end
+-- 添加按键状态跟踪
+local pressedKeys = {}
 
--- 监听按键松开
 function PlayerControl.ListenMoveKeyUp(onKeyUp)
     UserInputService.InputEnded:Connect(function(input, gameProcessed)
         if gameProcessed then return end
         if input.UserInputType == Enum.UserInputType.Keyboard then
             local key = input.KeyCode
             if key == Enum.KeyCode.W or key == Enum.KeyCode.A or key == Enum.KeyCode.S or key == Enum.KeyCode.D then
-                onKeyUp(key)
+                pressedKeys[key] = nil  -- 移除当前按键状态
+                
+                -- 检查是否还有其他移动按键在按下
+                local hasOtherKeysPressed = false
+                for k, v in pairs(pressedKeys) do
+                    if k == Enum.KeyCode.W or k == Enum.KeyCode.A or k == Enum.KeyCode.S or k == Enum.KeyCode.D then
+                        hasOtherKeysPressed = true
+                        break
+                    end
+                end
+                
+                -- 只有当没有其他移动按键按下时才调用onKeyUp
+                if not hasOtherKeysPressed then
+                    onKeyUp(key)
+                end
             end
         end
     end)
 end
 
+-- 添加按键按下监听
+function PlayerControl.ListenMoveKeyDown(onKeyDown)
+    UserInputService.InputBegan:Connect(function(input, gameProcessed)
+        if gameProcessed then return end
+        if input.UserInputType == Enum.UserInputType.Keyboard then
+            local key = input.KeyCode
+            if key == Enum.KeyCode.W or key == Enum.KeyCode.A or key == Enum.KeyCode.S or key == Enum.KeyCode.D then
+                pressedKeys[key] = true
+                onKeyDown(key)
+            end
+        end
+    end)
+end
+
+-- 添加获取当前按下按键的函数
+function PlayerControl.GetPressedKeys()
+    return pressedKeys
+end
+
+-- 添加检查特定按键是否按下的函数
+function PlayerControl.IsKeyPressed(keyCode)
+    return pressedKeys[keyCode] == true
+end
+
 return PlayerControl
\ No newline at end of file
diff --git a/src/StarterPlayerScripts/UI/UIManager.luau b/src/StarterPlayerScripts/UI/UIManager.luau
index 0fb6a88..708b3f0 100644
--- a/src/StarterPlayerScripts/UI/UIManager.luau
+++ b/src/StarterPlayerScripts/UI/UIManager.luau
@@ -128,6 +128,14 @@ function UIManager:IsOpened(WindowName: string)
     return UIManager.Instances[WindowName] ~= nil
 end
 
+function UIManager:SetData(WindowName: string, Data: table)
+    if not UIManager.Instances[WindowName] then
+        warn("UIManager:SetData() 窗口不存在：" .. WindowName)
+        return
+    end
+    UIManager.Instances[WindowName]:SetData(Data)
+end
+
 -- 获取当前窗口堆栈信息（用于调试）
 function UIManager:GetWindowStackInfo()
     local info = {}
diff --git a/src/StarterPlayerScripts/UI/Windows/MainWindow/init.luau b/src/StarterPlayerScripts/UI/Windows/MainWindow/init.luau
index 050451d..ddbb2fe 100644
--- a/src/StarterPlayerScripts/UI/Windows/MainWindow/init.luau
+++ b/src/StarterPlayerScripts/UI/Windows/MainWindow/init.luau
@@ -62,14 +62,16 @@ function MainWindow:OnOpenWindow()
     table.insert(self.Connections, chaCon)
     table.insert(self.Connections, attributeUpgradeCon)
  
-    local playerDataFolder = Utils:WaitPlayerDataFolder(LocalPlayer)
-    local StatsFolder = playerDataFolder:WaitForChild("PlayerInfo"):WaitForChild("Stats")
-    local levelCon = StatsFolder.level.Changed:Connect(function(newValue)
+    -- TODO: 暂时用主关卡数显示，我记得之前这里主要是记录的，Challenge中才是正在挑战的内容
+    -- TODO: 之后LevelProxy也应该挪到ReplicatedStorage下，之前可能是因为觉得Challenge是临时的内容所以放在workspace下，但是逻辑做的不统一
+    local playerDataFolder = game.Workspace:WaitForChild("Level"):WaitForChild(LocalPlayer.UserId)
+    local StatsFolder = playerDataFolder:WaitForChild("Progress")
+    local levelCon = StatsFolder.Main.Changed:Connect(function(newValue)
         self:SetShowLevel(newValue)
     end)
 
     -- 初始值设置
-    self:SetShowLevel(StatsFolder.level.Value)
+    self:SetShowLevel(StatsFolder.Main.Value)
     table.insert(self.Connections, levelCon)
 end