Commit 3db6015f2e045e45d7901644cc60b04efb358f7b

Authored by yangjiyue
2 parents 80f51f8c 1b01038b

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

# Conflicts:
#	Datas/pro2d/ItemData.xlsx
Datas/pro2d/CrystalReinforcement.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Defines/pro2d.xml
... ... @@ -597,6 +597,18 @@
597 597 <var name="Pool_3" type="int"/>
598 598 </bean>
599 599  
  600 + <bean name="CrystalReinforcement">
  601 + <var name="ID" type="int"/>
  602 + <var name="Combination" type="string"/>
  603 + <var name="successRate" type="int"/>
  604 + <var name="failRate" type="int"/>
  605 + <var name="ReturnsMaterialByForge" type="string"/>
  606 + <var name="unloadRate" type="int"/>
  607 + <var name="damageRate" type="int"/>
  608 + <var name="ReturnsMaterialByUnload" type="string"/>
  609 + <var name="SpecialEffects" type="string"/>
  610 + </bean>
  611 +
600 612 <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/>
601 613 <table name="TbHeroLvUpValue" value="HeroLvUpValue" input="pro2d/HeroLvUpValue.xlsx"/>
602 614 <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
... ... @@ -642,4 +654,5 @@
642 654 <table name="TbCardGroup" value="CardGroup" input="pro2d/CardGroup.xlsx"/>
643 655 <table name="TbCardQuality" value="CardQuality" input="pro2d/CardQuality.xlsx"/>
644 656 <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/>
  657 + <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/>
645 658 </module>
646 659 \ No newline at end of file
... ...