|
@@ -62,13 +62,20 @@ class MapProc {
|
|
|
|
|
|
StoreProc::removeItemFromStore(ctx()->store, $itemId);
|
|
StoreProc::removeItemFromStore(ctx()->store, $itemId);
|
|
|
|
|
|
- $zoneId = GameConfig::map_scene_getItem($curMapId)->zoneId;
|
|
|
|
- $item = GameConfig::map_scene_zoneid_getItemArray($zoneId)[0];
|
|
|
|
- $mid = $item->mapId;
|
|
|
|
|
|
+ $gateZone = GameConfig::gate_zone();
|
|
|
|
+ my_Assert($gateZone != null, ErrCode::err_const_no);
|
|
|
|
+ foreach ($gateZone as $zoneid => $val) {
|
|
|
|
+ $list = explode(',', $val->contains);
|
|
|
|
+ if(in_array($curMapId, $list)){
|
|
|
|
+ $mid = $list[0];
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
$newMap->curMapId = $mid;
|
|
$newMap->curMapId = $mid;
|
|
|
|
|
|
$data = new Ins_ChuansongzhenMapData();
|
|
$data = new Ins_ChuansongzhenMapData();
|
|
|
|
+ $data->mapId = $mid;
|
|
$data->lastMapId = $mapId;
|
|
$data->lastMapId = $mapId;
|
|
$data->position_x = $x;
|
|
$data->position_x = $x;
|
|
$data->position_y = $y;
|
|
$data->position_y = $y;
|
|
@@ -92,11 +99,20 @@ class MapProc {
|
|
//$mapid = req()->paras[0]; # 提取参数
|
|
//$mapid = req()->paras[0]; # 提取参数
|
|
$newMap = ctx()->newMap();
|
|
$newMap = ctx()->newMap();
|
|
$curMapId = $newMap->curMapId;
|
|
$curMapId = $newMap->curMapId;
|
|
- $zoneId = GameConfig::map_scene_getItem($curMapId)->zoneId;
|
|
|
|
-
|
|
|
|
- $item = GameConfig::map_scene_zoneid_getItemArray($zoneId)[0];
|
|
|
|
- $lastMapid = $item->mapId;
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+// $zoneId = GameConfig::map_scene_getItem($curMapId)->zoneId;
|
|
|
|
+// $item = GameConfig::map_scene_zoneid_getItemArray($zoneId)[0];
|
|
|
|
+ $lastMapid = $curMapId;
|
|
|
|
+ $gateZone = GameConfig::gate_zone();
|
|
|
|
+ my_Assert($gateZone != null, ErrCode::err_const_no);
|
|
|
|
+ foreach ($gateZone as $zoneid => $val) {
|
|
|
|
+ $list = explode(',', $val->contains);
|
|
|
|
+ if(in_array($curMapId, $list)){
|
|
|
|
+ $lastMapid = $list[0];
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
if(StlUtil::dictHasProperty($newMap->huichengquanRecord, $lastMapid)){
|
|
if(StlUtil::dictHasProperty($newMap->huichengquanRecord, $lastMapid)){
|
|
StlUtil::dictRemove($newMap->huichengquanRecord, $lastMapid);
|
|
StlUtil::dictRemove($newMap->huichengquanRecord, $lastMapid);
|
|
}
|
|
}
|
|
@@ -120,7 +136,7 @@ class MapProc {
|
|
|
|
|
|
$newMap->unlockedFootholds->$mapid->exploreRewardGeted = true;
|
|
$newMap->unlockedFootholds->$mapid->exploreRewardGeted = true;
|
|
|
|
|
|
- $cost = GameConfig::map_scene_getItem($mapid)->exploreReward;
|
|
|
|
|
|
+ $cost = GameConfig::gate_getItem($mapid)->exploreReward;
|
|
StoreProc::AddMultiItemInStore($cost);
|
|
StoreProc::AddMultiItemInStore($cost);
|
|
ctx()->newMap = $newMap;
|
|
ctx()->newMap = $newMap;
|
|
|
|
|
|
@@ -162,6 +178,8 @@ class MapProc {
|
|
|
|
|
|
my_Assert(StlUtil::dictHasProperty($newMap->unlockedFootholds, $mapid), ErrCode::map_Unlocked);
|
|
my_Assert(StlUtil::dictHasProperty($newMap->unlockedFootholds, $mapid), ErrCode::map_Unlocked);
|
|
|
|
|
|
|
|
+ $newMap->curMapId = $mapid;
|
|
|
|
+
|
|
$arr = self::countFootHoldExplorerNum($mapid, $type, $typeid, $newMap);
|
|
$arr = self::countFootHoldExplorerNum($mapid, $type, $typeid, $newMap);
|
|
$explorerNum = $arr[0];
|
|
$explorerNum = $arr[0];
|
|
$num = $arr[1];
|
|
$num = $arr[1];
|
|
@@ -234,9 +252,9 @@ class MapProc {
|
|
$newMap = ctx()->newMap();
|
|
$newMap = ctx()->newMap();
|
|
# 检查目标地图是否已经解锁
|
|
# 检查目标地图是否已经解锁
|
|
my_Assert(!isset($newMap->unlockedFootholds->$targetMapId), ErrCode::map_Unlocked);
|
|
my_Assert(!isset($newMap->unlockedFootholds->$targetMapId), ErrCode::map_Unlocked);
|
|
- $mo = GameConfig::map_scene_getItem($targetMapId);
|
|
|
|
|
|
+ $mo = GameConfig::gate_getItem($targetMapId);
|
|
$footHold = new Ins_FootHold();
|
|
$footHold = new Ins_FootHold();
|
|
- $footHold->mapId = $mo->mapId;
|
|
|
|
|
|
+ $footHold->mapId = $mo->gateId;
|
|
$footHold->curMapType = $mo->mapType;
|
|
$footHold->curMapType = $mo->mapType;
|
|
$this->unlockedFootholds->$targetMapId = $footHold; # 添加解锁据点数据
|
|
$this->unlockedFootholds->$targetMapId = $footHold; # 添加解锁据点数据
|
|
ctx()->newMap = $newMap;
|
|
ctx()->newMap = $newMap;
|