From 9eb19f754cb466f3ec84c2271483123f7eb5d71a Mon Sep 17 00:00:00 2001
From: zhanghualin <286990256@qq.com>
Date: Wed, 10 Aug 2022 12:02:40 +0800
Subject: [PATCH] Numeric相关配置

---
 Datas/__enums__.xlsx           | Bin 10774 -> 0 bytes
 Datas/common/NumericType.xlsx  | Bin 0 -> 11383 bytes
 Datas/pro2d/HeroLvUpValue.xlsx | Bin 10758 -> 0 bytes
 Datas/pro2d/hero.xlsx          | Bin 16124 -> 0 bytes
 Defines/__root__.xml           |  1 +
 Defines/pro2d.xml              | 22 +++++-----------------
 6 files changed, 6 insertions(+), 17 deletions(-)
 create mode 100644 Datas/common/NumericType.xlsx

diff --git a/Datas/__enums__.xlsx b/Datas/__enums__.xlsx
index dd55df5..f985e4e 100644
Binary files a/Datas/__enums__.xlsx and b/Datas/__enums__.xlsx differ
diff --git a/Datas/common/NumericType.xlsx b/Datas/common/NumericType.xlsx
new file mode 100644
index 0000000..080621c
Binary files /dev/null and b/Datas/common/NumericType.xlsx differ
diff --git a/Datas/pro2d/HeroLvUpValue.xlsx b/Datas/pro2d/HeroLvUpValue.xlsx
index ed09c6c..54ead73 100644
Binary files a/Datas/pro2d/HeroLvUpValue.xlsx and b/Datas/pro2d/HeroLvUpValue.xlsx differ
diff --git a/Datas/pro2d/hero.xlsx b/Datas/pro2d/hero.xlsx
index 9167502..1b7076a 100644
Binary files a/Datas/pro2d/hero.xlsx and b/Datas/pro2d/hero.xlsx differ
diff --git a/Defines/__root__.xml b/Defines/__root__.xml
index 5c810ea..901bd7c 100644
--- a/Defines/__root__.xml
+++ b/Defines/__root__.xml
@@ -17,6 +17,7 @@
 	
 	<importexcel name="__tables__.xlsx" type="table"/> 相对data目录
 	<importexcel name="__enums__.xlsx" type="enum"/>相对data目录
+	<importexcel name="common/NumericType.xlsx" type="enum"/>相对data目录
 	<importexcel name="__beans__.xlsx" type="bean"/>相对data目录
 	
 	<externalselector name="unity_cs"/>
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index dcaa952..a0f54b5 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -10,28 +10,14 @@
 	    <var name="level" type="int"/>
 	    <var name="hp" type="int"/>
 		<var name="sp" type="int"/>
-	    <var name="atk" type="int"/>
-	    <var name="def" type="int"/>
-	    <var name="speed" type="float"/>
-	    <var name="atkRange" type="float"/>
-	    <var name="atkSpeed" type="float"/>
+	    <var name="speed" type="int"/>
+	    <var name="atkRange" type="int"/>
+	    <var name="atkSpeed" type="int"/>
 	    <var name="crit" type="int"/>
 	    <var name="critHurt" type="int"/>
 	    <var name="dodge" type="int"/>
 	    <var name="block" type="int"/>
 	    <var name="parry" type="int"/>
-	    <var name="fireAtk" type="int"/>
-	    <var name="fireDef" type="int"/>
-	    <var name="thunderAtk" type="int"/>
-	    <var name="thunderDef" type="int"/>
-	    <var name="windAtk" type="int"/>
-	    <var name="windDef" type="int"/>
-	    <var name="soilAtk" type="int"/>
-	    <var name="soilDef" type="int"/>
-	    <var name="iceAtk" type="int"/>
-	    <var name="iceDef" type="int"/>
-	    <var name="poisonAtk" type="int"/>
-	    <var name="poisonDef" type="int"/>
 	    <var name="skillId" type="int"/>
 	    <var name="passiveSkillId1" type="int"/>
 	    <var name="passiveSkillId2" type="int"/>
@@ -48,6 +34,8 @@
 		<var name="ceRevise" type="float"/>
 		<var name="hpBarYpos" type="int"/>
 		<var name="lvUpType" type="int"/>
+		<var name="atks" type="map,NumericType,int"/>
+		<var name="defs" type="map,NumericType,int"/>
     </bean>
 
 	<bean name="HeroLvUpValue">
--
libgit2 0.21.2