From f3fd1d3c52fc2c3c49254db83a8fba108f3acc8b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 19 四月 2019 16:12:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py
index 824ae88..e53692f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDiceEx.py
@@ -13,7 +13,8 @@
#
# 详细描述: 我要太极
#---------------------------------------------------------------------
-"""Version = 2016-09-26 20:00"""
+#"""Version = 2016-09-26 20:00"""
+#---------------------------------------------------------------------
import GameWorld
import IPY_GameWorld
@@ -25,6 +26,7 @@
import ChConfig
import IpyGameDataPY
import PlayerActivity
+import PlayerSuccess
import ItemCommon
@@ -70,6 +72,7 @@
return
if not __DoDicelogic(curPlayer):
return
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_Dice, 1)
elif diceType == 1:
if not diceResult:
@@ -99,6 +102,8 @@
diceRandomDict = IpyGameDataPY.GetFuncEvalCfg('DiceRandomList')
diceRandomList = diceRandomDict.get(str(result).count('6'), [])
+ hasAdd = False #是否有增加6的数量
+ changeIndex = -1 #非6的索引
for i in range(6):
if isChange and GameWorld.GetDataByDigitPlace(result, i) == 6:
continue
@@ -108,9 +113,14 @@
GameWorld.ErrLog(" 摇骰子没有随机到结果 DiceRandomList异常！")
return
result = GameWorld.ChangeDataByDigitPlace(result, i, resultNum)
+ if resultNum == 6:
+ hasAdd = True
+ elif changeIndex == -1:
+ changeIndex = i
+
#GameWorld.DebugLog(" 摇骰子结果 resultNum=%s, result=%s" % (resultNum, result))
- if isChange and str(result).count('6') == 0:
- result = GameWorld.ChangeDataByDigitPlace(result, 0, 6)
+ if isChange and not hasAdd and changeIndex >=0:
+ result = GameWorld.ChangeDataByDigitPlace(result, changeIndex, 6)
GameWorld.DebugLog(" 摇骰子结果 result=%s,isChange=%s" % (result, isChange))
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Dice_Result, result)
if result == 666666:
@@ -133,7 +143,7 @@
PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_998371")
return
# 给物品
- ItemControler.GivePlayerItem(curPlayer, itemInfo[0], itemInfo[1], 1, [IPY_GameWorld.rptItem],
+ ItemControler.GivePlayerItem(curPlayer, itemInfo[0], itemInfo[1], 0, [IPY_GameWorld.rptItem],
event=[ChConfig.ItemGive_DiceEx, False, {}])
reExp = PlayerControl.GetPlayerReExp(curPlayer)
exp = eval(prizeInfo.get("exp", '0'))
--
Gitblit v1.8.0