From d66cd270eaaa0f4accfb65bac3f1e8fcc1b486b8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 26 Nov 2021 15:51:12 +0800 Subject: [PATCH] 1 --- doc/_common.py | 15 ++++++++++++--- sql/gamedb.sql | 14 +++++++------- sql/gamedb2005_n_migrate_201225_01 | 7 ------- webapp/models/Hero.php | 10 +++++----- webapp/models/HeroSkin.php | 7 ++++--- 5 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 sql/gamedb2005_n_migrate_201225_01 diff --git a/doc/_common.py b/doc/_common.py index 40b0ada..bcc63c6 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -31,6 +31,7 @@ class GunSkinInfo(object): self.fields = [ ['gun_id', 0, '枪支id'], ['skin_id', 0, '皮肤id'], + ['try_expire_time', 0, '试用到期时间(utc时间)'], ] class RoleInfo(object): @@ -142,9 +143,17 @@ class HeroSkin(object): self.fields = [ ['skin_id', 0, '英雄皮肤id'], ['skin_state', 0, '英雄皮肤状态 0=已经购，1 = 试用状态'], - ['get_from', 0, '获得方式 0 = 系统赠送 1 = 金币购买'], - ['consume_num,', 0, '消耗货币的具体数量'], - ['trytime', 0, '试用开始时间'], + ['try_expire_time', 0, '试用到期时间(utc时间)'], + ] + +class Item(object): + + def __init__(self): + self.fields = [ + ['item_id', 0, '道具id'], + ['item_num', 0, '道具数量'], + ['item_state', 0, '英雄皮肤状态 0=已经购，1 = 试用状态'], + ['try_expire_time', 0, '试用到期时间(utc时间)'], ] class RobotInfo(object): diff --git a/sql/gamedb.sql b/sql/gamedb.sql index bc450b3..24ec640 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -62,8 +62,8 @@ CREATE TABLE `t_hero` ( `hero_exp` int(11) NOT NULL DEFAULT '0' COMMENT '英雄等级', `yoke_lv` int(11) NOT NULL DEFAULT '0' COMMENT '羁绊等级', `yoke_exp` int(11) NOT NULL DEFAULT '0' COMMENT '羁绊经验', - `skill1_lv1` int(11) NOT NULL DEFAULT '1' COMMENT '必杀技等级', - `skill1_lv2` int(11) NOT NULL DEFAULT '1' COMMENT '躲避技能等级', + `skill_lv1` int(11) NOT NULL DEFAULT '1' COMMENT '必杀技等级', + `skill_lv2` int(11) NOT NULL DEFAULT '1' COMMENT '躲避技能等级', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), @@ -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 '消耗货币的具体数量', - `deadline` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', + `try_expire_time` 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`), @@ -105,8 +105,8 @@ CREATE TABLE `t_bag` ( `accountid` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', `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:已获得,2:未获得）', - `deadline` 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 '试用截止时间', `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', - `deadline` int(11) NOT NULL DEFAULT '0' COMMENT '试用截止时间', + `try_expire_time` 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`), @@ -150,7 +150,7 @@ CREATE TABLE `t_gun_talent` ( `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), - UNIQUE KEY `accountid_type_id_skill_id` (`accountid`, `type_id`,`skill_id`) + UNIQUE KEY `accountid_type_id_talent_id` (`accountid`, `type_id`,`talent_id`) ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/sql/gamedb2005_n_migrate_201225_01 b/sql/gamedb2005_n_migrate_201225_01 deleted file mode 100644 index 99c63c5..0000000 --- a/sql/gamedb2005_n_migrate_201225_01 +++ /dev/null @@ -1,7 +0,0 @@ -begin; - -alter table user add column `max_integral` int(11) NOT NULL DEFAULT '0' COMMENT '最高积分'; - -insert into version (version) values(2020122501); - -commit; diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index f7d0c19..c5d7d45 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -29,8 +29,8 @@ class Hero extends BaseModel { 'hero_id' => $row['hero_id'], 'hero_lv' => $row['hero_lv'], 'skin_id' => $row['skin_id'], - 'skill1_lv1' => $row['skill1_lv1'], - 'skill1_lv2' => $row['skill1_lv2'], + 'skill_lv1' => $row['skill_lv1'], + 'skill_lv2' => $row['skill_lv2'], 'yoke_lv' => $row['yoke_lv'], 'yoke_exp' => $row['yoke_exp'], ); @@ -53,8 +53,8 @@ class Hero extends BaseModel { 'hero_id' => $heroMeta['id'], 'hero_lv' => 1, 'skin_id' => $defSkin, - 'skill1_lv1' => 1, - 'skill1_lv2' => 1, + 'skill_lv1' => 1, + 'skill_lv2' => 1, 'yoke_lv' => 0, 'yoke_exp' => 0, 'createtime' => myself()->_getNowTime(), @@ -87,7 +87,7 @@ class Hero extends BaseModel { if (!in_array($skillIdx, array(0, 1))) { return; } - $fieldName = 'skill1_lv' . ($skillIdx + 1); + $fieldName = 'skill_lv' . ($skillIdx + 1); SqlHelper::update( myself()->_getSelfMysql(), 't_hero', diff --git a/webapp/models/HeroSkin.php b/webapp/models/HeroSkin.php index 5799746..01c9310 100644 --- a/webapp/models/HeroSkin.php +++ b/webapp/models/HeroSkin.php @@ -9,6 +9,9 @@ use phpcommon\SqlHelper; class HeroSkin extends BaseModel { + const GETED_STATE = 0; + const TRY_USING_STATE = 1; + public static function find($skinId) { $row = SqlHelper::ormSelectOne( @@ -27,9 +30,7 @@ class HeroSkin extends BaseModel { return array( 'skin_id' => $row['skin_id'], 'skin_state' => $row['skin_state'], - 'get_from' => $row['get_from'], - 'consume_num' => $row['consume_num'], - 'trytime' => $row['trytime'], + 'try_expire_time' => $row['try_expire_time'], ); }