5315 【后端】【1.6】登录奖励活动

xdh

2019-02-13 5d0665e7f5b3bee843f58afa9a05ae9d7e1fc72f

5315 【后端】【1.6】登录奖励活动

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -5307,6 +5307,29 @@
#可提前完成的周狂欢活动

AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]



#登录奖励活动定义

LoginAwardActIDList = (

Def_LoginAct_Login,  #每日登录1

Def_LoginAct_Pray, #祈愿2

Def_LoginAct_TowerSweep, #符印塔扫荡 3

Def_LoginAct_KirinHome, #麒麟之府 4

Def_LoginAct_RunTask, #师门悬赏5

Def_LoginAct_XJMJ, #仙境秘境 6

Def_LoginAct_FMT, #封魔坛7

Def_LoginAct_MunekadoTrial, #宗门试炼8

Def_LoginAct_FamilyParty, #仙盟宴会9

Def_LoginAct_WorldBOSS, #世界boss 10

Def_LoginAct_QueenRelices, #娲皇遗迹 11

Def_LoginAct_IceLode, #冰晶矿脉 12

Def_LoginAct_GodArea, #古神禁地 13

Def_LoginAct_ZhuXianTower, #诛仙塔挑战 14

Def_LoginAct_ZhuXianBOSS, #诛仙boss 15

Def_LoginAct_Alchemy, #炼丹 16

Def_LoginAct_EquipPlus, #强化 17

Def_LoginAct_EquipWash, #洗炼 18

) = range(1, 18+1)





# 套装枚举，普通套装，强化套装

(EquipSuitType_Normal,

EquipSuitType_Plus,


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.py

@@ -28,6 +28,7 @@
import PlayerActivity

import PlayerSuccess

import IpyGameDataPY

import PlayerActLogin

import GameWorld

import ChConfig

import ChEquip

@@ -92,6 +93,7 @@
    

    # 每日活动

    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_EquipPlus)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_EquipPlus, 1)

    #===========================================================================

    




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.py

@@ -23,6 +23,7 @@
import PlayerSuccess

import IPY_GameWorld

import DataRecordPack

import PlayerActLogin

import ShareDefine

import ItemCommon

import ChConfig

@@ -289,7 +290,7 @@
    

    if isRefreshAttr:

        RefreshEquipWashAttr(curPlayer)

        
    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_EquipWash, 1)

    return






 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.py

@@ -30,6 +30,7 @@
import PlayerBossReborn

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerActLogin

#------------------------------------------------------------------------------ 



#获取金币祈愿奖励

@@ -169,6 +170,7 @@
    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_Pray)

    PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Pray, 1)

    PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Pray, 1)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_Pray, 1)

    Sync_NotifyDataChange(curPlayer, [buyType])

    return




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py

@@ -61,6 +61,7 @@
import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerWeekParty

import PlayerActLogin

import PlayerHorse

import FBCommon

import PyGameData

@@ -5245,6 +5246,7 @@
        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_RunTask, addCnt)

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_RunTask, addCnt)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_RunTask, addCnt)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_RunTask, 1)

    elif missionType == QuestCommon.Def_Mission_Type_RunFamily:

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyRunMission, addCnt)

        PlayerFamily.AddFamilyActivity(curPlayer, ShareDefine.FamilyActive_Task, addCnt)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.py

@@ -33,6 +33,7 @@
import PlayerBossReborn

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerActLogin

import PlayerWeekParty

import ItemControler

import GameFuncComm

@@ -189,6 +190,7 @@
        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_XJMJ, 1)

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_XJMJ, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_XJMJ, 1)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_XJMJ, 1)

        FBCommon.UpdateFBEnterTick(curPlayer)

        gameFB.SetPlayerGameFBDict(playerID, FBPlayerDict_EnterLV, playerLV)

        PyGameData.g_bzzdPlayerKillNPCCntDict.pop(playerID, 0)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py

@@ -26,6 +26,7 @@
import GameWorldProcess

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerActLogin

import EventReport

import PyGameData

import ItemCommon

@@ -177,6 +178,7 @@
        EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_FamilyParty, 0, ChConfig.CME_Log_Start)

        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FamilyParty, 1)

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FamilyParty, 1)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_FamilyParty, 1)

    lineID = GameWorld.GetGameWorld().GetLineID()

    if lineID not in g_familyMapPlayerIDDict:

        g_familyMapPlayerIDDict[lineID] = []


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.py

@@ -25,6 +25,7 @@
import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerWeekParty

import PlayerActLogin

import EventReport

import time



@@ -147,6 +148,7 @@
        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_GodArea, 1)

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_GodArea, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_GodArea, 1)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_GodArea, 1)

    elif __IsAngerFull(curPlayer):

        #怒气已满，退出副本

        GameWorld.DebugLog("    副本里掉线重上 怒气已满，退出副本")


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.py

@@ -34,6 +34,7 @@
import NetPackCommon

import PlayerSuccess

import PlayerWeekParty

import PlayerActLogin

import BuffSkill



import random

@@ -565,6 +566,7 @@
        if not lastStar and not isInFBOnDay: #每日活动

            PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_IceLode)

            PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_IceLode, 1)

            PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_IceLode, 1)

    

    if isInFBOnDay: #在副本里过天，副本结束后再补发星级奖励

        CheckIceLodeStarAwardMail(curPlayer)

@@ -681,6 +683,7 @@
        GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineid, 3, False, [mapID])

    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_IceLode, addCnt)

    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_IceLode, addCnt)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_IceLode, addCnt)

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_IceLode, len(lineList))

    FBCommon.Sync_FBPlayerFBInfoData(curPlayer, mapID) # 同步信息

#    npcCountDict = {}


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.py

@@ -28,6 +28,7 @@
import PlayerControl

import PlayerBossReborn

import PlayerWeekParty

import PlayerActLogin

import EventShell

import EventReport



@@ -391,6 +392,7 @@
        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KirinHomeEx, 1)

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_KirinHome, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_KirinHome, 1)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_KirinHome, 1)

        EventShell.EventRespons_FBEvent(curPlayer, "kirinhome_%s" % (lineID+1))

        EventShell.EventRespons_FBEvent(curPlayer, "kirinhome_0")

        

@@ -493,6 +495,7 @@
    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KirinHomeEx, 1)

    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_KirinHome, sweepCnt)

    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_KirinHome, sweepCnt)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_KirinHome, sweepCnt)

    for _ in xrange(sweepCnt):

        EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_KirinHome, 0, ChConfig.CME_Log_Start)

    GameWorld.DebugLog("扫荡奖励: 次数=%s,totalExp=%s,totalMoney=%s,jsonItemList=%s" % (sweepCnt, totalExp, totalMoney, jsonItemList)) 


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py

@@ -35,6 +35,7 @@
import EventShell

import NPCCommon

import FBHelpBattle

import PlayerActLogin



import math



@@ -437,7 +438,7 @@
        else:

            curPlayer.SetDict(ChConfig.Def_PlayerKey_IsInFBOnDay, 0)

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)

            
        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_MunekadoTrial, 1)

            #=======================================================================================

            # #给奖励

            # needSpace = len(prizeItemList)

@@ -501,6 +502,7 @@
    EventShell.EventRespons_FBEvent(curPlayer, "passzmsl")

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [1, star, lineID+1])

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_MunekadoTrial, 1)

    jsonItemList, totalExp, totalMoney = NPCCommon.GiveKillNPCDropPrize(curPlayer, ChConfig.Def_FBMapID_MunekadoTrial, {killNPCID:1}, curGrade=star)

    

    # 通知结果


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.py

@@ -34,6 +34,7 @@
import FBHelpBattle

import IpyGameDataPY

import PlayerWeekParty

import PlayerActLogin





#阶段时间

@@ -522,6 +523,7 @@
                GameWorld.DebugLog("副本中过天，不增加挑战次数！", playerID)

            PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_QueenRelicsEx, 1)

            PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_QueenRelices, 1)

            PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_QueenRelices, 1)

        # 不可再挑战下一关了

        if not nextLineID:

            curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, fbLineTime[Def_LeaveTime] * 1000, True)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py

@@ -38,6 +38,7 @@
import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerWeekParty

import PlayerActLogin

import EventReport



FBDict_StartTick = 'FBDict_StartTick%s' #开始时间

@@ -550,6 +551,7 @@
    PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FMT, addCnt)

    PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FMT, addCnt)

    PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_FMT, addCnt)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_FMT, addCnt)

    return prizeItemList



def OnPickUpItem(curPlayer, curItem, tick):


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.py

@@ -35,6 +35,7 @@
import PlayerActivity

import PlayerBillboard

import PlayerWeekParty

import PlayerActLogin

import EventReport



import random

@@ -656,4 +657,5 @@
    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_TowerSD, 1)

    #BOSS复活活动

    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_TowerSweep, 1)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_TowerSweep, 1)

    return True

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py

@@ -31,6 +31,7 @@
import PlayerActivity

import NetPackCommon

import ItemControler

import PlayerActLogin

import EventReport



FBDict_StartTick = 'FBDict_StartTick%s' #开始时间

@@ -483,6 +484,7 @@
    FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, addCnt)

    # 每日活动

    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_ZhuXianBoss, addCnt)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_ZhuXianBOSS, addCnt)

    return prizeItemList



def OnPickUpItem(curPlayer, curItem, tick):


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py

@@ -29,7 +29,7 @@
import ItemCommon

import ChConfig

import ChPlayer

import PlayerSuccess

import PlayerActLogin

import GameWorldProcess

import PlayerBillboard

import EventReport

@@ -515,6 +515,7 @@


        

    gameFB.SetGameFBDict(FBDict_HasGiveAward, 1)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_ZhuXianTower, 1)

    return






 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py

@@ -54,6 +54,7 @@
import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerWeekParty

import PlayerActLogin

import FamilyRobBoss

import IpyGameDataPY

import PlayerState

@@ -2167,6 +2168,7 @@
        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_WorldBOSS, 1)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_WorldBOSS, 1)

        

    if mapID == ChConfig.Def_FBMapID_BossHome:

        #BOSS之家


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.py

@@ -60,13 +60,12 @@
    #LoginAwardID = actLoginAwardInfo.get(ShareDefine.ActKey_ID, 0)

    state = actLoginAwardInfo.get(ShareDefine.ActKey_State, 0)

    cfgID = actLoginAwardInfo.get(ShareDefine.ActKey_CfgID, 0)

    #passlv = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_TrialTower_PassLV)

    #isOk = AddLoginAwardActionCnt(curPlayer, ChConfig.Def_WPAct_Tower, passlv, False)

    #AddLoginAwardActionCnt(curPlayer, ChConfig.Def_WPAct_Login, 1)

    if state:

        #每天都要触发

        AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_Login, 1, False, False)

        SyncLoginAwardPlayerInfo(curPlayer)

    

    playerLoginAwardID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_LoginAwardID, 0, ChConfig.Def_PDictType_LoginAward)  # 玩家身上的活动ID

#    if not isOk and state:

#        SyncLoginAwardPlayerInfo(curPlayer)

    # 活动ID 相同的话不处理

    if cfgID == playerLoginAwardID:

        #GameWorld.DebugLog("登录奖励活动ID不变，不处理！", curPlayer.GetPlayerID())

@@ -117,7 +116,7 @@
    return





def AddLoginAwardActionCnt(curPlayer, actionID, addCnt=1, isAdd=True):

def AddLoginAwardActionCnt(curPlayer, actionID, addCnt=1, isAdd=True, isSync=True):

    '''增加登录奖励相关活动完成次数'''

    #判断活动是否开启

    if not addCnt:

@@ -160,6 +159,7 @@
        return

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_LoginAwardCurTimes % (dayIndex, findTid), updTimes, ChConfig.Def_PDictType_LoginAward)

    GameWorld.DebugLog('   增加登录奖励相关活动完成次数 dayIndex=%s, findTid=%s, realAddCnt=%s' % (dayIndex, findTid, realAddCnt))

    if isSync:

    SyncLoginAwardPlayerInfo(curPlayer, dayIndex, findTid)

    return True




 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.py

@@ -31,6 +31,7 @@
import PlayerActivity

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerActLogin

import PlayerVip



import copy

@@ -227,6 +228,7 @@
    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_RefineStove, costItemCnt)

    PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_RefineStove, 1)

    PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_RefineStove, 1)

    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_Alchemy, 1)

    return 



def __GetAlchemyUpItemID(itemID, alchemyLV, alchemyUpCfg):