Commit ed0d60aeb286a980ff2c33387e8bb0ab80a00c4e
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
6 changed files
with
40 additions
and
1 deletions
Show diff stats
Datas/common/NumericType.xlsx
No preview for this file type
Datas/common/NumericTypeEx.xlsx
No preview for this file type
Datas/pro2d/Dispatch.xlsx
No preview for this file type
No preview for this file type
Datas/pro2d/GlobalBaseDatas.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -353,6 +353,29 @@ | @@ -353,6 +353,29 @@ | ||
| 353 | <var name="GetWayLink" type="string"/> | 353 | <var name="GetWayLink" type="string"/> |
| 354 | </bean> | 354 | </bean> |
| 355 | 355 | ||
| 356 | + <bean name="EquipmentDataNew"> | ||
| 357 | + <var name="EquipID" type="int"/> | ||
| 358 | + <var name="EquipName" type="string"/> | ||
| 359 | + <var name="EquipType" type="int"/> | ||
| 360 | + <var name="Grade" type="int"/> | ||
| 361 | + <var name="Star" type="int"/> | ||
| 362 | + | ||
| 363 | + <var name="GemNum" type="int"/> | ||
| 364 | + <var name="PrefabId" type="int"/> | ||
| 365 | + <var name="Atk" type="float"/> | ||
| 366 | + <var name="Crit" type="float"/> | ||
| 367 | + <var name="Def" type="float"/> | ||
| 368 | + <var name="Dodge" type="float"/> | ||
| 369 | + <var name="Hp" type="float"/> | ||
| 370 | + | ||
| 371 | + <var name="StrengthenMaterialsCombinationID" type="int"/> | ||
| 372 | + | ||
| 373 | + <var name="ImageName" type="string"/> | ||
| 374 | + <var name="DetailText" type="string"/> | ||
| 375 | + <var name="GetWay" type="string"/> | ||
| 376 | + <var name="GetWayLink" type="string"/> | ||
| 377 | + </bean> | ||
| 378 | + | ||
| 356 | <bean name="EquipmentType"> | 379 | <bean name="EquipmentType"> |
| 357 | <var name="EquipType" type="int"/> | 380 | <var name="EquipType" type="int"/> |
| 358 | <var name="EquipBagClassify" type="int"/> | 381 | <var name="EquipBagClassify" type="int"/> |
| @@ -361,6 +384,19 @@ | @@ -361,6 +384,19 @@ | ||
| 361 | <var name="GemType" type="string"/> | 384 | <var name="GemType" type="string"/> |
| 362 | </bean> | 385 | </bean> |
| 363 | 386 | ||
| 387 | + <bean name="EquipmentAdvancedEntry"> | ||
| 388 | + <var name="ID" type="int"/> | ||
| 389 | + <var name="Description" type="string"/> | ||
| 390 | + <var name="EntryToWeapon" type="string"/> | ||
| 391 | + <var name="Star" type="int"/> | ||
| 392 | + <var name="weight" type="int"/> | ||
| 393 | + <var name="Lower" type="int"/> | ||
| 394 | + <var name="Upper" type="int"/> | ||
| 395 | + <var name="IsPct" type="bool"/> | ||
| 396 | + </bean> | ||
| 397 | + | ||
| 398 | + | ||
| 399 | + | ||
| 364 | <bean name="EquipBreakdown"> | 400 | <bean name="EquipBreakdown"> |
| 365 | <var name="EquipID" type="int"/> | 401 | <var name="EquipID" type="int"/> |
| 366 | <var name="BraekdownResults" type="list,BraekdownResult"/> | 402 | <var name="BraekdownResults" type="list,BraekdownResult"/> |
| @@ -1045,7 +1081,10 @@ | @@ -1045,7 +1081,10 @@ | ||
| 1045 | <table name="TbDropChildGroup" value="DropChildGroup" input="pro2d/DropChildGroup.xlsx"/> | 1081 | <table name="TbDropChildGroup" value="DropChildGroup" input="pro2d/DropChildGroup.xlsx"/> |
| 1046 | 1082 | ||
| 1047 | <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/> | 1083 | <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/> |
| 1048 | - <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/> | 1084 | + <table name="TbEquipmentDataNew" value="EquipmentDataNew" input="pro2d/BaseData@EquipmentDataNew.xlsx"/> |
| 1085 | + <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentDataNew.xlsx"/> | ||
| 1086 | + <table name="TbEquipmentAdvancedEntry" value="EquipmentAdvancedEntry" input="pro2d/EquipmentAdvancedEntry@EquipmentDataNew.xlsx"/> | ||
| 1087 | + | ||
| 1049 | <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/> | 1088 | <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/> |
| 1050 | <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/> | 1089 | <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/> |
| 1051 | <table name="TbEquipmentComposite" value="EquipmentComposite" input="pro2d/EquipmentComposite.xlsx"/> | 1090 | <table name="TbEquipmentComposite" value="EquipmentComposite" input="pro2d/EquipmentComposite.xlsx"/> |