Commit e3d391ec73fe21ca4b2aed80aec0f5fc35513e52
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
# Conflicts: # Datas/pro2d/PopupsDatas.xlsx
Showing
8 changed files
with
1 additions
and
1 deletions
Show diff stats
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
Datas/pro2d/DropChildGroup.xlsx
No preview for this file type
Datas/pro2d/GlobalBaseDatas.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Datas/pro2d/MainChapter.xlsx
No preview for this file type
Datas/pro2d/activity/ActivitySign.xlsx
No preview for this file type
Datas/pro2d/task/QuestDatas.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -796,7 +796,7 @@ | @@ -796,7 +796,7 @@ | ||
| 796 | <var name="bonusAward_3" type="string"/> | 796 | <var name="bonusAward_3" type="string"/> |
| 797 | <var name="recommendPower" type="int"/> | 797 | <var name="recommendPower" type="int"/> |
| 798 | <var name="showCarbonEnemy" type="string"/> | 798 | <var name="showCarbonEnemy" type="string"/> |
| 799 | - <var name="dropID" type="int"/> | 799 | + <var name="dropID" type="string"/> |
| 800 | <var name="mapItemdropID" type="int"/> | 800 | <var name="mapItemdropID" type="int"/> |
| 801 | <var name="mapItemdropCount" type="int"/> | 801 | <var name="mapItemdropCount" type="int"/> |
| 802 | <var name="mapTreasuredropID" type="int"/> | 802 | <var name="mapTreasuredropID" type="int"/> |