装备INS改成装备部位ins

Gameserver/App/model/User/Info_Store.php

@@ -44,7 +44,7 @@ class Info_Store extends Object_ext {
      * 装备
      * @var \stdClass()
      */
-    public $equip;
+    public $equipPosition;
     
     /**
      * 宝石装备的信息
@@ -68,11 +68,11 @@ class Info_Store extends Object_ext {
         if ($arg == null) {
             $this->items = new \stdClass();
             $this->gemStore = new \stdClass();
-            $this->equip = new \stdClass();
+            $this->equipPosition = new \stdClass();
             for ($i = 1; $i <=6; $i++) {
-                $equip =  new Ins_Equip();
+                $equip =  new Ins_EquipPosition();
                 $equip->typeId = $i;
-                $this->equip->$i = $equip;
+                $this->equipPosition->$i = $equip;
             }
             
             $this->gemEquip = new \stdClass();

Gameserver/App/model/User/Ins_Equip.php → Gameserver/App/model/User/Ins_EquipPosition.php

@@ -13,7 +13,7 @@ namespace loyalsoft;
  *
  * @author c'y'zhao
  */
-class Ins_Equip extends Object_ext{
+class Ins_EquipPosition extends Object_ext{
     
     //public $uid = 0;
     

Gameserver/App/model/User/Ins_TaskStep_Active.php

@@ -216,9 +216,9 @@ class Ins_TaskStep_Active extends Object_ext {
                 return $num;
             case Enum_ActiveTaskCmdType::AnyEquipUpLevel_X:                     # 任意1件装备等级达到2     
                 $num = 0;
-                $equip = ctx()->store->equip;
+                $equip = ctx()->store->equipPosition;
                 foreach ($equip as $index => $item) {
-                    $ins_equip = new Ins_Equip($item);
+                    $ins_equip = new Ins_EquipPosition($item);
                     if ($ins_equip->level >= $para0) {
                         $num += 1;
                     }
@@ -227,9 +227,9 @@ class Ins_TaskStep_Active extends Object_ext {
                 return $num;
             case Enum_ActiveTaskCmdType::AllEquipUpLevel_X:                     # 全身装备等级达到3级以上 
                 $num = 0;
-                $equip = ctx()->store->equip;
+                $equip = ctx()->store->equipPosition;
                 foreach ($equip as $index => $item) {
-                    $ins_equip = new Ins_Equip($item);
+                    $ins_equip = new Ins_EquipPosition($item);
                     if ($ins_equip->level >= $para0) {
                         $num += 1;
                     }

Gameserver/App/process/FightProc.php

@@ -1669,11 +1669,11 @@ class FightProc {
         $heroBashAttack = $mo->attack;
         $heroBashHp = $mo->hp;
 
-        $equipDic = ctx()->store->equip;
+        $equipDic = ctx()->store->equipPosition;
         $attck = 0;
         $hp = 0;
         foreach ($equipDic as $index => $ins_equip) {
-            $Ins_Equip = new Ins_Equip($ins_equip);
+            $Ins_Equip = new Ins_EquipPosition($ins_equip);
             if ($Ins_Equip->mo()->upgradeType == 1) {//攻击力
                 $attck += GameConfig::equip_levelupgrade_getItem($ins_equip->level)->attckNum;
             } elseif ($Ins_Equip->mo()->upgradeType == 2) {

Gameserver/App/process/StoreProc.php

@@ -170,14 +170,14 @@ class StoreProc {
         //list() = req()->paras;
         $user = ctx();
 
-        $equipDic = $user->store->equip;
+        $equipDic = $user->store->equipPosition;
 
         $equip_levelDic = GameConfig::equip_levelupgrade();              
         $maxLv = count(StlUtil::dictToArray($equip_levelDic));    
         $arr = array();
         if ($equipDic != null) {
             foreach ($equipDic as $k => &$equip) {
-                $equip = new Ins_Equip($equip);
+                $equip = new Ins_EquipPosition($equip);
 
                 if($equip->level >= $maxLv){
                     continue;
@@ -204,8 +204,8 @@ class StoreProc {
                         $arr[$j] = $arr[$j + 1];
                         $arr[$j + 1] = $temp;
                     } elseif ($arr[$j]->level == $arr[$j + 1]->level) {
-                        $j_equip = new Ins_Equip($arr[$j]);
-                        $jj_equip = new Ins_Equip($arr[$j + 1]);
+                        $j_equip = new Ins_EquipPosition($arr[$j]);
+                        $jj_equip = new Ins_EquipPosition($arr[$j + 1]);
                         if ($j_equip->mo()->position > $jj_equip->mo()->position) {
                             $temp = $arr[$j];
                             $arr[$j] = $arr[$j + 1];
@@ -219,7 +219,7 @@ class StoreProc {
             while (true) {
                 $tag = 9999;
                 foreach ($arr as $index => &$equip) {
-                    $ins_equip = new Ins_Equip($equip);
+                    $ins_equip = new Ins_EquipPosition($equip);
                     $lvMo = GameConfig::equip_levelupgrade_getItem($ins_equip->level);
                     $needGold = $lvMo->needGold;
                     $needItemNum = $lvMo->needItemNum;
@@ -321,9 +321,9 @@ class StoreProc {
         list($posId) = req()->paras; //装备部位
         $user = ctx();
 
-        my_Assert(StlUtil::dictHasProperty($user->store->equip, $posId), ErrCode::user_store_NoEquip);
+        my_Assert(StlUtil::dictHasProperty($user->store->equipPosition, $posId), ErrCode::user_store_NoEquip);
 
-        $user->store->equip->$posId->tip = 0;
+        $user->store->equipPosition->$posId->tip = 0;
 
         ctx($user);
         UserProc::updateUserInfo();
@@ -639,7 +639,7 @@ class StoreProc {
 
         $equip_levelDic = GameConfig::equip_levelupgrade();              
         $maxLv = count(StlUtil::dictToArray($equip_levelDic));                     
-        $lv = $user->store->equip->$posId->level;
+        $lv = $user->store->equipPosition->$posId->level;
         my_Assert($lv < $maxLv, ErrCode::user_store_equipLevelLimit);
         $mo = GameConfig::equip_levelupgrade_getItem($lv);
         my_Assert($user->baseInfo->gold >= $mo->needGold, ErrCode::notenough_gold_msg);
@@ -653,7 +653,7 @@ class StoreProc {
         $user->store->removeItem($costTuzhiId, $mo->needItemNum);
         ctx()->baseInfo->Consume_Gold($mo->needGold);
 
-        $user->store->equip->$posId->level += 1;
+        $user->store->equipPosition->$posId->level += 1;
 
         TaskProc::OnAnyEquipUpLevel_X();
         TaskProc::OnAllEquipUpLevel_X();
@@ -677,7 +677,7 @@ class StoreProc {
         list($posId) = req()->paras; //mask = 1:表示战斗中掉落
         $user = ctx();
 
-        $equip = $user->store->equip->$posId;
+        $equip = $user->store->equipPosition->$posId;
 
         $lv = $equip->level;
         $levelupgrade = GameConfig::equip_levelupgrade();
@@ -727,7 +727,7 @@ class StoreProc {
         $user->baseInfo->gold -= $need_gold;
         $user->store->removeItem($tuzhiId, $need_item);
         if($up_lv >0){
-            $user->store->equip->$posId->level = $up_lv;
+            $user->store->equipPosition->$posId->level = $up_lv;
         }
         
         TaskProc::OnAnyEquipUpLevel_X();
@@ -924,10 +924,10 @@ class StoreProc {
      * 得到金币或是图纸的时候校验下，是否满足装备升级条件，满足则tip字段设置为1
      */
     public static function checkEquipUpgradeTip() {
-        $equipDic = ctx()->store->equip;
+        $equipDic = ctx()->store->equipPosition;
         if ($equipDic != null) {
             foreach ($equipDic as $k => &$equip) {
-                $equip = new Ins_Equip($equip);
+                $equip = new Ins_EquipPosition($equip);
                 $lvMo = GameConfig::equip_levelupgrade_getItem($equip->level);
                 $needGold = $lvMo->needGold;
                 $needItemNum = $lvMo->needItemNum;
@@ -938,7 +938,7 @@ class StoreProc {
                 }
             }
         }
-        ctx()->store->equip = $equipDic;
+        ctx()->store->equipPosition = $equipDic;
     }
 
     /**