From 4b8deb4a83058367d0213c7c33243d269448d46a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 4 Sep 2024 11:50:07 +0800 Subject: [PATCH 1/5] 1 --- webapp/models/Hero.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index c8af5564..5b3d4ac7 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -461,7 +461,7 @@ class Hero extends BaseModel { } public static function abilityInfoAddition($baseAbility, $row){ - $attr = array(); + $attr = emptyReplace(json_decode($row['rand_attr'], true), array()); $chipPageDb = ChipPage::find($row['idx']); if ($row['quality'] > 1 && $chipPageDb) { $data = emptyReplace(json_decode($chipPageDb['data'], true), array()); @@ -469,6 +469,8 @@ class Hero extends BaseModel { $chipDb = Chip::find($value['chip_id']); if (!empty($chipDb)) { self::mergeAttr($attr, emptyReplace(json_decode($chipDb['rand_attr'], true), array())); + } else { + } } } @@ -551,7 +553,7 @@ class Hero extends BaseModel { { $pAttackAm = 0; $pAttackAm_Add = mt\AttrHelper::getAttrVal($attr, kHAT_pAttackAm, 0); - $pAttackAm += $pAttackAm; + $pAttackAm += $pAttackAm_Add; $pAttackRateSe = 0; $pAttackRateSe_Add = mt\AttrHelper::getAttrVal($attr, kHAT_pAttackRateSe, 0); @@ -640,7 +642,8 @@ class Hero extends BaseModel { } public static function abilityInfo($row){ - return self::calcAbility($row['hero_id'], array()); + $attr = emptyReplace(json_decode($row['rand_attr'], true), array()); + return self::calcAbility($row['hero_id'], $attr); } public static function addFreeHero($heroMeta) From f866c5b91b7dabaa3baaef050dd70f0100a61a9f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Sep 2024 10:49:23 +0800 Subject: [PATCH 2/5] 1 --- doc/AAMarket.py | 31 +++++++++++++++++++++++++++++++ doc/_common.py | 10 +++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/doc/AAMarket.py b/doc/AAMarket.py index 9733bb87..cd5ae833 100644 --- a/doc/AAMarket.py +++ b/doc/AAMarket.py @@ -533,6 +533,37 @@ class AAMarket(object): ['!rows', [_common.RechargeHistory()], '数据'], ] }, + { + 'method': 'POST', + 'name': '/api/vip/bind', + 'desc': '充值-历史', + 'group': '!AAMarket', + 'url': 'https://market-test.kingsome.cn/api/vip/bind', + 'is_json_params': True, + 'headers': _common.JcJwtHeader, + 'request_params': [ + ], + 'params': [ + ['passport_jwt', 0, 'passport_jwt'], + ], + 'response': [ + _common.RspHead(), + ] + }, + { + 'method': 'GET', + 'name': '/api/vip/info', + 'desc': '充值-历史', + 'group': '!AAMarket', + 'url': 'https://market-test.kingsome.cn/api/vip/info', + 'headers': _common.JcJwtHeader, + 'params': [ + ], + 'response': [ + _common.RspHead(), + ['info', _common.VipInfo(), 'vip信息'], + ] + }, { 'method': 'GET', 'name': '/api/server_switch', diff --git a/doc/_common.py b/doc/_common.py index 6afe1f88..921753a2 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -32,7 +32,7 @@ PassportJwtHeader = [ ] JcJwtHeader = [ - 'Authorization Bearer {JwtToken} 洪亮 jwt' + 'Authorization Bearer {JwtToken} 洪亮 jwt(小狐狸)' ] MaybeJwtHeader = [ @@ -1916,3 +1916,11 @@ class CecContributionActivity(object): ['total_cec_pool', 0, 'cec总奖池'], ['my_expected_cec', 0, '我预计可得cec'], ] + + +class VipInfo(object): + + def __init__(self): + self.fields = [ + ['bind_passport_address', 0, '绑定的passport地址'], + ] From 0c2db2c1cefcbae7c97eb75abad6a5521f69efa6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Sep 2024 10:53:35 +0800 Subject: [PATCH 3/5] 1 --- sql/bcnftdb.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sql/bcnftdb.sql b/sql/bcnftdb.sql index 497756f2..1cb11f8f 100644 --- a/sql/bcnftdb.sql +++ b/sql/bcnftdb.sql @@ -406,4 +406,23 @@ CREATE TABLE `t_staking_cec` ( ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `t_vip_bind` +-- + +DROP TABLE IF EXISTS `t_vip_bind`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_vip_bind` ( + `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', + `account_address` varchar(60) NOT NULL DEFAULT '' COMMENT '钱包地址(小狐狸)', + `passport_address` varchar(60) NOT NULL DEFAULT '' COMMENT '钱包地址(passport)', + `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', + PRIMARY KEY (`idx`), + UNIQUE KEY `uk_account_addresss` (`account_address`), + UNIQUE KEY `uk_passport_addresss` (`passport_address`) +) 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 From ba867c769740a9155d0cd12b0d56201867fdef7c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Sep 2024 13:45:30 +0800 Subject: [PATCH 4/5] 1 --- webapp/models/ChipPage.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/models/ChipPage.php b/webapp/models/ChipPage.php index 0ddfb32b..bc07bbc9 100644 --- a/webapp/models/ChipPage.php +++ b/webapp/models/ChipPage.php @@ -139,12 +139,16 @@ class ChipPage extends BaseModel } } $item = []; + $i = 0; foreach ($attrs as $k=>$v){ + $item['attr_' . $i] = $v; + ++$i; + /* if (!isset($item[$v['attr_id']])){ $item[$v['attr_id']] = $v; }else{ $item[$v['attr_id']]['val']+= $v['val']; - } + }*/ } return $item; } @@ -204,4 +208,4 @@ class ChipPage extends BaseModel ); } -} \ No newline at end of file +} From aff6cb7f2c79ad68024df25d9773b333f5f2efe3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 12 Sep 2024 16:59:28 +0800 Subject: [PATCH 5/5] 1 --- doc/_common.py | 1 + sql/bcnftdb.sql | 2 ++ 2 files changed, 3 insertions(+) diff --git a/doc/_common.py b/doc/_common.py index 921753a2..9085bfc8 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1923,4 +1923,5 @@ class VipInfo(object): def __init__(self): self.fields = [ ['bind_passport_address', 0, '绑定的passport地址'], + ['bind_email', 0, '绑定的email地址'], ] diff --git a/sql/bcnftdb.sql b/sql/bcnftdb.sql index 1cb11f8f..cfbb3764 100644 --- a/sql/bcnftdb.sql +++ b/sql/bcnftdb.sql @@ -417,6 +417,8 @@ CREATE TABLE `t_vip_bind` ( `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id', `account_address` varchar(60) NOT NULL DEFAULT '' COMMENT '钱包地址(小狐狸)', `passport_address` varchar(60) NOT NULL DEFAULT '' COMMENT '钱包地址(passport)', + `email` varchar(80) COMMENT 'email', + `lower_case_email` varchar(80) COMMENT 'lower_case_email', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`),