Compare View
Commits (2)
-
替换图标，删除equip表中的图标名，物品描述，物品获取途径描述，物品获取途径
-
# Conflicts: # Datas/pro2d/PopupsDatas.xlsx
Showing
3 changed files
Show diff stats
Datas/pro2d/EquipmentData.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Defines/pro2d.xml
| ... | ... | @@ -387,10 +387,6 @@ |
| 387 | 387 | <var name="Dodge" type="float"/> |
| 388 | 388 | <var name="Hp" type="float"/> |
| 389 | 389 | <var name="StrengthenMaterialsCombinationID" type="int"/> |
| 390 | - <var name="ImageName" type="string"/> | |
| 391 | - <var name="DetailText" type="string"/> | |
| 392 | - <var name="GetWay" type="string"/> | |
| 393 | - <var name="GetWayLink" type="string"/> | |
| 394 | 390 | </bean> |
| 395 | 391 | |
| 396 | 392 | <bean name="EquipmentType"> |
| ... | ... | @@ -707,7 +703,6 @@ |
| 707 | 703 | <var name="UnlockHeroNum" type="int"/> |
| 708 | 704 | <var name="AdvanceID" type="int"/> |
| 709 | 705 | <var name="Overflow" type="string"/> |
| 710 | - | |
| 711 | 706 | </bean> |
| 712 | 707 | |
| 713 | 708 | |
| ... | ... | @@ -728,7 +723,13 @@ |
| 728 | 723 | <var name="ImageName" type="string"/> |
| 729 | 724 | <var name="DetailText" type="string"/> |
| 730 | 725 | <var name="GetWay" type="string"/> |
| 731 | - <var name="GetWayLink" type="string"/> | |
| 726 | + <var name="GetWayLink" type="(list#sep=;),(ItemGetWayData#sep=-)"/> | |
| 727 | + </bean> | |
| 728 | + | |
| 729 | + <bean name="ItemGetWayData"> | |
| 730 | + <var name="Type" type="string"/> | |
| 731 | + <var name="Chapter" type="int"/> | |
| 732 | + <var name="Carbon" type="int"/> | |
| 732 | 733 | </bean> |
| 733 | 734 | |
| 734 | 735 | <bean name="IntervalTable"> | ... | ... |