Merge branch 'dev' of http://ylsjtt.game7000.com:3000/YLSJ/jzhj2024server into dev

Gameserver/App/process/FightProc.php

@@ -725,12 +725,21 @@ class FightProc {
     public static function Ranking_FightPower() {
         $memKey = MemKey_GameRun::Rank_FightPower_Zone_zset(req()->zoneid);
         $mem = gMem();
-        $arr = array();
         $uid = req()->uid;
-        $power = 10;
-        $arr["$uid"] = $power;
-        $mem->zadd($memKey, $arr);
-
+        $arr = array();
+        $power = self::countUserFightPower();
+        $rankPower = gMem()->zscore($memKey,$uid);
+        
+        if($rankPower == null){
+            $rankPower = 0;
+        }             
+        
+        if ($power > $rankPower) {
+            $arr["$uid"] = $power;
+            $mem->zadd($memKey, $arr);           
+            self::IsAchievedFightPower_PassReward($power);
+        }
+        
         $length = $mem->zlen($memKey);
         if ($length > glc()->Rank_FightPower_OnListRank) {
             $num = $length - glc()->Rank_FightPower_OnListRank;
@@ -865,8 +874,7 @@ class FightProc {
      * 战力奖励是否达成
      */
 
-    public static function IsAchievedFightPower_PassReward() {
-        $power = 0; //临时
+    public static function IsAchievedFightPower_PassReward($power) {    
         $rewards = GameConfig::rank_fightpowerreward();
 
         $memKey = MemKey_GameRun::RankReward_FightPower_Zone_hash(req()->zoneid);

Gameserver/App/process/StoreProc.php

@@ -245,6 +245,8 @@ class StoreProc {
         TaskProc::OnAllEquipUpLevel_X();
         TaskProc::OnEquipLevelUpNum();
         ctx($user);
+        
+        FightProc::Ranking_FightPower();
         UserProc::updateUserInfo();
         return Resp::ok(array(
                     'upLevelArr' => $upLevelArr,
@@ -557,6 +559,8 @@ class StoreProc {
         $user->store->gemEquip->$pag->$posId = $dic;
 
         TaskProc::OnSetSpecialQualGem();
+        
+        FightProc::Ranking_FightPower();
         ctx($user);
         UserProc::updateUserInfo();
         return Resp::ok(array(
@@ -597,6 +601,8 @@ class StoreProc {
             //$user->store->gemStore->$uid = $tag_gem;
         }
         ctx($user);
+        
+        FightProc::Ranking_FightPower();
         UserProc::updateUserInfo();
         return Resp::ok(array(
                     'gold' => 0,
@@ -629,6 +635,8 @@ class StoreProc {
         TaskProc::OnAnyEquipUpLevel_X();
         TaskProc::OnAllEquipUpLevel_X();
         TaskProc::OnEquipLevelUpNum();
+        
+        FightProc::Ranking_FightPower();
         ctx($user);
         UserProc::updateUserInfo();
         return Resp::ok(array(
@@ -684,6 +692,8 @@ class StoreProc {
         TaskProc::OnAnyEquipUpLevel_X();
         TaskProc::OnAllEquipUpLevel_X();
         TaskProc::OnEquipLevelUpNum();
+        
+        FightProc::Ranking_FightPower();
         ctx($user);
         UserProc::updateUserInfo();
         return Resp::ok(array(

Gameserver/App/process/UserProc.php

@@ -221,6 +221,7 @@ class UserProc {
 
             TaskProc::OnLogin_Daily();
             TaskProc::OnLogin_day7();
+            FightProc::Ranking_FightPower();
             return $resp;
         } else {                                                                # 2.如果玩家已存在，则处理普通登录流程
             req()->game = $game;                                                # 给Req挂载玩家数据