gwang пре 5 година
родитељ
комит
0e24ce639c
2 измењених фајлова са 4 додато и 1 уклоњено
  1. 3 0
      Gameserver/Amfphp/AutoLoad.php
  2. 1 1
      Gameserver/Amfphp/process/FightProc/PVPProc.php

+ 3 - 0
Gameserver/Amfphp/AutoLoad.php

@@ -22,6 +22,9 @@ class AutoLoad {
                 ROOTDIR . '/process/', #                                        # 逻辑处理代码
                 ROOTDIR . '/model/User/', #                                     # 数据结构定义
             );
+            if (defined("CodeGen_Folder")) {
+                $incs[] = CodeGen_Folder;
+            }
             $incPath = get_include_path() . PATH_SEPARATOR . join(PATH_SEPARATOR, $incs);
             set_include_path($incPath);
 //            var_dump(get_include_path());

+ 1 - 1
Gameserver/Amfphp/process/FightProc/PVPProc.php

@@ -712,7 +712,7 @@ class PVPProc {
                     $heros->$n_hid = $userGameInfo->game->heros->collectHeros->$hid;
                 }
             }
-            $fpower = HeroProc::CalcUserFightPower($zoneid, $uid, $userGameInfo); # 计算总战力
+            $fpower = HeroProc::CalcUserFightPower($zoneid, $uid, $userGameInfo->game); # 计算总战力
             $adversary = array(#                                                # 拼装玩家信息
                 'uid' => $uid,
                 'name' => my_null_default($userGameInfo->game->name, ""),