浏览代码

言灵、武器系统

gwang 5 年之前
父节点
当前提交
1b520f3ff3

+ 11 - 1
Gameserver/Amfphp/base/CmdCode.php

@@ -422,7 +422,7 @@ class CmdCode {
     /**
      * 英雄脱装备
      */
-    const cmd_store_UnWield = 6411;
+    const cmd_store_UnWieldEquip = 6411;
 
     /**
      * 购买增加物品栏格子数
@@ -437,6 +437,16 @@ class CmdCode {
      * 碎片合成
      */
     const cmd_store_PiecesCompose = 6415;
+
+    /**
+     * 装备言灵
+     */
+    const cmd_store_WearYanling = 6416;
+
+    /**
+     * 卸下言灵
+     */
+    const cmd_store_UnWieldYanling = 6417;
 // </editor-fold>
     //
     // <editor-fold defaultstate="collapsed" desc="活动操作码 - 65xx">

+ 17 - 1
Gameserver/Amfphp/configs/GameConfig.php

@@ -6,7 +6,7 @@ namespace loyalsoft;
 // 由CodeGenerator创建。
 // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
 // author: gwang 
-// 日期: 2019-12-19 16:11:17
+// 日期: 2020-01-02 18:14:49
 ////////////////////
 
 /**
@@ -309,6 +309,22 @@ class GameConfig {
         return self::get_hash_item('playerlevel', $itemid);
     }
 
+    /**
+     * 言灵类道具
+     * @return \item_yanling
+     */
+    public static function item_yanling() {
+        static $a = null;
+        return self::initValue($a, 'item_yanling');
+    }
+
+    /**
+     * @return \sm_item_yanling item_yanling item数据 
+     */
+    public static function item_yanling_getItem($itemid) {
+        return self::get_hash_item('item_yanling', $itemid);
+    }
+
     /**
      * 技能升级消耗金币
      * @return \skill_upgrade_cost

+ 1 - 1
Gameserver/Amfphp/main.php

@@ -83,7 +83,7 @@ function glc() {
 }
 
 /**
- * @return Req 全局访问
+ * @return loyalsoft\Req 全局访问
  */
 function req() {
     return Req::Ins();

+ 7 - 2
Gameserver/Amfphp/model/Const/primordial_data.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-06 11:05:48
+ // 日期: 2020-01-02 17:58:51
 ////////////////////
 
 
@@ -70,9 +70,14 @@ class primordial_data
     public $User_Store_items;
 
     /**
-    * @var Object   
+    * @var Object 装备初始化数据  
     */
     public $User_Store_equipment;
 
+    /**
+    * @var Object 言灵初始化数据  
+    */
+    public $User_Store_yanling;
+
 }
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_box.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-10-18 14:10:09
+ // 日期: 2019-12-27 16:23:28
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_gate.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-19 13:41:14
+ // 日期: 2020-01-02 15:30:20
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_gate_city.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-11-19 10:45:45
+ // 日期: 2019-12-24 15:21:12
 ////////////////////
 
 

+ 2 - 2
Gameserver/Amfphp/model/Const/sm_gate_combat.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-17 20:24:05
+ // 日期: 2019-12-31 17:16:07
 ////////////////////
 
 
@@ -40,7 +40,7 @@ class sm_gate_combat
     public $desc;
 
     /**
-    * @var String 波次ID(Gatelevel.id)  
+    * @var String [废弃]  
     */
     public $level;
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_gate_world.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-11-11 15:58:37
+ // 日期: 2019-12-31 17:14:41
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_gatelevel.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-17 16:00:40
+ // 日期: 2019-12-31 17:17:29
 ////////////////////
 
 

+ 1 - 1
Gameserver/Amfphp/model/Const/sm_hero.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-19 15:23:37
+ // 日期: 2019-12-31 17:13:43
 ////////////////////
 
 

+ 7 - 2
Gameserver/Amfphp/model/Const/sm_item_base.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-19 13:44:36
+ // 日期: 2020-01-02 16:03:27
 ////////////////////
 
 
@@ -34,13 +34,18 @@ class sm_item_base
     */
     public $img;
 
+    /**
+    * @var String 物品模型资源  
+    */
+    public $res;
+
     /**
     * @var String 物品描述 default(物品描述) 
     */
     public $itemDesc;
 
     /**
-    * @var Int32 物品大归类 1武器,2碎片,3材料 default(0) 
+    * @var Int32 物品大归类 1武器,2碎片,3材料, 4 言灵 default(0) 
     */
     public $itemType;
 

+ 20 - 10
Gameserver/Amfphp/model/Const/sm_item_weapon.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-04 14:59:39
+ // 日期: 2020-01-02 16:12:54
 ////////////////////
 
 
@@ -20,17 +20,27 @@ class sm_item_weapon
     public $typeId;
 
     /**
-    * @var Int32 附加HP default(0) 
+    * @var Int32 使用武器的英雄ID  
+    */
+    public $hero_id;
+
+    /**
+    * @var Int32 武器初始星级  
+    */
+    public $star;
+
+    /**
+    * @var Int32 【不改】附加生命 default(0) 
     */
     public $hp;
 
     /**
-    * @var Int32 攻击 default(0) 
+    * @var Int32 【不改】攻击 default(0) 
     */
     public $atk;
 
     /**
-    * @var Int32 防御 default(0) 
+    * @var Int32 【不改】防御 default(0) 
     */
     public $def;
 
@@ -45,24 +55,24 @@ class sm_item_weapon
     public $phyAtk;
 
     /**
-    * @var Int32 防御护甲 default(0) 
+    * @var Int32 【不改】防御护甲 default(0) 
     */
     public $phyDef;
 
     /**
-    * @var Int32 攻击速度 default(0) 
+    * @var Int32 【不改】攻击速度 default(0) 
     */
     public $atkSpeed;
 
     /**
-    * @var Int32 魔法抗性 default(0) 
+    * @var Int32 法术强度 default(0) 
     */
-    public $mofakangxing;
+    public $fashuqiangdu;
 
     /**
-    * @var Int32 法术强度 default(0) 
+    * @var Int32 【不改】魔法抗性 default(0) 
     */
-    public $fashuqiangdu;
+    public $mofakangxing;
 
 }
 

+ 83 - 0
Gameserver/Amfphp/model/Const/sm_item_yanling.php

@@ -0,0 +1,83 @@
+<?php
+
+////////////////////
+ // 由CodeGenerator创建。
+ // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
+ // author: gwang 
+ // 日期: 2020-01-02 16:13:28
+////////////////////
+
+
+/**
+ * Static Model item_yanling 
+ */
+class sm_item_yanling
+{
+
+    /**
+    * @var Int32 查询用的ID  
+    */
+    public $typeId;
+
+    /**
+    * @var String 可以匹配的英雄ID列表(逗号分隔)  
+    */
+    public $hero_id;
+
+    /**
+    * @var Int32 言灵的装备位置: 左: 1, 中 2 右 3 default(0) 
+    */
+    public $position;
+
+    /**
+    * @var Int32 武器初始星级  
+    */
+    public $star;
+
+    /**
+    * @var Int32 附加生命 default(0) 
+    */
+    public $hp;
+
+    /**
+    * @var Int32 攻击 default(0) 
+    */
+    public $atk;
+
+    /**
+    * @var Int32 防御 default(0) 
+    */
+    public $def;
+
+    /**
+    * @var Int32 暴击 default(0) 
+    */
+    public $crit;
+
+    /**
+    * @var Int32 物理攻击 default(0) 
+    */
+    public $phyAtk;
+
+    /**
+    * @var Int32 防御护甲 default(0) 
+    */
+    public $phyDef;
+
+    /**
+    * @var Int32 攻击速度 default(0) 
+    */
+    public $atkSpeed;
+
+    /**
+    * @var Int32 法术强度 default(0) 
+    */
+    public $fashuqiangdu;
+
+    /**
+    * @var Int32 魔法抗性 default(0) 
+    */
+    public $mofakangxing;
+
+}
+

+ 21 - 1
Gameserver/Amfphp/model/Const/sm_subSkill.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author: gwang 
- // 日期: 2019-12-18 09:52:04
+ // 日期: 2019-12-27 19:08:41
 ////////////////////
 
 
@@ -46,6 +46,21 @@ class sm_subSkill
     */
     public $targetType;
 
+    /**
+    * @var Int32 创建技能ID  
+    */
+    public $create_skill_id;
+
+    /**
+    * @var Int32 buffID default(0) 
+    */
+    public $buffId;
+
+    /**
+    * @var Int32 buff触发概率 default(0) 
+    */
+    public $buffProb;
+
     /**
     * @var Int32 技能效果:
     *  1.攻击速度增减(数值&百分比)
@@ -132,5 +147,10 @@ class sm_subSkill
     */
     public $desc;
 
+    /**
+    * @var String 子技能图标  
+    */
+    public $icon;
+
 }
 

+ 2 - 2
Gameserver/Amfphp/model/User/PrivateStateModel.php

@@ -26,7 +26,7 @@ class PrivateStateModel extends Object_ext {
      *
      * @var int 物品的uid,递增
      */
-    public $currentId;
+    public $currentId = 13;
 
     /**
      *
@@ -177,7 +177,7 @@ class PrivateStateModel extends Object_ext {
         $this->Tasks = ObjectInit();
         $this->AchiTasks = ObjectInit();
         $this->maxItemNum = GameConfig::primordial_data()->User_Private_MaxItem_num; //100;
-        $this->currentId = 1;
+        $this->currentId = 13;
         $this->ItemNum = 0;
         $this->GemUpgrage = 0;
         $this->ItemUpgrage = 0;

+ 11 - 4
Gameserver/Amfphp/model/User/StoreModel.php

@@ -22,11 +22,16 @@ class StoreModel extends Object_ext {
     public $cards;
 
     /**
-     * 装备, 待定
+     * 装备, 能强化升级, 独立于其它道具
      * @var type
      */
     public $equipment;
 
+    /**
+     * @var 言灵,能强化升级, 独立于其它道具
+     */
+    public $yanling;
+
     /**
      * 宝箱
      * @var array
@@ -61,10 +66,12 @@ class StoreModel extends Object_ext {
         $this->boxes = GameConfig::primordial_data()->User_Store_boxes;
         //array('701001' => 0, '702002' => 0, '703003' => 0, '704004' => 0);
         $this->cards = ArrayInit();
-        $this->items = GameConfig::primordial_data()->User_Store_items;         # 初始含有一张黄金通知书
-        $this->equipment = ObjectInit();
-        $this->segement = GameConfig::primordial_data()->User_Store_segment;    # 碎片
+        $this->items = JsonUtil::decode(GameConfig::primordial_data()->User_Store_items);         # 初始含有一张黄金通知书
+        $this->equipment = JsonUtil::decode(GameConfig::primordial_data()->User_Store_equipment); # 装备初始化数据
+        $this->yanling = JsonUtil::decode(GameConfig::primordial_data()->User_Store_yanling);     # 言灵初始化数据
+        $this->segement = JsonUtil::decode(GameConfig::primordial_data()->User_Store_segment);    # 碎片
         $this->stones = ObjectInit();
+
 //        $this->element = GameConfig::primordial_data()->User_Store_element;
         //array('388001' => 0, '388002' => 0, '388003' => 0, '388004' => 0, '388005' => 0, '388006' => 0, '388007' => 0);
     }

+ 6 - 4
Gameserver/Amfphp/model/User/UserGameModel.php

@@ -189,6 +189,8 @@ class UserGameModel extends Object_ext {
         $this->img = GameConfig::primordial_data()->User_img;
         # 添加默认战队设置
         $this->heroTeamConfig = JsonUtil::encode(GameConfig::primordial_data()->User_HeroTeamConfig);
+        $this->store->initialize();                                             # 添加默认物品
+        $this->heros->InitializeHero();                                     # 添加初始英雄
     }
 
     /**
@@ -198,12 +200,12 @@ class UserGameModel extends Object_ext {
     public function __construct($arg = null) {
         if (null === $arg) {                                                    # 未传参数的情况下
             $this->buildings = ObjectInit();                                    # 建筑数据
-            $this->heros = new UserGameHeroModel();                             # 英雄数据
-            $this->heros->InitializeHero();                                     # 添加初始英雄
-            $this->store = new StoreModel();                                    # 背包数据
-            $this->store->initialize();                                         # 添加默认物品
             $this->privateState = new PrivateStateModel();                      # 私有字段
             $this->privateState->initialize();                                  # 初始化默认数据
+            $this->store = new StoreModel();                                    # 背包数据
+//            $this->store->initialize();                                         # 添加默认物品
+            $this->heros = new UserGameHeroModel();                             # 英雄数据
+//            $this->heros->InitializeHero();                                     # 添加初始英雄
             $this->gates = new UserGateDifficulty();                            # 初始化关卡默认数据
             $this->heroManual = new HeroManualModel();                          # 初始化图鉴数据结构
             $this->NewbieGuide = ObjectInit();                                  # 初始化新手引导结构

+ 9 - 2
Gameserver/Amfphp/model/User/UserHeroModel.php

@@ -87,11 +87,17 @@ class UserHeroModel extends Object_ext {
     public $subSkills;
 
     /**
-     *
+     * 装备
      * @var object
      */
     public $equip;
 
+    /**
+     * 言灵
+     * @var {}
+     */
+    public $yanling;
+
     /**
      * 当前主线的好感度进度
      * @var object
@@ -135,13 +141,14 @@ class UserHeroModel extends Object_ext {
 
 //----初始化装备的默认数据
         $this->equip = ObjectInit();
-
         $tempEq = ObjectInit();
         $tempEq->weapon = JsonUtil::decode('{"itemuid":0}');
         $tempEq->armor = JsonUtil::decode('{"itemuid":0}');
         $tempEq->ring = JsonUtil::decode('{"itemuid":0}');
 
         $this->equip = $tempEq;
+// ------初始化言灵的默认数据
+        $this->yanling = JsonUtil::decode('{"1":{"itemuid":0},"2":{"itemuid":0},"3":{"itemuid":0}}');
     }
 
     /**

+ 17 - 0
Gameserver/Amfphp/process/HeroProc.php

@@ -1503,6 +1503,23 @@ class HeroProc {
         $hero->xp = 0;
         $lvs = GameConfig::hero_levelexp_getItem($hero->level + 1);
         $hero->maxXp = $lvs->requiredExp;
+
+        //  取可用武器第一个初始化
+        $wp = null;
+        foreach (GameConfig::item_weapon() as $id => $mo) {
+            isEditor() and $mo = new \sm_item_weapon();
+            if ($mo->hero_id == $hero->typeId) {
+                $wp = $mo;
+                break;
+            }
+        }
+        if (null != $wp) {
+            $req = req();
+            $wuid = StoreProc::PutEquipInStore($wp->typeId, $req);
+            $req->userInfo->game->store->equipment->$wuid->herouid = $uid;
+            $hero->equip->weapon = array("itemuid" => $wuid);
+        }
+
         return $hero;
     }
 

+ 84 - 9
Gameserver/Amfphp/process/StoreProc.php

@@ -37,9 +37,13 @@ class StoreProc {
 //
             case CmdCode::cmd_store_WearEquip:                                  # 6410 给英雄穿装备
                 return StoreProc::WearEquipToHero($req);
-            case CmdCode::cmd_store_UnWield:                                    # 6411 将该装备从指定英雄上脱下
+            case CmdCode::cmd_store_UnWieldEquip:                               # 6411 将该装备从指定英雄上脱下
                 return StoreProc::UnWieldEquip($req);
-//
+            case CmdCode::cmd_store_WearYanling:                                # 6416 装备言灵
+                return StoreProc::WearYanlingToHero($req);
+            case CmdCode::cmd_store_UnWieldYanling:                             # 6417 卸下言灵
+                return StoreProc::UnWieldYanling($req);
+// 
             case CmdCode::cmd_store_AddMaxPacketNum:                            # 6412 扩展包裹格子数量
                 return StoreProc::AddPacketNum($req);
             case CmdCode::cmd_store_MeltEquip:                                  # 6413 装备融合
@@ -801,15 +805,15 @@ class StoreProc {
      */
     static function PutEquipInStore($itemId, &$req) {
         $privateState = $req->userInfo->game->privateState;
-        if (!CommUtil::isPropertyExists($privateState, "currentId")) {// 如果仓库中已经有这种元素,则其数目+1
+        if (!CommUtil::isPropertyExists($privateState, "currentId")) {          // 如果仓库中已经有这种元素,则其数目+1
             $req->userInfo->game->privateState->currentId = 1;
         }
         $cid = $req->userInfo->game->privateState->currentId++;
         $equip = ObjectInit();
         $equip->typeId = $itemId;
         $req->userInfo->game->store->equipment->$cid = $equip;
-
-        SystemProc::GetEquip($req->zoneid, $req->userInfo->game, $itemId);      # 添加获得装备的消息
+        return $cid;
+//        SystemProc::GetEquip($req->zoneid, $req->userInfo->game, $itemId);      # 添加获得装备的消息
     }
 
     /**
@@ -890,6 +894,74 @@ class StoreProc {
 //        self::checkActiveItem($req, $itemModel);
     }
 
+    /**
+     * [6417] 给英雄装上言灵
+     * @param req $req
+     * @return type
+     */
+    static function WearYanlingToHero($req) {
+        $user = $req->userInfo->game;                                           # user引用
+        list($itemtype, $yanling_uid, $herouid) = $req->paras;                  # 提取参数: 装备类型, 装备的UID, 英雄的UID 
+
+        if (!CommUtil::isPropertyExists($user->store->yanling, $yanling_uid)) { # 检测是否存在该言灵
+            Err(ErrCode::store_itemno_err);
+        }
+        $yanlingVo = $user->store->yanling->$yanling_uid;                       # 取言灵对象
+        if ($yanlingVo->herouid > 0 && $yanlingVo->herouid != $herouid) {       # 检测该言灵是否装备到其他英雄身上 
+            Err(ErrCode::store_equipWeared_err);
+        }
+        $collectHeros = $user->heros->collectHeros;                             # 英雄集合
+        if (!$collectHeros) {                                                   # 防御对象为空
+            Err(ErrCode::err_innerfault);
+        }
+        if (!CommUtil::isPropertyExists($collectHeros, $herouid)) {             # 检查英雄是否存在
+            Err(ErrCode::hero_no);
+        }
+        $user->store->yanling->$yanling_uid->herouid = $herouid;                # 言灵上添加反向引用, 避免查询时的循环
+
+        $collectHeros->$herouid->yanling->$itemtype->itemuid = $yanling_uid;    # 英雄身上添加言灵记录
+
+        UserProc::updateUserInfo($req);                                         # 5.回写数据
+        $ret = array('resp' => "succeed!");
+        $resp = Resp::ok($ret);                                                 // 返回 
+//        StoreProc::CheckItemNum($req);
+        return $resp;
+    }
+
+    /**
+     * [6416] 给英雄卸下言灵
+     * @param req $req
+     * @return type
+     */
+    static function UnWieldYanling($req) {
+        $user = $req->userInfo->game;                                           # user引用
+        list($itemtype, $yanling_uid, $herouid) = $req->paras;                  # 提取参数: 装备类型, 装备的UID, 拥有该装备的英雄的UID 
+
+        $collectHeros = $user->heros->collectHeros;
+        if (!$collectHeros) {
+            Err(ErrCode::err_innerfault);
+        }
+        if (!CommUtil::isPropertyExists($collectHeros, $herouid)) {             # 检测是否存在拥有该装备的英雄
+            Err(ErrCode::hero_no);
+        }
+        if (!CommUtil::isPropertyExists($user->store->yanling, $yanling_uid)) { # 检测是否存在该装备
+            Err(ErrCode::store_itemno_err);
+        }
+        if ($user->store->yanling->$yanling_uid->herouid == $herouid) {         # 取装备对象
+            $user->store->yanling->$yanling_uid->herouid = 0;
+        }
+        if ($collectHeros->$herouid->yanling->$itemtype->itemuid != $yanling_uid) {
+            Err(ErrCode::store_noequip_err);
+        }
+        $collectHeros->$herouid->equip->weapon->itemuid = 0;                    # 卸下
+
+        UserProc::updateUserInfo($req);                                         # 回写数据
+        $ret = array('resp' => "succeed!");
+        $resp = Resp::ok($ret);                                                 // 返回 
+//        StoreProc::CheckItemNum($req);
+        return $resp;
+    }
+
     /**
      * [6410] 给英雄穿装备
      * @param req $req
@@ -897,15 +969,18 @@ class StoreProc {
      */
     static function WearEquipToHero($req) {
         $user = $req->userInfo->game;                                           # user引用
-        list($itemtype, $equipuid, $herouid) = $req->pars;                      # 提取参数: 装备类型, 装备的UID, 英雄的UID 
+        list($itemtype, $equipuid, $herouid) = $req->paras;                     # 提取参数: 装备类型, 装备的UID, 英雄的UID 
 
 
         if (!CommUtil::isPropertyExists($user->store->equipment, $equipuid)) {  # 检测是否存在该装备
             Err(ErrCode::store_itemno_err);
         }
         $equipVo = $user->store->equipment->$equipuid;                          # 取装备对象
-        if ($equipVo->herouid > 0 && $equipVo->herouid != $herouid) {           # 检测该装备是否装备到其他英雄身上 
-            Err(ErrCode::store_equipWeared_err);
+        if ($equipVo->herouid > 0) {                                            # 检测该装备是否装备到其他英雄身上 
+            if ($equipVo->herouid != $herouid) {
+                Err(ErrCode::store_equipWeared_err);
+            }
+            $user->store->equipment->$equipuid->herouid = 0;                    # 清理原来已经装备的言灵的反指向
         }
         $collectHeros = $user->heros->collectHeros;
         if (!$collectHeros) {                                                   # 防御对象为空
@@ -946,7 +1021,7 @@ class StoreProc {
      */
     static function UnWieldEquip($req) {
         $user = $req->userInfo->game;                                           # user引用
-        list($itemtype, $equipuid, $herouid) = $req->pars;                      # 提取参数: 装备类型, 装备的UID, 拥有该装备的英雄的UID 
+        list($itemtype, $equipuid, $herouid) = $req->paras;                      # 提取参数: 装备类型, 装备的UID, 拥有该装备的英雄的UID 
 
         $collectHeros = $user->heros->collectHeros;
         if (!$collectHeros) {

+ 1 - 0
Gameserver/Amfphp/process/SystemProc.php

@@ -306,6 +306,7 @@ class SystemProc {
      * @param type $zoneid
      * @param UserGameModel $user
      * @param int $equipModelId
+     * @deprecated since version 0 待维修 --王刚2020年1月2日21:07:04
      *      */
     static function GetEquip($zoneid, $user, $equipModelId) {
         $equipModel = GameConfig::item_getItem($equipModelId);

+ 1 - 1
Gameserver/Amfphp/process/UserProc.php

@@ -495,6 +495,7 @@ class UserProc {
      */
     static function createUser($req, $rolename, $gender, $profile_img) {
         $userInfo = new UserInfoMo();
+        $req->userInfo = $userInfo;                                             # 更新Req的userinfo,
         $userInfo->uid = $req->uid;
         $userInfo->zoneid = $req->zoneid;
         $userInfo->game = new UserGameModel();
@@ -507,7 +508,6 @@ class UserProc {
 //        $userInfo->game->NewbieGuideOver = 1;
         UserProc::_intiGodpetManual($userInfo->game);                           # 初始化图鉴
         $userInfo->interact = new UserInteractModel();                          # 初始化交互体数据
-        $req->userInfo = $userInfo;                                             # 更新Req的userinfo,
         #Ps 6006是没有获得到Userinfo到Req中的
         UserProc::checkContidays($req, 1);                                      # 每日状态检查
 //        UserProc::fetchFromInteract($mem, $req);  # 从interact拉取数据,Ps.初始化的过程应该还拉取不到什么有效数据

+ 7 - 7
Gameserver/nbproject/private/private.xml

@@ -12,15 +12,15 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/StatProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/StoreModel.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserGateDifficulty.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/ErrCode.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserGatesModel.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/SystemProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/UserProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/HeroProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserGameHeroModel.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserHeroModel.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/main.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/StoreProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc/SweepGatesProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserGameModel.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/PrivateStateModel.php</file>
         </group>
     </open-files>
 </project-private>