Commit 18878539cc257ecdd13bd39c358cdd0c24cd4ba2
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
3 changed files
with
4 additions
and
3 deletions
Show diff stats
Datas/pro2d/HeroToSkill.xlsx
No preview for this file type
Datas/pro2d/SkillConfig.xlsx
No preview for this file type
Defines/pro2d.xml
... | ... | @@ -450,6 +450,7 @@ |
450 | 450 | </bean> |
451 | 451 | |
452 | 452 | <bean name="SkillData"> |
453 | + <var name="SkillPath" type="string"/> | |
453 | 454 | <var name="Value1" type="double"/> |
454 | 455 | <var name="Value2" type="double"/> |
455 | 456 | <var name="Value3" type="double"/> |
... | ... | @@ -460,10 +461,9 @@ |
460 | 461 | <var name="SkillID" type="string"/> |
461 | 462 | <var name="SkillName" type="string"/> |
462 | 463 | <var name="SkillDescribe" type="string"/> |
463 | - <var name="SkillIcon" type="string"/> | |
464 | - <var name="SkillPath" type="string"/> | |
465 | 464 | <var name="SkillCount" type="int"/> |
466 | 465 | <var name="SkillCD" type="float"/> |
466 | + <var name="SkillIcon" type="string"/> | |
467 | 467 | <var name="SkillDatas" type="map,int,SkillData"/> |
468 | 468 | </bean> |
469 | 469 | |
... | ... | @@ -506,8 +506,9 @@ |
506 | 506 | <var name="atkId" type="int"/> |
507 | 507 | <var name="SkillId" type="list,int"/> |
508 | 508 | <var name="Buffs" type="list,int"/> |
509 | - <var name="PassiveSkillId" type="list,string"/> | |
509 | + <var name="PassiveSkillId" type="list,int"/> | |
510 | 510 | <var name="ShowPassiveSkillId" type="list,int"/> |
511 | + <var name="BornSkill" type="list,int"/> | |
511 | 512 | <var name="skillOrders" type="list,SkillOrder"/> |
512 | 513 | </bean> |
513 | 514 | ... | ... |