fixed: 任务卡

Gameserver/Amfphp/base/OpeCode.php

@@ -18,10 +18,10 @@ class OpeCode {
      */
     const User = 600;
 
-    /**
-     * 好友功能
-     */
-    const Friend = 601;
+//    /**
+//     * 好友功能
+//     */
+//    const Friend = 601;
 
     /**
      * 任务模块

Gameserver/Amfphp/configs/GameConfig.php

@@ -957,6 +957,22 @@ class GameConfig {
         return self::get_hash_item('activity_reggift', $itemid);
     }
 
+    /**
+     * 错误信息表
+     * @return \errmsg
+     */
+    public static function errmsg() {
+        static $a = null;
+        return self::initValue($a, 'errmsg');
+    }
+
+    /**
+     * @return \sm_errmsg errmsg item数据 
+     */
+    public static function errmsg_getItem($itemid) {
+        return self::get_hash_item('errmsg', $itemid);
+    }
+
     /**
      * 公会捐献卡牌奖励
      * @return \guilddonatereward

Gameserver/Amfphp/model/Const/GameConfig.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-11-18 19:57:16
+ // 日期: 2020-11-19 15:04:02
 ////////////////////
 
 /**
@@ -953,6 +953,22 @@ class GameConfig {
         return self::get_hash_item('activity_reggift', $itemid);
     }
     /**
+    * 错误信息表
+    * @return \errmsg
+    */
+    public static function errmsg()
+    { 
+        static $a = null; 
+        return self::initValue($a, 'errmsg');
+    }
+    /**
+    * @return \sm_errmsg errmsg item数据 
+    */
+    public static function errmsg_getItem($itemid)
+    { 
+        return self::get_hash_item('errmsg', $itemid);
+    }
+    /**
     * 公会捐献卡牌奖励
     * @return \guilddonatereward
     */

Gameserver/Amfphp/model/Const/sm_errmsg.php

@@ -0,0 +1,38 @@
+<?php
+
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author： gwang 
+ // 日期: 2020-11-17 14:22:46
+////////////////////
+
+
+/**
+ * Static Model errmsg 错误信息表
+ */
+class sm_errmsg
+{
+
+    /**
+    * @var String ERR_ID  
+    */
+    public $err;
+
+    /**
+    * @var Int32 错误码  
+    */
+    public $no;
+
+    /**
+    * @var Int32 错误类型: 继续=0.重启=1. default(0) 
+    */
+    public $type;
+
+    /**
+    * @var String 描述信息  
+    */
+    public $msg;
+
+}
+

Gameserver/Amfphp/model/Const/sm_gate.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-09-24 14:57:46
+ // 日期: 2020-11-19 13:55:26
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_gate_combat.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-11-02 10:10:49
+ // 日期: 2020-11-19 12:23:08
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_hero.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-11-18 17:38:07
+ // 日期: 2020-11-19 12:11:30
 ////////////////////
 
 
@@ -319,5 +319,45 @@ class sm_hero
     */
     public $ai_btree;
 
+    /**
+    * @var Int32 弱体 金 default(0) 
+    */
+    public $weak_gold;
+
+    /**
+    * @var Int32 弱体 冰 default(0) 
+    */
+    public $weak_ice;
+
+    /**
+    * @var Int32 弱体 火 default(0) 
+    */
+    public $weak_fire;
+
+    /**
+    * @var Int32 弱体 风 default(0) 
+    */
+    public $weak_wind;
+
+    /**
+    * @var Int32 弱体 雷 default(0) 
+    */
+    public $weak_thunder;
+
+    /**
+    * @var Int32 弱体 毒  
+    */
+    public $weak_drug;
+
+    /**
+    * @var Int32 弱体 黑暗 default(0) 
+    */
+    public $weak_dark;
+
+    /**
+    * @var Int32 弱体 亡灵 default(0) 
+    */
+    public $weak_ghost;
+
 }
 

Gameserver/Amfphp/process/UserProc.php

@@ -288,13 +288,13 @@ class UserProc {
      * @return type
      */
     public static function downloadConstInfo($req) {
-        $clientver = $req->paras[0];                                            # 客户端数据版本号
+        list($clientDataVer) = $req->paras;                                     # 客户端数据版本号,程序版本号
         $serverVer = GameConfig::ver();                                         # 最新数据版本号
         my_Assert($serverVer, ErrCode::err_const_no);                           # 找不到常量数据
-        if ($clientver == $serverVer) {                                         # 如果版本一致，数据体抹掉，只传回版本号
+        if ($clientDataVer == $serverVer) {                                         # 如果版本一致，数据体抹掉，只传回版本号
 //                $md5 = md5(json_encode($constInfo));                          # 计算MD5值，多余计算md5
             $ret = array(
-                'version' => $clientver,
+                'version' => $clientDataVer,
                 'data' => null);
             return Resp::ok($ret);
         }
@@ -309,25 +309,19 @@ class UserProc {
      * @return Resp
      */
     public static function loginUserInfo($req) {
-//        return ResponseVo::ErrResponse($req, ErrCode::msg_methodnotimplement);
         $userInfo = UserProc::getUserInfo(gMem(), $req->zoneid, $req->uid);     # 取玩家信息
         if ($userInfo == null) {                                                # 新用户, -> 6006创建账号
             $ret = array(
                 'isNewUser' => true
             );
             return Resp::ok($ret);
-        } else {//2.如果玩家已存在，则处理普通登录流程
+        } else {                                                                # 2.如果玩家已存在，则处理普通登录流程
             $req->userInfo = $userInfo;                                         # 给Req挂载userInfo
             UserProc::checkContidays($req);                                     # 连续登录,状态检查
-//            UserProc::_checkUpdateGift($req);                                 # 检查更新礼包
-//            UserProc::fetchFromInteract($mem, $req);                          # 从交互体更新部分信息 
             PayProc::m_refreshChargeOrders($req);                               # 刷新订单, 多平台版本
             PayProc::checkDeltest($req);                                        # 检查内侧充值记录(函数内部会只检查一次)
             UserProc::updateUserInfo();                                     # 这一步回存操作只有在 userInfo正常存在的情况下才进行
             $resp = Resp::ok($userInfo);                                        # 设置返回值
-//            if (isset($req->updateGift)) {                                    # 透传更新礼包给Response
-//                $resp->updateGift = $req->updateGift;
-//            }
             self::backupUserInfo($req);                                         # 数据回写
             self::updtateUserZoneInfo($req);                                    # 1. 更新玩家分区记录
         }

Gameserver/Amfphp/util/DebugHelper.php

@@ -42,12 +42,16 @@ class DebugHelper {
      */
     static function assert($condition, $err) {
         if (!$condition) {                                                      # 断言失败
-            if (is_int($err)) {
-                Err($err, "Assert faild!" . self::get_call_stack(6));
-            } else {
+            if (is_int($err)) {                                                 # err是int值,则按照错误码查找错误提示信息
+                $errMsg = GameConfig::errmsg_getItem($err);
+                $msg = "";
+                if (null != $errMsg) {
+                    $msg = $errMsg->msg;
+                }
+                Err($err, "$msg" . self::get_call_stack(6));
+            } else {                                                            # 不是int值,则当做普通错误信息来处理
                 Err(ErrCode::err_assert, $err . self::get_call_stack(6));
             }
-//            trigger_error($err, E_USER_ERROR);                                # 触发错误
         }
     }
 

Gameserver/nbproject/private/private.xml

@@ -12,14 +12,20 @@
     </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/User/TaskStepVo.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/util/DebugHelper.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/configs/GameConfig.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/TaskCardVo.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/EnumTaskType.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/process/StoreProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/index.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/util/ErrHandler.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/OpeCode.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/base/CmdCode.php</file>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/TaskInfo.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/main.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/model/User/TaskStepVo.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/Services/AppServer.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/EnumTaskType.php</file>
         </group>
     </open-files>
 </project-private>