test

Gameserver/App/process/ActiveProc.php

@@ -318,9 +318,9 @@ class ActiveProc {
      * 7日签到 数据更新
      */
     public static function DailyResetDay7Task($unlock = false) {
-        if (!$unlock && !FightProc::isFunUnlock(5)) {//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
-            return;
-        }
+//        if (!$unlock && !FightProc::isFunUnlock(5)) {//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
+//            return;
+//        }
 
         if (count(ctx()->privateState->LoginDays) >= 7) {
             ctx()->privateState->LoginDays = array();
@@ -416,21 +416,21 @@ class ActiveProc {
     /**
      * 限时贩卖 2天一刷
      */
-    public static function ResetLimitTsBuy() {       
+    public static function ResetLimitTsBuy() {
         ctx()->privateState->limitTsBuy_RewardRecord = array();
-        
+
         $mo = GameConfig::subfun_unlock_getItem(Enum_SubFunType::LimitTsSale);
         $day = $mo->ts;
         $startDay = TimeUtil::totalDays($mo->startTs);
         $nextDay = TimeUtil::totalDays();
-     
+
         $num = $nextDay - $startDay;
         $refershType = $num % $day; //day 2天一刷新 余数只会是0 或 1; 0:两天后在刷新，1就是已经过了一天了，在过一天就刷新，当前时间减一天
-        ctx()->privateState->nextDayLogin = now() - 86400*$refershType;
+        ctx()->privateState->nextDayLogin = now() - 86400 * $refershType;
 //        if ($refershType == 1) {
 //            ctx()->privateState->nextDayLogin = now() - 86400;
 //        }
-      
+
         $val = intval($num / $day);
         $yushu = $val % glc()->activity_limitTsBuy_giftTypeNum;
         $type = $yushu + 1;
@@ -470,9 +470,9 @@ class ActiveProc {
 
         my_Assert(ctx()->baseInfo->cash >= explode(',', $mo->cost)[1], ErrCode::notenough_cash_msg);
         ctx()->baseInfo->Consume_Cash(explode(',', $mo->cost)[1]);
-        
+
         $rewardArr = ctx()->privateState->limitTsBuy_RewardRecord;
-        $count = array_count_values($rewardArr)[$typeId];	        
+        $count = array_count_values($rewardArr)[$typeId];
         my_Assert($count < $mo->limitNum, ErrCode::user_shop_LimitNum);
 
         StoreProc::AddMultiItemInStore($mo->reward);                            # 发放奖励
@@ -489,42 +489,42 @@ class ActiveProc {
                     'reward_equip' => StoreProc::$reward_equip,
         ));
     }
-    
+
     /**
      * 6109 战令奖励领取
      */
     public static function BattlePassDrawReward() {
-        list($id) = req()->paras;                                               
+        list($id) = req()->paras;
 
         $mo = GameConfig::activity_battlepass_getItem($id);                     # 查询奖励数据
         my_Assert(null != $mo, ErrCode::err_const_no);                          # 防御找不到配置
         $subFunType = $mo->type;
         $typeId = $mo->typeId;
-        
-        $str_1 = $subFunType.'-1-'.$typeId;       
-        $str_2 = $subFunType.'-2-'.$typeId;        
+
+        $str_1 = $subFunType . '-1-' . $typeId;
+        $str_2 = $subFunType . '-2-' . $typeId;
         $isHasBuy_high = false;
         switch ($subFunType) {
             case Enum_SubFunType::ActivePoint_BattlePass:
-                $point =ctx()->privateState->battlePass_taskPoint;                         
+                $point = ctx()->privateState->battlePass_taskPoint;
                 my_Assert($point >= $typeId, ErrCode::active_pointNotEnough);
-                
-                if(ctx()->privateState->battlePass_activePoint_cost_ts > 0 && now() < ctx()->privateState->battlePass_activePoint_cost_ts + 30*24*60*60){
+
+                if (ctx()->privateState->battlePass_activePoint_cost_ts > 0 && now() < ctx()->privateState->battlePass_activePoint_cost_ts + 30 * 24 * 60 * 60) {
                     $isHasBuy_high = true;
                 }
-                
+
                 break;
             case Enum_SubFunType::Tili_BattleBass:
                 my_Assert(ctx()->privateData()->battlePass_tili >= $typeId, ErrCode::active_costTiliNotEnough);
-                if(ctx()->privateState->battlePass_tili_cost_ts > 0 && now() < ctx()->privateState->battlePass_tili_cost_ts + 30*24*60*60){
+                if (ctx()->privateState->battlePass_tili_cost_ts > 0 && now() < ctx()->privateState->battlePass_tili_cost_ts + 30 * 24 * 60 * 60) {
                     $isHasBuy_high = true;
                 }
                 break;
             case Enum_SubFunType::Gate_BattleBass:
-                my_Assert(StlUtil::dictHasProperty(ctx()->gates->GateList,$typeId), ErrCode::gate_GateNoUnlock);
+                my_Assert(StlUtil::dictHasProperty(ctx()->gates->GateList, $typeId), ErrCode::gate_GateNoUnlock);
                 my_Assert(ctx()->gates->GateList->$typeId->pass > 0, ErrCode::evolve_GateNoPass);
-                                      
-                if(ctx()->privateState->battlePass_gate_cost_ts > 0 && now() < ctx()->privateState->battlePass_gate_cost_ts + 30*24*60*60){
+
+                if (ctx()->privateState->battlePass_gate_cost_ts > 0 && now() < ctx()->privateState->battlePass_gate_cost_ts + 30 * 24 * 60 * 60) {
                     $isHasBuy_high = true;
                 }
                 break;
@@ -532,18 +532,18 @@ class ActiveProc {
             default:
                 break;
         }
-        
-        if(!in_array($str_1, ctx()->privateState->battlePassRewardReceived)){         
+
+        if (!in_array($str_1, ctx()->privateState->battlePassRewardReceived)) {
             StoreProc::AddMultiItemInStore($mo->rewards_1);                     # 发放奖励
             ctx()->privateData(true)->battlePassRewardReceived[] = $str_1;
         }
-        
+
         //my_Assert(!in_array($str_1, ctx()->privateState->battlePassRewardReceived), ErrCode::active_hasgetted);
-        if($isHasBuy_high && !in_array($str_2, ctx()->privateState->battlePassRewardReceived)){
+        if ($isHasBuy_high && !in_array($str_2, ctx()->privateState->battlePassRewardReceived)) {
             StoreProc::AddMultiItemInStore($mo->rewards_2);                     # 发放奖励
             ctx()->privateData(true)->battlePassRewardReceived[] = $str_2;
         }
-                                                 
+
         UserProc::updateUserInfo();                                             # 回存
         return Resp::ok(array('gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
@@ -553,7 +553,7 @@ class ActiveProc {
                     'reward' => StoreProc::$reward,
                     'reward_Gem' => StoreProc::$reward_Gem,
                     'reward_equip' => StoreProc::$reward_equip,
-                    "tili" => ctx()->baseInfo->tili, 
+                    "tili" => ctx()->baseInfo->tili,
                     "tili_ts" => ctx()->baseInfo->tili_ts,
         ));
     }
@@ -567,29 +567,29 @@ class ActiveProc {
         $rmArr = array();
         foreach ($list as $str) {
             $arr = explode('-', $str);
-            if($arr[0] == $type){
+            if ($arr[0] == $type) {
                 $rmArr[] = $str;
             }
         }
-        
+
         foreach ($rmArr as $k) {
-            StlUtil::arrayRemove(ctx()->privateData(true)->battlePassRewardReceived, $k); 
+            StlUtil::arrayRemove(ctx()->privateData(true)->battlePassRewardReceived, $k);
         }
     }
-    
+
     /**
      * 7日签到 数据更新
      */
-    public static function InitDay7_Sign_NewPlayer($unlock = false) {     
+    public static function InitDay7_Sign_NewPlayer($unlock = false) {
         if (!$unlock && !FightProc::isFunUnlock(21)) {//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
             return;
         }
         $index = count(ctx()->privateState->day7_drawed_newPlayer_LoginDays) + 1;
         if (count(ctx()->privateState->day7_drawed_newPlayer_LoginDays) < 7) {
             ctx()->privateState->day7_drawed_newPlayer_LoginDays[] = $index;
-        }                      
+        }
     }
-    
+
     /**
      * 6110 新手7日签到
      * @return type
@@ -614,5 +614,4 @@ class ActiveProc {
                     'reward_equip' => StoreProc::$reward_equip,
         ));
     }
-    
 }

Gameserver/App/process/TaskProc.php

@@ -118,7 +118,7 @@ class TaskProc {
                     'gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'heros' => ctx()->heros,
-                    'battlePass_taskPoint'=> ctx()->privateData()->battlePass_taskPoint,
+                    'battlePass_taskPoint' => ctx()->privateData()->battlePass_taskPoint,
         ));
     }
 
@@ -232,7 +232,7 @@ class TaskProc {
                     'gold' => ctx()->baseInfo->gold,
                     'cash' => ctx()->baseInfo->cash,
                     'heros' => ctx()->heros,
-                    'battlePass_taskPoint'=> ctx()->privateData()->battlePass_taskPoint,
+                    'battlePass_taskPoint' => ctx()->privateData()->battlePass_taskPoint,
         ));
     }
 
@@ -298,14 +298,13 @@ class TaskProc {
         ));
     }
 
-    static function ResetTask() {                  
+    static function ResetTask() {
 //        self::DailyTaskReset();
 //        self::ClearDay7Task();                      
 //        $week = date("w");
 //        if ($week == 1) {//每周一 第一次登录的时候刷新         
 //            self::WeekTaskReset();            
 //        }
-             
     }
 
     static function ClearDay7Task() {
@@ -399,10 +398,10 @@ class TaskProc {
      * 日常
      */
     static function DailyTaskReset($unlock = false) {
-        if(!$unlock && !FightProc::isFunUnlock(5)){//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
-            return;
-        }
-           
+//        if(!$unlock && !FightProc::isFunUnlock(5)){//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
+//            return;
+//        }
+
         self::ClearActiveTask(Enum_ActiveTaskType::DailyTask);
         self::initActiveTask(Enum_ActiveTaskType::DailyTask);
         self::autoRecoverState_activeTask();
@@ -414,9 +413,9 @@ class TaskProc {
      * 周常
      */
     static function WeekTaskReset($unlock = false) {
-        if(!$unlock && !FightProc::isFunUnlock(5)){//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
-            return;
-        }
+//        if(!$unlock && !FightProc::isFunUnlock(5)){//之所以这有两个判断是因为这个 活动解锁的代码监测位置问题，fightProc 里解锁监测代码在 $gateInfo->tz_state = $index;之前了 这个位置没有办法解锁
+//            return;
+//        }
         self::ClearActiveTask(Enum_ActiveTaskType::WeekTask);
         self::initActiveTask(Enum_ActiveTaskType::WeekTask);
 
@@ -604,7 +603,7 @@ class TaskProc {
         $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::EquipLevelUpNum, Enum_PropelType::add, 1, array());
         self::CheckActiveTaskConditions($taskEventArg);
     }
-    
+
     /**
      * 装备合成
      */