From dad92ce8acf71cc7ca770571c16a43de65cf78f1 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 24 十月 2018 14:40:30 +0800
Subject: [PATCH] 4233 【后端】许愿池功能开发

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 1672af7..66c355b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -62,9 +62,9 @@
 import PlayerActivity
 import PlayerTeHui
 import FBCommon
-import HighLadderTube
+import PlayerBindJadeWheel
 import BossHurtMng
-import PlayerAction
+import PlayerWishingWell
 import PlayerAttrFruit
 import PlayerSuccess
 import PlayerDienstgrad
@@ -102,7 +102,7 @@
 import PlayerTJG
 import GameLogic_XMZZ
 import GameLogic_SealDemon
-import GameLogic_Dogz
+import PlayerFlashSale
 import PlayerFlashGiftbag
 import PlayerCostRebate
 import PlayerSpringSale
@@ -491,7 +491,8 @@
     PlayerSpringSale.OnPlayerLogin(curPlayer)
     #限时礼包
     PlayerFlashGiftbag.OnPlayerLogin(curPlayer)
-    
+    #限时抢购
+    PlayerFlashSale.OnPlayerLogin(curPlayer)
 #    # 消费VIP
 #    PlayerCostVIP.CostVIPOnLogin(curPlayer, tick)
 #    
@@ -541,11 +542,12 @@
     GameFuncComm.DoFuncOpenLogic(curPlayer)
     # 神兽
     PlayerDogz.OnPlayerLogin(curPlayer)
-    # 神兽副本
-    GameLogic_Dogz.SyncNPCRefreshTime(curPlayer.GetID())
     # 骑宠
     FamilyRobBoss.OnPlayerLogin(curPlayer)
-    
+    # 绑玉转盘
+    PlayerBindJadeWheel.OnLogin(curPlayer)
+    # 许愿池
+    PlayerWishingWell.OnLogin(curPlayer)
     # 上线查询一次充值订单
     curPlayer.SendDBQueryRecharge()
     
@@ -4390,16 +4392,6 @@
         PlayerControl.NotifyCode(curPlayer, "04BBF813-7A30-47A8-927DE1ACCC4F378E")
         return
 
-#===============================================================================
-#    isFreedomTransBuff = SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID)
-#    if not PlayerControl.IsPlayerInFight(curPlayer):
-# 
-#        if (transportType == ChConfig.Def_Transport_Type_BigMap) or (not isFreedomTransBuff):
-#            #传送支付处理
-# 
-#            if not PayForTransport(curPlayer, transportType, isAutoBuy):
-#                return
-#===============================================================================
     #是任务传送,VIP等级不够,且传送符不足,不处理
     if transportType == ChConfig.Def_Transport_Type_Mission and \
        not TransportVipLvRestrict(curPlayer, transportType) and \
@@ -4501,12 +4493,6 @@
 #  @param transportType 传送类型
 #  @return 是否vip等级限制
 def TransportVipLvRestrict(curPlayer, transportType):
-    
-    #大地图标记传送不能体验无限飞buff功能
-    if transportType != ChConfig.Def_Transport_Type_BigMap:
-        if SkillCommon.GetPlayerBuffBySkillTypeID(curPlayer, ShareDefine.Def_FreedomTransBuffID):
-            #有无限飞buff
-            return True
     return PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FreeTransport)
 
 
@@ -4996,6 +4982,10 @@
     # 领取分包下载奖励
     elif rewardType == ChConfig.Def_RewardType_DownLoad:
         GetDownloadAward(curPlayer, dataEx)
+    # 领取许愿池奖励
+    elif rewardType == ChConfig.Def_RewardType_WishingWell:
+        PlayerWishingWell.DoGetWishingAward(curPlayer)
+    
 #
 #    # 充值豪礼奖励
 #    elif rewardType == ShareDefine.Def_RewardType_GoldGift:

--
Gitblit v1.8.0