From 81e17bea6f1dec0fd60c44ca22f3068e90d42969 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 17 六月 2019 21:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
index 0a67be3..03f4d8f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
@@ -80,8 +80,13 @@
recordData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordData % campaignType)
+ if value == recordData:
+ GameWorld.DebugLog(" 开服活动数据等于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s"
+ % (campaignType, recordData, value), curPlayer.GetPlayerID())
+ return
+
if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower,
- ShareDefine.Def_Campaign_Type_RuneLV] and value <= recordData:
+ ShareDefine.Def_Campaign_Type_RuneLV, ShareDefine.Def_Campaign_Type_LingGen] and value < recordData:
GameWorld.DebugLog(" 开服活动数据小于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s"
% (campaignType, recordData, value), curPlayer.GetPlayerID())
return
@@ -361,5 +366,11 @@
NetPackCommon.SendFakePack(curPlayer, oscAwardListPack)
return
-
+def UpdOpenServerCampaignLingGenData(curPlayer):
+ # 记录开服活动数据
+ totalLingGen = curPlayer.GetFreePoint() + PlayerControl.GetMetal(curPlayer) + PlayerControl.GetWood(curPlayer) + \
+ PlayerControl.GetWater(curPlayer) + PlayerControl.GetFire(curPlayer) + PlayerControl.GetEarth(curPlayer)
+ #GameWorld.DebugLog("总灵根: %s" % totalLingGen)
+ UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LingGen, totalLingGen)
+ return
--
Gitblit v1.8.0