From 0a70f452e0ffa0c4ab0d2d60599c3382e14aeb28 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Wed, 31 Aug 2022 10:57:50 +0800
Subject: [PATCH] hero表增加转生材料ID，增加转生材料表

---
 Datas/__enums__.xlsx             | Bin 10543 -> 0 bytes
 Datas/common/FUIPanel.xlsx       | Bin 10563 -> 0 bytes
 Datas/pro2d/AccountLevelExp.xlsx | Bin 9596 -> 0 bytes
 Datas/pro2d/HeroLevelExp.xlsx    | Bin 9411 -> 0 bytes
 Datas/pro2d/hero.xlsx            | Bin 15099 -> 0 bytes
 Defines/pro2d.xml                | 12 ++++++++++++
 6 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/Datas/__enums__.xlsx b/Datas/__enums__.xlsx
index 5f76ce6..028cfc5 100644
Binary files a/Datas/__enums__.xlsx and b/Datas/__enums__.xlsx differ
diff --git a/Datas/common/FUIPanel.xlsx b/Datas/common/FUIPanel.xlsx
index 2f17ffa..637272b 100644
Binary files a/Datas/common/FUIPanel.xlsx and b/Datas/common/FUIPanel.xlsx differ
diff --git a/Datas/pro2d/AccountLevelExp.xlsx b/Datas/pro2d/AccountLevelExp.xlsx
index e912af4..2eba841 100644
Binary files a/Datas/pro2d/AccountLevelExp.xlsx and b/Datas/pro2d/AccountLevelExp.xlsx differ
diff --git a/Datas/pro2d/HeroLevelExp.xlsx b/Datas/pro2d/HeroLevelExp.xlsx
index b7c96de..81d8b99 100644
Binary files a/Datas/pro2d/HeroLevelExp.xlsx and b/Datas/pro2d/HeroLevelExp.xlsx differ
diff --git a/Datas/pro2d/hero.xlsx b/Datas/pro2d/hero.xlsx
index c2dca3f..495f8f2 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 845356e..21b1311 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -34,6 +34,7 @@
 		<var name="ceRevise" type="float"/>
 		<var name="hpBarYpos" type="int"/>
 		<var name="lvUpType" type="int"/>
+		<var name="MaterialsListID" type="int"/>
 		<var name="atks" type="map,NumericType,int"/>
 		<var name="defs" type="map,NumericType,int"/>
     </bean>
@@ -304,6 +305,16 @@
     <var name="GoodsDataStructs" type="map,int,GoodsDataStruct"/>
   </bean>
 
+  <bean name="Materials">
+  	<var name="ItemID" type="int"/>
+  	<var name="ItemNum" type="int"/>
+  </bean>
+	
+  <bean name="HeroReinMaterials">
+    <var name="MaterialsListID" type="int"/>
+    <var name="MaterialsList" type="list,Materials"/>
+  </bean>
+
 	<bean name="AccountLevelExp">
 		<var name="level" type="int"/>
 		<var name="needExp" type="int"/>
@@ -509,6 +520,7 @@
 	<table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
 	<table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
 	<table name="TbRechargeDatas" value="RechargeDatas" input="pro2d/RechargeDatas.xlsx"/>
+	<table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/>
 
 	<table name="TbAccountLevelExp" value="AccountLevelExp" input="pro2d/AccountLevelExp.xlsx"/>
 	<table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
--
libgit2 0.21.2