diff --git a/Client/Data/Core/Define/Item/Coin.xml b/Client/Data/Core/Define/Item/Coin.xml
index 8952425..b5b6046 100644
--- a/Client/Data/Core/Define/Item/Coin.xml
+++ b/Client/Data/Core/Define/Item/Coin.xml
@@ -1,3 +1,4 @@
+
Coin
@@ -12,4 +13,4 @@
Coin
-
\ No newline at end of file
+
diff --git a/Client/Data/Core/Define/Item/Item.xml b/Client/Data/Core/Define/Item/Item.xml
index b0f25a5..4ad515e 100644
--- a/Client/Data/Core/Define/Item/Item.xml
+++ b/Client/Data/Core/Define/Item/Item.xml
@@ -1,11 +1,356 @@
-
+
- smallHealthPotion
+ smallHealthBottle
可以回复一点点血量
TestGun
-
\ No newline at end of file
+
+ intellectualBattleAssistantChip
+
+ 角色攻击10%概率2倍伤害；角色受伤10%概率免疫
+
+
+
+
+
+
+ autonomicNanoSystemChip
+
+ 纳米机器人会自动选择当前最佳行为
+
+
+
+
+
+ plasmaSparkPlug
+
+ 角色攻击力提升10%
+
+
+
+
+
+ particleCollector
+
+ 粒子获取增加50%
+
+
+
+
+
+ NanoExpander
+
+ 纳米机器人数量提升15
+
+
+
+
+
+ NanoConstructor
+
+ 纳米机器人恢复速率提升25%
+
+
+
+
+
+ orobaAlloy
+
+ 角色防御力提升15%
+
+
+
+
+
+ turboboostDrivingExtension
+
+ 角色攻击速度提升10%
+
+
+
+
+
+ multiFrequencyMicroElectricProducingSystem
+
+ 纳米机器人过载增益效果提升20%
+
+
+
+
+
+ abnormalErodingCellPollutedSample-1
+
+ 角色全属性提高5%；纳米机器人状态维护速率提升33%
+
+
+
+
+
+ abnormalErodingCellPollutedSample-2
+
+ 角色全属性提高5%；纳米机器人促回血速率提升33%
+
+
+
+
+
+ NanoDataSet
+
+ 纳米机器人性能10%
+
+
+
+
+
+ multiStateCrystalOre-α
+
+ 固定式防御塔攻击力提升25%
+
+
+
+
+
+ multiStateCrystalOre-β
+
+ 固定式防御塔防御力提升25%
+
+
+
+
+
+ versionBacktrack
+
+ 取得后使角色在受到致命伤害时，免疫此次伤害，并恢复10%命值。冷却时间：60s
+
+
+
+
+
+ reversingProgram
+
+ 取得后使角色在停止移动后受到初次伤害的90%转化为护盾，持续5s。冷却时间：10s
+
+
+
+
+
+ lightProjection
+
+ 取得后使角色在受到单次伤害超过10%最大生命值使，在角色当前坐标生成一个可吸收25%最大生命值的投影。冷却时间：30s
+
+
+
+
+
+ fightAgainstNetwork
+
+ 取得后使角色根据当前已损失得生命值减少收到的伤害，每损失1%生命值使受到得伤害减少0.25%。
+
+
+
+
+
+ EncryptedKernel
+
+ 取得后使角色受到得伤害减少15%，5%概率免疫本次伤害。
+
+
+
+
+
+ balancedLoad
+
+ 取得后使角色受到异常状态效果减弱25%。
+
+
+
+
+
+ matrixControl
+
+ 取得后使角色受到攻击时，最大生命值和防御力提高3%，最大叠加10层，持续10s，每层持续时间独立计算。
+
+
+
+
+
+ specifiedCoverage
+
+ 取得后使角色在获得30%最大生命值的护盾；持有护盾时，受到的伤害减少30%。
+
+
+
+
+
+ abnormalRefactor
+
+ 取得后使角色50%概率免疫异常状态。
+
+
+
+
+
+ parallelComputation
+
+ 取得后使角色在纳米机器人采用过载策略后，对造成的伤害进行累计，持续10s，持续时间结束后对场上的敌人造成100%计数的单次伤害。冷却时间：90s
+
+
+
+
+
+ residualNetwork
+
+ 取得后使角色根据当前已损失得生命值减少收到的伤害，每损失1%生命值使造成的伤害增加0.25%。
+
+
+
+
+
+ energySavingDriving
+
+ 取得后使角色在停止移动5s后，下一次攻击造成的伤害增加50%。冷却时间：10s
+
+
+
+
+
+ convolutionNetwork
+
+ 取得后使角色在持续攻击使获得攻击速度加成，每25连击数使攻击速度提高12%，最高叠加4层，增益效果持续至连击计数中断后5s。
+
+
+
+
+
+ loopNetwork
+
+ 取得后使角色在持续攻击使获得伤害加成，每25连击数使造成的伤害提高12%，最高叠加4层，增益效果持续至连击计数中断后5s。
+
+
+
+
+
+ descructor
+
+ 取得后使角色在攻击敌人时10%概率恢复该次攻击所造成伤害等值的生命值，溢出生命值转化为护盾，最高转化30%最大生命值的护盾。
+
+
+
+
+
+ enhancedProcess
+
+ 取得后使角色在纳米机器人采用激素策略后，造成的伤害提高30%
+
+
+
+
+
+ attributeInheriting
+
+ 取得后使角色在击杀敌人后，造成的伤害提高1%，最高叠加25层.
+
+
+
+
+
+ continiousIntegration
+
+ 取得后使角色根据当前粒子数量获得攻击力加成，每10粒子使攻击力提高0.1%.
+
+
+
+
+
+ bugsInjection
+
+ 取得后使角色在攻击敌人时，对敌人随机附加移动速度降低25%/攻击力降低10%/防御力降低10%的负面效果。
+
+
+
+
+
+ ploymorphicPotentialEnergy
+
+ 取得后使纳米机器人治疗/激素效果提高25%
+
+
+
+
+
+ simplifiedDeployment
+
+ 取得后使纳米机器人分裂速度提高10%
+
+
+
+
+
+ overloadedOperation
+
+ 取得后使纳米机器人在切换行动策略时，其效率提升33%，持续10s。
+
+
+
+
+
+ protocolCrack
+
+ 取得后使纳米机器人行动效率提高25%，并有5%概率直接完成本次行动。
+
+
+
+
+
+ systemIteration
+
+ 取得后使纳米机器人在完成行动后，对同类型的行动的效率提升3%，最多叠加10层。
+
+
+
+
+
+ deepLearning
+
+ 取得后使固定式防御塔攻击力和防御力随攻击次数提高，每进行一次攻击使攻击力和防御力提高0.25%，最多叠加400层。
+
+
+
+
+
+ neutralNetwork
+
+ 取得后使固定式防御塔攻击速度随攻击次数提高，每进行一次攻击使攻击速度提高0.25%，最多叠加400层。
+
+
+
+
+
+ variableMatching
+
+ 取得后使固定式防御塔攻击范围随攻击次数扩大，每进行一次攻击使攻击范围扩大0.25%，最多叠加400层。
+
+
+
+
+
+ patrialEngine
+
+ 取得后使角色击杀敌人获取的粒子数提高10%。
+
+
+
+
+
+ partialConversion
+
+ 取得后每5s获取当前持有粒子数5%的粒子。
+
+
+
+
+
diff --git a/Client/Data/Core/Define/Item/Weapon.xml b/Client/Data/Core/Define/Item/Weapon.xml
index 82b340f..109b540 100644
--- a/Client/Data/Core/Define/Item/Weapon.xml
+++ b/Client/Data/Core/Define/Item/Weapon.xml
@@ -1,4 +1,4 @@
-
+
@@ -105,5 +105,5 @@
-
-
\ No newline at end of file
+
+
diff --git a/Client/Packages/manifest.json b/Client/Packages/manifest.json
index 084e6e3..c886249 100644
--- a/Client/Packages/manifest.json
+++ b/Client/Packages/manifest.json
@@ -3,14 +3,14 @@
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "5.0.1",
- "com.unity.ai.navigation": "2.0.8",
- "com.unity.collab-proxy": "2.8.2",
- "com.unity.ide.rider": "3.0.36",
+ "com.unity.ai.navigation": "2.0.9",
+ "com.unity.collab-proxy": "2.9.3",
+ "com.unity.ide.rider": "3.0.38",
"com.unity.ide.visualstudio": "2.0.23",
"com.unity.inputsystem": "1.14.2",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.render-pipelines.universal": "17.2.0",
- "com.unity.test-framework": "1.5.1",
+ "com.unity.test-framework": "1.6.0",
"com.unity.timeline": "1.8.9",
"com.unity.ugui": "2.0.0",
"com.unity.vectorgraphics": "2.0.0-preview.25",
diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json
index 4c5998d..e028de0 100644
--- a/Client/Packages/packages-lock.json
+++ b/Client/Packages/packages-lock.json
@@ -27,7 +27,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ai.navigation": {
- "version": "2.0.8",
+ "version": "2.0.9",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -36,7 +36,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
- "version": "1.8.23",
+ "version": "1.8.24",
"depth": 2,
"source": "registry",
"dependencies": {
@@ -46,20 +46,21 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
- "version": "2.8.2",
+ "version": "2.9.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.collections": {
- "version": "2.5.1",
+ "version": "2.5.7",
"depth": 2,
"source": "registry",
"dependencies": {
- "com.unity.burst": "1.8.17",
- "com.unity.test-framework": "1.4.5",
- "com.unity.nuget.mono-cecil": "1.11.4",
+ "com.unity.burst": "1.8.19",
+ "com.unity.mathematics": "1.3.2",
+ "com.unity.test-framework": "1.4.6",
+ "com.unity.nuget.mono-cecil": "1.11.5",
"com.unity.test-framework.performance": "3.0.3"
},
"url": "https://packages.unity.com"
@@ -71,7 +72,7 @@
"dependencies": {}
},
"com.unity.ide.rider": {
- "version": "3.0.36",
+ "version": "3.0.38",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -113,14 +114,14 @@
}
},
"com.unity.nuget.mono-cecil": {
- "version": "1.11.4",
+ "version": "1.11.5",
"depth": 3,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
- "version": "17.1.0",
+ "version": "17.2.0",
"depth": 1,
"source": "builtin",
"dependencies": {
@@ -135,12 +136,12 @@
}
},
"com.unity.render-pipelines.universal": {
- "version": "17.1.0",
+ "version": "17.2.0",
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "17.1.0",
- "com.unity.shadergraph": "17.1.0",
+ "com.unity.render-pipelines.core": "17.2.0",
+ "com.unity.shadergraph": "17.2.0",
"com.unity.render-pipelines.universal-config": "17.0.3"
}
},
@@ -170,16 +171,16 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
- "version": "17.1.0",
+ "version": "17.2.0",
"depth": 1,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "17.1.0",
+ "com.unity.render-pipelines.core": "17.2.0",
"com.unity.searcher": "4.9.3"
}
},
"com.unity.test-framework": {
- "version": "1.5.1",
+ "version": "1.6.0",
"depth": 0,
"source": "builtin",
"dependencies": {
@@ -396,7 +397,8 @@
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
- "com.unity.modules.hierarchycore": "1.0.0"
+ "com.unity.modules.hierarchycore": "1.0.0",
+ "com.unity.modules.physics": "1.0.0"
}
},
"com.unity.modules.umbra": {
diff --git a/Client/ProjectSettings/ShaderGraphSettings.asset b/Client/ProjectSettings/ShaderGraphSettings.asset
index e66042a..ce8c243 100644
--- a/Client/ProjectSettings/ShaderGraphSettings.asset
+++ b/Client/ProjectSettings/ShaderGraphSettings.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
shaderVariantLimit: 128
+ overrideShaderVariantLimit: 0
customInterpolatorErrorThreshold: 32
customInterpolatorWarningThreshold: 16
customHeatmapValues: {fileID: 0}