Commit 9a73a5521512310aa8c2c060ed890f4a28b0f3aa
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
3 changed files
with
18 additions
and
1 deletions
Show diff stats
No preview for this file type
No preview for this file type
Defines/pro2d.xml
| @@ -837,7 +837,22 @@ | @@ -837,7 +837,22 @@ | ||
| 837 | <var name="AdvanceID" type="int"/> | 837 | <var name="AdvanceID" type="int"/> |
| 838 | </bean> | 838 | </bean> |
| 839 | 839 | ||
| 840 | - | 840 | + <bean name="ActivityCtl"> |
| 841 | + <var name="id" type="int"/> | ||
| 842 | + <var name="ttype" type="int"/> | ||
| 843 | + <var name="showType" type="int"/> | ||
| 844 | + <var name="time" type="string"/> | ||
| 845 | + </bean> | ||
| 846 | + | ||
| 847 | + <bean name="signData"> | ||
| 848 | + <var name="reward" type="string"/> | ||
| 849 | + </bean> | ||
| 850 | + | ||
| 851 | + <bean name="ActivitySign"> | ||
| 852 | + <var name="id" type="int"/> | ||
| 853 | + <var name="sinDatas" type="map,int,signData"/> | ||
| 854 | + </bean> | ||
| 855 | + | ||
| 841 | <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/> | 856 | <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/> |
| 842 | <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/> | 857 | <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/> |
| 843 | 858 | ||
| @@ -907,4 +922,6 @@ | @@ -907,4 +922,6 @@ | ||
| 907 | <table name="TbGemWeight" value="GemWeight" input="pro2d/GemWeight.xlsx"/> | 922 | <table name="TbGemWeight" value="GemWeight" input="pro2d/GemWeight.xlsx"/> |
| 908 | <table name="TbAdvance" value="Advance" input="pro2d/Advance.xlsx"/> | 923 | <table name="TbAdvance" value="Advance" input="pro2d/Advance.xlsx"/> |
| 909 | <table name="TbHeroItemFragment" value="HeroItemFragment" input="pro2d/HeroItemFragment.xlsx"/> | 924 | <table name="TbHeroItemFragment" value="HeroItemFragment" input="pro2d/HeroItemFragment.xlsx"/> |
| 925 | + <table name="TbActivityCtl" value="ActivityCtl" input="pro2d/activity/ActivityCtl.xlsx"/> | ||
| 926 | + <table name="TbActivitySign" value="ActivitySign" input="pro2d/activity/ActivitySign.xlsx"/> | ||
| 910 | </module> | 927 | </module> |
| 911 | \ No newline at end of file | 928 | \ No newline at end of file |