From b9cd2b292d30b20caca51112a6f0d40b5646503e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 7 Nov 2022 11:26:09 +0800
Subject: [PATCH] 1

---
 sql/gamedb.sql                                   | 4 +++-
 sql/marketdb.sql                                 | 4 ++--
 webapp/controller/BlockChainController.class.php | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index c32568dd..9a38c174 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -168,6 +168,7 @@ CREATE TABLE `t_hero` (
   `labour` 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`)
@@ -295,6 +296,7 @@ CREATE TABLE `t_gun` (
   `labour` 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`)
@@ -807,4 +809,4 @@ CREATE TABLE `t_nft_up_event` (
   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 */;
\ No newline at end of file
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/marketdb.sql b/sql/marketdb.sql
index b04ee694..a837e73a 100644
--- a/sql/marketdb.sql
+++ b/sql/marketdb.sql
@@ -508,7 +508,7 @@ DROP TABLE IF EXISTS `t_chip_plugin`;
 /*!40101 SET character_set_client  = utf8 */;
 CREATE TABLE `t_chip_plugin` (
   `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
-  `tokenid` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id',
+  `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id',
   `chip1` varchar(60) NOT NULL DEFAULT '' COMMENT 'chip1',
   `chip2` varchar(60) NOT NULL DEFAULT '' COMMENT 'chip2',
   `chip3` varchar(60) NOT NULL DEFAULT '' COMMENT 'chip3',
@@ -518,7 +518,7 @@ CREATE TABLE `t_chip_plugin` (
   `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
   `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
   PRIMARY KEY (`idx`),
-  UNIQUE KEY `tokenid` (`tokenid`),
+  UNIQUE KEY `token_id` (`token_id`),
   KEY `chip1` (`chip1`),
   KEY `chip2` (`chip2`),
   KEY `chip3` (`chip3`),
diff --git a/webapp/controller/BlockChainController.class.php b/webapp/controller/BlockChainController.class.php
index ad38e08c..b784738d 100644
--- a/webapp/controller/BlockChainController.class.php
+++ b/webapp/controller/BlockChainController.class.php
@@ -244,13 +244,13 @@ class BlockChainController extends BaseAuthedController {
                 'account_id' => myself()->_getAccountId(),
                 'session_id' => myself()->_getSessionId(),
                 'account' => myself()->_getOpenId(),
-                'token_id' => $tokenId,
-                'token_ids' => $tokenIds
+                'token_id' => $tokenId1,
+                'token_ids' => implode('|', $tokenIds)
             ),
             array(
                 'action' => Transaction::EVOLVE_CHIP_ACTION_TYPE,
                 'tokenId' => $tokenId1,
-                'itemType' => 0,
+                'tokenType' => 0,
                 'itemUniId' => $nftDb['chip_uniid'],
                 'itemId' => $nftDb['item_id']
             )