From b06f9794cac94d385cdfa96edb6e2fb58a521e2e Mon Sep 17 00:00:00 2001
From: zhanghualin <286990256@qq.com>
Date: Mon, 5 Sep 2022 10:22:37 +0800
Subject: [PATCH] -

---
 .gitignore                      |  0
 Datas/common/NumericType.xlsx   | Bin 12106 -> 0 bytes
 Datas/common/NumericTypeEx.xlsx | Bin 0 -> 11662 bytes
 Datas/pro2d/EquipmentData.xlsx  | Bin 111481 -> 0 bytes
 Defines/common.xml              | 13 +++++++++++++
 Defines/pro2d.xml               |  8 ++++----
 6 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Datas/common/NumericTypeEx.xlsx

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.gitignore
diff --git a/Datas/common/NumericType.xlsx b/Datas/common/NumericType.xlsx
index 79485f7..bf600c9 100644
Binary files a/Datas/common/NumericType.xlsx and b/Datas/common/NumericType.xlsx differ
diff --git a/Datas/common/NumericTypeEx.xlsx b/Datas/common/NumericTypeEx.xlsx
new file mode 100644
index 0000000..4266935
Binary files /dev/null and b/Datas/common/NumericTypeEx.xlsx differ
diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index 74dcd4d..92c3dd2 100644
Binary files a/Datas/pro2d/EquipmentData.xlsx and b/Datas/pro2d/EquipmentData.xlsx differ
diff --git a/Defines/common.xml b/Defines/common.xml
index 59db98f..a3cd678 100644
--- a/Defines/common.xml
+++ b/Defines/common.xml
@@ -25,6 +25,12 @@
 		<var name="AllBullet" comment="与所有Body类型碰撞"/>
 	</enum>
 
+	<enum name="ValueType" comment="数值类型">
+		<var name="TInt" />
+		<var name="TFloat" />
+		<var name="TPercent" />
+	</enum>
+
 	<bean name="ColliderRelation">
 		<var name="ColliderA" type="ColliderTag"/>
 		<var name="Others" type="list,ColliderTag"/>
@@ -44,9 +50,16 @@
 		<var name="Anima" type="FGUIAnimaType"/>
 	</bean>
 
+
+	<bean name="NumericTypeEx">
+		<var name="id" type="NumericType"/>
+		<var name="valueType" type="ValueType"/>
+	</bean>
+
     <table name="TbUnityScene" index = "id,assetName" value="UnityScene" input="common/UnityScene.xlsx"/>
 	<table name="TbDevLog" value="DevLog" input="common/DevLog.xlsx"/>
 	<table name="TbColliderRelation" value="ColliderRelation" input="common/ColliderRelation.xlsx"/>
 	<table name="TbGlobalDefine" value="GlobalDefine" input="common/GlobalDefine.xlsx"/>
 	<table name="TbFUIPanel" value="FUIPanel" input="common/FUIPanel.xlsx"/>
+	<table name="TbNumericTypeEx" value="NumericTypeEx" input="common/NumericTypeEx.xlsx"/>
 </module>
\ No newline at end of file
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 3b1efa7..3c4465d 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -190,10 +190,10 @@
     <var name="HpLv3" type="int"/>
     <var name="Hp" type="int"/>
     
-    <var name="HpPerUp" type="int"/>
-    <var name="Steal" type="int"/>
-    <var name="DropUp" type="int"/>
-    <var name="Sp" type="int"/>
+    <var name="HpPerUp" type="float"/>
+    <var name="Steal" type="float"/>
+    <var name="DropUp" type="float"/>
+    <var name="Sp" type="float"/>
     <var name="Speed" type="float"/>
 
     <var name="StrengthenMaterialsCombinationID" type="int"/>
--
libgit2 0.21.2