From 946e626b41a84da0eb778e852e8c71b8eed6146d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 15:58:05 +0800 Subject: [PATCH 01/16] 1 --- sql/gamedb.sql | 38 +++++++++++++++++++++++++++- sql/gamedb2006_migrate_241001_01.sql | 19 ++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/sql/gamedb.sql b/sql/gamedb.sql index 9abb7230..f061f3a2 100644 --- a/sql/gamedb.sql +++ b/sql/gamedb.sql @@ -2194,7 +2194,7 @@ CREATE TABLE `t_rookie_task_value` ( ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; - +-- -- Table structure for table `t_hashrate_shop_buy_record` -- @@ -2219,3 +2219,39 @@ CREATE TABLE `t_hashrate_shop_buy_record` ( ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `t_lucky_symbol` +-- + +DROP TABLE IF EXISTS `t_lucky_symbol`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_lucky_symbol` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `in_use_num` 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_lucky_symbol_record` +-- + +DROP TABLE IF EXISTS `t_lucky_symbol_record`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_lucky_symbol_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `room_uuid` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'room_uuid', + `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 `uk_room_uuid_account_id` (`room_uuid`, `account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +/*!40101 SET character_set_client = @saved_cs_client */; + diff --git a/sql/gamedb2006_migrate_241001_01.sql b/sql/gamedb2006_migrate_241001_01.sql index 4b687bed..79109b9e 100644 --- a/sql/gamedb2006_migrate_241001_01.sql +++ b/sql/gamedb2006_migrate_241001_01.sql @@ -62,6 +62,25 @@ CREATE TABLE `t_hashrate_shop_buy_record` ( UNIQUE KEY `account_id_goods_id` (`account_id`, `goods_id`) ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +CREATE TABLE `t_lucky_symbol` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_id` varchar(60) NOT NULL DEFAULT '' COMMENT '账号id', + `in_use_num` 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; + +CREATE TABLE `t_lucky_symbol_record` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `room_uuid` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT 'room_uuid', + `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 `uk_room_uuid_account_id` (`room_uuid`, `account_id`) +) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; insert into version (version) values(2024092401); From 80afde40d057fae875f11ca6856c42f331825e6b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 16:03:49 +0800 Subject: [PATCH 02/16] 1 --- webapp/models/LuckySymbol.php | 33 +++++++++++++++++++++++++++++ webapp/models/LuckySymbolRecord.php | 33 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 webapp/models/LuckySymbol.php create mode 100644 webapp/models/LuckySymbolRecord.php diff --git a/webapp/models/LuckySymbol.php b/webapp/models/LuckySymbol.php new file mode 100644 index 00000000..785f8027 --- /dev/null +++ b/webapp/models/LuckySymbol.php @@ -0,0 +1,33 @@ +_getSelfMysql(), + 't_bag', + array( + 'account_id' => myself()->_getAccountId(), + 'item_id' => $itemId, + ) + ); + if ($row) { + $row['item_uniid'] = $row['idx']; + if ($row['account_id'] != myself()->_getAccountId()) { + if (!NftService::isEquipOwner(myself()->_getAddress(), $row['token_id'])) { + $row = null; + } + } + } + return $row; + } + +} diff --git a/webapp/models/LuckySymbolRecord.php b/webapp/models/LuckySymbolRecord.php new file mode 100644 index 00000000..9f76e298 --- /dev/null +++ b/webapp/models/LuckySymbolRecord.php @@ -0,0 +1,33 @@ +_getSelfMysql(), + 't_bag', + array( + 'account_id' => myself()->_getAccountId(), + 'item_id' => $itemId, + ) + ); + if ($row) { + $row['item_uniid'] = $row['idx']; + if ($row['account_id'] != myself()->_getAccountId()) { + if (!NftService::isEquipOwner(myself()->_getAddress(), $row['token_id'])) { + $row = null; + } + } + } + return $row; + } + +} From 83e2386341b273629bb0fb6b9ef22b98ba614e3c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 16:19:08 +0800 Subject: [PATCH 03/16] 1 --- webapp/models/LuckySymbol.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/webapp/models/LuckySymbol.php b/webapp/models/LuckySymbol.php index 785f8027..0fe4a6c8 100644 --- a/webapp/models/LuckySymbol.php +++ b/webapp/models/LuckySymbol.php @@ -9,25 +9,16 @@ use phpcommon\SqlHelper; class LuckySymbol extends BaseModel { - public static function find($itemId) + public static function hasLuckySymbol() { $row = SqlHelper::ormSelectOne( myself()->_getSelfMysql(), - 't_bag', + 't_lucky_symbol', array( 'account_id' => myself()->_getAccountId(), - 'item_id' => $itemId, ) ); - if ($row) { - $row['item_uniid'] = $row['idx']; - if ($row['account_id'] != myself()->_getAccountId()) { - if (!NftService::isEquipOwner(myself()->_getAddress(), $row['token_id'])) { - $row = null; - } - } - } - return $row; + return empty($row) ? false : $row['in_use_item'] > 0; } } From a7f9f5cedfbe3d8ef8d75efb7f6fa07c3e172a25 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 16:43:06 +0800 Subject: [PATCH 04/16] 1 --- webapp/models/LuckySymbol.php | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/webapp/models/LuckySymbol.php b/webapp/models/LuckySymbol.php index 0fe4a6c8..b5a228ec 100644 --- a/webapp/models/LuckySymbol.php +++ b/webapp/models/LuckySymbol.php @@ -21,4 +21,40 @@ class LuckySymbol extends BaseModel { return empty($row) ? false : $row['in_use_item'] > 0; } + public static function decLuckySymbol() + { + SqlHelper::update + (myself()->_getSelfMysql(), + 't_lucky_symbol', + array( + 'account_id' => myself()->_getAccountId(), + ), + array( + 'in_use_num' => 0, + 'modifytime' => myself()->_getNowTime(), + ) + ); + } + + public static function addLuckySymbol() + { + SqlHelper::upsert + (myself()->_getSelfMysql(), + 't_lucky_symbol', + array( + 'account_id' => myself()->_getAccountId(), + ), + array( + 'in_use_num' => function () { return "item_num + 1";}, + 'modifytime' => myself()->_getNowTime(), + ), + array( + 'account_id' => myself()->_getAccountId(), + 'in_use_num' => function () { return "1";}, + 'createtime' => myself()->_getNowTime(), + 'modifytime' => myself()->_getNowTime(), + ) + ); + } + } From 9c9fa008c5db1957a42decf8583535ddfadf6987 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 16:59:03 +0800 Subject: [PATCH 05/16] 1 --- webapp/models/LuckySymbol.php | 6 ++--- webapp/models/LuckySymbolRecord.php | 35 ++++++++++++++++++----------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/webapp/models/LuckySymbol.php b/webapp/models/LuckySymbol.php index b5a228ec..d4f16823 100644 --- a/webapp/models/LuckySymbol.php +++ b/webapp/models/LuckySymbol.php @@ -2,8 +2,6 @@ namespace models; -require_once('mt/Item.php'); - use mt; use phpcommon\SqlHelper; @@ -21,7 +19,7 @@ class LuckySymbol extends BaseModel { return empty($row) ? false : $row['in_use_item'] > 0; } - public static function decLuckySymbol() + public static function dec() { SqlHelper::update (myself()->_getSelfMysql(), @@ -36,7 +34,7 @@ class LuckySymbol extends BaseModel { ); } - public static function addLuckySymbol() + public static function add() { SqlHelper::upsert (myself()->_getSelfMysql(), diff --git a/webapp/models/LuckySymbolRecord.php b/webapp/models/LuckySymbolRecord.php index 9f76e298..868dc88f 100644 --- a/webapp/models/LuckySymbolRecord.php +++ b/webapp/models/LuckySymbolRecord.php @@ -2,32 +2,41 @@ namespace models; -require_once('mt/Item.php'); - use mt; use phpcommon\SqlHelper; class LuckySymbolRecord extends BaseModel { - public static function find($itemId) + public static function find($roomUuid) { $row = SqlHelper::ormSelectOne( myself()->_getSelfMysql(), - 't_bag', + 't_lucky_symbol_record', array( 'account_id' => myself()->_getAccountId(), - 'item_id' => $itemId, + 'room_uuid' => $roomUuid, ) ); - if ($row) { - $row['item_uniid'] = $row['idx']; - if ($row['account_id'] != myself()->_getAccountId()) { - if (!NftService::isEquipOwner(myself()->_getAddress(), $row['token_id'])) { - $row = null; - } - } - } return $row; } + public static function add($roomUuid) + { + SqlHelper::upsert + (myself()->_getSelfMysql(), + 't_lucky_symbol_record', + array( + 'account_id' => myself()->_getAccountId(), + ), + array( + ), + array( + 'account_id' => myself()->_getAccountId(), + 'room_uuid' => $roomUuid, + 'createtime' => myself()->_getNowTime(), + 'modifytime' => myself()->_getNowTime(), + ) + ); + } + } From 73246226adbdaa619b3c2f92dbf3ee65162d0c7f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 17:05:41 +0800 Subject: [PATCH 06/16] 1 --- webapp/models/LuckySymbolRecord.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/models/LuckySymbolRecord.php b/webapp/models/LuckySymbolRecord.php index 868dc88f..c81d7429 100644 --- a/webapp/models/LuckySymbolRecord.php +++ b/webapp/models/LuckySymbolRecord.php @@ -27,6 +27,7 @@ class LuckySymbolRecord extends BaseModel { 't_lucky_symbol_record', array( 'account_id' => myself()->_getAccountId(), + 'room_uuid' => $roomUuid, ), array( ), From 36617c1e4c878064f123340b8bdffcf17b7fff80 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 17:11:58 +0800 Subject: [PATCH 07/16] 1 --- webapp/controller/BagController.class.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php index f183eff4..a6be83d4 100644 --- a/webapp/controller/BagController.class.php +++ b/webapp/controller/BagController.class.php @@ -15,7 +15,7 @@ require_once('models/User.php'); require_once('models/RealtimeData.php'); require_once('models/ChipPage.php'); require_once('models/Chip.php'); - +require_once('models/LuckySymbol.php'); require_once('services/AwardService.php'); require_once('services/PropertyChgService.php'); @@ -31,6 +31,7 @@ use models\User; use models\RealtimeData; use models\ChipPage; use models\Chip; +use models\LuckySymbol; use services\LogService; class BagController extends BaseAuthedController { @@ -134,6 +135,11 @@ class BagController extends BaseAuthedController { $this->useSealDrug($itemDb, $itemMeta, $itemNum, $param1, $param2, $param3); } break; + case mt\Item::LUCKY_SYMBOL_SUBTYPE: + { + $this->useSymbol($itemDb, $itemMeta, $itemNum, $param1, $param2, $param3); + } + break; default: { $this->_rspErr(4, 'The prop function has not been realized yet'); @@ -880,4 +886,12 @@ class BagController extends BaseAuthedController { )); } + private function useSymbol($itemDb, $itemMeta, $itemNum, $param1, $param2, $param3) + { + if (LuckySymbol::hasLuckySymbol()) { + $this->_rspErr(201, "alreay use"); + return ; + } + } + } From a81757dbebe7b7f1fdffa835df076f0144ec46ca Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 17:13:11 +0800 Subject: [PATCH 08/16] 1 --- webapp/controller/BagController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php index a6be83d4..2a856d38 100644 --- a/webapp/controller/BagController.class.php +++ b/webapp/controller/BagController.class.php @@ -892,6 +892,8 @@ class BagController extends BaseAuthedController { $this->_rspErr(201, "alreay use"); return ; } + LuckySymbol::add(); + myself()->_rspOk(); } } From 432871a78bc99f5cc84992cf6530831253bce68c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 15 Oct 2024 17:14:54 +0800 Subject: [PATCH 09/16] 1 --- webapp/controller/UserController.class.php | 1 + webapp/models/LuckySymbol.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index 66792b60..81b67c61 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -377,6 +377,7 @@ class UserController extends BaseAuthedController { $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); + $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); } $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); if (!$heroDb) { diff --git a/webapp/models/LuckySymbol.php b/webapp/models/LuckySymbol.php index d4f16823..9005939f 100644 --- a/webapp/models/LuckySymbol.php +++ b/webapp/models/LuckySymbol.php @@ -16,7 +16,8 @@ class LuckySymbol extends BaseModel { 'account_id' => myself()->_getAccountId(), ) ); - return empty($row) ? false : $row['in_use_item'] > 0; + $has = empty($row) ? false : $row['in_use_item'] > 0; + return $has ? 1 : 0; } public static function dec() From 5d92c0d8d9aba417f29fc967db0a83b0e9910857 Mon Sep 17 00:00:00 2001 From: yangduo Date: Tue, 15 Oct 2024 17:55:07 +0800 Subject: [PATCH 10/16] fix --- webapp/services/StakingVipService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/services/StakingVipService.php b/webapp/services/StakingVipService.php index 56915cf2..68dbf11a 100644 --- a/webapp/services/StakingVipService.php +++ b/webapp/services/StakingVipService.php @@ -20,7 +20,7 @@ class StakingVipService extends BaseService myself()->_getMarketMysql(), 't_vip_user', array( - 'account_address' => $accountAddr, + 'account_address' => strtolower($accountAddr), ) ); From a7502c2950a527bcecc87ac4b222eb8a1fadb45b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 16 Oct 2024 10:46:37 +0800 Subject: [PATCH 11/16] 1 --- webapp/controller/UserController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index 81b67c61..a3796dc7 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -417,6 +417,7 @@ class UserController extends BaseAuthedController { $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); + $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); } $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); if (!$heroDb) { @@ -457,6 +458,7 @@ class UserController extends BaseAuthedController { $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); + $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); } $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId); if (!$heroDb) { From ebc1cb94f2cb719dd1c8bea010251c9e692e69c7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 16 Oct 2024 14:17:40 +0800 Subject: [PATCH 12/16] 1 --- webapp/models/LuckySymbol.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/models/LuckySymbol.php b/webapp/models/LuckySymbol.php index 9005939f..01cb3ef3 100644 --- a/webapp/models/LuckySymbol.php +++ b/webapp/models/LuckySymbol.php @@ -16,7 +16,7 @@ class LuckySymbol extends BaseModel { 'account_id' => myself()->_getAccountId(), ) ); - $has = empty($row) ? false : $row['in_use_item'] > 0; + $has = empty($row) ? false : $row['in_use_num'] > 0; return $has ? 1 : 0; } @@ -44,12 +44,12 @@ class LuckySymbol extends BaseModel { 'account_id' => myself()->_getAccountId(), ), array( - 'in_use_num' => function () { return "item_num + 1";}, + 'in_use_num' => function () { return "in_use_num + 1";}, 'modifytime' => myself()->_getNowTime(), ), array( 'account_id' => myself()->_getAccountId(), - 'in_use_num' => function () { return "1";}, + 'in_use_num' => 1, 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime(), ) From e44922ab6ab8d4b09c94835c75944fca8c0098b4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 16 Oct 2024 14:19:16 +0800 Subject: [PATCH 13/16] 1 --- webapp/controller/BagController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php index 2a856d38..775e1307 100644 --- a/webapp/controller/BagController.class.php +++ b/webapp/controller/BagController.class.php @@ -892,6 +892,12 @@ class BagController extends BaseAuthedController { $this->_rspErr(201, "alreay use"); return ; } + $this->_decItems(array( + array( + 'item_id' => $itemMeta['id'], + 'item_num' => 1 + ) + )); LuckySymbol::add(); myself()->_rspOk(); } From 988123248339d61c851050a5530504b9a404b277 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 16 Oct 2024 14:45:52 +0800 Subject: [PATCH 14/16] 1 --- webapp/controller/BattleController.class.php | 31 ++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index bcb0f006..dfed480d 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -986,11 +986,32 @@ class BattleController extends BaseAuthedController { { $data = array(); foreach ($member['battle_items'] as $item) { - $itemCount = Bag::getItemCount($item['item_id']); - array_push($data, array( - 'item_id' => $item['item_id'], - 'item_num' => $item['item_num'], - )); + $itemMeta = mt\Item::get($item['item_id']); + if ($itemMeta['type'] == mt\Item::FUNC_TYPE && + $itemMeta['sub_type'] == mt\Item::LUCKY_SYMBOL_SUBTYPE) { + $luckyRecord = myself()->_callModelStatic('LuckySymbolRecord', 'find', $roomUuid); + if (empty($luckyRecord)) { + if (myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol')) { + myself()->_callModelStatic('LuckySymbol', 'dec'); + myself()->_callModelStatic('LuckySymbolRecord', 'add', $roomUuid); + array_push($data, array( + 'item_id' => $item['item_id'], + 'item_num' => 1, + )); + } + } else { + array_push($data, array( + 'item_id' => $item['item_id'], + 'item_num' => 1, + )); + } + } else { + $itemCount = Bag::getItemCount($item['item_id']); + array_push($data, array( + 'item_id' => $item['item_id'], + 'item_num' => $item['item_num'], + )); + } } $info['items'] = $data; } From 3d9b4f3b1157092196079b4e7dfb8e0ec4f033f0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 16 Oct 2024 14:53:54 +0800 Subject: [PATCH 15/16] 1 --- webapp/controller/BagController.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php index 775e1307..7480600c 100644 --- a/webapp/controller/BagController.class.php +++ b/webapp/controller/BagController.class.php @@ -899,7 +899,10 @@ class BagController extends BaseAuthedController { ) )); LuckySymbol::add(); - myself()->_rspOk(); + $this->_rspData(array( + 'award' => $this->awardService->toDto(), + 'property_chg' => $this->propertyChgService->toDto(), + )); } } From f3f373242b767681300ce64b91e4175ea57d264b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 16 Oct 2024 15:04:46 +0800 Subject: [PATCH 16/16] 1 --- webapp/controller/BagController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php index 7480600c..e645d511 100644 --- a/webapp/controller/BagController.class.php +++ b/webapp/controller/BagController.class.php @@ -899,6 +899,7 @@ class BagController extends BaseAuthedController { ) )); LuckySymbol::add(); + $this->propertyChgService->addBagChg(); $this->_rspData(array( 'award' => $this->awardService->toDto(), 'property_chg' => $this->propertyChgService->toDto(),