From 357b3e1c8c1ccf864c88bb534148cd5f3f9704b9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 26 Apr 2024 16:32:19 +0800
Subject: [PATCH 01/19] 1

---
 sql/migrate/bcnftdb.sql                      | 1 -
 sql/migrate/gamedb.sql                       | 1 -
 sql/migrate/gamedb2006_migrate_240129_01.sql | 1 -
 3 files changed, 3 deletions(-)
 delete mode 120000 sql/migrate/bcnftdb.sql
 delete mode 120000 sql/migrate/gamedb.sql
 delete mode 120000 sql/migrate/gamedb2006_migrate_240129_01.sql

diff --git a/sql/migrate/bcnftdb.sql b/sql/migrate/bcnftdb.sql
deleted file mode 120000
index 82e907ca..00000000
--- a/sql/migrate/bcnftdb.sql
+++ /dev/null
@@ -1 +0,0 @@
-../bcnftdb.sql
\ No newline at end of file
diff --git a/sql/migrate/gamedb.sql b/sql/migrate/gamedb.sql
deleted file mode 120000
index e3faeb33..00000000
--- a/sql/migrate/gamedb.sql
+++ /dev/null
@@ -1 +0,0 @@
-../gamedb.sql
\ No newline at end of file
diff --git a/sql/migrate/gamedb2006_migrate_240129_01.sql b/sql/migrate/gamedb2006_migrate_240129_01.sql
deleted file mode 120000
index e27ab0d2..00000000
--- a/sql/migrate/gamedb2006_migrate_240129_01.sql
+++ /dev/null
@@ -1 +0,0 @@
-../gamedb2006_migrate_240129_01.sql
\ No newline at end of file

From a917702284fe6f237e9eb211487838104e490738 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 17 May 2024 10:37:35 +0800
Subject: [PATCH 02/19] 1

---
 webapp/models/DynData.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php
index 6284f532..4ffbf986 100644
--- a/webapp/models/DynData.php
+++ b/webapp/models/DynData.php
@@ -237,6 +237,7 @@ class DynData extends BaseModel {
 
     private static function internalGetV($x, $y, $defVal = 0)
     {
+        self::checkLastUser();
         $key = self::calcKey($x, $y);
         if (!is_null(self::$dynData)) {
             if (isset(self::$dynData[$key])) {
@@ -270,6 +271,18 @@ class DynData extends BaseModel {
         }
     }
 
+    private static function checkLastUser()
+    {
+        if (!empty(self::$lastAccountId)) {
+            if (self::$lastAccountId != myself()->_getAccountId()) {
+                self::$lastAccountId = myself()->_getAccountId();
+                self::$dynData = null;
+                self::$hitCount = 0;
+            }
+        }
+    }
+
+    private static $lastAccountId = '';
     private static $dynData = null;
     private static $hitCount = 0;
 

From bb222476b1084645521b48ca8202b29d4a037498 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 17 May 2024 12:34:06 +0800
Subject: [PATCH 03/19] 1

---
 webapp/models/DynData.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php
index 4ffbf986..ae8db556 100644
--- a/webapp/models/DynData.php
+++ b/webapp/models/DynData.php
@@ -10,6 +10,7 @@ class DynData extends BaseModel {
     public static function preload()
     {
         if (is_null(self::$dynData)) {
+            self::$lastAccountId = myself()->_getAccountId();
             self::$dynData = array();
             $rows = SqlHelper::ormSelect(
                 myself()->_getSelfMysql(),

From 6308dd69a024b0c2155e862c77cd1f06107a7caf Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Wed, 22 May 2024 14:46:08 +0800
Subject: [PATCH 04/19] 1

---
 webapp/services/RoomBattleDataService.php | 12 ++++++++----
 webapp/services/TameBattleDataService.php |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 482b739e..dd7d8a55 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -113,10 +113,14 @@ class RoomBattleDataService extends BaseService {
                         $member['new_elo'] = $newElo;
                     }
 
-
-                    $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);
-                    myself()->_addItems($member['reward'], $awardService,$propertyChgService);
-
+                    if ($this->mapMode == mt\MapMode::GOLD_MODE &&
+                        ($member['move_distance'] <= 2000 || $member['damage_out'] <= 500) ){
+                        error_log("金币模式:消极战斗");
+                    }else{
+                        $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);
+                        myself()->_addItems($member['reward'], $awardService,$propertyChgService);
+                    }
+                
                     $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']);
                     if ($battleSingleDb){
                         $battleSingleData = emptyReplace(json_decode($battleSingleDb['data'], true), array());
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index c726aef4..5ed0c8ad 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -691,6 +691,8 @@ class TameBattleDataService extends BaseService {
                 'dead'=> getXVal($info,'dead', 0),
                 'skin_id'=> getXVal($info,'skin_id', 0),
                 'is_mvp'=> getXVal($info,'is_mvp', 0),
+                'damage_out'=> getXVal($info,'damage_out', 0),
+                'move_distance'=> getXVal($info,'move_distance', 0),
                 'old_rank'=> $oldRank,
                 'new_rank'=> $newRank,
                 'old_score'=> $oldScore,

From 8a5ee488b09f99ffc71289e3f2eb31be71f958dd Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Wed, 22 May 2024 15:08:32 +0800
Subject: [PATCH 05/19] 1

---
 webapp/services/RoomBattleDataService.php | 2 +-
 webapp/services/TameBattleDataService.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index dd7d8a55..81f4cd63 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -120,7 +120,7 @@ class RoomBattleDataService extends BaseService {
                         $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);
                         myself()->_addItems($member['reward'], $awardService,$propertyChgService);
                     }
-                
+
                     $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']);
                     if ($battleSingleDb){
                         $battleSingleData = emptyReplace(json_decode($battleSingleDb['data'], true), array());
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index 5ed0c8ad..2ca06aec 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -561,6 +561,8 @@ class TameBattleDataService extends BaseService {
             'dead'=> getXVal($this->battleInfo,'dead', 0),
             'skin_id'=> getXVal($this->battleInfo,'skin_id', 0),
             'is_mvp'=> getXVal($this->battleInfo,'is_mvp', 0),
+            'damage_out'=> getXVal($this->battleInfo,'damage_out', 0),
+            'move_distance'=> getXVal($this->battleInfo,'move_distance', 0),
             'old_rank'=> $oldRank,
             'new_rank'=> $newRank,
             'old_score'=> $oldScore,

From 08b6c9fd6a488c4694fe575ec0d7e10017852009 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Wed, 22 May 2024 17:54:08 +0800
Subject: [PATCH 06/19] 1

---
 webapp/services/RoomBattleDataService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 81f4cd63..8adbcbb7 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -114,7 +114,7 @@ class RoomBattleDataService extends BaseService {
                     }
 
                     if ($this->mapMode == mt\MapMode::GOLD_MODE &&
-                        ($member['move_distance'] <= 2000 || $member['damage_out'] <= 500) ){
+                        ($member['move_distance'] <= 4000 || $member['damage_out'] <= 500) ){
                         error_log("金币模式:消极战斗");
                     }else{
                         $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);

From c2949f17fc6c91d73804c46bb55e146e08a3fbb1 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Thu, 23 May 2024 14:22:00 +0800
Subject: [PATCH 07/19] 1

---
 webapp/services/RoomBattleDataService.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 8adbcbb7..80f8717c 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -113,8 +113,7 @@ class RoomBattleDataService extends BaseService {
                         $member['new_elo'] = $newElo;
                     }
 
-                    if ($this->mapMode == mt\MapMode::GOLD_MODE &&
-                        ($member['move_distance'] <= 4000 || $member['damage_out'] <= 500) ){
+                    if ($this->mapMode == mt\MapMode::GOLD_MODE && $member['move_distance'] <= 2000 ){
                         error_log("金币模式:消极战斗");
                     }else{
                         $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);

From 80c721948454d861c4f6b56d0fd568cb116b6811 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 28 Jun 2024 16:06:17 +0800
Subject: [PATCH 08/19] 1

---
 sql/bcnftdb.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/bcnftdb.sql b/sql/bcnftdb.sql
index 53574e5f..16658e54 100644
--- a/sql/bcnftdb.sql
+++ b/sql/bcnftdb.sql
@@ -155,6 +155,7 @@ CREATE TABLE `t_order` (
   `status` varchar(60) NOT NULL DEFAULT '' COMMENT 'status',
   `net_id` bigint NOT NULL DEFAULT '0' COMMENT 'net_id',
   `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id',
+  `seller_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'seller_address',
   `contract_address` varchar(60) NOT NULL DEFAULT '' COMMENT 'contract_address',
   `item_id` int(11) NOT NULL DEFAULT '0' COMMENT 'item_id',
   `hero_quality` int(11) NOT NULL DEFAULT '0' COMMENT 'hero_quality',
@@ -183,6 +184,7 @@ CREATE TABLE `t_order` (
   KEY `idx_event_id` (`event_id`),
   KEY `idx_contract_address` (`contract_address`),
   KEY `idx_token_id` (`token_id`),
+  KEY `idx_seller_address` (`seller_address`),
   KEY `idx_order_id` (`order_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;

From 56aec1305ed1bcb63fdc445f68e4330a23c7262b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 28 Jun 2024 16:45:44 +0800
Subject: [PATCH 09/19] 1

---
 sql/gamedb.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index af580ab7..c779dc29 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -1777,7 +1777,7 @@ CREATE TABLE `t_gold_bullion` (
   UNIQUE KEY `idx_token_id` (`token_id`),
   UNIQUE KEY `idx_token_id_net_id` (`token_id`, `net_id`),
   KEY `idx_address` (`address`),
-  KEY `idx_address_createtime_activate_status` (`address`, `createtime`, `activate`, `status`)
+  KEY `idx_address_createtime_activate_status` (`address`, `createtime`, `activated`, `status`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

From 023357fe265991e9697a609d0c3c40f061919055 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 28 Jun 2024 16:53:46 +0800
Subject: [PATCH 10/19] 1

---
 sql/gamedb.sql | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index c779dc29..c1f8d8bc 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -1755,36 +1755,6 @@ CREATE TABLE `t_sub_user_bind` (
 -- Table structure for table `t_gold_bullion`
 --
 
-DROP TABLE IF EXISTS `t_gold_bullion`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `t_gold_bullion` (
-  `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
-  `src_account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id(channel + "_" + gameid + "_" + openid)',
-  `src_address` varchar(60) COMMENT 'src_address',
-  `token_id` varchar(60) NOT NULL DEFAULT '' COMMENT 'token_id',
-  `net_id` int(11) NOT NULL DEFAULT '0' COMMENT '链id',
-  `gold` bigint NOT NULL DEFAULT '0' COMMENT '金币',
-  `address` varchar(60) COMMENT 'address',
-  `status` int(11) NOT NULL DEFAULT '0' COMMENT '状态 0:初始 1:已打开',
-  `returned` int(11) NOT NULL DEFAULT '0' COMMENT '是否已超时返还',
-  `return_time` int(11) NOT NULL DEFAULT '0' COMMENT '返还时间',
-  `activated` int(11) NOT NULL DEFAULT '0' COMMENT '是否已上连',
-  `activate_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 `idx_token_id` (`token_id`),
-  UNIQUE KEY `idx_token_id_net_id` (`token_id`, `net_id`),
-  KEY `idx_address` (`address`),
-  KEY `idx_address_createtime_activate_status` (`address`, `createtime`, `activated`, `status`)
-) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `t_gold_bullion`
---
-
 DROP TABLE IF EXISTS `t_gold_bullion`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;

From 69be97220ba7b3504b14c9864e2587f03ce82be1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 28 Jun 2024 20:44:12 +0800
Subject: [PATCH 11/19] 1

---
 webapp/controller/OutAppNftController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php
index b876dadd..d46b6c9a 100644
--- a/webapp/controller/OutAppNftController.class.php
+++ b/webapp/controller/OutAppNftController.class.php
@@ -166,9 +166,9 @@ class OutAppNftController extends BaseController {
         break;
         case Nft::GOLD_BULLION_TYPE:
         {
-            $NftMeta = \mt\NftDesc::getByItemId($nftDb['item_id']);
-            //$info['name'] = $heroMeta['name'];
-            $info['description'] = $NftMeta['desc'];
+            $nftMeta = \mt\NftDesc::getByItemId($nftDb['item_id']);
+            $info['name'] = $nftMeta['name'];
+            $info['description'] = $nftMeta['desc'];
             $info['image'] = "https://res2.counterfire.games/nft/meta/".$nftDb['item_id'].".png";
             if ($this->isCloseBox()) {
                 $this->fillBoxMeta($info);

From b3e09a8b1487256db36203e241c8d623f4b79890 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 28 Jun 2024 20:48:53 +0800
Subject: [PATCH 12/19] 1

---
 webapp/controller/OutAppNftController.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php
index d46b6c9a..6935ace1 100644
--- a/webapp/controller/OutAppNftController.class.php
+++ b/webapp/controller/OutAppNftController.class.php
@@ -293,13 +293,13 @@ class OutAppNftController extends BaseController {
         break;
         case Nft::GOLD_BULLION_TYPE:
         {
-            $itemMeta = \mt\Item::get($nftDb['item_id']);
-            if ($itemMeta) {
+            $nftMeta = \mt\NftDesc::getByItemId($nftDb['item_id']);
+            if ($nftMeta) {
                 $info['meta_url'] = NFT_META_URL . '/gold_bullion/meta/' . $nftDb['net_id'] . '/' . $nftDb['token_id'];
-                $info['name'] = $itemMeta['name'];
-                $info['item_id'] = $itemMeta['id'];
+                $info['name'] = $nftMeta['name'];
+                $info['item_id'] = $nftMeta['item_id'];
                 $info['type'] = $nftDb['token_type'];
-                $info['image'] = 'https://res2.counterfire.games/nft/meta/' . $itemMeta['id'] . '.png';
+                $info['image'] = 'https://res2.counterfire.games/nft/meta/' . $nftMeta['item_id'] . '.png';
                 $info['detail']['gold_coins'] = $this->getGoldBullionGoldNum($nftDb['item_id']);
             }
             if ($this->isCloseBox()) {

From 7e8b5a2276a7b8d2a6cd069dfae33e798c5d4fb5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 29 Jun 2024 15:44:33 +0800
Subject: [PATCH 13/19] 1

---
 .../controller/OutAppNftController.class.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php
index 6935ace1..c8b4278d 100644
--- a/webapp/controller/OutAppNftController.class.php
+++ b/webapp/controller/OutAppNftController.class.php
@@ -233,6 +233,7 @@ class OutAppNftController extends BaseController {
 
     private function internalNftDetail($netId, &$nftDb, &$info)
     {
+        $onSale = $this->nftIsOnSale($nftDb['net_id'], $nftDb['contract_address'], $nftDb['token_id']);
         $info = array(
             'net_id' => $netId,
             'contract_address' => '',
@@ -243,6 +244,7 @@ class OutAppNftController extends BaseController {
             'item_id' => 0,
             'type' => 0,
             'image' => '',
+            'on_sale' => $onSale,
             'detail' => array()
         );
         if (!empty($nftDb)) {
@@ -361,8 +363,24 @@ class OutAppNftController extends BaseController {
             'item_id' => 0,
             'type' => $info['type'],
             'image' => "https://res2.counterfire.games/nft/box/Gen2_raw.gif",
+            'on_sale' => $info['on_sale'],
             'detail' => array()
         );
     }
 
+    private function nftIsOnSale($netId, $contractAddress, $tokenId)
+    {
+        $row = SqlHelper::ormSelectOne(
+            myself()->_getMarketMysql(),
+            't_order',
+            array(
+                'net_id' => $netId,
+                'contract_address' => $contractAddress,
+                'token_id' => $tokenId,
+                'status' => 'ACTIVE',
+            )
+        );
+        return $row ? 1 : 0;
+    }
+
 }

From 91bfa101b06bdc8c6a4abfbfa85873706e6d4d6c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 29 Jun 2024 16:24:31 +0800
Subject: [PATCH 14/19] 1

---
 doc/AAMarket.py | 1 +
 doc/_common.py  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/AAMarket.py b/doc/AAMarket.py
index 1c140b57..a1d52261 100644
--- a/doc/AAMarket.py
+++ b/doc/AAMarket.py
@@ -102,6 +102,7 @@ class AAMarket(object):
                     ['type', '', '0:全部 1:买进 2：卖出'],
                     ['page_size', 0, '每页大小'],
                     ['cursor', '', '游标 第一页传空'],
+                    ['search_name', '', 'nft名字 空(所有)'],
                 ],
                 'response': [
                     _common.RspHead(),
diff --git a/doc/_common.py b/doc/_common.py
index 69377d02..b9fe7529 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -1759,6 +1759,7 @@ class NftInfo(object):
             ['item_id', 0, '道具id'],
             ['type', '', 'nft类型 1:英雄 11:金砖'],
             ['image', '', 'nft图片地址'],
+            ['on_sale', 0, '是否出售中'],
             ['detail', Union([
                 [NftHeroDetailNew(), '英雄'],
                 [NftGoldBullionDetail(), '英雄'],

From ab3edae859c63509280eaa460cf09a24f40deaaa Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 29 Jun 2024 16:33:25 +0800
Subject: [PATCH 15/19] 1

---
 sql/bcnftdb.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/bcnftdb.sql b/sql/bcnftdb.sql
index 16658e54..eca0939a 100644
--- a/sql/bcnftdb.sql
+++ b/sql/bcnftdb.sql
@@ -50,6 +50,7 @@ CREATE TABLE `t_nft` (
   KEY `idx_net_id_token_type_owner_address_last_owner_address` (`net_id`, `token_type`, `owner_address`, `last_owner_address`),
   KEY `idx_net_id_token_type_token_id` (`net_id`, `token_type`, `token_id`),
   KEY `idx_last_owner_address` (`last_owner_address`),
+  KEY `idx_item_id` (`item_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 */;
@@ -216,6 +217,7 @@ CREATE TABLE `t_sale` (
   PRIMARY KEY (`idx`),
   UNIQUE KEY `idx_order_id` (`order_id`),
   KEY `idx_buyer` (`buyer`),
+  KEY `idx_item_id` (`item_id`),
   KEY `idx_seller` (`seller`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;

From 45755a37dc2c0c3780b124369be67127126e31e1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 29 Jun 2024 19:35:35 +0800
Subject: [PATCH 16/19] 1

---
 webapp/controller/OutAppNftController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php
index c8b4278d..b2e4f828 100644
--- a/webapp/controller/OutAppNftController.class.php
+++ b/webapp/controller/OutAppNftController.class.php
@@ -345,8 +345,8 @@ class OutAppNftController extends BaseController {
 
     private function fillBoxMeta(&$info)
     {
-        $info['name'] = 'box';
-        $info['description'] = 'box';
+        $info['name'] = 'Genesis Hero';
+        $info['description'] = 'Genesis Hero';
         $info['image'] = "https://res2.counterfire.games/nft/box/Gen2_raw.gif";
         $info['attributes'] = array();
     }
@@ -359,7 +359,7 @@ class OutAppNftController extends BaseController {
             'token_id' => $info['token_id'],
             'owner_address' => $info['owner_address'],
             'meta_url' => $info['meta_url'],
-            'name' => 'box',
+            'name' => 'Genesis Hero',
             'item_id' => 0,
             'type' => $info['type'],
             'image' => "https://res2.counterfire.games/nft/box/Gen2_raw.gif",

From 6a2617d413854fbee9b1a3a58c8abfc93a057555 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 1 Jul 2024 13:58:05 +0800
Subject: [PATCH 17/19] 1

---
 webapp/controller/OutAppNftController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/controller/OutAppNftController.class.php b/webapp/controller/OutAppNftController.class.php
index b2e4f828..2fba8c41 100644
--- a/webapp/controller/OutAppNftController.class.php
+++ b/webapp/controller/OutAppNftController.class.php
@@ -334,7 +334,7 @@ class OutAppNftController extends BaseController {
 
     private function isCloseBox()
     {
-        $openTime = 1719828000;
+        $openTime = 1719828000 + 3600 * 24;
         if (myself()->_getNowTime() < $openTime) {
             if (SERVER_ENV == _ONLINE) {
                 return true;

From a3cabb2a7961e8914da7f1e1ecc96517fd5f46b9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 1 Jul 2024 14:16:48 +0800
Subject: [PATCH 18/19] 1

---
 .../controller/BaseAuthedController.class.php | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php
index 526a27d0..7b3b8d44 100644
--- a/webapp/controller/BaseAuthedController.class.php
+++ b/webapp/controller/BaseAuthedController.class.php
@@ -90,11 +90,22 @@ class BaseAuthedController extends BaseController {
         $this->accountId = getReqVal('account_id', '');
         $this->sessionId = getReqVal('session_id', '');
         if (SERVER_ENV != _DEBUG) {
-        if (!phpcommon\isValidSessionId($this->accountId,
-                                        $this->sessionId)) {
-            phpcommon\sendError(500, 'invalid session_id');
-            die();
-        }
+            if (SERVER_ENV == _TEST) {
+                if ($this->sessionId == "CzRXrGHxwQZJNCeXkTRA") {
+                } else {
+                    if (!phpcommon\isValidSessionId($this->accountId,
+                                                    $this->sessionId)) {
+                        phpcommon\sendError(500, 'invalid session_id');
+                        die();
+                    }
+                }
+            } else {
+                if (!phpcommon\isValidSessionId($this->accountId,
+                                                $this->sessionId)) {
+                    phpcommon\sendError(500, 'invalid session_id');
+                    die();
+                }
+            }
         }
         if (!(myself()->_getChannel() == IMTBL_CHANNEL ||
               myself()->_getChannel() == GUEST_CHANNEL)) {

From 306e067c9e3ba35ed9cae883675329ddcd22402e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 1 Jul 2024 15:15:24 +0800
Subject: [PATCH 19/19] 1

---
 sql/{ => archived}/gamedb2006_migrate_240521_01.sql | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/{ => archived}/gamedb2006_migrate_240521_01.sql (100%)

diff --git a/sql/gamedb2006_migrate_240521_01.sql b/sql/archived/gamedb2006_migrate_240521_01.sql
similarity index 100%
rename from sql/gamedb2006_migrate_240521_01.sql
rename to sql/archived/gamedb2006_migrate_240521_01.sql