From 4f0b63ba644f87dbec17b4987355adf1fdfc508c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 13 九月 2024 18:22:20 +0800
Subject: [PATCH] 10261 【越南】【砍树】【英文】仙盟徽章、头像、头像框(存储激活状态及到期时间方式修改;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTFace.py |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTFace.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTFace.py
index e1f89df..607aeb8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTFace.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTFace.py
@@ -19,6 +19,7 @@
 import DataRecordPack
 import PlayerFace
 import GMCommon
+import ChConfig
 
 #---------------------------------------------------------------------
 #全局变量
@@ -41,20 +42,22 @@
     Result = GMCommon.Def_Success
     orderId, isOnlineGMT, faceType, opID, expireTime, opType = packCMDList
     
-    endTime = -1
+    state, endTime = 0, 0
     isOK = False
     if faceType == "face":
         if opType == "add":
             isOK = PlayerFace.AddFace(curPlayer, opID, expireTime)
         elif opType == "del":
             isOK = PlayerFace.DelFace(curPlayer, opID)
-        endTime = PlayerFace.GetFaceEndTime(curPlayer, opID)
+        state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_FaceState, opID)
+        endTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FaceEndTime % opID)
     elif faceType == "facePic":
         if opType == "add":
             isOK = PlayerFace.AddFacePic(curPlayer, opID, expireTime)
         elif opType == "del":
             isOK = PlayerFace.DelFacePic(curPlayer, opID)
-        endTime = PlayerFace.GetFacePicEndTime(curPlayer, opID)
+        state = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_FacePicState, opID)
+        endTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FacePicEndTime % opID)
         
     if not isOK:
         errorMsg = "%s %s fail! Please check that the ID(%s) is correct." % (opType, faceType, opID)
@@ -63,9 +66,11 @@
         GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GMToolResult', resultMsg, len(resultMsg))
         return
     
-    endTimeStr = PlayerFace.GetEndTimeStr(endTime)
+    endTimeStr = "未激活"
+    if state:
+        endTimeStr = "永久" if not endTime else GameWorld.ChangeTimeNumToStr(endTime)
     resultDict = {"opID":opID, "expireTime":expireTime, "isOnlineGMT":isOnlineGMT, "opType":opType, 
-                  "faceType":faceType, "endTime":endTime, "endTimeStr":endTimeStr}
+                  "faceType":faceType, "state":state, "endTimeStr":endTimeStr}
     GameWorld.Log("GMT_Face, isOnlineGMT=%s,resultDict=%s" % (isOnlineGMT, resultDict), curPlayer.GetPlayerID())
     #流向 记录
     DataRecordPack.DR_ToolGMOperate(query_ID, curPlayer.GetPlayerName(), curPlayer.GetAccID(), 'GMT_Face', resultDict)

--
Gitblit v1.8.0