任务解锁bug修复

Gameserver/App/model/User/Info_Task.php

@@ -100,16 +100,16 @@ class Info_Task extends Object_ext{
     public function initialize() {
       //$this->taskcards = new \stdClass();
       //$this->achieveDic = new \stdClass(); 
-        $day7List = GameConfig::activeTask_type_getItemArray(Enum_ActiveTaskType::WeekTask);
-        $length = $this->activeTaskLength;
-        foreach ($day7List as $key => $task) {
-            $length += 1;
-            $ins_TaskStep_Active = new Ins_TaskStep_Active($task->id);
-            $ins_TaskStep_Active->uid = $length;
-            $ins_TaskStep_Active->state = Enum_TaskCardStateType::ing;
-            $this->activeTaskInfo->$length = $ins_TaskStep_Active;
-        }
-        $this->activeTaskLength = $length;
+//        $day7List = GameConfig::activeTask_type_getItemArray(Enum_ActiveTaskType::WeekTask);
+//        $length = $this->activeTaskLength;
+//        foreach ($day7List as $key => $task) {
+//            $length += 1;
+//            $ins_TaskStep_Active = new Ins_TaskStep_Active($task->id);
+//            $ins_TaskStep_Active->uid = $length;
+//            $ins_TaskStep_Active->state = Enum_TaskCardStateType::ing;
+//            $this->activeTaskInfo->$length = $ins_TaskStep_Active;
+//        }
+//        $this->activeTaskLength = $length;
                              
     }
 

Gameserver/App/process/FightProc.php

@@ -987,11 +987,11 @@ class FightProc {
                 TaskProc::Day7TaskReset();
             }
             if($mo->type == 2 && $mo->id == Enum_SubFunType::DailyTask){
-                TaskProc::DailyTaskReset();
+                TaskProc::DailyTaskReset(true);
             }
             
             if($mo->type == 2 && $mo->id == Enum_SubFunType::WeekTask){
-                TaskProc::WeekTaskReset();
+                TaskProc::WeekTaskReset(true);
             }
             
         }

Gameserver/App/process/TaskProc.php

@@ -391,11 +391,11 @@ class TaskProc {
     /**
      * 日常
      */
-    static function DailyTaskReset() {
-        if (!FightProc::isFunUnlock(5)) {
+    static function DailyTaskReset($unlock = false) {
+        if(!$unlock && !FightProc::isFunUnlock(5)){
             return;
         }
-
+           
         self::ClearActiveTask(Enum_ActiveTaskType::DailyTask);
         self::initActiveTask(Enum_ActiveTaskType::DailyTask);
         self::autoRecoverState_activeTask();
@@ -406,8 +406,8 @@ class TaskProc {
     /**
      * 周常
      */
-    static function WeekTaskReset() {
-        if (!FightProc::isFunUnlock(5)) {
+    static function WeekTaskReset($unlock = false) {
+        if(!$unlock && !FightProc::isFunUnlock(5)){
             return;
         }
         self::ClearActiveTask(Enum_ActiveTaskType::WeekTask);