fixed: 生成玩家编号时出现重复的问题.

Gameserver/Amfphp/base/CmdCode.php

@@ -496,9 +496,9 @@ class CmdCode {
     const cmd_store_refresh = 6405;
 
     /**
-     * 分解道具
+     * 删除道具
      */
-    const cmd_store_decomposeItem = 6406;
+    const cmd_store_delItem = 6406;
 
     /**
      * 测试用的命令

Gameserver/Amfphp/model/Const/GameConfig.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-02-08 18:03:54
+ // 日期: 2021-02-09 16:40:23
 ////////////////////
 
 /**

Gameserver/Amfphp/model/Const/sm_gatelevel.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-02-08 15:33:25
+ // 日期: 2021-02-09 14:19:53
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_hero.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-02-08 15:30:27
+ // 日期: 2021-02-09 14:15:57
 ////////////////////
 
 
@@ -359,5 +359,10 @@ class sm_hero
     */
     public $weak_ghost;
 
+    /**
+    * @var Int32 弱体 物理 default(0) 
+    */
+    public $weak_phy;
+
 }
 

Gameserver/Amfphp/model/Const/sm_item_base.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-02-08 17:25:39
+ // 日期: 2021-02-09 14:51:59
 ////////////////////
 
 

Gameserver/Amfphp/process/StoreProc.php

@@ -28,8 +28,8 @@ class StoreProc {
                 return StoreProc::useItem($req);
             case CmdCode::cmd_store_refresh:                                    # 6405 获取最新的仓库数据
                 return StoreProc::refreshStore($req);
-//            case CmdCode::cmd_store_decomposeItem:                              # 6406 分解道具
-//                return StoreProc::decomposeItem($req);
+            case CmdCode::cmd_store_delItem:                                    # 6406 从仓库删除道具
+                return StoreProc::delItemFromStore($req);
             case CmdCode::cmd_store_Testcmd:                                    # 6407 测试方法
                 return StoreProc::Test($req);
 //            case CmdCode::cmd_store_ItemUpgrade:                                # 6408 装备升级
@@ -165,6 +165,18 @@ class StoreProc {
         return Resp::ok(array('store' => $req->userInfo->game->store));
     }
 
+    /**
+     * [6406] 从仓库删除道具
+     * @param req $req
+     */
+    static function delItemFromStore($req) {
+        list($itemId, $num) = $req->paras;
+        $err = self::removeItemFromStore($req->userInfo->game->store, $itemId, $num);
+        my_Assert(ErrCode::ok == $err, $err);
+        UserProc::updateUserInfo();
+        return Resp::ok(array('store' => $req->userInfo->game->store));
+    }
+
     /**
      * [6409] 合成道具
      * @param Req $req
@@ -194,20 +206,14 @@ class StoreProc {
      * @return type
      */
     static function removeItemFromStore($store, $itemId, $itemcount = 1) {
-        if (CommUtil::isPropertyExists($store->items, $itemId)) {
-            if ($store->items->$itemId >= $itemcount) {                         # 数量足够
-                $store->items->$itemId -= $itemcount;
-                if ($store->items->$itemId == 0) {
-                    unset($store->items->$itemId);
-                }
-                NormalEventProc::OnBag_Remove_Item($itemId, $itemcount);        # 插入事件
-                return ErrCode::ok;
-            } else {
-                return ErrCode::store_itemnotenough;                            # 道具数量不足
-            }
-        } else {
-            return ErrCode::store_itemno_err;                                   # 没有这个道具
-        }
+        my_Assert(CommUtil::isPropertyExists($store->items, $itemId), ErrCode::store_itemno_err); # 没有这个道具
+        my_Assert($store->items->$itemId >= $itemcount, ErrCode::store_itemnotenough); # 数量不足
+        $store->items->$itemId -= $itemcount;
+        if ($store->items->$itemId == 0) {
+            unset($store->items->$itemId);
+        }
+        NormalEventProc::OnBag_Remove_Item($itemId, $itemcount);                # 插入事件
+        return ErrCode::ok;
     }
 
     /**
@@ -383,7 +389,7 @@ class StoreProc {
     }
 
     /**
-     * 向包裹中添加物品
+     * [6401]向包裹中添加物品
      * @param req $req
      * @return type
      */

Gameserver/Amfphp/process/UserProc.php

@@ -202,7 +202,7 @@ class UserProc {
         $userID = $req->uid;
         list($rolename, $gender, $profile_img) = $req->paras;                   # 参数: 昵称,性别,头像
         $id = gMem()->increment(MemKey_GameRun::Stat_UserCountByZone_int($req->zoneid));   # 增加玩家数量计数
-        $rolename = "No." . sprintf("%07d", $id);
+        $rolename = "No." . sprintf("%03d", $req->zoneid) . sprintf("%07d", $id); # 生成编号
         if (self::checkRoleNameNotExist($rolename)) {                           # 记录玩家
             $userinfo = self::createUser($req, $rolename, $gender, $profile_img);
             if (1 == self::regRole($req->zoneid, $userID, $rolename, $gender, $profile_img, $userinfo->getPlatStr())) {

Gameserver/nbproject/private/private.xml

@@ -12,6 +12,7 @@
     </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>
@@ -20,11 +21,16 @@
             <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/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>