Jelajahi Sumber

feat(protocol): 更新协议定义以支持新功能

- 在 ws_index_request.proto 中添加 collected_story_ids 字段用于记录已领取的阶段性奖励关卡id
- 修改 ws_mail_request.proto 中 ItemVo 的 quantity 类型从 int32 为 int64- 移除 MailDetailRequestMessage 消息体定义
- 新增 MailClaimResponse 消息体用于领取邮件附件响应,包含获取的道具列表字段 items
smile 2 hari lalu
induk
melakukan
126558c763
3 mengubah file dengan 513 tambahan dan 281 penghapusan
  1. 503 272
      Config
  2. 4 1
      protocol/ws_index_request.proto
  3. 6 8
      protocol/ws_mail_request.proto

+ 503 - 272
Config

@@ -306,66 +306,76 @@
 	<Data id="6050" itemType="6" level="50" maxLevel="50" quality="5" cost1="2,25500" cost2="11,144" reward="3,200000,7" atk="255" hp="" atkPct="5" hpPct="" crtPct="" movePct="" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data id="1001" taskType="1" des="无尽模式魔法阵使用2000万魔币" parameter="20000000" reward="7,1" unlock="0" />
-	<Data id="1002" taskType="1" des="无尽模式魔法阵使用4000万魔币" parameter="40000000" reward="7,1" unlock="0" />
-	<Data id="1003" taskType="1" des="无尽模式魔法阵使用6000万魔币" parameter="60000000" reward="7,1" unlock="0" />
-	<Data id="1004" taskType="1" des="无尽模式魔法阵使用1亿魔币" parameter="100000000" reward="7,2" unlock="0" />
-	<Data id="1005" taskType="1" des="无尽模式魔法阵使用1.4亿魔币" parameter="140000000" reward="7,2" unlock="0" />
-	<Data id="1006" taskType="1" des="无尽模式魔法阵使用1.8亿魔币" parameter="180000000" reward="7,2" unlock="0" />
-	<Data id="1007" taskType="1" des="无尽模式魔法阵使用2.4亿魔币" parameter="240000000" reward="7,3" unlock="0" />
-	<Data id="1008" taskType="1" des="无尽模式魔法阵使用3.6亿魔币" parameter="360000000" reward="7,3" unlock="0" />
-	<Data id="1009" taskType="1" des="无尽模式魔法阵使用4.4亿魔币" parameter="440000000" reward="7,3" unlock="0" />
-	<Data id="1010" taskType="1" des="无尽模式魔法阵使用5.2亿魔币" parameter="520000000" reward="7,4" unlock="0" />
-	<Data id="1011" taskType="1" des="无尽模式魔法阵使用6亿魔币" parameter="600000000" reward="7,4" unlock="0" />
-	<Data id="1012" taskType="1" des="无尽模式魔法阵使用7亿魔币" parameter="700000000" reward="7,4" unlock="0" />
-	<Data id="1013" taskType="1" des="无尽模式魔法阵使用8亿魔币" parameter="800000000" reward="7,5" unlock="0" />
-	<Data id="1014" taskType="1" des="无尽模式魔法阵使用9亿魔币" parameter="900000000" reward="7,5" unlock="0" />
-	<Data id="1015" taskType="1" des="无尽模式魔法阵使用12亿魔币" parameter="1200000000" reward="7,5" unlock="0" />
-	<Data id="1016" taskType="1" des="无尽模式魔法阵使用11.4亿魔币" parameter="1140000000" reward="7,6" unlock="0" />
-	<Data id="1017" taskType="1" des="无尽模式魔法阵使用12.6亿魔币" parameter="1260000000" reward="7,6" unlock="0" />
-	<Data id="1018" taskType="1" des="无尽模式魔法阵使用13.8亿魔币" parameter="1380000000" reward="7,6" unlock="0" />
-	<Data id="1019" taskType="1" des="无尽模式魔法阵使用15亿魔币" parameter="1500000000" reward="7,6" unlock="0" />
-	<Data id="1020" taskType="1" des="无尽模式魔法阵使用16.4亿魔币" parameter="1640000000" reward="7,6" unlock="0" />
-	<Data id="1021" taskType="1" des="无尽模式魔法阵使用17.8亿魔币" parameter="1780000000" reward="7,7" unlock="0" />
-	<Data id="1022" taskType="1" des="无尽模式魔法阵使用19.2亿魔币" parameter="1920000000" reward="7,7" unlock="0" />
-	<Data id="1023" taskType="1" des="无尽模式魔法阵使用20.6亿魔币" parameter="2060000000" reward="7,7" unlock="0" />
-	<Data id="1024" taskType="1" des="无尽模式魔法阵使用22亿魔币" parameter="2200000000" reward="7,7" unlock="0" />
-	<Data id="1025" taskType="1" des="无尽模式魔法阵使用23.6亿魔币" parameter="2360000000" reward="7,7" unlock="0" />
-	<Data id="1026" taskType="1" des="无尽模式魔法阵使用25.2亿魔币" parameter="2520000000" reward="7,8" unlock="0" />
-	<Data id="1027" taskType="1" des="无尽模式魔法阵使用26.8亿魔币" parameter="2680000000" reward="7,8" unlock="0" />
-	<Data id="1028" taskType="1" des="无尽模式魔法阵使用28.4亿魔币" parameter="2840000000" reward="7,8" unlock="0" />
-	<Data id="1029" taskType="1" des="无尽模式魔法阵使用30亿魔币" parameter="3000000000" reward="7,8" unlock="0" />
-	<Data id="1030" taskType="1" des="无尽模式魔法阵使用31.8亿魔币" parameter="3180000000" reward="7,8" unlock="0" />
-	<Data id="1031" taskType="1" des="无尽模式魔法阵使用31.8亿魔币" parameter="3180000000" reward="7,9" unlock="0" />
-	<Data id="1032" taskType="1" des="无尽模式魔法阵使用33.6亿魔币" parameter="3360000000" reward="7,9" unlock="0" />
-	<Data id="1033" taskType="1" des="无尽模式魔法阵使用35.4亿魔币" parameter="3540000000" reward="7,9" unlock="0" />
-	<Data id="1034" taskType="1" des="无尽模式魔法阵使用37.2亿魔币" parameter="3720000000" reward="7,9" unlock="0" />
-	<Data id="1035" taskType="1" des="无尽模式魔法阵使用39亿魔币" parameter="3900000000" reward="7,9" unlock="0" />
-	<Data id="1036" taskType="1" des="无尽模式魔法阵使用41亿魔币" parameter="4100000000" reward="7,10" unlock="0" />
-	<Data id="1037" taskType="1" des="无尽模式魔法阵使用43亿魔币" parameter="4300000000" reward="7,10" unlock="0" />
-	<Data id="1038" taskType="1" des="无尽模式魔法阵使用45亿魔币" parameter="4500000000" reward="7,10" unlock="0" />
-	<Data id="1039" taskType="1" des="无尽模式魔法阵使用47亿魔币" parameter="4700000000" reward="7,10" unlock="0" />
-	<Data id="1040" taskType="1" des="无尽模式魔法阵使用49亿魔币" parameter="4900000000" reward="7,10" unlock="0" />
-	<Data id="2001" taskType="2" des="战斗中获得100魔导石" parameter="100" reward="3,2" unlock="1" />
-	<Data id="2002" taskType="2" des="战斗中获得300魔导石" parameter="300" reward="3,4" unlock="1" />
-	<Data id="2003" taskType="2" des="战斗中获得800魔导石" parameter="800" reward="3,10" unlock="1" />
-	<Data id="2004" taskType="2" des="战斗中获得1800魔导石" parameter="1800" reward="3,20" unlock="1" />
-	<Data id="2005" taskType="2" des="战斗中获得4800魔导石" parameter="4800" reward="3,60" unlock="1" />
-	<Data id="2006" taskType="2" des="战斗中获得9800魔导石" parameter="9800" reward="3,100" unlock="1" />
-	<Data id="2007" taskType="2" des="战斗中获得15800魔导石" parameter="15800" reward="3,120" unlock="1" />
-	<Data id="2008" taskType="2" des="战斗中获得58800魔导石" parameter="58800" reward="3,860" unlock="1" />
-	<Data id="2009" taskType="2" des="战斗中获得128800魔导石" parameter="128800" reward="31,400" unlock="1" />
-	<Data id="2010" taskType="2" des="战斗中获得288000魔导石" parameter="288000" reward="33,188" unlock="1" />
-	<Data id="2011" taskType="2" des="战斗中获得488800魔导石" parameter="488800" reward="34,000" unlock="1" />
-	<Data id="2012" taskType="2" des="战斗中获得888888魔导石" parameter="888888" reward="38,000" unlock="1" />
-	<Data id="2013" taskType="2" des="战斗中获得1388888魔导石" parameter="1388888" reward="310,000" unlock="1" />
-	<Data id="3001" taskType="3" des="今日充值6元" parameter="6" reward="8,3" unlock="0" />
-	<Data id="3002" taskType="3" des="今日充值28元" parameter="28" reward="8,5" unlock="0" />
-	<Data id="3003" taskType="3" des="今日充值68元" parameter="68" reward="8,10" unlock="0" />
-	<Data id="3004" taskType="3" des="今日充值128元" parameter="128" reward="8,15" unlock="0" />
-	<Data id="3005" taskType="3" des="今日充值188元" parameter="188" reward="8,20" unlock="0" />
-	<Data id="3006" taskType="3" des="今日充值288元" parameter="288" reward="8,30" unlock="0" />
-	<Data id="3007" taskType="3" des="今日充值588元" parameter="588" reward="8,50" unlock="0" />
+	<Data id="1001" taskType="1" des="taskDesc_1001" beizhu="无尽模式魔法阵使用2000万魔币" parameter="20000000" reward="7,1" unlock="0" />
+	<Data id="1002" taskType="1" des="taskDesc_1002" beizhu="无尽模式魔法阵使用4000万魔币" parameter="40000000" reward="7,1" unlock="0" />
+	<Data id="1003" taskType="1" des="taskDesc_1003" beizhu="无尽模式魔法阵使用6000万魔币" parameter="60000000" reward="7,1" unlock="0" />
+	<Data id="1004" taskType="1" des="taskDesc_1004" beizhu="无尽模式魔法阵使用1亿魔币" parameter="100000000" reward="7,2" unlock="0" />
+	<Data id="1005" taskType="1" des="taskDesc_1005" beizhu="无尽模式魔法阵使用1.4亿魔币" parameter="140000000" reward="7,2" unlock="0" />
+	<Data id="1006" taskType="1" des="taskDesc_1006" beizhu="无尽模式魔法阵使用1.8亿魔币" parameter="180000000" reward="7,2" unlock="0" />
+	<Data id="1007" taskType="1" des="taskDesc_1007" beizhu="无尽模式魔法阵使用2.4亿魔币" parameter="240000000" reward="7,3" unlock="0" />
+	<Data id="1008" taskType="1" des="taskDesc_1008" beizhu="无尽模式魔法阵使用3.6亿魔币" parameter="360000000" reward="7,3" unlock="0" />
+	<Data id="1009" taskType="1" des="taskDesc_1009" beizhu="无尽模式魔法阵使用4.4亿魔币" parameter="440000000" reward="7,3" unlock="0" />
+	<Data id="1010" taskType="1" des="taskDesc_1010" beizhu="无尽模式魔法阵使用5.2亿魔币" parameter="520000000" reward="7,4" unlock="0" />
+	<Data id="1011" taskType="1" des="taskDesc_1011" beizhu="无尽模式魔法阵使用6亿魔币" parameter="600000000" reward="7,4" unlock="0" />
+	<Data id="1012" taskType="1" des="taskDesc_1012" beizhu="无尽模式魔法阵使用7亿魔币" parameter="700000000" reward="7,4" unlock="0" />
+	<Data id="1013" taskType="1" des="taskDesc_1013" beizhu="无尽模式魔法阵使用8亿魔币" parameter="800000000" reward="7,5" unlock="0" />
+	<Data id="1014" taskType="1" des="taskDesc_1014" beizhu="无尽模式魔法阵使用9亿魔币" parameter="900000000" reward="7,5" unlock="0" />
+	<Data id="1015" taskType="1" des="taskDesc_1015" beizhu="无尽模式魔法阵使用12亿魔币" parameter="1200000000" reward="7,5" unlock="0" />
+	<Data id="1016" taskType="1" des="taskDesc_1016" beizhu="无尽模式魔法阵使用11.4亿魔币" parameter="1140000000" reward="7,6" unlock="0" />
+	<Data id="1017" taskType="1" des="taskDesc_1017" beizhu="无尽模式魔法阵使用12.6亿魔币" parameter="1260000000" reward="7,6" unlock="0" />
+	<Data id="1018" taskType="1" des="taskDesc_1018" beizhu="无尽模式魔法阵使用13.8亿魔币" parameter="1380000000" reward="7,6" unlock="0" />
+	<Data id="1019" taskType="1" des="taskDesc_1019" beizhu="无尽模式魔法阵使用15亿魔币" parameter="1500000000" reward="7,6" unlock="0" />
+	<Data id="1020" taskType="1" des="taskDesc_1020" beizhu="无尽模式魔法阵使用16.4亿魔币" parameter="1640000000" reward="7,6" unlock="0" />
+	<Data id="1021" taskType="1" des="taskDesc_1021" beizhu="无尽模式魔法阵使用17.8亿魔币" parameter="1780000000" reward="7,7" unlock="0" />
+	<Data id="1022" taskType="1" des="taskDesc_1022" beizhu="无尽模式魔法阵使用19.2亿魔币" parameter="1920000000" reward="7,7" unlock="0" />
+	<Data id="1023" taskType="1" des="taskDesc_1023" beizhu="无尽模式魔法阵使用20.6亿魔币" parameter="2060000000" reward="7,7" unlock="0" />
+	<Data id="1024" taskType="1" des="taskDesc_1024" beizhu="无尽模式魔法阵使用22亿魔币" parameter="2200000000" reward="7,7" unlock="0" />
+	<Data id="1025" taskType="1" des="taskDesc_1025" beizhu="无尽模式魔法阵使用23.6亿魔币" parameter="2360000000" reward="7,7" unlock="0" />
+	<Data id="1026" taskType="1" des="taskDesc_1026" beizhu="无尽模式魔法阵使用25.2亿魔币" parameter="2520000000" reward="7,8" unlock="0" />
+	<Data id="1027" taskType="1" des="taskDesc_1027" beizhu="无尽模式魔法阵使用26.8亿魔币" parameter="2680000000" reward="7,8" unlock="0" />
+	<Data id="1028" taskType="1" des="taskDesc_1028" beizhu="无尽模式魔法阵使用28.4亿魔币" parameter="2840000000" reward="7,8" unlock="0" />
+	<Data id="1029" taskType="1" des="taskDesc_1029" beizhu="无尽模式魔法阵使用30亿魔币" parameter="3000000000" reward="7,8" unlock="0" />
+	<Data id="1030" taskType="1" des="taskDesc_1030" beizhu="无尽模式魔法阵使用31.8亿魔币" parameter="3180000000" reward="7,8" unlock="0" />
+	<Data id="1031" taskType="1" des="taskDesc_1031" beizhu="无尽模式魔法阵使用31.8亿魔币" parameter="3180000000" reward="7,9" unlock="0" />
+	<Data id="1032" taskType="1" des="taskDesc_1032" beizhu="无尽模式魔法阵使用33.6亿魔币" parameter="3360000000" reward="7,9" unlock="0" />
+	<Data id="1033" taskType="1" des="taskDesc_1033" beizhu="无尽模式魔法阵使用35.4亿魔币" parameter="3540000000" reward="7,9" unlock="0" />
+	<Data id="1034" taskType="1" des="taskDesc_1034" beizhu="无尽模式魔法阵使用37.2亿魔币" parameter="3720000000" reward="7,9" unlock="0" />
+	<Data id="1035" taskType="1" des="taskDesc_1035" beizhu="无尽模式魔法阵使用39亿魔币" parameter="3900000000" reward="7,9" unlock="0" />
+	<Data id="1036" taskType="1" des="taskDesc_1036" beizhu="无尽模式魔法阵使用41亿魔币" parameter="4100000000" reward="7,10" unlock="0" />
+	<Data id="1037" taskType="1" des="taskDesc_1037" beizhu="无尽模式魔法阵使用43亿魔币" parameter="4300000000" reward="7,10" unlock="0" />
+	<Data id="1038" taskType="1" des="taskDesc_1038" beizhu="无尽模式魔法阵使用45亿魔币" parameter="4500000000" reward="7,10" unlock="0" />
+	<Data id="1039" taskType="1" des="taskDesc_1039" beizhu="无尽模式魔法阵使用47亿魔币" parameter="4700000000" reward="7,10" unlock="0" />
+	<Data id="1040" taskType="1" des="taskDesc_1040" beizhu="无尽模式魔法阵使用49亿魔币" parameter="4900000000" reward="7,10" unlock="0" />
+	<Data id="2001" taskType="2" des="taskDesc_2001" beizhu="战斗中获得100魔导石" parameter="100" reward="3,2" unlock="1" />
+	<Data id="2002" taskType="2" des="taskDesc_2002" beizhu="战斗中获得300魔导石" parameter="300" reward="3,4" unlock="1" />
+	<Data id="2003" taskType="2" des="taskDesc_2003" beizhu="战斗中获得800魔导石" parameter="800" reward="3,10" unlock="1" />
+	<Data id="2004" taskType="2" des="taskDesc_2004" beizhu="战斗中获得1800魔导石" parameter="1800" reward="3,20" unlock="1" />
+	<Data id="2005" taskType="2" des="taskDesc_2005" beizhu="战斗中获得4800魔导石" parameter="4800" reward="3,60" unlock="1" />
+	<Data id="2006" taskType="2" des="taskDesc_2006" beizhu="战斗中获得9800魔导石" parameter="9800" reward="3,100" unlock="1" />
+	<Data id="2007" taskType="2" des="taskDesc_2007" beizhu="战斗中获得15800魔导石" parameter="15800" reward="3,120" unlock="1" />
+	<Data id="2008" taskType="2" des="taskDesc_2008" beizhu="战斗中获得58800魔导石" parameter="58800" reward="3,860" unlock="1" />
+	<Data id="2009" taskType="2" des="taskDesc_2009" beizhu="战斗中获得128800魔导石" parameter="128800" reward="3,1400" unlock="1" />
+	<Data id="2010" taskType="2" des="taskDesc_2010" beizhu="战斗中获得288000魔导石" parameter="288000" reward="3,3188" unlock="1" />
+	<Data id="2011" taskType="2" des="taskDesc_2011" beizhu="战斗中获得488800魔导石" parameter="488800" reward="3,4000" unlock="1" />
+	<Data id="2012" taskType="2" des="taskDesc_2012" beizhu="战斗中获得888888魔导石" parameter="888888" reward="3,8000" unlock="1" />
+	<Data id="2013" taskType="2" des="taskDesc_2013" beizhu="战斗中获得1388888魔导石" parameter="1388888" reward="3,10000" unlock="1" />
+	<Data id="2014" taskType="2" des="taskDesc_2014" beizhu="战斗中获得1988888魔导石" parameter="1988888" reward="3,12000" unlock="1" />
+	<Data id="2015" taskType="2" des="taskDesc_2015" beizhu="战斗中获得2688888魔导石" parameter="2688888" reward="3,14000" unlock="1" />
+	<Data id="2016" taskType="2" des="taskDesc_2016" beizhu="战斗中获得3488888魔导石" parameter="3488888" reward="3,16000" unlock="1" />
+	<Data id="2017" taskType="2" des="taskDesc_2017" beizhu="战斗中获得4388888魔导石" parameter="4388888" reward="3,18000" unlock="1" />
+	<Data id="2018" taskType="2" des="taskDesc_2018" beizhu="战斗中获得5388888魔导石" parameter="5388888" reward="3,20000" unlock="1" />
+	<Data id="2019" taskType="2" des="taskDesc_2019" beizhu="战斗中获得6488888魔导石" parameter="6488888" reward="3,22000" unlock="1" />
+	<Data id="2020" taskType="2" des="taskDesc_2020" beizhu="战斗中获得7688888魔导石" parameter="7688888" reward="3,24000" unlock="1" />
+	<Data id="2021" taskType="2" des="taskDesc_2021" beizhu="战斗中获得8988888魔导石" parameter="8988888" reward="3,26000" unlock="1" />
+	<Data id="2022" taskType="2" des="taskDesc_2022" beizhu="战斗中获得10388888魔导石" parameter="10388888" reward="3,28000" unlock="1" />
+	<Data id="2023" taskType="2" des="taskDesc_2023" beizhu="战斗中获得11888888魔导石" parameter="11888888" reward="3,30000" unlock="1" />
+	<Data id="3001" taskType="3" des="taskDesc_3001" beizhu="今日充值6元" parameter="6" reward="8,3" unlock="0" />
+	<Data id="3002" taskType="3" des="taskDesc_3002" beizhu="今日充值28元" parameter="28" reward="8,5" unlock="0" />
+	<Data id="3003" taskType="3" des="taskDesc_3003" beizhu="今日充值68元" parameter="68" reward="8,10" unlock="0" />
+	<Data id="3004" taskType="3" des="taskDesc_3004" beizhu="今日充值128元" parameter="128" reward="8,15" unlock="0" />
+	<Data id="3005" taskType="3" des="taskDesc_3005" beizhu="今日充值188元" parameter="188" reward="8,20" unlock="0" />
+	<Data id="3006" taskType="3" des="taskDesc_3006" beizhu="今日充值288元" parameter="288" reward="8,30" unlock="0" />
+	<Data id="3007" taskType="3" des="taskDesc_3007" beizhu="今日充值588元" parameter="588" reward="8,50" unlock="0" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data id="1001" monsterId="1001" fishGroup="1" num="100" killCount="1,1" awardDropProb="50" />
@@ -386,85 +396,85 @@
 	<Data id="1016" monsterId="2004" fishGroup="8" num="20" killCount="3,3" awardDropProb="3.75" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data id="1001" monsterId="1001" sceneType="1" group="20" weight="10" maxNum="1000" killCount="1,1" awardDropProb="16" />
-	<Data id="1002" monsterId="1002" sceneType="1" group="20" weight="10" maxNum="1000" killCount="1,1" awardDropProb="16" />
-	<Data id="1003" monsterId="1003" sceneType="1" group="20" weight="9" maxNum="1000" killCount="1,1" awardDropProb="16" />
-	<Data id="1004" monsterId="1004" sceneType="1" group="20" weight="9" maxNum="1000" killCount="1,1" awardDropProb="16" />
-	<Data id="1005" monsterId="1005" sceneType="1" group="20" weight="8" maxNum="900" killCount="1,1" awardDropProb="16" />
-	<Data id="1006" monsterId="1006" sceneType="1" group="20" weight="7" maxNum="900" killCount="1,1" awardDropProb="16" />
-	<Data id="1007" monsterId="1007" sceneType="1" group="20" weight="7" maxNum="800" killCount="1,1" awardDropProb="16" />
-	<Data id="1008" monsterId="1008" sceneType="1" group="20" weight="6" maxNum="700" killCount="1,1" awardDropProb="10" />
-	<Data id="1009" monsterId="1009" sceneType="1" group="20" weight="6" maxNum="700" killCount="1,1" awardDropProb="10" />
-	<Data id="1010" monsterId="1010" sceneType="1" group="20" weight="5" maxNum="600" killCount="1,1" awardDropProb="10" />
-	<Data id="1011" monsterId="1011" sceneType="1" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="1012" monsterId="1012" sceneType="1" group="10" weight="3" maxNum="300" killCount="2,2" awardDropProb="10" />
-	<Data id="1013" monsterId="1013" sceneType="1" group="10" weight="3" maxNum="300" killCount="2,2" awardDropProb="10" />
-	<Data id="1014" monsterId="1014" sceneType="1" group="10" weight="2" maxNum="200" killCount="2,2" awardDropProb="10" />
-	<Data id="1015" monsterId="1015" sceneType="1" group="10" weight="2" maxNum="200" killCount="2,2" awardDropProb="10" />
-	<Data id="1016" monsterId="2001" sceneType="1" group="10" weight="1" maxNum="100" killCount="3,3" awardDropProb="10" />
-	<Data id="1017" monsterId="2002" sceneType="1" group="10" weight="1" maxNum="100" killCount="3,3" awardDropProb="6" />
-	<Data id="1018" monsterId="2003" sceneType="1" group="10" weight="1" maxNum="100" killCount="3,3" awardDropProb="6" />
-	<Data id="1019" monsterId="2004" sceneType="1" group="10" weight="1" maxNum="100" killCount="3,3" awardDropProb="5" />
-	<Data id="1020" monsterId="2005" sceneType="1" group="10" weight="1" maxNum="100" killCount="3,3" awardDropProb="4" />
-	<Data id="1021" monsterId="2006" sceneType="1" group="10" weight="1" maxNum="100" killCount="5,5" awardDropProb="4" />
-	<Data id="1022" monsterId="2007" sceneType="1" group="10" weight="1" maxNum="100" killCount="5,5" awardDropProb="2" />
-	<Data id="1023" monsterId="2008" sceneType="1" group="10" weight="1" maxNum="100" killCount="5,5" awardDropProb="1" />
+	<Data id="1001" monsterId="1001" sceneType="1" group="20" weight="100" maxNum="2000" killCount="1,1" awardDropProb="20" />
+	<Data id="1002" monsterId="1002" sceneType="1" group="20" weight="100" maxNum="2000" killCount="1,1" awardDropProb="20" />
+	<Data id="1003" monsterId="1003" sceneType="1" group="20" weight="100" maxNum="2000" killCount="1,1" awardDropProb="19" />
+	<Data id="1004" monsterId="1004" sceneType="1" group="20" weight="100" maxNum="2000" killCount="1,1" awardDropProb="19" />
+	<Data id="1005" monsterId="1005" sceneType="1" group="20" weight="80" maxNum="1600" killCount="1,1" awardDropProb="18" />
+	<Data id="1006" monsterId="1006" sceneType="1" group="20" weight="70" maxNum="1400" killCount="1,1" awardDropProb="18" />
+	<Data id="1007" monsterId="1007" sceneType="1" group="20" weight="70" maxNum="1400" killCount="1,1" awardDropProb="16" />
+	<Data id="1008" monsterId="1008" sceneType="1" group="20" weight="60" maxNum="1200" killCount="1,1" awardDropProb="10" />
+	<Data id="1009" monsterId="1009" sceneType="1" group="20" weight="60" maxNum="1200" killCount="1,1" awardDropProb="10" />
+	<Data id="1010" monsterId="1010" sceneType="1" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="1011" monsterId="1011" sceneType="1" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="1012" monsterId="1012" sceneType="1" group="15" weight="30" maxNum="450" killCount="2,2" awardDropProb="10" />
+	<Data id="1013" monsterId="1013" sceneType="1" group="15" weight="30" maxNum="450" killCount="2,2" awardDropProb="10" />
+	<Data id="1014" monsterId="1014" sceneType="1" group="15" weight="20" maxNum="300" killCount="2,2" awardDropProb="10" />
+	<Data id="1015" monsterId="1015" sceneType="1" group="15" weight="20" maxNum="300" killCount="2,2" awardDropProb="10" />
+	<Data id="1016" monsterId="2001" sceneType="1" group="10" weight="10" maxNum="100" killCount="3,3" awardDropProb="8" />
+	<Data id="1017" monsterId="2002" sceneType="1" group="10" weight="10" maxNum="100" killCount="3,3" awardDropProb="7" />
+	<Data id="1018" monsterId="2003" sceneType="1" group="10" weight="10" maxNum="100" killCount="3,3" awardDropProb="6" />
+	<Data id="1019" monsterId="2004" sceneType="1" group="10" weight="10" maxNum="100" killCount="3,3" awardDropProb="5" />
+	<Data id="1020" monsterId="2005" sceneType="1" group="5" weight="5" maxNum="25" killCount="3,3" awardDropProb="4" />
+	<Data id="1021" monsterId="2006" sceneType="1" group="5" weight="5" maxNum="25" killCount="5,5" awardDropProb="3" />
+	<Data id="1022" monsterId="2007" sceneType="1" group="5" weight="5" maxNum="25" killCount="5,5" awardDropProb="2" />
+	<Data id="1023" monsterId="2008" sceneType="1" group="5" weight="5" maxNum="25" killCount="5,5" awardDropProb="1" />
 	<Data id="1024" monsterId="3001" sceneType="1" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="50" />
 	<Data id="1025" monsterId="3002" sceneType="1" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="25" />
 	<Data id="1026" monsterId="3003" sceneType="1" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="16.6" />
 	<Data id="1027" monsterId="3004" sceneType="1" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="12.5" />
 	<Data id="1028" monsterId="3005" sceneType="1" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="10" />
-	<Data id="2001" monsterId="1001" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2002" monsterId="1002" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2003" monsterId="1003" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2004" monsterId="1004" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2005" monsterId="1005" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2006" monsterId="1006" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2007" monsterId="1007" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2008" monsterId="1008" sceneType="2" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2009" monsterId="1009" sceneType="2" group="20" weight="4" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="2010" monsterId="1010" sceneType="2" group="20" weight="3" maxNum="500" killCount="2,2" awardDropProb="16" />
-	<Data id="2011" monsterId="1011" sceneType="2" group="20" weight="3" maxNum="300" killCount="2,2" awardDropProb="16" />
-	<Data id="2012" monsterId="1012" sceneType="2" group="10" weight="10" maxNum="1000" killCount="3,3" awardDropProb="16" />
-	<Data id="2013" monsterId="1013" sceneType="2" group="10" weight="10" maxNum="1000" killCount="3,3" awardDropProb="16" />
-	<Data id="2014" monsterId="1014" sceneType="2" group="10" weight="10" maxNum="1000" killCount="3,3" awardDropProb="16" />
-	<Data id="2015" monsterId="1015" sceneType="2" group="10" weight="10" maxNum="1000" killCount="3,3" awardDropProb="15" />
-	<Data id="2016" monsterId="2001" sceneType="2" group="10" weight="2" maxNum="200" killCount="4,4" awardDropProb="10" />
-	<Data id="2017" monsterId="2002" sceneType="2" group="10" weight="2" maxNum="200" killCount="4,4" awardDropProb="5" />
-	<Data id="2018" monsterId="2003" sceneType="2" group="10" weight="1" maxNum="100" killCount="4,4" awardDropProb="5" />
-	<Data id="2019" monsterId="2004" sceneType="2" group="10" weight="1" maxNum="100" killCount="4,4" awardDropProb="5" />
-	<Data id="2020" monsterId="2005" sceneType="2" group="10" weight="1" maxNum="100" killCount="4,4" awardDropProb="4" />
-	<Data id="2021" monsterId="2006" sceneType="2" group="10" weight="1" maxNum="100" killCount="5,5" awardDropProb="4" />
-	<Data id="2022" monsterId="2007" sceneType="2" group="10" weight="1" maxNum="100" killCount="5,5" awardDropProb="2" />
-	<Data id="2023" monsterId="2008" sceneType="2" group="10" weight="1" maxNum="100" killCount="5,5" awardDropProb="1" />
+	<Data id="2001" monsterId="1001" sceneType="2" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="2002" monsterId="1002" sceneType="2" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="2003" monsterId="1003" sceneType="2" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="2004" monsterId="1004" sceneType="2" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="2005" monsterId="1005" sceneType="2" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="2006" monsterId="1006" sceneType="2" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="10" />
+	<Data id="2007" monsterId="1007" sceneType="2" group="15" weight="50" maxNum="750" killCount="1,1" awardDropProb="10" />
+	<Data id="2008" monsterId="1008" sceneType="2" group="15" weight="50" maxNum="750" killCount="1,1" awardDropProb="10" />
+	<Data id="2009" monsterId="1009" sceneType="2" group="15" weight="40" maxNum="600" killCount="1,1" awardDropProb="10" />
+	<Data id="2010" monsterId="1010" sceneType="2" group="15" weight="30" maxNum="450" killCount="2,2" awardDropProb="16" />
+	<Data id="2011" monsterId="1011" sceneType="2" group="15" weight="30" maxNum="450" killCount="2,2" awardDropProb="16" />
+	<Data id="2012" monsterId="1012" sceneType="2" group="20" weight="100" maxNum="2000" killCount="3,3" awardDropProb="16" />
+	<Data id="2013" monsterId="1013" sceneType="2" group="20" weight="100" maxNum="2000" killCount="3,3" awardDropProb="16" />
+	<Data id="2014" monsterId="1014" sceneType="2" group="20" weight="100" maxNum="2000" killCount="3,3" awardDropProb="16" />
+	<Data id="2015" monsterId="1015" sceneType="2" group="20" weight="100" maxNum="2000" killCount="3,3" awardDropProb="15" />
+	<Data id="2016" monsterId="2001" sceneType="2" group="10" weight="20" maxNum="200" killCount="4,4" awardDropProb="10" />
+	<Data id="2017" monsterId="2002" sceneType="2" group="10" weight="20" maxNum="200" killCount="4,4" awardDropProb="5" />
+	<Data id="2018" monsterId="2003" sceneType="2" group="10" weight="10" maxNum="100" killCount="4,4" awardDropProb="5" />
+	<Data id="2019" monsterId="2004" sceneType="2" group="10" weight="10" maxNum="100" killCount="4,4" awardDropProb="5" />
+	<Data id="2020" monsterId="2005" sceneType="2" group="5" weight="5" maxNum="25" killCount="4,4" awardDropProb="4" />
+	<Data id="2021" monsterId="2006" sceneType="2" group="5" weight="5" maxNum="25" killCount="5,5" awardDropProb="4" />
+	<Data id="2022" monsterId="2007" sceneType="2" group="5" weight="5" maxNum="25" killCount="5,5" awardDropProb="2" />
+	<Data id="2023" monsterId="2008" sceneType="2" group="5" weight="5" maxNum="25" killCount="5,5" awardDropProb="1" />
 	<Data id="2024" monsterId="3006" sceneType="2" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="50" />
 	<Data id="2025" monsterId="3007" sceneType="2" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="25" />
 	<Data id="2026" monsterId="3008" sceneType="2" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="16.6" />
 	<Data id="2027" monsterId="3009" sceneType="2" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="12.5" />
 	<Data id="2028" monsterId="3010" sceneType="2" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="10" />
-	<Data id="3001" monsterId="1001" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3002" monsterId="1002" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3003" monsterId="1003" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3004" monsterId="1004" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3005" monsterId="1005" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3006" monsterId="1006" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3007" monsterId="1007" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="16" />
-	<Data id="3008" monsterId="1008" sceneType="3" group="20" weight="5" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="3009" monsterId="1009" sceneType="3" group="20" weight="4" maxNum="500" killCount="1,1" awardDropProb="10" />
-	<Data id="3010" monsterId="1010" sceneType="3" group="20" weight="3" maxNum="500" killCount="2,2" awardDropProb="10" />
-	<Data id="3011" monsterId="1011" sceneType="3" group="20" weight="3" maxNum="300" killCount="2,2" awardDropProb="10" />
-	<Data id="3012" monsterId="1012" sceneType="3" group="10" weight="3" maxNum="300" killCount="3,3" awardDropProb="10" />
-	<Data id="3013" monsterId="1013" sceneType="3" group="10" weight="2" maxNum="200" killCount="3,3" awardDropProb="10" />
-	<Data id="3014" monsterId="1014" sceneType="3" group="10" weight="2" maxNum="200" killCount="3,3" awardDropProb="10" />
-	<Data id="3015" monsterId="1015" sceneType="3" group="10" weight="2" maxNum="200" killCount="3,3" awardDropProb="10" />
-	<Data id="3016" monsterId="2001" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="8" />
-	<Data id="3017" monsterId="2002" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="8" />
-	<Data id="3018" monsterId="2003" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="8" />
-	<Data id="3019" monsterId="2004" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="5" />
-	<Data id="3020" monsterId="2005" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="4" />
-	<Data id="3021" monsterId="2006" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="3" />
-	<Data id="3022" monsterId="2007" sceneType="3" group="10" weight="6" maxNum="600" killCount="5,5" awardDropProb="2" />
-	<Data id="3023" monsterId="2008" sceneType="3" group="10" weight="5" maxNum="500" killCount="5,5" awardDropProb="2" />
+	<Data id="3001" monsterId="1001" sceneType="3" group="20" weight="60" maxNum="1200" killCount="1,1" awardDropProb="16" />
+	<Data id="3002" monsterId="1002" sceneType="3" group="20" weight="60" maxNum="1200" killCount="1,1" awardDropProb="16" />
+	<Data id="3003" monsterId="1003" sceneType="3" group="20" weight="60" maxNum="1200" killCount="1,1" awardDropProb="16" />
+	<Data id="3004" monsterId="1004" sceneType="3" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="16" />
+	<Data id="3005" monsterId="1005" sceneType="3" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="16" />
+	<Data id="3006" monsterId="1006" sceneType="3" group="20" weight="50" maxNum="1000" killCount="1,1" awardDropProb="16" />
+	<Data id="3007" monsterId="1007" sceneType="3" group="20" weight="40" maxNum="800" killCount="1,1" awardDropProb="16" />
+	<Data id="3008" monsterId="1008" sceneType="3" group="20" weight="40" maxNum="800" killCount="1,1" awardDropProb="10" />
+	<Data id="3009" monsterId="1009" sceneType="3" group="20" weight="40" maxNum="800" killCount="1,1" awardDropProb="10" />
+	<Data id="3010" monsterId="1010" sceneType="3" group="20" weight="30" maxNum="600" killCount="2,2" awardDropProb="10" />
+	<Data id="3011" monsterId="1011" sceneType="3" group="20" weight="30" maxNum="600" killCount="2,2" awardDropProb="10" />
+	<Data id="3012" monsterId="1012" sceneType="3" group="15" weight="30" maxNum="450" killCount="3,3" awardDropProb="10" />
+	<Data id="3013" monsterId="1013" sceneType="3" group="15" weight="20" maxNum="300" killCount="3,3" awardDropProb="10" />
+	<Data id="3014" monsterId="1014" sceneType="3" group="15" weight="20" maxNum="300" killCount="3,3" awardDropProb="10" />
+	<Data id="3015" monsterId="1015" sceneType="3" group="15" weight="20" maxNum="300" killCount="3,3" awardDropProb="10" />
+	<Data id="3016" monsterId="2001" sceneType="3" group="15" weight="50" maxNum="750" killCount="4,4" awardDropProb="8" />
+	<Data id="3017" monsterId="2002" sceneType="3" group="15" weight="50" maxNum="750" killCount="4,4" awardDropProb="8" />
+	<Data id="3018" monsterId="2003" sceneType="3" group="15" weight="50" maxNum="750" killCount="4,4" awardDropProb="8" />
+	<Data id="3019" monsterId="2004" sceneType="3" group="15" weight="50" maxNum="750" killCount="5,5" awardDropProb="5" />
+	<Data id="3020" monsterId="2005" sceneType="3" group="10" weight="50" maxNum="500" killCount="5,5" awardDropProb="4" />
+	<Data id="3021" monsterId="2006" sceneType="3" group="10" weight="50" maxNum="500" killCount="5,5" awardDropProb="3" />
+	<Data id="3022" monsterId="2007" sceneType="3" group="10" weight="50" maxNum="500" killCount="5,5" awardDropProb="2" />
+	<Data id="3023" monsterId="2008" sceneType="3" group="10" weight="50" maxNum="500" killCount="5,5" awardDropProb="2" />
 	<Data id="3024" monsterId="3001" sceneType="3" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="50" />
 	<Data id="3025" monsterId="3002" sceneType="3" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="25" />
 	<Data id="3026" monsterId="3003" sceneType="3" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="16.6" />
@@ -477,56 +487,156 @@
 	<Data id="3033" monsterId="3010" sceneType="3" group="1" weight="1" maxNum="1" killCount="50,50" awardDropProb="10" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data id="1000" leve="1" upExp="10" monsterNum="10" speed="1" />
-	<Data id="1001" leve="2" upExp="20" monsterNum="20" speed="1" />
-	<Data id="1002" leve="3" upExp="30" monsterNum="30" speed="1" />
-	<Data id="1003" leve="4" upExp="40" monsterNum="40" speed="1" />
-	<Data id="1004" leve="5" upExp="50" monsterNum="50" speed="1" />
-	<Data id="1005" leve="6" upExp="60" monsterNum="60" speed="1.1" />
-	<Data id="1006" leve="7" upExp="70" monsterNum="70" speed="1.1" />
-	<Data id="1007" leve="8" upExp="80" monsterNum="80" speed="1.1" />
-	<Data id="1008" leve="9" upExp="90" monsterNum="90" speed="1.1" />
-	<Data id="1009" leve="10" upExp="100" monsterNum="100" speed="1.1" />
-	<Data id="1010" leve="11" upExp="110" monsterNum="110" speed="1.2" />
-	<Data id="1011" leve="12" upExp="120" monsterNum="120" speed="1.2" />
-	<Data id="1012" leve="13" upExp="130" monsterNum="130" speed="1.2" />
-	<Data id="1013" leve="14" upExp="140" monsterNum="140" speed="1.2" />
-	<Data id="1014" leve="15" upExp="150" monsterNum="150" speed="1.2" />
-	<Data id="1015" leve="16" upExp="160" monsterNum="160" speed="1.3" />
-	<Data id="1016" leve="17" upExp="170" monsterNum="170" speed="1.3" />
-	<Data id="1017" leve="18" upExp="180" monsterNum="180" speed="1.3" />
-	<Data id="1018" leve="19" upExp="190" monsterNum="190" speed="1.3" />
-	<Data id="1019" leve="20" upExp="200" monsterNum="200" speed="1.3" />
-	<Data id="1020" leve="21" upExp="210" monsterNum="200" speed="1.4" />
-	<Data id="1021" leve="22" upExp="220" monsterNum="200" speed="1.4" />
-	<Data id="1022" leve="23" upExp="230" monsterNum="200" speed="1.4" />
-	<Data id="1023" leve="24" upExp="240" monsterNum="200" speed="1.4" />
-	<Data id="1024" leve="25" upExp="250" monsterNum="200" speed="1.4" />
-	<Data id="1025" leve="26" upExp="260" monsterNum="200" speed="1.5" />
-	<Data id="1026" leve="27" upExp="270" monsterNum="200" speed="1.5" />
-	<Data id="1027" leve="28" upExp="280" monsterNum="200" speed="1.5" />
-	<Data id="1028" leve="29" upExp="290" monsterNum="200" speed="1.5" />
-	<Data id="1029" leve="30" upExp="300" monsterNum="200" speed="1.5" />
-	<Data id="1030" leve="31" upExp="310" monsterNum="200" speed="1.6" />
-	<Data id="1031" leve="32" upExp="320" monsterNum="200" speed="1.6" />
-	<Data id="1032" leve="33" upExp="330" monsterNum="200" speed="1.6" />
-	<Data id="1033" leve="34" upExp="340" monsterNum="200" speed="1.6" />
-	<Data id="1034" leve="35" upExp="350" monsterNum="200" speed="1.6" />
-	<Data id="1035" leve="36" upExp="360" monsterNum="200" speed="1.7" />
-	<Data id="1036" leve="37" upExp="370" monsterNum="200" speed="1.7" />
-	<Data id="1037" leve="38" upExp="380" monsterNum="200" speed="1.7" />
-	<Data id="1038" leve="39" upExp="390" monsterNum="200" speed="1.7" />
-	<Data id="1039" leve="40" upExp="400" monsterNum="200" speed="1.7" />
-	<Data id="1040" leve="41" upExp="410" monsterNum="200" speed="1.8" />
-	<Data id="1041" leve="42" upExp="420" monsterNum="200" speed="1.8" />
-	<Data id="1042" leve="43" upExp="430" monsterNum="200" speed="1.8" />
-	<Data id="1043" leve="44" upExp="440" monsterNum="200" speed="1.8" />
-	<Data id="1044" leve="45" upExp="450" monsterNum="200" speed="1.8" />
-	<Data id="1045" leve="46" upExp="460" monsterNum="200" speed="1.9" />
-	<Data id="1046" leve="47" upExp="470" monsterNum="200" speed="1.9" />
-	<Data id="1047" leve="48" upExp="480" monsterNum="200" speed="1.9" />
-	<Data id="1048" leve="49" upExp="490" monsterNum="200" speed="1.9" />
-	<Data id="1048" leve="50" upExp="500" monsterNum="200" speed="1.9" />
+	<Data id="1000" leve="1" upExp="10" monsterNum="5" speed="1" />
+	<Data id="1001" leve="2" upExp="50" monsterNum="10" speed="1" />
+	<Data id="1002" leve="3" upExp="75" monsterNum="15" speed="1" />
+	<Data id="1003" leve="4" upExp="100" monsterNum="20" speed="1" />
+	<Data id="1004" leve="5" upExp="125" monsterNum="25" speed="1" />
+	<Data id="1005" leve="6" upExp="150" monsterNum="30" speed="1.1" />
+	<Data id="1006" leve="7" upExp="175" monsterNum="35" speed="1.1" />
+	<Data id="1007" leve="8" upExp="200" monsterNum="40" speed="1.1" />
+	<Data id="1008" leve="9" upExp="225" monsterNum="45" speed="1.1" />
+	<Data id="1009" leve="10" upExp="250" monsterNum="50" speed="1.1" />
+	<Data id="1010" leve="11" upExp="275" monsterNum="55" speed="1.2" />
+	<Data id="1011" leve="12" upExp="300" monsterNum="60" speed="1.2" />
+	<Data id="1012" leve="13" upExp="325" monsterNum="65" speed="1.2" />
+	<Data id="1013" leve="14" upExp="350" monsterNum="70" speed="1.2" />
+	<Data id="1014" leve="15" upExp="375" monsterNum="75" speed="1.2" />
+	<Data id="1015" leve="16" upExp="400" monsterNum="80" speed="1.3" />
+	<Data id="1016" leve="17" upExp="425" monsterNum="85" speed="1.3" />
+	<Data id="1017" leve="18" upExp="450" monsterNum="90" speed="1.3" />
+	<Data id="1018" leve="19" upExp="475" monsterNum="95" speed="1.3" />
+	<Data id="1019" leve="20" upExp="500" monsterNum="100" speed="1.3" />
+	<Data id="1020" leve="21" upExp="525" monsterNum="100" speed="1.4" />
+	<Data id="1021" leve="22" upExp="550" monsterNum="100" speed="1.4" />
+	<Data id="1022" leve="23" upExp="575" monsterNum="100" speed="1.4" />
+	<Data id="1023" leve="24" upExp="600" monsterNum="100" speed="1.4" />
+	<Data id="1024" leve="25" upExp="625" monsterNum="100" speed="1.4" />
+	<Data id="1025" leve="26" upExp="650" monsterNum="100" speed="1.5" />
+	<Data id="1026" leve="27" upExp="675" monsterNum="100" speed="1.5" />
+	<Data id="1027" leve="28" upExp="700" monsterNum="100" speed="1.5" />
+	<Data id="1028" leve="29" upExp="725" monsterNum="100" speed="1.5" />
+	<Data id="1029" leve="30" upExp="750" monsterNum="100" speed="1.5" />
+	<Data id="1030" leve="31" upExp="775" monsterNum="100" speed="1.6" />
+	<Data id="1031" leve="32" upExp="800" monsterNum="100" speed="1.6" />
+	<Data id="1032" leve="33" upExp="825" monsterNum="100" speed="1.6" />
+	<Data id="1033" leve="34" upExp="850" monsterNum="100" speed="1.6" />
+	<Data id="1034" leve="35" upExp="875" monsterNum="100" speed="1.6" />
+	<Data id="1035" leve="36" upExp="900" monsterNum="100" speed="1.7" />
+	<Data id="1036" leve="37" upExp="925" monsterNum="100" speed="1.7" />
+	<Data id="1037" leve="38" upExp="950" monsterNum="100" speed="1.7" />
+	<Data id="1038" leve="39" upExp="975" monsterNum="100" speed="1.7" />
+	<Data id="1039" leve="40" upExp="1000" monsterNum="100" speed="1.7" />
+	<Data id="1040" leve="41" upExp="1025" monsterNum="100" speed="1.8" />
+	<Data id="1041" leve="42" upExp="1050" monsterNum="100" speed="1.8" />
+	<Data id="1042" leve="43" upExp="1075" monsterNum="100" speed="1.8" />
+	<Data id="1043" leve="44" upExp="1100" monsterNum="100" speed="1.8" />
+	<Data id="1044" leve="45" upExp="1125" monsterNum="100" speed="1.8" />
+	<Data id="1045" leve="46" upExp="1150" monsterNum="100" speed="1.9" />
+	<Data id="1046" leve="47" upExp="1175" monsterNum="100" speed="1.9" />
+	<Data id="1047" leve="48" upExp="1200" monsterNum="100" speed="1.9" />
+	<Data id="1048" leve="49" upExp="1225" monsterNum="100" speed="1.9" />
+	<Data id="1049" leve="50" upExp="1250" monsterNum="100" speed="1.9" />
+	<Data id="1050" leve="51" upExp="1275" monsterNum="100" speed="1.9" />
+	<Data id="1051" leve="52" upExp="1300" monsterNum="100" speed="1.9" />
+	<Data id="1052" leve="53" upExp="1325" monsterNum="100" speed="1.9" />
+	<Data id="1053" leve="54" upExp="1350" monsterNum="100" speed="1.9" />
+	<Data id="1054" leve="55" upExp="1375" monsterNum="100" speed="1.9" />
+	<Data id="1055" leve="56" upExp="1400" monsterNum="100" speed="1.9" />
+	<Data id="1056" leve="57" upExp="1425" monsterNum="100" speed="1.9" />
+	<Data id="1057" leve="58" upExp="1450" monsterNum="100" speed="1.9" />
+	<Data id="1058" leve="59" upExp="1475" monsterNum="100" speed="1.9" />
+	<Data id="1059" leve="60" upExp="1500" monsterNum="100" speed="1.9" />
+	<Data id="1060" leve="61" upExp="1525" monsterNum="100" speed="1.9" />
+	<Data id="1061" leve="62" upExp="1550" monsterNum="100" speed="1.9" />
+	<Data id="1062" leve="63" upExp="1575" monsterNum="100" speed="1.9" />
+	<Data id="1063" leve="64" upExp="1600" monsterNum="100" speed="1.9" />
+	<Data id="1064" leve="65" upExp="1625" monsterNum="100" speed="1.9" />
+	<Data id="1065" leve="66" upExp="1650" monsterNum="100" speed="1.9" />
+	<Data id="1066" leve="67" upExp="1675" monsterNum="100" speed="1.9" />
+	<Data id="1067" leve="68" upExp="1700" monsterNum="100" speed="1.9" />
+	<Data id="1068" leve="69" upExp="1725" monsterNum="100" speed="1.9" />
+	<Data id="1069" leve="70" upExp="1750" monsterNum="100" speed="1.9" />
+	<Data id="1070" leve="71" upExp="1775" monsterNum="100" speed="1.9" />
+	<Data id="1071" leve="72" upExp="1800" monsterNum="100" speed="1.9" />
+	<Data id="1072" leve="73" upExp="1825" monsterNum="100" speed="1.9" />
+	<Data id="1073" leve="74" upExp="1850" monsterNum="100" speed="1.9" />
+	<Data id="1074" leve="75" upExp="1875" monsterNum="100" speed="1.9" />
+	<Data id="1075" leve="76" upExp="1900" monsterNum="100" speed="1.9" />
+	<Data id="1076" leve="77" upExp="1925" monsterNum="100" speed="1.9" />
+	<Data id="1077" leve="78" upExp="1950" monsterNum="100" speed="1.9" />
+	<Data id="1078" leve="79" upExp="1975" monsterNum="100" speed="1.9" />
+	<Data id="1079" leve="80" upExp="2000" monsterNum="100" speed="1.9" />
+	<Data id="1080" leve="81" upExp="2025" monsterNum="100" speed="1.9" />
+	<Data id="1081" leve="82" upExp="2050" monsterNum="100" speed="1.9" />
+	<Data id="1082" leve="83" upExp="2075" monsterNum="100" speed="1.9" />
+	<Data id="1083" leve="84" upExp="2100" monsterNum="100" speed="1.9" />
+	<Data id="1084" leve="85" upExp="2125" monsterNum="100" speed="1.9" />
+	<Data id="1085" leve="86" upExp="2150" monsterNum="100" speed="1.9" />
+	<Data id="1086" leve="87" upExp="2175" monsterNum="100" speed="1.9" />
+	<Data id="1087" leve="88" upExp="2200" monsterNum="100" speed="1.9" />
+	<Data id="1088" leve="89" upExp="2225" monsterNum="100" speed="1.9" />
+	<Data id="1089" leve="90" upExp="2250" monsterNum="100" speed="1.9" />
+	<Data id="1090" leve="91" upExp="2275" monsterNum="100" speed="1.9" />
+	<Data id="1091" leve="92" upExp="2300" monsterNum="100" speed="1.9" />
+	<Data id="1092" leve="93" upExp="2325" monsterNum="100" speed="1.9" />
+	<Data id="1093" leve="94" upExp="2350" monsterNum="100" speed="1.9" />
+	<Data id="1094" leve="95" upExp="2375" monsterNum="100" speed="1.9" />
+	<Data id="1095" leve="96" upExp="2400" monsterNum="100" speed="1.9" />
+	<Data id="1096" leve="97" upExp="2425" monsterNum="100" speed="1.9" />
+	<Data id="1097" leve="98" upExp="2450" monsterNum="100" speed="1.9" />
+	<Data id="1098" leve="99" upExp="2475" monsterNum="100" speed="1.9" />
+	<Data id="1099" leve="100" upExp="2500" monsterNum="100" speed="1.9" />
+	<Data id="1100" leve="101" upExp="2525" monsterNum="100" speed="1.9" />
+	<Data id="1101" leve="102" upExp="2550" monsterNum="100" speed="1.9" />
+	<Data id="1102" leve="103" upExp="2575" monsterNum="100" speed="1.9" />
+	<Data id="1103" leve="104" upExp="2600" monsterNum="100" speed="1.9" />
+	<Data id="1104" leve="105" upExp="2625" monsterNum="100" speed="1.9" />
+	<Data id="1105" leve="106" upExp="2650" monsterNum="100" speed="1.9" />
+	<Data id="1106" leve="107" upExp="2675" monsterNum="100" speed="1.9" />
+	<Data id="1107" leve="108" upExp="2700" monsterNum="100" speed="1.9" />
+	<Data id="1108" leve="109" upExp="2725" monsterNum="100" speed="1.9" />
+	<Data id="1109" leve="110" upExp="2750" monsterNum="100" speed="1.9" />
+	<Data id="1110" leve="111" upExp="2775" monsterNum="100" speed="1.9" />
+	<Data id="1111" leve="112" upExp="2800" monsterNum="100" speed="1.9" />
+	<Data id="1112" leve="113" upExp="2825" monsterNum="100" speed="1.9" />
+	<Data id="1113" leve="114" upExp="2850" monsterNum="100" speed="1.9" />
+	<Data id="1114" leve="115" upExp="2875" monsterNum="100" speed="1.9" />
+	<Data id="1115" leve="116" upExp="2900" monsterNum="100" speed="1.9" />
+	<Data id="1116" leve="117" upExp="2925" monsterNum="100" speed="1.9" />
+	<Data id="1117" leve="118" upExp="2950" monsterNum="100" speed="1.9" />
+	<Data id="1118" leve="119" upExp="2975" monsterNum="100" speed="1.9" />
+	<Data id="1119" leve="120" upExp="3000" monsterNum="100" speed="1.9" />
+	<Data id="1120" leve="121" upExp="3025" monsterNum="100" speed="1.9" />
+	<Data id="1121" leve="122" upExp="3050" monsterNum="100" speed="1.9" />
+	<Data id="1122" leve="123" upExp="3075" monsterNum="100" speed="1.9" />
+	<Data id="1123" leve="124" upExp="3100" monsterNum="100" speed="1.9" />
+	<Data id="1124" leve="125" upExp="3125" monsterNum="100" speed="1.9" />
+	<Data id="1125" leve="126" upExp="3150" monsterNum="100" speed="1.9" />
+	<Data id="1126" leve="127" upExp="3175" monsterNum="100" speed="1.9" />
+	<Data id="1127" leve="128" upExp="3200" monsterNum="100" speed="1.9" />
+	<Data id="1128" leve="129" upExp="3225" monsterNum="100" speed="1.9" />
+	<Data id="1129" leve="130" upExp="3250" monsterNum="100" speed="1.9" />
+	<Data id="1130" leve="131" upExp="3275" monsterNum="100" speed="1.9" />
+	<Data id="1131" leve="132" upExp="3300" monsterNum="100" speed="1.9" />
+	<Data id="1132" leve="133" upExp="3325" monsterNum="100" speed="1.9" />
+	<Data id="1133" leve="134" upExp="3350" monsterNum="100" speed="1.9" />
+	<Data id="1134" leve="135" upExp="3375" monsterNum="100" speed="1.9" />
+	<Data id="1135" leve="136" upExp="3400" monsterNum="100" speed="1.9" />
+	<Data id="1136" leve="137" upExp="3425" monsterNum="100" speed="1.9" />
+	<Data id="1137" leve="138" upExp="3450" monsterNum="100" speed="1.9" />
+	<Data id="1138" leve="139" upExp="3475" monsterNum="100" speed="1.9" />
+	<Data id="1139" leve="140" upExp="3500" monsterNum="100" speed="1.9" />
+	<Data id="1140" leve="141" upExp="3525" monsterNum="100" speed="1.9" />
+	<Data id="1141" leve="142" upExp="3550" monsterNum="100" speed="1.9" />
+	<Data id="1142" leve="143" upExp="3575" monsterNum="100" speed="1.9" />
+	<Data id="1143" leve="144" upExp="3600" monsterNum="100" speed="1.9" />
+	<Data id="1144" leve="145" upExp="3625" monsterNum="100" speed="1.9" />
+	<Data id="1145" leve="146" upExp="3650" monsterNum="100" speed="1.9" />
+	<Data id="1146" leve="147" upExp="3675" monsterNum="100" speed="1.9" />
+	<Data id="1147" leve="148" upExp="3700" monsterNum="100" speed="1.9" />
+	<Data id="1148" leve="149" upExp="3725" monsterNum="100" speed="1.9" />
+	<Data id="1149" leve="150" upExp="3750" monsterNum="100" speed="1.9" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data Key="TestKey1" Desc="XX字段" IntValue="1" IntListValue="2,3" StrValue="" StrListValue="lbt,lbbt" BoolValue="true" />
@@ -535,10 +645,11 @@
 	<Data Key="SkillWeight" Desc="技能选择权重 传说权重,史诗权重" IntValue="" IntListValue="2,1" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="Rampage" Desc="狂暴技能:魔币消耗倍数,奖励倍数" IntValue="" IntListValue="2,2" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="RampageUnlock" Desc="狂暴VIP解锁等级" IntValue="3" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
+	<Data Key="AutoUnlock" Desc="自动战斗VIP解锁等级" IntValue="1" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="TreasureChestRewards" Desc="魔导石宝箱  奖励百分比" IntValue="" IntListValue="100,125,150" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="TreasureChestProbability" Desc="魔导石宝箱  奖励概率(万分比)" IntValue="" IntListValue="5000,2500,2500" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="SuperTriggered" Desc="鱼阵时间触发 基础间隔,随机偏移" IntValue="" IntListValue="60,20" StrValue="" StrListValue="" BoolValue="" />
-	<Data Key="Death" Desc="主角受击次数死亡" IntValue="10" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
+	<Data Key="Death" Desc="主角受击次数死亡" IntValue="5" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="MonsterRefresh" Desc="刷怪圈(外圈直径,内圈直径)" IntValue="" IntListValue="2300,1500" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="MonsterInterval" Desc="刷怪间隔(毫秒)" IntValue="1" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
 	<Data Key="CarouselAmount" Desc="走马灯触发金额" IntValue="1000000" IntListValue="" StrValue="" StrListValue="" BoolValue="" />
@@ -739,7 +850,7 @@
 	<Data id="3000167" zh="每日宝箱" en="Daily Treasure Chest" />
 	<Data id="3000168" zh="解锁" en="UnLock" />
 	<Data id="3000169" zh="后激活以下特权" en="Activate the following privileges later" />
-	<Data id="3000170" zh="再充值#&amp;0元可提升至VIP#&amp;1" en="Recharge #&amp;0 yuan to increase VIP #&amp;1" />
+	<Data id="3000170" zh="再充值&lt;color=#00ff00&gt;#&amp;0&lt;/color&gt;元可提升至&lt;color=#fcde13&gt;VIP#&amp;1&lt;/color&gt;" en="Recharge #&amp;0 yuan to increase VIP #&amp;1" />
 	<Data id="3000171" zh="前往充值" en="Go to recharge" />
 	<Data id="3000172" zh="已激活以下特权" en="The following privileges have been activated" />
 	<Data id="3000173" zh="解锁VIP#&amp;0每日宝箱" en="Unlock VIP #&amp;0 Daily Treasure Chest" />
@@ -750,19 +861,39 @@
 	<Data id="3000178" zh="未领取奖励" en="No reward received" />
 	<Data id="3000179" zh="首通奖励" en="First Pass Reward" />
 	<Data id="3000180" zh="已通关" en="Passed Customs" />
-	<Data id="3000181" zh="" en="" />
-	<Data id="3000182" zh="" en="" />
-	<Data id="3000183" zh="" en="" />
-	<Data id="3000184" zh="" en="" />
-	<Data id="3000185" zh="" en="" />
-	<Data id="3000186" zh="" en="" />
-	<Data id="3000187" zh="" en="" />
-	<Data id="3000188" zh="" en="" />
-	<Data id="3000189" zh="" en="" />
-	<Data id="3000190" zh="" en="" />
-	<Data id="3000191" zh="" en="" />
-	<Data id="3000192" zh="" en="" />
-	<Data id="3000193" zh="" en="" />
+	<Data id="3000181" zh="魔晶石:#&amp;0" en="Magic Stone:#&amp;0" />
+	<Data id="3000182" zh="每日任务" en="Daily Task" />
+	<Data id="3000183" zh="挑战券任务" en="Challenge Coupon Task" />
+	<Data id="3000184" zh="VIP任务" en="VIP Task" />
+	<Data id="3000185" zh="完成任务总计可获得" en="The total amount of completed tasks can be obtained" />
+	<Data id="3000186" zh="每天#&amp;0刷新" en="Refresh daily #&amp;0" />
+	<Data id="3000187" zh="未达成" en="Not achieved" />
+	<Data id="3000188" zh="一键领取" en="One Key Get" />
+	<Data id="3000189" zh="充值任务" en="Recharge Task" />
+	<Data id="3000190" zh="暂无奖励可领" en="There are currently no rewards available to claim" />
+	<Data id="3000191" zh="积分商城" en="PointShop" />
+	<Data id="3000192" zh="首通奖励" en="First-time Reward" />
+	<Data id="3000193" zh="胜利宝箱" en="Victory Chest" />
+	<Data id="3000194" zh="下一关" en="Next Level" />
+	<Data id="3000195" zh="失败奖励" en="Failure Reward" />
+	<Data id="3000196" zh="您的#&amp;0不足" en="Your #&amp;0 is insufficient" />
+	<Data id="3000197" zh="退出战场会导致战斗失败,仅能获得基础挑战奖励,是否确认退出?" en="Exiting the battlefield will result in battle failure and only receive basic challenge rewards. Are you sure you want to exit?" />
+	<Data id="3000198" zh="选择一个宝箱点击打开" en="Select a treasure chest and click to open it" />
+	<Data id="3000199" zh="" en="" />
+	<Data id="3000200" zh="" en="" />
+	<Data id="3000201" zh="" en="" />
+	<Data id="3000202" zh="" en="" />
+	<Data id="3000203" zh="" en="" />
+	<Data id="3000204" zh="" en="" />
+	<Data id="3000205" zh="" en="" />
+	<Data id="3000206" zh="" en="" />
+	<Data id="3000207" zh="" en="" />
+	<Data id="3000208" zh="" en="" />
+	<Data id="3000209" zh="" en="" />
+	<Data id="3000210" zh="" en="" />
+	<Data id="3000211" zh="" en="" />
+	<Data id="3000212" zh="" en="" />
+	<Data id="3000213" zh="" en="" />
 	<Data id="4000000" zh="狂屠" en="Crazy slaughter" />
 	<Data id="4000001" zh="圣天使" en="Holy Angel" />
 	<Data id="4001000" zh="电" en="dian" />
@@ -869,6 +1000,7 @@
 	<Data id="itemName_16" zh="传说英雄3" en="Legendary Hero 3" />
 	<Data id="itemName_17" zh="传说英雄4" en="Legendary Hero 4" />
 	<Data id="itemName_18" zh="功勋" en="Meritorious Service" />
+	<Data id="itemName_19" zh="积分" en="" />
 	<Data id="itemDesc_1" zh="充值货币" en="Recharge currency" />
 	<Data id="itemDesc_2" zh="打怪消耗的货币" en="Currency consumed in fighting monsters" />
 	<Data id="itemDesc_3" zh="可用于积分商城兑换" en="Can be used for redemption in the points mall" />
@@ -887,6 +1019,7 @@
 	<Data id="itemDesc_16" zh="" en="" />
 	<Data id="itemDesc_17" zh="" en="" />
 	<Data id="itemDesc_18" zh="龙王秘宝活动功勋" en="Merit of the Dragon King Secret Treasure Activity" />
+	<Data id="itemDesc_19" zh="兑换商城积分" en="" />
 	<Data id="recharge_1001" zh="商城直充" en="Mall Direct Charging" />
 	<Data id="recharge_2001" zh="首充" en="First recharge" />
 	<Data id="recharge_3001" zh="鸿运礼包" en="Hongyun Gift Pack" />
@@ -944,6 +1077,76 @@
 	<Data id="mapName_1001" zh="旷野之地" en="Wilderness land" />
 	<Data id="mapName_1002" zh="冰封雪域" en="Ice covered snowy region" />
 	<Data id="mapName_1003" zh="危险沙漠" en="Dangerous Desert" />
+	<Data id="taskDesc_1001" zh="无尽模式魔法阵使用2000万魔币" en="Endless Mode Magic Array uses 20 million magic coins" />
+	<Data id="taskDesc_1002" zh="无尽模式魔法阵使用4000万魔币" en="Endless Mode Magic Array uses 40 million magic coins" />
+	<Data id="taskDesc_1003" zh="无尽模式魔法阵使用6000万魔币" en="Endless Mode Magic Array uses 60 million magic coins" />
+	<Data id="taskDesc_1004" zh="无尽模式魔法阵使用1亿魔币" en="Endless Mode Magic Array uses 100 million magic coins" />
+	<Data id="taskDesc_1005" zh="无尽模式魔法阵使用1.4亿魔币" en="Endless Mode Magic Array uses 140 million magic coins" />
+	<Data id="taskDesc_1006" zh="无尽模式魔法阵使用1.8亿魔币" en="Endless Mode Magic Array uses 180 million magic coins" />
+	<Data id="taskDesc_1007" zh="无尽模式魔法阵使用2.4亿魔币" en="Endless Mode Magic Array uses 240 million magic coins" />
+	<Data id="taskDesc_1008" zh="无尽模式魔法阵使用3.6亿魔币" en="Endless Mode Magic Array uses 360 million magic coins" />
+	<Data id="taskDesc_1009" zh="无尽模式魔法阵使用4.4亿魔币" en="Endless Mode Magic Array uses 440 million magic coins" />
+	<Data id="taskDesc_1010" zh="无尽模式魔法阵使用5.2亿魔币" en="Endless Mode Magic Array uses 520 million magic coins" />
+	<Data id="taskDesc_1011" zh="无尽模式魔法阵使用6亿魔币" en="Endless Mode Magic Array uses 600 million magic coins" />
+	<Data id="taskDesc_1012" zh="无尽模式魔法阵使用7亿魔币" en="Endless Mode Magic Array uses 700 million magic coins" />
+	<Data id="taskDesc_1013" zh="无尽模式魔法阵使用8亿魔币" en="Endless Mode Magic Array uses 800 million magic coins" />
+	<Data id="taskDesc_1014" zh="无尽模式魔法阵使用9亿魔币" en="Endless Mode Magic Array uses 900 million magic coins" />
+	<Data id="taskDesc_1015" zh="无尽模式魔法阵使用12亿魔币" en="Endless Mode Magic Array uses 1.2 billion magic coins" />
+	<Data id="taskDesc_1016" zh="无尽模式魔法阵使用11.4亿魔币" en="Endless Mode Magic Array uses 1.14 billion magic coins" />
+	<Data id="taskDesc_1017" zh="无尽模式魔法阵使用12.6亿魔币" en="Endless Mode Magic Array uses 1.26 billion magic coins" />
+	<Data id="taskDesc_1018" zh="无尽模式魔法阵使用13.8亿魔币" en="Endless Mode Magic Array uses 1.38 billion magic coins" />
+	<Data id="taskDesc_1019" zh="无尽模式魔法阵使用15亿魔币" en="Endless Mode Magic Array uses 1.5 billion magic coins" />
+	<Data id="taskDesc_1020" zh="无尽模式魔法阵使用16.4亿魔币" en="Endless Mode Magic Array uses 1.64 billion magic coins" />
+	<Data id="taskDesc_1021" zh="无尽模式魔法阵使用17.8亿魔币" en="Endless Mode Magic Array uses 1.78 billion magic coins" />
+	<Data id="taskDesc_1022" zh="无尽模式魔法阵使用19.2亿魔币" en="Endless Mode Magic Array uses 1.92 billion magic coins" />
+	<Data id="taskDesc_1023" zh="无尽模式魔法阵使用20.6亿魔币" en="Endless Mode Magic Array uses 2.06 billion magic coins" />
+	<Data id="taskDesc_1024" zh="无尽模式魔法阵使用22亿魔币" en="Endless Mode Magic Array uses 2.2 billion magic coins" />
+	<Data id="taskDesc_1025" zh="无尽模式魔法阵使用23.6亿魔币" en="Endless Mode Magic Array uses 2.36 billion magic coins" />
+	<Data id="taskDesc_1026" zh="无尽模式魔法阵使用25.2亿魔币" en="Endless Mode Magic Array uses 2.52 billion magic coins" />
+	<Data id="taskDesc_1027" zh="无尽模式魔法阵使用26.8亿魔币" en="Endless Mode Magic Array uses 2.68 billion magic coins" />
+	<Data id="taskDesc_1028" zh="无尽模式魔法阵使用28.4亿魔币" en="Endless Mode Magic Array uses 2.84 billion magic coins" />
+	<Data id="taskDesc_1029" zh="无尽模式魔法阵使用30亿魔币" en="Endless Mode Magic Array uses 3 billion magic coins" />
+	<Data id="taskDesc_1030" zh="无尽模式魔法阵使用31.8亿魔币" en="Endless Mode Magic Array uses 3.18 billion magic coins" />
+	<Data id="taskDesc_1031" zh="无尽模式魔法阵使用31.8亿魔币" en="Endless Mode Magic Array uses 3.18 billion magic coins" />
+	<Data id="taskDesc_1032" zh="无尽模式魔法阵使用33.6亿魔币" en="Endless Mode Magic Array uses 3.36 billion magic coins" />
+	<Data id="taskDesc_1033" zh="无尽模式魔法阵使用35.4亿魔币" en="Endless Mode Magic Array uses 3.54 billion magic coins" />
+	<Data id="taskDesc_1034" zh="无尽模式魔法阵使用37.2亿魔币" en="Endless Mode Magic Array uses 3.72 billion magic coins" />
+	<Data id="taskDesc_1035" zh="无尽模式魔法阵使用39亿魔币" en="Endless Mode Magic Array uses 3.9 billion magic coins" />
+	<Data id="taskDesc_1036" zh="无尽模式魔法阵使用41亿魔币" en="Endless Mode Magic Array uses 4.1 billion magic coins" />
+	<Data id="taskDesc_1037" zh="无尽模式魔法阵使用43亿魔币" en="Endless Mode Magic Array uses 4.3 billion magic coins" />
+	<Data id="taskDesc_1038" zh="无尽模式魔法阵使用45亿魔币" en="Endless Mode Magic Array uses 4.5 billion magic coins" />
+	<Data id="taskDesc_1039" zh="无尽模式魔法阵使用47亿魔币" en="Endless Mode Magic Array uses 4.7 billion magic coins" />
+	<Data id="taskDesc_1040" zh="无尽模式魔法阵使用49亿魔币" en="Endless Mode Magic Array uses 4.9 billion magic coins" />
+	<Data id="taskDesc_2001" zh="战斗中获得100魔导石" en="Obtain 100 magic stones in battle" />
+	<Data id="taskDesc_2002" zh="战斗中获得300魔导石" en="Obtain 300 magic stones in battle" />
+	<Data id="taskDesc_2003" zh="战斗中获得800魔导石" en="Obtain 800 magic stones in battle" />
+	<Data id="taskDesc_2004" zh="战斗中获得1800魔导石" en="Obtained 1800 Magic Stones in the battle" />
+	<Data id="taskDesc_2005" zh="战斗中获得4800魔导石" en="Obtained 4800 magic stones in the battle" />
+	<Data id="taskDesc_2006" zh="战斗中获得9800魔导石" en="Obtain 9800 magic stones in battle" />
+	<Data id="taskDesc_2007" zh="战斗中获得15800魔导石" en="Obtained 15800 magic stones in battle" />
+	<Data id="taskDesc_2008" zh="战斗中获得58800魔导石" en="Obtained 58800 magic stones in battle" />
+	<Data id="taskDesc_2009" zh="战斗中获得128800魔导石" en="Obtained 128800 Magic Stones in the battle" />
+	<Data id="taskDesc_2010" zh="战斗中获得288000魔导石" en="Obtained 288000 magic stones in battle" />
+	<Data id="taskDesc_2011" zh="战斗中获得488800魔导石" en="Obtained 488800 magic stones in battle" />
+	<Data id="taskDesc_2012" zh="战斗中获得888888魔导石" en="Obtain 888888 magic stones in battle" />
+	<Data id="taskDesc_2013" zh="战斗中获得1388888魔导石" en="Obtained 1388888 Magic Stones in the battle" />
+	<Data id="taskDesc_2014" zh="战斗中获得1988888魔导石" en="Obtained 1988888 Magic Stones in the battle" />
+	<Data id="taskDesc_2015" zh="战斗中获得2688888魔导石" en="Obtained 2688888 Magic Stones in the battle" />
+	<Data id="taskDesc_2016" zh="战斗中获得3488888魔导石" en="Obtained 3488888 Magic Stones in the battle" />
+	<Data id="taskDesc_2017" zh="战斗中获得4388888魔导石" en="Obtained 4388888 Magic Stones in the battle" />
+	<Data id="taskDesc_2018" zh="战斗中获得5388888魔导石" en="Obtained 5388888 Magic Stones in the battle" />
+	<Data id="taskDesc_2019" zh="战斗中获得6488888魔导石" en="Obtained 6488888 Magic Stones in the battle" />
+	<Data id="taskDesc_2020" zh="战斗中获得7688888魔导石" en="Obtained 7688888 Magic Stones in the battle" />
+	<Data id="taskDesc_2021" zh="战斗中获得8988888魔导石" en="Obtained 8988888 Magic Stones in the battle" />
+	<Data id="taskDesc_2022" zh="战斗中获得10388888魔导石" en="Obtained 10388888 Magic Stones in the battle" />
+	<Data id="taskDesc_2023" zh="战斗中获得11888888魔导石" en="Obtained 11888888 Magic Stones in the battle" />
+	<Data id="taskDesc_3001" zh="今日充值6元" en="Recharge 6 yuan today" />
+	<Data id="taskDesc_3002" zh="今日充值28元" en="Recharge 28 yuan today" />
+	<Data id="taskDesc_3003" zh="今日充值68元" en="Recharge 68 yuan today" />
+	<Data id="taskDesc_3004" zh="今日充值128元" en="Recharge 128 yuan today" />
+	<Data id="taskDesc_3005" zh="今日充值188元" en="Recharge 188 yuan today" />
+	<Data id="taskDesc_3006" zh="今日充值288元" en="Recharge 288 yuan today" />
+	<Data id="taskDesc_3007" zh="今日充值588元" en="Recharge 588 yuan today" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data id="1" name="itemName_1" desc="itemDesc_1" type="1" quality="1" icon="itemIcon/item_1" param1="" />
@@ -964,6 +1167,7 @@
 	<Data id="16" name="itemName_16" desc="itemDesc_16" type="6" quality="4" icon="" param1="" />
 	<Data id="17" name="itemName_17" desc="itemDesc_17" type="6" quality="4" icon="" param1="" />
 	<Data id="18" name="itemName_18" desc="itemDesc_18" type="1" quality="4" icon="" param1="" />
+	<Data id="19" name="itemName_19" desc="itemDesc_19" type="1" quality="1" icon="" param1="" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data id="1001" level="1" upCost="4,0" atkCost="2,100" unLockAward="2,0" atk="1" hp="1" icon="magicIcon/magic_1001" mStone="1" mgcStone="0.003" />
@@ -1006,31 +1210,31 @@
 	<Data id="1006" name="monster_1006" beizhu="哥布林刺客" type="1" multiple="7" icon="monsterIcon/monster_1006" aspect="1006" speed="1.2" superSpeed="1.8" zoomFactor="1.1" expValue="5" />
 	<Data id="1007" name="monster_1007" beizhu="岩鼠" type="1" multiple="8" icon="monsterIcon/monster_1007" aspect="1007" speed="0.9" superSpeed="1.35" zoomFactor="1.2" expValue="5" />
 	<Data id="1008" name="monster_1008" beizhu="异化冥蛊虫" type="1" multiple="9" icon="monsterIcon/monster_1008" aspect="1008" speed="1.3" superSpeed="1.95" zoomFactor="1.2" expValue="5" />
-	<Data id="1009" name="monster_1009" beizhu="祭祀小鬼" type="1" multiple="10" icon="monsterIcon/monster_1009" aspect="1009" speed="1" superSpeed="1.5" zoomFactor="1.2" expValue="5" />
+	<Data id="1009" name="monster_1009" beizhu="祭祀小鬼" type="1" multiple="10" icon="monsterIcon/monster_1009" aspect="1009" speed="1" superSpeed="1.5" zoomFactor="1.3" expValue="5" />
 	<Data id="1010" name="monster_1010" beizhu="幽面" type="1" multiple="12" icon="monsterIcon/monster_1010" aspect="1010" speed="0.9" superSpeed="1.35" zoomFactor="1.3" expValue="5" />
 	<Data id="1011" name="monster_1011" beizhu="祭师" type="1" multiple="15" icon="monsterIcon/monster_1011" aspect="1011" speed="0.8" superSpeed="1.2" zoomFactor="1.3" expValue="5" />
-	<Data id="1012" name="monster_1012" beizhu="武器哥布林" type="1" multiple="18" icon="monsterIcon/monster_1012" aspect="1012" speed="1.1" superSpeed="1.65" zoomFactor="1.3" expValue="5" />
+	<Data id="1012" name="monster_1012" beizhu="武器哥布林" type="1" multiple="18" icon="monsterIcon/monster_1012" aspect="1012" speed="1.1" superSpeed="1.65" zoomFactor="1.4" expValue="5" />
 	<Data id="1013" name="monster_1013" beizhu="石头人" type="1" multiple="20" icon="monsterIcon/monster_1013" aspect="1013" speed="0.8" superSpeed="1.2" zoomFactor="1.4" expValue="5" />
 	<Data id="1014" name="monster_1014" beizhu="异化石头人" type="1" multiple="20" icon="monsterIcon/monster_1014" aspect="1014" speed="1" superSpeed="1.5" zoomFactor="1.4" expValue="5" />
 	<Data id="1015" name="monster_1015" beizhu="独眼魔" type="1" multiple="25" icon="monsterIcon/monster_1015" aspect="1015" speed="0.7" superSpeed="1.05" zoomFactor="1.4" expValue="5" />
-	<Data id="2001" name="monster_2001" beizhu="精英怪物1" type="2" multiple="30" icon="monsterIcon/monster_2001" aspect="1003" speed="0.7" superSpeed="1.05" zoomFactor="1.5" expValue="6" />
-	<Data id="2002" name="monster_2002" beizhu="精英怪物2" type="2" multiple="50" icon="monsterIcon/monster_2002" aspect="1003" speed="0.8" superSpeed="1.2" zoomFactor="1.5" expValue="6" />
-	<Data id="2003" name="monster_2003" beizhu="精英怪物3" type="2" multiple="60" icon="monsterIcon/monster_2003" aspect="1003" speed="0.9" superSpeed="1.35" zoomFactor="1.5" expValue="6" />
-	<Data id="2004" name="monster_2004" beizhu="精英怪物4" type="2" multiple="80" icon="monsterIcon/monster_2004" aspect="1003" speed="1" superSpeed="1.5" zoomFactor="1.5" expValue="6" />
-	<Data id="2005" name="monster_2005" beizhu="精英怪物5" type="2" multiple="100" icon="monsterIcon/monster_2005" aspect="1003" speed="1.1" superSpeed="1.65" zoomFactor="1.5" expValue="6" />
-	<Data id="2006" name="monster_2006" beizhu="精英怪物6" type="2" multiple="200" icon="monsterIcon/monster_2006" aspect="1003" speed="1.2" superSpeed="1.8" zoomFactor="1.5" expValue="6" />
-	<Data id="2007" name="monster_2007" beizhu="精英怪物7" type="2" multiple="300" icon="monsterIcon/monster_2007" aspect="1003" speed="1.3" superSpeed="1.95" zoomFactor="1.5" expValue="6" />
-	<Data id="2008" name="monster_2008" beizhu="精英怪物8" type="2" multiple="500" icon="monsterIcon/monster_2008" aspect="1003" speed="1.4" superSpeed="2.1" zoomFactor="1.5" expValue="6" />
+	<Data id="2001" name="monster_2001" beizhu="精英哥布林战士" type="2" multiple="30" icon="monsterIcon/monster_2001" aspect="2001" speed="1.2" superSpeed="1.8" zoomFactor="1.5" expValue="6" />
+	<Data id="2002" name="monster_2002" beizhu="精英鬼蛛" type="2" multiple="50" icon="monsterIcon/monster_2002" aspect="2002" speed="1" superSpeed="1.5" zoomFactor="1.5" expValue="6" />
+	<Data id="2003" name="monster_2003" beizhu="精英哥布林刺客" type="2" multiple="60" icon="monsterIcon/monster_2003" aspect="2003" speed="1.4" superSpeed="2.1" zoomFactor="1.5" expValue="6" />
+	<Data id="2004" name="monster_2004" beizhu="精英岩鼠" type="2" multiple="80" icon="monsterIcon/monster_2004" aspect="2004" speed="1.1" superSpeed="1.65" zoomFactor="1.5" expValue="6" />
+	<Data id="2005" name="monster_2005" beizhu="精英幽面" type="2" multiple="100" icon="monsterIcon/monster_2005" aspect="2005" speed="1.1" superSpeed="1.65" zoomFactor="1.5" expValue="6" />
+	<Data id="2006" name="monster_2006" beizhu="精英祭师" type="2" multiple="200" icon="monsterIcon/monster_2006" aspect="2006" speed="1.4" superSpeed="2.1" zoomFactor="1.5" expValue="6" />
+	<Data id="2007" name="monster_2007" beizhu="精英武器哥布林" type="2" multiple="300" icon="monsterIcon/monster_2007" aspect="2007" speed="1.3" superSpeed="1.95" zoomFactor="1.5" expValue="6" />
+	<Data id="2008" name="monster_2008" beizhu="精英独眼魔" type="2" multiple="500" icon="monsterIcon/monster_2008" aspect="2008" speed="0.9" superSpeed="1.35" zoomFactor="1.5" expValue="6" />
 	<Data id="3001" name="monster_3001" beizhu="骷髅王" type="3" multiple="100" icon="monsterIcon/monster_3001" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
 	<Data id="3002" name="monster_3002" beizhu="荆棘魔" type="3" multiple="200" icon="monsterIcon/monster_3002" aspect="3002" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
 	<Data id="3003" name="monster_3003" beizhu="暗影之王" type="3" multiple="300" icon="monsterIcon/monster_3003" aspect="3003" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3004" name="monster_3004" beizhu="地狱三头犬" type="3" multiple="400" icon="monsterIcon/monster_3004" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3005" name="monster_3005" beizhu="巨镰天使" type="3" multiple="500" icon="monsterIcon/monster_3005" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3006" name="monster_3006" beizhu="双斧幽煞" type="3" multiple="100" icon="monsterIcon/monster_3006" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3007" name="monster_3007" beizhu="极地武者" type="3" multiple="200" icon="monsterIcon/monster_3007" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3008" name="monster_3008" beizhu="贪恋巨魔" type="3" multiple="300" icon="monsterIcon/monster_3008" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3009" name="monster_3009" beizhu="奶牛魔王" type="3" multiple="400" icon="monsterIcon/monster_3009" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
-	<Data id="3010" name="monster_3010" beizhu="幽冥巨锤" type="3" multiple="500" icon="monsterIcon/monster_3010" aspect="3001" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3004" name="monster_3004" beizhu="地狱三头犬" type="3" multiple="400" icon="monsterIcon/monster_3004" aspect="3004" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3005" name="monster_3005" beizhu="巨镰天使" type="3" multiple="500" icon="monsterIcon/monster_3005" aspect="3005" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3006" name="monster_3006" beizhu="双斧幽煞" type="3" multiple="100" icon="monsterIcon/monster_3006" aspect="3006" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3007" name="monster_3007" beizhu="极地武者" type="3" multiple="200" icon="monsterIcon/monster_3007" aspect="3007" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3008" name="monster_3008" beizhu="贪恋巨魔" type="3" multiple="300" icon="monsterIcon/monster_3008" aspect="3008" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3009" name="monster_3009" beizhu="奶牛魔王" type="3" multiple="400" icon="monsterIcon/monster_3009" aspect="3009" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
+	<Data id="3010" name="monster_3010" beizhu="幽冥巨锤" type="3" multiple="500" icon="monsterIcon/monster_3010" aspect="3010" speed="1.5" superSpeed="1" zoomFactor="0.8" expValue="6" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data id="1001" type="1" name="金币音效" filePath="fguiMusic/GoldCoin" />
@@ -1040,6 +1244,8 @@
 	<Data id="1005" type="1" name="点击宝箱后打开的音效" filePath="fguiMusic/open" />
 	<Data id="1006" type="1" name="战斗结束界面打开音效" filePath="fguiMusic/end" />
 	<Data id="1007" type="1" name="技能点下去选的的音效" filePath="fguiMusic/skillSelect" />
+	<Data id="1008" type="1" name="技能1音效" filePath="fguiMusic/skill001" />
+	<Data id="1009" type="1" name="技能2音效" filePath="fguiMusic/skill002" />
 	<Data id="2001" type="2" name="打BOSS期间背景音乐1" filePath="fguiMusic/BGM-boss1" />
 	<Data id="2002" type="2" name="打BOSS期间背景音乐2" filePath="fguiMusic/BGM-boss2" />
 	<Data id="2003" type="2" name="打BOSS期间背景音乐3" filePath="fguiMusic/BGM-boss3" />
@@ -1152,56 +1358,81 @@
 	<Data id="1704" skillType="8" heroId="1008" skillLeve="4" bulletNum="4" bulletRadius="1000" attackDistance="200" attackInterval="3" attackSpeed="0.5" skillName="heroSkill_1007" skillDes="heroSkillDesc_1007_4" skillIcon="skillIcon/skill_1001" aspect="1002" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data id="1001" checkPoint="1" unLock="7,1" checkPointReward="" first="8,3" victory="3,4000" fail="3,400" bossId="3001" />
-	<Data id="1002" checkPoint="2" unLock="7,1" checkPointReward="" first="8,3" victory="3,4000" fail="3,400" bossId="3002" />
-	<Data id="1003" checkPoint="3" unLock="7,2" checkPointReward="" first="8,3" victory="3,8000" fail="3,800" bossId="3003" />
-	<Data id="1004" checkPoint="4" unLock="7,2" checkPointReward="" first="8,3" victory="3,8000" fail="3,800" bossId="3004" />
-	<Data id="1005" checkPoint="5" unLock="7,3" checkPointReward="3,2000" first="8,3" victory="3,12000" fail="3,1200" bossId="3005" />
-	<Data id="1006" checkPoint="6" unLock="7,3" checkPointReward="" first="8,3" victory="3,12000" fail="3,1200" bossId="3006" />
-	<Data id="1007" checkPoint="7" unLock="7,4" checkPointReward="" first="8,3" victory="3,16000" fail="3,1600" bossId="3007" />
-	<Data id="1008" checkPoint="8" unLock="7,4" checkPointReward="" first="8,3" victory="3,16000" fail="3,1600" bossId="3008" />
-	<Data id="1009" checkPoint="9" unLock="7,5" checkPointReward="" first="8,3" victory="3,20000" fail="3,2000" bossId="3009" />
-	<Data id="1010" checkPoint="10" unLock="7,5" checkPointReward="3,5000" first="8,3" victory="3,20000" fail="3,2000" bossId="3010" />
-	<Data id="1011" checkPoint="11" unLock="7,6" checkPointReward="" first="8,3" victory="3,24000" fail="3,2400" bossId="3001" />
-	<Data id="1012" checkPoint="12" unLock="7,6" checkPointReward="" first="8,3" victory="3,24000" fail="3,2400" bossId="3002" />
-	<Data id="1013" checkPoint="13" unLock="7,7" checkPointReward="" first="8,3" victory="3,28000" fail="3,2800" bossId="3003" />
-	<Data id="1014" checkPoint="14" unLock="7,7" checkPointReward="" first="8,3" victory="3,28000" fail="3,2800" bossId="3004" />
-	<Data id="1015" checkPoint="15" unLock="7,8" checkPointReward="" first="8,3" victory="3,32000" fail="3,3200" bossId="3005" />
-	<Data id="1016" checkPoint="16" unLock="7,8" checkPointReward="" first="8,3" victory="3,32000" fail="3,3200" bossId="3006" />
-	<Data id="1017" checkPoint="17" unLock="7,9" checkPointReward="" first="8,3" victory="3,36000" fail="3,3600" bossId="3007" />
-	<Data id="1018" checkPoint="18" unLock="7,9" checkPointReward="" first="8,3" victory="3,36000" fail="3,3600" bossId="3008" />
-	<Data id="1019" checkPoint="19" unLock="7,10" checkPointReward="" first="8,3" victory="3,40000" fail="3,4000" bossId="3009" />
-	<Data id="1020" checkPoint="20" unLock="7,10" checkPointReward="3,10000" first="8,3" victory="3,40000" fail="3,4000" bossId="3010" />
-	<Data id="1021" checkPoint="21" unLock="7,11" checkPointReward="" first="8,3" victory="3,44000" fail="3,4400" bossId="3001" />
-	<Data id="1022" checkPoint="22" unLock="7,11" checkPointReward="" first="8,3" victory="3,44000" fail="3,4400" bossId="3002" />
-	<Data id="1023" checkPoint="23" unLock="7,12" checkPointReward="" first="8,3" victory="3,48000" fail="3,4800" bossId="3003" />
-	<Data id="1024" checkPoint="24" unLock="7,12" checkPointReward="" first="8,3" victory="3,48000" fail="3,4800" bossId="3004" />
-	<Data id="1025" checkPoint="25" unLock="7,13" checkPointReward="" first="8,3" victory="3,52000" fail="3,5200" bossId="3005" />
-	<Data id="1026" checkPoint="26" unLock="7,13" checkPointReward="" first="8,3" victory="3,52000" fail="3,5200" bossId="3006" />
-	<Data id="1027" checkPoint="27" unLock="7,14" checkPointReward="" first="8,3" victory="3,56000" fail="3,5600" bossId="3007" />
-	<Data id="1028" checkPoint="28" unLock="7,14" checkPointReward="" first="8,3" victory="3,56000" fail="3,5600" bossId="3008" />
-	<Data id="1029" checkPoint="29" unLock="7,15" checkPointReward="" first="8,3" victory="3,60000" fail="3,6000" bossId="3009" />
-	<Data id="1030" checkPoint="30" unLock="7,15" checkPointReward="3,50000" first="8,3" victory="3,60000" fail="3,6000" bossId="3010" />
-	<Data id="1031" checkPoint="31" unLock="7,16" checkPointReward="" first="8,3" victory="3,64000" fail="3,6400" bossId="3001" />
-	<Data id="1032" checkPoint="32" unLock="7,16" checkPointReward="" first="8,3" victory="3,64000" fail="3,6400" bossId="3002" />
-	<Data id="1033" checkPoint="33" unLock="7,17" checkPointReward="" first="8,3" victory="3,68000" fail="3,6800" bossId="3003" />
-	<Data id="1034" checkPoint="34" unLock="7,17" checkPointReward="" first="8,3" victory="3,68000" fail="3,6800" bossId="3004" />
-	<Data id="1035" checkPoint="35" unLock="7,18" checkPointReward="" first="8,3" victory="3,72000" fail="3,7200" bossId="3005" />
-	<Data id="1036" checkPoint="36" unLock="7,18" checkPointReward="" first="8,3" victory="3,72000" fail="3,7200" bossId="3006" />
-	<Data id="1037" checkPoint="37" unLock="7,19" checkPointReward="" first="8,3" victory="3,76000" fail="3,7600" bossId="3007" />
-	<Data id="1038" checkPoint="38" unLock="7,19" checkPointReward="" first="8,3" victory="3,76000" fail="3,7600" bossId="3008" />
-	<Data id="1039" checkPoint="39" unLock="7,20" checkPointReward="" first="8,3" victory="3,80000" fail="3,8000" bossId="3009" />
-	<Data id="1040" checkPoint="40" unLock="7,20" checkPointReward="" first="8,3" victory="3,80000" fail="3,8000" bossId="3010" />
-	<Data id="1041" checkPoint="41" unLock="7,21" checkPointReward="" first="8,3" victory="3,84000" fail="3,8400" bossId="3001" />
-	<Data id="1042" checkPoint="42" unLock="7,21" checkPointReward="" first="8,3" victory="3,84000" fail="3,8400" bossId="3002" />
-	<Data id="1043" checkPoint="43" unLock="7,22" checkPointReward="" first="8,3" victory="3,88000" fail="3,8800" bossId="3003" />
-	<Data id="1044" checkPoint="44" unLock="7,22" checkPointReward="" first="8,3" victory="3,88000" fail="3,8800" bossId="3004" />
-	<Data id="1045" checkPoint="45" unLock="7,23" checkPointReward="" first="8,3" victory="3,92000" fail="3,9200" bossId="3005" />
-	<Data id="1046" checkPoint="46" unLock="7,23" checkPointReward="" first="8,3" victory="3,92000" fail="3,9200" bossId="3006" />
-	<Data id="1047" checkPoint="47" unLock="7,24" checkPointReward="" first="8,3" victory="3,96000" fail="3,9600" bossId="3007" />
-	<Data id="1048" checkPoint="48" unLock="7,24" checkPointReward="" first="8,3" victory="3,96000" fail="3,9600" bossId="3008" />
-	<Data id="1049" checkPoint="49" unLock="7,25" checkPointReward="" first="8,3" victory="3,100000" fail="3,10000" bossId="3009" />
-	<Data id="1050" checkPoint="50" unLock="7,25" checkPointReward="3,100000" first="8,3" victory="3,100000" fail="3,10000" bossId="3010" />
+	<Data id="1001" nextId="1002" checkPoint="1" unLock="7,1" checkPointReward="" first="8,3" victory="3,4000" fail="3,400" mpaId="1" bossId="3001" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1002" nextId="1003" checkPoint="2" unLock="7,1" checkPointReward="" first="8,3" victory="3,4000" fail="3,400" mpaId="1" bossId="3002" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1003" nextId="1004" checkPoint="3" unLock="7,2" checkPointReward="" first="8,3" victory="3,8000" fail="3,800" mpaId="1" bossId="3003" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1004" nextId="1005" checkPoint="4" unLock="7,2" checkPointReward="" first="8,3" victory="3,8000" fail="3,800" mpaId="1" bossId="3004" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1005" nextId="1006" checkPoint="5" unLock="7,3" checkPointReward="3,2000" first="8,3" victory="3,12000" fail="3,1200" mpaId="1" bossId="3005" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1006" nextId="1007" checkPoint="6" unLock="7,3" checkPointReward="" first="8,3" victory="3,12000" fail="3,1200" mpaId="1" bossId="3006" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1007" nextId="1008" checkPoint="7" unLock="7,4" checkPointReward="" first="8,3" victory="3,16000" fail="3,1600" mpaId="1" bossId="3007" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1008" nextId="1009" checkPoint="8" unLock="7,4" checkPointReward="" first="8,3" victory="3,16000" fail="3,1600" mpaId="1" bossId="3008" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1009" nextId="1010" checkPoint="9" unLock="7,5" checkPointReward="" first="8,3" victory="3,20000" fail="3,2000" mpaId="1" bossId="3009" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1010" nextId="1011" checkPoint="10" unLock="7,5" checkPointReward="3,5000" first="8,3" victory="3,20000" fail="3,2000" mpaId="1" bossId="3010" fishWave="4,6" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1011" nextId="1012" checkPoint="11" unLock="7,6" checkPointReward="" first="8,3" victory="3,24000" fail="3,2400" mpaId="2" bossId="3001" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1012" nextId="1013" checkPoint="12" unLock="7,6" checkPointReward="" first="8,3" victory="3,24000" fail="3,2400" mpaId="2" bossId="3002" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1013" nextId="1014" checkPoint="13" unLock="7,7" checkPointReward="" first="8,3" victory="3,28000" fail="3,2800" mpaId="2" bossId="3003" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1014" nextId="1015" checkPoint="14" unLock="7,7" checkPointReward="" first="8,3" victory="3,28000" fail="3,2800" mpaId="2" bossId="3004" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1015" nextId="1016" checkPoint="15" unLock="7,8" checkPointReward="" first="8,3" victory="3,32000" fail="3,3200" mpaId="2" bossId="3005" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1016" nextId="1017" checkPoint="16" unLock="7,8" checkPointReward="" first="8,3" victory="3,32000" fail="3,3200" mpaId="2" bossId="3006" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1017" nextId="1018" checkPoint="17" unLock="7,9" checkPointReward="" first="8,3" victory="3,36000" fail="3,3600" mpaId="2" bossId="3007" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1018" nextId="1019" checkPoint="18" unLock="7,9" checkPointReward="" first="8,3" victory="3,36000" fail="3,3600" mpaId="2" bossId="3008" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1019" nextId="1020" checkPoint="19" unLock="7,10" checkPointReward="" first="8,3" victory="3,40000" fail="3,4000" mpaId="2" bossId="3009" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1020" nextId="1021" checkPoint="20" unLock="7,10" checkPointReward="3,10000" first="8,3" victory="3,40000" fail="3,4000" mpaId="2" bossId="3010" fishWave="5,7" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1021" nextId="1022" checkPoint="21" unLock="7,11" checkPointReward="" first="8,3" victory="3,44000" fail="3,4400" mpaId="3" bossId="3001" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1022" nextId="1023" checkPoint="22" unLock="7,11" checkPointReward="" first="8,3" victory="3,44000" fail="3,4400" mpaId="3" bossId="3002" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1023" nextId="1024" checkPoint="23" unLock="7,12" checkPointReward="" first="8,3" victory="3,48000" fail="3,4800" mpaId="3" bossId="3003" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1024" nextId="1025" checkPoint="24" unLock="7,12" checkPointReward="" first="8,3" victory="3,48000" fail="3,4800" mpaId="3" bossId="3004" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1025" nextId="1026" checkPoint="25" unLock="7,13" checkPointReward="" first="8,3" victory="3,52000" fail="3,5200" mpaId="3" bossId="3005" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1026" nextId="1027" checkPoint="26" unLock="7,13" checkPointReward="" first="8,3" victory="3,52000" fail="3,5200" mpaId="3" bossId="3006" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1027" nextId="1028" checkPoint="27" unLock="7,14" checkPointReward="" first="8,3" victory="3,56000" fail="3,5600" mpaId="3" bossId="3007" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1028" nextId="1029" checkPoint="28" unLock="7,14" checkPointReward="" first="8,3" victory="3,56000" fail="3,5600" mpaId="3" bossId="3008" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1029" nextId="1030" checkPoint="29" unLock="7,15" checkPointReward="" first="8,3" victory="3,60000" fail="3,6000" mpaId="3" bossId="3009" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1030" nextId="1031" checkPoint="30" unLock="7,15" checkPointReward="3,50000" first="8,3" victory="3,60000" fail="3,6000" mpaId="3" bossId="3010" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1031" nextId="1032" checkPoint="31" unLock="7,16" checkPointReward="" first="8,3" victory="3,64000" fail="3,6400" mpaId="2" bossId="3001" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1032" nextId="1033" checkPoint="32" unLock="7,16" checkPointReward="" first="8,3" victory="3,64000" fail="3,6400" mpaId="2" bossId="3002" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1033" nextId="1034" checkPoint="33" unLock="7,17" checkPointReward="" first="8,3" victory="3,68000" fail="3,6800" mpaId="2" bossId="3003" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1034" nextId="1035" checkPoint="34" unLock="7,17" checkPointReward="" first="8,3" victory="3,68000" fail="3,6800" mpaId="2" bossId="3004" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1035" nextId="1036" checkPoint="35" unLock="7,18" checkPointReward="" first="8,3" victory="3,72000" fail="3,7200" mpaId="2" bossId="3005" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1036" nextId="1037" checkPoint="36" unLock="7,18" checkPointReward="" first="8,3" victory="3,72000" fail="3,7200" mpaId="2" bossId="3006" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1037" nextId="1038" checkPoint="37" unLock="7,19" checkPointReward="" first="8,3" victory="3,76000" fail="3,7600" mpaId="2" bossId="3007" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1038" nextId="1039" checkPoint="38" unLock="7,19" checkPointReward="" first="8,3" victory="3,76000" fail="3,7600" mpaId="2" bossId="3008" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1039" nextId="1040" checkPoint="39" unLock="7,20" checkPointReward="" first="8,3" victory="3,80000" fail="3,8000" mpaId="2" bossId="3009" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1040" nextId="1041" checkPoint="40" unLock="7,20" checkPointReward="" first="8,3" victory="3,80000" fail="3,8000" mpaId="2" bossId="3010" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1041" nextId="1042" checkPoint="41" unLock="7,21" checkPointReward="" first="8,3" victory="3,84000" fail="3,8400" mpaId="3" bossId="3001" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1042" nextId="1043" checkPoint="42" unLock="7,21" checkPointReward="" first="8,3" victory="3,84000" fail="3,8400" mpaId="3" bossId="3002" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1043" nextId="1044" checkPoint="43" unLock="7,22" checkPointReward="" first="8,3" victory="3,88000" fail="3,8800" mpaId="3" bossId="3003" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1044" nextId="1045" checkPoint="44" unLock="7,22" checkPointReward="" first="8,3" victory="3,88000" fail="3,8800" mpaId="3" bossId="3004" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1045" nextId="1046" checkPoint="45" unLock="7,23" checkPointReward="" first="8,3" victory="3,92000" fail="3,9200" mpaId="3" bossId="3005" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1046" nextId="1047" checkPoint="46" unLock="7,23" checkPointReward="" first="8,3" victory="3,92000" fail="3,9200" mpaId="3" bossId="3006" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1047" nextId="1048" checkPoint="47" unLock="7,24" checkPointReward="" first="8,3" victory="3,96000" fail="3,9600" mpaId="3" bossId="3007" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1048" nextId="1049" checkPoint="48" unLock="7,24" checkPointReward="" first="8,3" victory="3,96000" fail="3,9600" mpaId="3" bossId="3008" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1049" nextId="1050" checkPoint="49" unLock="7,25" checkPointReward="" first="8,3" victory="3,100000" fail="3,10000" mpaId="3" bossId="3009" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+	<Data id="1050" nextId="0" checkPoint="50" unLock="7,25" checkPointReward="3,100000" first="8,3" victory="3,100000" fail="3,10000" mpaId="3" bossId="3010" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
+</Root><?xml version="1.0" encoding="utf-8"?>
+<Root>
+	<Data id="1001" monsterId="1001" group="20" weight="80" killCount="1,1" />
+	<Data id="1002" monsterId="1002" group="20" weight="80" killCount="1,1" />
+	<Data id="1003" monsterId="1003" group="20" weight="70" killCount="1,1" />
+	<Data id="1004" monsterId="1004" group="20" weight="70" killCount="1,1" />
+	<Data id="1005" monsterId="1005" group="20" weight="70" killCount="1,1" />
+	<Data id="1006" monsterId="1006" group="20" weight="60" killCount="1,1" />
+	<Data id="1007" monsterId="1007" group="20" weight="60" killCount="1,1" />
+	<Data id="1008" monsterId="1008" group="20" weight="60" killCount="1,1" />
+	<Data id="1009" monsterId="1009" group="20" weight="50" killCount="1,1" />
+	<Data id="1010" monsterId="1010" group="20" weight="50" killCount="1,1" />
+	<Data id="1011" monsterId="1011" group="20" weight="50" killCount="1,1" />
+	<Data id="1012" monsterId="1012" group="15" weight="40" killCount="2,2" />
+	<Data id="1013" monsterId="1013" group="15" weight="40" killCount="2,2" />
+	<Data id="1014" monsterId="1014" group="15" weight="35" killCount="2,2" />
+	<Data id="1015" monsterId="1015" group="15" weight="35" killCount="2,2" />
+	<Data id="1016" monsterId="2001" group="10" weight="30" killCount="3,3" />
+	<Data id="1017" monsterId="2002" group="10" weight="30" killCount="3,3" />
+	<Data id="1018" monsterId="2003" group="10" weight="20" killCount="4,4" />
+	<Data id="1019" monsterId="2004" group="10" weight="20" killCount="4,4" />
+	<Data id="1020" monsterId="2005" group="5" weight="20" killCount="4,4" />
+	<Data id="1021" monsterId="2006" group="5" weight="10" killCount="5,5" />
+	<Data id="1022" monsterId="2007" group="5" weight="10" killCount="5,5" />
+	<Data id="1023" monsterId="2008" group="5" weight="10" killCount="5,5" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data id="10001" xxx="观看视频" ttt="Watch Video" />
@@ -1215,17 +1446,17 @@
 	<Data id="1003" name="mapName_1003" beizhu="危险沙漠" battleType="3" unLockMagic="19" demand="10000" prohibit="0" useMagic="19,30" fishWave="6,8" fishScheme="1,1|2,1|3,1|4,1|5,1|6,1|7,1|8,1" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
-	<Data id="1000" level="0" vipeXp="6" everdayReward="2,90" skillQuantity="0" />
-	<Data id="1001" level="1" vipeXp="60" everdayReward="2,900" skillQuantity="1" />
-	<Data id="1002" level="2" vipeXp="120" everdayReward="2,1800" skillQuantity="2" />
-	<Data id="1003" level="3" vipeXp="400" everdayReward="2,6000" skillQuantity="3" />
-	<Data id="1004" level="4" vipeXp="2000" everdayReward="2,30000" skillQuantity="4" />
-	<Data id="1005" level="5" vipeXp="5000" everdayReward="2,75000" skillQuantity="5" />
-	<Data id="1006" level="6" vipeXp="10000" everdayReward="2,150000" skillQuantity="6" />
-	<Data id="1007" level="7" vipeXp="20000" everdayReward="2,300000" skillQuantity="7" />
-	<Data id="1008" level="8" vipeXp="50000" everdayReward="2,750000" skillQuantity="8" />
-	<Data id="1009" level="9" vipeXp="1000000" everdayReward="2,15000000" skillQuantity="9" />
-	<Data id="1010" level="10" vipeXp="2000000" everdayReward="2,30000000" skillQuantity="10" />
+	<Data id="1000" level="0" vipeXp="0" everdayReward="2,90" skillQuantity="0" />
+	<Data id="1001" level="1" vipeXp="6" everdayReward="2,900" skillQuantity="1" />
+	<Data id="1002" level="2" vipeXp="60" everdayReward="2,1800" skillQuantity="2" />
+	<Data id="1003" level="3" vipeXp="120" everdayReward="2,6000" skillQuantity="3" />
+	<Data id="1004" level="4" vipeXp="400" everdayReward="2,30000" skillQuantity="4" />
+	<Data id="1005" level="5" vipeXp="2000" everdayReward="2,75000" skillQuantity="5" />
+	<Data id="1006" level="6" vipeXp="5000" everdayReward="2,150000" skillQuantity="6" />
+	<Data id="1007" level="7" vipeXp="10000" everdayReward="2,300000" skillQuantity="7" />
+	<Data id="1008" level="8" vipeXp="20000" everdayReward="2,750000" skillQuantity="8" />
+	<Data id="1009" level="9" vipeXp="50000" everdayReward="2,15000000" skillQuantity="9" />
+	<Data id="1010" level="10" vipeXp="1000000" everdayReward="2,30000000" skillQuantity="10" />
 </Root><?xml version="1.0" encoding="utf-8"?>
 <Root>
 	<Data ID="1" SensitiveWord="悠扬" />

+ 4 - 1
protocol/ws_index_request.proto

@@ -21,6 +21,7 @@ message IndexPageDataResponse {
     repeated UnclaimedMagicStoneEntry unclaimed_magic_stone_map = 1; // 未领取魔法石映射
     optional StoryEntry storyEntry = 2;   //闯关模式数据
     optional int32 maxMagicArrayLevel=3;   //当前拥有的魔法阵最大等级
+    repeated int64 collected_story_ids=4;   //已领取的阶段性奖励关卡id
 }
 
 message UnclaimedMagicStoneEntry {
@@ -32,4 +33,6 @@ message StoryEntry{
     optional string story_id = 1;                          // 闯关模式当前关卡id
     optional bool success= 2 [default = false];            // 是否通关 true  通关
     optional int32 story_ticket = 3;                       // 挑战券数量
-}
+}
+
+

+ 6 - 8
protocol/ws_mail_request.proto

@@ -36,18 +36,11 @@ message PlayerMailList{
   optional string create_time=8;   //邮件发送时间
 }
 
-
 message ItemVo{
   optional int64 item_id=1;        //道具id
-  optional int32 quantity=2;       //数量
+  optional int64 quantity=2;       //数量
 }
 
-// 获取邮件明细单个邮件
-message MailDetailRequestMessage {
-  optional WsMessageType message_id = 1 [default = MAIL_DETAIL_REQUEST];  // 获取邮件明细单个邮件
-  optional int32 mailId = 2;                             // 邮件id
-  optional CommonRequest envelope = 10;                  // 公共必传参数集
-}
 
 // 领取邮件附件 批量领取
 message MailClaimRequestMessage {
@@ -56,6 +49,11 @@ message MailClaimRequestMessage {
   optional CommonRequest envelope = 10;                  // 公共必传参数集
 }
 
+//领取邮件附件响应
+message MailClaimResponse{
+  repeated ItemVo items=1;   // 获取的道具列表
+}
+
 //标记邮件已读 批量已读
 message MailReadRequestMessage{
   optional WsMessageType message_id = 1 [default = MAIL_READ_REQUEST];  // 领取邮件附件