代码整理, fixed:言灵召唤不用扣除道具.

Gameserver/Amfphp/index.php

@@ -117,6 +117,29 @@ class Index {
         return $ret;
     }
 
+    /**
+     * 直接返回错误resp并结束运行
+     * @param type $err
+     * @param type $msg
+     */
+    static function Err($err, $msg = "") {
+        if (ErrCode::ok === $err) {
+            CLog::err("Err()方法的参数err==ok, 那你还调个蛋的Err()!!!");
+        }
+        if (Index::$isDebugging) {                                                  # 组织调试信息       
+            Index::$debugMsg .= "<br/><font color='red'>发生错误逻辑中断($err)：$msg</font>"; # 错误信息用红色显示    
+            Index::$debugMsg .= '<br/>内存分配:' . number_format(memory_get_peak_usage() / 1024) . 'kb,';
+            Index::$debugMsg .= '内存占用:' . number_format(memory_get_usage() / 1024) . 'kb';  # 内存使用数量(kb) 
+        }
+        var_dump($err);
+        if (is_string($err)) {                                                      # 防御Err中直接输入字符串的货
+            $msg = "发生错误($err)直接中断逻辑执行." . $msg;
+            CLog::err($msg);
+            $err = ErrCode::err_innerfault;
+        }
+        exit(Index::OverPass(Resp::err($err, $msg)));                               # 直接返回错误信息  
+    }
+
 }
 
 Index::Init();

Gameserver/Amfphp/main.php

@@ -80,7 +80,7 @@ function glc() {
 }
 
 /**
- * @return loyalsoft\Req 全局访问
+ * @return Req 全局访问
  */
 function req() {
     return Req::Ins();
@@ -114,20 +114,7 @@ function InitZoneId() {
  * @param type $msg
  */
 function Err($err, $msg = "") {
-    if (ErrCode::ok === $err) {
-        CLog::err("Err()方法的参数err==ok, 那你还调个蛋的Err()!!!");
-    }
-    if (Index::$isDebugging) {                                                  # 组织调试信息       
-        Index::$debugMsg .= "<br/><font color='red'>发生错误逻辑中断($err)：$msg</font>"; # 错误信息用红色显示    
-        Index::$debugMsg .= '<br/>内存分配:' . number_format(memory_get_peak_usage() / 1024) . 'kb,';
-        Index::$debugMsg .= '内存占用:' . number_format(memory_get_usage() / 1024) . 'kb';  # 内存使用数量(kb) 
-    }
-    if (is_string($err)) {                                                      # 防御Err中直接输入字符串的货
-        $msg = "发生错误($err)直接中断逻辑执行." . $msg;
-        CLog::err($msg);
-        $err = ErrCode::err_innerfault;
-    }
-    exit(Index::OverPass(Resp::err($err, $msg)));                               # 直接返回错误信息  
+    Index::Err($err, $msg);
 }
 
 /**
@@ -139,13 +126,6 @@ function my_Assert($condition, $err) {
     DebugHelper::assert($condition, $err);
 }
 
-/**
- * 功能已过期 
- */
-function absolute() {
-    return Err(ErrCode::err_method_obsoleted);
-}
-
 /**
  * 带换行符输出
  */

Gameserver/Amfphp/process/StoreProc.php

@@ -372,6 +372,7 @@ class StoreProc {
                 case 321:                                                       # 进阶材料
                 case 322:                                                       # 进阶材料
                 case 323:                                                       # 锻造材料
+                case 324:                                                       # 魂器
                     StoreProc::PutOverlyingItemInStore($itemId, $num);          # 直接进包裹items
                     CornerSignEventProc::OnBag_new_Material();
                     break;

Gameserver/Amfphp/process/TaskProc.php

@@ -358,17 +358,10 @@ class TaskProc {
     static function OnTaskCard_reward() {
         // 销毁任务卡, 发放奖励
         list($taskCardUID) = req()->paras;
-        $store = req()->userInfo->game->store;                                   # 快速访问store
+        $store = ctx()->store();                                   # 快速访问store
         my_Assert(StlUtil::dictHasProperty($store->taskcards, $taskCardUID), ErrCode::taskCard_no); # 防御找不到实例
         $taskCard = new Ins_TaskCard($store->taskcards->$taskCardUID);          # 任务卡对象
-
-        if ($taskCard->mo()->cost != null) {
-            $sList = explode(';', $taskCard->mo()->cost);
-            foreach ($sList as $item) {
-                $str = explode(',', $item);
-                StoreProc::removeItemFromStore($store, $str[0], $str[1]);
-            }
-        }
+//  
 
         foreach ($taskCard->curSteps as &$tsp) {                                # 初期里面只有一个任务
             $tsp = new Ins_TaskStep($tsp);
@@ -378,17 +371,15 @@ class TaskProc {
             }
         }
         if (strlen($taskCard->mo()->reward) > 0) {                              # 防御奖励串为空
-            StoreProc::AddMultiItemInStore($taskCard->mo()->reward);      # 发放奖励
+            StoreProc::AddMultiItemInStore($taskCard->mo()->reward);            # 发放奖励
         }
         if ($taskCard->mo()->exp > 0) {                                         # 任务卡增加了指挥官经验
-//            Data_UserGame::Add_Exp(req()->userInfo->game->baseInfo, $taskCard->mo()->exp);
             req()->userInfo->game->base()->Add_Exp($taskCard->mo()->exp);       # 加指挥官经验
         }
         $taskCard->state = Enum_TaskCardStateType::drawed;
         //2021-3-4
-        $college = new Info_College(req()->userInfo->game->college);
+        $college = ctx()->college();
         $college->modifyTaskCardState($taskCard->typeId, Enum_TaskCardStateType::drawed);
-        req()->userInfo->game->college = $college;
 
         $store->taskcards->$taskCardUID = $taskCard;                            # 回写任务数据
         NormalEventProc::OnTaskCard_Reward($taskCard->mo()->reward, null);      # 带入事件
@@ -396,8 +387,7 @@ class TaskProc {
         if (!empty($taskCard->mo()->newTaskCard)) {                             # 下一个任务卡存在  
             StoreProc::PutTaskCardInStore($taskCard->mo()->newTaskCard);        # 放卡入背包
         }
-        StlUtil::dictRemove(req()->userInfo->game->store->taskcards, $taskCardUID); # 移除任务卡           
-        req()->userInfo->game->store = $store;
+        StlUtil::dictRemove($store->taskcards, $taskCardUID);                   # 移除任务卡   
         self::autoRecoverStateMissions();                                       # 重新更新其它状态类的任务卡
         UserProc::updateUserInfo();                                             # 回存玩家数据
         return Resp::ok(array(

Gameserver/Amfphp/test.php

@@ -41,10 +41,5 @@ class A {
 
 }
 
-function ctx() {
-    return req()->userInfo->game;
-}
-
-ctx()->base(true);
-var_dump(nameof($user->name));
+Err(1005);
 //var_dump(Resp::err(3503, "时尚杂志opencv"));