Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

yangjiyue
2 parents 36c5aeaa 422d8265
Showing 4 changed files with 12 additions and 0 deletions Show diff stats
Datas/pro2d/HeroSkillLvUpValue.xlsx
Datas/pro2d/QuestDataCondition.xlsx
Datas/pro2d/QuestDatas.xlsx
Defines/pro2d.xml
@@ -768,6 +768,9 @@
         <var name="QuestGoalTypeTag" type="int"/>
         <var name="QuestGoalProgressMax" type="int"/>
         <var name="QuestPrecondition" type="int"/>
+        <var name="UnlockCondition" type="int"/>
+        <var name="TaskCondition" type="int"/>
+        <var name="Circulable" type="int"/>
         <var name="QuestAward" type="string"/>
     </bean>
  
@@ -776,6 +779,14 @@
         <var name="QuestDataStructs" type="map,int,QuestDataStruct"/>
     </bean>
  
+    <bean name="QuestDataCondition">
+        <var name="ID" type="int"/>
+        <var name="ConditionName" type="string"/>
+        <var name="TaskConditionTypeName" type="string"/>
+        <var name="TaskConditionType" type="int"/>
+        <var name="CompareConditionType" type="string"/>
+        <var name="ParamList" type="int"/>
+    </bean>
  
     <bean name="RechargeDatas">
         <var name="StoreType" type="int"/>
@@ -1030,6 +1041,7 @@
     <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
     <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
     <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
+    <table name="TbQuestDataCondition" value="QuestDataCondition" input="pro2d/QuestDataCondition.xlsx"/>
  
     <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
     <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>