Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

yangjiyue
2 parents e5925477 18878539
Showing 3 changed files with 18 additions and 1 deletions Show diff stats
Datas/pro2d/activity/ActivityCtl.xlsx
Datas/pro2d/activity/ActivitySign.xlsx
Defines/pro2d.xml
@@ -837,7 +837,22 @@
         <var name="AdvanceID" type="int"/>
     </bean>
  
-
+	<bean name="ActivityCtl">
+		<var name="id" type="int"/>
+		<var name="ttype" type="int"/>
+		<var name="showType" type="int"/>
+		<var name="time" type="string"/>
+	</bean>
+	
+	<bean name="signData">
+		<var name="reward" type="string"/>
+	</bean>
+	
+	<bean name="ActivitySign">
+		<var name="id" type="int"/>
+		<var name="sinDatas" type="map,int,signData"/>
+	</bean>
+	
     <table name="TbGlobalBaseDatas" value="GlobalBaseDatas" input="pro2d/BaseData@GlobalBaseDatas.xlsx"/>
     <table name="TbGlobalListDatas" value="GlobalListDatas" input="pro2d/List@GlobalBaseDatas.xlsx"/>
  
@@ -907,4 +922,6 @@
     <table name="TbGemWeight" value="GemWeight" input="pro2d/GemWeight.xlsx"/>
     <table name="TbAdvance" value="Advance" input="pro2d/Advance.xlsx"/>
     <table name="TbHeroItemFragment" value="HeroItemFragment" input="pro2d/HeroItemFragment.xlsx"/>
+    <table name="TbActivityCtl" value="ActivityCtl" input="pro2d/activity/ActivityCtl.xlsx"/>
+    <table name="TbActivitySign" value="ActivitySign" input="pro2d/activity/ActivitySign.xlsx"/>
 </module>
 \ No newline at end of file