Procházet zdrojové kódy

添加技能测试.ini, 并根据测试结果修复了相关错误

gwang před 5 roky
rodič
revize
027e6e1529

+ 34 - 34
Gameserver/Amfphp/Model/User/UserHeroModel.php

@@ -5,7 +5,7 @@ namespace loyalsoft;
 /**
  * 玩家的英雄的实体数据
  */
-class UserHeroModel {
+class UserHeroModel extends Object_ext {
 
     /**
      * 唯一的英雄ID
@@ -110,39 +110,39 @@ class UserHeroModel {
      *
      * 构造函数
      */
-    public function __construct() {
-        $this->level = 1;
-        $this->xp = 0;
-        $this->maxXp = 0;
-        $this->strengthLevel = 0;
-        $this->curBloodId = 0;
-        $this->curStar = 0;
-        $this->isLocked = false;
-        $this->curMainFavor = 'E';
-        $this->favors = ArrayInit();
-        $this->favors[] = 'E';
-        $this->grade = "D";
-//-----------初始化技能的默认数据
-        $temp = ObjectInit();
-        $temp->normalSkill = JsonUtil::decode('{"level":1}');
-        $temp->manuSkill1 = JsonUtil::decode('{"level":1}');
-        $temp->manuSkill2 = JsonUtil::decode('{"level":1}');
-        $temp->manuSkill3 = JsonUtil::decode('{"level":1}');
-        $temp->passiveSkill = JsonUtil::decode('{"level":1}');
-        $temp->captainSkill = JsonUtil::decode('{"level":1}');
-        $this->skills = $temp;
-        $this->subSkills = ObjectInit();
-
-//----初始化装备的默认数据
-        $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;
-    }
+//    public function __construct() {
+//        $this->level = 1;
+//        $this->xp = 0;
+//        $this->maxXp = 0;
+//        $this->strengthLevel = 0;
+//        $this->curBloodId = 0;
+//        $this->curStar = 0;
+//        $this->isLocked = false;
+//        $this->curMainFavor = 'E';
+//        $this->favors = ArrayInit();
+//        $this->favors[] = 'E';
+//        $this->grade = "D";
+////-----------初始化技能的默认数据
+//        $temp = ObjectInit();
+//        $temp->normalSkill = JsonUtil::decode('{"level":1}');
+//        $temp->manuSkill1 = JsonUtil::decode('{"level":1}');
+//        $temp->manuSkill2 = JsonUtil::decode('{"level":1}');
+//        $temp->manuSkill3 = JsonUtil::decode('{"level":1}');
+//        $temp->passiveSkill = JsonUtil::decode('{"level":1}');
+//        $temp->captainSkill = JsonUtil::decode('{"level":1}');
+//        $this->skills = $temp;
+//        $this->subSkills = ObjectInit();
+//
+////----初始化装备的默认数据
+//        $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;
+//    }
 
     /**
      * 判断技能是否可升级

+ 106 - 107
Gameserver/Amfphp/Process/HeroProc.php

@@ -91,15 +91,15 @@ class HeroProc {
             return Resp::err(ErrCode::hero_no);
         }
 #                                                                               # 2.判断英雄的该技能能否升级....
-        isEditor() and $targetHero = new UserHeroModel();
-        $targetHero = $collectHeros->$huid;
+//        isEditor() and $targetHero = new UserHeroModel();
+        $targetHero = new UserHeroModel($collectHeros->$huid);
 #                                                                               # 取出这个英雄的技能数据 
         $targteHeroSkills = $targetHero->subSkills;
         if (!CommUtil::isPropertyExists($targteHeroSkills, $mainSkillId)) {     # 主技能Id.
-            return \Resp::err(ErrCode::err_unknownn, "玩家数据结构问题");
+            return Resp::err(ErrCode::err_unknownn, "玩家数据结构问题");
         }
-        if (CommUtil::isPropertyExists($targteHeroSkills->$mainSkillId, $subSkillId)) { # 子技能已经解锁
-            return \Resp::err(ErrCode::err_unknownn, "子技能已解锁");
+        if (CommUtil::isInArray($targteHeroSkills->$mainSkillId, $subSkillId)) { # 子技能已经解锁
+            return Resp::err(ErrCode::err_unknownn, "子技能已解锁");
         }
 //        if (!$targetHero->IsSkillUnlockAble($mainSkillId, $subSkillId)) {       # 3.判断技能是否处于待解锁状态
 //            return Resp::err(ErrCode::hero_upgradeSkill_maxLevel);
@@ -107,12 +107,12 @@ class HeroProc {
 
         $sm = GameConfig::subSkill_getItem($subSkillId);                        # 4.取出该技能升级消耗的常量数据
         if (null == $sm) {
-            return \Resp::err(ErrCode::err_const_no, '找不到子技能配置数据');
+            return Resp::err(ErrCode::err_const_no, '找不到子技能配置数据');
         }
         if (!UserGameModel::Consume_Gold($user, $sm->unlockCost)) {             # 5. 扣除金币消耗
             return Resp::err(ErrCode::notenough_gold_msg);
         }
-        $targteHeroSkills->$mainSkillId[] = $subSkillId;                        # 添加技能
+        array_push($targteHeroSkills->$mainSkillId, $subSkillId);               # 添加技能
         $targetHero->subSkills = $targteHeroSkills;
         UserProc::updateUserInfo($req);                                         # 回写数据
         return Resp::ok($targetHero);
@@ -138,15 +138,15 @@ class HeroProc {
             return Resp::err(ErrCode::hero_no);
         }
 #                                                                               # 2.判断英雄的该技能能否升级....
-        isEditor() and $targetHero = new UserHeroModel();
-        $targetHero = $collectHeros->$huid;
+//        isEditor() and $targetHero = new UserHeroModel();
+        $targetHero = new UserHeroModel($collectHeros->$huid);
 #                                                                               # 取出这个英雄的技能数据 
         $targteHeroSkills = $targetHero->subSkills;
         if (!CommUtil::isPropertyExists($targteHeroSkills, $mainSkillId)) {     # 主技能Id.
-            return \Resp::err(ErrCode::err_unknownn, "玩家数据结构问题");
+            return Resp::err(ErrCode::err_unknownn, "玩家数据结构问题");
         }
-        if (!CommUtil::isPropertyExists($targteHeroSkills->$mainSkillId, $subSkillId)) {
-            return \Resp::err(ErrCode::err_unknownn, "子技能id错误");
+        if (!CommUtil::isInArray($targteHeroSkills->$mainSkillId, $subSkillId)) {
+            return Resp::err(ErrCode::err_unknownn, "子技能id错误");
         }
 
 //        if (!$targetHero->IsSkillUpdateAble($mainSkillId, $subSkillId)) {       # 3.判断技能等级能否在继续升级了
@@ -160,7 +160,7 @@ class HeroProc {
             return Resp::err(ErrCode::notenough_gold_msg);
         }
         unset($targteHeroSkills->$mainSkillId, $subSkillId);                    # 替换技能
-        $targteHeroSkills->$mainSkillId[] = $targetSubSkillId;
+        array_push($targteHeroSkills->$mainSkillId, $targetSubSkillId);
         $targetHero->subSkills = $targteHeroSkills;
         UserProc::updateUserInfo($req);                                         # 回写数据
         return Resp::ok($targetHero);
@@ -185,15 +185,14 @@ class HeroProc {
             return Resp::err(ErrCode::hero_no);
         }
 #                                                                               # 2.判断英雄的该技能能否升级....
-        isEditor() and $targetHero = new UserHeroModel();
-        $targetHero = $collectHeros->$huid;
+        $targetHero = new UserHeroModel($collectHeros->$huid);
 #                                                                               # 取出这个英雄的技能数据 
         $targteHeroSkills = $targetHero->subSkills;
         if (!CommUtil::isPropertyExists($targteHeroSkills, $mainSkillId)) {     # 主技能Id.
-            return \Resp::err(ErrCode::err_unknownn, "玩家数据结构问题");
+            return Resp::err(ErrCode::err_unknownn, "玩家数据结构问题");
         }
-        if (!CommUtil::isPropertyExists($targteHeroSkills->$mainSkillId, $subSkillId)) {
-            return \Resp::err(ErrCode::err_unknownn, "子技能id错误");
+        if (!CommUtil::isInArray($targteHeroSkills->$mainSkillId, $subSkillId)) {
+            return Resp::err(ErrCode::err_unknownn, "子技能id错误");
         }
         if (!$targetHero->IsSkillUpdateAble($mainSkillId, $subSkillId)) {       # 3.判断技能等级能否在继续升级了
             return Resp::err(ErrCode::hero_upgradeSkill_maxLevel);
@@ -201,105 +200,18 @@ class HeroProc {
 
         $sm = GameConfig::subSkill_getItem($subSkillId);                        # 4.取出该技能升级消耗的常量数据
         if (null == $sm) {
-            return \Resp::err(ErrCode::err_const_no, '找不到子技能配置数据');
+            return Resp::err(ErrCode::err_const_no, '找不到子技能配置数据');
         }
         if (!UserGameModel::Consume_Gold($user, $sm->upgradeCost)) {            # 5. 扣除金币消耗
             return Resp::err(ErrCode::notenough_gold_msg);
         }
         unset($targteHeroSkills->$mainSkillId, $subSkillId);                    # 替换技能
-        $targteHeroSkills->$mainSkillId[] = $sm->nextLevel_Id;
+        array_push($targteHeroSkills->$mainSkillId, $sm->nextLevel_Id);
         $targetHero->subSkills = $targteHeroSkills;
         UserProc::updateUserInfo($req);                                         # 回写数据
         return Resp::ok($targetHero);
     }
 
-    /**
-     * [6314]英雄技能升级
-     * @param req $req
-     */
-    static function _UpgradeSkillLevel($req) {
-#         $resp = ResponseVo::ErrResponse($req, ErrCode::msg_methodnotimplement);
-        $user = $req->userInfo->game; # user引用
-        $huid = $req->paras[0];                                                 # 英雄的UID
-        $skillId = $req->paras[1];                                              # 要升级的技能
-        $skillType = $req->paras[2];                                            # 要升级的技能
-        $costGold = $req->paras[3];                                             # 要升级的消耗金币
-#                                                                               # 1.检查是否存在要升级的英雄
-        $collectHeros = $user->heros->collectHeros;
-        if (!$collectHeros) {
-            $collectHeros = ObjectInit();
-        }
-        if (!CommUtil::isPropertyExists($collectHeros, $huid)) {
-            return Resp::err(ErrCode::hero_no);
-        }
-#                                                                               # 2.判断英雄的该技能能否升级....
-        isEditor() and $strengthHero = new UserHeroModel();
-        $strengthHero = $collectHeros->$huid;
-#                                                                               # 取出这个英雄的技能数据
-        $targteHeroSkills = ObjectInit();
-        if (CommUtil::isPropertyExists($strengthHero, "skills")) {
-            $targteHeroSkills = $strengthHero->skills;
-        }
-
-        if (!CommUtil::isPropertyExists($targteHeroSkills, $skillType)) {       # 如果不存在这个类型的技能,则 初始化一个.
-            $targteHeroSkills->$skillType = JsonUtil::decode('{"level":1}');
-        }
-        $curSkillInfo = $targteHeroSkills->$skillType;
-        $curSkillLevel = $curSkillInfo->level;
-# 3.判断技能等级能否在继续升级了
-        if ($curSkillLevel >= $strengthHero->level) {
-            return Resp::err(ErrCode::hero_upgradeSkill_maxLevel);
-        }
-# 4.取出该技能升级消耗的常量数据
-# 检查是否存在当前技能的消耗常量数据
-//        $lvs = GameConfig::skill_shengji_getItem($skillId);
-        $lvs = GameConfig::skill_upgrade_cost_getItem($skillId);
-        if (!$lvs) {
-            return Resp::err(ErrCode::hero_upgradeSkill_cost_const_no);
-        }
-        $realGold = $lvs->basic + ($curSkillLevel - 1) * $lvs->xishu;
-        $arr_extracost = explode(";", $lvs->extra);
-        foreach ($arr_extracost as $value) {
-            $arr = explode(",", $value);
-            if (count($arr) == 2) {
-                $extraLevel = $arr[0];
-                $extraGold = $arr[1];
-                if ($extraLevel == $curSkillLevel + 1) {
-                    $realGold += $extraGold;
-                    break;
-                }
-            }
-        }
-
-# 判断金币是否充足
-        $bDeal = false;  # 成交
-        if ($realGold != $costGold) {
-            return Resp::err(ErrCode::paras_err, "costGold error! server need:" . $realGold);
-        } else {
-            if ($costGold > 0) {
-                if ($user->gold < $costGold) {
-                    return Resp::err(ErrCode::notenough_gold_msg);
-                } else {
-                    $bDeal = UserGameModel::Consume_Gold($user, $costGold);
-                }
-            } else if ($costGold == 0) {
-                $bDeal = true;
-            } else {
-                return Resp::err(ErrCode::paras_err);
-            }
-        }
-# 4.消耗金币和英雄
-        if ($bDeal) {
-            $targteHeroSkills->$skillType->level += 1;
-            $strengthHero->skills = $targteHeroSkills;
-            ActiveProc::ChangeTaskCount($req);
-# 回写数据
-            UserProc::updateUserInfo($req);
-            $resp = Resp::ok($strengthHero);
-        }
-        return $resp;
-    }
-
 // </editor-fold>
 //
     // <editor-fold defaultstate="collapsed" desc="英雄 强化">
@@ -420,6 +332,93 @@ class HeroProc {
 // 
 // <editor-fold defaultstate="collapsed" desc="已过时代码">
 
+    /**
+     * [6314]英雄技能升级
+     * @param req $req
+     */
+    static function _UpgradeSkillLevel($req) {
+#         $resp = ResponseVo::ErrResponse($req, ErrCode::msg_methodnotimplement);
+        $user = $req->userInfo->game; # user引用
+        $huid = $req->paras[0];                                                 # 英雄的UID
+        $skillId = $req->paras[1];                                              # 要升级的技能
+        $skillType = $req->paras[2];                                            # 要升级的技能
+        $costGold = $req->paras[3];                                             # 要升级的消耗金币
+#                                                                               # 1.检查是否存在要升级的英雄
+        $collectHeros = $user->heros->collectHeros;
+        if (!$collectHeros) {
+            $collectHeros = ObjectInit();
+        }
+        if (!CommUtil::isPropertyExists($collectHeros, $huid)) {
+            return Resp::err(ErrCode::hero_no);
+        }
+#                                                                               # 2.判断英雄的该技能能否升级....
+        isEditor() and $strengthHero = new UserHeroModel();
+        $strengthHero = $collectHeros->$huid;
+#                                                                               # 取出这个英雄的技能数据
+        $targteHeroSkills = ObjectInit();
+        if (CommUtil::isPropertyExists($strengthHero, "skills")) {
+            $targteHeroSkills = $strengthHero->skills;
+        }
+
+        if (!CommUtil::isPropertyExists($targteHeroSkills, $skillType)) {       # 如果不存在这个类型的技能,则 初始化一个.
+            $targteHeroSkills->$skillType = JsonUtil::decode('{"level":1}');
+        }
+        $curSkillInfo = $targteHeroSkills->$skillType;
+        $curSkillLevel = $curSkillInfo->level;
+# 3.判断技能等级能否在继续升级了
+        if ($curSkillLevel >= $strengthHero->level) {
+            return Resp::err(ErrCode::hero_upgradeSkill_maxLevel);
+        }
+# 4.取出该技能升级消耗的常量数据
+# 检查是否存在当前技能的消耗常量数据
+//        $lvs = GameConfig::skill_shengji_getItem($skillId);
+        $lvs = GameConfig::skill_upgrade_cost_getItem($skillId);
+        if (!$lvs) {
+            return Resp::err(ErrCode::hero_upgradeSkill_cost_const_no);
+        }
+        $realGold = $lvs->basic + ($curSkillLevel - 1) * $lvs->xishu;
+        $arr_extracost = explode(";", $lvs->extra);
+        foreach ($arr_extracost as $value) {
+            $arr = explode(",", $value);
+            if (count($arr) == 2) {
+                $extraLevel = $arr[0];
+                $extraGold = $arr[1];
+                if ($extraLevel == $curSkillLevel + 1) {
+                    $realGold += $extraGold;
+                    break;
+                }
+            }
+        }
+
+# 判断金币是否充足
+        $bDeal = false;  # 成交
+        if ($realGold != $costGold) {
+            return Resp::err(ErrCode::paras_err, "costGold error! server need:" . $realGold);
+        } else {
+            if ($costGold > 0) {
+                if ($user->gold < $costGold) {
+                    return Resp::err(ErrCode::notenough_gold_msg);
+                } else {
+                    $bDeal = UserGameModel::Consume_Gold($user, $costGold);
+                }
+            } else if ($costGold == 0) {
+                $bDeal = true;
+            } else {
+                return Resp::err(ErrCode::paras_err);
+            }
+        }
+# 4.消耗金币和英雄
+        if ($bDeal) {
+            $targteHeroSkills->$skillType->level += 1;
+            $strengthHero->skills = $targteHeroSkills;
+            ActiveProc::ChangeTaskCount($req);
+# 回写数据
+            UserProc::updateUserInfo($req);
+            $resp = Resp::ok($strengthHero);
+        }
+        return $resp;
+    }
+
     /**
      * 6323 解锁英雄
      * @param type $req

+ 3 - 0
Gameserver/Amfphp/test.php

@@ -15,3 +15,6 @@ $sarr = array("D" => 1, "C" => 2, "B" => 3, "A" => 4, "S" => 5);
 var_dump($sarr);
 var_dump(key_exists("C", $sarr));
 var_dump($sarr["C"]);
+//var_dump(CommUtil::isPropertyExists($sarr, "S"));
+$arr = array("S", "A", "B", "C");
+var_dump(CommUtil::isInArray($arr, "S"));

binární
Gameserver/Test/conf/PVP.ini


binární
Gameserver/Test/conf/lf.ini


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 92
Gameserver/Test/conf/lf.ini.html


binární
Gameserver/Test/conf/lf2.ini


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 92
Gameserver/Test/conf/lf2.ini.html


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 92
Gameserver/Test/conf/pvp.ini.html


+ 75 - 0
Gameserver/Test/conf/技能_测试.ini

@@ -0,0 +1,75 @@
+; 测试配置文件, 注意:文件编码选Unicode(记事本另存为)
+;  
+;  本配置文件格式:
+;    [SERVER]  服务器节点,唯一
+;     url      服务器地址,唯一
+;    [other]   其他节点, 都视作是测试节点
+;     req         必须包含一个请求数据
+
+[SERVER]
+prj=言灵世界->Test
+; url=http://localhost/dhd_aa/Gameserver/Amfphp/ 
+url=http://192.168.10.86/ylsj2019/Gameserver/Amfphp/ 
+; url=https://ylsj.game7000.com/Gameserver/Amfphp/
+; url=http://118.25.30.103/ylsj/Gameserver/Amfphp/
+method=Post
+;编解码插件的编解码类名称
+; 不设置则采用默认编解码方法: encoder=默认编码
+; 言灵世界采用的编解码方法
+encoder=泰坦_言灵世界
+[分区列表]
+req={"uid":"wanggangzero","ope":600,"cmd":6000,"paras":[],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+
+; [玩家登录]
+; req={"uid":"wanggangzero","ope":600,"cmd":6001,"paras":[],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":"啦啦我是中文"}
+ 
+
+
+[英雄-技能解锁]
+;参数: 英雄UID, 主技能id, 要解锁的子技能id
+;返回值: "ret":评论数组
+req={"uid":"yyyyyy-wg","ope":603,"cmd":6324,"paras":[10001,601001,101101],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+[英雄-技能升级]
+;参数: 英雄UID, 主技能id, 要升级的子技能id
+;返回值: "ret":评论数组
+req={"uid":"yyyyyy-wg","ope":603,"cmd":6314,"paras":[10001,601001,101101],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+[英雄-技能一键升级]
+;参数: 英雄UID, 主技能id, 要升级的子技能id, 升级到的子技能id, 消耗金币
+;返回值: "ret":评论数组
+req={"uid":"yyyyyy-wg","ope":603,"cmd":6325,"paras":[10001,601001,101102,101103],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+
+
+ [英雄-技能解锁]
+; ;参数: 英雄UID, 主技能id, 要解锁的子技能id
+; ;返回值: "ret":评论数组
+; req={"uid":"wanggangzero","ope":603,"cmd":6324,"paras":[10001,601001,101101],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+; [英雄-技能升级]
+; ;参数: 英雄UID, 主技能id, 要升级的子技能id
+; ;返回值: "ret":评论数组
+; req={"uid":"wanggangzero","ope":603,"cmd":6314,"paras":[10001,601001,101101],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+; [英雄-技能一键升级]
+; ;参数: 英雄UID, 主技能id, 要升级的子技能id, 升级到的子技能id, 消耗金币
+; ;返回值: "ret":评论数组
+; req={"uid":"wanggangzero","ope":603,"cmd":6325,"paras":[10001,601001,101102,101103],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+ 
+
+; [英雄评论-拉取评论]
+; ;参数: 英雄ID, 起始索引
+; ;返回值: "ret":评论数组
+; req={"uid":"wanggangzero","ope":603,"cmd":6316,"paras":[101001,0],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+; [英雄评论-点赞]
+; ;参数: 英雄ID,评论id
+; ;返回值: "ret":评论数组
+; req={"uid":"wanggangzero","ope":603,"cmd":6318,"paras":[101001,"wanggangzero"],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+; [英雄评论-发表评论]
+; ;参数: 英雄ID, 评论内容
+; ;返回值: "ret":评论数组
+; req={"uid":"wanggangzero","ope":603,"cmd":6317,"paras":[101001,"社会主义好,社会主义妙!"],"sig":"w","msgid":"w","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+
+; [背包-背包测试]
+; ;参数:无参数,刷新背包数据
+; req={"uid":"gwang","ope":608,"cmd":6405,"paras":[],"sig":"sig","msgid":"msgid","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+
+; [战斗--刷副本]
+; req={"uid":"qqwang11","ope":606,"cmd":6801,"paras":[502001,0,3,["10001"],0],"sig":"sig","msgid":"msgid","ts":0,"zoneid":1,"clientVer":"1.0.1","tag":null}
+ 

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 92 - 0
Gameserver/Test/conf/技能_测试.ini.html


+ 0 - 1
Gameserver/Test/lf2_测试.bat

@@ -1 +0,0 @@
-webRequest.exe conf\lf2.ini

+ 0 - 1
Gameserver/Test/lf_测试.bat

@@ -1 +0,0 @@
-webRequest.exe conf\lf.ini

+ 1 - 1
Gameserver/Test/王刚_测试.bat

@@ -1,3 +1,3 @@
 rem webRequest conf\登录_好友.ini
-webRequest.exe conf\pvp.ini
+webRequest.exe conf\技能_测试.ini
 rem webRequest.exe conf\新生招募.ini

+ 5 - 10
Gameserver/nbproject/private/private.xml

@@ -5,25 +5,20 @@
             <url>Amfphp/Process/HeroProc.php</url>
             <bookmark id="2">
                 <name/>
-                <line>1176</line>
+                <line>1339</line>
                 <key/>
             </bookmark>
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/FightProc/PVPProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/GuildProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/User/UserGameModel.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/ActiveProc/Lotterys.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/UserProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/FightProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Configs/GameConfig.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/User/UserHeroModel.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/test.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/User/UserGameHeroModel.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/vo/CmdCode.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/PreProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/User/UserGameModel.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/Const/primordial_data.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/HeroProc.php</file>
         </group>
     </open-files>

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů