From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py | 16 ++++++++--------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py | 6 +++++-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py
index ab094da..f8cd829 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.py
@@ -586,14 +586,14 @@
if isPass:
EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_MagicWeapon, 0, ChConfig.CME_Log_End, 0, 1)
- if lineID == IpyGameDataPY.GetFuncCfg('FirstGoldTryItem', 3):
- if not isPass:
- #副本指定线路失败了，进入首充试用引导
- if not curPlayer.GetChangeCoinPointTotal() and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry):
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 1)
- PlayerGoldGift.Sync_FirstGoldInfo(curPlayer)
- else:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 0)
+# if lineID == IpyGameDataPY.GetFuncCfg('FirstGoldTryItem', 3):
+# if not isPass:
+# #副本指定线路失败了，进入首充试用引导
+# if not curPlayer.GetChangeCoinPointTotal() and not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FirstGoldTry):
+# PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 1)
+# PlayerGoldGift.Sync_FirstGoldInfo(curPlayer)
+# else:
+# PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 0)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
index d057876..56a5da5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
@@ -513,7 +513,11 @@
itemObj = ItemCommon.GetMailItemDict(curItem)
PlayerControl.SendMailByKey('', [curPlayer.GetID()], [itemObj])
ItemCommon.DelItem(curPlayer, curItem, 1, False)
-
+ else:
+ result = ItemControler.PlayerItemControler(curPlayer).UnEquipItem(equipPlace, spaceIndex)
+ if not result:
+ GameWorld.Log(' 试用首充武器 卸下原装备失败！！', curPlayer.GetID())
+ return
tryItem = ItemControler.GetOutPutItemObj(tryItemID)
if ChEquip.DoPlayerEquipItem(curPlayer, tryItem, ItemCommon.GetEquipPackIndex(tryItem), tick):
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 2)
--
Gitblit v1.8.0