bug

Gameserver/Amfphp/process/MapProc.php

@@ -42,16 +42,26 @@ class MapProc {
      * @return Resp
      */
     public static function huichengQuanUse() {
-        $mapId = req()->paras[0];
-        $itemId = req()->paras[1];                                              # 提取参数		                                       
-        $newMap = ctx()->newMap(true);
-     
+//        $mapId = req()->paras[0];
+        //$itemId = req()->paras[1];                                              # 提取参数		                                       
+        $newMap = ctx()->newMap(true);   
+        $mapId = $newMap->curMapId;
+        
+        $itemId = 0;
+        $dic = ctx()->store()->items;
+        foreach ($dic as $id => $num) {
+            $subType = GameConfig::item_base_getItem($id)->subType;
+            if($subType == 344){
+                $itemId = $id;
+                break;
+            }           
+        }
+        my_Assert($itemId != 0, ErrCode::err_const_no);
+        
         StoreProc::removeItemFromStore(ctx()->store, $itemId);
        
         $zoneId = GameConfig::map_scene_getItem($mapId)->zoneId;
-        $dic = GameConfig::map_scene();
-        my_Assert($dic != null, ErrCode::err_const_no);
-        
+  
         $item = GameConfig::map_scene_zoneid_getItemArray($zoneId)[0];        
         
         $newMap->curMapId = $item->mapId;       
@@ -70,13 +80,16 @@ class MapProc {
      * @return Resp
      */
     public static function huichengQuanEnd() {
-        $mapid = req()->paras[0];                                               # 提取参数		                                       
+        //$mapid = req()->paras[0];                                               # 提取参数		                                       
         $newMap = ctx()->newMap();
-        //$initMapid = 1001;
-//        my_Assert(in_array($mapid,$newMap->huichengquanRecord), ErrCode::map_NotChuanSongZhen);
+        $curMapId = $newMap->curMapId;
+        $zoneId = GameConfig::map_scene_getItem($curMapId)->zoneId;
 
-        if(in_array($mapid, $newMap->huichengquanRecord)){
-            StlUtil::arrayRemove($newMap->huichengquanRecord, $mapid);
+        $item = GameConfig::map_scene_zoneid_getItemArray($zoneId)[0];  
+        
+        $lastMapid = $item->mapId;
+        if(in_array($lastMapid, $newMap->huichengquanRecord)){
+            StlUtil::arrayRemove($newMap->huichengquanRecord, $lastMapid);
         }
                      
         ctx()->newMap = $newMap;

Gameserver/Amfphp/process/StoreProc.php

@@ -155,8 +155,8 @@ class StoreProc {
         
         $str = GameConfig::globalsettings()->YaoPingAttrInitVal;
         $slist = explode(';', $str);
-        $hp = explode(',', $slist[0])[0];
-        $mp = explode(',', $slist[1])[0];
+        $hp = explode(',', $slist[0])[1];
+        $mp = explode(',', $slist[1])[1];
         
         if($type == 0){//添加   
             $item = new Ins_battleItem();