fixed: 英雄加经验出现当前经验负数问题.

Gameserver/Amfphp/process/HeroProc.php

@@ -1071,7 +1071,7 @@ class HeroProc {
                 } else {
                     $targetHero->xp -= $lvs->needExp;
                 }
-                $targetHero->maxXp = $lvs->needExp;
+//                $targetHero->maxXp = $lvs->needExp;
             } else {                                                            # 如果已到达最大等级则仅补齐缺失的经验即可
                 $targetHero->xp = $targetHero->maxXp;                           # 经验不能超过最大值
                 break;

Gameserver/nbproject/private/private.xml

@@ -12,10 +12,14 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+<<<<<<< HEAD
             <file>file:/T:/E盘/www/ylsj2019/Gameserver/Amfphp/model/User/EmailModel.php</file>
             <file>file:/T:/E盘/www/ylsj2019/Gameserver/Amfphp/process/FightProc/PVPProc.php</file>
             <file>file:/T:/E盘/www/ylsj2019/Gameserver/Amfphp/process/EmailProc.php</file>
             <file>file:/T:/E盘/www/ylsj2019/Gameserver/Amfphp/model/User/UserPVPModel.php</file>
+=======
+            <file>file:/D:/www/ylsj2019/Gameserver/Amfphp/process/FightProc.php</file>
+>>>>>>> fixed:  英雄加经验出现当前经验负数问题.
         </group>
     </open-files>
 </project-private>