cyzhao 11 сар өмнө
parent
commit
19955ea185

+ 40 - 7
Gameserver/App/base/ErrCode.php

@@ -218,7 +218,15 @@ class ErrCode {
      * 神秘商城 - 免费刷新时间未到
      */
     const pay_secretshopt_freeRefresh_Time = 8816;
+    
+    /**
+     * 订单号为null无法支付
+     */
     const pay_order_product_id = 8817;
+    
+    /**
+     * 支付失败
+     */
     const pay_fail = 8818;
 
     /**
@@ -271,7 +279,7 @@ class ErrCode {
     const notenough_resPoint = 3048;
 
     /**
-     *
+     * 道具数量不足
      */
     const notenough_item = 3049;
 // </editor-fold>
@@ -336,10 +344,13 @@ class ErrCode {
 //
 //   // <editor-fold defaultstate="collapsed" desc="    关卡     ">
 
+    /**
+     * 没有玩家关卡信息
+     */
     const gate_NoUserGateInfo = 3201;
 
     /**
-     *
+     * 当前关卡没有解锁
      */
     const gate_GateNoUnlock = 3202;
 
@@ -413,9 +424,13 @@ class ErrCode {
     const user_store_SameGemCanotEquip = 3305;
 
     /**
-     * 前端给的宝石存在不能合成的宝石
+     * 合成宝石条件不足无法合成
      */
     const user_store_GemCanotCompose = 3306;
+    
+    /**
+     * 背包不存在该宝石
+     */
     const user_store_NotExistGem = 3307;
 
     /**
@@ -497,22 +512,22 @@ class ErrCode {
     /**
      * 活动 - 激活码 渠道错误.
      */
-    const active_activecode_plat = 3905;
+    const active_activecode_plat = 3505;
     
     /**
      * 激活码礼包已经过期
      */
-    const active_activecode_outtime = 3906;
+    const active_activecode_outtime = 3506;
 
     /**
      * 活动 - 兑换码已经使用过了
      */
-    const active_activecode_used = 3907;
+    const active_activecode_used = 3507;
     
     /**
      * 活动 - 此活动尚未开放
      */
-    const active_time = 3908;
+    const active_time = 3508;
     
 // </editor-fold>
 //
@@ -522,8 +537,26 @@ class ErrCode {
      * 任务不存在
      */
     const task_NoExist = 3601;
+    
+    /**
+     * 不能领取该任务奖励
+     */
     const task_CanotPriceReviced = 3602;
+    
+    /**
+     * 任务奖励不能重复领取
+     */
     const task_PriceRepeatReviced = 3603;
+    
+    /**
+     * 活跃点宝箱奖励领取条件不达标无法领取
+     */
+    const task_CanotReviced_ActivePointBox = 3604;
+    
+    /**
+     * 活跃点宝箱奖励重复领取
+     */
+    const task_RepeatReviced_ActivePointBox = 3605;
 
 // </editor-fold>
 //

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

@@ -58,7 +58,7 @@ class TaskProc {
                 break;
         }
 
-        my_Assert($point >= $typeId, ErrCode::task_CanotPriceReviced);
+        my_Assert($point >= $typeId, ErrCode::task_CanotReviced_ActivePointBox);
 
         $mo = GameConfig::activepointreward_getItem($type, $typeId);
         my_Assert($mo != null, ErrCode::err_const_no);
@@ -66,7 +66,7 @@ class TaskProc {
         StoreProc::AddMultiItemInStore($mo->reward);
         
         $strId = $type . "-" . $typeId;      
-        my_Assert(!in_array($strId, ctx()->task->activePointReceived), ErrCode::task_CanotPriceReviced);
+        my_Assert(!in_array($strId, ctx()->task->activePointReceived), ErrCode::task_RepeatReviced_ActivePointBox);
         ctx()->task->activePointReceived[] = $strId;
 
         UserProc::updateUserInfo();