SnxxServerCode.git

parent: 02e23951 | 补丁 | 提交 | ignore whitespace

xdh

2018-11-21 70808a8f66c0ad61fc504203e81c29118e10441d

4909 【后端】【1.2】【1.3】绝版称号、绝世坐骑、逆天灵宠开启条件变更

7个文件已修改

	ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.py	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -859,6 +859,7 @@
GameFuncID_AddPoint = 145       # 加点功能

GameFuncID_LittleHelper = 146   # 小助手

GameFuncID_TJG = 147            # 脱机挂

GameFuncID_SuperGift = 150      # 超值礼包

# 以下为暂时无用的

GameFuncID_Truck = 33           # 运镖

GameFuncID_RunDaily = 34        # 日常跑环


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

@@ -3410,6 +3410,7 @@
Def_PDict_DailyGoldChargeState = "DailyGoldChargeState"  # 天天首充活动状态，0-未开启；1-已开启

Def_PDict_DailyChargeState = "DailyChargeState"  # 当日是否已充值

Def_PDict_SuperGiftStartTime = "SuperGiftStartTime"  # 超值礼包开始时间

Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen"  # 超值礼包是否开过

Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord"  # 天天首充领奖记录，0-不可领；1-可领；2-已领

Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt"  # 当日已充值数

Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex"  # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引

@@ -4481,7 +4482,8 @@
Def_VerFix_CTGDoublePrize, # 1.2版本开放首充双倍，重置老号充值ID对应累计充值次数;

Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;

Def_VerFix_FMTDouble, # 1.3版本VIP特权变更，记录切换版本前的VIP特权(封魔坛双倍挑战);

) = range(4)

Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;

) = range(5)



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

#游戏消费点类型定义


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

@@ -192,6 +192,14 @@


## 登录

def ShopItemOnLogin(curPlayer):

    if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_SuperGift):

        GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_SuperGift, 1)

        isGet = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord)

        if isGet:#首充奖励已领取则代表超值礼包已开启过，

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftHasOpen, 1)

            
    
    
    SyncShopItemTodayBuyCount(curPlayer)

    SyncSuperGiftInfo(curPlayer)

    return

@@ -638,6 +646,10 @@
            #活动结束 重置

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftStartTime, 0)

    else:

        if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftHasOpen):

            #老号已开启过超值礼包则不再开启

            return

        
        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftStartTime, curTime)

        addItemList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList', 2)

        PlayerControl.SendMailByKey('SellMail2', [curPlayer.GetID()], addItemList)


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

@@ -715,6 +715,9 @@
    if itemList:

        PlayerControl.SendMailByKey('IceLodeStarReward', [curPlayer.GetID()], itemList, detail=mailStarList)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_IceLodeIsInFBOnDay, 0)

    maxCnt, randomCnt = IpyGameDataPY.GetFuncEvalCfg('IceLodeCfg', 2)

    for i in xrange(maxCnt):

        GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, i, 0, False, [ChConfig.Def_FBMapID_IceLode])

    #重置领奖记录

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_IceLodeStarAwardRecord, 0)

    #随机今日玩法


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

@@ -65,6 +65,7 @@
                     ShareDefine.GameFuncID_AddPoint:lambda curObj:PlayerControl.DoAddPointOpen(curObj),

                     ShareDefine.GameFuncID_Talent:lambda curObj:PlayerGreatMaster.DoTalentOpen(curObj),

                     ShareDefine.GameFuncID_TJG:lambda curObj:PlayerTJG.DoTJGOpen(curObj),

                     ShareDefine.GameFuncID_SuperGift:lambda curObj:FunctionNPCCommon.UpdataSuperGiftTime(curObj),

                     #ShareDefine.GameFuncID_RunDaily:lambda curObj:FBCommon.DoFuncOpen_RunDaily(curObj),

                     #ShareDefine.GameFuncID_RunFamily:lambda curObj:FBCommon.DoFuncOpen_RunFamily(curObj),

                     #ShareDefine.GameFuncID_RefineExp:lambda curObj:Operate_PlayerBuyZhenQi.DoFuncOpen_RefineExp(curObj),


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

@@ -324,9 +324,6 @@
    

    # 通知客户端

    Sync_FirstGoldInfo(curPlayer)

    
    #超值礼包记录时间

    FunctionNPCCommon.UpdataSuperGiftTime(curPlayer)

    return



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


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

@@ -859,6 +859,7 @@
GameFuncID_AddPoint = 145       # 加点功能

GameFuncID_LittleHelper = 146   # 小助手

GameFuncID_TJG = 147            # 脱机挂

GameFuncID_SuperGift = 150      # 超值礼包

# 以下为暂时无用的

GameFuncID_Truck = 33           # 运镖

GameFuncID_RunDaily = 34        # 日常跑环

			@@ -859,6 +859,7 @@
			GameFuncID_AddPoint = 145 # 加点功能
			GameFuncID_LittleHelper = 146 # 小助手
			GameFuncID_TJG = 147 # 脱机挂
			GameFuncID_SuperGift = 150 # 超值礼包
			# 以下为暂时无用的
			GameFuncID_Truck = 33 # 运镖
			GameFuncID_RunDaily = 34 # 日常跑环

			@@ -3410,6 +3410,7 @@
			Def_PDict_DailyGoldChargeState = "DailyGoldChargeState" # 天天首充活动状态，0-未开启；1-已开启
			Def_PDict_DailyChargeState = "DailyChargeState" # 当日是否已充值
			Def_PDict_SuperGiftStartTime = "SuperGiftStartTime" # 超值礼包开始时间
			Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen" # 超值礼包是否开过
			Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord" # 天天首充领奖记录，0-不可领；1-可领；2-已领
			Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt" # 当日已充值数
			Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex" # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
			@@ -4481,7 +4482,8 @@
			Def_VerFix_CTGDoublePrize, # 1.2版本开放首充双倍，重置老号充值ID对应累计充值次数;
			Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
			Def_VerFix_FMTDouble, # 1.3版本VIP特权变更，记录切换版本前的VIP特权(封魔坛双倍挑战);
			) = range(4)
			Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;
			) = range(5)

			##==================================================================================================
			#游戏消费点类型定义

			@@ -192,6 +192,14 @@

			## 登录
			def ShopItemOnLogin(curPlayer):
			if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_SuperGift):
			GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_SuperGift, 1)
			isGet = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GoldGiftFirstRecord)
			if isGet:#首充奖励已领取则代表超值礼包已开启过，
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftHasOpen, 1)



			SyncShopItemTodayBuyCount(curPlayer)
			SyncSuperGiftInfo(curPlayer)
			return
			@@ -638,6 +646,10 @@
			#活动结束重置
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftStartTime, 0)
			else:
			if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SuperGiftHasOpen):
			#老号已开启过超值礼包则不再开启
			return

			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SuperGiftStartTime, curTime)
			addItemList = IpyGameDataPY.GetFuncEvalCfg('SuperGiftTimeList', 2)
			PlayerControl.SendMailByKey('SellMail2', [curPlayer.GetID()], addItemList)

			@@ -715,6 +715,9 @@
			if itemList:
			PlayerControl.SendMailByKey('IceLodeStarReward', [curPlayer.GetID()], itemList, detail=mailStarList)
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_IceLodeIsInFBOnDay, 0)
			maxCnt, randomCnt = IpyGameDataPY.GetFuncEvalCfg('IceLodeCfg', 2)
			for i in xrange(maxCnt):
			GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, i, 0, False, [ChConfig.Def_FBMapID_IceLode])
			#重置领奖记录
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_IceLodeStarAwardRecord, 0)
			#随机今日玩法

			@@ -65,6 +65,7 @@
			ShareDefine.GameFuncID_AddPoint:lambda curObj:PlayerControl.DoAddPointOpen(curObj),
			ShareDefine.GameFuncID_Talent:lambda curObj:PlayerGreatMaster.DoTalentOpen(curObj),
			ShareDefine.GameFuncID_TJG:lambda curObj:PlayerTJG.DoTJGOpen(curObj),
			ShareDefine.GameFuncID_SuperGift:lambda curObj:FunctionNPCCommon.UpdataSuperGiftTime(curObj),
			#ShareDefine.GameFuncID_RunDaily:lambda curObj:FBCommon.DoFuncOpen_RunDaily(curObj),
			#ShareDefine.GameFuncID_RunFamily:lambda curObj:FBCommon.DoFuncOpen_RunFamily(curObj),
			#ShareDefine.GameFuncID_RefineExp:lambda curObj:Operate_PlayerBuyZhenQi.DoFuncOpen_RefineExp(curObj),

			@@ -324,9 +324,6 @@

			# 通知客户端
			Sync_FirstGoldInfo(curPlayer)

			#超值礼包记录时间
			FunctionNPCCommon.UpdataSuperGiftTime(curPlayer)
			return

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