活动

lua/app/config/activity.lua

@@ -1,11 +1,30 @@
 local activity = {
-	[11701]={
+	[10001]={
 		["act_type"]=2,
 		["time_type"]=1,
 		["start_time_1"]=1,
 		["end_time_1"]=8,
 		["func_open"]="summon_open",
 		["version"]=1,
+		["round_limit"]=5,
+		["round_reward"]={
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=44,
+ 				["id_for_nothing"]="Ugw=",
+				["num"]=1,
+ 				["num_for_nothing"]="Vw=="
+			},
+			{
+				["type"]=1,
+ 				["type_for_nothing"]="Vw==",
+				["id"]=2,
+ 				["id_for_nothing"]="VA==",
+				["num"]=1000,
+ 				["num_for_nothing"]="VwhcAw=="
+			}
+		},
 		["act_gift"]={
 			1060000001,
 			1062000001,

lua/app/config/const.lua

@@ -393,18 +393,18 @@ local const = {
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=2,
+				["id"]=44,
- 				["id_for_nothing"]="VA==",
+ 				["id_for_nothing"]="Ugw=",
 				["num"]=1,
  				["num_for_nothing"]="Vw=="
 			},
 			{
 				["type"]=1,
  				["type_for_nothing"]="Vw==",
-				["id"]=1,
+				["id"]=2,
- 				["id_for_nothing"]="Vw==",
+ 				["id_for_nothing"]="VA==",
-				["num"]=50,
+				["num"]=1000,
- 				["num_for_nothing"]="Uwg="
+ 				["num_for_nothing"]="VwhcAw=="
 			}
 		}
 	},

lua/app/config/task_type.lua

@@ -139,9 +139,12 @@ local task_type = {
 	},
 	[47]={
 
+	},
+	[48]={
+
 	}
 }
 local config = {
-data=task_type,count=47
+data=task_type,count=48
 }
 return config

lua/app/module/activity/act_sprint/act_sprint_const.lua

@@ -6,7 +6,7 @@ ActSprintConst.ACT_ID = {
 	-- SUMMON_V2 = 11501,
     -- CORE_SOUL_BOX_V2 = 11601,
 	-- 新版新手
-	SUMMON_ALL = 11701,
+	SUMMON_ALL = 10001,
 	-- CORE_SOUL_BOX_ALL = 11801,
 	-- -- Loop
 	-- SUMMON_LOOP = 11901,

lua/app/module/hero/hero_manager.lua

@@ -62,6 +62,11 @@ function HeroManager:heroStarReqFinish(result)
 		DataManager.HeroData:setDirty()
 		DataManager.HeroData:calcPower()
 
+		local qlt = DataManager.HeroData:getHeroQlt(result.hero.id)
+		if qlt == 5 then
+			ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5, 1)
+		end
+
 		AudioManager:playEffect(AudioManager.EFFECT_ID.HERO_UP)
 	end
 end

lua/app/module/task/task_const.lua

@@ -54,6 +54,7 @@ TaskConst.TASK_TYPE = {
     X_SUMMON_HERO_4 = 45,                   -- 获得X个史诗英雄（紫色）
     X_SUMMON_HERO_3 = 46,                   -- 获得X个稀有英雄（蓝色）
     X_SUMMON_HERO = 47,                     -- 招聘X次
+    X_STAR_HERO_5 = 48,                     -- 传说英雄（橙色)最高星达X	历史最高记录，从建号起记录
 }
 
 return TaskConst

lua/app/module/task/task_manager.lua

@@ -346,6 +346,10 @@ function TaskManager:xRunesQuenching(count)
     self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING, count)
 end
 
+function TaskManager:xStarHero5(count)
+    self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5, count)
+end
+
 ---- 没有特殊说明，方法均返回任务增量
 TaskManager.TYPE_DEAL_FUNC = {
     [GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd,
@@ -388,6 +392,7 @@ TaskManager.TYPE_DEAL_FUNC = {
     [GConst.TaskConst.TASK_TYPE.X_BUY_ANYONE] = TaskManager.xBuyAnyone,
     [GConst.TaskConst.TASK_TYPE.X_RUNES_GETED_MATERIALS] = TaskManager.xRunesGetedMaterials,
     [GConst.TaskConst.TASK_TYPE.X_RUNES_QUENCHING] = TaskManager.xRunesQuenching,
+    [GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5] = TaskManager.xStarHero5,
 }
 
 function TaskManager:taskGoto(taskType)
@@ -456,6 +461,7 @@ TaskManager.gotoFunc = {
     [GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO_4] = TaskManager.gotoSummonUI,
     [GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO_3] = TaskManager.gotoSummonUI,
     [GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO] = TaskManager.gotoSummonUI,
+    [GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5] = TaskManager.gotoMainHeroUI,
 }
 
 function TaskManager:dealTaskType(taskType, callback, onlyGet)

lua/app/net/net_manager.lua

@@ -673,9 +673,9 @@ function NetManager:showReconnectMain()
         return
     end
     local params = {
-        content = I18N:getGlobalText(I18N.GlobalConst.DISCONNECT_DESC_2),
+        content = I18N:getGlobalText(I18N.GlobalConst.RECONNECT),
         okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
-        cancelText = I18N:getGlobalText(I18N.GlobalConst.DISCONNECT_DESC_3),
+        cancelText = I18N:getGlobalText(I18N.GlobalConst.RELOGIN),
         noShowClose = true,
         okFunc = function()
             self:reconnectMain()

lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua

@@ -3,12 +3,6 @@ local ActSprintSummonData = class("ActSprintSummonData", ActBaseData)
 
 function ActSprintSummonData:ctor()
 	self:clear()
-
-	self.actId = 11701
-	self.startTime = Time:getServerTime()
-	self.endTime = Time:getServerTime() + 864000
-	self.extraTime = Time:getServerTime() + 864000
-	self:initBountyCfg()
 end
 
 function ActSprintSummonData:clear()