diff --git a/sql/gamedb.sql b/sql/gamedb.sql index c1dc50f..82afee6 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -57,6 +57,7 @@ CREATE TABLE `user` ( `act_share_time` int(11) NOT NULL COMMENT '分享好礼活动时间', `create_time` int(11) NOT NULL COMMENT '创建时间', `modify_time` int(11) NOT NULL COMMENT '修改时间', + `first_fight` int(11) NOT NULL COMMENT '是否是第一次战斗', PRIMARY KEY (`idx`), UNIQUE KEY `accountid` (`accountid`) ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php index b5e60ac..1c08865 100644 --- a/webapp/controller/EquipController.class.php +++ b/webapp/controller/EquipController.class.php @@ -168,6 +168,7 @@ class EquipController{ } $equip_id = $_REQUEST['equip_id']; $free = $_REQUEST['free']; + $equip_level = 0; $row = $conn->execQueryOne('SELECT * FROM equip WHERE accountid=:account_id AND equip_id=:equip_id;', array( ':account_id' => $account_id, @@ -192,6 +193,7 @@ class EquipController{ die(); return; } + $equip_level = 2; } else { $e = $this->subCoin($account_id, $equip_id, $row['equip_level'], $free); $ret = $conn->execScript('UPDATE equip SET equip_level=:equip_level, modify_time=:modify_time ' . @@ -206,6 +208,7 @@ class EquipController{ die(); return; } + $equip_level = $row['equip_level'] + 1; } $quest = new classes\Quest(); $quest->triggerQuest(QUEST_DAY_UPDATEEQUIP, 1, 1, $account_id); @@ -215,6 +218,10 @@ class EquipController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + /*'equip_id' => $equip_id, + 'equip_level' => $equip_level, + 'equip_time' => 0, + 'coin_num' => -($e['equip_cost'] * ceil($equip_level / 5) + $e['cost_int'])*/ )); } @@ -281,6 +288,9 @@ class EquipController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + /*'equip_id' => $equip_id, + 'equip_level' => $e['max_lv'], + 'equip_time' => time() + $time,*/ )); } } diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index cb710cc..20235db 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -87,9 +87,9 @@ class RoleController{ ':accountid' => $account_id )); if (!$row) { - $ret = $conn->execScript('INSERT INTO user(accountid, user_name, avatar_url, game_times, win_times, kills, harm, add_HP, alive_time, coin_num, integral, kill_his, alive_time_his, harm_his, add_HP_his, act_share_time, act_share_status, create_time, modify_time) ' . - ' VALUES(:accountid, :user_name, :avatar_url, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, create_time, :modify_time) ' . - ' ON DUPLICATE KEY UPDATE accountid=:accountid, user_name=:user_name, avatar_url=:avatar_url, game_times=0, win_times=0, kills=0, harm=0, add_HP=0, alive_time=0, coin_num=0, integral=0, kill_his=0, alive_time_his=0, harm_his=0, add_HP_his=0, act_share_time=0, act_share_status=0, modify_time=:modify_time;', + $ret = $conn->execScript('INSERT INTO user(accountid, user_name, avatar_url, game_times, win_times, kills, harm, add_HP, alive_time, coin_num, integral, kill_his, alive_time_his, harm_his, add_HP_his, act_share_time, act_share_status, create_time, modify_time, first_fight) ' . + ' VALUES(:accountid, :user_name, :avatar_url, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, create_time, :modify_time, 0) ' . + ' ON DUPLICATE KEY UPDATE accountid=:accountid, user_name=:user_name, avatar_url=:avatar_url, game_times=0, win_times=0, kills=0, harm=0, add_HP=0, alive_time=0, coin_num=0, integral=0, kill_his=0, alive_time_his=0, harm_his=0, add_HP_his=0, act_share_time=0, act_share_status=0, modify_time=:modify_time, first_fight=0;', array( ':accountid' => $account_id, ':user_name' => $user_name, @@ -113,6 +113,7 @@ class RoleController{ 'add_HP' => 0, 'alive_time' => 0, 'coin_num' => 0, + 'first_fight' => 0 )); } else { echo json_encode(array( @@ -126,7 +127,8 @@ class RoleController{ 'harm' => $row['harm'], 'add_HP' => $row['add_HP'], 'alive_time' => $row['alive_time'], - 'coin_num' => $row['coin_num'] + 'coin_num' => $row['coin_num'], + 'first_fight' => $row['first_fight'] )); } } @@ -193,7 +195,7 @@ class RoleController{ if ($add_HP_his < $row['add_HP_his']) { $add_HP_his = $row['add_HP_his']; } - $ret = $conn->execScript('UPDATE user SET game_times=:game_times, win_times=:win_times, kills=:kills, harm=:harm, add_HP=:add_HP, alive_time=:alive_time, kill_his=:kill_his, alive_time_his=:alive_time_his, harm_his=:harm_his, add_HP_his=:add_HP_his, coin_num=:coin_num, integral=:integral, modify_time=:modify_time ' . + $ret = $conn->execScript('UPDATE user SET game_times=:game_times, win_times=:win_times, kills=:kills, harm=:harm, add_HP=:add_HP, alive_time=:alive_time, kill_his=:kill_his, alive_time_his=:alive_time_his, harm_his=:harm_his, add_HP_his=:add_HP_his, coin_num=:coin_num, integral=:integral, modify_time=:modify_time, first_fight=1 ' . ' WHERE accountid=:accountid;', array( ':game_times' => $row['game_times'] + 1, diff --git a/webapp/controller/SkinController.class.php b/webapp/controller/SkinController.class.php index 25f4f68..c87ea05 100644 --- a/webapp/controller/SkinController.class.php +++ b/webapp/controller/SkinController.class.php @@ -281,6 +281,12 @@ class SkinController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + /*"skin_id" => $skin_id, + "skin_status" => $skin_status, + "fragment_num" => $fragment_num, + "time" => $active_time, + "skin_level" => 1, + "skin_experience_type" => $skin_experience_type,*/ )); } @@ -343,9 +349,33 @@ class SkinController{ die(); return; } + /*$skin_list = array(); + array_push($skin_list, array( + 'skin_id' => $row['skin_id'], + 'skin_status' => $skin_status, + 'fragment_num' => $row['fragment_num'], + 'active_time' => $row['active_time'], + 'skin_level' => $row['skin_level'], + 'skin_experience_type' => $row['skin_experience_type'] + )); + $row_exchange = $conn->execQueryOne('SELECT * FROM skin WHERE accountid=:accountid AND skin_id=:skin_id;', + array( + ':accountid' => $account_id, + ':skin_id' => $exchangeskin_id, + )); + array_push($skin_list, array( + 'skin_id' => $row_exchange['skin_id'], + 'skin_status' => 0, + 'fragment_num' => $row_exchange['fragment_num'], + 'active_time' => $row_exchange['active_time'], + 'skin_level' => $row_exchange['skin_level'], + 'skin_experience_type' => $row_exchange['skin_experience_type'] + )); + */ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + //"skin_list" => $skin_list, )); } @@ -413,6 +443,12 @@ class SkinController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + /*'skin_id' => $row['skin_id'], + 'skin_status' => $row['skin_status'], + 'fragment_num' => $row['fragment_num'], + 'active_time' => time() + $time, + 'skin_level' => $ex_level, + 'skin_experience_type' => 2*/ )); } @@ -474,6 +510,12 @@ class SkinController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + /*'skin_id' => $row['skin_id'], + 'skin_status' => $row['skin_status'], + 'fragment_num' => $row['fragment_num'] - $debris_num, + 'active_time' => $row['active_time'], + 'skin_level' => $row['skin_level'] + 1, + 'skin_experience_type' => $row['skin_experience_type']*/ )); } } diff --git a/webapp/controller/SupplyBoxController.class.php b/webapp/controller/SupplyBoxController.class.php index 59e4cd5..1e2ed99 100644 --- a/webapp/controller/SupplyBoxController.class.php +++ b/webapp/controller/SupplyBoxController.class.php @@ -143,6 +143,8 @@ class SupplyBoxController{ } $box_id = $_REQUEST['box_id']; $free_open = $_REQUEST['free_open']; + $free_times = 0; + $buy_times = 0; $s = $this->getSupplyBox($box_id); if (!$s) { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个宝箱'); @@ -170,6 +172,8 @@ class SupplyBoxController{ phpcommon\sendError(ERR_USER_BASE + 2, '没有这个宝箱'); return; } else if ($free_open == 1) { + $free_times = 1; + $buy_times = 0; $ret = $conn->execScript('INSERT INTO supplybox(accountid, box_id, buy_times, free_times, last_buy_time, create_time, modify_time) ' . ' VALUES(:accountid, :box_id, 0, 1, :last_buy_time, :create_time, :modify_time) ' . ' ON DUPLICATE KEY UPDATE accountid=:accountid, box_id=:box_id, buy_times=0, free_times=1, last_buy_time=:last_buy_time, modify_time=:modify_time;', @@ -194,6 +198,7 @@ class SupplyBoxController{ return; } $free_times = $row['free_times'] + 1; + $buy_times = $row['buy_times']; $ret = $conn->execScript('UPDATE supplybox SET free_times=:free_times, last_buy_time=:last_buy_time, modify_time=:modify_time ' . ' WHERE accountid=:accountid AND box_id=:box_id;', array( @@ -259,7 +264,10 @@ class SupplyBoxController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', - 'item_list' => $item_list + 'item_list' => $item_list, + /*'box_id' => $box_id, + 'buy_times' => $buy_times, + 'free_times' => $free_times*/ )); } @@ -278,7 +286,9 @@ class SupplyBoxController{ return; } $box_id = $_REQUEST['box_id']; - $coin_num = $_REQUEST['coin_num']; + $coin_num = 0; + $buy_times = 0; + $free_times = 0; $s = $this->getSupplyBox($box_id); if (!$s) { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个宝箱'); @@ -298,6 +308,9 @@ class SupplyBoxController{ phpcommon\sendError(ERR_USER_BASE + 3, '金币不足'); return; } + $coin_num = $s['price']; + $buy_times = 1; + $free_times = 0; $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time ' . ' WHERE accountid=:accountid;', array( @@ -329,11 +342,14 @@ class SupplyBoxController{ phpcommon\sendError(ERR_USER_BASE + 3, '金币不足'); return; } + $coin_num = $s['price'] * pow($s['parameter'], ($row['buy_times'])); + $buy_times = $row['buy_times'] + 1; + $free_times = $row['free_times']; $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time ' . ' WHERE accountid=:accountid;', array( ':accountid' => $account_id, - ':coin_num' => $row1['coin_num'] - ($s['price'] * pow($s['parameter'], ($row['buy_times']))), + ':coin_num' => $row1['coin_num'] - $coin_num, ':modify_time' => time() )); $ret = $conn->execScript('UPDATE supplybox SET buy_times=:buy_times, last_buy_time=:time, modify_time=:modify_time ' . @@ -353,6 +369,10 @@ class SupplyBoxController{ echo json_encode(array( 'errcode' => 0, 'errmsg' => '', + /*"box_id" => $box_id, + "buy_times" => $buy_times, + "free_times" => $free_times, + "coin_num" => -$coin_num,*/ )); }