Compare View
Commits (2)
-
# Conflicts: # Datas/pro2d/task/QuestAchievementDatas.xlsx # Datas/pro2d/task/QuestDatas.xlsx # Defines/pro2d.xml
Showing
7 changed files
Show diff stats
Datas/__enums__.xlsx
No preview for this file type
Datas/common/FUIPanel.xlsx
No preview for this file type
No preview for this file type
No preview for this file type
Datas/pro2d/task/QuestAchievementDatas.xlsx
No preview for this file type
Datas/pro2d/task/QuestDatas.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -142,6 +142,30 @@ | @@ -142,6 +142,30 @@ | ||
| 142 | <var name="QualityStr" type="string"/> | 142 | <var name="QualityStr" type="string"/> |
| 143 | <var name="CardPoolDatas" type="map,int,CardPoolData"/> | 143 | <var name="CardPoolDatas" type="map,int,CardPoolData"/> |
| 144 | </bean> | 144 | </bean> |
| 145 | + | ||
| 146 | + | ||
| 147 | + <bean name="CatSurvivorBuffPool"> | ||
| 148 | + <var name="CatSurvivorBuffPoolType" type="int"/> | ||
| 149 | + <var name="CatSurvivorBuffPoolData" type="list,CatSurvivorBuffData"/> | ||
| 150 | + </bean> | ||
| 151 | + | ||
| 152 | + <bean name="CatSurvivorBuffData"> | ||
| 153 | + <var name="BuffType" type="string"/> | ||
| 154 | + <var name="DataType" type="string"/> | ||
| 155 | + <var name="Name" type="string"/> | ||
| 156 | + <var name="DataID" type="int"/> | ||
| 157 | + <var name="Descriptions" type="string"/> | ||
| 158 | + <var name="MaxAmounts" type="int"/> | ||
| 159 | + <var name="AddDescriptions" type="string"/> | ||
| 160 | + <var name="AddData" type="string"/> | ||
| 161 | + </bean> | ||
| 162 | + | ||
| 163 | + <bean name="CatSurvivorLevelExp"> | ||
| 164 | + <var name="Level" type="int"/> | ||
| 165 | + <var name="NeedExp" type="int"/> | ||
| 166 | + <var name="BuffRank" type="string"/> | ||
| 167 | + </bean> | ||
| 168 | + | ||
| 145 | 169 | ||
| 146 | <bean name="CrystalReinforcement"> | 170 | <bean name="CrystalReinforcement"> |
| 147 | <var name="ID" type="int"/> | 171 | <var name="ID" type="int"/> |
| @@ -1294,6 +1318,8 @@ | @@ -1294,6 +1318,8 @@ | ||
| 1294 | <table name="TbCardGroup" value="CardGroup" input="pro2d/CardGroup.xlsx"/> | 1318 | <table name="TbCardGroup" value="CardGroup" input="pro2d/CardGroup.xlsx"/> |
| 1295 | <table name="TbCardQuality" value="CardQuality" input="pro2d/CardQuality.xlsx"/> | 1319 | <table name="TbCardQuality" value="CardQuality" input="pro2d/CardQuality.xlsx"/> |
| 1296 | <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/> | 1320 | <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/> |
| 1321 | + <table name="TbCatSurvivorBuffPool" value="CatSurvivorBuffPool" input="pro2d/CatSurvivorBuffPool.xlsx"/> | ||
| 1322 | + <table name="TbCatSurvivorLevelExp" value="CatSurvivorLevelExp" input="pro2d/CatSurvivorLevelExp.xlsx"/> | ||
| 1297 | <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/> | 1323 | <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/> |
| 1298 | <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> | 1324 | <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> |
| 1299 | <table name="TbCatSurvivorMonster" value="CatSurvivorMonster" input="pro2d/CatSurvivorMonster.xlsx"/> | 1325 | <table name="TbCatSurvivorMonster" value="CatSurvivorMonster" input="pro2d/CatSurvivorMonster.xlsx"/> |