Commit 8fdc48b1e49fe6f892b6ecdfcd58103f4474127a

Authored by yangjiyue
2 parents dd95e2e2 b8c2d8fa

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

# Conflicts:
#	Datas/pro2d/GlobalBaseDatas.xlsx
Datas/pro2d/GlobalBaseDatas.xlsx
No preview for this file type
Datas/pro2d/HeroToSkill.xlsx
No preview for this file type
Datas/pro2d/QuestDatas.xlsx 0 → 100644
No preview for this file type
Datas/pro2d/hero.xlsx
No preview for this file type
Defines/pro2d.xml
... ... @@ -594,6 +594,9 @@
594 594 <var name="atkPct1" type="float"/>
595 595 <var name="atkPct2" type="float"/>
596 596 <var name="atkPct3" type="float"/>
  597 + <var name="def1" type="float"/>
  598 + <var name="def2" type="float"/>
  599 + <var name="def3" type="float"/>
597 600 </bean>
598 601  
599 602 <bean name="HeroGradeUpValue">
... ...