From 931a2cbb88495db317e9a0ad68a9073a1dc98dc1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 31 五月 2021 18:23:46 +0800
Subject: [PATCH] 8921 【主干】【BT2】【后端】H.活动-节日活动-垃圾分类（增加垃圾分类结果封包通知 AA57, 去除分类结果系统提示）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGarbageSorting.py | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGarbageSorting.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGarbageSorting.py
index 9fbfda5..b7977b6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGarbageSorting.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGarbageSorting.py
@@ -182,7 +182,7 @@
ItemControler.GivePlayerItemOrMail(curPlayer, giveItemList)
- Sync_GarbageTaskInfo(curPlayer, actNum, taskID, giveItemList)
+ Sync_GarbageTaskInfo(curPlayer, actNum, taskID)
return True
#// AA 14 垃圾分类活动分类垃圾 #tagCMActGarbageSorting
@@ -205,6 +205,7 @@
GameWorld.DebugLog("垃圾分类投放: sortingType=%s,itemIndexList=%s" % (sortingType, itemIndexList), playerID)
+ isRight = 1
environmentValueInfo = IpyGameDataPY.GetFuncEvalCfg("GarbageSorting", 2)
addEnvValueTotal = 0
garbagePack = curPlayer.GetItemManager().GetPack(ShareDefine.rptGarbage)
@@ -219,11 +220,10 @@
if sortingType == itemSortingType:
delCount = curItem.GetCount()
addEnvValue = environmentValueInfo[0] * delCount
- PlayerControl.NotifyCode(curPlayer, "GarbageSortingRight", [addEnvValue])
else:
delCount = 1 # 错误只扣除1一个
addEnvValue = environmentValueInfo[1] * delCount
- PlayerControl.NotifyCode(curPlayer, "GarbageSortingWrong", [addEnvValue])
+ isRight = 0
ItemControler.SetItemCount(curItem, max(0, curItem.GetCount() - delCount))
addEnvValueTotal += addEnvValue
@@ -240,6 +240,14 @@
% (addEnvValueTotal, actEnvValueTotal, PlayerControl.GetMoney(curPlayer, ShareDefine.TYPE_Price_Environment)), playerID)
PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_Environment, actEnvValueTotal)
+
+ # 通知结果
+ clientPack = ChPyNetSendPack.tagMCActGarbageSortingResult()
+ clientPack.ActNum = actNum
+ clientPack.GarbageSortingType = sortingType
+ clientPack.IsRight = isRight
+ clientPack.AddEnvValue = addEnvValueTotal
+ NetPackCommon.SendFakePack(curPlayer, clientPack)
return
@@ -258,7 +266,7 @@
__DoCheckFinishGarbageTask(curPlayer, actNum, taskID)
return
-def Sync_GarbageTaskInfo(curPlayer, actNum, taskID=0, awardItemList=None):
+def Sync_GarbageTaskInfo(curPlayer, actNum, taskID=0):
## 通知垃圾收集任务信息
syncTaskIDList = [taskID] if taskID else ChConfig.GarbageTaskList
clientPack = ChPyNetSendPack.tagMCActGarbageTaskInfo()
@@ -271,14 +279,6 @@
task.GarbageTaskFinishCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GarbageTaskFinishCount % (actNum, taskID))
clientPack.GarbageTaskList.append(task)
clientPack.GarbageTaskCount = len(clientPack.GarbageTaskList)
-
- if awardItemList:
- for itemID, itemCount, _ in awardItemList:
- item = ChPyNetSendPack.tagMCActGarbageTaskItem()
- item.ItemID = itemID
- item.ItemCount = itemCount
- clientPack.GarbageTaskItemList.append(item)
- clientPack.TaskItemCount = len(clientPack.GarbageTaskItemList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
return
--
Gitblit v1.8.0