From 8fb2aa81a4b76746938d07c936593b5da3c8fa1c Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Tue, 28 Feb 2023 15:21:36 +0800
Subject: [PATCH] 1

---
 doc/_common.py         | 14 --------------
 webapp/models/Gun.php  |  4 ++--
 webapp/models/Hero.php |  4 ++--
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/doc/_common.py b/doc/_common.py
index 14d97927..a7c5bfe4 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -82,7 +82,6 @@ class Gun(object):
             ['gun_lv', 0, '枪等级'],
             ['quality', 0, '品阶'],
             ['durability', 0, '耐久'],
-            ['durability_max', 0, '最大耐久'],
             ['ceg_uplimit', 0, 'ceg今天获取上限'],
             ['!attr_base', [Attr()], '枪械基础属性'],
             ['!attr_pro', [Attr()], '枪械升级升阶加成属性'],
@@ -95,10 +94,6 @@ class Gun(object):
             ['current_pve_get_ceg', 0, '当前pve获取的ceg数量'],
             ['last_pvp_get_ceg_time', 0, '最后一次获取pvp获取ceg时间'],
             ['last_pve_get_ceg_time', 0, '最后一次获取pve获取ceg时间'],
-            ['chip_ids', '', '镶嵌的芯片主键id组'],
-
-            ['pvp_ceg_uplimit', 0, 'pvp获取的ceg的上限'],
-            ['pve_ceg_uplimit', 0, 'pve获取的ceg的上限'],
             ['offer_reward_state', 0, '是否悬赏中'],
             ['tags', '', '1：Gen状态'],
         ]
@@ -239,7 +234,6 @@ class Hero(object):
             ['hero_id', 0, '英雄id'],
             ['hero_lv', 0, '英雄等级'],
             ['hero_tili', 0, '英雄体力'],
-            ['hero_tili_max', 0, '英雄最大体力'],
             ['state', 0, '0：已购买 1：免费（GIFT标签）'],
             ['skin_id', 0, '英雄皮肤id'],
             ['quality', 0, '品阶'],
@@ -247,7 +241,6 @@ class Hero(object):
             ['skill_lv2', 0, '被动技能等级'],
             ['!attr_base', [Attr()], '英雄基础属性'],
             ['!attr_pro', [Attr()], '英雄升级升阶提升属性'],
-            ['!attr_skill', [Attr()], '英雄技能提升属性'],
             ['try_count', 0, '剩余体验次数 当state=1时才有意义'],
             ['lock_type', 0, '0:无锁 1:升级 2:升阶 3:派遣中'],
             ['unlock_lefttime', 0, '解锁剩余时间(单位秒)'],
@@ -258,13 +251,6 @@ class Hero(object):
             ['last_pve_get_ceg_time', 0, '最后一次获取pve获取ceg时间'],
             ['unlock_trade_time', 0, '出售解锁utc时间(升级或者升阶完成后触发),只锁交易，其他的操作仍可进行，和lock_type无关是独立的锁!!!'],
             ['advanced_count', 0, '进阶次数'],
-            ['lukcy', 0, '幸运'],
-            ['chip_ids', '', '镶嵌的芯片主键id组'],
-            ['skill_points', '', '技能点'],
-
-            ['!skill_common', [], '通用属性'],
-            ['pvp_ceg_uplimit', 0, 'pvp获取的ceg的上限'],
-            ['pve_ceg_uplimit', 0, 'pve获取的ceg的上限'],
             ['offer_reward_state', 0, '是否悬赏中'],
             ['tags', '', '1：Gen状态'],
 
diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index d77afb50..1fefab2b 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -271,7 +271,7 @@ class Gun extends BaseModel {
         if (myself()->_getDaySeconds($lastMissionGetCegTime) <  myself()->_getNowDaySeconds()) {
             $todayMissionGetCeg = 0;
         }
-        $gunLucky = \services\FormulaService::Weapon_Advanced_Lucky_Value($row['quality']);
+//        $gunLucky = \services\FormulaService::Weapon_Advanced_Lucky_Value($row['quality']);
         $dto = array(
             'idx' => $row['idx'],
             'token_id' => $row['token_id'],
@@ -280,7 +280,7 @@ class Gun extends BaseModel {
             'gun_lv' => $row['gun_lv'],
             'state' => $row['state'],
             'quality' => $row['quality'],
-            'lucky' => strval($gunLucky),
+//            'lucky' => strval($gunLucky),
             'durability' => $row['durability'],
             'ceg_uplimit' => 0,
             'pve_ceg_uplimit' => 0,
diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php
index dfc99aaf..f0b67a93 100644
--- a/webapp/models/Hero.php
+++ b/webapp/models/Hero.php
@@ -264,7 +264,7 @@ class Hero extends BaseModel {
             }
             $attrPro = self::mergeAttrPro($baseAttr,$attrPro1,$attrPro2);
         }
-        $heroLucky = \services\FormulaService::Hero_Advanced_Lucky_Value($row['quality']);
+//        $heroLucky = \services\FormulaService::Hero_Advanced_Lucky_Value($row['quality']);
         $dto = array(
             'idx' => $row['idx'],
             'token_id' => $row['token_id'],
@@ -293,7 +293,7 @@ class Hero extends BaseModel {
             'last_mission_get_ceg_time' => $lastMissionGetCegTime,
             'unlock_trade_time' => $row['unlock_trade_time'],
             'advanced_count' => $row['advanced_count'],
-            'lucky' => $heroLucky,
+//            'lucky' => $heroLucky,
             'offer_reward_state' => 0,
             'tags' => $row['tags'],
         );