From ffb2b5d1c7246523bb51e75d067c14d7bb8bbdc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 25 一月 2019 16:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/1.5.200.develop'

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py
index d66627e..d416a88 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipStone.py
@@ -28,6 +28,7 @@
 import NetPackCommon
 import DataRecordPack
 import PlayerSuccess
+import PlayerWeekParty
 import ShareDefine
 
 
@@ -198,6 +199,7 @@
     # 记录开服活动宝石总等级
     OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_StoneLV, totalStoneLV)
     PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_StoneTotalLV, totalStoneLV)
+    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Stone, totalStoneLV, False, True)
     return
 
 #//A3 05 宝石摘取 #tagCMEquipStonePick
@@ -242,6 +244,14 @@
     #同步客户端
     Sycn_StoneHoleInfo(curPlayer, [equipIndex])
     
+    totalStoneLV = GetTotalStoneLV(curPlayer)
+    # 记录开服活动宝石总等级
+    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_StoneLV, totalStoneLV)
+    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Stone, totalStoneLV, False, True)
+    return
+
+def GetTotalStoneLV(curPlayer):
+    ##宝石总等级
     totalStoneLV = 0
     holeIndexList = GetAllEquipPlaceHoleIndex()
     gameData = GameWorld.GetGameData()
@@ -258,11 +268,7 @@
                 continue
             gemLV = curGem.GetEffectByIndex(0).GetEffectValue(1)
             totalStoneLV += gemLV
-            
-    # 记录开服活动宝石总等级
-    OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_StoneLV, totalStoneLV)
-    return
-
+    return totalStoneLV
 
 #// A3 06 宝石升级 #tagCMEquipStoneUpgrade
 #struct    tagCMEquipStoneUpgrade

--
Gitblit v1.8.0