From 675580afb856d313edb055b48e0d24b55273d233 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 10 Nov 2023 18:01:43 +0800 Subject: [PATCH 01/43] 1 --- webapp/controller/NftController.class.php | 4 ++++ webapp/models/Nft.php | 1 + 2 files changed, 5 insertions(+) diff --git a/webapp/controller/NftController.class.php b/webapp/controller/NftController.class.php index 15708e55..ee9ceaca 100644 --- a/webapp/controller/NftController.class.php +++ b/webapp/controller/NftController.class.php @@ -62,6 +62,10 @@ class NftController extends BaseAuthedController array_push($listInfo,$info); } break; + case Nft::EXPLORER_TYPE : { + array_push($listInfo,$info); + } + break; } } } diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php index f9aae1a5..fcc6e88f 100644 --- a/webapp/models/Nft.php +++ b/webapp/models/Nft.php @@ -25,6 +25,7 @@ class Nft extends BaseModel const HONOR1_TYPE = 6; //荣誉 const GENESIS_TYPE = 7; //创世徽章 const PLANET_TYPE = 8; //星球 + const EXPLORER_TYPE = 9; //Explorer const RING_TYPE = 19; //戒指 const AVATAR_TYPE = 30; //装饰 From 25ce486b6fefce427d5cae9d49ce53611f37ab40 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 13 Nov 2023 16:23:20 +0800 Subject: [PATCH 02/43] 1 --- webapp/models/Nft.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/models/Nft.php b/webapp/models/Nft.php index fcc6e88f..3f44cc76 100644 --- a/webapp/models/Nft.php +++ b/webapp/models/Nft.php @@ -433,7 +433,8 @@ class Nft extends BaseModel self::HONOR1_TYPE, self::RING_TYPE, self::GENESIS_TYPE, - self::PLANET_TYPE + self::PLANET_TYPE, + self::EXPLORER_TYPE )); } From e108913c141e1e73099edfcd0db63e3c3359f49e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 22 Nov 2023 14:35:07 +0800 Subject: [PATCH 03/43] 1 --- sql/migrate/bcnftdb.sql | 140 ++++ sql/migrate/gamedb.sql | 1696 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1836 insertions(+) create mode 100644 sql/migrate/bcnftdb.sql create mode 100644 sql/migrate/gamedb.sql diff --git a/sql/migrate/bcnftdb.sql b/sql/migrate/bcnftdb.sql new file mode 100644 index 00000000..67546889 --- /dev/null +++ b/sql/migrate/bcnftdb.sql @@ -0,0 +1,140 @@ +-- MySQL dump 10.14 Distrib 5.5.41-MariaDB, for Linux (x86_64) +-- +-- Host: localhost Database: bcnft +-- ------------------------------------------------------ +-- Server version 5.5.41-MariaDB + +-- +-- Table structure for table `version` +-- + +DROP TABLE IF EXISTS `version`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `version` ( + `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `version` int(11) NOT NULL DEFAULT '0' COMMENT '版本号', + PRIMARY KEY (`idx`), + UNIQUE KEY `version` (`version`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_nft` +-- + +DROP TABLE IF EXISTS `t_nft`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_nft` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `owner_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'owner_address', + `creator_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'creator_address', + `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id', + `token_type` int(11) NOT NULL DEFAULT '0' COMMENT 'nft类型 1:英雄 2:枪支 3:芯片 6:荣誉 7:徽章', + `token_state` int(11) NOT NULL DEFAULT '0' COMMENT '0:正常状态 1:出售中 2:出租中', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `deleted` int(11) NOT NULL DEFAULT '0' COMMENT 'deleted', + `confirm_count` int(11) NOT NULL DEFAULT '0' COMMENT 'confirm_count', + `confirm_block_number` bigint NOT NULL DEFAULT '0' COMMENT 'confirm_block_number', + `tags` varchar(60) NOT NULL DEFAULT '' COMMENT 'tags', + `net_id` bigint NOT NULL DEFAULT '0' COMMENT 'net_id', + `contract_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'contract_address', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `unikey` (`net_id`, `contract_address`, `token_id`), + KEY `owner_address_token_type` (`owner_address`, `token_type`), + KEY `owner_address_contract_address` (`owner_address`, `contract_address`), + KEY `owner_address` (`owner_address`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_log` +-- + +DROP TABLE IF EXISTS `t_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_log` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `type` varchar(255) NOT NULL DEFAULT '' COMMENT '日志类型', + `subtype` varchar(255) NOT NULL DEFAULT '' COMMENT '日志子类型', + `param1` mediumblob COMMENT 'param1', + `param2` mediumblob COMMENT 'param2', + `param3` mediumblob COMMENT 'param3', + `param4` mediumblob COMMENT 'param4', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_buy_record` +-- + +DROP TABLE IF EXISTS `t_buy_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_buy_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `blobdata` mediumblob COMMENT 'blobdata', + `buyer_address` mediumblob COMMENT 'buyer_address', + `order_id` varchar(60) COMMENT '订单id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `order_id` (`order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_nft1155` +-- + +DROP TABLE IF EXISTS `t_nft1155`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_nft1155` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `owner_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'owner_address', + `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `balance` bigint NOT NULL DEFAULT '0' COMMENT '余额', + `item_uniid` bigint NOT NULL DEFAULT '0' COMMENT 'item_uniid', + `confirm_count` int(11) NOT NULL DEFAULT '0' COMMENT 'confirm_count', + `confirm_block_number` bigint NOT NULL DEFAULT '0' COMMENT 'confirm_block_number', + `net_id` bigint NOT NULL DEFAULT '0' COMMENT 'net_id', + `contract_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'contract_address', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `unikey` (`owner_address`, `contract_address`, `token_id`), + KEY `owner_address` (`owner_address`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_callback` +-- + +DROP TABLE IF EXISTS `t_callback`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_callback` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `cb_uuid` varchar(60) COMMENT '年月日时分秒_进程id_自增id', + `params` mediumblob COMMENT '需要签名的字段(json不含签名)', + `signature` varchar(60) COMMENT 'signature', + `secret_key` varchar(60) COMMENT 'secret_key', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `cb_uuid` (`cb_uuid`), + KEY `signature` (`signature`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- Dump completed on 2015-08-19 18:51:22 diff --git a/sql/migrate/gamedb.sql b/sql/migrate/gamedb.sql new file mode 100644 index 00000000..59d04cdc --- /dev/null +++ b/sql/migrate/gamedb.sql @@ -0,0 +1,1696 @@ +-- MySQL dump 10.14 Distrib 5.5.41-MariaDB, for Linux (x86_64) +-- +-- Host: localhost Database: accountdb +-- ------------------------------------------------------ +-- Server version 5.5.41-MariaDB + +-- +-- Table structure for table `version` +-- + +DROP TABLE IF EXISTS `version`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `version` ( + `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `version` int(11) NOT NULL DEFAULT '0' COMMENT '版本号', + PRIMARY KEY (`idx`), + UNIQUE KEY `version` (`version`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_user` +-- + +DROP TABLE IF EXISTS `t_user`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `channel` int(11) NOT NULL DEFAULT '0' COMMENT 'channel', + `address` varchar(60) COMMENT 'address', + `name` tinyblob COMMENT '用户名字', + `sex` int(11) NOT NULL DEFAULT '0' COMMENT '性别', + `head_id` int(11) NOT NULL DEFAULT '0' COMMENT '头像id', + `head_frame` int(11) NOT NULL DEFAULT '0' COMMENT '头像框id', + `level` int(11) NOT NULL DEFAULT '0' COMMENT '等级', + `exp` int(11) NOT NULL DEFAULT '0' COMMENT '经验', + `rank` int(11) NOT NULL DEFAULT '0' COMMENT '段位', + `history_best_rank` int(11) NOT NULL DEFAULT '0' COMMENT '历史最高段位', + `score` int(11) NOT NULL DEFAULT '0' COMMENT '积分', + `history_best_score` int(11) NOT NULL DEFAULT '0' COMMENT '历史最高积分', + `elo` int(11) NOT NULL DEFAULT '0' COMMENT '隐藏ELO积分', + `bceg` double NOT NULL DEFAULT '0' COMMENT '中心化代币', + `gold` double NOT NULL DEFAULT '0' COMMENT '金币', + `diamond` double NOT NULL DEFAULT '0' COMMENT '钻石', + `hero_id` bigint NOT NULL DEFAULT '0' COMMENT '当前上阵英雄id', + `first_fight` int(11) NOT NULL DEFAULT '0' COMMENT '是否首战', + `last_season_id` int(11) NOT NULL DEFAULT '0' COMMENT '最后一次赛季id', + `activated` int(11) NOT NULL DEFAULT '0' COMMENT '是否已激活', + `rename_count` int(11) NOT NULL DEFAULT '0' COMMENT '改名次数', + `activatetime` int(11) NOT NULL DEFAULT '0' COMMENT '激活时间', + `already_guide` int(11) NOT NULL DEFAULT '0' COMMENT '已引导', + `pve_instance_id` int(11) NOT NULL DEFAULT '0' COMMENT '已过pve副本id', + `like_count` int(11) NOT NULL DEFAULT '0' COMMENT '被点赞次数', + `head_list` mediumblob COMMENT '拥有的头像列表', + `head_frame_list` mediumblob COMMENT '拥有的头像框列表', + `consume_gold` bigint NOT NULL DEFAULT '0' COMMENT '消费金币数', + `score_modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '积分修改时间', + `best_rank_modifytime` int(11) NOT NULL DEFAULT '0' COMMENT 'bestrank修改时间', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + `last_login_time` int(11) NOT NULL DEFAULT '0' COMMENT '上次登录时间', + `is_gain_item` int(11) NOT NULL DEFAULT '0' COMMENT '是否获取免费item道具', + `guild_id` varchar(60) NOT NULL DEFAULT '' COMMENT '工会id', + `guild_job` int(11) NOT NULL DEFAULT '0' COMMENT '工会职位', + `guild_name` varchar(255) NOT NULL DEFAULT '' COMMENT '工会名称', + `parachute` int(11) NOT NULL DEFAULT '0' COMMENT '降落伞ID', + `ring_id` int(11) NOT NULL DEFAULT '0' COMMENT '戒指id', + `star_num` int(11) NOT NULL DEFAULT '0' COMMENT '星星数(成长任务)', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id` (`account_id`), + UNIQUE KEY `address` (`address`), + KEY `channel` (`channel`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_bigdata` +-- + +DROP TABLE IF EXISTS `t_bigdata`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_bigdata` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `type` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'type', + `data` mediumblob COMMENT 'data', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_type` (`account_id`, `type`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; +-- + +DROP TABLE IF EXISTS `t_user_wallet_offline`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_wallet_offline` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `gold` bigint NOT NULL DEFAULT '0' COMMENT '金币', + `diamond` bigint 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 `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_user_wallet_record` +-- + +DROP TABLE IF EXISTS `t_user_wallet_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_wallet_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `txhash` varchar(100) NOT NULL DEFAULT '' COMMENT 'txhash', + `dir` int(11) NOT NULL DEFAULT '0' COMMENT 'dir', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `type` int(11) NOT NULL DEFAULT '0' COMMENT 'type', + `value` varchar(100) NOT NULL DEFAULT '' COMMENT 'value', + `state` int(11) NOT NULL DEFAULT '0' COMMENT 'state', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `txhash` (`txhash`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_hero` +-- + +DROP TABLE IF EXISTS `t_hero`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_hero` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `token_id` varchar(60) COMMENT 'token_id', + `account_id` varchar(60) COMMENT 'account_id', + `hero_id` int(11) NOT NULL DEFAULT '0' COMMENT '英雄id', + `hero_tili` varchar(25) NOT NULL DEFAULT '0' COMMENT '英雄体力', + `state` int(11) NOT NULL DEFAULT '0' COMMENT '0：已购买 1：体验中', + `skin_id` int(11) NOT NULL DEFAULT '0' COMMENT '皮肤id', + `hero_lv` int(11) NOT NULL DEFAULT '0' COMMENT '英雄等级', + `quality` int(11) NOT NULL DEFAULT '0' COMMENT '品阶', + `skill_lv1` int(11) NOT NULL DEFAULT '0' COMMENT '必杀技等级', + `skill_lv2` int(11) NOT NULL DEFAULT '0' COMMENT '躲避技能等级', + `try_count` int(11) NOT NULL DEFAULT '0' COMMENT '剩余体验次数 当state=1时才有意义', + `advanced_count` int(11) NOT NULL DEFAULT '0' COMMENT '进阶次数', + `lock_type` int(11) NOT NULL DEFAULT '0' COMMENT '0:无锁 1:升级 2:升阶 3:悬赏', + `unlock_time` int(11) NOT NULL DEFAULT '0' COMMENT '解锁时间', + `unlock_trade_time` int(11) NOT NULL DEFAULT '0' COMMENT '出售解锁时间', + `rand_attr` mediumblob COMMENT '随机属性', + `today_get_gold` bigint NOT NULL DEFAULT '0' COMMENT '金币', + `last_get_gold_time` int(11) NOT NULL DEFAULT '0' COMMENT '最后获取金币的时间', + `today_pve_get_ceg` bigint NOT NULL DEFAULT '0' COMMENT 'pve金币', + `last_pve_get_ceg_time` bigint NOT NULL DEFAULT '0' COMMENT '最后pve获取金币的时间', + `today_mission_get_ceg` bigint NOT NULL DEFAULT '0' COMMENT '悬赏任务获得金币', + `last_mission_get_ceg_time` bigint NOT NULL DEFAULT '0' COMMENT '最后悬赏任务获取金币的时间', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + `active_token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'active_token_id', + `active_count` int(11) NOT NULL DEFAULT '0' COMMENT 'active_count', + `activate` int(11) NOT NULL DEFAULT '0' COMMENT '是否激活 1：已初始激活', + `base_attr` mediumblob COMMENT '初始随机属性（英雄重置时需要）', + PRIMARY KEY (`idx`), + UNIQUE KEY `token_id` (`token_id`), + KEY `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_hero_skin` +-- + +DROP TABLE IF EXISTS `t_hero_skin`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_hero_skin` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `skin_id` int(11) NOT NULL DEFAULT '0' COMMENT '英雄皮肤id', + `hero_id` int(11) NOT NULL DEFAULT '0' COMMENT '英雄id', + `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_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`), + UNIQUE KEY `account_id_skinid` (`account_id`, `skin_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_bag` +-- + +DROP TABLE IF EXISTS `t_bag`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_bag` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `token_id` varchar(60) COMMENT 'token_id', + `account_id` varchar(60) COMMENT 'account_id', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `item_num` int(11) NOT NULL DEFAULT '0' COMMENT '数量', + `rand_attr` mediumblob COMMENT '随机属性', + `today_get_gold` bigint NOT NULL DEFAULT '0' COMMENT '金币', + `last_get_gold_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`), + UNIQUE KEY `token_id` (`token_id`), + KEY `item_id` (`item_id`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_bag` +-- + +-- +-- Table structure for table `t_chip` +-- + +DROP TABLE IF EXISTS `t_chip`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_chip` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `token_id` varchar(60) COMMENT 'token_id', + `account_id` varchar(60) COMMENT 'account_id', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `item_num` int(11) NOT NULL DEFAULT '1' COMMENT '数量', + `chip_grade` int(11) NOT NULL DEFAULT '1' COMMENT '芯片等级', + `chip_type` int(11) NOT NULL DEFAULT '1' COMMENT '1 攻击；2 防御；3 辅助', + `state` int(11) NOT NULL DEFAULT '0' COMMENT '0：已购买 1：免费（GIFT标签）', + `inlay_state` varchar(60) COMMENT '所镶嵌的芯片页id：1|2|3', + `rand_attr` mediumblob COMMENT '随机属性', + `active_token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'active_token_id', + `active_count` int(11) NOT NULL DEFAULT '0' COMMENT 'active_count', + `activate` int(11) NOT NULL DEFAULT '0' COMMENT '是否激活 1：已初始激活', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `token_id` (`token_id`), + KEY `item_id` (`item_id`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_gun` +-- + +DROP TABLE IF EXISTS `t_gun`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_gun` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `token_id` varchar(60) COMMENT 'token_id', + `account_id` varchar(60) COMMENT 'account_id', + `gun_id` int(11) NOT NULL DEFAULT '0' COMMENT '枪id', + `state` int(11) NOT NULL DEFAULT '0' COMMENT '0：已购买 1：体验中', + `gun_lv` int(11) NOT NULL DEFAULT '0' COMMENT '枪等级', + `quality` int(11) NOT NULL DEFAULT '0' COMMENT '品阶', + `try_count` int(11) NOT NULL DEFAULT '0' COMMENT '剩余体验次数 当state=1时才有意义', + `lock_type` int(11) NOT NULL DEFAULT '0' COMMENT '0:无锁 1:升级 2:升阶 3:悬赏', + `unlock_time` int(11) NOT NULL DEFAULT '0' COMMENT '解锁时间', + `unlock_trade_time` int(11) NOT NULL DEFAULT '0' COMMENT '出售解锁时间', + `durability` varchar(25) NOT NULL DEFAULT '0' COMMENT '耐久', + `rand_attr` mediumblob COMMENT '随机属性', + `today_get_gold` bigint NOT NULL DEFAULT '0' COMMENT '金币', + `last_get_gold_time` int(11) NOT NULL DEFAULT '0' COMMENT '最后获取金币的时间', + `today_pve_get_ceg` bigint NOT NULL DEFAULT '0' COMMENT 'pve金币', + `last_pve_get_ceg_time` bigint NOT NULL DEFAULT '0' COMMENT '最后pve获取金币的时间', + `today_mission_get_ceg` bigint NOT NULL DEFAULT '0' COMMENT '悬赏任务获得金币', + `last_mission_get_ceg_time` bigint NOT NULL DEFAULT '0' COMMENT '最后悬赏任务获取金币的时间', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + `active_token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'active_token_id', + `active_count` int(11) NOT NULL DEFAULT '0' COMMENT 'active_count', + `activate` int(11) NOT NULL DEFAULT '0' COMMENT '是否激活 1：已初始激活', + PRIMARY KEY (`idx`), + UNIQUE KEY `token_id` (`token_id`), + KEY `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_gun_skin` +-- + +DROP TABLE IF EXISTS `t_gun_skin`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_gun_skin` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `skin_id` int(11) NOT NULL DEFAULT '0' COMMENT '皮肤ID', + `skin_state` int(11) NOT NULL DEFAULT '0' COMMENT '状态（0=已经购，1 = 试用状态）', + `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`), + UNIQUE KEY `account_id_skin_id` (`account_id`, `skin_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_gun_talent` +-- + +DROP TABLE IF EXISTS `t_gun_talent`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_gun_talent` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `talent_id` int(11) NOT NULL DEFAULT '0' COMMENT '技能ID', + `talent_lv` 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`), + UNIQUE KEY `account_id_talent_id` (`account_id`, `talent_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_dyndata` +-- + +DROP TABLE IF EXISTS `t_dyndata`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_dyndata` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `x` int(11) NOT NULL DEFAULT '0' COMMENT 'x', + `y` int(11) NOT NULL DEFAULT '0' COMMENT 'y', + `val` bigint NOT NULL DEFAULT '0' COMMENT 'val', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_x_y` (`account_id`, `x`, `y`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_shop_buy_record` +-- + +DROP TABLE IF EXISTS `t_shop_buy_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_shop_buy_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `this_day_buy_times` int(11) NOT NULL DEFAULT '0' COMMENT '今日购买次数', + `this_week_buy_times` int(11) NOT NULL DEFAULT '0' COMMENT '本周购买次数', + `total_buy_times` int(11) NOT NULL DEFAULT '0' COMMENT '总购买次数', + `last_buy_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`), + KEY `account_id` (`account_id`), + UNIQUE KEY `account_id_item_id` (`account_id`, `item_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_mission` +-- + +DROP TABLE IF EXISTS `t_mission`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_mission` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `mission_id` int(11) NOT NULL DEFAULT '0' COMMENT '任务id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`), + UNIQUE KEY `account_id_mission_id` (`account_id`, `mission_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_battle` +-- + +DROP TABLE IF EXISTS `t_battle`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_battle` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `battle_data` mediumblob COMMENT 'battle_data', + `kills_modifytime` 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`), + UNIQUE KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_battle_record` +-- + +DROP TABLE IF EXISTS `t_battle_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_battle_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `request` mediumblob COMMENT 'request', + `kills_modifytime` 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`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_season` +-- + +DROP TABLE IF EXISTS `t_season`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_season` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `season_id` int(11) NOT NULL DEFAULT '0' COMMENT '赛季id', + `card_lv` int(11) NOT NULL DEFAULT '0' COMMENT '赛季手册等级', + `card_exp` int(11) NOT NULL DEFAULT '0' COMMENT '赛季手册经验', + `rank` int(11) NOT NULL DEFAULT '0' COMMENT '段位', + `score` int(11) NOT NULL DEFAULT '0' COMMENT '积分', + `elo` int(11) NOT NULL DEFAULT '0' COMMENT '隐藏ELO积分', + `history_best_rank` int(11) NOT NULL DEFAULT '0' COMMENT '历史最高段位', + `gift_state1` int(11) NOT NULL DEFAULT '0' COMMENT '普通礼包购买状态 0:未购 1:已购', + `gift_buytime1` int(11) NOT NULL DEFAULT '0' COMMENT '普通礼包购买时间', + `gift_state2` int(11) NOT NULL DEFAULT '0' COMMENT '豪华礼包购买状态 0:未购 1:已购', + `gift_buytime2` int(11) NOT NULL DEFAULT '0' COMMENT '豪华礼包购买时间', + `battle_data` mediumblob COMMENT 'battle_data', + `kills_modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '击杀修改时间', + `score_modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '积分修改时间', + `best_rank_modifytime` int(11) NOT NULL DEFAULT '0' COMMENT 'bestrank修改时间', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`), + UNIQUE KEY `account_id_season_id` (`account_id`, `season_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_season_card` +-- + +DROP TABLE IF EXISTS `t_season_card`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_season_card` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `season_id` int(11) NOT NULL DEFAULT '0' COMMENT '赛季id', + `type` int(11) NOT NULL DEFAULT '0' COMMENT '手册类型 1：普通 2：精英', + `card_lv` int(11) NOT NULL DEFAULT '0' COMMENT '赛季手册等级', + `reward_received` 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`), + KEY `account_id_season_id` (`account_id`, `season_id`), + UNIQUE KEY `account_id_season_id_type_card_lv` (`account_id`, `season_id`, `type`, `card_lv`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_used_name` +-- + +DROP TABLE IF EXISTS `t_used_name`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_used_name` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `name` tinyblob COMMENT '名字', + `name_base64` varchar(255) NOT NULL DEFAULT '' COMMENT '名字base64', + `key` varchar(60) NOT NULL DEFAULT '' COMMENT '应用key', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `name_base64_key` (`name_base64`, `key`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_drop_log` +-- + +DROP TABLE IF EXISTS `t_drop_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_drop_log` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `drop_source` varchar(60) NOT NULL DEFAULT '' COMMENT '掉落源', + `drop_id` varchar(60) NOT NULL DEFAULT '' COMMENT '掉落id', + `drop_items` mediumblob COMMENT '掉落的物品', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id_drop_source_drop_id` (`account_id`, `drop_source`, `drop_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_rank_activity` +-- + +DROP TABLE IF EXISTS `t_rank_activity`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_rank_activity` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `channel` int(11) NOT NULL DEFAULT '0' COMMENT 'channel', + `guild_id` varchar(60) NOT NULL DEFAULT '' COMMENT '工会id', + `wave` int(11) NOT NULL DEFAULT '0' COMMENT 'wave', + `type` int(11) NOT NULL DEFAULT '0' COMMENT 'type', + `value` double NOT NULL DEFAULT '0' COMMENT 'value', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_wave_type` (`account_id`, `wave`, `type`), + KEY `channel` (`channel`), + KEY `type` (`type`), + KEY `guild_id` (`guild_id`), + KEY `value` (`value`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_game_log` +-- + +DROP TABLE IF EXISTS `t_game_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_game_log` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `type` varchar(255) NOT NULL DEFAULT '' COMMENT '日志类型', + `subtype` varchar(255) NOT NULL DEFAULT '' COMMENT '日志子类型', + `param1` varchar(666) NOT NULL DEFAULT '' COMMENT 'param1', + `param2` varchar(666) NOT NULL DEFAULT '' COMMENT 'param2', + `param3` varchar(666) NOT NULL DEFAULT '' COMMENT 'param3', + `param4` varchar(666) NOT NULL DEFAULT '' COMMENT 'param4', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id_type_subtype` (`account_id`, `type`, `subtype`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- Dump completed on 2015-08-19 18:51:22 + +-- +-- Table structure for table `t_nft_active` +-- + +DROP TABLE IF EXISTS `t_nft_active`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_nft_active` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `uniid` varchar(255) NOT NULL DEFAULT '' COMMENT 'nft uniid', + `token_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'token id', + `daytime` int(11) NOT NULL DEFAULT '0' COMMENT '今天0点时间', + `token_type` int(11) NOT NULL DEFAULT '0' COMMENT 'nft类型 1:英雄 2:枪支 3:芯片 5:碎片箱子', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `uniid_daytime_type` (`uniid`, `daytime`,`token_type`), + KEY `account_id_token_type` (`account_id`,`token_type`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_fragment_pool` +-- + +DROP TABLE IF EXISTS `t_fragment_pool`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_fragment_pool` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `fragment_id` int(11) NOT NULL DEFAULT '0' COMMENT '碎片id', + `type` int(11) NOT NULL DEFAULT '0' COMMENT '0:pvp 1:pve', + `fragment_type` int(11) NOT NULL DEFAULT '0' COMMENT '碎片类型 0:英雄 1:武器', + `fragment_num` int(11) NOT NULL DEFAULT '0' COMMENT '剩余碎片数量', + `alloced_num` int(11) NOT NULL DEFAULT '0' COMMENT '已经分配的碎片数量', + `alloc_num` int(11) NOT NULL DEFAULT '0' COMMENT '分配的碎片数量', + `alloc_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`), + KEY `alloc_time_type_fragment_type` (`alloc_time`, `type`, `fragment_type`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_fragment_record` +-- + +DROP TABLE IF EXISTS `t_fragment_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_fragment_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `param` int(11) NOT NULL DEFAULT '0' COMMENT 'param', + `value` 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`), + KEY `account_param` (`account_id`, `param`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_realtime_data` +-- + +DROP TABLE IF EXISTS `t_realtime_data`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_realtime_data` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `name` varchar(60) NOT NULL DEFAULT '' COMMENT '参数名', + `value1` varchar(60) NOT NULL DEFAULT '' COMMENT '值1', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_battle_settlement_single` +-- + +DROP TABLE IF EXISTS `t_battle_settlement_single`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_battle_settlement_single` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `battle_uuid` varchar(60) NOT NULL DEFAULT '' COMMENT '战斗记录唯一id', + `account_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'account_id', + `room_uuid` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'room_uuid', + `data` mediumblob COMMENT 'data', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_battle_uniid` (`account_id`, `battle_uuid`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_battle_settlement_team` +-- + +DROP TABLE IF EXISTS `t_battle_settlement_team`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_battle_settlement_team` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `battle_uuid` varchar(60) NOT NULL DEFAULT '' COMMENT '战斗记录唯一id', + `room_uuid` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'room_id', + `data` mediumblob COMMENT 'data', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `battle_room_uuid` (`battle_uuid`, `room_uuid`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_battle_settlement_team` +-- + +DROP TABLE IF EXISTS `t_battle_input`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_battle_input` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `battle_uuid` varchar(60) NOT NULL DEFAULT '' COMMENT '战斗记录唯一id', + `room_uuid` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'room_id', + `input` mediumblob COMMENT 'input', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `battle_room_uuid` (`battle_uuid`, `room_uuid`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_battle_history` +-- + +DROP TABLE IF EXISTS `t_battle_history`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_battle_history` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `battle_uniid` varchar(60) NOT NULL DEFAULT '' COMMENT '战斗记录唯一id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '用户 account_id', + `match_mode` int(11) NOT NULL DEFAULT '0' COMMENT '0: 匹配 pvp 1: 排位赛 2: pve', + `team_mode` int(11) NOT NULL DEFAULT '0' COMMENT '队伍模式 0:单人 1：组队', + `battle_rank` int(11) NOT NULL DEFAULT '0' COMMENT '战斗排名', + `team_rank` int(11) NOT NULL DEFAULT '0' COMMENT '团队排名', + `team_kills` int(11) NOT NULL DEFAULT '0' COMMENT '团队击杀数', + `gold` int(11) NOT NULL DEFAULT '0' COMMENT 'gold获得数', + `is_win` int(11) NOT NULL DEFAULT '0' COMMENT 'pve冒险是否胜利', + `kills` int(11) NOT NULL DEFAULT '0' COMMENT '击杀数', + `hero_id` int(11) NOT NULL DEFAULT '0' COMMENT '英雄 id', + `weapon1` int(11) NOT NULL DEFAULT '0' COMMENT '枪械1 id', + `weapon2` int(11) NOT NULL DEFAULT '0' COMMENT '枪械2 id', + `damage` int(11) NOT NULL DEFAULT '0' COMMENT '伤害', + `battle_end_time` int(11) NOT NULL DEFAULT '0' COMMENT '战斗结束时间', + `current_level_class` varchar(60) NOT NULL DEFAULT '0' COMMENT '当前用户段位', + `current_level_class_score` int(11) NOT NULL DEFAULT '0' COMMENT '当前用户排位分', + `level_class_score_chg` int(11) NOT NULL DEFAULT '0' COMMENT '排位分改变', + `pve_rank_score` int(11) NOT NULL DEFAULT '0' COMMENT 'pve冒险积分', + `pve_kill_boss` int(11) NOT NULL DEFAULT '0' COMMENT 'pve冒险是否击杀BOSS', + `pve_instance_id` int(11) NOT NULL DEFAULT '0' COMMENT 'pve副本难度id', + `pve_instance_mode` int(11) NOT NULL DEFAULT '0' COMMENT 'pve副本mode', + `battle_foreign_key` int(11) NOT NULL DEFAULT '0' COMMENT '结算外键', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_battle_uniid` (`account_id`, `battle_uniid`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_guide_data` +-- + +DROP TABLE IF EXISTS `t_guide_data`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_guide_data` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `data` varchar(255) NOT NULL DEFAULT '' COMMENT '值1', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- Dump completed on 2015-08-19 18:51:22 + +-- +-- Table structure for table `t_user_season_ring` +-- + +DROP TABLE IF EXISTS `t_user_season_ring`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_season_ring` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_season_ranking` +-- + +DROP TABLE IF EXISTS `t_season_ranking`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_season_ranking` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `address` varchar(60) COMMENT 'address', + `channel` int(11) NOT NULL DEFAULT '0' COMMENT 'channel', + `rank` int(11) NOT NULL DEFAULT '0' COMMENT '段位', + `score` int(11) NOT NULL DEFAULT '0' COMMENT '积分', + `ranking` int(11) NOT NULL DEFAULT '0' COMMENT '排名', + `ranking_point` bigint NOT NULL DEFAULT '0' COMMENT '排名SV积分', + `season` 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`), + UNIQUE KEY `account_id_season` (`account_id`, `season`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_parachute` +-- + +DROP TABLE IF EXISTS `t_parachute`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_parachute` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_transaction` +-- + +DROP TABLE IF EXISTS `t_transaction`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_transaction` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `address` varchar(60) NOT NULL DEFAULT '' COMMENT 'address', + `trans_id` varchar(255) NOT NULL DEFAULT '' COMMENT '事务id', + `action` int(11) NOT NULL DEFAULT '0' COMMENT 'action', + `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id', + `token_type` int(11) NOT NULL DEFAULT '0' COMMENT 'token_type', + `item_uniid` bigint NOT NULL DEFAULT '0' COMMENT '道具uniid', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `item_num` bigint NOT NULL DEFAULT '0' COMMENT '道具num', + `status` int(11) NOT NULL DEFAULT '0' COMMENT 'status', + `result` int(11) NOT NULL DEFAULT '0' COMMENT 'result 0：失败 1：成功', + `client_confirmed` int(11) NOT NULL DEFAULT '0' COMMENT 'client_confirmed', + `client_result` mediumblob COMMENT 'client_result', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `trans_id` (`trans_id`), + KEY `account_id` (`account_id`), + KEY `address` (`address`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_transaction_prefee` +-- + +DROP TABLE IF EXISTS `t_transaction_prefee`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_transaction_prefee` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `trans_id` varchar(255) NOT NULL DEFAULT '' COMMENT '事务id', + `target_token_id` bigint NOT NULL DEFAULT '0' COMMENT 'target_token_id', + `target_token_type` bigint NOT NULL DEFAULT '0' COMMENT 'target_token_type', + `item_uniid` bigint NOT NULL DEFAULT '0' COMMENT '道具uniid', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `item_num` double NOT NULL DEFAULT '0' COMMENT '道具数量', + `done` int(11) NOT NULL DEFAULT '0' COMMENT 'done', + `state` int(11) NOT NULL DEFAULT '0' COMMENT 'state', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `trans_id` (`trans_id`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_nft_up_event` +-- + +DROP TABLE IF EXISTS `t_nft_up_event`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_nft_up_event` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `trans_id` varchar(255) NOT NULL DEFAULT '' COMMENT '事务id', + `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id', + `value` int(11) NOT NULL DEFAULT '0' COMMENT 'value', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `trans_id` (`trans_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `t_nft_up_receive`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_nft_up_receive` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `trans_id` varchar(255) NOT NULL DEFAULT '' COMMENT '事务id', + `token_id1` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id1', + `token_id2` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id2', + `state` int(11) NOT NULL DEFAULT '0' COMMENT '0进阶中,1可领取', + `token_type` int(11) NOT NULL DEFAULT '0' COMMENT '1英雄,2枪械', + `from_data` int(11) NOT NULL DEFAULT '0' COMMENT '0本地,1链', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `trans_id` (`trans_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_event_ranking` +-- + +DROP TABLE IF EXISTS `t_event_ranking`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_event_ranking` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `wave` int(11) NOT NULL DEFAULT '0' COMMENT 'wave', + `type` int(11) NOT NULL DEFAULT '0' COMMENT 'type', + `value` double NOT NULL DEFAULT '0' COMMENT 'value', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_wave_type` (`account_id`, `wave`, `type`), + KEY `value` (`value`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_user_currency` +-- + +DROP TABLE IF EXISTS `t_user_currency`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_currency` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `net_id` int(11) NOT NULL DEFAULT '0' COMMENT '链id', + `address` varchar(60) NOT NULL DEFAULT '' COMMENT '货币地址', + `symbol` varchar(10) NOT NULL DEFAULT '' COMMENT '符号', + `precision` int(11) NOT NULL DEFAULT '0' COMMENT '精度', + `type` int(11) NOT NULL DEFAULT '0' COMMENT '类型 1:ERC721 2:ERC1155 3:ERC20', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_net_address` (`account_id`, `net_id`, `address`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_emoji` +-- + +DROP TABLE IF EXISTS `t_emoji`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_emoji` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT 'itemID', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_item_id` (`account_id`, `item_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_user_use_emoji` +-- + +DROP TABLE IF EXISTS `t_user_use_emoji`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_use_emoji` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `value` varchar(255) NOT NULL DEFAULT '' COMMENT '选中表情itemID', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_chip_page` +-- + +DROP TABLE IF EXISTS `t_chip_page`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_chip_page` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `page_name` varchar(50) NOT NULL DEFAULT '' COMMENT '页名', + `page_id` int(11) NOT NULL DEFAULT '0' COMMENT '页id', + `data` mediumblob COMMENT 'data', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_page_id` (`account_id`, `page_id`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_hero_preset` +-- + +DROP TABLE IF EXISTS `t_hero_preset`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_hero_preset` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `hero_uid` bigint NOT NULL DEFAULT 0 COMMENT 'hero uniid', + `skill_id` int(11) NOT NULL DEFAULT 0 COMMENT '技能 item_id', + `weapon_uid1` bigint NOT NULL DEFAULT 0 COMMENT 'gun uniid1', + `weapon_uid2` bigint NOT NULL DEFAULT 0 COMMENT 'gun uniid2', + `chip_page` int(11) NOT NULL DEFAULT 0 COMMENT '芯片页id', + `createtime` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', + PRIMARY KEY (`idx`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_rank_battle` +-- + +DROP TABLE IF EXISTS `t_rank_battle`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_rank_battle` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `channel` int(11) NOT NULL DEFAULT '0' COMMENT 'channel', + `type` int(11) NOT NULL DEFAULT '0' COMMENT 'type 1:场次榜 2:吃鸡榜 3:mvp榜 4:前三名榜 5:击杀榜', + `value` bigint NOT NULL DEFAULT '0' COMMENT 'value', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id_type` (`account_id`, `type`), + KEY `channel` (`channel`), + KEY `type` (`type`), + KEY `value` (`value`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_mission_star` +-- + +DROP TABLE IF EXISTS `t_mission_star`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_mission_star` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `season_id` int(11) NOT NULL DEFAULT '0' COMMENT '成长任务赛季id', + `mission_id` int(11) NOT NULL DEFAULT '0' COMMENT '成长任务id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_season_mission_id` (`account_id`, `season_id`, `mission_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_user_sign_log` +-- + +DROP TABLE IF EXISTS `t_user_sign_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_sign_log` ( + `idx` int(10) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `days` int(10) DEFAULT '0' COMMENT '累计签到天数', + `sign_time` int(10) DEFAULT NULL COMMENT '签到时间', + `is_receive` tinyint(4) DEFAULT '0' COMMENT '是否领取奖励', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_first_topup` +-- + +DROP TABLE IF EXISTS `t_first_topup`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_first_topup` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT, + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `address` varchar(60) COMMENT 'address', + `status1` int(11) NOT NULL DEFAULT '0' COMMENT '领取状态1 0 不能领取 1 可领取状态 2 已领取', + `status2` int(11) NOT NULL DEFAULT '0' COMMENT '领取状态2', + `status3` int(11) NOT NULL DEFAULT '0' COMMENT '领取状态3', + `createtime` int(11) NOT NULL COMMENT '首充时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_shop_buy_order` +-- + +DROP TABLE IF EXISTS `t_shop_buy_order`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_shop_buy_order` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单id', + `order_id` varchar(64) DEFAULT NULL COMMENT '订单id', + `address` varchar(60) NOT NULL COMMENT '账户地址', + `createtime` int(11) NOT NULL COMMENT '订单开始时间', + `id` int(11) NOT NULL COMMENT '商店货物id', + `item_id` int(11) NOT NULL COMMENT '道具id', + `goods_num` bigint(20) NOT NULL COMMENT '购买个数', + `status` int(11) NOT NULL COMMENT '订单状态 0-客户端申请了订单 1-订单完成 2-订单失败', + PRIMARY KEY (`idx`), + UNIQUE KEY `order_id` (`order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_user_pass` +-- + +DROP TABLE IF EXISTS `t_user_pass`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_pass` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL COMMENT '账户id', + `season_id` int(11) NOT NULL DEFAULT '0' COMMENT '通行证赛季', + `data` mediumblob COMMENT 'data', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `account_season_id` (`account_id`, `season_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_bc_order` +-- + +DROP TABLE IF EXISTS `t_bc_order`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_bc_order` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `order_id` varchar(255) COMMENT '订单号', + `order_type` int(11) NOT NULL COMMENT '0:默认', + `account_id` varchar(60) NOT NULL COMMENT '账户id 只用做事后分析用', + `address` varchar(60) COMMENT 'address', + `currency_name` varchar(60) NOT NULL DEFAULT '' COMMENT 'currency_name', + `status` int(11) NOT NULL DEFAULT '0' COMMENT '0: 支付中 1： 已发货', + `item_id` int(11) NOT NULL COMMENT '道具id', + `item_num` bigint NOT NULL DEFAULT '0' COMMENT '道具数量', + `ext_data` mediumblob COMMENT '扩展数据自定义', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + `price` varchar(60) COLLATE utf8_bin NOT NULL COMMENT '价格', + PRIMARY KEY (`idx`), + UNIQUE KEY `order_id` (`order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_shop_dailyselection` +-- + +DROP TABLE IF EXISTS `t_shop_dailyselection`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_shop_dailyselection` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `address` varchar(60) NOT NULL COMMENT 'address', + `refresh_mode` int(11) NOT NULL COMMENT '0-每日自动刷新时间 1-手动刷新时间', + `refresh_time` int(11) NOT NULL DEFAULT '0' COMMENT '刷新时间', + `grid_1` int(11) NOT NULL, + `grid_2` int(11) NOT NULL, + `grid_3` int(11) NOT NULL, + `grid_4` int(11) NOT NULL, + `grid_5` int(11) NOT NULL, + `grid_6` int(11) NOT NULL, + `count_1` tinyint(4) NOT NULL, + `count_2` tinyint(4) NOT NULL, + `count_3` tinyint(4) NOT NULL, + `count_4` tinyint(4) NOT NULL, + `count_5` tinyint(4) NOT NULL, + `count_6` tinyint(4) NOT NULL, + PRIMARY KEY (`idx`), + KEY `refresh_time` (`refresh_time`), + KEY `address` (`address`), + KEY `refresh_mode` (`refresh_mode`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `t_shop_free_record`; +CREATE TABLE `t_shop_free_record` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL COMMENT '账号id', + `shop_id` int(11) NOT NULL COMMENT '商店id', + `id` int(11) NOT NULL COMMENT '货架id', + `goods_id` int(11) NOT NULL COMMENT '道具id', + `goods_num` int(11) NOT NULL COMMENT '道具数量', + `free_type` int(11) NOT NULL COMMENT '免费类型', + `free_num` int(11) NOT NULL COMMENT '免费数量', + `createtime` int(11) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`), + KEY `createtime` (`createtime`), + KEY `id` (`id`), + KEY `goods_id` (`goods_id`) +) ENGINE=InnoDB AUTO_INCREMENT=78 DEFAULT CHARSET=utf8; + + +-- +-- Table structure for table `t_user_honor` +-- + +DROP TABLE IF EXISTS `t_user_honor`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_user_honor` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `address` varchar(60) NOT NULL COMMENT '钱包地址', + `honor1` int(11) NOT NULL DEFAULT '0' COMMENT 'nft类型6 1:佩戴', + `honor2` int(11) NOT NULL DEFAULT '0' COMMENT 'honor2', + `honor3` int(11) NOT NULL DEFAULT '0' COMMENT 'honor3', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `address` (`address`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_orderid` +-- + +DROP TABLE IF EXISTS `t_orderid`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_orderid` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `request` mediumblob COMMENT 'request', + `confirmed` 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`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_inapp_record` +-- + +DROP TABLE IF EXISTS `t_inapp_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_inapp_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `amount` double NOT NULL DEFAULT '0' COMMENT '充值总额', + `buy_times` int(11) NOT NULL DEFAULT '0' COMMENT '充值次数', + `amount_ok` double NOT NULL DEFAULT '0' COMMENT '充值成功总额', + `buy_ok_times` int(11) NOT NULL DEFAULT '0' COMMENT '充值成功次数', + `daytime` 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`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_inapp_order` +-- + +DROP TABLE IF EXISTS `t_inapp_order`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_inapp_order` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `order_id` varchar(60) NOT NULL DEFAULT '' COMMENT '订单id', + `sp_order_id` varchar(64) DEFAULT NULL COMMENT 'app store order_id', + `platform` int(11) NOT NULL DEFAULT '0' COMMENT '0: ios 1: android', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '申请账号id', + `goods_id` int(11) NOT NULL DEFAULT '0' COMMENT '物品id', + `price` double NOT NULL DEFAULT '0' COMMENT '价格', + `status` int(11) NOT NULL DEFAULT '0' COMMENT 'status', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `order_id` (`order_id`), + UNIQUE KEY `platform_sp_order_id` (`platform`, `sp_order_id`), + KEY `account_id` (`account_id`), + KEY `sp_order_id` (`sp_order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_outapp_order` +-- + +DROP TABLE IF EXISTS `t_outapp_order`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_outapp_order` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `order_id` varchar(60) NOT NULL DEFAULT '' COMMENT '订单id', + `sp_order_id` varchar(64) DEFAULT NULL COMMENT 'app store order_id', + `platform` int(11) NOT NULL DEFAULT '0' COMMENT '0: ios 1: android', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '申请账号id', + `address` varchar(60) DEFAULT NULL COMMENT '申请时账号绑定的钱包', + `goods_id` int(11) NOT NULL DEFAULT '0' COMMENT '物品id', + `price` double NOT NULL DEFAULT '0' COMMENT '价格', + `params` mediumblob COMMENT 'params', + `status` int(11) NOT NULL DEFAULT '0' COMMENT 'status', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `order_id` (`order_id`), + UNIQUE KEY `platform_sp_order_id` (`platform`, `sp_order_id`), + KEY `account_id` (`account_id`), + KEY `address` (`address`), + KEY `sp_order_id` (`sp_order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_mall` +-- + +DROP TABLE IF EXISTS `t_mall`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_mall` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id', + `goods_uuid` varchar(255) NOT NULL DEFAULT '' COMMENT '商品uuid', + `seller` varchar(60) NOT NULL DEFAULT '' COMMENT 'seller', + `seller_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'seller_address', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '物品id', + `item_num` bigint NOT NULL DEFAULT '0' COMMENT '物品数量', + `currency` varchar(60) NOT NULL COMMENT 'currency', + `price` varchar(255) NOT NULL DEFAULT '' COMMENT 'price', + `status` int(11) NOT NULL DEFAULT '0' COMMENT 'status', + `last_buy_time` int(11) NOT NULL DEFAULT '0' COMMENT '最后一次购买时间', + `last_buyer` varchar(60) NOT NULL DEFAULT '' COMMENT '最后一次购买者', + `last_modify_price_time` int(11) NOT NULL DEFAULT '0' COMMENT '最后一次修改价格事件', + `buyer` varchar(60) NOT NULL DEFAULT '' COMMENT '购买成功者', + `buy_ok_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`), + KEY `seller` (`seller`), + KEY `seller_address` (`seller_address`), + KEY `price` (`price`), + UNIQUE KEY `order_id` (`order_id`), + UNIQUE KEY `goods_uuid` (`goods_uuid`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_market` +-- + +DROP TABLE IF EXISTS `t_market`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_market` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `net_id` bigint NOT NULL DEFAULT '0' COMMENT 'net_id', + `order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id', + `token_id` varchar(60) NOT NULL COMMENT 'token_id', + `seller` varchar(60) NOT NULL COMMENT 'owner', + `buyer` varchar(60) NOT NULL COMMENT 'owner', + `nft_token` varchar(60) NOT NULL COMMENT 'nft_token', + `amount` varchar(255) NOT NULL DEFAULT '' COMMENT 'amount', + `currency` varchar(60) NOT NULL COMMENT 'currency', + `price` varchar(255) NOT NULL DEFAULT '' COMMENT 'price', + `update_price` varchar(255) COMMENT 'update_price', + `update_time` int(11) COMMENT 'update_time', + `c_name` varchar(32) NOT NULL DEFAULT '' COMMENT '缓存-名称', + `c_job` int(11) NOT NULL DEFAULT '0' COMMENT '缓存-职业', + `c_type` int(11) NOT NULL DEFAULT '0' COMMENT '缓存-碎片类型', + `c_lv` int(11) NOT NULL DEFAULT '0' COMMENT '缓存-级别', + `c_quality` int(11) NOT NULL DEFAULT '0' COMMENT '缓存-品阶', + `c_durability` float NOT NULL DEFAULT '0' COMMENT '缓存-能量', + `status` int(11) NOT NULL DEFAULT '0' COMMENT 'status', + `activated` int(11) NOT NULL DEFAULT '0' COMMENT 'activated', + `selltime` int(11) COMMENT 'selltime', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `order_id` (`order_id`), + KEY `seller_activated` (`seller`, `activated`), + KEY `activated` (`activated`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `t_web2_order`; +CREATE TABLE `t_web2_order` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `status` int(11) NOT NULL COMMENT '订单状态 0-客户端申请了订单 1-订单完成 2-订单失败', + `order_id` varchar(64) DEFAULT NULL COMMENT '订单id', + `createtime` datetime NOT NULL COMMENT '创建时间', + `account_id` varchar(64) NOT NULL COMMENT '申请账号id', + `address` varchar(64) DEFAULT NULL COMMENT '申请时账号绑定的钱包', + `item_id` int(11) NOT NULL COMMENT '物品id', + `item_num` bigint(20) NOT NULL COMMENT '物品数量', + `id` int(11) NOT NULL COMMENT '商店中的配置id，', + `goods_num` bigint(20) NOT NULL COMMENT '购买商品个数', + `price` varchar(64) DEFAULT NULL COMMENT '价格', + `ext_data` mediumblob COMMENT '扩展自定义数据', + `channel` varchar(64) DEFAULT NULL COMMENT 'google or apple', + `out_order_id` varchar(64) DEFAULT NULL COMMENT 'app store order_id', + PRIMARY KEY (`idx`), + UNIQUE KEY `order_id` (`order_id`), + KEY `out_order_id` (`out_order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `t_market_store`; +CREATE TABLE `t_market_store` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', + `order_id` varchar(64) DEFAULT NULL COMMENT '订单id', + `o_link` varchar(64) DEFAULT NULL COMMENT '关联的链上上架单号', + `status` int(11) NOT NULL COMMENT '订单状态 0:出售中 1:已下架 2:已售出 3:购买中', + `owner_address` varchar(60) NOT NULL COMMENT '当前拥有者', + `token_id` varchar(60) DEFAULT NULL COMMENT 'token_id', + `nft_token` varchar(64) DEFAULT NULL COMMENT 'nftToken', + `token_type` int(11) NOT NULL COMMENT 'nft类型 1:英雄 2:枪支 3:芯片', + `item_id` int(11) DEFAULT NULL COMMENT '特殊字段，用于标记中心化道具，用于交易金币', + `amount` bigint(20) NOT NULL DEFAULT '1' COMMENT '堆叠数量', + `createtime` int(11) NOT NULL COMMENT '创建时间(上架时间)', + `modifytime` int(11) NOT NULL COMMENT '修改时间(更新价格等)', + `buytime` int(11) DEFAULT NULL COMMENT '开始购买的时间', + `s_currency` varchar(64) DEFAULT NULL COMMENT '出售时选择的币种地址', + `s_price` varchar(64) NOT NULL COMMENT '出售价格', + `c_name` varchar(32) NOT NULL COMMENT '缓存-名称', + `c_job` int(11) NOT NULL COMMENT '缓存-职业', + `c_type` int(11) NOT NULL COMMENT '缓存-碎片类型', + `c_lv` int(11) NOT NULL COMMENT '缓存-级别', + `c_quality` int(11) NOT NULL COMMENT '缓存-品阶', + `c_durability` float NOT NULL COMMENT '缓存-能量', + `c_id` int(11) NOT NULL COMMENT '缓存-id', + PRIMARY KEY (`idx`) USING BTREE, + UNIQUE KEY `idx` (`idx`), + UNIQUE KEY `o_link` (`o_link`) USING BTREE, + UNIQUE KEY `order_id` (`order_id`) USING BTREE, + KEY `owner_address` (`owner_address`), + KEY `token_id` (`token_id`), + KEY `createtime` (`createtime`), + KEY `s_currency` (`s_currency`), + KEY `s_price` (`s_price`), + KEY `c_name` (`c_name`), + KEY `c_job` (`c_job`), + KEY `c_lv` (`c_lv`), + KEY `c_quality` (`c_quality`), + KEY `c_durability` (`c_durability`), + KEY `c_id` (`c_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10048 DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `t_market_transaction_record`; +CREATE TABLE `t_market_transaction_record` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT, + `createtime` int(11) NOT NULL COMMENT '交易成功时间', + `order_id` varchar(64) NOT NULL DEFAULT '0' COMMENT '订单id', + `o_link` varchar(64) NOT NULL COMMENT '合约订单id', + `seller` varchar(60) NOT NULL COMMENT '卖家', + `buyer` varchar(60) NOT NULL COMMENT '买家', + `token_id` varchar(60) NOT NULL COMMENT 'tokenid', + `item_id` int(11) DEFAULT NULL COMMENT '如果有，说明是中心化道具交易', + `amount` bigint(20) NOT NULL COMMENT '堆叠数量', + `name` varchar(64) NOT NULL COMMENT '商品名称', + `type` int(11) NOT NULL COMMENT '商品类型', + PRIMARY KEY (`idx`), + KEY `createtime` (`createtime`), + KEY `seller` (`seller`), + KEY `buyer` (`buyer`), + KEY `o_link` (`o_link`), + KEY `order_id` (`order_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10002 DEFAULT CHARSET=utf8; + + + +-- +-- Table structure for table `t_crystal_exchange_record` +-- + +DROP TABLE IF EXISTS `t_crystal_exchange_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_crystal_exchange_record` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT, + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `address` varchar(60) COMMENT 'address', + `period` int(11) NOT NULL DEFAULT '0' COMMENT '第几期', + `item_id` int(11) NOT NULL DEFAULT '0' COMMENT '道具id', + `item_num` bigint NOT NULL DEFAULT '0' COMMENT '道具数量', + `createtime` int(11) NOT NULL COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_power_exchange_record` +-- + +DROP TABLE IF EXISTS `t_power_exchange_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_power_exchange_record` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT, + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `address` varchar(60) COMMENT 'address', + `period` int(11) NOT NULL DEFAULT '0' COMMENT '第几期', + `item_num1` int(11) NOT NULL DEFAULT '0' COMMENT '晶体道具260001兑换算力数量', + `item_num2` int(11) NOT NULL DEFAULT '0' COMMENT '晶体道具260002兑换算力数量', + `item_num3` int(11) NOT NULL DEFAULT '0' COMMENT '晶体道具260003兑换算力数量', + `item_num4` int(11) NOT NULL DEFAULT '0' COMMENT '晶体道具260004兑换算力数量', + `total_num` double NOT NULL DEFAULT '0' COMMENT '算力总量', + `createtime` int(11) NOT NULL COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `t_computing_power_period` +-- + +DROP TABLE IF EXISTS `t_computing_power_period`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_hash_rate_reward` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT, + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `address` varchar(60) COMMENT 'address', + `period` int(11) NOT NULL DEFAULT '0' COMMENT '第几期', + `power` varchar(60) COMMENT '算力', + `reward_cec` varchar(60) COMMENT 'reward cec', + `reward1` int(11) NOT NULL DEFAULT '0' COMMENT '第1周奖励', + `reward2` int(11) NOT NULL DEFAULT '0' COMMENT '第2周奖励', + `reward3` int(11) NOT NULL DEFAULT '0' COMMENT '第3周奖励', + `reward4` int(11) NOT NULL DEFAULT '0' COMMENT '第4周奖励', + `txHash1` varchar(60) NOT NULL DEFAULT '' COMMENT '地址1', + `txHash2` varchar(60) NOT NULL DEFAULT '' COMMENT '地址2', + `txHash3` varchar(60) NOT NULL DEFAULT '' COMMENT '地址3', + `txHash4` varchar(60) NOT NULL DEFAULT '' COMMENT '地址4', + + `createtime` int(11) NOT NULL COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +CREATE TABLE `t_ranking_settlement_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `state` int(11) NOT NULL DEFAULT '0' COMMENT '是否重置', + `last_rank` int(11) NOT NULL DEFAULT '0' COMMENT '上赛季段位', + `current_rank` int(11) NOT NULL DEFAULT '0' COMMENT '新段位', + `last_score` int(11) NOT NULL DEFAULT '0' COMMENT '上赛季段位分', + `current_score` int(11) NOT NULL DEFAULT '0' COMMENT '新段位分', + `awards` mediumblob COMMENT '奖励', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id` (`account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + + +CREATE TABLE `t_staking` ( + `idx` bigint(20) NOT NULL AUTO_INCREMENT, + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `address` varchar(60) NOT NULL DEFAULT '' COMMENT 'address', + `order_id` varchar(60) COMMENT 'order_id', + `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id', + `item_id` int(11) NOT NULL COMMENT 'item_id', + `token_type` int(11) NOT NULL DEFAULT '0' COMMENT 'nft类型 1:英雄 2:枪支 3:芯片 6:荣誉 7:徽章', + `net_id` bigint NOT NULL DEFAULT '0' COMMENT 'net_id', + `contract_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'contract_address', + `stacked_num` varchar(60) NOT NULL DEFAULT '' COMMENT 'stacked_num', + `start_time` bigint NOT NULL DEFAULT '0' COMMENT '质押开始时间', + `stake_time` bigint NOT NULL DEFAULT '0' COMMENT '质押结束时间', + `redeem_time` bigint NOT NULL DEFAULT '0' COMMENT '赎回时间', + `status` int(11) NOT NULL COMMENT '0:质押中 1:已解押', + `txhash` varchar(255) NOT NULL DEFAULT '' COMMENT 'txhash', + `nft_type` int(11) NOT NULL COMMENT '', + `nft_reward` double NOT NULL DEFAULT '0' COMMENT '利息', + `createtime` int(11) NOT NULL COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `unikey1` (`token_id`, `contract_address`, `net_id`, `start_time`), + UNIQUE KEY `unikey2` (`token_id`, `contract_address`, `net_id`, `order_id`), + KEY `address` (`address`) +) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8; + +-- +-- Table structure for table `t_mail` +-- + +DROP TABLE IF EXISTS `t_mail`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_mail` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `mailid` bigint NOT NULL DEFAULT '0' COMMENT '邮件id', + `confirmed` int(11) NOT NULL DEFAULT '0' COMMENT 'confirmed', + `attachments` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '附件', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + KEY `account_id_mailid` (`account_id`, `mailid`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + + +-- +-- Table structure for table `t_avatar` +-- + +DROP TABLE IF EXISTS `t_avatar`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_avatar` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)', + `token_id` varchar(60) COMMENT 'token_id', + `item_id` int(11) NOT NULL COMMENT 'item_id', + `item_type` int(11) NOT NULL COMMENT 'item类型', + `status` int(11) NOT NULL DEFAULT '0' COMMENT '装备状态', + `hero_idx` bigint DEFAULT NULL COMMENT '英雄外键id', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `hero_idx_type` (`hero_idx`, `item_type`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; \ No newline at end of file From ba90c85676e49a91f21127d831183aec5a8682fe Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 15 Dec 2023 16:10:16 +0800 Subject: [PATCH 04/43] 1 --- webapp/controller/UserController.class.php | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index eed7d673..3d10dd30 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -116,22 +116,22 @@ class UserController extends BaseAuthedController { } } -// if (SERVER_ENV == _TEST) { -// -// array_push($addItems, -// array( -// 'item_id' => V_ITEM_GOLD, -// 'item_num' => 500000 -// )); -// $itemIds = array(30100,30200,30300,30400,30500,30600,30700,30800,30900,31000,40702,40902,40102); -// foreach ($itemIds as $row){ -// array_push($addItems, -// array( -// 'item_id' => $row, -// 'item_num' => 1 -// )); -// } -// } + if (defined('PRESENT_FREE_ITEM')) { + + array_push($addItems, + array( + 'item_id' => V_ITEM_GOLD, + 'item_num' => 500000 + )); + $itemIds = array(30100,30200,30300,30400,30500,30600,30700,30800,30900,31000,40702,40902,40102); + foreach ($itemIds as $row){ + array_push($addItems, + array( + 'item_id' => $row, + 'item_num' => 1 + )); + } + } $awardService = new services\AwardService(); $propertyChgService = new services\PropertyChgService(); From f47f7334102564dc64f8f6aa2f96eccfb2857cbd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 25 Dec 2023 19:26:21 +0800 Subject: [PATCH 05/43] 1 --- doc/Match.py | 23 +++++++++++++++++++++++ doc/_common.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 doc/Match.py diff --git a/doc/Match.py b/doc/Match.py new file mode 100644 index 00000000..6e32a387 --- /dev/null +++ b/doc/Match.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +import _common + +class Match(object): + + def __init__(self): + self.apis = [ + { + 'name': 'getMatchInfo', + 'desc': '获取匹配信息', + 'group': 'Match', + 'url': 'webapp/index.php?c=Match&a=getMatchInfo', + 'params': [ + _common.ReqHead(), + ['team_uuid', '', '队伍唯一id'], + ], + 'response': [ + _common.RspHead(), + ['info', _common.MatchInfo(), '队伍唯一id'], + ] + } + ] diff --git a/doc/_common.py b/doc/_common.py index 66cbe777..74affbb7 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1527,3 +1527,45 @@ class BattleTeam(object): ['team_uuid','','队伍唯一id'], ['!members', BattleData(), '成员数据'], ] + +class MatchMember(object): + + def __init__(self): + self.fields = [ + ['account_id', '', '账号id'], + ['address', '', 'openid'], + ['name', '', '用户名字'], + ['hero_uniId', 0, 'hero uniid'], + ['hero_id', 0, 'hero itemId'], + ['hero_skin', 0, '英雄皮肤 itemId'], + ['head_id', 0, '头像id'], + ['level', 0, '等级'], + ['exp', 0, '经验'], + ['rank', 0, '段位'], + ['pve_instance_id', 0, 'pve难度id'], + ['parachute', 0, '降落伞id'], + ['presetInfo', HeroPreset(), '备战信息'], + ['game_times', 0, '游戏次数'], + ['win_times', 0, '胜利次数'], + ['kills', 0, '击杀数'], + ['is_leader', 0, '是否队长'], + ['is_ready', 0, '是否准备'], + ['permission', 0, '邀请许可'], + ['createtime', 0, '账号创建时间'], + ] + +class MatchTeam(object): + + def __init__(self): + self.fields = [ + ['team_uuid','','队伍唯一id'], + ['!members', BattleData(), '成员数据'], + ] + +class MatchInfo(object): + + def __init__(self): + self.fields = [ + ['state',0,'状态 0:匹配中 1:匹配成功'], + ['!team_list', MatchTeam(), '队伍列表(客户端自行判断所属哪个队伍)'], + ] From fc404c7e4dfc0d86767527704bc2add4056d643e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 25 Dec 2023 19:27:14 +0800 Subject: [PATCH 06/43] 1 --- doc/Match.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/Match.py b/doc/Match.py index 6e32a387..85076743 100644 --- a/doc/Match.py +++ b/doc/Match.py @@ -19,5 +19,18 @@ class Match(object): _common.RspHead(), ['info', _common.MatchInfo(), '队伍唯一id'], ] + }, + { + 'name': 'cancel', + 'desc': '取消匹配', + 'group': 'Match', + 'url': 'webapp/index.php?c=Match&a=cancel', + 'params': [ + _common.ReqHead(), + ['team_uuid', '', '队伍唯一id'], + ], + 'response': [ + _common.RspHead(), + ] } ] From 3bbe10dcd7461eca3f0c9e141acafb9a09037fce Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 10:58:24 +0800 Subject: [PATCH 07/43] 1 --- webapp/controller/MatchController.class.php | 42 +++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 webapp/controller/MatchController.class.php diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php new file mode 100644 index 00000000..4d49e12f --- /dev/null +++ b/webapp/controller/MatchController.class.php @@ -0,0 +1,42 @@ +_getRedis($teamUuid); + $teamDb = $this->readTeamDb($r, $teamUuid); + if (empty($teamDb)) { + $this->_rspErr(1, 'The team has been disbanded'); + return; + } + $r->pexpire(TEAMID_KEY . $teamUuid, 1000*600); + $this->_rspData(array( + 'team_info' => $teamDb + )); + } + +} From df57bbdec392d9a821f5fa7e0c0265f5fe5ee29d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 11:38:47 +0800 Subject: [PATCH 08/43] 1 --- doc/Match.py | 2 +- webapp/controller/MatchController.class.php | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/Match.py b/doc/Match.py index 85076743..abcccf65 100644 --- a/doc/Match.py +++ b/doc/Match.py @@ -17,7 +17,7 @@ class Match(object): ], 'response': [ _common.RspHead(), - ['info', _common.MatchInfo(), '队伍唯一id'], + ['info', _common.MatchInfo(), '匹配信息'], ] }, { diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 4d49e12f..f5a9afc4 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -24,7 +24,7 @@ use models\HeroSkin; class MatchController extends BaseAuthedController { - public function teamInfo() + public function getMatchInfo() { $teamUuid = getReqVal('team_uuid', ''); $r = $this->_getRedis($teamUuid); @@ -39,4 +39,14 @@ class MatchController extends BaseAuthedController { )); } + public function cancel() + { + $teamUuid = getReqVal('team_uuid', ''); + $r = $this->_getRedis($teamUuid); + $teamDb = $this->readTeamDb($r, $teamUuid); + if (!empty($teamDb)) { + } + $this->_rspOk(); + } + } From a3ff4562627ea387bf60b2b78e64dc02357a19d7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 13:40:29 +0800 Subject: [PATCH 09/43] 1 --- webapp/bootstrap/constant.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/bootstrap/constant.php b/webapp/bootstrap/constant.php index 76458d5d..ff8a3732 100644 --- a/webapp/bootstrap/constant.php +++ b/webapp/bootstrap/constant.php @@ -6,6 +6,7 @@ define('DAILY_SELECTION_KEY', 'game2006api:daily_selection:'); define('PLANET_BUY_KEY', 'game2006api:planet_buy:'); define('LAST_SESSION_KEY', 'last_session:'); +define('MATCH_KEY', 'match:'); define('V_ITEM_GOLD', 10001); //金币 define('V_ITEM_DIAMOND', 10014); //钻石 From e61198c2a87631b7f316230accd53996c641aaa4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 13:54:37 +0800 Subject: [PATCH 10/43] 1 --- webapp/bootstrap/constant.php | 2 +- webapp/controller/MatchController.class.php | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/webapp/bootstrap/constant.php b/webapp/bootstrap/constant.php index ff8a3732..8d053a81 100644 --- a/webapp/bootstrap/constant.php +++ b/webapp/bootstrap/constant.php @@ -6,7 +6,7 @@ define('DAILY_SELECTION_KEY', 'game2006api:daily_selection:'); define('PLANET_BUY_KEY', 'game2006api:planet_buy:'); define('LAST_SESSION_KEY', 'last_session:'); -define('MATCH_KEY', 'match:'); +define('MATCH_CURRENT_TEAM_KEY', 'match:current_team:'); define('V_ITEM_GOLD', 10001); //金币 define('V_ITEM_DIAMOND', 10014); //钻石 diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index f5a9afc4..2938b405 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -13,7 +13,6 @@ require_once('mt/StarLevel.php'); require_once('services/PropertyChgService.php'); - use phpcommon\SqlHelper; use models\User; use models\Hero; @@ -49,4 +48,24 @@ class MatchController extends BaseAuthedController { $this->_rspOk(); } + private function readTeamDb($r, $teamUuid) + { + $teamDbStr = $r->get(TEAMID_KEY . $teamUuid); + if (empty($teamDbStr)) { + return null; + } + $teamDb = json_decode($teamDbStr, true); + return $teamDb; + } + + private function readCurrMatchTeam($r) + { + $teamDbStr = $r->get(MATCH_CURRENT_TEAM_KEY . $teamUuid); + if (empty($teamDbStr)) { + return null; + } + $teamDb = json_decode($teamDbStr, true); + return $teamDb; + } + } From 69fd8c5bd0bed0ef45a54e0a41661d66dbbd1ce1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 14:23:50 +0800 Subject: [PATCH 11/43] 1 --- webapp/bootstrap/constant.php | 1 + webapp/controller/MatchController.class.php | 33 +++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/webapp/bootstrap/constant.php b/webapp/bootstrap/constant.php index 8d053a81..2d998aa6 100644 --- a/webapp/bootstrap/constant.php +++ b/webapp/bootstrap/constant.php @@ -7,6 +7,7 @@ define('PLANET_BUY_KEY', 'game2006api:planet_buy:'); define('LAST_SESSION_KEY', 'last_session:'); define('MATCH_CURRENT_TEAM_KEY', 'match:current_team:'); +define('MATCH_OK_KEY', 'match:current_team:'); define('V_ITEM_GOLD', 10001); //金币 define('V_ITEM_DIAMOND', 10014); //钻石 diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 2938b405..803cee4f 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -32,7 +32,7 @@ class MatchController extends BaseAuthedController { $this->_rspErr(1, 'The team has been disbanded'); return; } - $r->pexpire(TEAMID_KEY . $teamUuid, 1000*600); + $matchDb = $this->readCurrMatchTeam($r); $this->_rspData(array( 'team_info' => $teamDb )); @@ -54,13 +54,20 @@ class MatchController extends BaseAuthedController { if (empty($teamDbStr)) { return null; } + $r->refreshKeyExpire($r, TEAMID_KEY . $teamUuid, 1000*600); $teamDb = json_decode($teamDbStr, true); return $teamDb; } + /* + { + "current_team": "dafsdf" + "match_time": 231434 + } + */ private function readCurrMatchTeam($r) { - $teamDbStr = $r->get(MATCH_CURRENT_TEAM_KEY . $teamUuid); + $teamDbStr = $r->get(MATCH_CURRENT_TEAM_KEY); if (empty($teamDbStr)) { return null; } @@ -68,4 +75,26 @@ class MatchController extends BaseAuthedController { return $teamDb; } + /* + { + "target_team": "dafsdf" + "match_time": 231434 + } + */ + private function readMatchOk($r, $teamUuid) + { + $teamDbStr = $r->get(MATCH_OK_KEY . $teamUuid); + if (empty($teamDbStr)) { + return null; + } + $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); + $teamDb = json_decode($teamDbStr, true); + return $teamDb; + } + + private function refreshKeyExpire($r, $key, $time) + { + $r->pexpire($key, $time); + } + } From 28e1c183f4652288b2a7b35fcd03d05e502db410 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 14:26:45 +0800 Subject: [PATCH 12/43] 1 --- webapp/controller/MatchController.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 803cee4f..6d5d4bf1 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -32,7 +32,11 @@ class MatchController extends BaseAuthedController { $this->_rspErr(1, 'The team has been disbanded'); return; } - $matchDb = $this->readCurrMatchTeam($r); + $matchOkDb = $this->readMatchOk($r, $teamUuid); + if ($matchOkDb) { + + } + $currMatchDb = $this->readCurrMatchTeam($r); $this->_rspData(array( 'team_info' => $teamDb )); From 0d746e5c4152630d67936fd399ab4d1f929332c8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 14:34:36 +0800 Subject: [PATCH 13/43] 1 --- webapp/controller/MatchController.class.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 6d5d4bf1..564b7d84 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -34,9 +34,21 @@ class MatchController extends BaseAuthedController { } $matchOkDb = $this->readMatchOk($r, $teamUuid); if ($matchOkDb) { + $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); + $this->refreshKeyExpire($r, MATCH_OK_KEY . $matchOkDb['target_team'], 1000*600); + } else { + $currMatchDb = $this->readCurrMatchTeam($r); + if (empty($currMatchDb)) { + $currMatchDb = array( + 'current_team' => $teamUuid, + 'match_time' => $this->_getNowTime() + ); + $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); + $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); + } else { + } } - $currMatchDb = $this->readCurrMatchTeam($r); $this->_rspData(array( 'team_info' => $teamDb )); From 941985477517805228e4c4851dabd158518e0604 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 14:40:24 +0800 Subject: [PATCH 14/43] 1 --- webapp/controller/MatchController.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 564b7d84..80670b03 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -46,7 +46,9 @@ class MatchController extends BaseAuthedController { $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); } else { - + if ($currMatchDb['current_team'] != $teamUuid) { + $this->matchOk($r, $teamUuid, $currMatchDb); + } } } $this->_rspData(array( @@ -113,4 +115,9 @@ class MatchController extends BaseAuthedController { $r->pexpire($key, $time); } + private function matchOk($r, $teamUuid, $currMatchDb) + { + + } + } From 21587f7c372f36a06bbbe194bbed2246b625c569 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:01:16 +0800 Subject: [PATCH 15/43] 1 --- webapp/controller/MatchController.class.php | 23 +++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 80670b03..28644d17 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -36,6 +36,7 @@ class MatchController extends BaseAuthedController { if ($matchOkDb) { $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); $this->refreshKeyExpire($r, MATCH_OK_KEY . $matchOkDb['target_team'], 1000*600); + $this->refreshKeyExpire($r, TEAMID_KEY . $matchOkDb['target_team'], 1000*600); } else { $currMatchDb = $this->readCurrMatchTeam($r); if (empty($currMatchDb)) { @@ -72,7 +73,7 @@ class MatchController extends BaseAuthedController { if (empty($teamDbStr)) { return null; } - $r->refreshKeyExpire($r, TEAMID_KEY . $teamUuid, 1000*600); + $this->refreshKeyExpire($r, TEAMID_KEY . $teamUuid, 1000*600); $teamDb = json_decode($teamDbStr, true); return $teamDb; } @@ -117,7 +118,25 @@ class MatchController extends BaseAuthedController { private function matchOk($r, $teamUuid, $currMatchDb) { - + { + $r->del(MATCH_CURRENT_TEAM_KEY); + } + { + $matchOkDb = array( + 'target_team' => $currMatchDb['current_team'], + 'match_time' => $this->_getNowTime() + ); + $r->set(MATCH_OK_KEY . $teamUuid, json_encode($currMatchDb)); + $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); + } + { + $matchOkDb = array( + 'target_team' => $teamUuid, + 'match_time' => $this->_getNowTime() + ); + $r->set(MATCH_OK_KEY . $currMatchDb['current_team'], json_encode($currMatchDb)); + $this->refreshKeyExpire($r, MATCH_OK_KEY . $currMatchDb['current_team'], 1000*600); + } } } From 8bd3b443ec6a3e04387089246d3ea75235ae8cc1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:21:27 +0800 Subject: [PATCH 16/43] 1 --- webapp/controller/MatchController.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 28644d17..6be37b1f 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -32,6 +32,9 @@ class MatchController extends BaseAuthedController { $this->_rspErr(1, 'The team has been disbanded'); return; } + $matchInfo = array( + + ); $matchOkDb = $this->readMatchOk($r, $teamUuid); if ($matchOkDb) { $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); @@ -52,9 +55,7 @@ class MatchController extends BaseAuthedController { } } } - $this->_rspData(array( - 'team_info' => $teamDb - )); + $this->_rspData($matchInfo); } public function cancel() From 33347004a55906b1b3ea1ef80850c5bf1a9a3a9e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:28:25 +0800 Subject: [PATCH 17/43] 1 --- webapp/controller/MatchController.class.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 6be37b1f..b2f0ddae 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -33,13 +33,15 @@ class MatchController extends BaseAuthedController { return; } $matchInfo = array( - + 'state' => 0, + 'team_list' => array() ); $matchOkDb = $this->readMatchOk($r, $teamUuid); if ($matchOkDb) { $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); $this->refreshKeyExpire($r, MATCH_OK_KEY . $matchOkDb['target_team'], 1000*600); $this->refreshKeyExpire($r, TEAMID_KEY . $matchOkDb['target_team'], 1000*600); + $this->fillMatchInfo($r, $matchInfo); } else { $currMatchDb = $this->readCurrMatchTeam($r); if (empty($currMatchDb)) { @@ -52,6 +54,7 @@ class MatchController extends BaseAuthedController { } else { if ($currMatchDb['current_team'] != $teamUuid) { $this->matchOk($r, $teamUuid, $currMatchDb); + $this->fillMatchInfo($r, $matchInfo); } } } @@ -140,4 +143,9 @@ class MatchController extends BaseAuthedController { } } + private function fillMatchInfo($r, &$matchInfo) + { + $matchInfo['state'] = 1; + } + } From 6e11c16a12cf4d03bf64799dd9d731d305a1cbd1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:32:07 +0800 Subject: [PATCH 18/43] 1 --- webapp/controller/MatchController.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index b2f0ddae..4bfbfce3 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -41,7 +41,7 @@ class MatchController extends BaseAuthedController { $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); $this->refreshKeyExpire($r, MATCH_OK_KEY . $matchOkDb['target_team'], 1000*600); $this->refreshKeyExpire($r, TEAMID_KEY . $matchOkDb['target_team'], 1000*600); - $this->fillMatchInfo($r, $matchInfo); + $this->fillMatchInfo($r, $matchInfo, $matchOkDb); } else { $currMatchDb = $this->readCurrMatchTeam($r); if (empty($currMatchDb)) { @@ -54,7 +54,7 @@ class MatchController extends BaseAuthedController { } else { if ($currMatchDb['current_team'] != $teamUuid) { $this->matchOk($r, $teamUuid, $currMatchDb); - $this->fillMatchInfo($r, $matchInfo); + $this->fillMatchInfo($r, $matchInfo, $this->readMatchOk($r, $teamUuid)); } } } @@ -143,8 +143,11 @@ class MatchController extends BaseAuthedController { } } - private function fillMatchInfo($r, &$matchInfo) + private function fillMatchInfo($r, &$matchInfo, $matchOkDb) { + if (empty($matchOkDb)) { + return; + } $matchInfo['state'] = 1; } From d9eeb3011696b6346af1d2225fba645eea3bfd3c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:32:58 +0800 Subject: [PATCH 19/43] 1 --- webapp/controller/MatchController.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 4bfbfce3..da6191da 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -41,7 +41,7 @@ class MatchController extends BaseAuthedController { $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); $this->refreshKeyExpire($r, MATCH_OK_KEY . $matchOkDb['target_team'], 1000*600); $this->refreshKeyExpire($r, TEAMID_KEY . $matchOkDb['target_team'], 1000*600); - $this->fillMatchInfo($r, $matchInfo, $matchOkDb); + $this->fillMatchInfo($r, $teamUuid, $matchInfo, $matchOkDb); } else { $currMatchDb = $this->readCurrMatchTeam($r); if (empty($currMatchDb)) { @@ -54,7 +54,7 @@ class MatchController extends BaseAuthedController { } else { if ($currMatchDb['current_team'] != $teamUuid) { $this->matchOk($r, $teamUuid, $currMatchDb); - $this->fillMatchInfo($r, $matchInfo, $this->readMatchOk($r, $teamUuid)); + $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); } } } @@ -143,12 +143,14 @@ class MatchController extends BaseAuthedController { } } - private function fillMatchInfo($r, &$matchInfo, $matchOkDb) + private function fillMatchInfo($r, $teamUuid, &$matchInfo, $matchOkDb) { if (empty($matchOkDb)) { return; } $matchInfo['state'] = 1; + { + } } } From 1d891b05f7f53e0f1ebdaaaddf15258f5018602f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:49:01 +0800 Subject: [PATCH 20/43] 1 --- webapp/controller/MatchController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index da6191da..791e7786 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -150,6 +150,12 @@ class MatchController extends BaseAuthedController { } $matchInfo['state'] = 1; { + $teamDb = $this->readTeamDb($r, $teamUuid); + array_push($matchInfo['team_list'], $teamDb); + } + { + $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']); + array_push($matchInfo['team_list'], $teamDb); } } From 91a6b5c15dc648b8ec402ac1af48e653a7c34ade Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 15:55:46 +0800 Subject: [PATCH 21/43] 1 --- webapp/controller/MatchController.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 791e7786..2d3eea86 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -67,6 +67,11 @@ class MatchController extends BaseAuthedController { $r = $this->_getRedis($teamUuid); $teamDb = $this->readTeamDb($r, $teamUuid); if (!empty($teamDb)) { + $r->del(MATCH_OK_KEY . $teamUuid); + $matchOkDb = $this->readMatchOk($r, $teamUuid); + if ($matchOkDb) { + $r->del(MATCH_OK_KEY . $matchOkDb['target_team']); + } } $this->_rspOk(); } From 12b0abc9c05e65272fa98b2f07093731cafc3be0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 16:33:29 +0800 Subject: [PATCH 22/43] 1 --- webapp/controller/MatchController.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 2d3eea86..0891c8a9 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -55,6 +55,7 @@ class MatchController extends BaseAuthedController { if ($currMatchDb['current_team'] != $teamUuid) { $this->matchOk($r, $teamUuid, $currMatchDb); $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); + } else { } } } @@ -160,7 +161,9 @@ class MatchController extends BaseAuthedController { } { $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']); - array_push($matchInfo['team_list'], $teamDb); + if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) { + array_push($matchInfo['team_list'], $teamDb); + } } } From f40ebe1918532628b62d3f9ce5b13418970eadd5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 17:25:48 +0800 Subject: [PATCH 23/43] 1 --- webapp/controller/MatchController.class.php | 41 ++++++++++++--------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 0891c8a9..f2d790a1 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -43,21 +43,7 @@ class MatchController extends BaseAuthedController { $this->refreshKeyExpire($r, TEAMID_KEY . $matchOkDb['target_team'], 1000*600); $this->fillMatchInfo($r, $teamUuid, $matchInfo, $matchOkDb); } else { - $currMatchDb = $this->readCurrMatchTeam($r); - if (empty($currMatchDb)) { - $currMatchDb = array( - 'current_team' => $teamUuid, - 'match_time' => $this->_getNowTime() - ); - $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); - $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); - } else { - if ($currMatchDb['current_team'] != $teamUuid) { - $this->matchOk($r, $teamUuid, $currMatchDb); - $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); - } else { - } - } + $this->execMatch($r, $teamUuid, $teamDb, $matchInfo); } $this->_rspData($matchInfo); } @@ -90,8 +76,10 @@ class MatchController extends BaseAuthedController { /* { - "current_team": "dafsdf" - "match_time": 231434 + "": { + "current_team": "dafsdf" + "match_time": 231434 + } } */ private function readCurrMatchTeam($r) @@ -126,6 +114,25 @@ class MatchController extends BaseAuthedController { $r->pexpire($key, $time); } + private function execMatch($r, $teamUuid, $teamDb, &$matchInfo) + { + $currMatchDb = $this->readCurrMatchTeam($r); + if (empty($currMatchDb)) { + $currMatchDb = array( + 'current_team' => $teamUuid, + 'match_time' => $this->_getNowTime() + ); + $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); + $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); + } else { + if ($currMatchDb['current_team'] != $teamUuid) { + $this->matchOk($r, $teamUuid, $currMatchDb); + $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); + } else { + } + } + } + private function matchOk($r, $teamUuid, $currMatchDb) { { From 37c6a942aedf518aff10244b16e905c225c5a1b6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 17:38:19 +0800 Subject: [PATCH 24/43] 1 --- webapp/controller/MatchController.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index f2d790a1..c532c843 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -119,12 +119,15 @@ class MatchController extends BaseAuthedController { $currMatchDb = $this->readCurrMatchTeam($r); if (empty($currMatchDb)) { $currMatchDb = array( - 'current_team' => $teamUuid, - 'match_time' => $this->_getNowTime() + $teamUuid => array( + 'current_team' => $teamUuid, + 'match_time' => $this->_getNowTime() + ) ); $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); } else { + $currMatchDb = json_decode($currMatchDb, true); if ($currMatchDb['current_team'] != $teamUuid) { $this->matchOk($r, $teamUuid, $currMatchDb); $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); From 2420298d1978d1b5e7c4074e737080377b309273 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 18:06:58 +0800 Subject: [PATCH 25/43] 1 --- webapp/controller/MatchController.class.php | 28 +++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index c532c843..06208816 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -120,7 +120,7 @@ class MatchController extends BaseAuthedController { if (empty($currMatchDb)) { $currMatchDb = array( $teamUuid => array( - 'current_team' => $teamUuid, + 'team_uuid' => $teamUuid, 'match_time' => $this->_getNowTime() ) ); @@ -128,10 +128,28 @@ class MatchController extends BaseAuthedController { $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); } else { $currMatchDb = json_decode($currMatchDb, true); - if ($currMatchDb['current_team'] != $teamUuid) { - $this->matchOk($r, $teamUuid, $currMatchDb); - $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); - } else { + $delTeams = array(); + foreach ($currMatchDb as $key => $val) { + $tmpTeamDb = $this->readTeamDb($r, $key); + if (!empty($tmpTeamDb) || $this->_getNowTime() - $tmpTeamDb['match_time'] > 120) { + array_push($delTeams, $key); + } else { + $found = false; + if ($key == $teamUuid) { + $found = true; + } else { + foreach ($val['member_list'] as $member) { + if ($member['account_id'] == myself()->_getAccountId()) { + $found = true; + break; + } + } + } + if (!$found) { + $this->matchOk($r, $teamUuid, $val); + $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); + } + } } } } From 6bdf42690b2ff12f1ad07a29dd6fed1fec9f49db Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 18:07:41 +0800 Subject: [PATCH 26/43] 1 --- webapp/controller/MatchController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 06208816..337a3b7c 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -77,7 +77,7 @@ class MatchController extends BaseAuthedController { /* { "": { - "current_team": "dafsdf" + "team_uuid": "dafsdf" "match_time": 231434 } } From 596204edcacbb1035e01c2a86fc1b4283ca06d9a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 18:10:57 +0800 Subject: [PATCH 27/43] 1 --- webapp/controller/MatchController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 337a3b7c..5c5ce49a 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -148,8 +148,14 @@ class MatchController extends BaseAuthedController { if (!$found) { $this->matchOk($r, $teamUuid, $val); $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); + array_push($delTeams, $key); } } + }//end foreach $currMatchDb + if (count($delTeams) > 0) { + foreach ($delTeams as $id) { + unset($delTeams[$id]); + } } } } From f6fff0d16c9e451cabc9e21d2cbf3807f0e14cad Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 18:11:25 +0800 Subject: [PATCH 28/43] 1 --- webapp/controller/MatchController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 5c5ce49a..c3402deb 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -156,6 +156,8 @@ class MatchController extends BaseAuthedController { foreach ($delTeams as $id) { unset($delTeams[$id]); } + $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); + $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); } } } From 93fc71290e8950510f79660a597d8d856f0653b9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 19:03:43 +0800 Subject: [PATCH 29/43] 1 --- webapp/controller/MatchController.class.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index c3402deb..3c3b1092 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -164,9 +164,6 @@ class MatchController extends BaseAuthedController { private function matchOk($r, $teamUuid, $currMatchDb) { - { - $r->del(MATCH_CURRENT_TEAM_KEY); - } { $matchOkDb = array( 'target_team' => $currMatchDb['current_team'], From 4e45d080dc9a0d3d422c580f25a7b5a23332e1e4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 19:17:08 +0800 Subject: [PATCH 30/43] 1 --- webapp/controller/MatchController.class.php | 45 ++++++++++++--------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 3c3b1092..49c59f77 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -129,29 +129,36 @@ class MatchController extends BaseAuthedController { } else { $currMatchDb = json_decode($currMatchDb, true); $delTeams = array(); - foreach ($currMatchDb as $key => $val) { - $tmpTeamDb = $this->readTeamDb($r, $key); - if (!empty($tmpTeamDb) || $this->_getNowTime() - $tmpTeamDb['match_time'] > 120) { - array_push($delTeams, $key); - } else { - $found = false; - if ($key == $teamUuid) { - $found = true; + $selfTeamDb = $currMatchDb[$teamUuid]; + if ($selfTeamDb && myself()->_getNowTime() - $selfTeamDb['match_time'] > 7) { + $this->matchOk($r, $teamUuid, $selfTeamDb); + $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); + array_push($delTeams, $teamUuid); + } else { + foreach ($currMatchDb as $key => $val) { + $tmpTeamDb = $this->readTeamDb($r, $key); + if (!empty($tmpTeamDb) || $this->_getNowTime() - $tmpTeamDb['match_time'] > 120) { + array_push($delTeams, $key); } else { - foreach ($val['member_list'] as $member) { - if ($member['account_id'] == myself()->_getAccountId()) { - $found = true; - break; + $found = false; + if ($key == $teamUuid) { + $found = true; + } else { + foreach ($val['member_list'] as $member) { + if ($member['account_id'] == myself()->_getAccountId()) { + $found = true; + break; + } } } + if (!$found) { + $this->matchOk($r, $teamUuid, $val); + $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); + array_push($delTeams, $key); + } } - if (!$found) { - $this->matchOk($r, $teamUuid, $val); - $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid)); - array_push($delTeams, $key); - } - } - }//end foreach $currMatchDb + }//end foreach $currMatchDb + } if (count($delTeams) > 0) { foreach ($delTeams as $id) { unset($delTeams[$id]); From fceb480a433e322a522d983853a482da5168888a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Dec 2023 19:26:40 +0800 Subject: [PATCH 31/43] 1 --- webapp/controller/MatchController.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 49c59f77..3f7427c4 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -127,7 +127,6 @@ class MatchController extends BaseAuthedController { $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); } else { - $currMatchDb = json_decode($currMatchDb, true); $delTeams = array(); $selfTeamDb = $currMatchDb[$teamUuid]; if ($selfTeamDb && myself()->_getNowTime() - $selfTeamDb['match_time'] > 7) { @@ -173,10 +172,10 @@ class MatchController extends BaseAuthedController { { { $matchOkDb = array( - 'target_team' => $currMatchDb['current_team'], + 'target_team' => $currMatchDb['team_uuid'], 'match_time' => $this->_getNowTime() ); - $r->set(MATCH_OK_KEY . $teamUuid, json_encode($currMatchDb)); + $r->set(MATCH_OK_KEY . $teamUuid, json_encode($matchOkDb)); $this->refreshKeyExpire($r, MATCH_OK_KEY . $teamUuid, 1000*600); } { @@ -184,8 +183,8 @@ class MatchController extends BaseAuthedController { 'target_team' => $teamUuid, 'match_time' => $this->_getNowTime() ); - $r->set(MATCH_OK_KEY . $currMatchDb['current_team'], json_encode($currMatchDb)); - $this->refreshKeyExpire($r, MATCH_OK_KEY . $currMatchDb['current_team'], 1000*600); + $r->set(MATCH_OK_KEY . $currMatchDb['team_uuid'], json_encode($matchOkDb)); + $this->refreshKeyExpire($r, MATCH_OK_KEY . $currMatchDb['team_uuid'], 1000*600); } } @@ -194,6 +193,7 @@ class MatchController extends BaseAuthedController { if (empty($matchOkDb)) { return; } + error_log(json_encode($matchOkDb)); $matchInfo['state'] = 1; { $teamDb = $this->readTeamDb($r, $teamUuid); From a6be7a54ff352e096d2f2f075d49bc9995faecd4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 27 Dec 2023 10:46:33 +0800 Subject: [PATCH 32/43] 1 --- webapp/bootstrap/constant.php | 2 +- webapp/controller/MatchController.class.php | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/webapp/bootstrap/constant.php b/webapp/bootstrap/constant.php index 2d998aa6..b004c37f 100644 --- a/webapp/bootstrap/constant.php +++ b/webapp/bootstrap/constant.php @@ -7,7 +7,7 @@ define('PLANET_BUY_KEY', 'game2006api:planet_buy:'); define('LAST_SESSION_KEY', 'last_session:'); define('MATCH_CURRENT_TEAM_KEY', 'match:current_team:'); -define('MATCH_OK_KEY', 'match:current_team:'); +define('MATCH_OK_KEY', 'match:ok:'); define('V_ITEM_GOLD', 10001); //金币 define('V_ITEM_DIAMOND', 10014); //钻石 diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 3f7427c4..167a90e1 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -59,6 +59,14 @@ class MatchController extends BaseAuthedController { if ($matchOkDb) { $r->del(MATCH_OK_KEY . $matchOkDb['target_team']); } + { + $currMatchDb = $this->readCurrMatchTeam($r); + if (!empty($currMatchDb)) { + unset($currMatchDb[$teamUuid]); + $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); + $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); + } + } } $this->_rspOk(); } @@ -160,7 +168,7 @@ class MatchController extends BaseAuthedController { } if (count($delTeams) > 0) { foreach ($delTeams as $id) { - unset($delTeams[$id]); + unset($currMatchDb[$id]); } $r->set(MATCH_CURRENT_TEAM_KEY, json_encode($currMatchDb)); $this->refreshKeyExpire($r, MATCH_CURRENT_TEAM_KEY, 1000*600); From 6b6c685006ca9059c5235de3100621e317133af8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 28 Dec 2023 16:47:45 +0800 Subject: [PATCH 33/43] 1 --- webapp/controller/BattleController.class.php | 102 +++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index 30abcbf6..d55b5923 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -429,6 +429,108 @@ class BattleController extends BaseAuthedController { myself()->_rspData($data); } + public function getMobaBattleData() + { + $sign = ''; + $customData = array(); + { + $rawData = file_get_contents('php://input'); + error_log($rawData); + $sign = strstr($rawData, '|', true); + $customData = strstr($rawData, '|'); + $customData = substr($customData, 1); + error_log(json_encode(array( + 'sign' => $sign, + 'customData' => $customData + ))); + if (md5($customData . HALL_KEY) != $sign) { + myself()->_rspErr(1, 'sign error'); + return; + } + $customData = json_decode($customData, true); + } + + $zoneId = $customData['zone_id']; + $nodeId = $customData['node_id']; + $roomUuid = $customData['room_uuid']; + $startTime = $customData['start_time']; + + $data = array( + 'sign' => $sign, + 'zone_id' => $zoneId, + 'node_id' => $nodeId, + 'room_uuid' => $roomUuid, + 'start_time' => $startTime, + 'team_list' => array() + ); + + $currSeason = mt\RankSeason::getCurrentSeason(); + foreach ($customData['team_list'] as $team) { + $teamInfo = array( + 'team_uuid' => $team['team_uuid'], + 'members' => array() + ); + foreach ($team['members'] as $member) { + $accountId = $member['account_id']; + $switchOk = $this->switchOnlineAccount($accountId); + if (!$switchOk) { + myself()->_rspErr(1, 'data error'); + return; + } + $info = $this->genInitBattleData(); + $userDb = User::find($accountId); + if ($userDb) { + $userPresetInfo = User::toPreset($userDb); + $info['elo'] = $userDb['elo']; + $info['rank'] = $userDb['rank']; + $info['name'] = $userPresetInfo['name']; + $info['level'] = $userPresetInfo['level']; + $info['parachute'] = $userPresetInfo['parachute']; + $info['hero_uniid'] = $userPresetInfo['hero_uniId']; + $info['hero_id'] = $userPresetInfo['hero_id']; + $info['hero_skin'] = $userPresetInfo['hero_skin']; + $info['skill_id'] = $userPresetInfo['presetInfo']['skill_id']; + $info['weapon_uuid1'] = $userPresetInfo['presetInfo']['weapon_uid1']; + $info['weapon_uuid2'] = $userPresetInfo['presetInfo']['weapon_uid2']; + $chipPageDb = ChipPage::find($userPresetInfo['presetInfo']['chip_page']); + $info['chip_page'] = ChipPage::toDtoBattle($chipPageDb); + $info['honor_info'] = $userPresetInfo['honor_info']; + $battleDb = Battle::find($accountId); + if ($battleDb){ + $battleData = json_decode($battleDb['battle_data'], true); + $seasonBattleData = isset($battleData) ? getXVal($battleData, 'data', array()) : array(); + $info['battle_times'] = getXVal($seasonBattleData, 'total_battle_times', 0); + } + + $heroDb = Hero::findByAccountId($accountId,$info['hero_uniid']); + if ($heroDb) { + $info['is_valid_battle'] = 1; + $info['hero_dto'] = Hero::toDto($heroDb); + } else { + $info['errcode'] = 51; + $info['errmsg'] = 'paramater error'; + } + + { + $itemDb = Bag::findEx($accountId, V_ITEM_REVIVE_COIN); + $info['revive_coin'] = $itemDb && $itemDb['item_num'] > 0 ? $itemDb['item_num'] : 0; + } + + { + $info['match_mode'] = 0; + if ($currSeason){ + $info['match_mode'] = 1; + } + } + } + array_push($teamInfo['members'], $info); + } + array_push($data['team_list'], $teamInfo); + } + error_log(json_encode($data)); + myself()->_rspData($data); + } + private function genInitBattleData() { $accountId = myself()->_getAccountId(); From 21c9103d1b521c9766fef225e2e13b81eb6961e9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 29 Dec 2023 14:28:13 +0800 Subject: [PATCH 34/43] 1 --- webapp/controller/BattleController.class.php | 3 ++- webapp/controller/MatchController.class.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index d55b5923..5ff03abc 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -436,7 +436,8 @@ class BattleController extends BaseAuthedController { { $rawData = file_get_contents('php://input'); error_log($rawData); - $sign = strstr($rawData, '|', true); + $headStr = strstr($rawData, '|', true); + $sign = strstr($headStr, ':', true); $customData = strstr($rawData, '|'); $customData = substr($customData, 1); error_log(json_encode(array( diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 167a90e1..79b3804a 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -144,7 +144,7 @@ class MatchController extends BaseAuthedController { } else { foreach ($currMatchDb as $key => $val) { $tmpTeamDb = $this->readTeamDb($r, $key); - if (!empty($tmpTeamDb) || $this->_getNowTime() - $tmpTeamDb['match_time'] > 120) { + if (!empty($tmpTeamDb) && $this->_getNowTime() - $val['match_time'] > 120) { array_push($delTeams, $key); } else { $found = false; From f0c46fa9341df2ac51eaac7392791e54d9a64049 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 29 Dec 2023 14:41:59 +0800 Subject: [PATCH 35/43] 1 --- doc/Match.py | 1 + doc/_common.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/doc/Match.py b/doc/Match.py index abcccf65..e2eaaa26 100644 --- a/doc/Match.py +++ b/doc/Match.py @@ -18,6 +18,7 @@ class Match(object): 'response': [ _common.RspHead(), ['info', _common.MatchInfo(), '匹配信息'], + ['join_msg', _common.SpecJoin(), '匹配成功后改字段才有意义，传给CMJoin里的参数(team_uuid、payload)'], ] }, { diff --git a/doc/_common.py b/doc/_common.py index 74affbb7..50ea0d68 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1569,3 +1569,11 @@ class MatchInfo(object): ['state',0,'状态 0:匹配中 1:匹配成功'], ['!team_list', MatchTeam(), '队伍列表(客户端自行判断所属哪个队伍)'], ] + +class SpecJoin(object): + + def __init__(self): + self.fields = [ + ['team_uuid', '', '自定义房间、moba房间会修改玩家原始team_uuid，所以用这个新的team_uuid替换之前CMJoin里的team_uuid'], + ['payload', '', '透传数据'], + ] From 8fdf13c01442781572af3ca65f0afa551c64a2a0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 29 Dec 2023 17:31:24 +0800 Subject: [PATCH 36/43] 1 --- doc/Match.py | 1 - doc/_common.py | 1 + webapp/controller/BattleController.class.php | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/Match.py b/doc/Match.py index e2eaaa26..abcccf65 100644 --- a/doc/Match.py +++ b/doc/Match.py @@ -18,7 +18,6 @@ class Match(object): 'response': [ _common.RspHead(), ['info', _common.MatchInfo(), '匹配信息'], - ['join_msg', _common.SpecJoin(), '匹配成功后改字段才有意义，传给CMJoin里的参数(team_uuid、payload)'], ] }, { diff --git a/doc/_common.py b/doc/_common.py index 50ea0d68..559cca8a 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1568,6 +1568,7 @@ class MatchInfo(object): self.fields = [ ['state',0,'状态 0:匹配中 1:匹配成功'], ['!team_list', MatchTeam(), '队伍列表(客户端自行判断所属哪个队伍)'], + ['join_msg', SpecJoin(), '匹配成功后改字段才有意义，传给CMJoin里的参数(team_uuid、payload)'], ] class SpecJoin(object): diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index 5ff03abc..a994af72 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -348,6 +348,7 @@ class BattleController extends BaseAuthedController { $customData = json_decode($customData, true); } + error_log(json_encode($customData)); $zoneId = $customData['zone_id']; $nodeId = $customData['node_id']; $roomUuid = $customData['room_uuid']; From 4d64af598de76faca6f478d1d64f48cbf5fc3eaf Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 15:00:59 +0800 Subject: [PATCH 37/43] 1 --- webapp/controller/MatchController.class.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 79b3804a..db33611a 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -203,16 +203,37 @@ class MatchController extends BaseAuthedController { } error_log(json_encode($matchOkDb)); $matchInfo['state'] = 1; + $teamList = array(); { $teamDb = $this->readTeamDb($r, $teamUuid); array_push($matchInfo['team_list'], $teamDb); + $teamInfo = array( + 'team_uuid' => $teamDb['team_uuid'], + 'members' => array() + ); + foreach ($teamDb['member_list'] as $val) { + array_push($teamInfo['members'], array( + 'account_id' => $val['account_id'] + )); + } + array_push($teamList, $teamInfo); } { $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']); if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) { array_push($matchInfo['team_list'], $teamDb); + foreach ($teamDb['member_list'] as $val) { + array_push($teamInfo['members'], array( + 'account_id' => $val['account_id'] + )); + } + array_push($teamList, $teamInfo); } } + $matchInfo['join_msg'] = array( + 'team_uuid' => $teamUuid, + 'payload' => $teamList + ); } } From d9b3415e92aa684a7cd87c3e1031092e05cdd3ba Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 15:06:58 +0800 Subject: [PATCH 38/43] 1 --- webapp/controller/MatchController.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index db33611a..12951990 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -230,9 +230,11 @@ class MatchController extends BaseAuthedController { array_push($teamList, $teamInfo); } } + $payload = md5(json_encode($teamList) . '520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)') . + ":moba_room|" . json_encode($teamList); $matchInfo['join_msg'] = array( 'team_uuid' => $teamUuid, - 'payload' => $teamList + 'payload' => $payload ); } From 1b2ff4ff007be8b377430b57563de2ea554cee05 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 15:11:06 +0800 Subject: [PATCH 39/43] 1 --- webapp/controller/MatchController.class.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 12951990..64db3ccb 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -203,6 +203,13 @@ class MatchController extends BaseAuthedController { } error_log(json_encode($matchOkDb)); $matchInfo['state'] = 1; + $data = array( + 'zid' => '', + 'node_id' => '', + 'room_uuid' => '', + 'start_time' => myself()->_GetNowTime(), + 'team_list' => array() + ); $teamList = array(); { $teamDb = $this->readTeamDb($r, $teamUuid); @@ -217,6 +224,9 @@ class MatchController extends BaseAuthedController { )); } array_push($teamList, $teamInfo); + $data['zid'] = $teamDb['zid']; + $data['node_id'] = $teamDb['node_id']; + $data['room_uuid'] = $teamDb['team_uuid']; } { $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']); @@ -230,8 +240,9 @@ class MatchController extends BaseAuthedController { array_push($teamList, $teamInfo); } } - $payload = md5(json_encode($teamList) . '520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)') . - ":moba_room|" . json_encode($teamList); + $data['team_list'] = $teamList; + $payload = md5(json_encode($data) . '520d8eAbB(8cf1^#$^&!@d833a42c820432PDAFE^^)') . + ":moba_room|" . json_encode($data); $matchInfo['join_msg'] = array( 'team_uuid' => $teamUuid, 'payload' => $payload From 91b913fadd282bea34f557655f6398d5903e7320 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 15:14:02 +0800 Subject: [PATCH 40/43] 1 --- webapp/controller/MatchController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index 64db3ccb..e53053e3 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -207,7 +207,7 @@ class MatchController extends BaseAuthedController { 'zid' => '', 'node_id' => '', 'room_uuid' => '', - 'start_time' => myself()->_GetNowTime(), + 'start_time' => $matchOkDb['match_time'], 'team_list' => array() ); $teamList = array(); From f11e84c45e08344bc2f1e849d83ad54f018504a2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 15:19:02 +0800 Subject: [PATCH 41/43] 1 --- webapp/controller/MatchController.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index e53053e3..a7e84991 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -144,6 +144,10 @@ class MatchController extends BaseAuthedController { } else { foreach ($currMatchDb as $key => $val) { $tmpTeamDb = $this->readTeamDb($r, $key); + if ($tmpTeamDb['zid'] != $teamDb['zid'] || + $tmpTeamDb['node_id'] != $teamDb['node_id']) { + continue; + } if (!empty($tmpTeamDb) && $this->_getNowTime() - $val['match_time'] > 120) { array_push($delTeams, $key); } else { From 5dae9b1edd4c243354f0ec7b546fc14631ba06d5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 15:21:37 +0800 Subject: [PATCH 42/43] 1 --- webapp/controller/MatchController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index a7e84991..a449b075 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -145,7 +145,8 @@ class MatchController extends BaseAuthedController { foreach ($currMatchDb as $key => $val) { $tmpTeamDb = $this->readTeamDb($r, $key); if ($tmpTeamDb['zid'] != $teamDb['zid'] || - $tmpTeamDb['node_id'] != $teamDb['node_id']) { + $tmpTeamDb['node_id'] != $teamDb['node_id'] || + $tmpTeamDb['map_id'] != $teamDb['map_id']) { continue; } if (!empty($tmpTeamDb) && $this->_getNowTime() - $val['match_time'] > 120) { From cbadab33ede14dd35d70518937ca9567326e4b41 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 2 Jan 2024 16:37:08 +0800 Subject: [PATCH 43/43] 1 --- webapp/controller/MatchController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php index a449b075..2fc87da6 100644 --- a/webapp/controller/MatchController.class.php +++ b/webapp/controller/MatchController.class.php @@ -237,12 +237,19 @@ class MatchController extends BaseAuthedController { $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']); if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) { array_push($matchInfo['team_list'], $teamDb); + $teamInfo = array( + 'team_uuid' => $teamDb['team_uuid'], + 'members' => array() + ); foreach ($teamDb['member_list'] as $val) { array_push($teamInfo['members'], array( 'account_id' => $val['account_id'] )); } array_push($teamList, $teamInfo); + if (strcasecmp($teamDb['team_uuid'], $data['room_uuid']) < 0) { + $data['room_uuid'] = $teamDb['team_uuid']; + } } } $data['team_list'] = $teamList;