战力bug修复

Gameserver/App/model/Const/GameConfig.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-03-17 17:53:19
+ // 日期: 2025-03-21 10:15:38
 ////////////////////
 
 /**

Gameserver/App/model/Const/sm_hero.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-02-19 17:42:21
+ // 日期: 2025-03-20 15:38:17
 ////////////////////
 
 

Gameserver/App/model/Const/sm_heroType_typeId.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-02-19 17:42:21
+ // 日期: 2025-03-20 15:38:17
 ////////////////////
 
 

Gameserver/App/model/Const/sm_item.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-02-25 09:18:05
+ // 日期: 2025-03-20 15:09:41
 ////////////////////
 
 

Gameserver/App/model/Const/sm_pet.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-03-14 15:22:01
+ // 日期: 2025-03-20 15:09:41
 ////////////////////
 
 

Gameserver/App/model/Const/sm_predicate.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-03-11 11:30:10
+ // 日期: 2025-03-20 16:37:08
 ////////////////////
 
 

Gameserver/App/model/Const/sm_skills.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-02-20 16:56:39
+ // 日期: 2025-03-20 18:03:28
 ////////////////////
 
 

Gameserver/App/model/Const/sm_waveItem.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-03-17 17:39:47
+ // 日期: 2025-03-20 14:24:26
 ////////////////////
 
 

Gameserver/App/model/Const/sm_waves.php

@@ -3,7 +3,7 @@
  // 由CodeGenerator创建。
  // Copyright (C) gwang (wanggangzero@qq.com), Loyalsoft@sjz Inc
  // author： gwang 
- // 日期: 2025-03-17 17:39:47
+ // 日期: 2025-03-20 14:24:26
 ////////////////////
 
 

Gameserver/App/model/User/E_PredicateActionType.php

@@ -15,6 +15,16 @@ namespace loyalsoft;
  */
 class E_PredicateActionType {
     
+    /**
+     * 攻击力增加X actionParam1
+     */
+    const addAtk = "addAtk";
+    
+    /**
+     * 攻击力额外增加X% actionParam1
+     */
+    const mulAtk = "mulAtk";
+    
     /**
      * 攻击力增加X actionParam1
      */

Gameserver/App/process/FightPower_Calculate.php

@@ -46,8 +46,8 @@ class FightPower_Calculate {
             //等级
             $ins_Equip = new Ins_Equip(ctx()->store->equip->$equipUid);
             $equipParam += GameConfig::equip_power_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual, $ins_Equip->mo()->position)->power;
-            if ($ins_Equip->mo()->position % 2 == 1) {
-                $attck += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual, $ins_Equip->mo()->position, $ins_Equip->level)->attckNum;
+            if ($ins_Equip->mo()->position % 2 == 1) {              
+                $attck += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual, $ins_Equip->mo()->position, $ins_Equip->level)->attckNum;            
             } elseif ($ins_Equip->mo()->position % 2 == 0) {
                 $hp += GameConfig::equip_levelupgrade_getItem($ins_Equip->mo()->rarity, $ins_Equip->qual, $ins_Equip->mo()->position, $ins_Equip->level)->hpNum;
             }
@@ -117,7 +117,11 @@ class FightPower_Calculate {
         $addDamage_ActionKey = E_PredicateActionType::addDamage;
         $dic->$addDamage_ActionKey += $mo->attack;
         $dic->$addDamage_ActionKey += $attck;
-        $base_addDamage = $dic->$addDamage_ActionKey;                           // 基础攻击
+        
+        $addAtk_ActionKey = E_PredicateActionType::addAtk;
+        $addAtk = $dic->$addAtk_ActionKey;
+                
+        $base_addDamage = $dic->$addDamage_ActionKey + $addAtk;                           // 基础攻击
 
 
         $addHp_ActionKey = E_PredicateActionType::addHp;
@@ -138,6 +142,9 @@ class FightPower_Calculate {
         $mulDamage_ActionKey = E_PredicateActionType::mulDamage;
         $mulDamageVal = $dic->$mulDamage_ActionKey;                             // 攻击里加成百分比
 
+        $mulAtk_ActionKey = E_PredicateActionType::mulAtk;
+        $mulAtk = $dic->$mulAtk_ActionKey;
+        
         $mulHp_ActionKey = E_PredicateActionType::mulHp;
         $mulHpVal = $dic->$mulHp_ActionKey;                                     // 生命额外加成
 
@@ -155,7 +162,7 @@ class FightPower_Calculate {
         $mulEquipBasicProps_hp_ActionKey = E_PredicateActionType::mulEquipBasicProps_hp;
         $mulEquipBasicProps_hp_val = $dic->$mulEquipBasicProps_hp_ActionKey;
 
-        $gongji = round($base_addDamage * (1 + $mulDamageVal + $mulEquipBasicProps_damage_val), 0);
+        $gongji = round($base_addDamage * (1 + $mulDamageVal+$mulAtk + $mulEquipBasicProps_damage_val), 0);
         $shengming = round($base_addHp * (1 + $mulHpVal + $mulEquipBasicProps_hp_val), 0);
 
         $fightPower = (
@@ -166,31 +173,30 @@ class FightPower_Calculate {
                 + $shanghaijianmian * (1 + $shanghaijianmian_xiaoguo) * $hpParas // 伤害减免值 * （1 + 伤害减免效果）* 生命值系数
                 ) * (1 + $equipParam + $mo->mulFightPower);                     // (1 + 装备系数 + 角色系数)
         //
-//        var_dump('---base_addDamage攻击-------------------'.$base_addDamage);
-//        var_dump('攻击里加成百分比---------------'.$mulDamageVal);
-//        var_dump('mulEquipBasicProps_damage_val----'.$mulEquipBasicProps_damage_val);                     
-//        var_dump('---攻击最后值-------------------'.$gongji);
-//        var_dump('---攻击系数-------------------'.$attackParas);
-//        
+        
+//        var_dump('---基础攻击力-------------------'.$gongji);
+//        var_dump('---攻击力系数-------------------'.$attackParas);
+//        var_dump('---基础生命值-------------------'.$shengming);
+//        var_dump('---生命值系数-------------------'.$hpParas);
 //        
-//        var_dump('---base_addHp-------------------'.$base_addHp);
-//        var_dump('---生命额外加成-------------------'.$mulHpVal);
-//        var_dump('---启灵加成-------------------'.$mulEquipBasicProps_hp_val);
-//        var_dump('---生命最后值-------------------'.$shengming);
+//        var_dump('---暴击率-------------------'.$baojilv);
+//        var_dump('---暴击伤害-------------------'.$baojishanghai);
+//        var_dump('---暴击系数-------------------'.$fightPower_bitHitParas);
+//        var_dump('---肉食恢复加成-----------------'.$roushihuifu);
+//        var_dump('---肉食恢复效果-----------------'.$roushihuifu_xiaoguo);
 //        
-//        var_dump('---生命系数-------------------'.$hpParas);
+//        var_dump('---伤害减免值-----------------'.$shanghaijianmian);
+//        var_dump('---伤害减免效果-----------------'.$shanghaijianmian_xiaoguo);
+//        var_dump('---装备系数-----------------'.$equipParam);
+//        var_dump('---角色系数-----------------'.$mo->mulFightPower);
 //        
-//        var_dump('---baojilv-------------------'.$baojilv);
-//        var_dump('---baojishanghai------------------'.$baojishanghai);
-//        var_dump('---roushihuifu-------------------'.$roushihuifu);
-//        var_dump('---roushihuifu_xiaoguo-------------------'.$roushihuifu_xiaoguo);
-//        var_dump('---shanghaijianmian-------------------'.$shanghaijianmian);
-//        var_dump('---shanghaijianmian_xiaoguo-------------------'.$shanghaijianmian_xiaoguo);
-//        var_dump('---equipParam-------------------'.$equipParam);
+//        var_dump('---战力-----------------'.$fightPower);
 //        
-//        var_dump('shanghaijianmian_xiaoguo_val----'.$mulEquipBasicProps_hp_val);
-//        
-//               
+//        var_dump('---base_addDamage攻击-------------------'.$base_addDamage);
+//        var_dump('攻击里加成百分比---------------'.$mulDamageVal);
+//        var_dump('mulEquipBasicProps_damage_val----'.$mulEquipBasicProps_damage_val);                     
+    
+               
         return round($fightPower, 0);
     }
 

Gameserver/App/process/FightProc.php

@@ -1318,11 +1318,11 @@ class FightProc {
 
         $score = self::GetRankScoreUid($uid, 2);
         //$power = self::countUserFightPower();
-        $power = FightPower_Calculate::GetFightPower();
-        if ($power > $score) {
-            $arr = array();
-            $arr["$uid"] = self::createScore($power);
-            $mem->zadd($memKey, $arr);
+        $power = FightPower_Calculate::GetFightPower();   
+        $arr = array();
+        $arr["$uid"] = self::createScore($power);
+        $mem->zadd($memKey, $arr);
+        if ($power >= $score) {
             self::IsAchievedFightPower_PassReward($power);
         }
 
@@ -1937,13 +1937,13 @@ class FightProc {
             if (count($list) == 0) {
                 continue;
             }
-           
+
             foreach ($list as $uid => $score) {
                 $index += 1;
-                EmailProc::SendWorldBossRewardMail(req()->zoneid, $uid, $mo->reward,$index);
+                EmailProc::SendWorldBossRewardMail(req()->zoneid, $uid, $mo->reward, $index);
             }
         }
-        
+
         gMem()->delete($memKey);
 //        $list = gMem()->zrevrange($memKey, 0, GameConfig::glc2()->WorldBoss_RankRewardStatistics, true);       
 //        if (count($list) <= 0) {
@@ -1994,7 +1994,7 @@ class FightProc {
         }
         $mem->deleteMulti($arr);
     }
-         
+
     /**
      * 每天登录的时候 检测轮次变化
      */
@@ -2131,11 +2131,11 @@ class FightProc {
         $tsMemKey = MemKey_GameRun::WorldBoss_StartTs(req()->zoneid);
         $ts = gMem()->get($tsMemKey);
         ctx()->privateState->worldBoss_startTs = $ts;
-        
+
         UserProc::updateUserInfo();
         $ret = array(
             'selfRank' => $ins_rank,
-            'worldBoss_startTs'=>$ts,
+            'worldBoss_startTs' => $ts,
         );
         return Resp::ok($ret);
     }

Gameserver/App/process/StoreProc.php

@@ -48,7 +48,7 @@ class StoreProc {
                 return StoreProc::GemXiLian();
             case CmdCode::store_equiped:                                        # 6414 装备
                 return StoreProc::Equiped();
-            case CmdCode::store_remove_equip:                                   # 6413 卸下装备
+            case CmdCode::store_remove_equip:                                   # 6415 卸下装备
                 return StoreProc::RemoveEquip();
             case CmdCode::store_equip_gemSlotBuy:                               # 6416 购买装备宝石槽         
                 return StoreProc::Gem_BuySlot();
@@ -923,14 +923,14 @@ class StoreProc {
         $posId = $ins_equip->mo()->position;
         ctx()->store(true)->equipLocation->$posId = $uid;
         FightProc::Ranking_FightPower();
-
+        
         GuideProc::GateFight_Guide_Trigger();
         UserProc::updateUserInfo();
         return Resp::ok(array());
     }
 
     /**
-     * 6413 卸下装备
+     * 6415 卸下装备
      * @return type
      */
     public static function RemoveEquip() {
@@ -941,7 +941,7 @@ class StoreProc {
         $ins_equip = new Ins_Equip($equipDic->$uid);
         $posId = $ins_equip->mo()->position;
         StlUtil::dictRemove(ctx()->store(true)->equipLocation, $posId);
-
+              
         FightProc::Ranking_FightPower();
         UserProc::updateUserInfo();
         return Resp::ok(array());