Commit c8bd778d304e95fcf0365dd18f9dd522fa27c8a9

Authored by ZhaoLu-Hoshea\Administrator
2 parents ced98bec 69721518

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/IntervalTable.xlsx
No preview for this file type
Datas/pro2d/task/QuestCtl.xlsx renamed to Datas/pro2d/task/QuestCircleCtl.xlsx
No preview for this file type
Datas/pro2d/task/QuestLimitCtl.xlsx 0 → 100644
No preview for this file type
Defines/pro2d.xml
... ... @@ -1001,13 +1001,23 @@
1001 1001 <var name="TaskConditionParamList" type="int"/>
1002 1002 </bean>
1003 1003  
1004   - <bean name="QuestCtl">
  1004 + <bean name="QuestCircleCtl">
1005 1005 <var name="ID" type="int"/>
1006   - <var name="Type" type="int"/>
  1006 + <var name="Name" type="string"/>
  1007 + <var name="OpenFguiId" type="int"/>
1007 1008 <var name="UnlockGlobalQuestID" type="int"/>
1008 1009 <var name="Time" type="string"/>
1009 1010 </bean>
1010 1011  
  1012 + <bean name="QuestLimitCtl">
  1013 + <var name="ID" type="int"/>
  1014 + <var name="Name" type="string"/>
  1015 + <var name="OpenFguiId" type="int"/>
  1016 + <var name="UnlockGlobalQuestID" type="int"/>
  1017 + <var name="StartTime" type="string"/>
  1018 + <var name="EndTime" type="string"/>
  1019 + </bean>
  1020 +
1011 1021 <bean name="RechargeDatas">
1012 1022 <var name="StoreType" type="int"/>
1013 1023 <var name="StoreResetCycle" type="int"/>
... ... @@ -1344,7 +1354,8 @@
1344 1354 <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/>
1345 1355 <table name="TbQuestFavorability" value="QuestFavorability" input="pro2d/task/QuestFavorability.xlsx"/>
1346 1356 <table name="TbQuestGlobal" value="QuestGlobal" input="pro2d/task/QuestGlobal.xlsx"/>
1347   - <table name="TbQuestCtl" value="QuestCtl" input="pro2d/task/QuestCtl.xlsx"/>
  1357 + <table name="TbQuestCircleCtl" value="QuestCircleCtl" input="pro2d/task/QuestCircleCtl.xlsx"/>
  1358 + <table name="TbQuestLimitCtl" value="QuestLimitCtl" input="pro2d/task/QuestLimitCtl.xlsx"/>
1348 1359  
1349 1360 <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
1350 1361 <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
... ...