Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-06-26 7cdb243db4fc597190a3d7d37af411c9893859a8

Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -1437,7 +1437,8 @@
DailyActionID_FairyDomain, # 缥缈仙域  25

DailyActionID_AuctionItem, # 拍卖行上架/竞拍  26

DailyActionID_LeiFaBoss, # 雷罚boss 27

) = range(1, 27 + 1)

DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28

) = range(1, 28 + 1)








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

@@ -1576,8 +1576,11 @@
    #GameWorld.DebugLog('封魔坛最大可恢复次数 %s'%maxCanAdd)



    curTime = int(time.time())

    recoverInterval = IpyGameDataPY.GetFuncCfg('FBCntRegainInterval')

    lastRegainTime = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID)

    if not lastRegainTime:

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID, curTime)

        return

    recoverInterval = IpyGameDataPY.GetFuncCfg('FBCntRegainInterval')

    needTime = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbCntRegainTotalTime % mapID)

    if not needTime:

        needTime = recoverInterval


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

@@ -2306,6 +2306,10 @@
        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_BossHome, 1)

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

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

        
    elif mapID is ChConfig.Def_FBMapID_CrossPenglai:

        #跨服蓬莱仙境

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossPenglai)

    return

    

#################################################


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

@@ -525,16 +525,17 @@
        PlayerBindJadeWheel.OnDay(curPlayer)

    # 特殊时间点X点过天

    elif onEventType == ShareDefine.Def_OnEventTypeEx:

        # 资源找回

        PlayerRecover.RecoverOnDay(curPlayer)

        #触发每日任务重置脚本

        EventShell.EventResponse_OnDay(curPlayer)

        #购买次数清空

        Operate_PlayerBuyZhenQi.PlayerOnDay(curPlayer)

        # 世界boss

        BossHurtMng.OnDay(curPlayer)

        
        #我要太极过天

        PlayerDiceEx.OnDay(curPlayer)

        # 资源找回

        PlayerRecover.RecoverOnDay(curPlayer)

        # 世界boss

        BossHurtMng.OnDay(curPlayer)

        # 仙盟过天

        PlayerFamily.FamilyPlayerOnDay(curPlayer)

        # 重置物品每日使用次数


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

@@ -1437,7 +1437,8 @@
DailyActionID_FairyDomain, # 缥缈仙域  25

DailyActionID_AuctionItem, # 拍卖行上架/竞拍  26

DailyActionID_LeiFaBoss, # 雷罚boss 27

) = range(1, 27 + 1)

DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28

) = range(1, 28 + 1)