From 09d066a2fe57438fee1db40092e09bb640b87927 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 Sep 2021 10:15:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=A0=E9=99=A4log=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/controller/NBagController.class.php | 17 ++- webapp/controller/NGunController.class.php | 20 ++-- webapp/controller/NHeroController.class.php | 39 ++++--- webapp/controller/NPlayerController.class.php | 7 +- .../NPlayerInfoController.class.php | 8 +- webapp/controller/NRRController.class.php | 18 ++-- webapp/controller/NRankController.class.php | 8 +- webapp/controller/NShopController.class.php | 37 +++---- webapp/controller/NTaskController.class.php | 26 ++--- webapp/controller/RoleController.class.php | 7 +- webapp/controller/TeamController.class.php | 14 +-- webapp/mt/newShop.php | 102 +++++++++++++++++- 12 files changed, 178 insertions(+), 125 deletions(-) diff --git a/webapp/controller/NBagController.class.php b/webapp/controller/NBagController.class.php index eb93708..01b4b14 100644 --- a/webapp/controller/NBagController.class.php +++ b/webapp/controller/NBagController.class.php @@ -65,13 +65,12 @@ class NBagController extends BaseAuthedController { $itemNum = $_REQUEST['itemNum']; $itemCfg = $newItemCfg[$itemID]; $singlePrice = $itemCfg["sell_price"]; - error_log("NewItemCfg=03=====".$itemID."===".$itemNum."==".$singlePrice); + //error_log("NewItemCfg=03=====".$itemID."===".$itemNum."==".$singlePrice); $deleteItem = array("item_id"=>$itemID,"item_num"=>$itemNum); array_push($itemArr,$deleteItem); $code = $this->deleteItem($deleteItem); - - error_log("准备删除道具======".$code); + //error_log("准备删除道具======".$code); if($code == 100) { $this->decItem($itemArr); @@ -88,7 +87,7 @@ class NBagController extends BaseAuthedController { $itemNum = $_REQUEST['itemNum']; $itemCfg = $newItemCfg[$itemID]; $dropID = $itemCfg["drop"]; - error_log("掉落道具======".$dropID); + //error_log("掉落道具======".$dropID); $item_list = array(); $itemArr = array(); $deleteItem = array("item_id"=>$itemID,"item_num"=>$itemNum); @@ -133,14 +132,13 @@ class NBagController extends BaseAuthedController { } } - error_log("dropInfo=======".json_encode($item_list)); - error_log("使用道具=====".json_encode($itemCfg)); + // error_log("dropInfo=======".json_encode($item_list)); + // error_log("使用道具=====".json_encode($itemCfg)); $resultArr = array('itemID'=>$itemID,'itemNum'=>$itemNum,"dropItem"=>$item_list); $this->sendDataToClient($code,"ok",$resultArr); } public function updateBag() { - error_log("准备更新背包======"); $this->getAllItem(); } public function getAllItem() @@ -150,10 +148,7 @@ class NBagController extends BaseAuthedController { $sqlStr = "SELECT * FROM bag WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); if($row) { - error_log("Test05======"); - } - else{ - error_log("Test06======="); + } $this->sendDataToClient(0,"test03",$row); } diff --git a/webapp/controller/NGunController.class.php b/webapp/controller/NGunController.class.php index 8aac617..33875f0 100644 --- a/webapp/controller/NGunController.class.php +++ b/webapp/controller/NGunController.class.php @@ -14,10 +14,10 @@ class NGunController extends BaseAuthedController { $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); if($row) { - error_log("GunTest3======"); + // error_log("GunTest3======"); } else{ - error_log("GunTest4======="); + //error_log("GunTest4======="); } $this->sendDataToClient(0,"test02",$row); } @@ -43,11 +43,11 @@ class NGunController extends BaseAuthedController { { $skillLvData = 1; $skillLv = $row[0]["skill_lv"]; - error_log("查询到gunSkill=====".json_encode($row)); + //error_log("查询到gunSkill=====".json_encode($row)); } else { - error_log("未查询到gunSkill====="); + //error_log("未查询到gunSkill====="); } } else @@ -102,7 +102,7 @@ class NGunController extends BaseAuthedController { { $tempNeedItemID = $lvUpNeedItemArr[$i]["itemID"]; $tempNeedItemNum = $lvUpNeedItemArr[$i]["itemNum"]; - error_log("技能升级01======".$tempNeedItemID."==".$tempNeedItemNum); + //error_log("技能升级01======".$tempNeedItemID."==".$tempNeedItemNum); if($tempNeedItemID == "10001") { $code = 97;//金币不足 @@ -130,7 +130,7 @@ class NGunController extends BaseAuthedController { $bagItemNum = $row[$j]["num"]; if($tempNeedItemID == $bagItemID) { - error_log("技能升级======".$bagItemID."==".$bagItemNum); + // error_log("技能升级======".$bagItemID."==".$bagItemNum); if($tempNeedItemNum <= $bagItemNum) { $code = 100; @@ -175,12 +175,12 @@ class NGunController extends BaseAuthedController { $this->updateGunSkillIntensify($tempItemData); $resultData = array("skill_type_id"=>$skill_type_id,"skill_id"=>$skill_id,"skill_lv"=>$skillLv); } - error_log("GunTest3======".$skill_id."==".$skill_type_id); + //error_log("GunTest3======".$skill_id."==".$skill_type_id); } $this->sendDataToClient($code,"gunSkillLvUp",$resultData); //$conn = $this->getMysql($account_id); } - public function updateCurrency($_money,$_diamond) + private function updateCurrency($_money,$_diamond) { $account_id = $_REQUEST['account_id']; $conn = $this->getMysql($account_id); @@ -189,7 +189,7 @@ class NGunController extends BaseAuthedController { $row = $conn->execQuery($sqlStr2,array(':accountid' => $account_id,':coin_num' => $_money,':diamond_num' => $_diamond)); } - public function updateGunSkillIntensify($item) + private function updateGunSkillIntensify($item) { phpcommon\SqlHelper::insertOrUpdate ($this->getSelfMysql(), @@ -264,7 +264,7 @@ class NGunController extends BaseAuthedController { $skinID = $_REQUEST['skin_id']; $goodsID = $_REQUEST['goodsID']; - error_log("购买皮肤======".$goodsID); + //error_log("购买皮肤======".$goodsID); $shopMeta = mt\NewShop::getShopItemByID($goodsID); $code = 100; $skinData = null; diff --git a/webapp/controller/NHeroController.class.php b/webapp/controller/NHeroController.class.php index 152c24e..c0911bf 100644 --- a/webapp/controller/NHeroController.class.php +++ b/webapp/controller/NHeroController.class.php @@ -23,7 +23,7 @@ class NHeroController extends BaseAuthedController { $skinID = $skinIDArr[0]; $itemData = array("hero_id"=>$heroID,"skin_id"=>$skinID); array_push($itemArr,$itemData); - error_log("itemTest=01====".$itemIDArr[$i]."==".$skinID); + //error_log("itemTest=01====".$itemIDArr[$i]."==".$skinID); $skinData = array( 'accountid' => $this->getAccountId(),'hero_id' => $heroID,'skin_id' => $skinID, 'skin_state' => 0, @@ -37,7 +37,7 @@ class NHeroController extends BaseAuthedController { $this->addAllHero($itemArr); $this->sendDataToClient(1,"test03",$playerCfg); } - public function addHeroToDB($heroID,$_heroCfg) + private function addHeroToDB($heroID,$_heroCfg) { $code = 100; $itemArr = array(); @@ -64,7 +64,7 @@ class NHeroController extends BaseAuthedController { array_push($resultArr,$skinData); return $resultArr; } - public function addHeroAndSkin($heroID,$_heroCfg,$skinID) + private function addHeroAndSkin($heroID,$_heroCfg,$skinID) { $code = 100; $itemArr = array(); @@ -109,10 +109,10 @@ class NHeroController extends BaseAuthedController { $sqlStr = "SELECT id,lv,skinid,skill1_lv1,skill1_lv2,yokeexp,yoketotalexp FROM hero WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); if($row) { - error_log("getHero======"); + //error_log("getHero======"); } else{ - error_log("getHeroFailed======="); + // error_log("getHeroFailed======="); } $this->sendDataToClient(0,"getHero",$row); } @@ -125,10 +125,10 @@ class NHeroController extends BaseAuthedController { $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id,':id' => $heroID)); if($row) { - error_log("getHero======"); + // error_log("getHero======"); } else{ - error_log("getHeroFailed======="); + // error_log("getHeroFailed======="); } $this->sendDataToClient(0,"getHeroInfoByID",$row); } @@ -143,7 +143,7 @@ class NHeroController extends BaseAuthedController { $account_id = $_REQUEST['account_id']; $conn = $this->getMysql($account_id); - error_log("updateHeroSkinSuccess======".$heroID); + // error_log("updateHeroSkinSuccess======".$heroID); $sqlStr = "Update hero set skinid =:skinid WHERE accountid=:accountid AND id=:id "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id,':id'=>$heroID,':skinid'=>$skinID)); @@ -247,7 +247,7 @@ class NHeroController extends BaseAuthedController { $code = $this->checkPriceEnough($priceNum,$priceID); if($code == 100) { - error_log("购买英雄成功=====".$priceNum); + // error_log("购买英雄成功=====".$priceNum); $conn = $this->getMysql($account_id); $sqlStr3 = "SELECT coin_num,diamond_num FROM user WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr3,array(':accountid' => $account_id)); @@ -291,7 +291,7 @@ class NHeroController extends BaseAuthedController { } $this->sendDataToClient($code,"buyHero",$heroData); } - public function updateCurrency($_money,$_diamond) + private function updateCurrency($_money,$_diamond) { $account_id = $_REQUEST['account_id']; $conn = $this->getMysql($account_id); @@ -308,10 +308,10 @@ class NHeroController extends BaseAuthedController { $sqlStr = "SELECT hero_id,skin_id,skin_state,get_from,consume_num,trytime FROM hero_skin WHERE accountid=:accountid AND hero_id=:hero_id;"; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id,':hero_id' => $heroID)); if($row) { - error_log("getHeroSkin====="); + //error_log("getHeroSkin====="); } else{ - error_log("getHeroSkinFailed======="); + //error_log("getHeroSkinFailed======="); } $this->sendDataToClient(0,"getHeroSkin",$row); } @@ -413,7 +413,7 @@ class NHeroController extends BaseAuthedController { { $tempNeedItemID = $needItemArr[$i]["itemID"]; $tempNeedItemNum = $needItemArr[$i]["itemNum"]; - error_log("技能升级01======".$tempNeedItemID."==".$tempNeedItemNum); + //error_log("技能升级01======".$tempNeedItemID."==".$tempNeedItemNum); if($tempNeedItemID == "10001") { $code = 97;//金币不足 @@ -441,7 +441,7 @@ class NHeroController extends BaseAuthedController { $bagItemNum = $row[$j]["num"]; if($tempNeedItemID == $bagItemID) { - error_log("技能升级======".$bagItemID."==".$bagItemNum); + //error_log("技能升级======".$bagItemID."==".$bagItemNum); if($tempNeedItemNum <= $bagItemNum) { $code = 100; @@ -483,7 +483,7 @@ class NHeroController extends BaseAuthedController { $conn = $this->getMysql($account_id); $row = $conn->execQuery($sqlStr2,array(':accountid' => $account_id,':id' => $heroID,':skill1_lv' => $skillLv)); - error_log("更新英雄数据到服务器==="); + //error_log("更新英雄数据到服务器==="); } } $resultArr = array("skillLv"=>$skillLv); @@ -508,7 +508,6 @@ class NHeroController extends BaseAuthedController { $totalGetExp = 0; if($code == 100) { - // if($newItemCfg[$itemID]) { $itemCfg = $newItemCfg[$itemID]; @@ -544,7 +543,7 @@ class NHeroController extends BaseAuthedController { $expNum = $expNum - $czExp; $totalExp = $totalExp +$czExp; $curHeroExp = 0; - error_log("TestLVUp=====".$heroLv."==".$czExp."==".$expNum.json_encode($heroLvUpNeedExpArray)); + //error_log("TestLVUp=====".$heroLv."==".$czExp."==".$expNum.json_encode($heroLvUpNeedExpArray)); if($heroLv >= $maxLv)//未超过最大等级 { $isOut = 1; @@ -577,13 +576,13 @@ class NHeroController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "Update hero set lv =:lv,yokeexp =:yokeexp,yoketotalexp =:yoketotalexp WHERE accountid=:accountid AND id=:id "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id,':id' => $heroID,':lv' => $heroLv,':yokeexp' => $curHeroExp,':yoketotalexp' => $totalGetExp)); - error_log("更新英雄数据到服务器===".$heroLv."==".$curHeroExp); + //error_log("更新英雄数据到服务器===".$heroLv."==".$curHeroExp); } } $resultArr = array("itemCnt"=>$itemNum,"itemPerExp"=>$perExp,"itemID"=>$itemID,"heroLV"=>$heroLv,"totalExp"=>$totalGetExp,"curExp"=>$curHeroExp); $this->sendDataToClient($code,"ok",$resultArr); } - public function addHeroSkin($item) + private function addHeroSkin($item) { phpcommon\SqlHelper::insertOrUpdate ($this->getSelfMysql(), @@ -610,7 +609,7 @@ class NHeroController extends BaseAuthedController { ) ); } - public function addAllHero($items) + private function addAllHero($items) { foreach ($items as $item) { phpcommon\SqlHelper::insertOrUpdate diff --git a/webapp/controller/NPlayerController.class.php b/webapp/controller/NPlayerController.class.php index f07cdaf..936a21d 100644 --- a/webapp/controller/NPlayerController.class.php +++ b/webapp/controller/NPlayerController.class.php @@ -12,12 +12,7 @@ class NPlayerController extends BaseAuthedController { // )); $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) { - error_log("GunTest3======"); - } - else{ - error_log("GunTest4======="); - } + $this->sendDataToClient(0,"test02",$row); } public function getPlayerLv() diff --git a/webapp/controller/NPlayerInfoController.class.php b/webapp/controller/NPlayerInfoController.class.php index c7ddb1b..32fd834 100644 --- a/webapp/controller/NPlayerInfoController.class.php +++ b/webapp/controller/NPlayerInfoController.class.php @@ -1,7 +1,7 @@ getMysql($account_id); @@ -12,7 +12,7 @@ class NPlayerInfoController extends BaseAuthedController { $giveMeFiveCnt = $row["give_me_five"]; } - error_log("当前GiveMeFiveCnt===".$giveMeFiveCnt); + //error_log("当前GiveMeFiveCnt===".$giveMeFiveCnt); return $giveMeFiveCnt; } @@ -23,7 +23,7 @@ class NPlayerInfoController extends BaseAuthedController { } public function addGiveMeFive()//玩家被点赞一次 { - error_log("玩家被点赞===".$this->getAccountId()); + //error_log("玩家被点赞===".$this->getAccountId()); $tmpCnt = $this->getGiveMeFive(); $tmpCnt ++; phpcommon\SqlHelper::insertOrUpdate @@ -212,7 +212,7 @@ class NPlayerInfoController extends BaseAuthedController { { $this->decItem($itemArr); - error_log("改名测试======".$code); + //error_log("改名测试======".$code); phpcommon\SqlHelper::update ($this->getSelfMysql(), 'user', diff --git a/webapp/controller/NRRController.class.php b/webapp/controller/NRRController.class.php index fcc4d72..14ecc73 100644 --- a/webapp/controller/NRRController.class.php +++ b/webapp/controller/NRRController.class.php @@ -10,17 +10,11 @@ class NRRController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) { - error_log("GunTest3======"); - } - else{ - error_log("GunTest4======="); - } $this->sendDataToClient(0,"test02",$row); } public function test() { - error_log("testController====".$this->m_testCnt); + //error_log("testController====".$this->m_testCnt); $this->m_testCnt ++; } public function ResetRRVIP() @@ -51,7 +45,7 @@ class NRRController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "UPDATE user set passcard=:passcard WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id,':passcard'=>1)); - error_log("更新user==".json_encode($row)); + // error_log("更新user==".json_encode($row)); } } $this->sendDataToClient($code,"buyRRVIP",null); @@ -85,7 +79,7 @@ class NRRController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "SELECT passid,active_status,honor_status FROM passinfo WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - error_log("Test==".json_encode($row)); + //error_log("Test==".json_encode($row)); if($row) { $cnt = count($row); @@ -157,7 +151,7 @@ class NRRController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "SELECT * FROM passinfo WHERE accountid=:accountid AND passid=:passid ;"; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id,':passid' => $rewardId)); - error_log("准备领取奖励===".$rewardId); + //error_log("准备领取奖励===".$rewardId); if($row) { $tmpState = 0;//奖励是否领取 $activeState = $row[0]['active_status']; @@ -182,7 +176,7 @@ class NRRController extends BaseAuthedController { $code = 99;//奖励已经领取 } - error_log("查询结果=======".json_encode($row)); + //error_log("查询结果=======".json_encode($row)); } if($code == 100)//未领取奖励 { @@ -260,7 +254,7 @@ class NRRController extends BaseAuthedController { $this->sendDataToClient($code,"getAward",$toClientData); } - public function getAwardArr() + private function getAwardArr() { $seasonCfg = mt\Season::getSeasonCfg(); $curCfg = $this->getCurSeasonCfg(); diff --git a/webapp/controller/NRankController.class.php b/webapp/controller/NRankController.class.php index a5adff0..a9d3c3c 100644 --- a/webapp/controller/NRankController.class.php +++ b/webapp/controller/NRankController.class.php @@ -8,12 +8,6 @@ class NRankController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) { - error_log("GunTest3======"); - } - else{ - error_log("GunTest4======="); - } $this->sendDataToClient(0,"test02",$row); } public function getRankInfo() @@ -95,7 +89,7 @@ class NRankController extends BaseAuthedController { return; } $data = json_decode($response, true); - error_log("邮件测试=====".json_encode($data)); + //error_log("邮件测试=====".json_encode($data)); $this->sendDataToClient(100,"MailTest",$data); } diff --git a/webapp/controller/NShopController.class.php b/webapp/controller/NShopController.class.php index 2e60292..20a1c0f 100644 --- a/webapp/controller/NShopController.class.php +++ b/webapp/controller/NShopController.class.php @@ -18,12 +18,6 @@ class NShopController extends BaseAuthedController { // )); $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) { - error_log("GunTest3======"); - } - else{ - error_log("GunTest4======="); - } $this->sendDataToClient(0,"test02",$row); } public function getShopData() @@ -104,7 +98,7 @@ class NShopController extends BaseAuthedController { $r -> pexpire($draw_uuid, 200 * 1000); $encodeArr = json_encode($allItemCfg); $allItemCfg = json_decode($encodeArr); - error_log("已经过期重新获得====".$nextDaySeconds."==".$nowSeconds."==".$daySeconds."==".$nextWeekSeconds); + //error_log("已经过期重新获得====".$nextDaySeconds."==".$nowSeconds."==".$daySeconds."==".$nextWeekSeconds); } return $allItemCfg; } @@ -128,17 +122,17 @@ class NShopController extends BaseAuthedController { } return $tmpCnt; } - public function rnd($_seed) + private function rnd($_seed) { $tmpSeed = ($_seed * 9301 + 49297) % 233280; //神奇数字 $this->m_timeSeed = $tmpSeed; return $tmpSeed / (233280.0); } - public function resetTimeSeed($_timeSeed) + private function resetTimeSeed($_timeSeed) { $this->m_timeSeed = $_timeSeed; } - public function getRandN($_num) + private function getRandN($_num) { $tmpN = $this->rnd($this->m_timeSeed); $randN = floor($tmpN*$_num); @@ -253,7 +247,7 @@ class NShopController extends BaseAuthedController { $srcPrice = $priceNum; $zkN = (int)$buyGoodsCfg->specailPrice; $priceNum = $priceNum * ($zkN/100); - error_log("购买的价格是否打折======".$srcPrice."==".$zkN."==".$priceNum); + //error_log("购买的价格是否打折======".$srcPrice."==".$zkN."==".$priceNum); } $code = $this->checkPriceEnough($priceNum,$priceID);//检查是否现有货币是否足够购买道具 } @@ -266,7 +260,7 @@ class NShopController extends BaseAuthedController { $itemCfg = $this->getItemIDByGoodsID($goodsID); if(!$itemCfg) { - error_log("商品部存在===".$goodsID); + //error_log("商品部存在===".$goodsID); $code = 98;//商品对应的道具不存在 } } @@ -287,7 +281,7 @@ class NShopController extends BaseAuthedController { $itemID = $itemCfg["id"]; } - error_log("购买道具======".$itemID); + //error_log("购买道具======".$itemID); if($goodsType == 19)//购买英雄 { @@ -373,7 +367,6 @@ class NShopController extends BaseAuthedController { $len = count($allItemCfg); for($i = 0 ;$i < $len; $i++) { - $len2 = count($allItemCfg[$i]); //error_log("当前列表======".$len2."==".$i); for($j = 0; $j < $len2; $j ++) @@ -388,7 +381,7 @@ class NShopController extends BaseAuthedController { } } } - public function calculateLimitGoods($_goodsID) + private function calculateLimitGoods($_goodsID) { $tmpAllData = $this->getAllItem(); $allItemCfg = $tmpAllData->goodsData;//$tmpAllData["goodsData"]; @@ -560,14 +553,14 @@ class NShopController extends BaseAuthedController { $tmpData = array("goodsID"=>$itemID,"buyCnt"=>0); $r -> set($draw_uuid, json_encode($tmpData)); $r -> pexpire($draw_uuid, $updateTime * 1000); - error_log("过期了，不存在======".$itemID); + //error_log("过期了，不存在======".$itemID); } else { $limitGoods = json_decode($limitGoods); $buyCnt = $limitGoods->buyCnt; $allItemCfg[$i][$j]["buyCnt"] = $buyCnt;//赋值已经购买了多少个 - error_log("FromRadis======".json_encode($limitGoods)); + //error_log("FromRadis======".json_encode($limitGoods)); } } @@ -581,7 +574,7 @@ class NShopController extends BaseAuthedController { //$this->sendDataToClient(100,"InitAllItem",$resultArr); } - public function addHeroToDB($heroID,$_heroCfg) + private function addHeroToDB($heroID,$_heroCfg) { $itemArr = array(); $resultArr = array(); @@ -602,7 +595,7 @@ class NShopController extends BaseAuthedController { $this->addHeroSkin($skinData); $this->addAllHero($itemArr); } - public function addAllHero($items) + private function addAllHero($items) { foreach ($items as $item) { phpcommon\SqlHelper::insertOrUpdate @@ -631,7 +624,7 @@ class NShopController extends BaseAuthedController { ); } } - public function addHeroSkin($item) + private function addHeroSkin($item) { phpcommon\SqlHelper::insertOrUpdate ($this->getSelfMysql(), @@ -658,7 +651,7 @@ class NShopController extends BaseAuthedController { ) ); } - public function buySkin($_skinID,$_heroID)//购买英雄皮肤 + private function buySkin($_skinID,$_heroID)//购买英雄皮肤 { $skinID = $_skinID; $heroID = $_heroID; @@ -672,7 +665,7 @@ class NShopController extends BaseAuthedController { ); $this->addHeroSkin($skinData); } - public function updateCurrency($_money,$_diamond) + private function updateCurrency($_money,$_diamond) { $account_id = $_REQUEST['account_id']; $conn = $this->getMysql($account_id); diff --git a/webapp/controller/NTaskController.class.php b/webapp/controller/NTaskController.class.php index a6dbc3d..253b780 100644 --- a/webapp/controller/NTaskController.class.php +++ b/webapp/controller/NTaskController.class.php @@ -11,17 +11,11 @@ class NTaskController extends BaseAuthedController { $conn = $this->getMysql($account_id); $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) { - error_log("GunTest3======"); - } - else{ - error_log("GunTest4======="); - } + $this->sendDataToClient(0,"test02",$row); } public function test() { - error_log("testController====".$this->m_testCnt); $this->m_testCnt ++; } public function updateLogin()//更新登录任务 @@ -86,13 +80,13 @@ class NTaskController extends BaseAuthedController { $item = array("item_id"=>$itemID,"item_num"=>$itemNum); if($itemID == Daily_AP_ID) { - error_log("我是每日活跃度ID=====".$itemID."==".$itemNum); + // error_log("我是每日活跃度ID=====".$itemID."==".$itemNum); $this->updateActivePointTODB(999,$itemNum,0); } else if($itemID == WEEK_AP_ID) { $this->updateActivePointTODB(998,$itemNum,0); - error_log("我是周活跃度ID=====".$itemID."==".$itemNum); + // error_log("我是周活跃度ID=====".$itemID."==".$itemNum); } else { @@ -122,7 +116,7 @@ class NTaskController extends BaseAuthedController { } $this->InsertTaskType($taskID,$taskCfg["type"],0); } - error_log("PlayerLv=====".$playerLv); + //error_log("PlayerLv=====".$playerLv); $this->sendDataToClient($code,"GetPlayerLvTaskReward",$resultArr); } public function getRewardByTaskID()//领取任务奖励 @@ -139,7 +133,7 @@ class NTaskController extends BaseAuthedController { $resultArr = array(); array_push($resultArr,array("taskID"=>$taskID,"index"=>$tmpIndex)); $rewardState = 0;//未领取奖励状态 - error_log("准备领取奖励测试======".$taskID."==".json_encode($row)); + //error_log("准备领取奖励测试======".$taskID."==".json_encode($row)); if($row) { $rewardState = $row[0]["quest_state"];//重新赋值是否领取了奖励 @@ -192,7 +186,7 @@ class NTaskController extends BaseAuthedController { $newState = $newState."".$listArr[$i]; } $rewardState = $newState; - error_log("配置信息======".$maxNum."==".$dropID."==".json_encode($listArr)."==".$newState); + //error_log("配置信息======".$maxNum."==".$dropID."==".json_encode($listArr)."==".$newState); } else { @@ -216,13 +210,13 @@ class NTaskController extends BaseAuthedController { $item = array("item_id"=>$itemID,"item_num"=>$itemNum); if($itemID == Daily_AP_ID) { - error_log("我是每日活跃度ID=====".$itemID."==".$itemNum); + //error_log("我是每日活跃度ID=====".$itemID."==".$itemNum); $this->updateActivePointTODB(999,$itemNum,0); } else if($itemID == WEEK_AP_ID) { $this->updateActivePointTODB(998,$itemNum,0); - error_log("我是周活跃度ID=====".$itemID."==".$itemNum); + //error_log("我是周活跃度ID=====".$itemID."==".$itemNum); } else { @@ -261,7 +255,7 @@ class NTaskController extends BaseAuthedController { //error_log("准备领取奖励=====".json_encode($_REQUEST)."==".$taskID); } //更新日活跃和周活跃分数 - public function updateActivePointTODB($_questID,$_questNum,$_rewardState) + private function updateActivePointTODB($_questID,$_questNum,$_rewardState) { $account_id = $_REQUEST['account_id']; $conn = $this->getMysql($account_id); @@ -420,7 +414,7 @@ class NTaskController extends BaseAuthedController { $modifyTime = $weekDeadLine; } $taskNum = 0; - error_log("重置======".$nowSeconds."==".$modifyTime); + //error_log("重置======".$nowSeconds."==".$modifyTime); } } $tmpData = array("id"=>$taskID,"num"=>$taskNum,"rewardState"=>$rewardState,"condition"=>$taskCondition,"modifyTime"=>$modifyTime); diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index be1b7a6..edc1d96 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -151,8 +151,6 @@ class RoleController extends BaseAuthedController { $testTask = new NTaskController(); $testTask->updateTaskToDB(QUEST_DAY_LOGIN,1); //创建任务对象结束-- - - error_log("玩家登录=====".$account_id); //登录校验 $login = loginVerify($account_id, $_REQUEST['session_id']); if (!$login) { @@ -440,6 +438,7 @@ class RoleController extends BaseAuthedController { for($i = 0 ; $i < count($paramStrArr); $i++) { array_push($itemIDArr,$paramStrArr[$i]); + error_log("newPlayerHero========".$paramStrArr[$i]); } $playerCfg = require('../res/player@player.php'); @@ -815,7 +814,7 @@ class RoleController extends BaseAuthedController { public function battleReport() { - error_log("游戏结束====".json_encode($_REQUEST)); + // error_log("游戏结束====".json_encode($_REQUEST)); //任务参与 N场比赛开始-- $taskObj = new NTaskController(); $taskObj->updateTaskToDB(PLAY_GAME,1); @@ -824,7 +823,7 @@ class RoleController extends BaseAuthedController { $alive_time = $_REQUEST["alive_time"]; $tmpAlive_time = floor($alive_time/1000); $taskObj->updateTaskToDB(ALIVE_TIME,$tmpAlive_time); - error_log("玩家存活时间======".$alive_time."==".$tmpAlive_time); + // error_log("玩家存活时间======".$alive_time."==".$tmpAlive_time); //累计生存时间多少分钟结束-- //累计击杀10个敌人开始-- $killNum = $_REQUEST['kills']; diff --git a/webapp/controller/TeamController.class.php b/webapp/controller/TeamController.class.php index 44ecb72..6e3d9e9 100644 --- a/webapp/controller/TeamController.class.php +++ b/webapp/controller/TeamController.class.php @@ -15,7 +15,6 @@ class TeamController extends BaseAuthedController { $rank = 1; $equip_id = 0; $model = 0; - error_log("创建房间===".$team_uuid); $hiID = 0; $hiFrameID = 0; @@ -230,7 +229,7 @@ class TeamController extends BaseAuthedController { } $type = $_REQUEST['type']; $acctID = $_REQUEST['account_id']; - error_log("SelectHero".$type."==".$acctID); + // error_log("SelectHero".$type."==".$acctID); foreach ($user_db['member_list'] as &$memberlist) { if($memberlist['account_id'] == $acctID) @@ -277,7 +276,6 @@ class TeamController extends BaseAuthedController { return; } $readyState = $_REQUEST['readyState']; - error_log("readyState=====".$readyState); // $user_db['member_list'] = array_values($user_db['member_list']); $acctID = $_REQUEST['account_id']; foreach ($user_db['member_list'] as &$memberlist) @@ -288,7 +286,6 @@ class TeamController extends BaseAuthedController { break; } } - error_log("Data===".json_encode($user_db)); $r->set(TEAMID_KEY . $team_uuid, json_encode($user_db)); $r -> pexpire(TEAMID_KEY . $team_uuid, 1000 * 600); echo json_encode(array( @@ -388,25 +385,21 @@ class TeamController extends BaseAuthedController { public function kickoutMember() { - error_log("剔除玩家==06="); if (!isset($_REQUEST['team_uuid'])) { return; } $team_uuid = $_REQUEST['team_uuid']; - error_log("剔除玩家==="); $r = $this->getRedis($team_uuid); if (!$r) { echo 'is null'; } else { $user_db_str = $r->get(TEAMID_KEY . $team_uuid); if (empty($user_db_str)) { - error_log("剔除玩家==3="); phpcommon\sendError(ERR_USER_BASE + 1,'session失效1'); return; } $user_db = json_decode($user_db_str, true); if (empty($user_db)) { - error_log("剔除玩家==5="); phpcommon\sendError(ERR_USER_BASE + 1,'session失效2'); return; } @@ -443,14 +436,12 @@ class TeamController extends BaseAuthedController { $team_uuid = $_REQUEST['team_uuid']; $r = $this->getRedis($team_uuid); $roomManager = $_REQUEST['roomManager']; - error_log("是否是队长===".$roomManager); if (!$r) { echo 'is null'; } else { $user_db_str = $r->get(TEAMID_KEY . $team_uuid); if (empty($user_db_str)) { - error_log("剔除玩家===1"); phpcommon\sendError(ERR_USER_BASE + 1,'session失效1'); return; } @@ -486,7 +477,6 @@ class TeamController extends BaseAuthedController { $r -> pexpire(TEAMID_KEY . $team_uuid, 1000 * 600); if (count($user_db['member_list']) == 0) { $r->del(TEAMID_KEY . $team_uuid, json_encode($user_db)); - error_log("没有玩家了房间删除========"); } } echo json_encode(array( @@ -542,7 +532,7 @@ class TeamController extends BaseAuthedController { return; } $team_uuid = $_REQUEST['team_uuid']; - error_log("剔除玩家==="); + //error_log("剔除玩家==="); $r = $this->getRedis($team_uuid); if (!$r) { diff --git a/webapp/mt/newShop.php b/webapp/mt/newShop.php index 866ffb2..4411e29 100644 --- a/webapp/mt/newShop.php +++ b/webapp/mt/newShop.php @@ -4,8 +4,9 @@ namespace mt; use phpcommon; -class newShop { +class NewShop { + public static function get($equipId) { return self::getMeta()[$equipId]; @@ -18,7 +19,106 @@ class newShop { } return self::$meta; } + public static function getShopCfg() + { + $shopCfgArr = self::getMeta(); + return $shopCfgArr; + } + public static function getShopItemByID($itemID) + { + $shopCfgArr = self::getMeta(); + if(!self::$itemArr) + { self::$itemArr = array(); + foreach ($shopCfgArr as $item) + { + $goodsIDStr = $item["goods"]; + $tmpPriceStr = $item["price"]; + $goodsIDArrStr = explode("|",$goodsIDStr); + $goodsPriceArrStr = explode("|",$tmpPriceStr); + $discountStr = null; + $limitStr = null; + if($item["discount"] && $item["discount"] != "") + { + $discountStr = $item["discount"]; + } + if($item["limit"] && $item["limit"] != "") + { + $limitStr = $item["limit"]; + } + $discountStrArr = null; + $limitStrArr = null; + if($discountStr) + { + $discountStrArr = explode("|",$discountStr); + } + if($limitStr) + { + $limitStrArr = explode("|",$limitStr); + } + $len = count($goodsIDArrStr); + $len2 = count($goodsIDArrStr); + for($i = 0 ; $i < $len ;$i++) + { + $goodsIDArr = explode(":",$goodsIDArrStr[$i]); + $goodsPriceStr2 = $goodsPriceArrStr[$i]; + if($goodsPriceStr2 == "") + { + $goodsPriceStr2 = "10001:99999"; + } + $priceArr = explode(":",$goodsPriceStr2); + $goodsID = $goodsIDArr[0]; + $goodsNum = 1; + $tmpLen = count($goodsIDArr); + if($tmpLen >= 2) + { + $goodsNum = $goodsIDArr[1]; + } + $priceID = $priceArr[0]; + $priceNum = $priceArr[1]; + $specailPrice = 0; + $limitType = 0; + + if($discountStrArr) + { + $len1 = count($discountStrArr); + if($len1 > 0) + { + $specailPrice = $discountStrArr[$i]; + } + } + if($limitStrArr) + { + $len1 = count($limitStrArr); + if($len1 > 0) + { + if($len1 > $i) + { + $limitType = $limitStrArr[$i]; + } + } + } + + + $itemInfo = array("goodsID"=>$goodsID,"goodsNum"=>$goodsNum, + "priceID"=>$priceID,"priceNum"=>$priceNum, + "specailPrice"=>$specailPrice,"limitType"=>$limitType); + self::$itemArr[$itemInfo['goodsID']] = $itemInfo; + } + } + } + + $itemData = null; + if(self::$itemArr[$itemID]) + { + $itemData = self::$itemArr[$itemID]; + } + + return $itemData; + + + } + protected static $itemArr; protected static $meta; }