Commit 3334121b39599a9d0c1f0c4d9e9cad02f5041be4
1 parent
937ca4e4
hero相关
Showing
5 changed files
with
8 additions
and
7 deletions
Show diff stats
Datas/__enums__.xlsx
No preview for this file type
Datas/common/FUIPanel.xlsx
No preview for this file type
Datas/pro2d/GlobalBaseDatas.xlsx
No preview for this file type
Datas/pro2d/PopupsDatas.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -378,7 +378,6 @@ | @@ -378,7 +378,6 @@ | ||
| 378 | <var name="EquipType" type="int"/> | 378 | <var name="EquipType" type="int"/> |
| 379 | <var name="Grade" type="int"/> | 379 | <var name="Grade" type="int"/> |
| 380 | <var name="Star" type="int"/> | 380 | <var name="Star" type="int"/> |
| 381 | - | ||
| 382 | <var name="GemNum" type="int"/> | 381 | <var name="GemNum" type="int"/> |
| 383 | <var name="PrefabId" type="int"/> | 382 | <var name="PrefabId" type="int"/> |
| 384 | <var name="Atk" type="float"/> | 383 | <var name="Atk" type="float"/> |
| @@ -386,9 +385,7 @@ | @@ -386,9 +385,7 @@ | ||
| 386 | <var name="Def" type="float"/> | 385 | <var name="Def" type="float"/> |
| 387 | <var name="Dodge" type="float"/> | 386 | <var name="Dodge" type="float"/> |
| 388 | <var name="Hp" type="float"/> | 387 | <var name="Hp" type="float"/> |
| 389 | - | ||
| 390 | <var name="StrengthenMaterialsCombinationID" type="int"/> | 388 | <var name="StrengthenMaterialsCombinationID" type="int"/> |
| 391 | - | ||
| 392 | <var name="ImageName" type="string"/> | 389 | <var name="ImageName" type="string"/> |
| 393 | <var name="DetailText" type="string"/> | 390 | <var name="DetailText" type="string"/> |
| 394 | <var name="GetWay" type="string"/> | 391 | <var name="GetWay" type="string"/> |
| @@ -438,6 +435,13 @@ | @@ -438,6 +435,13 @@ | ||
| 438 | <var name="VarValue" type="string"/> | 435 | <var name="VarValue" type="string"/> |
| 439 | </bean> | 436 | </bean> |
| 440 | 437 | ||
| 438 | + <bean name="GlobalDictDatas"> | ||
| 439 | + <var name="ListName" type="string"/> | ||
| 440 | + <var name="KeyType" type="string"/> | ||
| 441 | + <var name="ValueType" type="string"/> | ||
| 442 | + <var name="DictData" type="map,string,string"/> | ||
| 443 | + </bean> | ||
| 444 | + | ||
| 441 | <bean name="GlobalListDatas"> | 445 | <bean name="GlobalListDatas"> |
| 442 | <var name="ListName" type="string"/> | 446 | <var name="ListName" type="string"/> |
| 443 | <var name="ListValueType" type="string"/> | 447 | <var name="ListValueType" type="string"/> |
| @@ -461,17 +465,14 @@ | @@ -461,17 +465,14 @@ | ||
| 461 | </bean> | 465 | </bean> |
| 462 | 466 | ||
| 463 | <bean name="GemCreateLimit"> | 467 | <bean name="GemCreateLimit"> |
| 464 | - | ||
| 465 | <var name="ID" type="int"/> | 468 | <var name="ID" type="int"/> |
| 466 | <var name="LimitType" type="int"/> | 469 | <var name="LimitType" type="int"/> |
| 467 | <var name="LimitTaskId" type="int"/> | 470 | <var name="LimitTaskId" type="int"/> |
| 468 | <var name="Num" type="int"/> | 471 | <var name="Num" type="int"/> |
| 469 | <var name="Describe" type="string"/> | 472 | <var name="Describe" type="string"/> |
| 470 | - | ||
| 471 | </bean> | 473 | </bean> |
| 472 | 474 | ||
| 473 | <bean name="GemCreateGroup"> | 475 | <bean name="GemCreateGroup"> |
| 474 | - | ||
| 475 | <var name="ID" type="int"/> | 476 | <var name="ID" type="int"/> |
| 476 | <var name="Name" type="string"/> | 477 | <var name="Name" type="string"/> |
| 477 | <var name="Min" type="int"/> | 478 | <var name="Min" type="int"/> |
| @@ -482,7 +483,6 @@ | @@ -482,7 +483,6 @@ | ||
| 482 | <var name="materialMax" type="int"/> | 483 | <var name="materialMax" type="int"/> |
| 483 | <var name="otherSC" type="string"/> | 484 | <var name="otherSC" type="string"/> |
| 484 | <var name="ImmediatelyFinish" type="string"/> | 485 | <var name="ImmediatelyFinish" type="string"/> |
| 485 | - | ||
| 486 | </bean> | 486 | </bean> |
| 487 | 487 | ||
| 488 | <bean name="GemCreateTime"> | 488 | <bean name="GemCreateTime"> |
| @@ -1115,6 +1115,7 @@ | @@ -1115,6 +1115,7 @@ | ||
| 1115 | 1115 | ||
| 1116 | <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/> | 1116 | <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/> |
| 1117 | <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/> | 1117 | <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/> |
| 1118 | + <table name="TbGlobalDictDatas" value="GlobalDictDatas" input="pro2d/Dictionary@GlobalBaseDatas.xlsx"/> | ||
| 1118 | <table name="TbGemAttention" value="GemAttention" input="pro2d/GemAttention.xlsx"/> | 1119 | <table name="TbGemAttention" value="GemAttention" input="pro2d/GemAttention.xlsx"/> |
| 1119 | <table name="TbGemCreateLimit" value="GemCreateLimit" input="pro2d/GemCreateLimit.xlsx"/> | 1120 | <table name="TbGemCreateLimit" value="GemCreateLimit" input="pro2d/GemCreateLimit.xlsx"/> |
| 1120 | <table name="TbGemCreateGroup" value="GemCreateGroup" input="pro2d/GemCreateGroup.xlsx"/> | 1121 | <table name="TbGemCreateGroup" value="GemCreateGroup" input="pro2d/GemCreateGroup.xlsx"/> |