Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb
This commit is contained in:
hujiabin
commit
ad6179b72a
@ -26,6 +26,8 @@ class AALogin(object):
|
||||
'params': [
|
||||
['gameid', '', '游戏id'],
|
||||
['channel', '', '渠道编号'],
|
||||
['_packageid', 0, '包id 1:android 2:ios'],
|
||||
['_version', '', '版本号'],
|
||||
],
|
||||
'response': [
|
||||
_common.RspHead(),
|
||||
|
||||
@ -372,6 +372,36 @@ class AAMarket(object):
|
||||
], '任务列表'],
|
||||
]
|
||||
},
|
||||
{
|
||||
'method': 'GET',
|
||||
'name': '/api/activity/cec/contribution/:account_address',
|
||||
'desc': 'cec贡献点活动',
|
||||
'group': '!AAMarket',
|
||||
'url': '/api/activity/cec/contribution/:account_address',
|
||||
'params': [
|
||||
],
|
||||
'response': [
|
||||
_common.RspHead(),
|
||||
['info', _common.CecContributionActivity(), 'cec贡献点活动'],
|
||||
]
|
||||
},
|
||||
{
|
||||
'method': 'GET',
|
||||
'name': '/api/activity/contribution/history/:account_address',
|
||||
'desc': '贡献点活动-获得历史',
|
||||
'group': '!AAMarket',
|
||||
'url': '/api/activity/contribution/history/:account_address',
|
||||
'params': [
|
||||
],
|
||||
'response': [
|
||||
_common.RspHead(),
|
||||
['!rows', [
|
||||
['type', 0, '1:质押 2:游戏内消费金币'],
|
||||
['give_time', 0, '获得时间'],
|
||||
['contribution_point', 0, '贡献点'],
|
||||
], '数据'],
|
||||
]
|
||||
},
|
||||
{
|
||||
'method': 'GET',
|
||||
'name': '/api/chain/txhash/:net_id/:txhash',
|
||||
@ -431,6 +461,7 @@ class AAMarket(object):
|
||||
],
|
||||
'response': [
|
||||
_common.RspHead(),
|
||||
['contribution', 0, '通过充值获得的贡献点数'],
|
||||
['!rows', [_common.RechargeGoods()], '数据'],
|
||||
]
|
||||
},
|
||||
@ -449,6 +480,7 @@ class AAMarket(object):
|
||||
['goods_id', '', '商品id'],
|
||||
['goods_num', '', '商品数量'],
|
||||
['account_address', '', '钱包地址(一般为小狐狸)'],
|
||||
['currency_address', '', '货币地址'],
|
||||
],
|
||||
'response': [
|
||||
_common.RspHead(),
|
||||
@ -473,6 +505,7 @@ class AAMarket(object):
|
||||
['goods_id', '', '商品id'],
|
||||
['goods_num', '', '商品数量'],
|
||||
['account_address', '', '钱包地址(一般为小狐狸)'],
|
||||
['currency_address', '', '货币地址'],
|
||||
['email', '', 'email'],
|
||||
],
|
||||
'response': [
|
||||
|
||||
@ -5,7 +5,10 @@
|
||||
* @apiVersion 0.0.1
|
||||
* @apiSuccessExample {json} Success-Response:
|
||||
* 所有的协议都可能携带award和property_chg，award用来显示获得的东西,propery_chg用来更新本地数据
|
||||
*
|
||||
* 公共错误码
|
||||
* errcode=1001 session_id已过期(客户端需回到游戏主界面)
|
||||
* errcode=1006 该接口已升级为S版(客户端需要转到sapi)
|
||||
* errcode=1008 该接口功能已关闭(admin后台上配置为功能关闭，客户端需刷新功能开关)
|
||||
*
|
||||
*
|
||||
*/
|
||||
@ -49,7 +52,6 @@
|
||||
* 删除 c=Currency
|
||||
* 删除 c=PayMethod
|
||||
* 删除 c=OutAppPlanet
|
||||
* 删除 c=Shop
|
||||
* 删除 c=BlockChain&a=getTransactionList
|
||||
* 删除 c=BlockChain&a=getTransactionInfo
|
||||
* 删除 c=BlockChain&a=reportResult
|
||||
|
||||
@ -12,7 +12,7 @@ class RspHead(object):
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self.fields = [
|
||||
['errcode', 0, '错误码/0 成功；1 失败；2余额不足'],
|
||||
['errcode', 0, '错误码/0 成功；1 失败'],
|
||||
['errmsg', '', '错误描述'],
|
||||
['contributionPoint', '', '贡献点'],
|
||||
]
|
||||
@ -1845,6 +1845,14 @@ class ChainActivity(object):
|
||||
['date', '', '事件发生时间'],
|
||||
]
|
||||
|
||||
class RechargeCurrency(object):
|
||||
|
||||
def __init__(self):
|
||||
self.fields = [
|
||||
['name', '', '货币名'],
|
||||
['address', '', '货币地址'],
|
||||
]
|
||||
|
||||
class RechargeGoods(object):
|
||||
|
||||
def __init__(self):
|
||||
@ -1855,10 +1863,7 @@ class RechargeGoods(object):
|
||||
['first_present_diamond', 0, '首冲赠送钻石'],
|
||||
['is_first_recharge', 0, '是否第一次购买该商品'],
|
||||
['max_buy_times', 0, '充值次数上限'],
|
||||
['currencys', [[
|
||||
['name', '', '货币名'],
|
||||
['address', '', '货币地址'],
|
||||
]], '货币列表'],
|
||||
['!currency_list', [RechargeCurrency()], '货币列表'],
|
||||
]
|
||||
|
||||
class RechargeHistory(object):
|
||||
@ -1897,3 +1902,13 @@ class BigwheelInfo(object):
|
||||
['!items1', [BigwheelGrid()], '档位1'],
|
||||
['!items2', [BigwheelGrid()], '档位2'],
|
||||
]
|
||||
|
||||
class CecContributionActivity(object):
|
||||
|
||||
def __init__(self):
|
||||
self.fields = [
|
||||
['my_contribution', 0, '我的贡献点数'],
|
||||
['global_contribution', 0, '全服贡献点数'],
|
||||
['total_cec_pool', 0, 'cec总奖池'],
|
||||
['my_expected_cec', 0, '我预计可得cec'],
|
||||
]
|
||||
|
||||
@ -2013,3 +2013,22 @@ CREATE TABLE `t_contribution` (
|
||||
UNIQUE KEY `idx_account_id` (`account_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `t_contribution_history`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `t_contribution_history`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `t_contribution_history` (
|
||||
`idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
|
||||
`account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)',
|
||||
`consume_gold` double NOT NULL DEFAULT '0' COMMENT '消费金币数',
|
||||
`contribution` double NOT NULL DEFAULT '0' COMMENT '获得点数',
|
||||
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
|
||||
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
|
||||
PRIMARY KEY (`idx`),
|
||||
UNIQUE KEY `idx_account_id` (`account_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@ -8,11 +8,11 @@ class AnncController extends BaseController {
|
||||
// myself()->_rspData(require('../config/annc.php'));
|
||||
$data = array();
|
||||
$row = myself()->_getConfDbMysql()->execQueryOne(
|
||||
'SELECT * FROM t_game_annc WHERE begin_time < :star_time AND end_time > :end_time AND is_open = :open_state',
|
||||
'SELECT * FROM t_game_annc WHERE begin_date < :begin_date AND end_date > :end_date AND is_open = :is_open',
|
||||
array(
|
||||
':star_time' => myself()->_getNowTime(),
|
||||
':end_time' => myself()->_getNowTime(),
|
||||
':open_state' => 1,
|
||||
':begin_date' => myself()->_getNowTime(),
|
||||
':end_date' => myself()->_getNowTime(),
|
||||
':is_open' => 1,
|
||||
)
|
||||
);
|
||||
if ($row){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user