合并冲突

Gameserver/Amfphp/main.php

@@ -29,7 +29,7 @@ function getRootURL() {
  * 经验证,复杂逻辑(会多次读取配置信息时)可以有效改善性能. -gwang 2020.11.24 
  * @var boolean (部署环境)是否允许代码生成
  */
-define('CodeGen_Enabled', true)
+define('CodeGen_Enabled', false)
         and CodeGen_Enabled
         and define('CodeGen_Folder', ROOTDIR . '/../../CodeGen/');              # 代码生成功能的输出位置
 

Gameserver/Amfphp/model/Const/GameConfig.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-03-03 13:52:53
+ // 日期: 2021-03-04 09:49:24
 ////////////////////
 
 /**

Gameserver/Amfphp/model/Const/sm_eventAction.php

@@ -15,7 +15,10 @@ class sm_eventAction
 {
 
     /**
-    * @var Int32 动作id(枚举值) default(0) 
+    * @var Int32 动作id(枚举值)
+    *  101触发场景剧情: 场景id, 剧情stageid
+    *  102
+    *  103 解锁建筑: 建筑id default(0) 
     */
     public $cmd;
 

Gameserver/Amfphp/model/Const/sm_gate.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-03-02 14:52:58
+ // 日期: 2021-03-03 23:31:53
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_gate_combat.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2020-12-28 11:42:49
+ // 日期: 2021-03-02 16:22:45
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_gate_mainland.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-03-02 16:00:39
+ // 日期: 2021-03-02 16:08:14
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_gatelevel.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-02-26 10:24:35
+ // 日期: 2021-03-03 17:37:43
 ////////////////////
 
 

Gameserver/Amfphp/model/Const/sm_hero.php

@@ -4,7 +4,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2021-03-02 14:51:11
+ // 日期: 2021-03-03 11:51:10
 ////////////////////
 
 

Gameserver/Amfphp/model/User/Enum_EventActionType.php

@@ -11,11 +11,16 @@ class Enum_EventActionType extends Enum {
     /**
      * 触发场景剧情:场景id,剧情stage id
      */
-    public const StartPlotScene = 101;
+    const StartPlotScene = 101;
 
     /**
      * 触发NPC对话剧情: NPCid,剧情stage id
      */
-    public const StartPlotNPC = 102;
+    const StartPlotNPC = 102;
+
+    /**
+     * 解锁建筑:建筑id
+     */
+    const UnlockBuild = 103;
 
 }

Gameserver/Amfphp/model/User/Enum_TaskCmdType.php

@@ -7,13 +7,16 @@ namespace loyalsoft;
  */
 class Enum_TaskCmdType extends Enum {
 
-    const CommanderLevelUpTo = 11;
-    const HeroLevelUpTo = 12;
-    const HeroGradeUpTo = 13;
-    const HeroSegmentNumberTo = 14;
-    const HeroSkillUnlock = 15;
-    const PassGateN = 21;
-    const passCarbonN = 22;
+    const CommanderLevelUpTo = 11;                                              # 玩家等级达到x级  (num:level,paras:[]) (跳关卡选择)
+    const HeroLevelUpTo = 12;                                                   # 唤灵师等级达到x级(num:level,paras:[heroid])(hero属性)
+    const HeroGradeUpTo = 13;                                                   # 
+    const HeroSegmentNumberTo = 14;                                             # 
+    const HeroSkillUnlock = 15;                                                 # 
+    const HeroWearupWeapon_quality = 16;                                        # 唤灵师装备X品质的武器(num:1,paras:[heroId,quality])(装备界面)
+    const HeroWearupYanling = 17;                                               # 唤灵师装备xx(id)言灵 (num:1,paras:[heroId,yanlingid])(言灵配置界面)
+    // -----
+    const PassGateN = 21;                                                       # 通过指定剧情关卡(num:1,paras:[关卡id,难度(1,2,3)])(跳关卡选择)
+    const passCarbonN = 22;                                                     # 
     const PvPWinNumberTo = 31;
     const PvPScoreTo = 32;
     const UserPowerTo = 33;
@@ -26,8 +29,11 @@ class Enum_TaskCmdType extends Enum {
     const DailyRankChalenge = 105;
     const DailyShopping = 106;
     // ---------  任务卡  --------
-    const KillMonster = 201;
-    const GainItem = 202;
-    const PlotOver = 203;
+    const KillMonster = 201;                                                    # 击杀怪物 (num:数量,paras:[怪物id]) (跳到某个关卡)
+    const GainItem = 202;                                                       # 获得道具 (num:数量,paras:[道具id]
+    const PlotOver = 203;                                                       # 对话结束 (num:1,paras:[gateid,stage]
+    const BuyTaskCard_Num = 204;                                                # 购买任务卡_带数量(num:数量,paras:[]) (跳任务卡商店)
+    const FinishTaskCard_noID = 205;                                            # 完成任务_指定id(num:1,paras:[]) (无前往)
+    const DrawSysMail_ID = 206;                                                 # 领取系统邮件_指定id(num:1,paras:[邮件id]) (跳邮件界面)
 
 }

Gameserver/Amfphp/model/User/Info_Map.php

@@ -19,8 +19,8 @@ class Info_Map extends Object_ext {
     function __construct($arg = null) {
         if (null === $arg) {
             // 直接初始化8个大陆的基本数据
+            $this->mainlands = ObjectInit();
             foreach (GameConfig::gate_mainland() as $id => $land) {
-                $this->mainlands = ObjectInit();
                 $ins = new Ins_Mainland();
                 $ins->landId = $id;
                 if (1 == $id) {                                                 # 第一个大陆, 直接开启第一个区域
@@ -31,10 +31,10 @@ class Info_Map extends Object_ext {
                     $zonecfg = GameConfig::gate_zone_getItem($zoneid);
                     my_Assert($zonecfg, ErrCode::err_const_no);
                     $gateIds = explode(',', $zonecfg->contains);
-                    $zone->highest = $gateIds[0];
+                    $zone->gates[] = $gateIds[0];
                     $ins->normal->$zoneid = $zone;
                 }
-                $this->$id = $ins;
+                $this->mainlands->$id = $ins;
             }
         } else {
             parent::__construct($arg);

Gameserver/Amfphp/model/User/Info_PrivateState.php

@@ -94,13 +94,13 @@ class Info_PrivateState extends Object_ext {
      * 角标通知缓存
      * @var array[int]
      */
-    public $cornerSignNotifications = [];
+    public $cornerSignNotifications = array();
 
     /**
      * 已解锁建筑
      * @var array[int]
      */
-    public $unlockedBuild = [];
+    public $unlockedBuild = array(1002);
 
 // <editor-fold defaultstate="collapsed" desc="    初始化    ">
 

Gameserver/Amfphp/model/User/Ins_Mainland.php

@@ -42,4 +42,17 @@ class Ins_Mainland extends Object_ext {
         }
     }
 
+    public function getZoneMos() {
+        $ldc = GameConfig::gate_mainland_getItem($this->landId);
+        $zidArr = explode(',', $ldc->containZones);
+        $ret = array();
+        $w = (array) GameConfig::gate_zone();
+        array_walk($w, function ($v, $k) use($zidArr, &$ret) {
+            if (in_array($k, $zidArr)) {
+                $ret[] = $v;
+            }
+        });
+        return $ret;
+    }
+
 }

Gameserver/Amfphp/model/User/Ins_Mapzone.php

@@ -14,23 +14,23 @@ class Ins_Mapzone extends Object_ext {
      */
     public $zoneid;
 
-    /**
-     * 最后一次挑战的关卡ID
-     * @var int
-     */
-    public $latest = 1;
-
-    /**
-     * 已挑战的最高关卡Id(用于限定解锁关卡)
-     * @var int
-     */
-    public $highest = 1;
+//    /**
+//     * 最后一次挑战的关卡ID
+//     * @var int
+//     */
+//    public $latest = 1;
+//
+//    /**
+//     * 已挑战的最高关卡Id(用于限定解锁关卡)
+//     * @var int
+//     */
+//    public $highest = 1;
 
     /**
      * 关卡具体数据()
-     * @var asoc_array/Ins_UGate dic<gateId,Ins_UGate>
+     * @var array[]
      */
-    public $gates;
+    public $gates = array();
 
     /**
      * 构造函数
@@ -38,7 +38,7 @@ class Ins_Mapzone extends Object_ext {
      */
     function __construct($arg = null) {
         if (null === $arg) {
-            $this->gates = ObjectInit();
+            $this->gates = array();
         } else {
             parent::__construct($arg);
         }

Gameserver/Amfphp/model/User/Ins_TaskCard.php

@@ -89,7 +89,9 @@ class Ins_TaskCard extends Object_ext {
             }
         }
         if (!$exists) {
-            $this->curSteps[] = new Ins_TaskStep($stpid);
+            $newstp = new Ins_TaskStep($stpid);
+            $this->curSteps[] = $newstp;
+            $newstp->doStartAct();
         }
     }
 

Gameserver/Amfphp/model/User/Ins_TaskStep.php

@@ -56,6 +56,42 @@ class Ins_TaskStep extends Object_ext {
         return $this->cur >= $this->max();
     }
 
+    /**
+     * 执行任务完成事件
+     */
+    public function doFinishAct() {
+        if ($this->mo()->finishact > 0) {
+            $act = GameConfig::eventAction_getItem($this->mo()->finishact);
+            my_Assert($act, ErrCode::err_const_no);
+            switch ($act->cmd) {
+                case Enum_EventActionType::StartPlotScene:                      # 触发场景剧情,
+                case Enum_EventActionType::StartPlotNPC:                        # 触发NPC剧情
+                    break;
+                case Enum_EventActionType::UnlockBuild:                         # 解锁建筑
+                    req()->userInfo->game->privateState->unlockedBuild[] = $act->parameters;
+                    break;
+            }
+        }
+    }
+
+    /**
+     * 执行任务开始事件
+     */
+    public function doStartAct() {
+        if ($this->mo()->startact > 0) {
+            $act = GameConfig::eventAction_getItem($this->mo()->startact);
+            my_Assert($act, ErrCode::err_const_no);
+            switch ($act->cmd) {
+                case Enum_EventActionType::StartPlotScene:                      # 触发场景剧情,
+                case Enum_EventActionType::StartPlotNPC:                        # 触发NPC剧情
+                    break;
+                case Enum_EventActionType::UnlockBuild:                         # 解锁建筑
+                    req()->userInfo->game->privateState->unlockedBuild[] = $act->parameters;
+                    break;
+            }
+        }
+    }
+
     /**
      * 构造函数
      * @param type $args
@@ -190,6 +226,9 @@ class Ins_TaskStep extends Object_ext {
                 if ($taskParam->val > $this->cur) {
                     $this->cur = $taskParam->val;
                 }
+                break;
+            case Enum_PropelType::stat:
+
                 break;
         }
     }

Gameserver/Amfphp/process/EmailProc.php

@@ -158,6 +158,7 @@ class EmailProc {
         my_Assert(ErrCode::ok == $err, $err);                                   # 发奖成功
         $mail->drawedts = now();                                                # 更新领取时间戳
         self::updateMail($zoneid, $uid, $mail);                                 # 回写邮件数据
+        TaskProc::OnDrawSysMail($mail->mailId);
         self::logMailDrawed(array($mailId), $uid, $zoneid);                     # 更新数据库中邮件的领取记录 
         UserProc::updateUserInfo();
         return Resp::ok(array(#                                                 # 同步数据        
@@ -196,6 +197,7 @@ class EmailProc {
                 }
                 $arr[] = $m->appendix;
                 $rewardEmailIds[] = $m->mailId;
+                TaskProc::OnDrawSysMail($m->mailId);
             } //  else                                                          # 无附件的邮件不管
         }
         $asocMails = array();

Gameserver/Amfphp/process/EventProc.php

@@ -82,6 +82,21 @@ class EventProc {
             }
         }
 
+        $map = req()->userInfo->game->map;
+        foreach ($map->mainlands as $id => $mlnd) {                             # 检查解锁
+            $mlnd = new Ins_Mainland($mlnd);
+            foreach ($mlnd->getZoneMos() as $zoneid => $zone) {
+                isEditor()and $zone = new \sm_gate_zone();
+                if ($zone->playerLevelLimit <= $new) {
+                    if (!CommUtil::isPropertyExists($mlnd->normal, $zoneid)) {
+                        NormalEventProc::OnUnlockMap($zoneid, 0);
+                    } else {
+                        // 此区域已经解锁,走顺序关卡模式,除非有其他任务卡或者什么东西直接解锁了某个关卡
+                    }
+                }
+            }
+        }
+
 //        NormalEventProc::OnHelloWorld($arg1, $arg2);                            # 添加升级事件,算了这个暂时没人关注
     }
 

Gameserver/Amfphp/process/FightProc/SweepGatesProc.php

@@ -43,6 +43,7 @@ class SweepGatesProc {
         }
         $rsarr = explode(';', $rwdstr);
         my_Assert(count($rsarr) > 0, "关卡奖励数据异常");
+        $dic = array();
         foreach ($rsarr as $rs) {
             $rarr = explode(',', $rs);
             $id = intval($rarr[0]);

Gameserver/Amfphp/process/StoreProc.php

@@ -535,7 +535,7 @@ class StoreProc {
             $user->store->yanling->$oldYLid->herouid = 0;                       # 清理旧言灵的
         }
         $collectHeros->$herouid->yanling->$itemtype->itemuid = $yanling_uid;    # 英雄身上添加言灵记录
-
+        TaskProc::OnHeroWearWeapon($collectHeros->$herouid->typeId, $user->store->yanling->$yanling_uid->typeId);
         UserProc::updateUserInfo();                                             # 5.回写数据
         $ret = array('resp' => "succeed!");
         $resp = Resp::ok($ret);                                                 // 返回 
@@ -615,6 +615,7 @@ class StoreProc {
         }
         UserProc::updateUserInfo();                                             // 5.回写数据
 //        StoreProc::CheckItemNum($req);
+        TaskProc::OnHeroWearWeapon($collectHeros->$herouid->typeId, $user->store->equipment->$equipuid->typeId);
         HeroProc::CalcUserFightPower($req->zoneid, $req->uid, $user);           # 更新总战力榜
         return Resp::ok(array('resp' => "succeed!"));                           // 返回 
     }

Gameserver/Amfphp/process/TaskProc.php

@@ -123,6 +123,7 @@ class TaskProc {
         $userInfo->taskCardShop->selled[] = $typeId;                            # 添加售罄记录
         UserProc::updateUserInfo();
         NormalEventProc::OnTaskBag_new_Card($cid, $num);                        # 播放获得任务卡事件
+        self::OnBuyTaskCard($num);                                              # 监控购买任务卡的任务卡[・_・?]
         return Resp::ok(array(
                     'gold' => $req->userInfo->game->baseInfo->gold,
                     'cash' => $req->userInfo->game->baseInfo->cash,
@@ -300,6 +301,7 @@ class TaskProc {
             if ($tsp->isStatusType()) {                                         # 如果是道具收集类的, 扣除所收集道具
                 $tsp->autoCalcStatusCur();
             }
+            $tsp->doStartAct();
         }
         if ($taskCard->IsFinish()) {                                            # 检查是否任务卡的所有步骤都已完成
             $taskCard->state = Enum_TaskCardStateType::finish;
@@ -325,7 +327,7 @@ class TaskProc {
     static function FindIngCardCount() {
         $cardDic = req()->userInfo->game->store->taskcards;
         $num = 0;
-        array_walk($cardDic, function ($inst) use(&$find) {
+        array_walk($cardDic, function ($inst) use(&$num) {
 //             $inst = new Ins_TaskCard($inst); 
             if ($inst->state == Enum_TaskCardStateType::ing) {
                 $num++;
@@ -366,6 +368,7 @@ class TaskProc {
         
         $store->taskcards->$taskCardUID = $taskCard;                            # 回写任务数据
         NormalEventProc::OnTaskCard_Reward($taskCard->mo()->reward, null);      # 带入事件
+        self::OnFinishTaskCard();                                               # 触发检查任务卡的任务卡[・_・?]
         StlUtil::dictRemove($req->userInfo->game->store->taskcards, $taskCardUID); # 移除任务卡
         $req->userInfo->game->store = $store;
         self::autoRecoverStateMissions();                                       # 重新更新其它状态类的任务卡
@@ -608,6 +611,9 @@ class TaskProc {
     static function OnUserLevelUp($newLvl) {
         $taskParam = new Ins_TaskParams(Enum_TaskCmdType::CommanderLevelUpTo, $newLvl);
         self::CheckTaskConditions($taskParam);
+
+        $taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::CommanderLevelUpTo, Enum_PropelType::set, $newLvl, array($newLvl));
+        self::CheckTaskCardConditions($taskEventArg);
     }
 
     /**
@@ -618,6 +624,8 @@ class TaskProc {
     static function OnHeroLevelUp($heroMoId, $newLvl) {
         $taskParam = new Ins_TaskParams(Enum_TaskCmdType::HeroLevelUpTo, $heroMoId, $newLvl);
         self::CheckTaskConditions($taskParam);
+        $taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::HeroLevelUpTo, Enum_PropelType::set, $newLvl, array($heroMoId));
+        self::CheckTaskCardConditions($taskEventArg);
     }
 
     /**
@@ -651,6 +659,28 @@ class TaskProc {
         self::CheckTaskConditions($taskParam);
     }
 
+    /**
+     * 英雄穿上武器
+     * @param type $heroMoid
+     * @param type $weaponMoId
+     */
+    static function OnHeroWearWeapon($heroMoid, $weaponMoId) {
+        $weapMO = GameConfig::item_base_getItem($weaponMoId);
+        my_Assert($weapMO, ErrCode::err_const_no);
+        $taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::HeroWearupWeapon_quality, Enum_PropelType::set, 1, array($heroMoid, $weapMO->quality));
+        self::CheckTaskCardConditions($taskEventArg);
+    }
+
+    /**
+     * 英雄装备言灵
+     * @param type $heroMoid
+     * @param type $weaponMoId
+     */
+    static function OnHeroWearYanling($heroMoid, $yanlingMoId) {
+        $taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::HeroWearupYanling, Enum_PropelType::set, 1, array($heroMoid, $yanlingMoId));
+        self::CheckTaskCardConditions($taskEventArg);
+    }
+
     /**
      * 通关剧情关卡
      * @param type $gateId
@@ -660,6 +690,9 @@ class TaskProc {
         $taskParam = new Ins_TaskParams(Enum_TaskCmdType::PassGateN, $gateId, $difficulty);
         self::CheckTaskConditions($taskParam);
         self::OnPassGate();
+
+        $taskEventArg = new Ins_TaskEventArgs(Enum_TaskCmdType::PassGateN, Enum_PropelType::set, 1, array($gateId, $difficulty));
+        self::CheckTaskCardConditions($taskEventArg);
     }
 
     /**
@@ -795,7 +828,7 @@ class TaskProc {
 
     /**
      * 检查任务卡条件是否达成
-     * @param Ins_TaskParams $taskParam Description
+     * @param Ins_TaskEventArgs $taskParam Description
      */
     static function CheckTaskCardConditions($taskParam) {
         $bUpdate = false;
@@ -814,8 +847,8 @@ class TaskProc {
                     $tsp->propel($taskParam);
                     NormalEventProc::OnTaskCardStep_Process($task->uid, $tsp->typeId); # 任务进度更新
                     if ($tsp->isFinish()) {
-
                         NormalEventProc::OnTaskCardStep_Complete($task->uid, $tsp->typeId); # 广播任务步骤完成事件
+                        $tsp->doFinishAct();
                     }
 //                    break;
                 }
@@ -861,11 +894,46 @@ class TaskProc {
         self::CheckTaskCardConditions($taskParam);
     }
 
+    /**
+     * 对话完成
+     * @param type $gate_or_npc_id
+     * @param type $stage
+     * @return type
+     */
     static function OnPlotOver($gate_or_npc_id, $stage) {
         $taskParam = new Ins_TaskEventArgs(Enum_TaskCmdType::PlotOver, Enum_PropelType::set, 1, array($gate_or_npc_id, "$stage"));
         return self::CheckTaskCardConditions($taskParam);
     }
 
+    /**
+     * 购买n张任务卡(非特定) 
+     * @param type $_num
+     * @return type
+     */
+    static function OnBuyTaskCard($_num = 1) {
+        $taskParam = new Ins_TaskEventArgs(Enum_TaskCmdType::BuyTaskCard_Num, Enum_PropelType::add, $_num, array());
+        return self::CheckTaskCardConditions($taskParam);
+    }
+
+    /**
+     * 完成任务卡(不指定) 这是要造检查任务卡的任务卡[・_・?]
+     * @return type
+     */
+    static function OnFinishTaskCard() {
+        $taskParam = new Ins_TaskEventArgs(Enum_TaskCmdType::FinishTaskCard_noID, Enum_PropelType::set, 1, array());
+        return self::CheckTaskCardConditions($taskParam);
+    }
+
+    /**
+     * 领取系统邮件奖励
+     * @param type $mailId 指定邮件id
+     * @return type
+     */
+    static function OnDrawSysMail($mailId) {
+        $taskParam = new Ins_TaskEventArgs(Enum_TaskCmdType::DrawSysMail_ID, Enum_PropelType::set, 1, array($mailId));
+        return self::CheckTaskCardConditions($taskParam);
+    }
+
     // 
     // </editor-fold>
 //

Gameserver/Amfphp/test.php

@@ -8,28 +8,11 @@ echoLine("phpver: " . PHP_VERSION . PHP_EOL);
 //
 //set_time_limit(15);                                                           # 设置执行超时时间
 //
-
-$id = 233;
-
-var_dump(sprintf("%07d", $id));
-
-//$arr = array("name" => "王刚",
-//    "sex" => "male",
-//);
-//$url = "https://siapcn.galaxyappstore.com/samsung/coupon-merch/player/login_check";
-//$par = '{"applyNo":"5000951584","uid":"54337601","sign":"bnECLDsKKI3n3jBEPHfVvOuoQH\/n8QlVnbfeS5Rk3+jt6WqtMjMDzIZtEaL0TCaxssz0wa5YJ8TxnFe+3smElIYc1jSYzKpGFZi15w8iWk6wyVn4az15HXzNc66ImSFq1RAgkoe8BAMVWUfhr2Jz2c+k4dZuZ+c5vG6miZTznWY="}';
-//$resp = HttpUtil::makeRequest($url, $par, array(), array('Content-type: application/json;charset=utf-8'));
+//$id = 233;
 //
-//var_dump($resp);
-//
-//$url = "http://192.168.10.86/PetMulti/Gameserver/Amfphp/service_call/pay/samsung/login_samsung_dy.php";
-//$par = "appid=5000951584&signature=1c30d675131e7af135ead2ca8f6a20a3&uid=54337601&signMethod=MD5&";
-//$resp = HttpUtil::makeRequest($url, $par);
-//var_dump($resp);
-//
-//test(function() {
-//    $key = "test";
-//    $v = gMem()->get($key);
-////    var_dump($v);
-//    gMem()->set($key, \loyalsoft\TimeUtil::dtCurrent());
-//}, 100);
+//var_dump(sprintf("%07d", $id));
+
+$mlnd = new Ins_Mainland();
+$mlnd->landId = 1;
+//var_dump((array) GameConfig::gate_zone());
+var_dump($mlnd->getZoneMos());

Gameserver/nbproject/private/private.xml

@@ -12,9 +12,20 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_PrivateState.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/StoreProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/EventProc/NormalEventProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/TaskProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/EventProc.php</file>
             <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_Map.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/FightProc/SweepGatesProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskCard.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Ins_TaskStep.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Enum_EventActionType.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/test.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/model/User/Info_PrivateState.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/process/HeroProc.php</file>
+            <file>file:/D:/local_svn/0_ylsj2019/ylsj2019Server/Gameserver/Amfphp/base/CmdCode.php</file>
         </group>
     </open-files>
 </project-private>