From f566423217ed3f99e271679d3fc2b5dec0ba00ef Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Sun, 23 Apr 2023 18:55:33 +0800
Subject: [PATCH] 表格改动提交

---
 Datas/pro2d/HeroGradeUpValue.xlsx | Bin 10916 -> 0 bytes
 Datas/pro2d/hero.xlsx             | Bin 35518 -> 0 bytes
 Defines/pro2d.xml                 | 23 ++++++-----------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Datas/pro2d/HeroGradeUpValue.xlsx b/Datas/pro2d/HeroGradeUpValue.xlsx
index 8a25bcb..89a7f7d 100644
Binary files a/Datas/pro2d/HeroGradeUpValue.xlsx and b/Datas/pro2d/HeroGradeUpValue.xlsx differ
diff --git a/Datas/pro2d/hero.xlsx b/Datas/pro2d/hero.xlsx
index 53f23c7..1e001ab 100644
Binary files a/Datas/pro2d/hero.xlsx and b/Datas/pro2d/hero.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 977eec7..afad522 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -569,7 +569,6 @@
         <var name="ceRevise" type="float"/>
         <var name="hpBarYpos" type="int"/>
         <var name="lvUpType" type="int"/>
-        <var name="GradeUpType" type="int"/>
         <var name="MaterialsListID" type="int"/>
         <var name="WeaponType" type="string"/>
         <var name="ArmorType" type="string"/>
@@ -597,22 +596,12 @@
     </bean>
 
     <bean name="HeroGradeUpValue">
-        <var name="lvUpType" type="int"/>
-        <var name="hp1" type="float"/>
-        <var name="hp2" type="float"/>
-        <var name="hp3" type="float"/>
-        <var name="dodge1" type="float"/>
-        <var name="dodge2" type="float"/>
-        <var name="dodge3" type="float"/>
-        <var name="crit1" type="float"/>
-        <var name="crit2" type="float"/>
-        <var name="crit3" type="float"/>
-        <var name="atkPct1" type="float"/>
-        <var name="atkPct2" type="float"/>
-        <var name="atkPct3" type="float"/>
-        <var name="def1" type="int"/>
-        <var name="def2" type="int"/>
-        <var name="def3" type="int"/>
+        <var name="GradeLevel" type="int"/>
+        <var name="HpBaseAdd" type="float"/>
+        <var name="DodgeBaseAdd" type="float"/>
+        <var name="CritBaseAdd" type="float"/>
+        <var name="AtkBaseAdd" type="float"/>
+        <var name="DefBaseAdd" type="int"/>
     </bean>
 
     <bean name="HeroGradeMemoryGroup">
--
libgit2 0.21.2