From ba1daaddc293ed16926dbead3783c77566b22e6d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 13 一月 2020 14:27:01 +0800
Subject: [PATCH] 8364 【恺英】【后端】缥缈随机任务（删除）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 48 ----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 81 --------
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 48 ----
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 81 --------
/dev/null | 244 ------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 13 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 6
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py | 12 -
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 8
14 files changed, 1 insertions(+), 548 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 4ffc655..a044623 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -5494,54 +5494,6 @@
#------------------------------------------------------
-# A2 08 刷新缥缈任务 #tagCMRefreshPiaomiaoTask
-
-class tagCMRefreshPiaomiaoTask(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA2
- self.SubCmd = 0x08
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xA2
- self.SubCmd = 0x08
- return
-
- def GetLength(self):
- return sizeof(tagCMRefreshPiaomiaoTask)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A2 08 刷新缥缈任务 //tagCMRefreshPiaomiaoTask:
- Cmd:%s,
- SubCmd:%s
- '''\
- %(
- self.Cmd,
- self.SubCmd
- )
- return DumpString
-
-
-m_NAtagCMRefreshPiaomiaoTask=tagCMRefreshPiaomiaoTask()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshPiaomiaoTask.Cmd,m_NAtagCMRefreshPiaomiaoTask.SubCmd))] = m_NAtagCMRefreshPiaomiaoTask
-
-
-#------------------------------------------------------
#A2 02通知选中对象 # tagCMSelectObj
class tagCMSelectObj(Structure):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 842d082..6dcef87 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -22010,87 +22010,6 @@
#------------------------------------------------------
-# A7 20 缥缈任务信息 #tagMCPiaomiaoTaskInfo
-
-class tagMCPiaomiaoTaskInfo(Structure):
- Head = tagHead()
- FinishCount = 0 #(BYTE FinishCount)//今日已完成次数
- RefreshCount = 0 #(BYTE RefreshCount)//今日已刷新次数
- TaskCount = 0 #(BYTE TaskCount)
- TaskIDList = list() #(vector<DWORD> TaskIDList)//刷新任务ID列表[taskID,...]
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA7
- self.Head.SubCmd = 0x20
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.FinishCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.RefreshCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.TaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.TaskCount):
- value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
- self.TaskIDList.append(value)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA7
- self.Head.SubCmd = 0x20
- self.FinishCount = 0
- self.RefreshCount = 0
- self.TaskCount = 0
- self.TaskIDList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- length += 1
- length += 4 * self.TaskCount
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.FinishCount)
- data = CommFunc.WriteBYTE(data, self.RefreshCount)
- data = CommFunc.WriteBYTE(data, self.TaskCount)
- for i in range(self.TaskCount):
- data = CommFunc.WriteDWORD(data, self.TaskIDList[i])
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- FinishCount:%d,
- RefreshCount:%d,
- TaskCount:%d,
- TaskIDList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.FinishCount,
- self.RefreshCount,
- self.TaskCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagMCPiaomiaoTaskInfo=tagMCPiaomiaoTaskInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCPiaomiaoTaskInfo.Head.Cmd,m_NAtagMCPiaomiaoTaskInfo.Head.SubCmd))] = m_NAtagMCPiaomiaoTaskInfo
-
-
-#------------------------------------------------------
# A7 19 查询玩家境界阶装备信息结果 #tagSCPlayerEquipCacheResult
class tagSCPlayerEquipCacheResult(Structure):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 807f209..7de36d7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -961,7 +961,6 @@
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
-GameFuncID_PiaomiaoTask = 173 # 缥缈任务
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index eb6a611..4ea8bc7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -288,19 +288,6 @@
PacketSubCMD_11=0x07
PacketCallFunc_11=OnTakeTask
-
-;缥缈任务
-[PlayerPiaomiaoTask]
-ScriptName = Player\PlayerPiaomiaoTask.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xA2
-PacketSubCMD_1=0x08
-PacketCallFunc_1=OnRefreshPiaomiaoTask
-
;VIP功能
[PlayerVip]
ScriptName = Player\PlayerVip.py
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 8b593d2..69d10c7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3992,10 +3992,6 @@
Def_PDict_TodayAssistMoney = "TodayAssistMoney" # 今日已获得协助货币奖励
Def_PDict_TodayAssistMoneySocial = "TodayAssistMoneySocial" # 今日已获得协助货币 社交关系额外加成
-#缥缈任务
-Def_PDict_PiaomiaoTaskFinishCount = "PiaomiaoTaskFinishCount" # 今日已完成任务次数
-Def_PDict_PiaomiaoTaskRefreshCount = "PiaomiaoTaskRefreshCount" # 今日已刷新次数
-Def_PDict_PiaomiaoMaxGradeTaskID = "PiaomiaoMaxGradeTaskID" # 缥缈任务最大评分任务ID
#-------------------------------------------------------------------------------
#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
@@ -4686,7 +4682,6 @@
Def_Cost_BuyKillBossCnt, #购买boss次数
Def_Cost_EquipStar, #装备升星
Def_Cost_ActivityPlace, #活跃放置 50
-Def_Cost_PiaomiaoTask, #缥缈任务
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4699,7 +4694,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 63)
+) = range(2000, 2000 + 62)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4783,7 +4778,6 @@
Def_Cost_BuyKillBossCnt:"BuyKillBossCnt",
Def_Cost_EquipStar:"EquipStar",
Def_Cost_ActivityPlace:"ActivityPlace",
-Def_Cost_PiaomiaoTask:"PiaomiaoTask",
}
## -----------------------------------------------------
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 4ffc655..a044623 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -5494,54 +5494,6 @@
#------------------------------------------------------
-# A2 08 刷新缥缈任务 #tagCMRefreshPiaomiaoTask
-
-class tagCMRefreshPiaomiaoTask(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA2
- self.SubCmd = 0x08
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xA2
- self.SubCmd = 0x08
- return
-
- def GetLength(self):
- return sizeof(tagCMRefreshPiaomiaoTask)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A2 08 刷新缥缈任务 //tagCMRefreshPiaomiaoTask:
- Cmd:%s,
- SubCmd:%s
- '''\
- %(
- self.Cmd,
- self.SubCmd
- )
- return DumpString
-
-
-m_NAtagCMRefreshPiaomiaoTask=tagCMRefreshPiaomiaoTask()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshPiaomiaoTask.Cmd,m_NAtagCMRefreshPiaomiaoTask.SubCmd))] = m_NAtagCMRefreshPiaomiaoTask
-
-
-#------------------------------------------------------
#A2 02通知选中对象 # tagCMSelectObj
class tagCMSelectObj(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 842d082..6dcef87 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -22010,87 +22010,6 @@
#------------------------------------------------------
-# A7 20 缥缈任务信息 #tagMCPiaomiaoTaskInfo
-
-class tagMCPiaomiaoTaskInfo(Structure):
- Head = tagHead()
- FinishCount = 0 #(BYTE FinishCount)//今日已完成次数
- RefreshCount = 0 #(BYTE RefreshCount)//今日已刷新次数
- TaskCount = 0 #(BYTE TaskCount)
- TaskIDList = list() #(vector<DWORD> TaskIDList)//刷新任务ID列表[taskID,...]
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA7
- self.Head.SubCmd = 0x20
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.FinishCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.RefreshCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.TaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.TaskCount):
- value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
- self.TaskIDList.append(value)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA7
- self.Head.SubCmd = 0x20
- self.FinishCount = 0
- self.RefreshCount = 0
- self.TaskCount = 0
- self.TaskIDList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- length += 1
- length += 1
- length += 4 * self.TaskCount
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.FinishCount)
- data = CommFunc.WriteBYTE(data, self.RefreshCount)
- data = CommFunc.WriteBYTE(data, self.TaskCount)
- for i in range(self.TaskCount):
- data = CommFunc.WriteDWORD(data, self.TaskIDList[i])
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- FinishCount:%d,
- RefreshCount:%d,
- TaskCount:%d,
- TaskIDList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.FinishCount,
- self.RefreshCount,
- self.TaskCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagMCPiaomiaoTaskInfo=tagMCPiaomiaoTaskInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCPiaomiaoTaskInfo.Head.Cmd,m_NAtagMCPiaomiaoTaskInfo.Head.SubCmd))] = m_NAtagMCPiaomiaoTaskInfo
-
-
-#------------------------------------------------------
# A7 19 查询玩家境界阶装备信息结果 #tagSCPlayerEquipCacheResult
class tagSCPlayerEquipCacheResult(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
index 102265c..61e389c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -104,7 +104,6 @@
import FormulaControl
import GameFuncComm
import ChPyNetSendPack
-import PlayerPiaomiaoTask
import NetPackCommon
import NPCCommon
import PlayerVip
@@ -1575,9 +1574,6 @@
return
curQuestData = QuestManager.FindQuest(taskID)
- if curQuestData.Type == QuestCommon.Def_Mission_Type_Piaomiao:
- PlayerPiaomiaoTask.OnFinishPiaomiaoTask(curPlayer, curMission)
- return
rewardPer = 100 if rewardPer <= 0 else rewardPer
moneyType, moneyCnt = 0, 0
@@ -3976,10 +3972,6 @@
#放弃悬赏任务
#if missionID == ChConfig.Def_ArrestMissionID:
# PlayerArrestTask.OnDeleteArrestTask(curPlayer)
-
- if curQuestData.Type == QuestCommon.Def_Mission_Type_Piaomiao:
- PlayerPiaomiaoTask.DoCancelPiaomiaoTask(curPlayer, curMission)
- return
#先在任务表中找数据, 如果找到了, 就不遍历XML了
if __DoLogic_DeleteMission(curPlayer, curMission):
@@ -4910,10 +4902,6 @@
curQuestData = QuestManager.FindQuest(missionID)
if not curQuestData:
- return
-
- if curQuestData.Type == QuestCommon.Def_Mission_Type_Piaomiao:
- PlayerPiaomiaoTask.OnTakePiaomiaoTask(curPlayer, curMission)
return
QuestCommon.SetPlayerMissionState(curPlayer, curMission, 1)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py
index 184b183..da87f73 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestCommon.py
@@ -106,7 +106,6 @@
Def_GM_Active_Mission_Type = 999 #暂时不用，配大点
Def_Mission_Type_RunDaily = 7
Def_Mission_Type_RunFamily = 12
-Def_Mission_Type_Piaomiao = 25 # 缥缈任务
Def_MainTask_Type_List = [Def_Mission_Type_Main, Def_Mission_Type_MainHid]
Def_RunTask_Type_List = [Def_Mission_Type_RunDaily, Def_Mission_Type_RunFamily]
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 2d25300..500144f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -80,14 +80,12 @@
import PlayerWeekParty
import PlayerFeastWeekParty
import PlayerActLogin
-import Operate_EquipWash
import PlayerTreasure
import GameLogic_GodArea
import PlayerRune
import PlayerFamilyRedPacket
import IpyGameDataPY
import EventReport
-import Operate_EquipStone
import OpenServerCampaign
import PlayerVip
import PlayerRefineStove
@@ -116,8 +114,6 @@
import PlayerGeTui
import PlayerDogz
import PlayerCoat
-import PlayerQuDaoDoubleBill
-import PlayerPiaomiaoTask
import PlayerFB
import SkillShell
import PlayerYinji
@@ -644,8 +640,6 @@
ChItem.Sync_ItemDayUseCnt(curPlayer)
# 悬赏登录通知
#PlayerArrestTask.OnLogin(curPlayer)
- # 缥缈任务
- PlayerPiaomiaoTask.OnPlayerLogin(curPlayer)
# 符印登录通知
PlayerRune.PlayerRuneLogin(curPlayer)
# 仙盟红包登录通知
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py
index d0f7704..2900423 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.py
@@ -38,7 +38,6 @@
import PlayerSignDay
import PlayerGoldGift
import PlayerEquipDecompose
-import PlayerPiaomiaoTask
import PlayerFreeGoods
import FunctionNPCCommon
import PlayerGreatMaster
@@ -66,7 +65,6 @@
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_PiaomiaoTask:lambda curObj:PlayerPiaomiaoTask.DoPiaomiaoTaskOpen(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),
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index 952ce96..230dd3c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -90,7 +90,6 @@
import PlayerFlashSale
import PlayerWishingWell
import PlayerFairyDomain
-import PlayerPiaomiaoTask
import PlayerVip
import PlayerDiceEx
import IpyGameDataPY
@@ -548,8 +547,6 @@
PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)
#缥缈仙域
PlayerFairyDomain.OnDay(curPlayer)
- #缥缈任务
- PlayerPiaomiaoTask.OnDay(curPlayer)
#仙盟宴会
GameLogic_FamilyParty.OnDayFamilyPartyPlayer(curPlayer)
#协助
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPiaomiaoTask.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPiaomiaoTask.py
deleted file mode 100644
index 7d680ac..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPiaomiaoTask.py
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package Player.PlayerPiaomiaoTask
-#
-# @todo:缥缈任务
-# @author hxp
-# @date 2020-01-03
-# @version 1.0
-#
-# 详细描述: 缥缈任务
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2020-01-03 20:30"""
-#-------------------------------------------------------------------------------
-
-import GameWorld
-import EventShell
-import QuestCommon
-import QuestRunner
-import QuestManager
-import NetPackCommon
-import IpyGameDataPY
-import FormulaControl
-import ChPyNetSendPack
-import PlayerControl
-import IPY_GameWorld
-import ItemControler
-import ItemCommon
-import ChConfig
-
-Def_MaxGrade = 5 # 暂时只针对组队缥缈副本
-
-def DoPiaomiaoTaskOpen(curPlayer):
- ## 缥缈任务开启
- __DoRefreshPiaomiaoTask(curPlayer)
- return
-
-def OnDay(curPlayer):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_PiaomiaoTaskFinishCount, 0)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_PiaomiaoTaskRefreshCount, 0)
- SyncPiaomiaoTaskInfo(curPlayer)
- return
-
-def OnPlayerLogin(curPlayer):
- SyncPiaomiaoTaskInfo(curPlayer)
- return
-
-#// A2 08 刷新缥缈任务 #tagCMRefreshPiaomiaoTask
-#
-#struct tagCMRefreshPiaomiaoTask
-#{
-# tagHead Head;
-#};
-def OnRefreshPiaomiaoTask(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-
- freeRefreshCount = IpyGameDataPY.GetFuncCfg("PiaomiaoTask", 2)
- todayRefreshCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_PiaomiaoTaskRefreshCount)
- if todayRefreshCount >= freeRefreshCount:
- costGold = IpyGameDataPY.GetFuncCfg("PiaomiaoTask", 3)
- if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costGold, ChConfig.Def_Cost_PiaomiaoTask):
- return
- else:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_PiaomiaoTaskRefreshCount, todayRefreshCount + 1)
- __DoRefreshPiaomiaoTask(curPlayer)
- return
-
-def __DoRefreshPiaomiaoTask(curPlayer):
- ## 刷新缥缈任务
-
- randMissionCount = IpyGameDataPY.GetFuncCfg("PiaomiaoTaskRand", 1)
- randMissionWeightList = IpyGameDataPY.GetFuncEvalCfg("PiaomiaoTaskRand", 2)
- missionGradeRewardDict = IpyGameDataPY.GetFuncEvalCfg("PiaomiaoTaskRand", 3)
- piaomiaoMissionIDList = []
-
- GameWorld.DebugLog("刷新缥缈任务! randMissionCount=%s" % randMissionCount)
-
- delMissionIDList = []
- for i in range(curPlayer.GetMissionCount()):
- curMission = curPlayer.GetMissionByIndex(i)
- missionID = curMission.GetMissionID()
- missionState = curMission.GetState()
- questData = QuestManager.FindQuest(missionID)
- if not questData:
- continue
-
- if questData.Type != QuestCommon.Def_Mission_Type_Piaomiao:
- continue
-
- curGrade = curMission.GetProperty(QuestCommon.Def_Mission_Grade)
- # 评级5 S不重置
- if missionState != ChConfig.Def_Mission_State_NoAccept or curGrade == Def_MaxGrade:
- piaomiaoMissionIDList.append(missionID)
- GameWorld.DebugLog(" 缥缈任务非未接，保留! missionID=%s,missionState=%s" % (missionID, missionState))
- continue
- GameWorld.DebugLog(" 缥缈任务未接，删除! missionID=%s,missionState=%s" % (missionID, missionState))
- delMissionIDList.append(missionID)
- for delMissionID in delMissionIDList:
- QuestCommon.DeleteMission(curPlayer, delMissionID)
-
- reExp = PlayerControl.GetPlayerReExp(curPlayer)
- doCount = 100
- while len(piaomiaoMissionIDList) < randMissionCount and doCount > 0:
- doCount -= 1
- randMissionInfo = GameWorld.GetResultByWeightList(randMissionWeightList)
- if not randMissionInfo:
- continue
- randMissionID, grade = randMissionInfo
- if randMissionID in piaomiaoMissionIDList:
- continue
- if grade not in missionGradeRewardDict:
- continue
- expFormat, goldPaper, itemID = missionGradeRewardDict[grade]
- curExp = int(eval(FormulaControl.GetCompileFormula("PiaomiaoReward_%s" % grade, expFormat)))
-
- piaomiaoMissionIDList.append(randMissionID)
- curMission = QuestCommon.AddNewMission(curPlayer, randMissionID)
- curMission.SetProperty(QuestCommon.Def_Mission_Grade, grade)
- QuestCommon.SetPlayerMissionState(curPlayer, curMission, ChConfig.Def_Mission_State_NoAccept)
-
- curMission.SetProperty(QuestRunner.Def_Run_Around_Reward_Exp, curExp % ChConfig.Def_PerPointValue)
- curMission.SetProperty(QuestRunner.Def_Run_Around_Reward_ExpPoint, curExp / ChConfig.Def_PerPointValue)
- curMission.SetProperty(QuestRunner.Def_Run_Around_Reward_GoldPaper, goldPaper)
-
- itemCount = 1 # 物品暂默认1个
- curMission.SetProperty(QuestRunner.Def_Day_Event_Reward_Item_Id, itemID)
- curMission.SetProperty(QuestRunner.Def_Day_Event_Reward_Item_Count, itemCount)
-
- GameWorld.DebugLog(" 新增随机缥缈任务: randMissionID=%s,grade=%s,curExp=%s,goldPaper=%s,itemID=%s"
- % (randMissionID, grade, curExp, goldPaper, itemID))
- #通知客户端
- EventShell.NotifyOneMission(curPlayer, curMission)
-
- if grade == Def_MaxGrade:
- familyID = curPlayer.GetFamilyID()
- if familyID:
- PlayerControl.FamilyNotify(familyID, "RefreshPiaomiaoSFB", [curPlayer.GetPlayerName(), ChConfig.Def_FBMapID_KillDevil])
-
- SyncPiaomiaoTaskInfo(curPlayer)
- return
-
-def OnTakePiaomiaoTask(curPlayer, curMission):
- ## 接缥缈任务
-
- finishCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_PiaomiaoTaskFinishCount)
- maxFinishCount = IpyGameDataPY.GetFuncCfg("PiaomiaoTask", 1)
- if finishCount >= maxFinishCount:
- GameWorld.DebugLog("已达今日任务上限!finishCount=%s" % finishCount)
- return
-
- for i in range(curPlayer.GetMissionCount()):
- mission = curPlayer.GetMissionByIndex(i)
- missionID = mission.GetMissionID()
- questData = QuestManager.FindQuest(missionID)
- if not questData:
- continue
-
- if questData.Type == QuestCommon.Def_Mission_Type_Piaomiao and mission.GetState() != ChConfig.Def_Mission_State_NoAccept:
- GameWorld.DebugLog("已经有接了缥缈任务，无法再接!missionID=%s" % missionID)
- return
-
- QuestCommon.SetPlayerMissionState(curPlayer, curMission, 1)
-
- curGrade = curMission.GetProperty(QuestCommon.Def_Mission_Grade)
- if curGrade == Def_MaxGrade:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_PiaomiaoMaxGradeTaskID, curMission.GetMissionID())
-
- EventShell.NotifyOneMission(curPlayer, curMission, isNotifyAll=False)
- SyncPiaomiaoTaskInfo(curPlayer)
- return
-
-def OnFinishPiaomiaoTask(curPlayer, curMission):
- ## 完成缥缈任务
-
- finishTaskCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_PiaomiaoTaskFinishCount) + 1
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_PiaomiaoTaskFinishCount, finishTaskCount)
-
- missionID = curMission.GetMissionID()
- # 给奖励
- exp = curMission.GetProperty(QuestRunner.Def_Run_Around_Reward_Exp)
- expPoint = curMission.GetProperty(QuestRunner.Def_Run_Around_Reward_ExpPoint)
- exp = expPoint * ChConfig.Def_PerPointValue + exp
- playerControl = PlayerControl.PlayerControl(curPlayer)
- playerControl.AddExp(exp)
-
- goldPaper = curMission.GetProperty(QuestRunner.Def_Run_Around_Reward_GoldPaper)
- addDataDict = {ChConfig.Def_Give_Reason_SonKey:"Piaomiao"}
- PlayerControl.GiveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Paper, goldPaper, ChConfig.Def_GiveMoney_Mission, addDataDict)
-
- itemID = curMission.GetProperty(QuestRunner.Def_Day_Event_Reward_Item_Id)
- itemCount = curMission.GetProperty(QuestRunner.Def_Day_Event_Reward_Item_Count)
- if itemID and itemCount:
- isAuctionItem = 0
- itemList = [[itemID, itemCount, isAuctionItem]]
- ItemControler.GivePlayerItemOrMail(curPlayer, itemList)
-
- delItemID = curMission.GetProperty(QuestCommon.Def_Item_ID)
- if delItemID:
- ItemCommon.DelMissionItem(curPlayer, IPY_GameWorld.rptItem, delItemID, 0, missionID)
-
- GameWorld.DebugLog("完成缥缈任务: finishTaskCount=%s,missionID=%s,exp=%s,goldPaper=%s,itemID=%s,delItemID=%s"
- % (finishTaskCount, missionID, exp, goldPaper, itemID, delItemID))
-
- # 删任务
- QuestCommon.DeleteMission(curPlayer, missionID)
- # 重新刷新
- __DoRefreshPiaomiaoTask(curPlayer)
- return
-
-def DoCancelPiaomiaoTask(curPlayer, curMission):
- ## 放弃任务，设置为未接状态，不重新刷新列表
- missionID = curMission.GetMissionID()
- GameWorld.DebugLog("放弃缥缈任务! missionID=%s" % missionID)
- QuestCommon.SetPlayerMissionState(curPlayer, curMission, ChConfig.Def_Mission_State_NoAccept)
- EventShell.NotifyOneMission(curPlayer, curMission, isNotifyAll=False)
- return
-
-def SyncPiaomiaoTaskInfo(curPlayer):
- taskIDList = []
- for i in xrange(curPlayer.GetMissionCount()):
- curMission = curPlayer.GetMissionByIndex(i)
- missionID = curMission.GetMissionID()
- questData = QuestManager.FindQuest(missionID)
- if not questData:
- continue
- if questData.Type != QuestCommon.Def_Mission_Type_Piaomiao:
- continue
- taskIDList.append(missionID)
- if not taskIDList:
- return
-
- taskInfo = ChPyNetSendPack.tagMCPiaomiaoTaskInfo()
- taskInfo.FinishCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_PiaomiaoTaskFinishCount)
- taskInfo.RefreshCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_PiaomiaoTaskRefreshCount)
- taskInfo.TaskIDList = taskIDList
- taskInfo.TaskCount = len(taskIDList)
- NetPackCommon.SendFakePack(curPlayer, taskInfo)
- return
-
-
-
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 807f209..7de36d7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -961,7 +961,6 @@
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
-GameFuncID_PiaomiaoTask = 173 # 缥缈任务
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
--
Gitblit v1.8.0