From 4cf6e90575a661fca5b78af6253946cdd8e0cdd6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 三月 2019 18:04:47 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置（腾讯相关）
---
/dev/null | 257 ------------------------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_LoginData.py | 6 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 16 --
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 3
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 16 --
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 20 ---
6 files changed, 1 insertions(+), 317 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_TaskMarket.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_TaskMarket.py
deleted file mode 100644
index 7bbfb7e..0000000
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_TaskMarket.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.GMT_TaskMarket
-#
-# @todo:腾讯任务集市
-# @author hxp
-# @date 2016-09-18
-# @version 1.0
-#
-# 详细描述: 腾讯任务集市
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2016-09-18 18:00"""
-#-------------------------------------------------------------------------------
-
-import GMCommon
-import ChConfig
-
-
-## 执行逻辑
-# @param curPlayer 当前玩家
-# @param gmCmdDict: 命令字典
-# @return None
-# @remarks 函数详细说明.
-def OnExec(orderId, gmCmdDict):
- queryType = gmCmdDict.get(GMCommon.Def_GMKey_QueryType, "")
- playerFind = gmCmdDict.get(GMCommon.Def_GMKey_PlayerFind, "")
-
- if queryType == GMCommon.Def_GMKey_PlayerAccID:
- queryType = ChConfig.queryType_sqtPlayerByAccID
- elif queryType == GMCommon.Def_GMKey_PlayerName:
- queryType = ChConfig.queryType_sqtPlayerByName
- else:
- GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_ParamErr)
- return
-
- GMCommon.GMTool_MapServer_Query(queryType, orderId, playerFind, gmCmdDict, "GMTTaskMarket", [orderId, gmCmdDict], False)
- return
-
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 2a0215c..287d675 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1338,22 +1338,6 @@
# 玩家字典按数位存储数据个数
Def_PDictDigitCnt = 9
-# 副本评分类型
-(
-ScoreType_TimeConsume, # 耗时结算类型
-ScoreType_KillStat, # 击杀怪物统计
-ScoreType_NewGuySuperShow, # 击杀怪物统计
-ScoreType_GetItem, # 获得物品奖励统计
-ScoreType_RedFortReward, # 打开客户端frmRedFortReward
-)=range(5)
-
-ScoreTypeName = "TScore"
-
-Def_QQPlatVIPTypeList = (
-Def_QQPlatVIP_Yellow, #黄钻
-Def_QQPlatVIP_Blue, #蓝钻
-) = range(1, 3)
-
# VIP类型定义
(
Def_VIPType_Not, # 非VIP
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 7d8cc7e..2f430f8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3280,10 +3280,7 @@
Def_PDictType_Reincarnation, # 转生
Def_PDictType_GreatMaster, # 大师
Def_PDictType_BloodElf, # 血魔
-Def_PDictType_28,
-Def_PDictType_29,
-Def_PDictType_QQ, # QQ相关
-) = range(31)
+) = range(28)
# 玩家字典key定义规则, key的长度不能超过29个字节, 注意尽量避免命名重复
# 新增参数TYPE 用于字典分类，默认0
@@ -3302,7 +3299,6 @@
Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
Def_Player_Dict_PlayerFromPID = "PlayerFromPID" # pid
Def_Player_Dict_Account_Type = "account_type" # account_type
-Def_Player_Dict_TencentPF = "tencentPF" # 腾讯平台来源pf
Def_Player_Dict_FirstLogin = "FirstLogin" # 首登标记 0-未首登; 1-首登过
Def_GuideStateKeyCount = 8 # 引导状态key最大个数
Def_Player_Dict_GuideState = "GuideState_%s" # 引导状态记录，参数为key个数编号
@@ -3808,20 +3804,6 @@
Def_PDict_Success_CntValue = "Su_%s_%s" # 当前次数值,参数(成就类型、条件)
Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)
Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本
-
-# QQ相关 Def_PDictType_QQ
-Def_PDict_QQUpYellowAwardRecord = "QQUpYellowAwardRecord" # QQ成长礼包奖励是否已领取(黄钻)
-Def_PDict_QQUpBlueAwardRecord = "QQUpBlueAwardRecord" # QQ成长礼包奖励是否已领取(蓝钻)
-Def_PDict_QQNewManAwardRecord = "QQNewManAwardRecord" # QQ新手礼包奖励是否已领取
-Def_PDict_QQDayGiftAwardRecord = "QQDayGiftAwardRecord" # QQ每日礼包奖励是否已领取
-Def_PDict_QQTaskMarketRecord = "QQTaskMarketRecord_%s" # 任务集市领奖记录, 参数为任务记录编号
-
-Def_Tencent_PF_List = ["tencent", "qzone", "pengyou","qplus","qqgame","3366"] # 腾讯平台来源pf
-
-# qzone
-Def_PDict_QzoneUpAwardRecord = "QzoneUpAwardRecord" # qzone成长礼包奖励是否已领取
-Def_PDict_QzoneNewManAwardRecord = "QzoneNewManRecord" # qzone新手礼包奖励是否已领取
-Def_PDict_QzoneDayAwardRecord = "QQDayGiftRecord" # qzone每日礼包奖励是否已领取
# 转生 Def_PDictType_Reincarnation
Def_PDict_Reinc_Reiki = "Reinc_Reiki" # 当前转生灵力
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearQQAward.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearQQAward.py
deleted file mode 100644
index fe153de..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearQQAward.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#
-#
-##@package ClearQQAward.py
-#
-# @todo:清除QQ奖励
-#
-# @author xdh
-# @date 2015-07-10 16:00
-# @version 1.0
-# @note:
-#
-#
-#------------------------------------------------------------------------------
-"""Version = 2015-07-10 16:00"""
-#------------------------------------------------------------------------------
-
-import GameWorld
-import PlayerQQ
-
-#---------------------------------------------------------------------
-
-## 执行逻辑
-# @param curPlayer 当前玩家
-# @param cmdList 参数
-# @return None
-def OnExec(curPlayer, cmdList):
- if len(cmdList) == 0:
- for rewardType in PlayerQQ.AwardType_KeyDict.keys():
- __DoQQCReset(curPlayer, rewardType)
- return
-
- rewardType = cmdList[0]
- if rewardType not in PlayerQQ.AwardType_KeyDict.keys():
- return
- __DoQQCReset(curPlayer, rewardType)
- return
-
-## QQ奖励信息重置
-# @param curPlayer 当前玩家
-# @param rewardType 重置奖励类型
-# @return None
-def __DoQQCReset(curPlayer, rewardType):
- PlayerQQ.Sync_ResetQQAwardGetRecord(curPlayer, rewardType)
- GameWorld.DebugAnswer(curPlayer, 'QQAwardReset %s OK！'%rewardType)
- return
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetQQUser.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetQQUser.py
deleted file mode 100644
index 69080d0..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetQQUser.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.SetQQUser
-#
-# @todo:设置QQ玩家信息
-# @author hxp
-# @date 2016-09-12
-# @version 1.0
-#
-# 详细描述: 设置QQ玩家信息
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2016-09-12 12:00"""
-#-------------------------------------------------------------------------------
-import PlayerBillboard
-import PlayerQQ
-import ChConfig
-import PlayerControl
-import GameWorld
-#---------------------------------------------------------------------
-#逻辑实现
-## GM命令执行入口
-# @param curPlayer 当前玩家
-# @param paramList 参数列表
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, paramList):
-
- if not paramList:
- __AnswerHelp(curPlayer)
- return
-
- if len(paramList) == 1 and paramList[0] == 0:
- curPlayer.SetOperateInfo(0)
- PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer)
- GameWorld.DebugAnswer(curPlayer, "重置qq会员信息成功!")
- return
- if len(paramList) == 2 and paramList[0] == "pf":
- pf = paramList[1]
- pfValue = 0
- if pf in ChConfig.Def_Tencent_PF_List:
- pfValue = ChConfig.Def_Tencent_PF_List.index(pf) + 1
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_TencentPF, pfValue)
- GameWorld.DebugAnswer(curPlayer, "设置腾讯来源pf: %s, pfValue=%s" % (pf, pfValue))
- return
-
- qquserTypeDict = {1:"黄钻", 2:"蓝钻"}
- userType = PlayerQQ.GetQQPlatVIPType(curPlayer)
- if userType not in qquserTypeDict:
- GameWorld.DebugAnswer(curPlayer, "当前平台非QQ平台, 无法设置! ")
- return
-
- ybVIPLV = min(paramList[0], 8) # 钻等级
- isYBHighVIP = 0 if len(paramList) <= 1 else paramList[1] # 豪华
- isYBYearVIP = 0 if len(paramList) <= 2 else paramList[2] # 年费
-
- # 是否钻贵族
- if len(paramList) <= 3:
- isYBVIP = 1 if ybVIPLV > 0 else 0 # 没设置的情况下，有钻等级默认为钻贵族
- else:
- isYBVIP = paramList[3]
-
- platVIPData = int("%02d%s%s%s" % (ybVIPLV, isYBHighVIP, isYBYearVIP, isYBVIP))
- curPlayer.SetOperateInfo(platVIPData)
- PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer)
-
- GameWorld.DebugAnswer(curPlayer, "设置成功当前为 %s %s%s%s%s%s" % (platVIPData, "豪华版" if isYBHighVIP else "",
- "年费" if isYBYearVIP else "",
- qquserTypeDict.get(userType),
- "%s级" % ybVIPLV,
- "" if isYBVIP else "(已过期)",
- ))
- return
-
-def __AnswerHelp(curPlayer):
- GameWorld.DebugAnswer(curPlayer, "SetQQUser 钻等级, 是否豪华版, 是否包年, 是否贵族")
- GameWorld.DebugAnswer(curPlayer, "SetQQUser 0 清除qq会员信息")
- GameWorld.DebugAnswer(curPlayer, "SetQQUser pf 来源pf%s" % ChConfig.Def_Tencent_PF_List)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index ccbac65..88f6b5c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -690,9 +690,6 @@
# # 消费VIP
# PlayerCostVIP.CostVIPOnLogin(curPlayer, tick)
#
-# # QQ相关奖励OnLogin
-# #PlayerQQ.Sync_QQAllAwardRecord(curPlayer)
-#
# # 世界boss
BossHurtMng.OnLogin(curPlayer)
ChItem.Sync_ItemDayUseCnt(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQQ.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQQ.py
deleted file mode 100644
index 189e563..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerQQ.py
+++ /dev/null
@@ -1,557 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package PlayerQQ
-#
-# @todo:QQ奖励
-# @author zqx
-# @date 2014-12-03
-# @version 1.3
-#
-# 详细描述:
-# @change: "2016-09-13 15:00" hxp 代码调整
-# @change: "2016-09-14 03:50" xdh qzone奖励
-# @change: "2016-09-23 21:00" hxp 平台统一为tencent，功能奖励通过pf识别
-#
-#---------------------------------------------------------------------
-#"""Version = 2016-09-23 21:00"""
-#---------------------------------------------------------------------
-
-import ChConfig
-import GameWorld
-import ShareDefine
-import ReadChConfig
-import ItemControler
-import DataRecordPack
-import IPY_GameWorld
-import PlayerControl
-import ItemCommon
-import ChPlayer
-
-# 奖励类型对应记录key
-AwardType_KeyDict = {
-# ShareDefine.Def_RewardType_QQUpYellow:ChConfig.Def_PDict_QQUpYellowAwardRecord,
-# ShareDefine.Def_RewardType_QQUpBlue:ChConfig.Def_PDict_QQUpBlueAwardRecord,
-# ShareDefine.Def_RewardType_QQNewMan:ChConfig.Def_PDict_QQNewManAwardRecord,
-# ShareDefine.Def_RewardType_QQDayGift:ChConfig.Def_PDict_QQDayGiftAwardRecord,
-# ShareDefine.Def_RewardType_QzoneUp:ChConfig.Def_PDict_QzoneUpAwardRecord,
-# ShareDefine.Def_RewardType_QzoneNewMan:ChConfig.Def_PDict_QzoneNewManAwardRecord,
-# ShareDefine.Def_RewardType_QzoneDayGift:ChConfig.Def_PDict_QzoneDayAwardRecord,
- }
-
-
-# 定义奖励信息索引
-QQDayAwardIndexList = (
-Def_QQDayAward_YELLOW, # 黄钻
-Def_QQDayAward_BLUE, # 蓝钻
-Def_QQDayAward_YEAR_YELLOW, # 年费黄钻
-Def_QQDayAward_YEAR_BLUE, # 年费蓝钻
-) = range(4)
-
-QQGropUpRewardDict = {
-# ShareDefine.Def_QQPlatVIP_Yellow:ShareDefine.Def_RewardType_QQUpYellow,
-# ShareDefine.Def_QQPlatVIP_Blue:ShareDefine.Def_RewardType_QQUpBlue,
- }
-
-def GetTencentPF(curPlayer):
- ''' 获取腾讯平台来源pf '''
- pfValue = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_TencentPF)
- if pfValue <= 0:
- return ""
-
- if pfValue > len(ChConfig.Def_Tencent_PF_List):
- return ""
-
- return ChConfig.Def_Tencent_PF_List[pfValue - 1]
-
-##获取平台特权VIP类型
-# @param
-# @return 1-黄钻，2-蓝钻
-def GetQQPlatVIPType(curPlayer):
- if GameWorld.GetPlatform() != "tencent":
- return 0
- pf = GetTencentPF(curPlayer)
- QQLVTypeInfo = ReadChConfig.GetEvalChConfig("PlayerQQLVTypeDict")
- for platFormList, LVType in QQLVTypeInfo.items():
- if pf in platFormList:
- return LVType
- return 0
-
-##是否平台钻石VIP(第1位表示)
-# @param vipDataInfo: 平台VIP数据信息
-# @return: 0-不是； 1-是
-def IsPlatVIP(vipDataInfo):
- return GameWorld.GetDataByDigitPlace(vipDataInfo, 0)
-
-##是否年费钻石VIP(第2位表示)
-# @param vipDataInfo: 平台VIP数据信息
-# @return: 0-不是； 1-是
-def IsYearPlatVIP(vipDataInfo):
- return GameWorld.GetDataByDigitPlace(vipDataInfo, 1)
-
-##是否豪华版钻石VIP(第3位表示)
-# @param vipDataInfo: 平台VIP数据信息
-# @return: 0-不是； 1-是
-def IsHighPlatVIP(vipDataInfo):
- return GameWorld.GetDataByDigitPlace(vipDataInfo, 2)
-
-##平台钻石VIP等级(第4~5位表示)
-# @param vipDataInfo: 平台VIP数据信息
-# @return
-def GetPlatVIPLevel(vipDataInfo):
- return (vipDataInfo / pow(10, 3)) % 100
-
-## 通知奖励领取记录信息
-# @param curPlayer
-# @param awardType
-# @return None
-def Sync_QQAwardGetRecord(curPlayer, awardType):
- recordKey = AwardType_KeyDict.get(awardType)
- if not recordKey:
- GameWorld.DebugLog("Sync_QQAwardGetRecord() awardType(%s) not found" % awardType)
- return
- record = __GetQQPDictValue(curPlayer, recordKey)
- ChPlayer.Sync_RewardGetRecordInfo(curPlayer, awardType, record)
- return
-
-## 重置奖励领取记录
-# @param curPlayer
-# @param awardType 奖励类型
-# @return None
-def Sync_ResetQQAwardGetRecord(curPlayer, awardType):
- recordKey = AwardType_KeyDict.get(awardType)
- if not recordKey:
- GameWorld.DebugLog("Sync_ResetQQAwardGetRecord() awardType(%s) not found" % awardType)
- return
- __SetQQPDictValue(curPlayer, recordKey, 0)
- record = __GetQQPDictValue(curPlayer, recordKey)
- ChPlayer.Sync_RewardGetRecordInfo(curPlayer, awardType, record)
- return
-
-
-## 设置QQ玩家字典值
-# @param curPlayer
-# @param key: 字典key
-# @param value: 字典value
-# @return None
-def __SetQQPDictValue(curPlayer, key, value):
- PlayerControl.NomalDictSetProperty(curPlayer, key, value, ChConfig.Def_PDictType_QQ)
- return
-
-## 获取QQ玩家字典对应值
-# @param curPlayer
-# @param key: 字典key
-# @return 值
-def __GetQQPDictValue(curPlayer, key):
- return curPlayer.NomalDictGetProperty(key, 0, ChConfig.Def_PDictType_QQ)
-
-##设置领奖记录
-# @param curPlayer: 当前玩家实例
-# @param recordKey: 记录类型
-# @param getIndex: 奖励对应的记录位
-# @return
-def __SetAwardRecord(curPlayer, recordKey, getIndex):
- recordValue = __GetQQPDictValue(curPlayer, recordKey)
- recordState = recordValue | pow(2, getIndex)
- __SetQQPDictValue(curPlayer, recordKey, recordState)
- return
-
-## OnDay
-# @param curPlayer 玩家实例
-# @return
-def OnDay(curPlayer):
- #QQ每日礼包重置
- #Sync_ResetQQAwardGetRecord(curPlayer, ShareDefine.Def_RewardType_QQDayGift)
- #Sync_ResetQQAwardGetRecord(curPlayer, ShareDefine.Def_RewardType_QzoneDayGift)
- return
-
-## 同步QQ所有奖励记录
-# @param curPlayer
-# @return None
-def Sync_QQAllAwardRecord(curPlayer):
- for key in AwardType_KeyDict.keys():
- GameWorld.DebugLog("Sync_QQAllAwardRecord() RewardType(%s)" % (key))
- Sync_QQAwardGetRecord(curPlayer, key)
- return
-
-##检查是否已领取
-# @param curPlayer: 当前玩家实例
-# @param recordKey: 记录类型
-# @param getIndex: 奖励对应的记录位
-# @return True-已领取, False-未领取
-def __CheckIsGetAward(curPlayer, recordKey, getIndex):
- recordValue = __GetQQPDictValue(curPlayer, recordKey)
- recordState = recordValue & pow(2, getIndex)
- if recordState > 0:
- GameWorld.DebugLog(" recordKey=%s 已领取!recordValue=%s,getIndex=%s,recordState=%s"
- % (recordKey, recordValue, getIndex, recordState))
- return True
- return False
-
-##检查可否领取
-# @param curPlayer: 当前玩家实例
-# @param recordKey: 记录类型
-# @param qqLVType: 钻石类型
-# @param getLV: 领取等级
-# @return (奖励列表, 等级对应索引位)
-def __CheckCanGetLVAward(curPlayer, recordKey, qqLVType, getLV):
- qqRewardDict = ReadChConfig.GetEvalChConfig("PlayerQQUpReward")
- if qqLVType not in qqRewardDict.keys():
- # 没有该钻石类型奖励
- GameWorld.DebugLog("检查可否领取QQ成长礼包 QQLVType = %s, not have reward" % (qqLVType))
- return [], 0
-
- # 根据职业获取奖励
- qqLVRewardDict = __GetAwardByJob(curPlayer, qqRewardDict[qqLVType])
- getLVIndex = __GetLVRecordIndex(getLV, qqLVRewardDict)
- if getLVIndex < 0:
- # 没有该等级类型奖励
- GameWorld.DebugLog("检查可否领取QQ成长礼包 GetLV = %s, not have reward" % (getLV))
- return [], 0
-
- heroLV = curPlayer.GetLV()
- if heroLV < getLV:
- # 等级不足
- GameWorld.DebugLog("检查可否领取QQ成长礼包 heroLV = %s, lv not enough" % (heroLV))
- return [], 0
-
- if __CheckIsGetAward(curPlayer, recordKey, getLVIndex):
- return [], 0
-
- return qqLVRewardDict[getLV], getLVIndex
-
-## 根据职业获取奖励
-# @param curPlayer：玩家实例
-# @param qqRewardDict：奖励物品配置字典
-# @return None
-def __GetAwardByJob(curPlayer, qqRewardDict):
- infoKey = () # 默认key
- job = curPlayer.GetJob()
- for key in qqRewardDict.keys():
- # 如果玩家职业在配置的key里，则取指定的key信息
- if job in key:
- infoKey = key
- break
-
- return qqRewardDict[infoKey]
-
-##获取等级奖励对应的记录位
-# @param getLV: 领取等级
-# @param lvRewardDict: 等级奖励字典
-# @return :等级奖励对应的记录位
-def __GetLVRecordIndex(getLV, lvRewardDict):
- lvList = lvRewardDict.keys()
- lvList.sort()
- for i in range(len(lvList)):
- if getLV == lvList[i]:
- return i
- return -1
-
-##获取QQ成长奖励
-# @param curPlayer: 当前玩家实例
-# @param rewardType: 奖励类型
-# @param dataEx: 领取等级
-# @return
-def GetQQUpReward(curPlayer, rewardType, dataEx):
- getLV = dataEx
-
- getVIPType = GetQQPlatVIPType(curPlayer)
- if getVIPType not in QQGropUpRewardDict or QQGropUpRewardDict[getVIPType] != rewardType:
- GameWorld.DebugLog("获取QQ成长奖励的奖励类型不对")
- return
-
- # 不是平台VIP
- vipDataInfo = curPlayer.GetOperateInfo()
- if IsPlatVIP(vipDataInfo) <= 0:
- return
-
- recordKey = AwardType_KeyDict.get(rewardType)
- # 检查可否领取
- itemInfoList, getLVIndex = __CheckCanGetLVAward(curPlayer, recordKey, getVIPType, getLV)
- if not itemInfoList:
- GameWorld.DebugLog("can not Get QQUp LV Award!!!")
- return
-
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(itemInfoList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- # 给物品
- for itemID, itemCount, isBind in itemInfoList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
-
- # 更新已领取成功标记
- __SetAwardRecord(curPlayer, recordKey, getLVIndex)
-
- # 通知客户端
- Sync_QQAwardGetRecord(curPlayer, rewardType)
-
- addDataDict = {"getVIPType":getVIPType, "getLV":getLV, "getLVIndex":getLVIndex, "itemInfoList":itemInfoList}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QQUpReward", addDataDict)
- GameWorld.DebugLog("领取QQ成长礼包: getVIPType=%s,getLV=%s,getLVIndex=%s,recordKey=%s"
- % (getVIPType, getLV, getLVIndex, recordKey))
- return
-
-def GetQQNewManAward(curPlayer, awardType, dataEx):
- # 领取QQ新手礼包
-
- GameWorld.DebugLog("GetQQNewManAward()")
- playerID = curPlayer.GetPlayerID()
- platVIPType = GetQQPlatVIPType(curPlayer)
- getVIPType = dataEx
- if platVIPType != getVIPType:
- GameWorld.ErrLog("领取QQ新手礼包 platVIPType(%s) != getVIPType(%s)" % (platVIPType, getVIPType), playerID)
- return
-
- vipDataInfo = curPlayer.GetOperateInfo()
- if not IsPlatVIP(vipDataInfo):
- GameWorld.DebugLog("领取QQ新手礼包 未开通会员 platVIPType = %s, OperateInfo=%s" % (platVIPType, vipDataInfo), playerID)
- return
-
- # 是否已领取
- recordValue = __GetQQPDictValue(curPlayer, ChConfig.Def_PDict_QQNewManAwardRecord)
- if recordValue & pow(2, getVIPType):
- GameWorld.DebugLog("领取QQ新手礼包 已领取! recordValue=%s,getVIPType=%s" % (recordValue, getVIPType), playerID)
- return
-
- awardItemDict = ReadChConfig.GetEvalChConfig("PlayerQQNewMan")
- awardItemList = awardItemDict.get(getVIPType)
-
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(awardItemList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- # 给物品
- for itemID, itemCount, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
-
- # 更新已领取成功标记
- updRecord = recordValue | pow(2, getVIPType)
- __SetQQPDictValue(curPlayer, ChConfig.Def_PDict_QQNewManAwardRecord, updRecord)
-
- # 通知客户端
- Sync_QQAwardGetRecord(curPlayer, awardType)
-
- addDataDict = {"recordValue":recordValue, "updRecord":updRecord, "getVIPType":getVIPType, "awardItemList":awardItemList}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QQNewManAward", addDataDict)
- GameWorld.DebugLog("领取QQ新手礼包 getVIPType=%s,recordValue=%s,updRecord=%s" % (getVIPType, recordValue, updRecord), playerID)
- return
-
-
-## 领取QQ每日礼包
-# @param curPlayer: 玩家实例
-# @param awardType: 领奖类型
-# @param dataEx: 预留参数
-# @return
-def GetQQDayGift(curPlayer, awardType, dataEx):
- awardIndex = dataEx
- playerID = curPlayer.GetPlayerID()
-
- if awardIndex not in QQDayAwardIndexList:
- return
-
- getVIPType = GetQQPlatVIPType(curPlayer)
- if getVIPType < 0:
- GameWorld.DebugLog("领取QQ每日礼包 非QQ平台 ")
- return
-
- vipDataInfo = curPlayer.GetOperateInfo()
- if not IsPlatVIP(vipDataInfo):
- GameWorld.DebugLog("领取QQ每日礼包 未开通会员 getVIPType = %s" % getVIPType)
- return
-
- if awardIndex in [Def_QQDayAward_YEAR_YELLOW, Def_QQDayAward_YEAR_BLUE]:
- if not IsYearPlatVIP(vipDataInfo):
- GameWorld.DebugLog("领取QQ每日礼包 非年费!")
- return
-
- # 是否已领取
- recordValue = __GetQQPDictValue(curPlayer, ChConfig.Def_PDict_QQDayGiftAwardRecord)
- if recordValue & pow(2, awardIndex):
- GameWorld.DebugLog("领取QQ每日礼包 已领取! recordValue=%s,getVIPType=%s" % (recordValue, awardIndex), playerID)
- return
-
- awardItemDict = ReadChConfig.GetEvalChConfig("PlayerQQDayGift")
- awardItemList = awardItemDict.get(awardIndex)
- if awardIndex in [Def_QQDayAward_YELLOW, Def_QQDayAward_BLUE]:
- QQlv = GetPlatVIPLevel(vipDataInfo)
- awardItemList = awardItemList.get(QQlv, [])
-
- if not awardItemList:
- GameWorld.ErrLog("领取QQ每日礼包 找不到奖励物品! awardIndex=%s" % (awardIndex), playerID)
- return
-
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(awardItemList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- GameWorld.DebugLog("awardItemList=%s" % awardItemList)
- # 给物品
- for itemID, itemCount, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
-
- # 更新已领取成功标记
- updRecord = recordValue | pow(2, awardIndex)
- __SetQQPDictValue(curPlayer, ChConfig.Def_PDict_QQDayGiftAwardRecord, updRecord)
-
- # 通知客户端
- Sync_QQAwardGetRecord(curPlayer, awardType)
-
- addDataDict = {"recordValue":recordValue, "updRecord":updRecord, "getVIPType":getVIPType,
- "awardIndex":awardIndex, "awardItemList":awardItemList}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QQDayGift", addDataDict)
- GameWorld.DebugLog("领取QQ每日礼包 getVIPType=%s,awardIndex=%s,recordValue=%s,updRecord=%s"
- % (getVIPType, awardIndex, recordValue, updRecord), playerID)
- return
-
-
-#########################
-## 是否QQ空间平台
-def IsQzonePlatForm(curPlayer):
- return GetTencentPF(curPlayer) == 'qzone'
-
-##获取Qzone成长奖励
-# @param curPlayer: 当前玩家实例
-# @param rewardType: 奖励类型
-# @param dataEx: 领取等级
-# @return
-def GetQzoneUpReward(curPlayer, rewardType, dataEx):
- if not IsQzonePlatForm(curPlayer):
- GameWorld.DebugLog("不是qzone平台")
- return
-
- awardIndex = dataEx
-
- QzoneLVAwardList = ReadChConfig.GetEvalChConfig("QzoneLVAward")
- if awardIndex < 0 or awardIndex >=len(QzoneLVAwardList):
- GameWorld.DebugLog("GetQzoneUpReward() 检查QzoneLVAward.txt awardIndex=%s"%awardIndex)
- return
-
- needLV, itemList = QzoneLVAwardList[awardIndex]
-
- # 检查可否领取
- if curPlayer.GetLV() < needLV:
- GameWorld.DebugLog("GetQzoneUpReward() 等级不足%s"%needLV)
- return
-
- # 检查是否已领取
- recordKey = AwardType_KeyDict.get(rewardType)
- if __CheckIsGetAward(curPlayer, recordKey, awardIndex):
- return
-
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(itemList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- # 给物品
- for itemID, itemCount, isBind in itemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
-
- # 更新已领取成功标记
- __SetAwardRecord(curPlayer, recordKey, awardIndex)
-
- # 通知客户端
- Sync_QQAwardGetRecord(curPlayer, rewardType)
-
- addDataDict = {"getLV":needLV, "getLVIndex":awardIndex, "itemList":itemList}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QzoneUpReward", addDataDict)
- GameWorld.DebugLog("Qzone成长奖励:getLV=%s,getLVIndex=%s,recordKey=%s"
- % (needLV, awardIndex, recordKey))
- return
-
-## 获取Qzone新手奖励
-def GetQzoneNewManAward(curPlayer, awardType, dataEx):
- if not IsQzonePlatForm(curPlayer):
- GameWorld.DebugLog("不是qzone平台")
- return
-
- # 领取Qzone新手礼包
- GameWorld.DebugLog("GetQzoneNewManAward()")
- playerID = curPlayer.GetPlayerID()
-
- # 是否已领取
- recordKey = AwardType_KeyDict.get(awardType)
- recordValue = __GetQQPDictValue(curPlayer, recordKey)
- if recordValue:
- GameWorld.DebugLog("GetQzoneNewManAward() 已领取!", playerID)
- return
-
- awardItemList = ReadChConfig.GetEvalChConfig("QzoneNewManAward")
-
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(awardItemList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- # 给物品
- for itemID, itemCount, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
-
- # 更新已领取成功标记
- __SetQQPDictValue(curPlayer, recordKey, 1)
-
- # 通知客户端
- Sync_QQAwardGetRecord(curPlayer, awardType)
-
- addDataDict = {"awardItemList":awardItemList}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QzoneNewManAward", addDataDict)
- GameWorld.DebugLog("GetQzoneNewManAward() 领取成功", playerID)
- return
-
-
-## 领取Qzone每日礼包
-# @param curPlayer: 玩家实例
-# @param awardType: 领奖类型
-# @param dataEx: 预留参数
-# @return
-def GetQzoneDayGift(curPlayer, awardType, dataEx):
- if not IsQzonePlatForm(curPlayer):
- GameWorld.DebugLog("不是qzone平台")
- return
-
- playerID = curPlayer.GetPlayerID()
-
-
- # 是否已领取
- recordKey = AwardType_KeyDict.get(awardType)
- recordValue = __GetQQPDictValue(curPlayer, recordKey)
- if recordValue:
- GameWorld.DebugLog("领取QQ每日礼包 已领取!" , playerID)
- return
-
- awardItemList = ReadChConfig.GetEvalChConfig("QzoneDayAward")
-
- # 检查背包
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem)
- if len(awardItemList) > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
- return
-
- # 给物品
- for itemID, itemCount, isBind in awardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem])
-
- # 更新已领取成功标记
- __SetQQPDictValue(curPlayer, recordKey, 1)
-
- # 通知客户端
- Sync_QQAwardGetRecord(curPlayer, awardType)
-
- addDataDict = {"awardItemList":awardItemList}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QzoneDayGift", addDataDict)
- GameWorld.DebugLog("领取QQ每日礼包 成功" , playerID)
- return
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTTaskMarket.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTTaskMarket.py
deleted file mode 100644
index 1599ade..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTTaskMarket.py
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.RemoteQuery.GY_Query_GMTTaskMarket
-#
-# @todo:腾讯任务集市
-# @author hxp
-# @date 2016-09-18
-# @version 1.0
-#
-# 详细描述: 腾讯任务集市
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2016-09-18 18:00"""
-#-------------------------------------------------------------------------------
-
-import PlayerQQ
-import GameWorld
-import QuestCommon
-import ReadChConfig
-import PlayerControl
-#import PlayerPrestigeSys
-import DataRecordPack
-import ShareDefine
-import PlayerPet
-import ChConfig
-import FBLogic
-
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#标准返回码如下：
-#0: 步骤已完成 或 奖励发放成功
-#1: 用户尚未在应用内创建角色
-#2：用户尚未完成本步骤
-#3：该步骤奖励已发放过
-#100: token已过期
-#101: token不存在
-#102: 奖励发放失败
-#103: 请求参数错误
-
-#{"ret":0,"msg":"OK","zoneid":"1"}
-#{"ret":200,"msg":"参数错误","zoneid":"1"}
-#注：返回码0-200为平台保留， 开发者自定义返回码务必在200-10000之间。返回码必须严格遵守规范，若不遵守，将出现外网故障。
-
-Def_Ret_OK = 0
-Def_Ret_NoFinish = 2
-Def_Ret_AwardGot = 3
-Def_Ret_TokenNotExist = 101
-Def_Ret_AwardFail = 102
-Def_Ret_ParamErr = 103
-
-Def_CustomRet_ParamErr = 201 # 自定义参数错误
-Def_CustomRet_Condition_Nonsupport = 202 # 任务条件不支持
-
-(
-Def_QQTM_MailContent, # 奖励邮件内容模板
-Def_QQTM_MailGetDays, # 奖励邮件有效天
-Def_QQTM_InfoDict, # 任务信息字典
-) = range(3)
-
-#逻辑实现
-## 请求逻辑
-# @param query_Type 请求类型
-# @param query_ID 玩家ID
-# @param packCMDList 发包命令
-# @param tick 当前时间
-# @return "True" or "False" or ""
-# @remarks 函数详细说明.
-def DoLogic(query_Type, query_ID, packCMDList, tick):
-
- GameWorld.DebugLog("GY_Query_GMTTaskMarket %s" % packCMDList)
- orderId, gmCmdDict = packCMDList
-
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
- if not curPlayer or curPlayer.IsEmpty():
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, {"ret":Def_Ret_TokenNotExist,"msg":"token不存在"})
- return
-
- #参数: cmd 执行命令
- # check: 开发者仅需要查询任务步骤是否完成，返回步骤完成状态。
- # check_award: 开发者需要查询任务步骤是否完成，若步骤已完成，直接给用户发货（payitem），并返回发货是否成功。
- # award: 平台通知开发者直接给给用户发货，开发者返回发货是否成功。
- cmd = gmCmdDict.get("cmd", '')
- if not cmd or cmd not in ["check", "check_award", "award"]:
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, {"ret":Def_Ret_ParamErr,"msg":"请求参数错误(cmd)"})
- return
-
- #参数: contractid # 任务ID, 由广点通任务创建后自动生成
- contractid = gmCmdDict.get("contractid", '')
- if not contractid:
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, {"ret":Def_Ret_ParamErr,"msg":"请求参数错误(contractid)"})
- return
-
- #参数: step 任务步骤
- # 任务的步骤，step从1开始计。step=1表示第一步，四个步骤都是必选。
- # 第一步内容固定为进入应用，由平台判断用户是否完成。
- # 第四步内容为连续三天登陆，由平台判断用户是否完成。
- # 第二步、第三步内容和完成判断均由开发者自由实现（内容不可为连续登陆、充值等条件）
- step = GameWorld.ToIntDef(gmCmdDict.get("step"), 0)
- if step not in [1, 2, 3, 4]:
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, {"ret":Def_Ret_ParamErr,"msg":"请求参数错误(step)"})
- return
-
- #参数: payitem 道具礼包id
- # 若本次回调需要发货（cmd字段值为check_award 或 award），本字段值为该步骤道具礼包id，开发者需直接给用户发放该id的道具礼包。
- # 其他情况，本字段值为空。
- payitem = GameWorld.ToIntDef(gmCmdDict.get("payitem"), 0)
- if cmd in ["check_award", "award"] and payitem <= 0:
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, {"ret":Def_Ret_ParamErr,"msg":"请求参数错误(payitem)"})
- return
-
- #参数: billno # 发放奖励流水号，由平台生成，传给应用。应用需记录该流水号，用于开发商与平台对帐。
- billno = gmCmdDict.get("billno", '')
-
- ##--------------------------- 腾讯请求接口参数检查完毕 ---------------------------
-
- qqtmCfg = ReadChConfig.GetEvalChConfig("QQTaskMarket")
- taskMarketDict = qqtmCfg[Def_QQTM_InfoDict]
- if contractid not in taskMarketDict:
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, {"ret":Def_CustomRet_ParamErr,"msg":"参数错误(contractid)未配置"})
- return
- taskNum, conditionDict = taskMarketDict[contractid]
-
- ##--------------------------- 以下具体逻辑 ---------------------------
-
- if cmd == "check":
- retMsg = __DoQQTM_Check(curPlayer, contractid, step, conditionDict)
-
- elif cmd == "check_award":
- retMsg = __DoQQTM_Check_Award(curPlayer, contractid, step, conditionDict, taskNum, payitem, billno, qqtmCfg)
-
- # 进1，4 步骤可以直接发放奖励
- elif cmd == "award" and step in [1, 4]:
- retMsg = __DoQQTM_Award(curPlayer, contractid, step, taskNum, payitem, billno, qqtmCfg)
-
- else:
- retMsg = {"ret":Def_Ret_ParamErr,"msg":"请求参数错误(cmd step)"}
-
- __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, retMsg)
- return
-
-#---------------------------------------------------------------------
-#执行结果
-## 执行结果
-# @param curPlayer 发出请求的玩家
-# @param callFunName 功能名称
-# @param funResult 查询的结果
-# @param tick 当前时间
-# @return None
-# @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
- return
-
-def __DoQQTM_Check(curPlayer, contractid, step, conditionDict):
- # 有需要检查则需要配置条件
- if step not in conditionDict:
- return {"ret":Def_CustomRet_ParamErr,"msg":"参数错误(step)未配置"}
-
- conditionInfo = conditionDict[step]
- conditionType = conditionInfo[0] # 任务条件类型
-
- ret = Def_Ret_NoFinish
-
- # 等级
- if conditionType == "LV":
- if curPlayer.GetLV() >= conditionInfo[1]:
- ret = Def_Ret_OK
-
- # 家族
- elif conditionType == "Family":
- if curPlayer.GetFamilyID() > 0:
- ret = Def_Ret_OK
-
-# # 宠物
-# elif conditionType == "Pet":
-# petNPCID, petLV = conditionInfo[1:]
-# petItemIndex = PlayerPet.GetPetDataItemIndexByNPCID(curPlayer, petNPCID)
-# if petItemIndex >= 0:
-# petDataItem = PlayerPet.GetPetDataItemByIndex(curPlayer, petItemIndex)
-# if petDataItem and petDataItem.GetUserAttr(ShareDefine.Def_IudetPet_StarLV) >= petLV:
-# ret = Def_Ret_OK
-
-# # 官爵星级
-# elif conditionType == "Official":
-# officialLV, star = conditionInfo[1:]
-# curOfficialLV = curPlayer.GetOfficialRank()
-# curStar = PlayerPrestigeSys.GetOfficialStarIndex(curPlayer)
-# if curOfficialLV > officialLV or (curOfficialLV == officialLV and curStar >= star):
-# ret = Def_Ret_OK
-
-# # 坐骑
-# elif conditionType == "Horse":
-# classLV, starLV = conditionInfo[1:]
-# curClassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Horser_ClassLV, 0, ChConfig.Def_PDictType_Horse)
-# curStarLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Horser_StarLV, 0, ChConfig.Def_PDictType_Horse)
-# if curClassLV > classLV or (curClassLV == classLV and curStarLV >= starLV):
-# ret = Def_Ret_OK
-
- # 参与副本
- elif conditionType == "FBEnter":
- mapID = conditionInfo[1]
- if FBLogic.GetHadEnterFB(curPlayer, mapID):
- ret = Def_Ret_OK
-
- # 完成任务
- elif conditionType == "Mission":
- missionID = conditionInfo[1]
- if QuestCommon.GetHadFinishMainMission(curPlayer, missionID):
- ret = Def_Ret_OK
-
- # 其他条件支持在此扩展
- else:
- return {"ret":Def_CustomRet_Condition_Nonsupport,"msg":"不支持该条件查询(%s)" % conditionType}
-
- return {"ret":ret,"msg":"步骤已完成" if ret == Def_Ret_OK else "用户尚未完成本步骤"}
-
-def __DoQQTM_Check_Award(curPlayer, contractid, step, conditionDict, taskNum, payitem, billno, qqtmCfg):
- retMsg = __DoQQTM_Check(curPlayer, contractid, step, conditionDict)
- if retMsg.get("ret") == Def_Ret_OK:
- retMsg = __DoQQTM_Award(curPlayer, contractid, step, taskNum, payitem, billno, qqtmCfg)
- return retMsg
-
-def __DoQQTM_Award(curPlayer, contractid, step, taskNum, payitem, billno, qqtmCfg):
- ret = Def_Ret_AwardFail
- msg = "奖励发放失败"
- tmAwardRecord = PlayerQQ.__GetQQPDictValue(curPlayer, ChConfig.Def_PDict_QQTaskMarketRecord % taskNum)
- if tmAwardRecord&pow(2, step):
- ret = Def_Ret_AwardGot
- msg = "该步骤奖励已发放过"
- else:
- isOK = PlayerControl.SendMail("", qqtmCfg[Def_QQTM_MailContent], qqtmCfg[Def_QQTM_MailGetDays],
- [curPlayer.GetPlayerID()], [(payitem, 1, 1)])
- if isOK:
- PlayerQQ.__SetQQPDictValue(curPlayer, ChConfig.Def_PDict_QQTaskMarketRecord % taskNum, tmAwardRecord|pow(2, step))
- ret = Def_Ret_OK
- msg = "奖励发放成功"
- addDataDict = {"contractid":contractid, "step":step, "taskNum":taskNum, "payitem":payitem, "billno":billno}
- DataRecordPack.DR_FuncGiveItem(curPlayer, "QQTaskMarketMail", addDataDict)
-
- return {"ret":ret,"msg":msg}
-
-def __GameServer_QueryPlayerResult(orderId, query_ID, curPlayer, retMsg):
- GameWorld.Log("GMT_TaskMarket retMsg=%s" % retMsg)
-
- playerName = "" if not curPlayer else curPlayer.GetPlayerName()
- accID = "" if not curPlayer else curPlayer.GetAccID()
-
- resultMsg = str([orderId, retMsg, 'GMT_TaskMarket'])
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GMToolResult', resultMsg, len(resultMsg))
- DataRecordPack.DR_ToolGMOperate(query_ID, playerName, accID, 'GMT_TaskMarket', resultMsg)
- return
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_LoginData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_LoginData.py
index 124dc66..8ad47a3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_LoginData.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_LoginData.py
@@ -77,12 +77,6 @@
pid = result[2]
platform = result[3]
account_type = result[4]
-
- if platform in ChConfig.Def_Tencent_PF_List:
- pf = ChConfig.Def_Tencent_PF_List.index(platform) + 1
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_TencentPF, pf)
- else:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_TencentPF, 0)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_PlayerFromPID, pid)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_Account_Type, account_type)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 2a0215c..287d675 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1338,22 +1338,6 @@
# 玩家字典按数位存储数据个数
Def_PDictDigitCnt = 9
-# 副本评分类型
-(
-ScoreType_TimeConsume, # 耗时结算类型
-ScoreType_KillStat, # 击杀怪物统计
-ScoreType_NewGuySuperShow, # 击杀怪物统计
-ScoreType_GetItem, # 获得物品奖励统计
-ScoreType_RedFortReward, # 打开客户端frmRedFortReward
-)=range(5)
-
-ScoreTypeName = "TScore"
-
-Def_QQPlatVIPTypeList = (
-Def_QQPlatVIP_Yellow, #黄钻
-Def_QQPlatVIP_Blue, #蓝钻
-) = range(1, 3)
-
# VIP类型定义
(
Def_VIPType_Not, # 非VIP
--
Gitblit v1.8.0