From 3334121b39599a9d0c1f0c4d9e9cad02f5041be4 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Wed, 12 Apr 2023 17:57:30 +0800
Subject: [PATCH] hero相关

---
 Datas/__enums__.xlsx             | Bin 11827 -> 0 bytes
 Datas/common/FUIPanel.xlsx       | Bin 11725 -> 0 bytes
 Datas/pro2d/GlobalBaseDatas.xlsx | Bin 14632 -> 0 bytes
 Datas/pro2d/PopupsDatas.xlsx     | Bin 12726 -> 0 bytes
 Defines/pro2d.xml                | 15 ++++++++-------
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Datas/__enums__.xlsx b/Datas/__enums__.xlsx
index 596f7b6..a439d10 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 dc37090..46c84c4 100644
Binary files a/Datas/common/FUIPanel.xlsx and b/Datas/common/FUIPanel.xlsx differ
diff --git a/Datas/pro2d/GlobalBaseDatas.xlsx b/Datas/pro2d/GlobalBaseDatas.xlsx
index 9749007..eeb057c 100644
Binary files a/Datas/pro2d/GlobalBaseDatas.xlsx and b/Datas/pro2d/GlobalBaseDatas.xlsx differ
diff --git a/Datas/pro2d/PopupsDatas.xlsx b/Datas/pro2d/PopupsDatas.xlsx
index 930d806..8327985 100644
Binary files a/Datas/pro2d/PopupsDatas.xlsx and b/Datas/pro2d/PopupsDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 62b9cc3..5261c06 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -378,7 +378,6 @@
       <var name="EquipType" type="int"/>
       <var name="Grade" type="int"/>
       <var name="Star" type="int"/>
-
       <var name="GemNum" type="int"/>
       <var name="PrefabId" type="int"/>
       <var name="Atk" type="float"/>
@@ -386,9 +385,7 @@
       <var name="Def" type="float"/>
       <var name="Dodge" type="float"/>
       <var name="Hp" type="float"/>
-    
       <var name="StrengthenMaterialsCombinationID" type="int"/>
-
       <var name="ImageName" type="string"/>
       <var name="DetailText" type="string"/>
       <var name="GetWay" type="string"/>
@@ -438,6 +435,13 @@
         <var name="VarValue" type="string"/>
     </bean>
 
+    <bean name="GlobalDictDatas">
+        <var name="ListName" type="string"/>
+        <var name="KeyType" type="string"/>
+        <var name="ValueType" type="string"/>
+        <var name="DictData" type="map,string,string"/>
+    </bean>
+
     <bean name="GlobalListDatas">
         <var name="ListName" type="string"/>
         <var name="ListValueType" type="string"/>
@@ -461,17 +465,14 @@
     </bean>
 
     <bean name="GemCreateLimit">
-
         <var name="ID" type="int"/>
         <var name="LimitType" type="int"/>
         <var name="LimitTaskId" type="int"/>
         <var name="Num" type="int"/>
         <var name="Describe" type="string"/>
-
     </bean>
 
     <bean name="GemCreateGroup">
-
         <var name="ID" type="int"/>
         <var name="Name" type="string"/>
         <var name="Min" type="int"/>
@@ -482,7 +483,6 @@
         <var name="materialMax" type="int"/>
         <var name="otherSC" type="string"/>
         <var name="ImmediatelyFinish" type="string"/>
-
     </bean>
 
     <bean name="GemCreateTime">
@@ -1115,6 +1115,7 @@
 
     <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/>
     <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/>
+    <table name="TbGlobalDictDatas" value="GlobalDictDatas" input="pro2d/Dictionary@GlobalBaseDatas.xlsx"/>
     <table name="TbGemAttention" value="GemAttention" input="pro2d/GemAttention.xlsx"/>
     <table name="TbGemCreateLimit" value="GemCreateLimit" input="pro2d/GemCreateLimit.xlsx"/>
     <table name="TbGemCreateGroup" value="GemCreateGroup" input="pro2d/GemCreateGroup.xlsx"/>
--
libgit2 0.21.2