Ver Fonte

冲突解决再提交

cyzhao há 3 anos atrás
pai
commit
72d7f1f51c

+ 6 - 4
Gameserver/Amfphp/process/TaskProc.php

@@ -477,12 +477,14 @@ class TaskProc {
                 }
             }
         }
-
-        if ($num >= 4 && $handOverTask == 0) {//每日任务全部完成,挂载每日任务--交付任务           
+        
+        if($num>=4 && $handOverTask == 0){//每日任务全部完成,挂载每日任务--交付任务           
+            ctx()->store->dailyTask_HandOver = 1;
             $count = count($list);
-            $rand = rand(0, $count - 1);
+            $rand = rand(0,$count-1);
+            
+            StoreProc::PutTaskCardInStore($list[$rand]);          
 
-            StoreProc::PutTaskCardInStore($list[$rand]);
         }
     }
 

+ 2 - 3
Gameserver/Amfphp/process/UserProc.php

@@ -446,6 +446,7 @@ class UserProc {
             ctx()->colleg = $college;
             ShopProc::resetDaliySpecialPackages();                              #每日特惠领奖每日重置
             self::checkMissOrder();                                             #校验是否有漏单
+            TaskProc::checkHandOverDailyTask();
             UserProc::updateUserInfo();                                         # 这一步回存操作只有在 userInfo正常存在的情况下才进行
 
             $resp = Resp::ok($game);                                            # 设置返回值
@@ -519,9 +520,7 @@ class UserProc {
        if(!StlUtil::dictHasProperty($game->store, 'dailyTask_HandOver')){
             $game->store->dailyTask_HandOver = 0;
         }
-                  
-        TaskProc::checkHandOverDailyTask();
-        
+                         
     }
 
     /**