diff --git a/webapp/classes/Quest.php b/webapp/classes/Quest.php index 33e6928..240eb6e 100644 --- a/webapp/classes/Quest.php +++ b/webapp/classes/Quest.php @@ -21,7 +21,7 @@ class Quest{ protected function getQuest($quest_id) { - $g_conf_quest_cluster = require('../config/game2001api.task.cluster.php'); + $g_conf_quest_cluster = require('../res/game2001api.task.cluster.php'); $quest_conf = getQuestConfig($g_conf_quest_cluster, $quest_id); $q = array( 'id' => $quest_conf['id'], diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index f9bc2df..48ba8e6 100644 --- a/webapp/controller/ActivityController.class.php +++ b/webapp/controller/ActivityController.class.php @@ -20,7 +20,7 @@ class ActivityController{ protected function getActivityConfig($activity_id) { - $g_conf_activity_cluster = require('../config/game2001api.activity.cluster.php'); + $g_conf_activity_cluster = require('../res/game2001api.activity.cluster.php'); $activity_conf = getActivityConfig($g_conf_activity_cluster, $activity_id); $a = array( 'id' => $activity_conf['id'], @@ -34,7 +34,7 @@ class ActivityController{ protected function getActivityRewardConfig($activityReward_id) { - $g_conf_activityReward_cluster = require('../config/game2001api.activityReward.cluster.php'); + $g_conf_activityReward_cluster = require('../res/game2001api.activityReward.cluster.php'); $activityReward_conf = getActivityRewardConfig($g_conf_activityReward_cluster, $activityReward_id); $act = array( 'id' => $activityReward_conf['id'], @@ -80,7 +80,7 @@ class ActivityController{ return; } //活动列表 - $g_conf_activity_cluster = require('../config/game2001api.activity.cluster.php'); + $g_conf_activity_cluster = require('../res/game2001api.activity.cluster.php'); for ($i = 1; $i <= count($g_conf_activity_cluster); $i++) { $start_status = 0; $a = $this->getActivityConfig($i); diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php index d4547b7..fc8d91d 100644 --- a/webapp/controller/EquipController.class.php +++ b/webapp/controller/EquipController.class.php @@ -19,7 +19,7 @@ class EquipController{ protected function getEquip($equip_id) { - $g_conf_equip_cluster = require('../config/game2001api.equipUpgrade.cluster.php'); + $g_conf_equip_cluster = require('../res/game2001api.equipUpgrade.cluster.php'); $equip_conf = getEquipConfig($g_conf_equip_cluster, $equip_id); $e = array( 'equip_id' => $equip_conf['id'], @@ -36,7 +36,7 @@ class EquipController{ protected function getParameter($para_id) { - $g_conf_para_cluster = require('../config/game2001api.parameter.cluster.php'); + $g_conf_para_cluster = require('../res/game2001api.parameter.cluster.php'); $para_conf = getParameterConfig($g_conf_para_cluster, $para_id); $p = array( 'id' => $para_conf['id'], diff --git a/webapp/controller/HangController.class.php b/webapp/controller/HangController.class.php index 13d0231..4f1cb39 100644 --- a/webapp/controller/HangController.class.php +++ b/webapp/controller/HangController.class.php @@ -17,7 +17,7 @@ class HangController{ protected function getParameter($para_id) { - $g_conf_para_cluster = require('../config/game2001api.parameter.cluster.php'); + $g_conf_para_cluster = require('../res/game2001api.parameter.cluster.php'); $para_conf = getParameterConfig($g_conf_para_cluster, $para_id); $p = array( 'id' => $para_conf['id'], diff --git a/webapp/controller/OpsController.class.php b/webapp/controller/OpsController.class.php deleted file mode 120000 index 633aecc..0000000 --- a/webapp/controller/OpsController.class.php +++ /dev/null @@ -1 +0,0 @@ -../phpcommon/Controller/OpsController.class.php \ No newline at end of file diff --git a/webapp/controller/OpsController.class.php b/webapp/controller/OpsController.class.php new file mode 100644 index 0000000..d0dbba9 --- /dev/null +++ b/webapp/controller/OpsController.class.php @@ -0,0 +1,15 @@ + 0, + 'errmsg' => '', + 'healthy' => 1, + 'max_rundelay' => 1, + )); + } + +} diff --git a/webapp/controller/QuestController.class.php b/webapp/controller/QuestController.class.php index 240f925..73930ae 100644 --- a/webapp/controller/QuestController.class.php +++ b/webapp/controller/QuestController.class.php @@ -19,7 +19,7 @@ class QuestController{ protected function getQuest($quest_id) { - $g_conf_quest_cluster = require('../config/game2001api.task.cluster.php'); + $g_conf_quest_cluster = require('../res/game2001api.task.cluster.php'); $quest_conf = getQuestConfig($g_conf_quest_cluster, $quest_id); $q = array( 'id' => $quest_conf['id'], @@ -34,7 +34,7 @@ class QuestController{ protected function getTaskReward($taskReward_id) { - $g_conf_taskReward_cluster = require('../config/game2001api.taskReward.cluster.php'); + $g_conf_taskReward_cluster = require('../res/game2001api.taskReward.cluster.php'); $taskReward_conf = getTaskRewardConfig($g_conf_taskReward_cluster, $taskReward_id); $t = array( 'id' => $taskReward_conf['id'], @@ -60,7 +60,7 @@ class QuestController{ protected function getDrop($drop_id) { - $g_conf_drop_cluster = require('../config/game2001api.drop.cluster.php'); + $g_conf_drop_cluster = require('../res/game2001api.drop.cluster.php'); $drop_conf = getDropConfig($g_conf_drop_cluster, $drop_id); $d = array( 'drop_id' => $drop_conf['drop_id'], diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index d35daf3..cf35497 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -20,7 +20,7 @@ class RoleController{ protected function getActivityRewardConfig($activityReward_id) { - $g_conf_activityReward_cluster = require('../config/game2001api.activityReward.cluster.php'); + $g_conf_activityReward_cluster = require('../res/game2001api.activityReward.cluster.php'); $activityReward_conf = getActivityRewardConfig($g_conf_activityReward_cluster, $activityReward_id); $act = array( 'id' => $activityReward_conf['id'], @@ -52,7 +52,7 @@ class RoleController{ protected function getParameter($para_id) { - $g_conf_para_cluster = require('../config/game2001api.parameter.cluster.php'); + $g_conf_para_cluster = require('../res/game2001api.parameter.cluster.php'); $para_conf = getParameterConfig($g_conf_para_cluster, $para_id); $p = array( 'id' => $para_conf['id'], diff --git a/webapp/controller/SignController.class.php b/webapp/controller/SignController.class.php index c1b50e9..373dbcd 100644 --- a/webapp/controller/SignController.class.php +++ b/webapp/controller/SignController.class.php @@ -19,7 +19,7 @@ class SignController{ protected function getSign($sign_id) { - $g_conf_sign_cluster = require('../config/game2001api.signDaily.cluster.php'); + $g_conf_sign_cluster = require('../res/game2001api.signDaily.cluster.php'); $sign_conf = getSignConfig($g_conf_sign_cluster, $sign_id); $s = array( 'sign_id' => $sign_conf['sign_id'], @@ -32,7 +32,7 @@ class SignController{ protected function getActivityRewardConfig($activityReward_id) { - $g_conf_activityReward_cluster = require('../config/game2001api.activityReward.cluster.php'); + $g_conf_activityReward_cluster = require('../res/game2001api.activityReward.cluster.php'); $activityReward_conf = getActivityRewardConfig($g_conf_activityReward_cluster, $activityReward_id); $act = array( 'id' => $activityReward_conf['id'], @@ -62,7 +62,7 @@ class SignController{ protected function getParameter($para_id) { - $g_conf_para_cluster = require('../config/game2001api.parameter.cluster.php'); + $g_conf_para_cluster = require('../res/game2001api.parameter.cluster.php'); $para_conf = getParameterConfig($g_conf_para_cluster, $para_id); $p = array( 'id' => $para_conf['id'], @@ -265,7 +265,7 @@ class SignController{ return; } //获得奖励 - $g_conf_sign_cluster = require('../config/game2001api.signDaily.cluster.php'); + $g_conf_sign_cluster = require('../res/game2001api.signDaily.cluster.php'); $sign_days = $row['sign_days'] % count($g_conf_sign_cluster); if ($sign_days == 0) { $sign_days = count($g_conf_sign_cluster); diff --git a/webapp/controller/SkinController.class.php b/webapp/controller/SkinController.class.php index b2ae788..9ce8e0c 100644 --- a/webapp/controller/SkinController.class.php +++ b/webapp/controller/SkinController.class.php @@ -17,7 +17,7 @@ class SkinController{ protected function getSkin($skin_id) { - $g_conf_skin_cluster = require('../config/game2001api.dress.cluster.php'); + $g_conf_skin_cluster = require('../res/game2001api.dress.cluster.php'); $skin_conf = getSkinConfig($g_conf_skin_cluster, $skin_id); $s = array( 'skin_id' => $skin_conf['id'], @@ -34,7 +34,7 @@ class SkinController{ protected function getDressUpgrade($skin_id) { - $g_conf_skin_cluster = require('../config/game2001api.dressUpgrade.cluster.php'); + $g_conf_skin_cluster = require('../res/game2001api.dressUpgrade.cluster.php'); $skin_conf = getDressUpgradeConfig($g_conf_skin_cluster, $skin_id); $d = array( 'id' => $skin_conf['id'], @@ -62,7 +62,7 @@ class SkinController{ protected function getParameter($para_id) { - $g_conf_para_cluster = require('../config/game2001api.parameter.cluster.php'); + $g_conf_para_cluster = require('../res/game2001api.parameter.cluster.php'); $para_conf = getParameterConfig($g_conf_para_cluster, $para_id); $p = array( 'id' => $para_conf['id'], @@ -131,7 +131,7 @@ class SkinController{ phpcommon\sendError(ERR_USER_BASE + 1,'没有这个玩家'); return; } - $g_conf_skin_cluster = require('../config/game2001api.dress.cluster.php'); + $g_conf_skin_cluster = require('../res/game2001api.dress.cluster.php'); $s = $this->getSkin(14001); if(!$s){ phpcommon\sendError(ERR_USER_BASE + 1,'没有这个皮肤'); diff --git a/webapp/controller/SupplyBoxController.class.php b/webapp/controller/SupplyBoxController.class.php index 196ffb2..8a535c8 100644 --- a/webapp/controller/SupplyBoxController.class.php +++ b/webapp/controller/SupplyBoxController.class.php @@ -19,7 +19,7 @@ class SupplyBoxController{ protected function getSupplyBox($box_id) { - $g_conf_supply_cluster = require('../config/game2001api.supply.cluster.php'); + $g_conf_supply_cluster = require('../res/game2001api.supply.cluster.php'); $supply_conf = getSupplyConfig($g_conf_supply_cluster, $box_id); $s = array( 'id' => $supply_conf['id'], @@ -35,7 +35,7 @@ class SupplyBoxController{ protected function getDrop($drop_id) { - $g_conf_drop_cluster = require('../config/game2001api.drop.cluster.php'); + $g_conf_drop_cluster = require('../res/game2001api.drop.cluster.php'); $drop_conf = getDropConfig($g_conf_drop_cluster, $drop_id); $d = array( 'drop_id' => $drop_conf['drop_id'], @@ -62,7 +62,7 @@ class SupplyBoxController{ protected function getParameter($para_id) { - $g_conf_para_cluster = require('../config/game2001api.parameter.cluster.php'); + $g_conf_para_cluster = require('../res/game2001api.parameter.cluster.php'); $para_conf = getParameterConfig($g_conf_para_cluster, $para_id); $p = array( 'id' => $para_conf['id'],