From 9cc23ba064d9daf14a9085685f961b10d4f379f3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 17:15:23 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(召回系统)

---
 /dev/null                                                                              |   58 -----------------------------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini                |   17 --------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py     |    3 -
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py                   |   10 -----
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py                             |    1 
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |    3 -
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py                          |    3 -
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py        |    4 --
 8 files changed, 0 insertions(+), 99 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index da10f58..c83e7ad 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -615,7 +615,6 @@
 Def_PlayerDataCollect_Key = 0x86
 
 #---SetDict  玩家字典不存数据库---
-Def_Player_NoSave_Dict_RecallCountGift = 'RecallCountGift_0'    # 召回玩家个数奖励发包限制
 Def_Player_NoSave_Dict_PlayerExamRightCnt = 'PlayerExamRightCnt_1_%s'  # 玩家答题正确数量
 Def_Player_NoSave_Dict_PlayerExamCRightCnt = 'PlayerExamCRightCnt_1_%s'  # 玩家答题连续正确数量
 
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/RecallCnt.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/RecallCnt.py
deleted file mode 100644
index fd85b67..0000000
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/RecallCnt.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package RecallCnt
-#
-# @todo: 设置召回个数
-# @author Alee
-# @date 2011-07-22 15:00
-# @version 1.0
-#
-# 详细描述:
-#------------------------------------------------------------------------------ 
-"""Version = 2011-07-22 15:00"""
-#导入
-import ChConfig
-import GameWorld
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-
-## 执行逻辑
-#  @param curPlayer 当前玩家
-#  @param cmList 参数列表
-#  @return None
-#  @remarks 函数详细说明.
-def OnExec(curPlayer, cmList):
-    playerID = curPlayer.GetPlayerID()
-
-    cmdLen = len(cmList)
-    if cmdLen == 2:
-        cnt, flag = cmList
-    elif cmdLen == 3:    
-        playerID, cnt, flag = cmList
-    else:
-        GameWorld.Log("参数不对")
-        return
-    
-    limit = pow(2, 32) - 1
-    if cnt >= limit or flag >= limit:
-        GameWorld.Log("数值异常")
-        return
-    
-    recallMgr = GameWorld.GetGameWorld().GetPlayerRecallMgr()
-    recall = recallMgr.FindPlayerRecallByPlayerID(playerID)
-    
-    if recall == None:
-        GameWorld.Log("未申请过邀请码 %s"%playerID)
-        return
-    
-    #初始化一次
-    recall = recallMgr.GetPlayerRecallByPlayerID(playerID)
-    recall.SetRecallCount(cnt)
-    recall.SetReceiveFlag(flag)
-    
-    curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
-    if not curPlayer:
-        return
-    
-    curPlayer.Sync_PlayerRecallInfo(cnt, flag)
-    curPlayer.Sync_SendInviteCode(playerID)
-
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index cd02fab..7672c0a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -37,7 +37,6 @@
 import PlayerBillboard
 import PlayerExam
 import PlayerControl
-import PlayerRecall
 import PlayerFamilyAction
 import PlayerUniversalGameRec
 import PlayerFamily
@@ -546,11 +545,6 @@
         PlayerControl.TeamNotify(teamID, msg, msgList)
         return
     
-    if callName == 'ReveiveRecallAward':
-        #召回奖励领取情况
-        PlayerRecall.ReveiveRecallAwardResult(srcPlayerID, resultName)
-        return
-    
     if callName == "NotifyTruckDestroy":
         killTruckPlayerName, exp, zhenQi, prestige, moneyCnt, moneyType = eval(resultName)
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -872,10 +866,6 @@
             return
         resultName = '%s' % ret
         
-    if callName == 'SendInviteCode':
-        #邀请码验证回复
-        resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())
-    
     if callName == 'OpenServerCampaignAward':
         #可否领取开服活动奖励
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRecall.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRecall.py
deleted file mode 100644
index 5669631..0000000
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRecall.py
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package PlayerRecall
-#
-# @todo: 玩家召回玩家
-# @author Alee
-# @date 2011-07-22 15:00
-# @version 1.5
-#
-# 详细描述:
-# @change: "2011-07-25 19:00" Alee 领取奖励判定和申请邀请码通知
-# @change: "2011-07-26 15:30" Alee GameServer和MapServer交互间隔无判断导致,领取多份礼物
-# @change: "2011-07-29 11:40" Alee 修改记录玩家提交邀请码
-# @change: "2011-07-29 17:30" Alee 详细记录和输出
-# @change: "2012-05-16 14:30" jiang C++接口修改MapServer_QueryPlayerResult和MapServer_QueryPlayer修改
-#------------------------------------------------------------------------------ 
-"""Version = 2012-05-16 14:30"""
-#------------------------------------------------------------------------------ 
-
-import GameWorld
-import ChConfig
-import ReadChConfig
-import ShareDefine
-import PlayerControl
-import IPY_GameServer
-
-##登陆同时客户端玩家召回信息
-# @param curPlayer 玩家实例
-# @return None
-def LoginSync_PlayerRecallInfo(curPlayer):
-    if ReadChConfig.GetEvalChConfig('PlayerRecall_Open') != ShareDefine.Def_Player_Recall_Open:
-        return
-    
-    playerID = curPlayer.GetPlayerID()
-    
-    recallMgr = GameWorld.GetGameWorld().GetPlayerRecallMgr()
-    recall = recallMgr.FindPlayerRecallByPlayerID(playerID)
-    
-    if recall == None:
-        return
-    recallCount = recall.GetRecallCount()
-    awardInfo = recall.GetReceiveFlag()
-    
-    #GameWorld.Log("上线通知客户端 %s,%s,%s"%(playerID, recallCount, awardInfo))
-    curPlayer.Sync_PlayerRecallInfo(recallCount, awardInfo)
-    curPlayer.Sync_SendInviteCode(playerID)
-    
-    return
-
-##玩家发送邀请码
-# @param srcPlayerID 发送者ID
-# @param tagPlayerID 邀请者ID
-# @return 0失败 1成功
-def PlayerRecall_InviteCode(srcPlayerID, tagPlayerID):
-    srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-    if not srcPlayer:
-        GameWorld.ErrLog("PlayerRecall_InviteCode no srcPlayer id=%s"%srcPlayerID)
-        return '0'
-    
-    recallMgr = GameWorld.GetGameWorld().GetPlayerRecallMgr()
-    recall = recallMgr.FindPlayerRecallByPlayerID(tagPlayerID)
-    
-    if recall == None:
-        return '0'
-
-    recallCount = recall.GetRecallCount() + 1
-    recall.SetRecallCount(recallCount)
-    
-    srcPlayerName = srcPlayer.GetName()
-
-    #通知客户端
-    tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
-    if not tagPlayer:
-        return '1'
-    
-    tagPlayer.Sync_PlayerRecallInfo(recallCount, recall.GetReceiveFlag())
-    PlayerControl.NotifyCode(tagPlayer, "GeRen_lhs_592851", [srcPlayerName, recallCount])
-    
-    return '1'
-
-#===============================================================================
-# //03 3C 领取召回奖励#tagCReceiveRecallReward
-# struct tagCReceiveRecallReward
-# {
-#         tagHead Head;
-#         WORD RecallCount; //召回个数
-# };
-#===============================================================================
-##领取召回个数奖励
-#@param index 玩家索引
-#@param tick 时间戳
-#@return 返回值无意义
-def ReceiveRecallReward(index, tick):
-    if ReadChConfig.GetEvalChConfig('PlayerRecall_Open') != ShareDefine.Def_Player_Recall_Open:
-        return
-    
-    pack = IPY_GameServer.IPY_CReceiveRecallReward()
-    recallCount = pack.GetRecallCount()
-    
-    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    playerID = curPlayer.GetID()
-    
-    recallMgr = GameWorld.GetGameWorld().GetPlayerRecallMgr()
-    recall = recallMgr.FindPlayerRecallByPlayerID(curPlayer.GetPlayerID())
-    
-    if recall == None:
-        GameWorld.ErrLog("ReceiveRecallReward 没有申请过邀请码", playerID)
-        return
-    
-    realCount = recall.GetRecallCount()
-    #领取奖励人数验证
-    if recallCount > realCount:
-        GameWorld.ErrLog("ReceiveRecallReward CntErr packCount=%s realCount=%s"%(recallCount, realCount), playerID)
-        return
-    
-    awardDict = ReadChConfig.GetEvalChConfig('PlayerRecall_RecallCount')
-    
-    awardList = awardDict.get(recallCount)
-    if awardList == None:
-        GameWorld.ErrLog("ReceiveRecallReward AwardErr count=%s awardDict=%s"%(recallCount, awardDict), playerID)
-        return
-    
-    #添加字典用于在MapServer 回复消息前,限制发包,未确认结果
-    if curPlayer.GetDictByKey(ChConfig.Def_Player_NoSave_Dict_RecallCountGift) == 1:
-        return
-    
-    curPlayer.SetDict(ChConfig.Def_Player_NoSave_Dict_RecallCountGift, 1)
-
-    awardFlag = awardList[0]
-    realFlag = recall.GetReceiveFlag()
-    
-    #验证是否领取过,真正的判断是否领取
-    if awardFlag&realFlag != 0:
-
-        #因为要领不同的礼物,在判断已领取后还原可处理下一个包标识
-        curPlayer.SetDict(ChConfig.Def_Player_NoSave_Dict_RecallCountGift, 0)
-        
-        GameWorld.ErrLog("ReceiveRecallReward HadReceive count=%s awardFlag=%s, \
-                         realFlag=%s"%(recallCount, awardFlag, realFlag), playerID)
-        return
-    
-    mapID = GameWorld.GetQueryPlayerMapID(curPlayer)
-    
-    #GameWorld.Log("发送给MapServer")
-    #发送请求至目标地图
-    GameWorld.GetPlayerManager().MapServer_QueryPlayer(playerID, 0, playerID, mapID, 
-                                                       'ReveiveRecallAward', 
-                                                       '%s'%awardList, len(str(awardList)),
-                                                       curPlayer.GetRouteServerIndex())
-    return
-
-##领取召回个数奖励
-#@param srcPlayerID 玩家ID
-#@param resultName 领取结果
-#@return 返回值无意义
-def ReveiveRecallAwardResult(srcPlayerID, resultName):
-    srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-    if not srcPlayer:
-        return
-    
-    #恢复可处理包逻辑
-    srcPlayer.SetDict(ChConfig.Def_Player_NoSave_Dict_RecallCountGift, 0)
-
-    #领取失败退出
-    if resultName == '0':
-        return
-    
-    recallMgr = GameWorld.GetGameWorld().GetPlayerRecallMgr()
-    recall = recallMgr.FindPlayerRecallByPlayerID(srcPlayerID)
-    
-    if recall == None:
-        return
-    
-    curFlag = int(resultName)|recall.GetReceiveFlag()
-    recall.SetReceiveFlag(curFlag)
-
-    srcPlayer.Sync_PlayerRecallInfo(recall.GetRecallCount(), curFlag)
-    return
-
-#===============================================================================
-# //03 3F 申请邀请码#tagCRequestInviteCode
-# struct tagCRequestInviteCode
-# {
-#         tagHead Head;
-# };
-#===============================================================================
-##申请邀请码
-#@param index 玩家索引
-#@param tick 时间戳
-#@return 返回值无意义
-def ApplyInviteCode(index, tick):
-    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    playerID = curPlayer.GetPlayerID()
-    
-    recallMgr = GameWorld.GetGameWorld().GetPlayerRecallMgr()
-    recall = recallMgr.FindPlayerRecallByPlayerID(playerID)
-    
-    if recall != None:
-        return
-    
-    if playerID < 0:
-        #以后可以删除了
-        GameWorld.ErrLog('ApplyInviteCode 玩家ID=%s异常'%playerID)
-    
-    #初始化一次
-    recall = recallMgr.GetPlayerRecallByPlayerID(playerID)
-    recall.SetRecallCount(0)
-    recall.SetReceiveFlag(0)
-    
-    curPlayer.Sync_PlayerRecallInfo(0, 0)
-    curPlayer.Sync_SendInviteCode(playerID)
-    PlayerControl.NotifyCode(curPlayer, 'GeRen_lhs_770488')
-    
-    return
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index f205662..ab51ac3 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -757,9 +757,6 @@
 Def_Cheater_CharArg = 200    #字符参数
 #---------------------------------------------------------------------
 
-#玩家回归开关 1开
-Def_Player_Recall_Open = 1
-
 #---竞技场---
 #竞技场房间状态
 Def_VsRoom_State = range(0,3)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
index b5ccd8f..0dedbe8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
@@ -1231,23 +1231,6 @@
 PacketSubCMD_1=0xFE
 PacketCallFunc_1=RecNetPack
 
-
-;玩家回归
-[PlayerRecall]
-ScriptName = Player\PlayerRecall.py
-Writer = Alee
-Releaser = Alee
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0x03
-PacketSubCMD_1=0x3D
-PacketCallFunc_1=PlayerBackAward
-
-PacketCMD_2=0x03
-PacketSubCMD_2=0x3E
-PacketCallFunc_2=RecallInviteCode
-
 ;玩家称号
 [PlayerDienstgrad]
 ScriptName = Player\PlayerDienstgrad
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index d2d9578..512d6d0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3030,7 +3030,6 @@
 Def_PlayerKey_PowerPartCount = "PowerPartCount"     # 蓄力技能能量次数
 Def_PlayerKey_ClientMaxHurtValue = "CMaxHValue"     # 缓存单次技能攻击的最大伤害, 减少计算量
 Def_Player_RefreshAttr = "Player_RefreshAttr"   # 玩家刷新属性标志
-Def_Player_NoSave_Dict_SendInviteCode = "SendInviteCode_0"    # 玩家提交邀请码次数验证
 Def_PlayerKey_LoadMapIsLogin = 'LoadMapIsLogin'    # 本次进入地图是否是登录的
 Def_PlayerKey_NotifyAllAttrState = 'NotifyAllAttrState'    # 是否同步过所有属性,切图时第一次刷属性需要同步
 Def_PlayerKey_LoginTick = 'PlayerKey_LoginTick'    # 玩家上线的当前服务器tick
@@ -3321,9 +3320,6 @@
 Def_Player_Dict_CabinetCount_WeaponCoat = "CabinetCount_WeaponCoat_40"    #武器收纳柜
 Def_Player_Dict_CabinetCount_DressCoat = "CabinetCount_DressCoat_41"     #时装收纳柜
 Def_Player_Dict_CabinetCount_Horse = "CabinetCount_Horse_42"    #马匹收纳柜
-Def_Player_Dict_OffDaysAward = "OffDaysAward_45"    #玩家回归奖励
-Def_Player_Dict_CheckInviteCode = "CheckInviteCode_46"    #检查玩家发送的邀请码
-Def_Player_Dict_JM_OpenXW = "JM%s_OpenXw_54"  # 经脉被开启的穴位数 %s对应经脉类型
 Def_Player_Dict_PackCount_Item = "PackCount_Item_72"    #玩家物品背包格子数
 Def_Player_Dict_PackCount_Warehouse = "PackCount_Warehouse_73"    #仓库背包格子数
 Def_Player_Dict_PlayerMapSignCnt = "PlayerMapSignCnt_75"    # 大地图标记数量
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 0341b26..ccd93c5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -578,9 +578,6 @@
     # 首充/天天首充/充值豪礼
     PlayerGoldGift.OnLogin(curPlayer)
     
-    #玩家回归通知
-    #PlayerRecall.PlayerBack(curPlayer)
-    
     #通知购买功能中各购买类型的已购买和可购买次数
     Operate_PlayerBuyZhenQi.DoPlayerLogin(curPlayer)
 #    
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecall.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecall.py
deleted file mode 100644
index 3adb2fc..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecall.py
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package PlayerRecall
-#
-# @todo: 召回玩家
-# @author Alee
-# @date 2011-07-22 15:00
-# @version 1.7
-#
-# 详细描述:
-# @change: "2011-07-22 17:00" Alee 修改回归玩家上线通知
-# @change: "2011-07-25 19:00" Alee 离线天数通知错误
-# @change: "2011-07-26 11:00" Alee 领取物品系统提示和变量初始化,通知问题
-# @change: "2011-07-26 13:30" Alee  发送邀请码等级限制
-# @change: "2011-07-26 15:30" Alee 修复在MapServer和GameServer交互期间会领取多份礼物
-# @change: "2012-05-16 15:00" jiang C++修改接口GameServer_QueryPlayerByID和GameServer_QueryPlayerResult
-# @change: "2012-07-30 16:30" wdb 补充oss记录
-#------------------------------------------------------------------------------ 
-"""Version = 2012-07-30 16:30"""
-#------------------------------------------------------------------------------ 
-
-import GameWorld
-import ChConfig
-import ReadChConfig
-import ItemControler
-import IPY_GameWorld
-import ShareDefine
-import PlayerControl
-import DataRecordPack
-
-
-#回归奖励的最短时间
-Def_Base_OffDay = 7
-#回归奖励最低等级
-Def_Base_LV = 30
-
-
-##玩家回归通知奖励
-# @param curPlayer 玩家实例
-# @return None
-def PlayerBack(curPlayer):
-    if ReadChConfig.GetEvalChConfig('PlayerRecall_Open') != ShareDefine.Def_Player_Recall_Open:
-        return
-    
-    #等级限制
-    if curPlayer.GetLV() < Def_Base_LV:
-        return
-    
-    #当前离线时间字符传
-    logoffTimeStr = curPlayer.GetLogoffTime()
-
-    if logoffTimeStr == "" or logoffTimeStr == '0':
-        return
-
-    logoffTime = GameWorld.GetDateTimeByStr(logoffTimeStr)
-    
-    limitTime = GameWorld.GetDateTimeByStr(ReadChConfig.GetEvalChConfig('PlayerRecall_TimeLimit'))
-    
-    #记录已有天数和新天数变量
-    newOffDays = offDays = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_OffDaysAward)
-    
-    #判断活动时间
-    if logoffTime > limitTime:
-        #之前的离线未领取礼物的判定
-        if  offDays == 0:
-            return
-    
-    else:
-        loginTime = GameWorld.GetDateTimeByStr(GameWorld.GetCurrentDataTimeStr())
-        diffTime = loginTime - logoffTime
-        
-        #记录新时间
-        newOffDays = diffTime.days
-        if newOffDays < Def_Base_OffDay: 
-            if offDays == 0:
-                #时间不足
-                return
-            
-            #获取上次奖励,旧的奖励不更新字典,原样通知
-            newOffDays = offDays
-        else:
-            #初始化一次,避免开关失败
-            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_CheckInviteCode, 0)
-            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_OffDaysAward, newOffDays)
-        
-    #通知有礼物可领
-    curPlayer.Sync_PlayerBeRecalledInfo(newOffDays)
-    
-    #非0表示已发送
-    if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_CheckInviteCode) != 0:
-        #通知客户端已发送过邀请码
-        curPlayer.Sync_PlayerBeRecalledInfo(0)
-    
-    return
-
-#===============================================================================
-# //03 3D 领取被召回奖励#tagCReceiveBeRecalledReward
-# struct tagCReceiveBeRecalledReward
-# {
-#         tagHead Head;
-# };
-#===============================================================================
-##玩家回归奖励
-#@param index 玩家索引
-#@param tick 时间戳
-#@return 返回值无意义
-def PlayerBackAward(index, tick):
-    if ReadChConfig.GetEvalChConfig('PlayerRecall_Open') != ShareDefine.Def_Player_Recall_Open:
-        return
-    
-    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    
-    playerLV = curPlayer.GetLV()
-    if playerLV < Def_Base_LV:
-        return
-    
-    offDays = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_OffDaysAward)
-    if offDays == 0:
-        return
-    
-    lvList = ReadChConfig.GetEvalChConfig('PlayerRecall_OffDays')
-    
-    #等级
-    offDaysList = GameWorld.GetResultByRiseList(lvList, playerLV)
-    if offDaysList == None:
-        GameWorld.ErrLog("PlayerBackAward, LVErr LV=%s, award=%s"%(playerLV, lvList))
-        return
-    
-    #离线天数
-    itemList = GameWorld.GetResultByRiseList(offDaysList, offDays)
-    if itemList == None:
-        GameWorld.ErrLog("PlayerBackAward, offDaysErr LV=%s, offDays=%s, award=%s"%(playerLV, offDays, lvList))
-        return
-    
-    itemID, count = itemList
-    
-    #把地图物品放到背包中
-    dataDict = {'PlayerLV':playerLV, 'OffDays':offDays}
-    if not ItemControler.GivePlayerItem(curPlayer, itemID, count, 0, [IPY_GameWorld.rptItem], event=["PlayerBackAward", True, dataDict]):
-        return
-    
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_OffDaysAward, 0)
-    return
-
-#===============================================================================
-# //03 3E 被召回玩家发送邀请码#tagCBeRecalledInviteCode
-# struct tagCBeRecalledInviteCode
-# {
-#         tagHead Head;
-#         DWORD InviteCode; // 邀请码
-# };
-#===============================================================================
-##玩家回归奖励
-#@param index 玩家索引
-#@param tick 时间戳
-#@return 返回值无意义
-def RecallInviteCode(index, tick):
-    if ReadChConfig.GetEvalChConfig('PlayerRecall_Open') != ShareDefine.Def_Player_Recall_Open:
-        return
-        
-    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-    
-    #邀请码等级限制
-    if curPlayer.GetLV() < Def_Base_LV:
-        return
-    
-    #添加字典用于在GameServer 回复消息前,限制发包,未确认结果
-    if curPlayer.GetDictByKey(ChConfig.Def_Player_NoSave_Dict_SendInviteCode) == 1:
-        return
-    
-    curPlayer.SetDict(ChConfig.Def_Player_NoSave_Dict_SendInviteCode, 1)
-    
-    if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_CheckInviteCode) == 1:
-        #存于数据库中,记录你真的提交过邀请码并成功
-        return
-       
-    pack = IPY_GameWorld.IPY_CBeRecalledInviteCode()
-    inviteCode = pack.GetInviteCode()
-
-    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetPlayerID(), 0, 
-                                                              int(inviteCode), 'SendInviteCode', '', 0)
-    
-    return
-    
-    
-    
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ReveiveRecallAward.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ReveiveRecallAward.py
deleted file mode 100644
index a6bd25a..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ReveiveRecallAward.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package GY_Query_ReveiveRecallAward.py
-#
-# @todo: 召回奖励
-# @author Alee
-# @date 2011-07-22 15:00
-# @version 1.1
-#
-# 详细描述:
-# @change: "2011-07-26 11:00" Alee 领取物品系统提示
-#------------------------------------------------------------------------------ 
-"""Version = 2011-07-26 11:00"""
-#---------------------------------------------------------------------
-#导入
-import PlayerControl
-import ChConfig
-import GameWorld
-import ItemControler
-import IPY_GameWorld
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-
-## 请求逻辑
-#  @param query_Type 请求类型
-#  @param query_ID 请求的玩家ID
-#  @param packCMDList 发包命令 [等级]
-#  @param tick 当前时间
-#  @return None
-def DoLogic(query_Type, query_ID, packCMDList, tick):
-
-    curFindPlayer = GameWorld.GetPlayerManager().FindPlayerByID(query_ID)
-    
-    if not curFindPlayer or curFindPlayer.IsEmpty():
-        return '0'
-    
-    flag, itemID, itemCnt = packCMDList
-    
-    #把物品放到背包中
-    if not ItemControler.GivePlayerItem(curFindPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem]):
-        return '0'
-
-    #通知放入背包特效
-    #curFindPlayer.Sync_GetItemView(itemID, itemCnt)
-    #PlayerControl.NotifyCode(curFindPlayer, "ObtainRes01", [itemID, itemCnt])
-    
-    return str(flag)
-#---------------------------------------------------------------------
-
-## 执行结果
-#  @param curPlayer 发出请求的玩家
-#  @param callFunName 功能名称
-#  @param funResult 查询的结果
-#  @param tick 当前时间
-#  @return None
-#  @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
-    return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SendInviteCode.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SendInviteCode.py
deleted file mode 100644
index c926058..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SendInviteCode.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package GY_Query_CheckInviteCode
-#
-# @todo: 检查邀请码
-# @author Alee
-# @date 2011-07-22 17:00
-# @version 1.1
-#
-# 详细描述:
-# @change: "2011-07-26 15:30" Alee 修复在MapServer和GameServer交互期间会领取多份礼物
-#------------------------------------------------------------------------------ 
-"""Version = 2011-07-26 15:30"""
-#---------------------------------------------------------------------
-#导入
-import PlayerControl
-import ChConfig
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-
-## 请求逻辑
-#  @param query_Type 请求类型
-#  @param query_ID 请求的玩家ID
-#  @param packCMDList 发包命令 [等级]
-#  @param tick 当前时间
-#  @return None
-def DoLogic(query_Type, query_ID, packCMDList, tick):
-    return ''
-#---------------------------------------------------------------------
-
-## 执行结果
-#  @param curPlayer 发出请求的玩家
-#  @param callFunName 功能名称
-#  @param funResult 查询的结果
-#  @param tick 当前时间
-#  @return None
-#  @remarks 函数详细说明.
-def DoResult(curPlayer, callFunName, funResult, tick):
-
-    if funResult == '0':
-        #如果邀请码失败则恢复发送权限
-        curPlayer.SetDict(ChConfig.Def_Player_NoSave_Dict_SendInviteCode, 0)
-        #错误邀请码
-        PlayerControl.NotifyCode(curPlayer, "GeRen_lhs_955456")
-        return
-    
-    curPlayer.Sync_PlayerBeRecalledInfo(0)
-    #设置已发送
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_CheckInviteCode, 1)
-    return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index f205662..ab51ac3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -757,9 +757,6 @@
 Def_Cheater_CharArg = 200    #字符参数
 #---------------------------------------------------------------------
 
-#玩家回归开关 1开
-Def_Player_Recall_Open = 1
-
 #---竞技场---
 #竞技场房间状态
 Def_VsRoom_State = range(0,3)

--
Gitblit v1.8.0