From d0d6af30f0a6854b23ada340b5a618eb50c6f865 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 20 十月 2018 22:20:03 +0800
Subject: [PATCH] 2683 子 天赋技能和新增双职业各两个技能 / 【后端】天赋技能  -  buff层级变化触发技能,添加精灵召唤兽

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
index cd9df55..9a12a1d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.py
@@ -28,6 +28,9 @@
 import PassiveBuffEffMng
 import SkillCommon
 import SkillShell
+import PlayerSuccess
+
+import time
 
 '''
 神兽编号: 1~20,上线后不可修改
@@ -39,6 +42,8 @@
 '''
 
 DogzEquipCount = 5 # 神兽装备位数量,固定5个,策划说打死也不改
+
+g_helpBattleNotifyTimeDict = {} # 助战广播时间记录 {神兽ID:广播time, ...}
 
 def GetDogzEquipPlaceIndex(equipPlace):
     ## 获取神兽装备位对应的索引
@@ -142,9 +147,8 @@
     
     # 助战状态换装需要刷属性
     if GetDogzIsHelpFight(curPlayer, dogzID):
-        RefreshDogzAttr(curPlayer)
+        RefreshDogzAttr(curPlayer, True)
         PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
-        
     return
 
 
@@ -219,7 +223,7 @@
     # 助战状态换装需要刷属性
     if GetDogzIsHelpFight(curPlayer, dogzID):
         SetDogzIsHelpFight(curPlayer, dogzID, False) # 因为脱下了状态,所以必须设置为非助战状态
-        RefreshDogzAttr(curPlayer)
+        RefreshDogzAttr(curPlayer, True)
         PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
         
     return
@@ -235,6 +239,8 @@
 #    BYTE        BatteState;    //助战状态,0-召回,1-助战
 #};
 def OnDogzBattleStateChange(index, clientData, tick):
+    global g_helpBattleNotifyTimeDict
+    
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     playerID = curPlayer.GetPlayerID()
     dogzID = clientData.DogzID
@@ -277,12 +283,22 @@
             if curItem.IsEmpty():
                 GameWorld.DebugLog("神兽有装备未穿戴,无法助战!dogzID=%s,packIndex=%s" % (dogzID, i), playerID)
                 return
-            
+        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzBattle, 1, [dogzID])
+        
     isFight = True if batteState else False
     GameWorld.DebugLog("神兽助战状态变更!dogzID=%s,isFight=%s" % (dogzID, isFight), playerID)
     SetDogzIsHelpFight(curPlayer, dogzID, isFight)
-    RefreshDogzAttr(curPlayer)
+    RefreshDogzAttr(curPlayer, True)
     PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
+    
+    if isFight and ipyData.GetHelpBattleNotify():
+        curTime = int(time.time())
+        playerName = curPlayer.GetPlayerName()
+        notifyKey, notifyParamList, notifyCD = ipyData.GetHelpBattleNotify()
+        lastNotifyTime = g_helpBattleNotifyTimeDict.get(dogzID, 0)
+        if curTime - lastNotifyTime >= notifyCD * 60: 
+            PlayerControl.WorldNotify(0, notifyKey, [playerName] + notifyParamList)
+            g_helpBattleNotifyTimeDict[dogzID] = curTime
     return
 
 
@@ -320,6 +336,7 @@
     GameWorld.DebugLog("购买神兽助战位! updBuyCount=%s" % updBuyCount, playerID)
     
     Sync_DogzInfo(curPlayer)
+    PlayerControl.WorldNotify(0, "DogzNumberUp", [curPlayer.GetPlayerName(), needItemID, curHelpFightCount + 1])
     return
 
 
@@ -460,7 +477,7 @@
                        % (curPlusLV, curPlusExpTotal, addExpTotal, updPlusLV, updPlusExpTotal), playerID)
     
     if isRefreshAtrr:
-        RefreshDogzAttr(curPlayer)
+        RefreshDogzAttr(curPlayer, True)
         PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
         
     curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitDogzEquipPlus, 1)
@@ -488,9 +505,9 @@
         
     return retLV, retExp
 
-def RefreshDogzAttr(curPlayer):
+def RefreshDogzAttr(curPlayer, isUpdateSucc=False):
     ## 刷新神兽属性
-    
+    totalPlusLv = 0 #出战神兽装备总强化等级
     fightPowerEx = 0
     allAttrList = [{} for _ in range(4)]
     
@@ -538,6 +555,7 @@
                 
             # 强化属性
             curPlusLV = curEquip.GetUserAttrByIndex(ShareDefine.Def_IudetDogzEquipPlus, 0)
+            totalPlusLv += curPlusLV
             plusIpyData = IpyGameDataPY.GetIpyGameData("DogzEquipPlus", curEquip.GetEquipPlace(), curPlusLV)
             if plusIpyData:
                 plusAttrTypeList = plusIpyData.GetPlusAttrTypes()
@@ -562,6 +580,10 @@
     # 技能属性,从Def_CalcAttrFunc_Dogz获取
     skillAttrList = CalcDogzBattleSkillAttr(curPlayer)
     PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_DogzBattleSkill, skillAttrList)
+    #成就
+    if isUpdateSucc:
+        PlayerSuccess.ResetSuccessByType(curPlayer, ShareDefine.SuccType_DogzEquipPlus)
+        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DogzEquipPlus, totalPlusLv)
     return
 
 

--
Gitblit v1.8.0