bug修复

Gameserver/App/base/CmdCode.php

@@ -148,6 +148,11 @@ class CmdCode {
      */
     const cmd_store_equipUpgrade_MaxLv = 6405;
     
+    /**
+     * 合成
+     */
+    const cmd_store_equipCompose = 6406;
+    
     // </editor-fold>
     
     // <editor-fold defaultstate="collapsed" desc="商城操作码 - 65xx">

Gameserver/App/process/ShopProc.php

@@ -37,6 +37,7 @@ class ShopProc {
         $user = ctx();
 
         $equip = array();
+        $gateGift = array();
         switch ($type) {
             case EnumShopGift::GateGift_Shop://章节礼包
                 my_Assert(!in_array($typeId, ctx()->privateState->gateGiftReceived), ErrCode::user_shop_NotRepeatBuy);       
@@ -267,7 +268,7 @@ class ShopProc {
                                
                 break;
             case EnumShopGift::Cash_Shop://商城-钻石
-                $mo = GameConfig::shop_cash_getItem($typeId);
+                $mo = GameConfig::shop_cash_getItem($typeId);                            
                 my_Assert($mo != null, ErrCode::err_const_no); 
                 
                 $tag = false;
@@ -313,6 +314,7 @@ class ShopProc {
         ctx($user);
         UserProc::updateUserInfo();
         return Resp::ok(array(         
+                    'gateGift'=>$gateGift,
                     'equip'=>$equip,
                     'cash'=>$user->baseInfo->cash,
                     'gold'=>$user->baseInfo->gold,

Gameserver/App/process/StoreProc.php

@@ -31,11 +31,35 @@ class StoreProc {
                 return StoreProc::equipUpgrade();  
             case CmdCode::cmd_store_equipUpgrade_MaxLv:                         # 6404
                 return StoreProc::equipUpgrade_MaxLv();    
+            case CmdCode::cmd_store_equipCompose:                               # 6404
+                return StoreProc::equipCompose();     
+                
             default:
                 Err(ErrCode::cmd_err);
         }
     }
     
+    /**
+     * 合成
+     * @return type
+     */
+    public static function equipCompose() {
+        list($uid) = req()->paras;
+        $user = ctx();
+
+        //my_Assert(StlUtil::dictHasProperty($user->store->equip, $uid), ErrCode::user_store_NoEquip);                  
+        
+        
+        
+                      
+        UserProc::updateUserInfo();
+        return Resp::ok(array(                   
+                    'heros' => $user->heros,                   
+                    'store' => $user->store,));
+        
+    }
+    
+    
     /**
      * 装备
      * @return type