From 82386347b443641354735896a0366b177878abaf Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Wed, 1 Mar 2023 12:11:55 +0800
Subject: [PATCH] 加个品级升级界面

---
 Datas/__enums__.xlsx       | Bin 11635 -> 0 bytes
 Datas/common/FUIPanel.xlsx | Bin 11473 -> 0 bytes
 Defines/pro2d.xml          | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------
 3 files changed, 111 insertions(+), 114 deletions(-)

diff --git a/Datas/__enums__.xlsx b/Datas/__enums__.xlsx
index 197718a..9d602e1 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 ae7f72a..94c12b1 100644
Binary files a/Datas/common/FUIPanel.xlsx and b/Datas/common/FUIPanel.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 36355e1..c72ed88 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -62,7 +62,7 @@
         <var name="DefWeight" type="float"/>
         <var name="AdvanceAdd" type="string"/>
     </bean>
-    
+
     <bean name="AdvanceHero">
         <var name="heroID" type="int"/>
         <var name="heroName" type="string"/>
@@ -86,8 +86,8 @@
         <var name="showType" type="int"/>
         <var name="time" type="string"/>
     </bean>
-    
-    
+
+
     <bean name="BraekdownResult">
         <var name="ItemID" type="int"/>
         <var name="MinNum" type="int"/>
@@ -106,7 +106,7 @@
         <var name="name" type="string"/>
         <var name="path" type="string"/>
     </bean>
-    
+
 
     <bean name="CardGroupInfo">
         <var name="Desc" type="string"/>
@@ -124,7 +124,7 @@
         <var name="Weight" type="int"/>
         <var name="Desc" type="string"/>
     </bean>
-    
+
     <bean name="CardQuality">
         <var name="ID" type="int"/>
         <var name="ColorInfos" type="map,int,CardColorInfo"/>
@@ -135,7 +135,7 @@
         <var name="Pool_2" type="int"/>
         <var name="Pool_3" type="int"/>
     </bean>
-    
+
     <bean name="CardPool">
         <var name="Quality" type="int"/>
         <var name="QualityStr" type="string"/>
@@ -196,9 +196,8 @@
         <var name="carbonMonsterLevel" type="int"/>
         <var name="mainCarbonWaves" type="list,mainCarbonWaves"/>
     </bean>
-    
 
-    
+
     <bean name="DialogueAll">
         <var name="ID" type="int"/>
         <var name="index" type="int"/>
@@ -243,12 +242,12 @@
         <var name="max" type="int"/>
         <var name="weight" type="int"/>
     </bean>
-    
+
     <bean name="DropChildGroup">
         <var name="ID" type="int"/>
         <var name="dropInfos" type="map,int,dropInfo"/>
     </bean>
-    
+
 
     <bean name="EquipmentData">
         <var name="EquipID" type="int"/>
@@ -350,8 +349,8 @@
         <var name="EquipID" type="int32"/>
         <var name="Composite" type="string"/>
     </bean>
-    
-    
+
+
     <bean name="GlobalBaseDatas">
         <var name="VarName" type="string"/>
         <var name="VarType" type="string"/>
@@ -438,59 +437,58 @@
     </bean>
 
 
-
     <bean name="Hero">
-    <var name="id" type="int"/>
-    <var name="name" type="string"/>
-    <var name="type" type="int"/>
-    <var name="Describe" type="string"/>
-    <var name="Faith" type="int"/>
-    <var name="FaithName" type="string"/>
-    <var name="tag" type="int"/>
-    <var name="profession" type="int"/>
-    <var name="race" type="int"/>
-    <var name="star" type="int"/>
-    <var name="Advance" type="int"/>
-    <var name="level" type="int"/>
-    <var name="hp" type="int"/>
-    <var name="sp" type="int"/>
-    <var name="speed" type="float"/>
-    <var name="searchRange" type="float"/>
-    <var name="atkRange" type="float"/>
-    <var name="atkSpeed" type="float"/>
-    <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="stiffness" type="int"/>
-    <var name="atkDropSpProbability" type="float"/>
-    <var name="skillId" type="int"/>
-    <var name="passiveSkillId1" type="int"/>
-    <var name="passiveSkillId2" type="int"/>
-    <var name="passiveSkillId3" type="int"/>
-    <var name="weapon" type="int"/>
-    <var name="perfabName" type="string"/>
-    <var name="iconUrl" type="string"/>
-    <var name="attackLv" type="int"/>
-    <var name="group" type="int"/>
-    <var name="occupation" type="int"/>
-    <var name="species" type="int"/>
-    <var name="attackType" type="int"/>
-    <var name="unitType" type="int"/>
-    <var name="ceRevise" type="float"/>
-    <var name="hpBarYpos" type="int"/>
-    <var name="lvUpType" type="int"/>
-    <var name="ReinLevelType" type="int"/>
-    <var name="MaterialsListID" type="int"/>
-    <var name="WeaponType" type="string"/>
-    <var name="ArmorType" type="string"/>
-    <var name="ShoesType" type="string"/>
-    <var name="CoupleTiesID" type="int"/>
-
-    <var name="atks" type="map,NumericType,int"/>
-    <var name="defs" type="map,NumericType,int"/>
-  </bean>
+        <var name="id" type="int"/>
+        <var name="name" type="string"/>
+        <var name="type" type="int"/>
+        <var name="Describe" type="string"/>
+        <var name="Faith" type="int"/>
+        <var name="FaithName" type="string"/>
+        <var name="tag" type="int"/>
+        <var name="profession" type="int"/>
+        <var name="race" type="int"/>
+        <var name="star" type="int"/>
+        <var name="Advance" type="int"/>
+        <var name="level" type="int"/>
+        <var name="hp" type="int"/>
+        <var name="sp" type="int"/>
+        <var name="speed" type="float"/>
+        <var name="searchRange" type="float"/>
+        <var name="atkRange" type="float"/>
+        <var name="atkSpeed" type="float"/>
+        <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="stiffness" type="int"/>
+        <var name="atkDropSpProbability" type="float"/>
+        <var name="skillId" type="int"/>
+        <var name="passiveSkillId1" type="int"/>
+        <var name="passiveSkillId2" type="int"/>
+        <var name="passiveSkillId3" type="int"/>
+        <var name="weapon" type="int"/>
+        <var name="perfabName" type="string"/>
+        <var name="iconUrl" type="string"/>
+        <var name="attackLv" type="int"/>
+        <var name="group" type="int"/>
+        <var name="occupation" type="int"/>
+        <var name="species" type="int"/>
+        <var name="attackType" type="int"/>
+        <var name="unitType" type="int"/>
+        <var name="ceRevise" type="float"/>
+        <var name="hpBarYpos" type="int"/>
+        <var name="lvUpType" type="int"/>
+        <var name="ReinLevelType" type="int"/>
+        <var name="MaterialsListID" type="int"/>
+        <var name="WeaponType" type="string"/>
+        <var name="ArmorType" type="string"/>
+        <var name="ShoesType" type="string"/>
+        <var name="CoupleTiesID" type="int"/>
+
+        <var name="atks" type="map,NumericType,int"/>
+        <var name="defs" type="map,NumericType,int"/>
+    </bean>
 
     <bean name="HeroLvUpValue">
         <var name="lvUpType" type="int"/>
@@ -525,33 +523,38 @@
     </bean>
 
     <bean name="HeroGradeMemoryGroup">
-    <var name="HeroID" type="int"/>
-    <var name="Grade_1" type="list,int"/>
-    <var name="Grade_2" type="list,int"/>
-    <var name="Grade_3" type="list,int"/>
-    <var name="Grade_4" type="list,int"/>
-    <var name="Grade_5" type="list,int"/>
-    <var name="Grade_6" type="list,int"/>
-    <var name="Grade_7" type="list,int"/>
-    <var name="Grade_8" type="list,int"/>
-    <var name="Grade_9" type="list,int"/>
-    <var name="Grade_10" type="list,int"/>
-    <var name="Grade_11" type="list,int"/>
-    <var name="Grade_12" type="list,int"/>
-    <var name="Grade_13" type="list,int"/>
-    <var name="Grade_14" type="list,int"/>
-    <var name="Grade_15" type="list,int"/>
-    <var name="Grade_16" type="list,int"/>
-    <var name="Grade_17" type="list,int"/>
-    <var name="Grade_18" type="list,int"/>
-    <var name="Grade_19" type="list,int"/>
-    <var name="Grade_20" type="list,int"/>
-  </bean>
-
-	<bean name="HeroSkillLvUpValue">
+        <var name="HeroID" type="int"/>
+        <var name="Grade_1" type="list,int"/>
+        <var name="Grade_2" type="list,int"/>
+        <var name="Grade_3" type="list,int"/>
+        <var name="Grade_4" type="list,int"/>
+        <var name="Grade_5" type="list,int"/>
+        <var name="Grade_6" type="list,int"/>
+        <var name="Grade_7" type="list,int"/>
+        <var name="Grade_8" type="list,int"/>
+        <var name="Grade_9" type="list,int"/>
+        <var name="Grade_10" type="list,int"/>
+        <var name="Grade_11" type="list,int"/>
+        <var name="Grade_12" type="list,int"/>
+        <var name="Grade_13" type="list,int"/>
+        <var name="Grade_14" type="list,int"/>
+        <var name="Grade_15" type="list,int"/>
+        <var name="Grade_16" type="list,int"/>
+        <var name="Grade_17" type="list,int"/>
+        <var name="Grade_18" type="list,int"/>
+        <var name="Grade_19" type="list,int"/>
+        <var name="Grade_20" type="list,int"/>
+    </bean>
+
+    <bean name="HeroGradeMemoryData">
+        <var name="MemoryId" type="int"/>
+        <var name="MemoryData" type="map,string,int"/>
+    </bean>
+
+    <bean name="HeroSkillLvUpValue">
         <var name="Lv" type="int"/>
         <var name="needGold" type="int"/>
-	</bean>
+    </bean>
 
     <bean name="HeroReinMaterials">
         <var name="MaterialsListID" type="int"/>
@@ -586,7 +589,6 @@
     </bean>
 
 
-
     <bean name="ItemData">
         <var name="ID" type="int"/>
         <var name="Name" type="string"/>
@@ -615,9 +617,6 @@
     </bean>
 
 
-
-
-
     <bean name="mainCarbonWaves">
         <var name="key" type="int"/>
         <var name="mapId" type="string"/>
@@ -697,8 +696,6 @@
     </bean>
 
 
-
-
     <bean name="OpenBox">
         <var name="ID" type="int"/>
         <var name="Name" type="string"/>
@@ -731,7 +728,6 @@
     </bean>
 
 
-
     <bean name="RechargeDatas">
         <var name="StoreType" type="int"/>
         <var name="StoreResetCycle" type="int"/>
@@ -795,8 +791,6 @@
         <var name="EnergyMax" type="int"/>
         <var name="needExp" type="int"/>
     </bean>
-    
-    
 
 
     <bean name="Skill">
@@ -853,13 +847,12 @@
         <var name="skillIdList" type="list,int"/>
         <var name="time" type="list,int"/>
     </bean>
-    
+
     <bean name="signData">
         <var name="reward" type="string"/>
     </bean>
 
 
-
     <bean name="TeamBonus">
         <var name="ID" type="int"/>
         <var name="Name" type="string"/>
@@ -906,7 +899,7 @@
         <var name="BoxReawardID" type="list,int"/>
     </bean>
 
-  
+
     <bean name="Wave">
         <var name="id" type="int"/>
         <var name="buff" type="string"/>
@@ -924,10 +917,10 @@
     <table name="TbActivityReward" value="ActivityReward" input="pro2d/activity/ActivityReward.xlsx"/>
     <table name="TbAdvance" value="Advance" input="pro2d/Advance.xlsx"/>
     <table name="TbAttributesEntry" value="AttributesEntry" input="pro2d/AttributesEntry.xlsx"/>
-    
+
     <table name="TbBuff" value="Buff" input="pro2d/Buff.xlsx"/>
     <table name="TbBullet" value="Bullet" input="pro2d/Bullet.xlsx"/>
-    
+
     <table name="TbCardGroup" value="CardGroup" input="pro2d/CardGroup.xlsx"/>
     <table name="TbCardQuality" value="CardQuality" input="pro2d/CardQuality.xlsx"/>
     <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/>
@@ -935,18 +928,18 @@
     <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
     <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
     <table name="TbCoupleTies" value="CoupleTies" input="pro2d/CoupleTiesDatas.xlsx"/>
-    
+
     <table name="TbDialogueAll" value="DialogueAll" input="pro2d/DialogueAll.xlsx"/>
     <table name="TbDialogueToChapter" value="DialogueToChapter" input="pro2d/DialogueToChapter.xlsx"/>
     <table name="TbDropGroup" value="DropGroup" input="pro2d/DropGroup.xlsx"/>
     <table name="TbDropChildGroup" value="DropChildGroup" input="pro2d/DropChildGroup.xlsx"/>
-    
+
     <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/>
     <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
     <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
     <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
     <table name="TbEquipmentComposite" value="EquipmentComposite" input="pro2d/EquipmentComposite.xlsx"/>
-    
+
     <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/>
     <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/>
     <table name="TbGemAttention" value="GemAttention" input="pro2d/GemAttention.xlsx"/>
@@ -954,11 +947,12 @@
     <table name="TbGemCreateGroup" value="GemCreateGroup" input="pro2d/GemCreateGroup.xlsx"/>
     <table name="TbGemCreateTime" value="GemCreateTime" input="pro2d/GemCreateTime.xlsx"/>
     <table name="TbGemWeight" value="GemWeight" input="pro2d/GemWeight.xlsx"/>
-    
+
     <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/>
     <table name="TbHeroLvUpValue" value="HeroLvUpValue" input="pro2d/HeroLvUpValue.xlsx"/>
     <table name="TbHeroReinLevelValue" value="HeroReinLevelValue" input="pro2d/HeroReinLevelValue.xlsx"/>
     <table name="TbHeroGradeMemoryGroup" value="HeroGradeMemoryGroup" input="pro2d/HeroGradeMemoryGroup.xls"/>
+    <table name="TbHeroGradeMemoryData" value="HeroGradeMemoryData" input="pro2d/HeroGradeMemoryData.xls"/>
     <table name="TbHeroToSkill" value="HeroToSkill" input="pro2d/HeroToSkill.xlsx"/>
     <table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/>
     <table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
@@ -974,7 +968,7 @@
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
     <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
     <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
-    
+
     <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
     <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
     <table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
@@ -990,11 +984,14 @@
 
     <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/>
 
-    <table name="TbUnlimitedChapterDatas" value="UnlimitedChapterDatas" input="pro2d/ChapterDatas@UnlimitedCarbonDatas.xlsx"/>
-    <table name="TbUnlimitedCarbonMonsterCostDatas" value="UnlimitedCarbonMonsterCostDatas" input="pro2d/MonsterDatas@UnlimitedCarbonDatas.xlsx"/>
-    <table name="TbUnlimitedCarbonPreviewReward" value="UnlimitedCarbonPreviewReward" input="pro2d/PreviewReward@UnlimitedCarbonDatas.xlsx"/>
-  
+    <table name="TbUnlimitedChapterDatas" value="UnlimitedChapterDatas"
+           input="pro2d/ChapterDatas@UnlimitedCarbonDatas.xlsx"/>
+    <table name="TbUnlimitedCarbonMonsterCostDatas" value="UnlimitedCarbonMonsterCostDatas"
+           input="pro2d/MonsterDatas@UnlimitedCarbonDatas.xlsx"/>
+    <table name="TbUnlimitedCarbonPreviewReward" value="UnlimitedCarbonPreviewReward"
+           input="pro2d/PreviewReward@UnlimitedCarbonDatas.xlsx"/>
+
     <table name="TbWeapon" value="Weapon" input="pro2d/Weapon.xlsx"/>
- 
-   
+
+
 </module>
\ No newline at end of file
--
libgit2 0.21.2