Commit 541a17efbe771336eae4abe328dbcf77def9786a
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
4 changed files
with
13 additions
and
2 deletions
Show diff stats
Datas/pro2d/DropGroup.xlsx
No preview for this file type
Datas/pro2d/GemCreateGroup.xlsx
No preview for this file type
No preview for this file type
Defines/pro2d.xml
| ... | ... | @@ -729,6 +729,7 @@ |
| 729 | 729 | <var name="Name" type="string"/> |
| 730 | 730 | <var name="Min" type="int"/> |
| 731 | 731 | <var name="Max" type="int"/> |
| 732 | + <var name="GrabGemLevel" type="string"/> | |
| 732 | 733 | <var name="Describe" type="string"/> |
| 733 | 734 | <var name="materialID" type="int"/> |
| 734 | 735 | <var name="materialMax" type="int"/> |
| ... | ... | @@ -738,13 +739,22 @@ |
| 738 | 739 | |
| 739 | 740 | |
| 740 | 741 | <bean name="GemCreateTime"> |
| 741 | - | |
| 742 | 742 | <var name="ID" type="int"/> |
| 743 | 743 | <var name="Time" type="int"/> |
| 744 | 744 | <var name="Min" type="int"/> |
| 745 | 745 | <var name="Max" type="int"/> |
| 746 | 746 | <var name="Describe" type="string"/> |
| 747 | - | |
| 747 | + </bean> | |
| 748 | + | |
| 749 | + <bean name="GemWeightInfo"> | |
| 750 | + <var name="WeightMin" type="int"/> | |
| 751 | + <var name="WeightMax" type="int"/> | |
| 752 | + </bean> | |
| 753 | + | |
| 754 | + <bean name="GemWeight"> | |
| 755 | + <var name="ID" type="int"/> | |
| 756 | + <var name="Name" type="string"/> | |
| 757 | + <var name="gemWeightInfos" type="map,int,GemWeightInfo"/> | |
| 748 | 758 | </bean> |
| 749 | 759 | |
| 750 | 760 | |
| ... | ... | @@ -803,4 +813,5 @@ |
| 803 | 813 | <table name="TbGemCreateLimit" value="GemCreateLimit" input="pro2d/GemCreateLimit.xlsx"/> |
| 804 | 814 | <table name="TbGemCreateGroup" value="GemCreateGroup" input="pro2d/GemCreateGroup.xlsx"/> |
| 805 | 815 | <table name="TbGemCreateTime" value="GemCreateTime" input="pro2d/GemCreateTime.xlsx"/> |
| 816 | + <table name="TbGemWeight" value="GemWeight" input="pro2d/GemWeight.xlsx"/> | |
| 806 | 817 | </module> |
| 807 | 818 | \ No newline at end of file | ... | ... |