浏览代码

翻翻乐登录任务修改

cyzhao 3 天之前
父节点
当前提交
26fce99018

+ 1 - 1
Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2025-06-05 15:19:44
+ // 日期: 2025-06-10 11:11:02
 ////////////////////
 
 /**

+ 1 - 1
Gameserver/App/model/Const/sm_activeTask.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2025-05-29 16:43:52
+ // 日期: 2025-06-10 11:13:18
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_activeTask_type.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2025-05-29 16:43:52
+ // 日期: 2025-06-10 11:13:18
 ////////////////////
 
 

+ 1 - 1
Gameserver/App/model/Const/sm_item.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2025-06-05 15:22:41
+ // 日期: 2025-06-10 11:05:58
 ////////////////////
 
 

+ 2 - 2
Gameserver/App/model/User/Info_PrivateState.php

@@ -514,10 +514,10 @@ class Info_PrivateState extends Object_ext {
     public $flipCardNum_daily = 0;
     
     /**
-     * 开始时间
+     * 开始时间 废弃
      * @var type
      */
-    public $flipCardLottery_startTs = 0;
+    //public $flipCardLottery_startTs = 0;
     
     /**
      * 结束时间

+ 19 - 19
Gameserver/App/model/User/Ins_TaskStep_Active.php

@@ -268,25 +268,25 @@ class Ins_TaskStep_Active extends Object_ext {
                     }
                 }                                               
                 return $day;
-            case Enum_ActiveTaskCmdType::OnLogin_Accumulate_FlipCard:           # 金蛇 累计登录天数 
-                $day = 0;               
-                $mo = GameConfig::subfun_unlock_getItem(Enum_SubFunType::FlipCardLottery);                
-                if (now()>= $mo->startTs && now()< $mo->endTs) {
-                    //$startDay = TimeUtil::totalDays($mo->startTs);
-                    
-                    $startDay = TimeUtil::totalDays(ctx()->privateState->flipCardLottery_startTs);
-                    $endDay = TimeUtil::totalDays($mo->endTs);                  
-                    if (TimeUtil::totalDays(now()) <= $endDay) {
-                        $day = 0;
-                        for ($i = $startDay; $i <= $endDay; $i++) {
-                            $day += 1;
-                            if (TimeUtil::totalDays(now()) == $i) {
-                                break;
-                            }
-                        }
-                    }
-                }
-                return $day;                                 
+//            case Enum_ActiveTaskCmdType::OnLogin_Accumulate_FlipCard:           # 金蛇 累计登录天数 
+//                $day = 0;               
+//                $mo = GameConfig::subfun_unlock_getItem(Enum_SubFunType::FlipCardLottery);                
+//                if (now()>= $mo->startTs && now()< $mo->endTs) {
+//                    //$startDay = TimeUtil::totalDays($mo->startTs);
+//                    
+//                    $startDay = TimeUtil::totalDays(ctx()->privateState->flipCardLottery_startTs);
+//                    $endDay = TimeUtil::totalDays($mo->endTs);                  
+//                    if (TimeUtil::totalDays(now()) <= $endDay) {
+//                        $day = 0;
+//                        for ($i = $startDay; $i <= $endDay; $i++) {
+//                            $day += 1;
+//                            if (TimeUtil::totalDays(now()) == $i) {
+//                                break;
+//                            }
+//                        }
+//                    }
+//                }
+//                return $day;                                 
             case Enum_ActiveTaskCmdType::PassLayer_ChallengeGate:
                 if(ctx()->gates->TowerGate->CurLayer-1 < 0){
                     return 0;

+ 1 - 1
Gameserver/App/process/ActiveProc.php

@@ -82,7 +82,7 @@ class ActiveProc {
         //活动结束
         $mo = GameConfig::subfun_unlock_getItem(Enum_SubFunType::FlipCardLottery);
         if (now() >= $mo->startTs && now() < $mo->endTs && $mo->endTs != ctx()->privateState->flipCardLottery_endTs) {//当活动重启再次开启的时候再重置数据
-            ctx()->privateState->flipCardLottery_startTs = now();
+            //ctx()->privateState->flipCardLottery_startTs = now();
             ctx()->privateState->flipCardLottery_endTs = $mo->endTs;
             ctx()->privateState->flipCardNum_all = 0;
             ctx()->privateState->flipCardNum_turnNum = 0;

+ 2 - 2
Gameserver/App/process/TaskProc.php

@@ -546,7 +546,7 @@ class TaskProc {
     }
     
     static function OnLogin_Accumulate_FlipCard() {
-        $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::OnLogin_Accumulate_FlipCard, Enum_PropelType::add, 1, array());
+        $taskEventArg = new Ins_TaskEventArgs(Enum_ActiveTaskCmdType::OnLogin_Accumulate, Enum_PropelType::add, 1, array());
         self::CheckActiveTaskConditions($taskEventArg);
     }
 
@@ -878,7 +878,7 @@ class TaskProc {
             if ($ins_TaskStep_Active->mo()->cmd == $taskParam->taskType) {
                 if ($ins_TaskStep_Active->isStatusType()) {//校验状态类的                                      
                     $cur = $ins_TaskStep_Active->calcStatusCur();
-                    if ($cur != $ins_TaskStep_Active->cur) {
+                    if ($cur != $ins_TaskStep_Active->cur) {                                               
                         $ins_TaskStep_Active->cur = $cur;
                         if ($ins_TaskStep_Active->cur >= $ins_TaskStep_Active->max()) {
                             $ins_TaskStep_Active->cur = $ins_TaskStep_Active->max();