From 2399e4420a0309193839d4355886c9540983af8f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 23 五月 2019 20:14:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerYinji.py |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerYinji.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerYinji.py
index 384c6ab..320f862 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerYinji.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerYinji.py
@@ -23,7 +23,6 @@
 
 Def_LastYinji_Tick = "lastyjtick"   # 上一次印记消失时间
 
-#CDBPlayerRefresh_XP
 def AddYinji(curPlayer, cnt):
     beforeCnt = PlayerControl.GetYinjiCnt(curPlayer)
     #上限    X个
@@ -36,7 +35,7 @@
     return
 
 def SubYinji(curPlayer, cnt):
-    PlayerControl.SetYinjiCnt(curPlayer, max(curPlayer.GetXP() - cnt, 0))
+    PlayerControl.SetYinjiCnt(curPlayer, max(PlayerControl.GetYinjiCnt(curPlayer) - cnt, 0))
     return
 
 
@@ -51,6 +50,7 @@
     
     StartYinjiTick(curPlayer)
     
+    
     SubYinji(curPlayer, 1)
     
     
@@ -58,4 +58,32 @@
     curPlayer.SetDict(Def_LastYinji_Tick, GameWorld.GetGameWorld().GetTick())
     pack = ChPyNetSendPack.tagMCYinjiStartTime()
 
-    NetPackCommon.SendFakePack(curPlayer, pack)
\ No newline at end of file
+    NetPackCommon.SendFakePack(curPlayer, pack)
+    
+    
+def OnLoadMap(curPlayer):
+    PlayerControl.SetYinjiCnt(curPlayer, 0)
+    return
+    
+#===============================================================================
+# // B4 0D 战斗印记 #tagCMYinji
+# 
+# struct    tagCMYinji
+# {
+#    tagHead        Head;
+#    BYTE        Count;
+#    BYTE        Type;    // 0 加,1减
+# };
+#===============================================================================
+def OnYinji(index, clientData, tick):
+    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+    if curPlayer.GetLV() > 100:
+        # 只是为了前期前端战斗的使用
+        return
+    
+    if clientData.Type == 0:
+        AddYinji(curPlayer, clientData.Count)
+    elif clientData.Type == 1:
+        SubYinji(curPlayer, clientData.Count)
+    return
+

--
Gitblit v1.8.0