Browse Source

fix: 任务步骤检查逻辑.

gwang 4 years ago
parent
commit
b1f5992d33

+ 17 - 1
Gameserver/Amfphp/model/Const/GameConfig.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2021-02-20 11:02:03
+ // 日期: 2021-02-24 11:02:08
 ////////////////////
 
 /**
@@ -503,6 +503,22 @@ class GameConfig {
         return self::get_hash_item('task_node', $itemid);
     }
     /**
+    * 
+    * @return \gate_mainland
+    */
+    public static function gate_mainland()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'gate_mainland');
+    }
+    /**
+    * @return \sm_gate_mainland gate_mainland item数据 
+    */
+    public static function gate_mainland_getItem($itemid)
+    { 
+        return self::get_hash_item('gate_mainland', $itemid);
+    }
+    /**
     * 动作事件表
     * @return \eventAction
     */

+ 58 - 0
Gameserver/Amfphp/model/Const/sm_gate_mainland.php

@@ -0,0 +1,58 @@
+<?php
+
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author: gwang 
+ // 日期: 2021-02-22 15:13:55
+////////////////////
+
+
+/**
+ * Static Model gate_mainland 
+ */
+class sm_gate_mainland
+{
+
+    /**
+    * @var Int32 用途未知!!请到数据库中添加字段注释。  
+    */
+    public $id;
+
+    /**
+    * @var Int32    
+    */
+    public $landId;
+
+    /**
+    * @var String 关卡名称  
+    */
+    public $landName;
+
+    /**
+    * @var String 描述  
+    */
+    public $desc;
+
+    /**
+    * @var String 是否是主线 default(1) 
+    */
+    public $isMain;
+
+    /**
+    * @var String 包含的区域内容  
+    */
+    public $containZones;
+
+    /**
+    * @var String 用途未知!!请到数据库中添加字段注释。  
+    */
+    public $path;
+
+    /**
+    * @var DateTime 上次修改 default(CURRENT_TIMESTAMP) 
+    */
+    public $lastupdate;
+
+}
+

+ 7 - 22
Gameserver/Amfphp/model/Const/sm_gate_zone.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2020-09-11 10:01:57
+ // 日期: 2021-02-22 15:18:49
 ////////////////////
 
 
@@ -15,22 +15,22 @@ class sm_gate_zone
 {
 
     /**
-    * @var Int32 用途未知!!请到数据库中添加字段注释。  
+    * @var Int32 区域编号  
     */
-    public $worldId;
+    public $zoneId;
 
     /**
-    * @var String 用途未知!!请到数据库中添加字段注释。  
+    * @var String 区域名称  
     */
-    public $worldName;
+    public $zoneName;
 
     /**
-    * @var String 用途未知!!请到数据库中添加字段注释。  
+    * @var String 描述/备注  
     */
     public $desc;
 
     /**
-    * @var String 用途未知!!请到数据库中添加字段注释。  
+    * @var String 包含关卡列表  
     */
     public $contains;
 
@@ -39,20 +39,5 @@ class sm_gate_zone
     */
     public $playerLevelLimit;
 
-    /**
-    * @var String 依赖其他关卡解锁的世界地图ID  
-    */
-    public $relyWorldId;
-
-    /**
-    * @var String 用途未知!!请到数据库中添加字段注释。  
-    */
-    public $position;
-
-    /**
-    * @var String 地图放大状态下,区域块的大概位置  
-    */
-    public $worldPosition;
-
 }
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_taskcard_shop.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2021-02-10 14:49:08
+ // 日期: 2021-02-22 13:54:10
 ////////////////////
 
 

+ 3 - 4
Gameserver/Amfphp/model/User/Ins_TaskStep.php

@@ -134,16 +134,15 @@ class Ins_TaskStep extends Object_ext {
      */
     public function check_new($taskCardEvent) {
 //        var_dump($taskCardEvent);
+        if ($taskCardEvent->taskType != $this->mo()->cmd) {                     # 事件类型匹配
+            return false;
+        }
         if ($this->isStatusType()) {                                            # 状态检查类任务
             return $this->autoCalcStatusCur();
         }
         if ($this->isFinish()) {
             return true;
         }
-        if ($taskCardEvent->taskType != $this->mo()->cmd) {                     # 事件类型匹配
-            return false;
-        }
-
         if (strlen($this->mo()->paras) <= 0) {                                  # 无参数
             return true;
         }

+ 1 - 1
Gameserver/Amfphp/process/TaskProc.php

@@ -802,12 +802,12 @@ class TaskProc {
             }
             foreach ($task->curSteps as &$tsp) {                                # 初期里面只有一个任务
                 $tsp = new Ins_TaskStep($tsp);
+                var_dump($tsp);
                 if ($tsp->check_new($taskParam)) {
                     $bUpdate = true;
                     $tsp->propel($taskParam);
                     NormalEventProc::OnTaskCardStep_Process($task->uid, $tsp->typeId); # 任务进度更新
                     if ($tsp->isFinish()) {
-
                         if (strlen($tsp->mo()->next) > 0) {                     # 有后续任务
                             $arr = explode(',', $tsp->mo()->next);
                             foreach ($arr as $stpid) {

+ 1 - 18
Gameserver/nbproject/private/private.xml

@@ -12,27 +12,10 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/Const/globalsettings.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/del_MissProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_TaskCmdType.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/ErrCode.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_TaskCardStateType.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/StoreProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/TaskProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_PropelType.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/UserProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/MemKey_GameRun.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc/SweepGatesProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskCard.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/main.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskStep.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/test.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/MemKey_Stat.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskEventArgs.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/HeroProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/ShopProc.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
         </group>
     </open-files>
 </project-private>