diff --git a/doc/_common.py b/doc/_common.py index bcc63c6..fbca022 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -31,7 +31,7 @@ class GunSkinInfo(object): self.fields = [ ['gun_id', 0, '枪支id'], ['skin_id', 0, '皮肤id'], - ['try_expire_time', 0, '试用到期时间(utc时间)'], + ['try_expire_at', 0, '试用到期时间(utc时间)'], ] class RoleInfo(object): @@ -143,7 +143,7 @@ class HeroSkin(object): self.fields = [ ['skin_id', 0, '英雄皮肤id'], ['skin_state', 0, '英雄皮肤状态 0=已经购,1 = 试用状态'], - ['try_expire_time', 0, '试用到期时间(utc时间)'], + ['try_expire_at', 0, '试用到期时间(utc时间)'], ] class Item(object): @@ -153,7 +153,7 @@ class Item(object): ['item_id', 0, '道具id'], ['item_num', 0, '道具数量'], ['item_state', 0, '英雄皮肤状态 0=已经购,1 = 试用状态'], - ['try_expire_time', 0, '试用到期时间(utc时间)'], + ['try_expire_at', 0, '试用到期时间(utc时间)'], ] class RobotInfo(object): diff --git a/sql/gamedb.sql b/sql/gamedb.sql index a8f1980..e6e9573 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -85,7 +85,7 @@ CREATE TABLE `t_hero_skin` ( `skin_state` int(11) NOT NULL DEFAULT '0' COMMENT '英雄皮肤状态 0=已经购,1 = 试用状态', `get_from` int(11) NOT NULL DEFAULT '0' COMMENT '获得方式 0 = 系统赠送 1 = 金币购买', `consume_num` int(11) NOT NULL DEFAULT '0' COMMENT '消耗货币的具体数量', - `try_expire_time` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', + `try_expire_at` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), @@ -106,7 +106,7 @@ CREATE TABLE `t_bag` ( `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', `item_num` int(11) NOT NULL DEFAULT '0' COMMENT '数量', `item_state` int(11) NOT NULL DEFAULT '0' COMMENT '状态(0=已经购,1 = 试用状态)', - `try_expire_time` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', + `try_expire_at` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), @@ -126,7 +126,7 @@ CREATE TABLE `t_gun_skin` ( `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', `accountid` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'accountid', `skin_id` int(11) NOT NULL DEFAULT '0' COMMENT '皮肤ID', - `try_expire_time` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', + `try_expire_at` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php index 73b67f4..bfa607a 100644 --- a/webapp/controller/BaseAuthedController.class.php +++ b/webapp/controller/BaseAuthedController.class.php @@ -229,7 +229,7 @@ class BaseAuthedController extends BaseController { 'item_id' => $item['item_id'], 'item_num' => 1, 'item_state' => 0, - 'try_expire_time' => 0, + 'try_expire_at' => 0, 'createtime' => $this->_getNowTime(), 'modifytime' => $this->_getNowTime() ) diff --git a/webapp/models/HeroSkin.php b/webapp/models/HeroSkin.php index 331bafe..572b0ec 100644 --- a/webapp/models/HeroSkin.php +++ b/webapp/models/HeroSkin.php @@ -30,7 +30,7 @@ class HeroSkin extends BaseModel { return array( 'skin_id' => $row['skin_id'], 'skin_state' => $row['skin_state'], - 'try_expire_time' => $row['try_expire_time'], + 'try_expire_at' => $row['try_expire_at'], ); } @@ -53,7 +53,7 @@ class HeroSkin extends BaseModel { 'skin_state' => 0, 'get_from' => 0, 'consume_num' => 0, - 'try_expire_time' => 0, + 'try_expire_at' => 0, 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime() )