From 7e061666ff94ee05d08028ab0e4ac41afd3d4419 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 07 十一月 2018 11:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
index 797241a..1f6e86f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -27,6 +27,8 @@
import IpyGameDataPY
import PlayerSuccess
import PlayerMagicWeapon
+import IPY_GameWorld
+import OpenServerCampaign
g_runeLVExpDict = {}
@@ -114,6 +116,32 @@
runeMaxLV = runeMaxLVDict.get(itemColor, 0)
return runeMaxLV
+#// A5 13 解锁符印孔 #tagCMUnlockRuneHole
+#
+#struct tagCMUnlockRuneHole
+#{
+# tagHead Head;
+# BYTE HoleIndex; // 孔索引
+#};
+def OnUnlockRuneHole(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ holeIndex = clientData.HoleIndex
+ runeUnlockDict = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 2, {})
+ if holeIndex not in runeUnlockDict:
+ return
+ runeOpenState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_HoleOpenState, 0)
+ if runeOpenState & pow(2, holeIndex):
+ return
+ if curPlayer.GetLV() < IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 3, {}).get(holeIndex, 0):
+ return
+ costMoney = runeUnlockDict[holeIndex]
+ if not PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costMoney, ChConfig.Def_Cost_RuneHole, {'holeIndex':holeIndex}):
+ return
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_HoleOpenState, runeOpenState |pow(2, holeIndex))
+ Sync_RuneInfo(curPlayer)
+ PlayerControl.WorldNotify(0, 'RuneSpecialHoleGet', [curPlayer.GetName(), costMoney])
+ return
+
def DoUnlockRuneHole(curPlayer, isSycn=True):
# 解锁符印孔, 符印塔过关时调用
runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
@@ -158,9 +186,8 @@
or (srcBackpack == ShareDefine.rptRune and desBackPack == ShareDefine.rptTempSwap)):
return False
-
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- maxRuneHole = len(runeUnlockList)
+
+ maxRuneHole = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
# 穿
if desBackPack == ShareDefine.rptTempSwap:
desRuneNum = destIndex + 1
@@ -325,8 +352,8 @@
#清掉#镶嵌X枚X品质符印的成就信息
PlayerSuccess.ResetSuccessByType(curPlayer, ShareDefine.SuccType_InlayRune)
totalLV = 0
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- for holeNum in xrange(1, len(runeUnlockList) + 1):
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ for holeNum in xrange(1, runeHoleCnt + 1):
runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
if not runeData:
continue
@@ -339,6 +366,8 @@
totalLV += runeItemPlusLV
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_InlayRune, 1, [itemColor])
PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_RuneLvUp, totalLV)
+ # 开服活动数据
+ OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_RuneLV, totalLV)
return
#// A5 66 符印分解 #tagCMRuneDecompose
@@ -396,7 +425,7 @@
decompose += decompose * addPer / ShareDefine.Def_MaxRateValue
ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
- if ipyData:
+ if ipyData and ItemControler.GetRuneItemSource(RuneData) in [0,2]:
totalMJ += ipyData.GetNeedMJ()
@@ -542,6 +571,7 @@
#给新物品
curItem = ItemControler.GetOutPutItemObj(tagItemID)
curItem.SetUserAttr(ShareDefine.Def_IudetRuneLV, tagItemLV)
+ curItem.SetUserAttr(ShareDefine.Def_IudetRuneSource, 2)
PlayerItemControler = ItemControler.PlayerItemControler(curPlayer)
PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {}])
return
@@ -550,8 +580,8 @@
## 刷符印属性
def RefreshRuneAttr(curPlayer):
allAttrList = [{} for _ in range(4)]
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- for holeNum in xrange(1, len(runeUnlockList) + 1):
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ for holeNum in xrange(1, runeHoleCnt + 1):
runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
if not runeData:
continue
@@ -574,14 +604,14 @@
## 同步客户端
def Sync_RuneInfo(curPlayer):
- runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock")
- if not runeUnlockList:
+ runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+ if not runeHoleCnt:
return
RuneInfoPack = ChPyNetSendPack.tagMCRuneInfo()
RuneInfoPack.Clear()
RuneInfoPack.RuneHoleOpenState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_HoleOpenState, 0)
RuneInfoPack.RuneDataList = []
- for RuneNum in xrange(1, len(runeUnlockList) + 1):
+ for RuneNum in xrange(1, runeHoleCnt + 1):
RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % RuneNum, 0)
RuneInfoPack.RuneDataList.append(RuneData)
RuneInfoPack.Count = len(RuneInfoPack.RuneDataList)
--
Gitblit v1.8.0