From 0494d4903383737139445b11e525a9e2ca583801 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 21 二月 2019 16:47:35 +0800
Subject: [PATCH] 6268 【后端】【1.6.100】增加道具七日巡礼积分和节日巡礼积分支持

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 92eeea5..d174759 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -84,6 +84,7 @@
 import PlayerCostRebate
 import GY_Query_CrossRealmReg
 import PlayerFairyCeremony
+import PlayerNewFairyCeremony
 import PlayerCrossRealmPK
 import FunctionNPCCommon
 import CrossRealmPlayer
@@ -530,6 +531,10 @@
         
     if not GameWorld.IsCrossServer() and GetCrossMapID(curPlayer):
         NotifyCode(curPlayer, "CrossMap10") 
+        return False
+    
+    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
+        GameWorld.Log("客户端自定义场景下无法传送!", curPlayer.GetPlayerID())
         return False
     
     return True
@@ -1816,6 +1821,12 @@
             NotifyCode(curPlayer, "Carry_lhs_697674")
         return ShareDefine.EntFBAskRet_Sit
     
+    if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
+        if isNotify:
+            NotifyCode(curPlayer, "Carry_lhs_697674")
+        GameWorld.Log("客户端自定义场景下无法进入副本!", curPlayer.GetPlayerID())
+        return ShareDefine.EntFBAskRet_Other
+    
     if playerAction in ChConfig.Def_Player_Cannot_TransState:
         #Carry_lhs_697674:您当前所处的状态不能进行传送!
         if isNotify:
@@ -2971,6 +2982,7 @@
     PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
     # 绝版降临
     PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)
+    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)
     # 消费VIP
 #    if costVIPGold < 0:
 #        costVIPGold = price
@@ -3739,7 +3751,7 @@
         # 检查最大等级
         if curLV >= maxLV and curTotalExp >= maxLVExpStore:
             self.__NotifyExpFull(curPlayer, "GeRen_admin_825676")
-            GameWorld.DebugLog("经验已满!已满级!curLV=%s" % (curLV), curPlayer.GetPlayerID())
+            #GameWorld.DebugLog("经验已满!已满级!curLV=%s" % (curLV), curPlayer.GetPlayerID())
             return 0, expViewType
         
         # 杀怪

--
Gitblit v1.8.0