From 5ab23bf8c2f16b2ac19d76282ad9528fcb247005 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 30 十月 2018 17:55:37 +0800
Subject: [PATCH] 4409 【后端】【1.2.0】装备合成、翅膀合成修改

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
index 20f77dd..0e7a045 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -177,10 +177,6 @@
     curPlayer.SetSight(min(ChConfig.Def_PlayerSight_Default, clientData.Sight))
     GameWorld.DebugLog("OnSightZoom:%s"%clientData.Sight)
     
-    # 脱机玩家过多,需要隐身一部分
-    if curPlayer.GetLV() < 190:
-        if random.randint(0, 5) != 2:
-            curPlayer.SetVisible(False)
     return
 
 # 需要处理的点,防沉迷
@@ -455,7 +451,10 @@
     
     # 击杀特定NPC成就
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, killCnt, [npcID])
-    
+    # 日常活动
+    if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDictType_TJGOnDayEx):
+        if npcData.GetLV()>=curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):
+            PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC, killCnt)
     # 击杀任务怪, 杀怪日常已经没有了,暂时屏蔽
     #for _ in xrange(killCnt):
     #    EventShell.Event_OnKillByID(curPlayer, npcID)
@@ -659,7 +658,8 @@
     if curPlayer.GetIP() == "127.0.0.1":
         LoginFixTJG(curPlayer, True)
         return
-    
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGOnDayEx, 0)
+                                       
     # 脱机挂没有运作情况下 弥补收益
     LoginFixTJG(curPlayer)
     
@@ -781,12 +781,16 @@
  
 
 # 过天清理
-def TJGOnDay(curPlayer):
-    times = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TJGDeadPayTime)
-    if times == 0:
-        return
-        
-    ResetTJGDeadInfo(curPlayer)
+def TJGOnDay(curPlayer, onEventType):
+    if onEventType == ShareDefine.Def_OnEventType:
+        times = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TJGDeadPayTime)
+        if times == 0:
+            return
+            
+        ResetTJGDeadInfo(curPlayer)
+    elif onEventType == ShareDefine.Def_OnEventTypeEx:
+        if GetIsTJG(curPlayer):
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDictType_TJGOnDayEx, 1)
     return
 
 def ResetTJGDeadInfo(curPlayer):
@@ -914,7 +918,7 @@
         # 此时由服务端重新找一次挂机NPC
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_TJGNPC, npcID)
     
-    GameWorld.DebugLog("弥补脱机----npcid  %s-%s-%s"%(
+    GameWorld.DebugLog("弥补脱机----playerID:%s ,npcid  %s-%s-%s"%(curPlayer.GetID(),
                     curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_TJGNPC), times,
                     curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TotalExpRate)))
     

--
Gitblit v1.8.0