Merge branch 'dev' into tap

Gameserver/App/process/ActiveProc.php

@@ -122,13 +122,13 @@ class ActiveProc {
 
         $costTag = true;
         if ($num == 1 && ctx()->privateState->lotteryNum_free < GameConfig::glc2()->activity_lottery_FreeNum + GameConfig::glc2()->activity_lottery_GuanggaoNum) {
-            $costTag = false;            
+            $costTag = false;
         }
 
-        if($num == 1){
+        if ($num == 1) {
             ctx()->privateState->lotteryNum_free += 1;
         }
-        
+
         if ($costTag) {
             $cost = "";
             if ($num == 1) {
@@ -147,15 +147,15 @@ class ActiveProc {
 
         if (ctx()->privateState->lotteryNum_free > GameConfig::glc2()->activity_lottery_FreeNum && ctx()->privateState->lotteryNum_free <= GameConfig::glc2()->activity_lottery_FreeNum + GameConfig::glc2()->activity_lottery_GuanggaoNum) {
             my_Assert(now() - ctx()->privateData(true)->activity_lottery_guanggaoTs >= GameConfig::glc2()->activity_lottery_GuanggaoDownTs, ErrCode::user_shop_DownTsLimit);
-            ctx()->privateData(true)->activity_lottery_guanggaoTs = now();  
-            
+            ctx()->privateData(true)->activity_lottery_guanggaoTs = now();
+
             TaskProc::OnLookGuanggao();
         }
 
         if (ctx()->privateState->lotteryNum < glc()->activity_lottery_allNum) {
             ctx()->privateState->lotteryNum += $num;
         }
-      
+
         $rewardList = array();
         $dic = GameConfig::activity_lottery_tree();
         for ($i = 0; $i < $num; $i++) {
@@ -632,5 +632,4 @@ class ActiveProc {
                     'reward_equip' => StoreProc::$reward_equip,
         ));
     }
-
 }

Gameserver/App/process/TaskProc.php

@@ -35,12 +35,12 @@ class TaskProc {
             case CmdCode::cmd_task_prizesAllreceived:                           # 6206 任务奖励一键领取
                 return TaskProc::taskPrizesAllreceived();
             case CmdCode::cmd_task_lookGuangGao:                                # 6207 观看广告 通知后端
-                return TaskProc::LookGuangGao();               
+                return TaskProc::LookGuangGao();
             default:
                 Err(ErrCode::cmd_err);
         }
     }
-    
+
     /**
      * 6207 观看广告 通知后端
      * @return type
@@ -48,9 +48,9 @@ class TaskProc {
     public static function LookGuangGao() {
         //list($type) = req()->paras;
         TaskProc::OnLookGuanggao();
-        
+
         UserProc::updateUserInfo();
-        return Resp::ok(array("task" => ctx()->task,                 
+        return Resp::ok(array("task" => ctx()->task,
         ));
     }
 
@@ -431,6 +431,7 @@ class TaskProc {
         if (!$unlock && !FightProc::isFunUnlock(5)) {//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
             return;
         }
+
         self::ClearActiveTask(Enum_ActiveTaskType::WeekTask);
         self::initActiveTask(Enum_ActiveTaskType::WeekTask);
 
@@ -490,7 +491,7 @@ class TaskProc {
         $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::DailyLogin, Enum_PropelType::add, 1, array());
         self::CheckActiveTaskConditions($taskEventArg);
     }
-    
+
     /**
      * 改名字
      */
@@ -499,7 +500,6 @@ class TaskProc {
         self::CheckActiveTaskConditions($taskEventArg);
     }
 
-
     /**
      * 登录第X天
      */
@@ -720,7 +720,7 @@ class TaskProc {
         $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::BuyTiliOrLookGuanggao, Enum_PropelType::add, 1, array());
         self::CheckActiveTaskConditions($taskEventArg);
     }
-    
+
     /**
      * 观看广告
      */