From 2638c8b67d1dcac1c774f942ac144579c6f82ec1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 九月 2018 21:41:11 +0800
Subject: [PATCH] 3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑（自动加入匹配中的队伍）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
index 03abf41..c7ea0f9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
@@ -25,6 +25,7 @@
import IpyGameDataPY
import ChConfig
import PlayerSuccess
+import DataRecordPack
import PlayerWing
import PlayerDogz
@@ -125,11 +126,12 @@
fixedItemIndexDict, fixedItemNeedCntDict, compoundBindCnt = fixedItemInfo
# 检查附加道具增加成功率消耗
- addSuccRate = 0
+ addSuccRate, addSuccRateItemInfo = 0, []
if addonsCountMax > 0:
- addSuccRate = __CheckAddonsItem(playerID, compoundID, itemPack, addonsItemIndexList, addonsItemCountList, addonsCountMax)
- if addSuccRate == None:
+ addSuccRateInfo = __CheckAddonsItem(playerID, compoundID, itemPack, addonsItemIndexList, addonsItemCountList, addonsCountMax)
+ if addSuccRateInfo == None:
return
+ addSuccRate, addSuccRateItemInfo = addSuccRateInfo
# 扣铜钱
PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Silver_Money, totalNeedMoney, ChConfig.Def_Cost_ItemProduce,
@@ -180,7 +182,20 @@
GameWorld.DebugLog("首次合成一代翅膀，必定成功!totalSuccRate=%s" % totalSuccRate, playerID)
# 合成成功
- if GameWorld.CanHappen(totalSuccRate, ShareDefine.Def_MaxRateValue):
+ maxRateValue = ShareDefine.Def_MaxRateValue
+ randValue = random.randint(1, maxRateValue)
+ canHappen = randValue <= totalSuccRate
+ GameWorld.DebugLog("canHappen=%s,randValue=%s,totalSuccRate=%s,maxRateValue=%s"
+ % (canHappen, randValue, totalSuccRate, maxRateValue), playerID)
+ # 不是百分百成功的记录合成流向
+ if successRate != maxRateValue:
+ drDict = {"PlayerID":curPlayer.GetPlayerID(), "AccID":curPlayer.GetAccID(), "ID":compoundID, "MakeItemID":makeItemID, "IsSuccess":canHappen,
+ "RateInfo":{"totalSuccRate":"%s(%s+%s)" % (totalSuccRate, successRate, addSuccRate), "randValue":randValue, "maxRateValue":maxRateValue},
+ "AddSuccRateItemInfo":addSuccRateItemInfo
+ }
+ DataRecordPack.SendEventPack("ItemCompound", drDict, curPlayer)
+
+ if canHappen:
GameWorld.DebugLog("合成成功: makeItemID=%s,compoundCnt=%s,compoundBindCnt=%s" % (makeItemID, compoundCnt, compoundBindCnt), playerID)
userData = GiveNewCompoundItem(curPlayer, makeItemID, compoundCnt, compoundBindCnt, wingItemExpInfo, dogzEquipPlusExp)
@@ -377,6 +392,7 @@
# ComposeAddonsQuality 4|2 0 0 0 0 阶数和颜色
# ComposeAddonsFormula level*10 0 0 0 0 计算合成时附加材料增加的几率公式
+ addSuccRateItemInfo = []
composeAddonsTypeList = IpyGameDataPY.GetFuncEvalCfg("ComposeAddonsType")
classLV, color = IpyGameDataPY.GetFuncEvalCfg("ComposeAddonsQuality", 1)
ComposeAddonsFormula = IpyGameDataPY.GetFuncCfg("ComposeAddonsFormula")
@@ -428,8 +444,9 @@
addSuccRate = eval(FormulaControl.GetCompileFormula("ComposeAddonsFormula", ComposeAddonsFormula))
addTotalSuccRate += (addSuccRate*costCount)
+ addSuccRateItemInfo.append({"ItemID":itemID, "ItemColor":itemColor, "ItemClassLV":itemClassLV, "addSuccRate":addSuccRate, "costCount":costCount})
- return int(addTotalSuccRate)
+ return int(addTotalSuccRate), addSuccRateItemInfo
def __CheckItemCanUseCompound(playerID, index, curItem):
--
Gitblit v1.8.0