Browse Source

英雄模块

gwang 5 years ago
parent
commit
743b8ed4e0

+ 5 - 4
Gameserver/Amfphp/Model/User/StoreModel.php

@@ -7,8 +7,7 @@ namespace loyalsoft;
  * 玩家背包/仓库数据模型
  * @author gwang
  */
-class StoreModel extends Object_ext
-{
+class StoreModel extends Object_ext {
 
     /**
      * 其他道具
@@ -37,26 +36,28 @@ class StoreModel extends Object_ext
     /**
      * 英雄碎片,叠加
      * @var object
+     * @deprecated since version 0
      */
     public $segement;
 
     /**
      * 七宗罪元素(炼金元素)
      * @var object
+     * @deprecated since version 0
      */
     public $element;
 
     /**
      * 石头,叠加
      * @var object
+     * @deprecated since version 0
      */
     public $stones;
 
     /**
      * 玩家注册时初始化
      */
-    public function initialize()
-    {
+    public function initialize() {
         $this->boxes = GameConfig::primordial_data()->User_Store_boxes;
         //array('701001' => 0, '702002' => 0, '703003' => 0, '704004' => 0);
         $this->cards = ArrayInit();

+ 15 - 15
Gameserver/Amfphp/Model/User/UserGameModel.php

@@ -196,22 +196,22 @@ class UserGameModel extends Object_ext {
      * @param type $arg
      */
     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->gates = new UserGateDifficulty();       # 初始化关卡默认数据
-            $this->heroManual = new HeroManualModel();     # 初始化图鉴数据结构
-            $this->NewbieGuide = ObjectInit();             # 初始化新手引导结构
-            $this->pvp = new UserPVPModel();               # 初始化pvp模块
-        } else {                                           # 实参
-            parent::__construct($arg);                     # 调用Object的构造函数
+        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->gates = new UserGateDifficulty();                            # 初始化关卡默认数据
+            $this->heroManual = new HeroManualModel();                          # 初始化图鉴数据结构
+            $this->NewbieGuide = ObjectInit();                                  # 初始化新手引导结构
+            $this->pvp = new UserPVPModel();                                    # 初始化pvp模块
+        } else {                                                                # 实参
+            parent::__construct($arg);                                          # 调用Object的构造函数
         }
-        $this->profile = new UserProfile();                # 初始化用户画像模块
+        $this->profile = new UserProfile();                                     # 初始化用户画像模块
     }
 
     // <editor-fold defaultstate="collapsed" desc="   functions   ">

+ 5 - 5
Gameserver/Amfphp/Process/HeroProc.php

@@ -1433,7 +1433,7 @@ class HeroProc {
             $collectHeros = ObjectInit();
         }
         if (!CommUtil::isPropertyExists($collectHeros, $heroUID)) {
-            return;                                         # 要升级的英雄不存在
+            return;                                                              # 要升级的英雄不存在
         }
         isEditor() and $targetHero = new UserHeroModel;
         $targetHero = $collectHeros->$heroUID;
@@ -1441,7 +1441,7 @@ class HeroProc {
         //$strengthconst = GameConfig::heroextra_dengjie_getItem($targetHero->strengthLevel);
         $maxLevel = $g->Hero_Upgrade_BasicMaxLevel; //$strengthconst->maxLevel;
         if ($targetHero->level >= $maxLevel) {
-            return;                                         # 已达顶级
+            return;                                                             # 已达顶级
         }
         $lvs = GameConfig::hero_levelexp_getItem($targetHero->level);
         $targetHero->xp += $totalEXP;
@@ -1449,7 +1449,7 @@ class HeroProc {
                 "[" . $req->uid . "] : HeroLevelUpgrade Exp is negative!");
 
         while ($targetHero->xp >= $targetHero->maxXp) {
-            if ($targetHero->level < $maxLevel) {           # 如果未到达最大等级
+            if ($targetHero->level < $maxLevel) {                               # 如果未到达最大等级
                 $nowlv = $targetHero->level + 1;
                 $nextlv = $nowlv + 1;
                 $targetHero->level = $nowlv;
@@ -1458,8 +1458,8 @@ class HeroProc {
                     $targetHero->xp = $targetHero->maxXp;
                 }
                 $targetHero->maxXp = $lvs->requiredExp;
-            } else {                                        # 如果已到达最大等级则仅补齐缺失的经验即可
-                $targetHero->xp = $targetHero->maxXp;       # 经验不能超过最大值
+            } else {                                                            # 如果已到达最大等级则仅补齐缺失的经验即可
+                $targetHero->xp = $targetHero->maxXp;                           # 经验不能超过最大值
                 break;
             }
         }

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

@@ -14,9 +14,9 @@
         <group>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/User/UserGameModel.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/FightProc/PVPProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Model/User/StoreModel.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/GuildProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Process/UserProc.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/FightProc.php</file>