Commit 2e1f7ee4b7663fc31a1bc8dc47f72a1f724fb460
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
7 changed files
with
7 additions
and
17 deletions
Show diff stats
Datas/common/UnityScene.xlsx
No preview for this file type
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
Datas/pro2d/HeroGradeUpValue.xlsx
No preview for this file type
Datas/pro2d/MainChapter.xlsx
No preview for this file type
Datas/pro2d/PopupsDatas.xlsx
No preview for this file type
Datas/pro2d/hero.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -569,7 +569,6 @@ | @@ -569,7 +569,6 @@ | ||
| 569 | <var name="ceRevise" type="float"/> | 569 | <var name="ceRevise" type="float"/> |
| 570 | <var name="hpBarYpos" type="int"/> | 570 | <var name="hpBarYpos" type="int"/> |
| 571 | <var name="lvUpType" type="int"/> | 571 | <var name="lvUpType" type="int"/> |
| 572 | - <var name="GradeUpType" type="int"/> | ||
| 573 | <var name="MaterialsListID" type="int"/> | 572 | <var name="MaterialsListID" type="int"/> |
| 574 | <var name="WeaponType" type="string"/> | 573 | <var name="WeaponType" type="string"/> |
| 575 | <var name="ArmorType" type="string"/> | 574 | <var name="ArmorType" type="string"/> |
| @@ -597,22 +596,12 @@ | @@ -597,22 +596,12 @@ | ||
| 597 | </bean> | 596 | </bean> |
| 598 | 597 | ||
| 599 | <bean name="HeroGradeUpValue"> | 598 | <bean name="HeroGradeUpValue"> |
| 600 | - <var name="lvUpType" type="int"/> | ||
| 601 | - <var name="hp1" type="float"/> | ||
| 602 | - <var name="hp2" type="float"/> | ||
| 603 | - <var name="hp3" type="float"/> | ||
| 604 | - <var name="dodge1" type="float"/> | ||
| 605 | - <var name="dodge2" type="float"/> | ||
| 606 | - <var name="dodge3" type="float"/> | ||
| 607 | - <var name="crit1" type="float"/> | ||
| 608 | - <var name="crit2" type="float"/> | ||
| 609 | - <var name="crit3" type="float"/> | ||
| 610 | - <var name="atkPct1" type="float"/> | ||
| 611 | - <var name="atkPct2" type="float"/> | ||
| 612 | - <var name="atkPct3" type="float"/> | ||
| 613 | - <var name="def1" type="int"/> | ||
| 614 | - <var name="def2" type="int"/> | ||
| 615 | - <var name="def3" type="int"/> | 599 | + <var name="GradeLevel" type="int"/> |
| 600 | + <var name="HpBaseAdd" type="float"/> | ||
| 601 | + <var name="DodgeBaseAdd" type="float"/> | ||
| 602 | + <var name="CritBaseAdd" type="float"/> | ||
| 603 | + <var name="AtkBaseAdd" type="float"/> | ||
| 604 | + <var name="DefBaseAdd" type="int"/> | ||
| 616 | </bean> | 605 | </bean> |
| 617 | 606 | ||
| 618 | <bean name="HeroGradeMemoryGroup"> | 607 | <bean name="HeroGradeMemoryGroup"> |
| @@ -760,6 +749,7 @@ | @@ -760,6 +749,7 @@ | ||
| 760 | <bean name="mainMonsterWave"> | 749 | <bean name="mainMonsterWave"> |
| 761 | <var name="key" type="int"/> | 750 | <var name="key" type="int"/> |
| 762 | <var name="name" type="string"/> | 751 | <var name="name" type="string"/> |
| 752 | + <var name="isTrigger" type="bool"/> | ||
| 763 | <var name="startWait" type="float"/> | 753 | <var name="startWait" type="float"/> |
| 764 | <var name="completeWait" type="float"/> | 754 | <var name="completeWait" type="float"/> |
| 765 | <var name="monsterBorn" type="list,MonsterBorn"/> | 755 | <var name="monsterBorn" type="list,MonsterBorn"/> |