From e4c2a1b331ef0133a010bce5ccdcf3d19db12726 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 07 十一月 2025 14:46:31 +0800
Subject: [PATCH] 237 【福利内容】每日任务/每周任务/章节奖励-服务端(增加物品效果281-给活跃度;每日任务奖励改为配置物品;)

---
 /dev/null                                                                                    |   69 -------------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py    |   21 +++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py |    3 
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py           |   44 ++++----
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py         |    4 
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py           |   21 ----
 PySysDB/PySysDBPY.h                                                                          |    2 
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py              |   86 ++++------------
 8 files changed, 66 insertions(+), 184 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index e553401..0507b3a 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1240,7 +1240,7 @@
 	BYTE		_TaskType;	//任务类型
 	list		TaskConds;	//任务条件[...]
 	DWORD		NeedValue;	//所需任务值
-	BYTE		AwardLiveness;	//奖励活跃度
+	list		AwardItemList;	//奖励物品列表
 };
 
 //每日活跃奖励表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 05f514c..ee41b3f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -498,10 +498,10 @@
 Def_ItemType_Title = 4           #称号
 Def_ItemType_SPValue = 5           #SP值
 Def_ItemType_SPBook = 6           #SP技能书
-Def_ItemType_HPMP = 7             #补红补篮
-Def_ItemType_AddExpBuff = 8          #经验道具
-Def_ItemType_AddLimitBuff = 9    #添加限时buff物品类型
-Def_ItemType_AddLimitBuff2 = 18   #添加限时buff物品类型,效果相同,前端需求需要区分类型
+#Def_ItemType_HPMP = 7             #补红补篮
+#Def_ItemType_AddExpBuff = 8          #经验道具
+#Def_ItemType_AddLimitBuff = 9    #添加限时buff物品类型
+#Def_ItemType_AddLimitBuff2 = 18   #添加限时buff物品类型,效果相同,前端需求需要区分类型
 Def_ItemType_OnhookCard = 10    #挂机卡
 Def_ItemType_ChangePlayerName = 11          #改名贴
 Def_ItemType_Transmit = 12          #传送道具
@@ -536,7 +536,7 @@
 Def_ItemType_FamilyBossFood = 50       #仙盟兽粮
 Def_ItemType_ActiveMWItem = 53     # 用于激活法宝的物品,不存在背包 (王者法宝)
 Def_ItemType_ActiveMWItem2 = 56     # 用于激活法宝的物品,不存在背包(非王者法宝)
-Def_ItemType_ResetAttrPoint = 59       #洗点卷轴 使用后将某个属性一定值变为未分配属性
+#Def_ItemType_ResetAttrPoint = 59       #洗点卷轴 使用后将某个属性一定值变为未分配属性
 Def_ItemType_GatherSoulExp = 61 #聚魂精华材料
 Def_ItemType_GatherSoul = 62 #普通聚魂
 Def_ItemType_GatherSoulCore = 63 #聚魂核心
@@ -574,7 +574,6 @@
 Def_ItemType_DogzEquipTooth = 121   # 神兽獠牙
 Def_ItemType_DogzEquipClaw = 122    # 神兽兽爪
 Def_ItemType_DogzEquipScute = 123   # 神兽鳞甲
-Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数
 
 Def_ItemType_DogzStuff = 139 # 神兽材料
 
@@ -629,7 +628,7 @@
 Def_Effect_GivePlayerMoneyGift = 202    #给人物金钱 绑定仙玉道具效果ID
 Def_Effect_GivePlayerMoneyGold = 203    #给人物金钱 仙玉道具效果ID
 Def_Effect_AddDienstgrad = 204   #使用物品获得称号
-Def_Effect_UseItemGiveZhenQi = 205      #使用道具给予真气
+#205      #使用道具给予真气
 Def_Effect_ItemGiveFamilyContribution = 209      #使用道具给予仙盟贡献
 Def_Effect_ItemAddExp = 213      #给经验道具 
 Def_Effect_ItemAddLV = 214       #直接升级道具 
@@ -638,16 +637,16 @@
 Def_Effect_EquipStone = 225   #镶嵌宝石效果;A值-宝石镶嵌类型,B值-宝石等级,C值-下一级宝石ID
 Def_Effect_Reborn = 227                 #复活物品(还阳咒)效果ID
 Def_Effect_PrizeCoin = 228                 #奖励充值点券; A值点券;B值奖励点券
-Def_Effect_AddVIPExp = 229                 #增加VIP经验;A值经验点
-Def_Effect_ResetBossKillCnt = 230                 #重置boss击杀疲劳;A值重置的boss疲劳类型
+#229                 #增加VIP经验;A值经验点
+#230                 #重置boss击杀疲劳;A值重置的boss疲劳类型
 Def_Effect_GivePlayerSilverPaper = 1915    #给人物金钱银票(恶魔精华)道具效果ID
 Def_Effect_ItemSpeak = 2700              #小喇叭效果ID
-Def_Effect_CleanGuilt = 2812   # 洗红名
+#Def_Effect_CleanGuilt = 2812   # 洗红名
 Def_Effect_ResetAttrPoint = 231   # 洗点
 Def_Effect_AddFBCnt = 233   # 增加副本可进入次数,A值副本ID,B值是否自动使用
-Def_Effect_AddKillBossCnt = 234   # 增加BOSS可击杀次数
+#234   # 增加BOSS可击杀次数
 Def_Effect_DogzEquipPlusExp = 235   # 神兽强化材料经验效果,A值基础经验,B值双倍强化消耗仙玉
-Def_Effect_AddMagicWeaponUpExp = 236   # 增加法宝升星经验 A值法宝ID B值X经验
+#236   # 增加法宝升星经验 A值法宝ID B值X经验
 Def_Effect_ChatBubbleBox = 237   # 激活聊天气泡框,A值气泡框ID
 Def_Effect_ItemGiveRealmPoint = 238      #使用道具给予修行点
 Def_Effect_ItemGiveSoulDust = 239   # 使用道具给予魂尘
@@ -656,14 +655,14 @@
 Def_Effect_ItemGiveHonor = 242      #使用道具给予荣誉
 Def_Effect_ItemGiveWeekPartyPoint = 245      #使用道具给予七日巡礼积分
 Def_Effect_ItemGiveWeekPartyPoint1 = 246      #使用道具给予节日巡礼积分
-Def_Effect_AddRealmExpRate = 251 #增加聚灵效率
-Def_Effect_TouchMission = 252 #触发任务
+#251 #增加聚灵效率
+#252 #触发任务
 #253 #骑宠觉醒值
 Def_Effect_ItemGiveTreasureScore = 254      #使用道具给予寻宝积分
-Def_Effect_VIPLVCard = 256    #VIP等级直升卡 直接升到VIPx级,只加经验,享受VIP特权    效果值A: vip等级    效果值B: 领取是否默认直接使用
-Def_Effect_AddArenaBattleCount = 257    #增加竞技场挑战次数,A值为增加次数
+#256    #VIP等级直升卡 直接升到VIPx级,只加经验,享受VIP特权    效果值A: vip等级    效果值B: 领取是否默认直接使用
+#257    #增加竞技场挑战次数,A值为增加次数
 Def_Effect_ItemGiveMoney = 264    #通用给货币道具,A值数量,B值货币类型
-Def_Effect_GuajiAward = 266    #直接给挂机收益,A值分钟
+#266    #直接给挂机收益,A值分钟
 Def_Effect_ItemCount = 267     #自动转化为对应物品ID的个数,不存背包
 Def_Effect_TrainRealmLV = 272     #境界培养卡,值A-功能(1-坐骑;2-灵宠;3-灵器), 值B-境界
 Def_Effect_TiandaoQiyun = 273   #增加天道树气运;A值-增加值   效果值B: 领取是否默认直接使用
@@ -674,54 +673,14 @@
 Def_Effect_FamilyEmblem = 278   #激活仙盟徽章; A值-徽章ID;
 Def_Effect_HeroSkin = 279   #激活武将皮肤; A值-武将ID;B值-皮肤索引
 Def_Effect_FamilyTaofaCnt = 280   #增加公会讨伐次数; A值-讨伐次数
+Def_Effect_AddActivity = 281   #给活跃度
+
+#放入背包自动使用的物品效果ID
+AutoUseItemEffectIDList = [Def_Effect_ItemCount, Def_Effect_AddActivity]
+
 #----以下未使用或代码依然存在的---
-Def_Effect_ItemGiveGongXun = 1920        #使用道具给予功勋
 Def_Effect_ItemGiveRuneJH = 1925       #使用道具给予符印精华
 Def_Effect_ItemGiveRuneSplinters = 1926       #使用道具给予符印碎片
-Def_Effect_SuiteMark = 2838    #用于标示套装装备,过滤等使用
-Def_Effect_ClothesCoatSkin = 1919   #玩家时装皮肤
-#Def_Effect_PetReSet = 5500        #易髓丹
-#Def_Effect_PetUpdateTalent = 5501 #造化丹
-#Def_Effect_PetRePoint = 5505      #神泣之泪
-#Def_Effect_PetEmptySoul = 5503    #宠物空魂
-#Def_Effect_PetSoul = 5504         #宠物满魂
-#Def_Effect_PetItemAddExp = 2006   #给宠物经验道具 
-#Def_Effect_EnergyItem = 2600             #精力药剂
-#Def_Effect_PetRewashSkill = 5506         #重洗技能
-#Def_Effect_AddStarItemNormal = 1157      #普通升星物品效果ID
-#Def_Effect_AddStarItemHighLevel = 1158   #高级升星物品效果ID
-#Def_Effect_CompoundJiePo = 1159          #结魄效果ID
-#Def_Effect_PickStone = 1160              #摘取符效果ID
-#Def_Effect_ItemJionFamilyBattle = 1800   #报名家族争霸赛效果ID
-#Def_Effect_ItemEnterMiJingDiTu = 1164    #进入密境地图效果ID
-#Def_Effect_FineSouleProtect = 1163       #精魄合成保护符效果ID
-#Def_Effect_ItemChangMaxEndure = 1165     #物品提高装备最大耐久
-#Def_Effect_ItemNoLostEquipEndure = 1166  #物品不扣装备耐久
-#Def_Effect_ItemRestoreEndure = 1167      #物品修复装备耐久
-#Def_Effect_ItemWuXingJuan = 1171         #五行转换卷轴
-#Def_Effect_ResetAttrItem = 1174          #属性重修丸效果ID
-#Def_Effect_PetReSetTalentl = 5507        #宠物道具, 重置资质
-#Def_Effect_ResetQuestCount = 1175        #重置任务次数
-#Def_Effect_MaxAddSkillCnt = 1184         #增加最大灵纹次数道具
-#Def_Effect_FarSellItem = 2012            #远程贩卖所需物品
-#Def_MagicStone_EffID = 1104              #灵石
-#Def_SuperMagicStone_EffID = 1190         #圣石效果ID
-#Def_PhoneVip_EffID = 600                 #手机VIP物品卡效果ID
-#Def_Effect_ItemEquipWakeUp = 1191        #神器唤醒效果
-#Def_Effect_ItemEquipWakeUpStarLv = 1192  #最高级升星石
-#Def_Effect_AddZhenQiByTimes = 2018       #增加真气按一天使用次数减少
-#Def_Effect_AddPrestige = 2021            #增加威望 
-#Def_Effect_FamilyImpeach = 1193          #弹劾符 
-#Def_Item_150_Effect = 2010                 #定点传送符
-#Def_Item_152_Effect = 383                  #山洞传送符
-#Def_Effect_GetVIP = 2811   # 获取vip物品效果
-#Def_ItemEff_WeaponType = 2808   # 武器类型分类(非物品类型)
-#Def_ItemEff_Flower = 2816   # 鲜花
-#Def_Effect_AddMagicJifen = 1916      #使用道具给予幸运宝藏积分
-#Def_Effect_AddSkyGodExp = 2854   #增加天神经验 A值天神经验
-#Def_Effect_SummonNPC = 2855   #召唤NPC A值NPCID B值持续时间 C值是否不删除物品,默认0删除
-#Def_Effect_AddOfficialExp = 2859   #增加爵位经验
-
 #---------------------------------------------------------------------
 Def_Max_Update_Talent_Time = 3    #最大使用造化丹次数
 
@@ -4484,7 +4443,7 @@
 ItemDel_SellPackItem, # 出售物品
 ItemDel_2, # 神兵
 ItemDel_EquipEnchase, # 宝石镶嵌
-ItemDel_Add_LimitingBuff, # 增加buff时间
+ItemDel_4, # 增加buff时间
 ItemDel_AddDienstgrad, # 增加称号 5
 ItemDel_AddExp, # 增加经验
 ItemDel_AddLV, # 增加等级
@@ -4534,7 +4493,6 @@
                    ItemDel_Unknown:"Unknown",
                    ItemDel_SellPackItem:"SellPackItem",
                    ItemDel_EquipEnchase:"EquipEnchase",
-                   ItemDel_Add_LimitingBuff:"Add_LimitingBuff",
                    ItemDel_AddDienstgrad:"AddDienstgrad",
                    ItemDel_AddExp:"AddExp",
                    ItemDel_AddLV:"AddLV",
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index a6eecb9..50bbece 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1013,7 +1013,7 @@
                         ("BYTE", "TaskType", 1),
                         ("list", "TaskConds", 0),
                         ("DWORD", "NeedValue", 0),
-                        ("BYTE", "AwardLiveness", 0),
+                        ("list", "AwardItemList", 0),
                         ),
 
                 "DailyLivenessReward":(
@@ -3673,7 +3673,7 @@
     def GetTaskType(self): return self.attrTuple[1] # 任务类型 BYTE
     def GetTaskConds(self): return self.attrTuple[2] # 任务条件[...] list
     def GetNeedValue(self): return self.attrTuple[3] # 所需任务值 DWORD
-    def GetAwardLiveness(self): return self.attrTuple[4] # 奖励活跃度 BYTE
+    def GetAwardItemList(self): return self.attrTuple[4] # 奖励物品列表 list
 
 # 每日活跃奖励表
 class IPY_DailyLivenessReward():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
index 73f307f..efc014c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
@@ -574,45 +574,24 @@
     
     #根据物品类型使用{物品类型:call的py名}
     itemTypeCallFuncDic = {
-                           ChConfig.Def_ItemType_HPMP:"Item_Add_HPMP",                # 补红补篮药剂
                            ChConfig.Def_ItemType_AddExp:"Item_AddExp",         # 给经验道具
                            ChConfig.Def_ItemType_GiveMoney:"Item_GiveMoney",         # 给人物金钱
                            ChConfig.Def_ItemType_AutoUseMoney:"Item_GiveMoney",         # 给人物金钱
-                           ChConfig.Def_ItemType_RuneExp:"Item_RuneExp",         # 给人物符印精华
-                           ChConfig.Def_ItemType_AddLimitBuff:"Item_Add_LimitingBuff",         # 给限时buff物品
-                           ChConfig.Def_ItemType_AddLimitBuff2:"Item_Add_LimitingBuff",         # 给限时buff物品
-                           ChConfig.Def_ItemType_AddExpBuff:"Item_Add_LimitingBuff",         # 给限时buff物品
-                           ChConfig.Def_ItemType_ResetAttrPoint:"Item_ResetAttrPoint",    #单个属性点重置
-                           ChConfig.Def_ItemType_AddCrossRealmPKCnt:"Item_AddCrossRealmPKCnt"    #增加跨服PK次数
                            } 
     
     #根据物品效果使用{物品效果ID:call的py名}
     itemEffIdCallFuncDic = {
-                            ChConfig.Def_Effect_UseItemGiveZhenQi:"Item_UseItemGiveZhenQi", # 使用道具给予真气
                             ChConfig.Def_Effect_ItemAddLV:"Item_AddLV", #升级道具
-                            ChConfig.Def_Effect_GuajiAward:"Item_GuajiAward", #直接给挂机收益
-                            ChConfig.Def_Effect_CleanGuilt:"Item_CleanGuilt", # 洗红名
                             ChConfig.Def_Effect_PrizeCoin:"Item_PrizeCoin", # 奖励充值点券
-                            ChConfig.Def_Effect_AddVIPExp:"Item_AddVIPExp", # 增加VIP经验
-                            ChConfig.Def_Effect_VIPLVCard:"Item_VIPLVCard", # VIP等级直升卡
                             ChConfig.Def_Effect_TiandaoQiyun:"Item_TiandaoQiyun", # 天道树气运
                             ChConfig.Def_Effect_TrainRealmLV:"Item_TrainRealmLV", # 境界培养卡
-                            ChConfig.Def_Effect_ResetBossKillCnt:"Item_ResetBossKillCnt", # 重置boss击杀疲劳
                             ChConfig.Def_Effect_AddFBCnt:"Item_AddFBCnt", # 增加副本可进入次数
-                            ChConfig.Def_Effect_AddKillBossCnt:"Item_AddKillBossCnt", # 增加BOSS可击杀次数
-                            ChConfig.Def_Effect_AddMagicWeaponUpExp:"Item_AddMagicWeaponUpExp", # 增加法宝升星经验
                             ChConfig.Def_Effect_EmojiPack:"Item_EmojiPack",
                             ChConfig.Def_Effect_FamilyEmblem:"Item_FamilyEmblem",
                             ChConfig.Def_Effect_ItemGiveWeekPartyPoint:"Item_WeekPartyPoint", # 增加活动巡礼积分
                             ChConfig.Def_Effect_ItemGiveWeekPartyPoint1:"Item_WeekPartyPoint", # 增加活动巡礼积分
-                            ChConfig.Def_Effect_AddRealmExpRate:"Item_AddRealmExpRate", # 增加聚灵效率
-                            ChConfig.Def_Effect_TouchMission:"Item_TouchMission",  # 触发任务接口
                             ChConfig.Def_Effect_HeroSkin:"Item_HeroSkin",  # 武将皮肤
                             ChConfig.Def_Effect_FamilyTaofaCnt:"Item_FamilyTaofaCnt",  # 增加公会讨伐次数
-                            #ChConfig.Def_Effect_AddArenaBattleCount:"Item_AddArenaBattleCount", # 增加竞技场挑战次数
-                            #ChConfig.Def_Effect_FamilyImpeach:"Item_FamilyImpeach",  # 弹劾符
-                            #ChConfig.Def_Effect_ClothesCoatSkin:"Item_ClothesCoatSkin", #激活时装皮肤
-                            #ChConfig.Def_Effect_AddOfficialExp:"Item_AddOfficialExp", # 增加爵位经验
                             }
     
     callFuncName = itemTypeCallFuncDic.get(curItemType, "")
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index 0ef20d0..79539df 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -25,6 +25,7 @@
 import traceback
 import random
 import ReadChConfig
+import PlayerActivity
 import ChPyNetSendPack
 import NetPackCommon
 import PlayerXiangong
@@ -901,6 +902,18 @@
         GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_PutInItem, itemMsg, [serverGroupID])
         return
     
+    def __autoUseByEffectID(self, curPlayer, tagItem, itemEff, itemID, itemCount):
+        effectID = itemEff.GetEffectID()
+        
+        # 物品碎片
+        if effectID == ChConfig.Def_Effect_ItemCount:
+            SetItemCountByID(curPlayer, itemID, GetItemCountByID(curPlayer, itemID) + itemCount)
+        # 活跃度
+        elif effectID == ChConfig.Def_Effect_AddActivity:
+            PlayerActivity.DoAddActivity(curPlayer, itemCount)
+            
+        return
+    
     ## 放入物品 
     #  @param packIndex 背包索引
     #  @param tagItem 物品
@@ -939,11 +952,11 @@
         #    tagItem.Clear()
         #    return True
         itemEff = tagItem.GetEffectByIndex(0)
-        #物品碎片
-        if itemEff.GetEffectID() == ChConfig.Def_Effect_ItemCount:
-            SetItemCountByID(curPlayer, itemID, GetItemCountByID(curPlayer, itemID) + tagItemCount)
+        if itemEff.GetEffectID() in ChConfig.AutoUseItemEffectIDList:
+            self.__autoUseByEffectID(curPlayer, tagItem, itemEff, itemID, tagItemCount)
             tagItem.Clear()
             return True
+        
         #气运
         if itemEff.GetEffectID() == ChConfig.Def_Effect_TiandaoQiyun:
             isAutoUse = itemEff.GetEffectValue(1)
@@ -2179,7 +2192,7 @@
     if itemData.GetItemTypeID() in ChConfig.Def_TransformItemIDList or itemData.GetType() == ChConfig.Def_ItemType_AutoUseMoney:
         return True
     itemEff = itemData.GetEffectByIndex(0)
-    if itemEff.GetEffectID() == ChConfig.Def_Effect_ItemCount:
+    if itemEff.GetEffectID() in ChConfig.AutoUseItemEffectIDList:
         return True
     return False
 
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.py
deleted file mode 100644
index 2a68f91..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddCrossRealmPKCnt.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package UseItem.Item_AddCrossRealmPKCnt
-#
-# @todo:增加跨服PK次数
-# @author xdh
-# @date 2019-01-14
-# @version 1.0
-#
-# 详细描述: 增加跨服PK次数
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2018-03-09 12:00"""
-#-------------------------------------------------------------------------------
-import ItemCommon
-import PlayerCrossRealmPK
-import PlayerControl
-import ChConfig
-import CrossRealmPlayer
-import GameWorld
-
-
-def BatchUseItem(curPlayer, curRoleItem, tick, useCnt, exData):
-    ##批量使用物品
-    playerID = curPlayer.GetID()
-    #curEff = curRoleItem.GetEffectByIndex(0)
-    addCnt = useCnt #curEff.GetEffectValue(0)
-    if not CrossRealmPlayer.IsCrossServerOpen():
-        PlayerControl.NotifyCode(curPlayer, "CrossMatching18")
-        return
-    if not PlayerCrossRealmPK.IsCrossRealmPKMatchState():
-        GameWorld.DebugLog("跨服匹配未开启,不可进行使用物品增加次数!", playerID)
-        return
-    todayItemAddCount  = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CrossPK_ItemAddCount)
-
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CrossPK_ItemAddCount, todayItemAddCount+addCnt)
-    
-    ItemCommon.DelItem(curPlayer, curRoleItem, useCnt, True, ChConfig.ItemDel_AddFBCnt)
-    PlayerCrossRealmPK.SyncCrossRealmPKPlayerInfo(curPlayer)
-    
-    PlayerControl.NotifyCode(curPlayer, 'CrossMatching25', [useCnt])
-    
-    return True, useCnt
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py
deleted file mode 100644
index ebdf705..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_HPMP.py
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package Item_Add_HPMP
-# @todo: 药剂物品使用
-#
-# @author: panwei
-# @date 2010-04-23
-# @version 2.5
-#
-# @change: "2010-08-09 16:00" panwei 新增多次回复药剂逻辑
-# @change: "2010-08-18 14:25" panwei 持续补红和持续补篮效果分开
-# @change: "2011-02-23 17:30" panwei 删除外层统一流向记录, 单个物品调用统一流向记录
-# @change: "2011-04-13 18:00" Alee 添加宠物多次补给物品
-# @change: "2011-04-18 13:30" Alee 添加系统提示参数
-# @change: "2012-06-18 18:00" jiang 修改ItemCommon.DelItem函数的参数用于Oss事件记录
-# @change: "2012-07-18 17:40" Alee 精简流向输出
-# @change: "2013-07-17 20:10" Alee 修改系统提示
-# @change: "2014-07-03 21:00" hxp 增加血包/蓝包补充量物品
-# @change: "2015-03-23 03:30" ljd 药剂补血增加治疗(增加减少回血效果)效果
-# @change: "2015-05-07 11:00" hxp 修改提示
-# @change: "2015-05-22 20:30" hxp 增加宠物回血血包
-# @change: "2016-11-03 20:30" xdh 死亡不回血
-# @change: "2016-11-16 20:00" hxp 增加禁疗状态下限制
-# @change: "2016-11-24 16:30" hxp 增加不可回血的地图设定
-#---------------------------------------------------------------------
-#"""Version = 2016-11-24 16:30"""
-#---------------------------------------------------------------------
-#导入
-import ChConfig
-import PlayerControl
-import GameWorld
-import ItemCommon
-import Item_Txt_Skill_ByItemList
-import PetControl
-import SkillCommon
-import BuffSkill
-import IPY_GameWorld
-import GameObj
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-## 逻辑实现 //返回值为是否使用成功(外层通知特效)
-#  @param curPlayer 当前玩家
-#  @param curRoleItem 当前主角使用的物品
-#  @param tick 当前时间
-#  @return True or False 返回值为是否使用成功(外层通知特效)
-#  @remarks 函数详细说明.
-def UseItem(curPlayer, curRoleItem, tick):
-    if GameObj.GetHP(curPlayer) <= 0 or curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
-        #死亡不回血
-        return
-    
-    if curPlayer.GetMapID() in ChConfig.CanNotRecoverMapIDList:
-        #GameWorld.DebugLog("该地图无法使用恢复物品!")
-        return
-    
-    if GameObj.GetPyPlayerState(curPlayer, ChConfig.Def_PlayerState_LimitAddHP):
-        # 暂时红蓝都禁掉
-        #GameWorld.DebugLog("当前禁疗状态下,无法使用回血物品!")
-        return
-    
-    useItemEff = curRoleItem.GetEffectByIndex(0)
-    curEffID = useItemEff.GetEffectID()
-    curEffValueA = useItemEff.GetEffectValue(0)
-    curEffValueB = useItemEff.GetEffectValue(1)
-
-    # HP恢复效果变化
-    if curEffID in [ChConfig.Def_Effect_AddHP_Once, ChConfig.Def_Effect_AddHP_More,
-                    ChConfig.Def_Effect_AddHP_Package, ChConfig.Def_Effect_AddPetHP_More]:
-        # 血瓶恢复效果加成
-        curEffValueB += PlayerControl.GetHPCureEnhance(curPlayer)
-
-    #补红(单次)
-    if curEffID == ChConfig.Def_Effect_AddHP_Once:
-        return __DoLogic_AddHP_Once(curPlayer, curRoleItem, curEffValueA, curEffValueB)
-    
-    #补蓝(单次)
-    if curEffID == ChConfig.Def_Effect_AddMP_Once:
-        return __DoLogic_AddMP_Once(curPlayer, curRoleItem, curEffValueA, curEffValueB)
-    
-    #===========================================================================
-    # #补红(多次)
-    # if curEffID == ChConfig.Def_Effect_AddHP_More:
-    #    return __DoLogic_AddHP_More(curPlayer, curRoleItem, curEffValueA)
-    # 
-    # #补蓝(多次)
-    # if curEffID == ChConfig.Def_Effect_AddMP_More:
-    #    return __DoLogic_AddMP_More(curPlayer, curRoleItem, curEffValueA)
-    #===========================================================================
-    
-    #持续回复血或蓝
-    if curEffID in [ChConfig.Def_Effect_AddHP_Last, ChConfig.Def_Effect_AddMP_Last]:
-        #调用物品触发技能
-        return Item_Txt_Skill_ByItemList.UseItem(curPlayer, curRoleItem, tick)
-    
-    #血包或蓝包容量
-    if curEffID in [ChConfig.Def_Effect_AddHP_Package, ChConfig.Def_Effect_AddMP_Package, 
-                    ChConfig.Def_Effect_AddPetHP_Package]:
-        return __DoLogic_AddHPMP_Package(curPlayer, curRoleItem, curEffValueA, tick)
-    
-    if curEffID == ChConfig.Def_Effect_AddPetHP_More:
-        return __DoLogic_AddPetHP_More(curPlayer, curRoleItem, curEffValueA)
-    
-    #使用失败
-    GameWorld.ErrLog('Item_Add_HPMP effID = %s NoFind'%(curEffID))
-    return False
-
-#===============================================================================
-#---单次回复逻辑--- 回复效果 = 玩家当前生命(魔法) + 玩家最大生命(魔法)上限 * 效果A值 + 效果B值
-#===============================================================================
-#---------------------------------------------------------------------
-##一次性回血物品逻辑处理
-# @param curPlayer 玩家实例
-# @param curItem 物品实例
-# @param effValueA 效果A值
-# @param effValueB 效果B值
-# @return 布尔值
-# @remarks 一次性回血物品逻辑处理
-def __DoLogic_AddHP_Once(curPlayer, curItem, effValueA, effValueB):
-    curValue = GameObj.GetHP(curPlayer)
-    curMaxValue = GameObj.GetMaxHP(curPlayer)
-    setFunc = "SetHP"
-    sysMsgStr = 'GeRen_chenxin_21675'
-    
-    return __Add_HPorMP_Once(curPlayer, curItem, curValue, curMaxValue, setFunc, effValueA, effValueB, sysMsgStr)
-#---------------------------------------------------------------------
-##一次性回蓝物品逻辑处理
-# @param curPlayer 玩家实例
-# @param curItem 物品实例
-# @param effValueA 效果A值
-# @param effValueB 效果B值
-# @return 布尔值
-# @remarks 一次性回蓝物品逻辑处理
-def __DoLogic_AddMP_Once(curPlayer, curItem, effValueA, effValueB):
-    curValue = curPlayer.GetMP()
-    curMaxValue = curPlayer.GetMaxMP()
-    setFunc = curPlayer.SetMP
-    sysMsgStr = 'GeRen_chenxin_295695'
-    
-    return __Add_HPorMP_Once(curPlayer, curItem, curValue, curMaxValue, setFunc, effValueA, effValueB, sysMsgStr)
-#---------------------------------------------------------------------
-##单次回复逻辑处理
-# @param curPlayer 玩家实例
-# @param curItem 物品实例
-# @param curValue 当前值
-# @param curMaxValue 当前最大值
-# @param setFunc 调用设置函数
-# @param addPer 百分比加成
-# @param addValue 固定值
-# @param sysMsgStr 系统提示消息字符串
-# @return 布尔值
-# @remarks 单次补HP或者补MP
-def __Add_HPorMP_Once(curPlayer, curItem, curValue, curMaxValue, setFunc, addPer, addValue, sysMsgStr):
-    if curValue == curMaxValue:
-        PlayerControl.NotifyCode(curPlayer, sysMsgStr)
-        return False
-    
-    #回复效果 = 玩家当前生命(魔法) + 玩家最大生命(魔法)上限 * 效果A值 + 效果B值
-    addTotalValue = int(curMaxValue * addPer / ChConfig.Def_MaxRateValue + addValue)
-    #回复数值
-    if setFunc == "SetHP":
-        GameObj.SetHP(curPlayer, min(curMaxValue, curValue + addTotalValue))
-    else:
-        setFunc(min(curMaxValue, curValue + addTotalValue))
-    #扣除物品
-    ItemCommon.DelItem(curPlayer, curItem, 1, True)
-    return True
-
-#===============================================================================
-#--多次回复逻辑--- 回复效果 = 玩家当前生命(魔法) + 效果A值
-#===============================================================================
-#---------------------------------------------------------------------
-##多次回血物品逻辑处理
-# @param curPlayer 玩家实例
-# @param curItem 物品实例
-# @param effValueA 效果A值
-# @return 布尔值
-# @remarks 多次回血物品逻辑处理
-def __DoLogic_AddHP_More(curPlayer, curItem, effValueA):
-    curValue = GameObj.GetHP(curPlayer)
-    curMaxValue = GameObj.GetMaxHP(curPlayer)
-    setFunc = curPlayer.SetHP
-    sysMsgStr = 'GeRen_chenxin_21675'
-    
-    return __Add_HPorMP_More(curPlayer, curItem, curValue, curMaxValue, setFunc, effValueA, sysMsgStr)
-#---------------------------------------------------------------------
-##多次回蓝物品逻辑处理
-# @param curPlayer 玩家实例
-# @param curItem 物品实例
-# @param effValueA 效果A值
-# @return 布尔值
-# @remarks 多次回蓝物品逻辑处理
-def __DoLogic_AddMP_More(curPlayer, curItem, effValueA):
-    curValue = curPlayer.GetMP()
-    curMaxValue = curPlayer.GetMaxMP()
-    setFunc = curPlayer.SetMP
-    sysMsgStr = 'GeRen_chenxin_295695'
-    
-    return __Add_HPorMP_More(curPlayer, curItem, curValue, curMaxValue, setFunc, effValueA, sysMsgStr)
-#---------------------------------------------------------------------
-##多次恢复逻辑处理
-# @param curPlayer 玩家实例
-# @param curItem 物品实例
-# @param curValue 当前值
-# @param curMaxValue 当前最大值
-# @param setFunc 设置函数
-# @param addValue 添加值
-# @param sysMsgStr 系统提示消息字符串
-# @return 布尔值
-# @remarks 多次补HP或者补MP
-def __Add_HPorMP_More(curPlayer, curItem, curValue, curMaxValue, setFunc, addValue, sysMsgStr):
-    #===========================================================================
-    # #已经满值
-    # if curValue == curMaxValue:
-    #    PlayerControl.NotifyCode(curPlayer, sysMsgStr)
-    #    return False
-    # 
-    # curItemDurg = curItem.GetCurDurg()
-    # 
-    # #回复效果 = 玩家当前生命(魔法) + 效果A值 (最后一次不一定足够)
-    # setFunc(min(curMaxValue, curValue + min(addValue, curItemDurg)))
-    # 
-    # #---物品耐久减少---
-    # if curItemDurg > addValue:
-    #    curItem.SetCurDurg(curItemDurg - addValue)
-    # else:
-    #    ItemCommon.DelItem(curPlayer, curItem, 1, True)
-    #===========================================================================
-        
-    return True
-
-
-##宠物多次回血物品逻辑处理
-# @param curPlayer 玩家实例
-# @param curRoleItem 物品实例
-# @param curEffValueA 效果A值
-# @return 布尔值
-def __DoLogic_AddPetHP_More(curPlayer, curRoleItem, curEffValueA):
-#===============================================================================
-#    fightPetObj = curPlayer.GetPetMgr().GetFightPet()  # 出战的宠物对象
-#    
-#    if fightPetObj == None:
-#        PlayerControl.NotifyCode(curPlayer, "Pet_liubo_381601", [curRoleItem.GetItemTypeID()])
-#        return False
-#    
-#    curValue = GameObj.GetHP(fightPetObj)
-#    curMaxValue = GameObj.GetMaxHP(fightPetObj)
-#    #已经满值
-#    if curValue == curMaxValue:
-#        PlayerControl.NotifyCode(curPlayer, "Pet_liubo_493922")
-#        return False
-#    
-#    curItemDurg = curRoleItem.GetCurDurg()
-# 
-#    #回复效果 = 当前生命 + 效果A值(最后一次不一定够)
-#    PetControl.AddPetHP(fightPetObj, min(curEffValueA, curItemDurg))
-#    
-#    #---物品耐久减少---
-#    if curItemDurg > curEffValueA:
-#        curRoleItem.SetCurDurg(curItemDurg - curEffValueA)
-#    else:
-#        ItemCommon.DelItem(curPlayer, curRoleItem, 1, True)
-#        
-#===============================================================================
-    return True
-
-
-##血包/蓝包补充包
-# @param curPlayer 玩家实例
-# @param curRoleItem 物品实例
-# @param curEffValueA 效果A值
-# @return 布尔值
-def __DoLogic_AddHPMP_Package(curPlayer, curRoleItem, curEffValueA, tick):
-    # 使用等级
-    if curPlayer.GetLV() < curRoleItem.GetUseLV():
-        return False
-    
-    if curRoleItem.GetAddSkillCount() <= 0:
-        return False
-    
-    addSkillID = curRoleItem.GetAddSkill(0)
-    
-    if not addSkillID:
-        return False
-    
-    addSkill = GameWorld.GetGameData().GetSkillBySkillID(addSkillID)
-
-    buffType = SkillCommon.GetBuffType(addSkill)
-    BuffSkill.AddBuffNoRefreshState(curPlayer, buffType, addSkill, tick, [curEffValueA], curPlayer)
-    # 激活玩家(保证持续性Buff处理间隔)
-    PlayerControl.SetIsNeedProcess(curPlayer, True)
-    # 扣除物品
-    ItemCommon.DelItem(curPlayer, curRoleItem, 1, True)
-    return True
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_LimitingBuff.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_LimitingBuff.py
deleted file mode 100644
index 084fd2d..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_LimitingBuff.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package Item_Add_LimitingBuff
-# @todo: 添加有最大时间上限Buff物品
-#
-# @author: zhangd
-# @date 2011-03-16
-# @version 1.3
-#
-# @change: "2011-04-02 16:30" zhangd 修改添加buff时刷新属性
-# @change: "2012-06-18 18:00" jiang 修改ItemCommon.DelItem函数的参数用于Oss事件记录
-# @change: "2015-01-29 19:40" ljd 修改物品使用上限系统提示参数
-#---------------------------------------------------------------------
-#"""Version = 2015-01-29 19:40"""
-#---------------------------------------------------------------------
-import GameWorld
-import PlayerControl
-import ItemCommon
-import SkillCommon
-import IpyGameDataPY
-import ChConfig
-#---------------------------------------------------------------------
-#最大使用时间
-Def_MaxUseTime = 576 * 60 * 60 * 1000                             
-#---------------------------------------------------------------------
-
-
-def BatchUseItem(curPlayer, curRoleItem, tick, useCnt, exData):
-    curRoleItemID = curRoleItem.GetItemTypeID()
-    
-    if curRoleItem.GetAddSkillCount() <= 0:
-        return False
-    
-    curSkillID = curRoleItem.GetAddSkill(0)
-    
-    if not curSkillID:
-        return False
-    
-    curSkill = GameWorld.GetGameData().GetSkillBySkillID(curSkillID)
-    
-    if not curSkill:
-        GameWorld.ErrLog('添加有最大时间上限Buff物品 = %s 使用异常, 无法获取附加技能 = %s'%(curRoleItemID, curSkillID))
-        return False
-    
-    #--获取是否已经添加过该Buff--
-    buffType = SkillCommon.GetBuffType(curSkill)
-    buffTuple = SkillCommon.GetBuffManagerByBuffType(curPlayer, buffType)
-    #通过类型获取目标的buff管理器为空,则跳出
-    if buffTuple == ():
-        return
-    
-    buffState = buffTuple[0]
-    #可添加的持续时间
-    curSkillLastTime = curSkill.GetLastTime()*useCnt
-    #获取buff
-    curBuff = buffState.FindBuff(curSkillID)
-    if curBuff:   
-        #当前buff剩余时间
-        curBuffRemainTime = curBuff.GetRemainTime()
-        
-        #累加数据
-        sumTime = curSkillLastTime + curBuffRemainTime
-        #检查累加时间是否超过上限
-        if sumTime > Def_MaxUseTime:
-            #物品使用上限24天,超过无法使用
-            PlayerControl.NotifyCode(curPlayer, 'Item_Effect_Max', [curRoleItemID, Def_MaxUseTime / (60 * 60 * 1000)])
-            return False        
-
-    if not ItemCommon.ItemUseSkillAddBuff(curPlayer, curRoleItem, tick, True, useCnt):
-        return False
-    if curRoleItemID not in IpyGameDataPY.GetFuncEvalCfg('UnShowMsgBuffItemID', 1):
-        if curSkillLastTime:
-            PlayerControl.NotifyCode(curPlayer, 'UseItem1', [curRoleItemID, curSkillID, curSkillLastTime])
-        else:
-            PlayerControl.NotifyCode(curPlayer, 'UseItem3', [curRoleItemID, curSkillID])
-    #调用通用接口删除道具
-    ItemCommon.DelItem(curPlayer, curRoleItem, useCnt, True, ChConfig.ItemDel_Add_LimitingBuff)
-    return True, useCnt
-
-
-## 逻辑实现 //返回值为是否使用成功(外层通知特效)
-#  @param curPlayer 当前玩家
-#  @param curRoleItem 当前主角使用的物品
-#  @param tick 当前时间
-#  @return True or False 返回值为是否使用成功(外层通知特效)
-#  @remarks 函数详细说明.
-def UseItem(curPlayer, curRoleItem, tick):
-    BatchUseItem(curPlayer, curRoleItem, tick, 1, 0)
-    return True
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_PetHP.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_PetHP.py
deleted file mode 100644
index d7a2ff6..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Add_PetHP.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package Item_Add_PetHP
-# @todo: 宠物药剂, 补红
-#
-# @author: panwei
-# @date 2010-07-02
-# @version 1.4
-#
-# @change: "2011-02-23 17:30" panwei 删除外层统一流向记录, 单个物品调用统一流向记录
-# @change: "2012-06-18 18:00" jiang 修改ItemCommon.DelItem函数的参数用于Oss事件记录
-# @change: "2012-07-18 17:40" Alee 精简流向输出
-# @change: "2015-05-07 11:00" hxp 修改提示
-#------------------------------------------------------------------------------ 
-"""Version = 2015-05-07 11:00"""
-#---------------------------------------------------------------------
-import PlayerControl
-import PetControl
-import ChConfig
-import ItemCommon
-import GameObj
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-## 逻辑实现 //返回值为是否使用成功(外层通知特效)
-#  @param curPlayer 当前玩家
-#  @param curRoleItem 当前主角使用的物品
-#  @param tick 当前时间
-#  @return True or False 返回值为是否使用成功(外层通知特效)
-#  @remarks 函数详细说明.
-def UseItem(curPlayer, curRoleItem, tick):
-    useItemID = curRoleItem.GetItemTypeID()
-    #---获得出战的宠物---
-    rolePetMgr = curPlayer.GetPetMgr()
-    fightPet = rolePetMgr.GetFightPet()
-    
-    if fightPet == None:
-        PlayerControl.NotifyCode(curPlayer, "Pet_liubo_381601", [useItemID])
-        return False
-    
-    fightPetHP = GameObj.GetHP(fightPet)
-    fightPetMaxHP = GameObj.GetMaxHP(fightPet)
-    
-    if fightPetHP == fightPetMaxHP:
-        PlayerControl.NotifyCode(curPlayer, "Pet_liubo_493922")
-        return False
-    
-    #---获得表中的累加值a值为f% b值为固定值
-    curEff = curRoleItem.GetEffectByIndex(0)
-    addValue = curEff.GetEffectValue(0) / float(ChConfig.Def_MaxRateValue) + curEff.GetEffectValue(1)
-    
-    PetControl.AddPetHP(fightPet, int(addValue))
-    
-    #扣物品
-    ItemCommon.DelItem(curPlayer, curRoleItem, 1, True)
-    
-    #//返回值转CD
-    return True
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_CleanGuilt.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_CleanGuilt.py
deleted file mode 100644
index 4c61851..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_CleanGuilt.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#------------------------------------------------------------------------------ 
-##@package Item_CleanGuilt
-# @todo: 洗红名
-#
-# @author: Alee
-# @date 2014-01-06 19:20
-# @version 1.0
-#
-# 详细描述
-#---------------------------------------------------------------------
-#"""Version = 2014-01-06 19:20"""
-#---------------------------------------------------------------------
-#导入
-import BuffSkill
-import ItemCommon
-import PlayerControl
-import ShareDefine
-import ChConfig
-
-#------------------------------------------------------------------------------ 
-
-
-#------------------------------------------------------------------------------ 
-##使用物品,触发物品附加效果 给人物金钱
-# @param curPlayer: 玩家实例
-# @param curRoleItem: 物品实例
-# @param tick: 时间戳
-# @return: 是否使用物品成功
-# @remarks: giveMoney = reMoney * curEff.GetEffectValue(1) + curEff.GetEffectValue(2)
-# A值为金钱公式里的数量(乘法因子) B值为金钱公式里额外固定数量(加法因子) 
-def UseItem(curPlayer, curRoleItem, tick):
-    curPKValue = curPlayer.GetPKValue()
-    if curPKValue == 0:
-        #GeRen_chenxin_774045
-        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_774045")
-        return False
-    curEff = curRoleItem.GetEffectByIndex(0)
-    clearPoint = int(curEff.GetEffectValue(0))  # 减少固定值
-    
-    #BuffSkill.DelBuffBySkillID(curPlayer, ChConfig.Def_SkillID_Red, tick, False)
-    #PlayerControl.ClearPKValue(curPlayer)
-    PlayerControl.ChangePKValue(curPlayer, -clearPoint, tick)
-    ItemCommon.DelItem(curPlayer, curRoleItem, 1, False, ChConfig.ItemDel_CleanGuilt)
-    #GeRen_liubo_827276
-    PlayerControl.NotifyCode(curPlayer, "GeRen_liubo_827276", [min(clearPoint, curPKValue)])
-    return True
-
-
-    
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_FamilyImpeach.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_FamilyImpeach.py
deleted file mode 100644
index 79437d7..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_FamilyImpeach.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package Item_FamilyImpeach.py
-# @todo: 帮主弹劾符
-#
-# @author: wdb
-# @date 2012-08-07
-# @version 1.0
-#
-# @note
-#---------------------------------------------------------------------
-"""Version = 2012-08-07 14:00"""
-#---------------------------------------------------------------------
-import ChConfig
-import GameWorld
-import ShareDefine
-import PlayerControl
-#---------------------------------------------------------------------
-
-## 帮主弹劾符
-#  @param curPlayer 当前玩家
-#  @param curRoleItem 当前主角使用的物品
-#  @param tick 当前时间
-#  @return None
-def UseItem(curPlayer, curRoleItem, tick):
-    
-    # 客服使用帮主弹劾符
-    if not CanUseFamilyImpeach(curPlayer):
-       
-        PlayerControl.NotifyCode(curPlayer, "jiazu_xyj_161795")
-        return
-    
-    # 使用间隔,防止帮主在线,玩家一直使用
-    if tick - curPlayer.GetTickByType(ChConfig.TYPE_Player_Tick_FamilyImpeach) \
-            <= ChConfig.TYPE_Player_Tick_Time[ChConfig.TYPE_Player_Tick_FamilyImpeach]:
-        return
-    
-    curPlayer.SetTickByType(ChConfig.TYPE_Player_Tick_FamilyImpeach, tick)
-    
-    #通知GameServer使用弹劾符
-    curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_FamilyImpeach, 0, '', '', 0)
-    return
-        
-        
-
-## 客服使用帮主弹劾符
-#  @param curPlayer 当前玩家
-#  @return None 
-def CanUseFamilyImpeach(curPlayer):
-    
-    familyId = curPlayer.GetFamilyID()  #家族Id
-    if not familyId:
-        return False
-    
-#    # 等级不够    
-#    if curPlayer.GetLV() < ShareDefine.Def_CreateFamily_MinLV:
-#        return False
-
-    return True
-        
-        
-        
-        
-        
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetAttrPoint.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetAttrPoint.py
deleted file mode 100644
index 301b850..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetAttrPoint.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package Item_ResetAttrPoint
-# @todo: 洗点卷轴
-#
-# @author: xdh
-# @date 2017-12-15
-# @version 1.0
-#
-#---------------------------------------------------------------------
-#"""Version = 2017-12-15 17:40"""
-#---------------------------------------------------------------------
-
-import ChPlayer
-import PlayerControl
-import DataRecordPack
-import IpyGameDataPY
-import ItemCommon
-import ChConfig
-import SkillShell
-
-##批量使用物品
-# @param curPlayer: 玩家实例
-# @param curRoleItem: 物品实例
-# @param tick: 时间戳
-# @param useCnt: 使用个数
-# @return: 
-def BatchUseItem(curPlayer, curRoleItem, tick, useCnt, exData):
-    curEff = curRoleItem.GetEffectByIndex(0)
-    effectID = curEff.GetEffectID()
-    if effectID != ChConfig.Def_Effect_ResetAttrPoint:
-        return
-    resetID = curEff.GetEffectValue(0)
-    if not resetID and exData:
-        resetID = exData
-    resetPoint = curEff.GetEffectValue(1) * useCnt
-    if not DoResetAttrPoint(curPlayer, resetID, resetPoint, curRoleItem.GetItemTypeID()):
-        return
-    
-    #扣除物品
-    ItemCommon.DelItem(curPlayer, curRoleItem, useCnt, True, ChConfig.ItemDel_ResetAttrPoint)
-    return True, useCnt
-
-def DoResetAttrPoint(curPlayer, resetID, resetPoint, useItemID=0):
-    '''重置灵根属性点
-    @param resetID: 重置属性ID,0为重置全部
-    @param resetPoint: 重置点数,0为重置全部
-    '''
-    
-    ipyDataMgr = IpyGameDataPY.IPY_Data()
-    canResetIDList = [ipyDataMgr.GetRolePointByIndex(index).GetAttrID() for index in xrange(ipyDataMgr.GetRolePointCount())]
-    if resetID == 0:
-        resetIDList = canResetIDList
-        resetValueList = [resetPoint for _ in xrange(len(canResetIDList))]
-    elif resetID in canResetIDList:
-        resetIDList = [resetID]
-        resetValueList = [resetPoint]
-    else:
-        return
-    
-    resetPointTotal = 0
-    for i, resetID in enumerate(resetIDList):
-        resetPoint = resetValueList[i]
-        curPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_AddPointValue % resetID)
-        if not resetPoint:
-            realResetPoint = curPoint
-        else:
-            realResetPoint = min(resetPoint, curPoint)
-        if not realResetPoint:
-            continue
-        resetPointTotal += realResetPoint
-        updPoint = max(curPoint - realResetPoint, 0)
-        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_AddPointValue % resetID, updPoint)
-        if useItemID:
-            PlayerControl.NotifyCode(curPlayer, 'WashPoint2', [useItemID, resetID, realResetPoint, updPoint])
-            
-    freePoint = curPlayer.GetFreePoint()
-    curPlayer.SetFreePoint(freePoint + resetPointTotal)
-    ChPlayer.NotifyPlayerBasePoint(curPlayer, resetIDList)
-    DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_ResetPoint, {'resetIDList':resetIDList, 'resetPointTotal':resetPointTotal})
-    
-    #刷新人物所有状态
-    playerControl = PlayerControl.PlayerControl(curPlayer)
-    playerControl.RefreshPlayerAttrState()
-    return True
-
-## 逻辑实现 //返回值为是否使用成功(外层通知特效)
-#  @param curPlayer 当前玩家
-#  @param curRoleItem 当前主角使用的物品
-#  @param tick 当前时间
-#  @return True or False 返回值为是否使用成功(外层通知特效)
-#  @remarks 函数详细说明.
-def UseItem(curPlayer, curRoleItem, tick):
-    return BatchUseItem(curPlayer, curRoleItem, tick, 1, 0)
-   
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_RuneExp.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_RuneExp.py
deleted file mode 100644
index 6302301..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_RuneExp.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package UseItem.Item_RuneExp
-#
-# @todo:给符印精华
-# @author hxp
-# @date 2020-12-04
-# @version 1.0
-#
-# 详细描述: 给符印精华
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2020-12-04 16:30"""
-#-------------------------------------------------------------------------------
-
-import ChConfig
-import PlayerControl
-import ShareDefine
-import ItemCommon
-
-def BatchUseItem(curPlayer, curRoleItem, tick, useCnt, exData):
-    ##批量使用物品
-    curEff = curRoleItem.GetEffectByIndex(0)
-    totalRuneExp = curEff.GetEffectValue(0) * useCnt
-    if not totalRuneExp:
-        return
-    
-    ItemCommon.DelItem(curPlayer, curRoleItem, useCnt, True, ChConfig.ItemDel_Rune)
-    
-    addDataDict = {"totalRuneExp":totalRuneExp, "useCnt":useCnt}
-    PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Rune, totalRuneExp, 
-                            ChConfig.Def_GiveMoney_UseItem, addDataDict)
-    
-    return True, useCnt
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_SkillBook.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_SkillBook.py
deleted file mode 100644
index 5ee22c1..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_SkillBook.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-# ----------------------------------------------------------------------------------------------------
-#
-# ----------------------------------------------------------------------------------------------------
-##@package Item_SkillBook
-# @todo: 使用技能书学习技能
-#
-# @author zb
-# @date 2010-05-26
-# @version 1.4
-#
-# 修改时间 修改人 修改内容
-# @change: "2013-03-26 15:00" wdb 学习技能修改
-# @change: "2013-04-17 20:35" Alee 被动技能直接添加BUFF
-# @change: "2013-10-14 13:30" hxp 修改使用技能书mark
-# @change: "2016-03-24 17:00" hxp 技能算战斗力
-#------------------------------------------------------------------------------ 
-"""Version = 2016-03-24 17:00"""
-#---------------------------------------------------------------------
-import PlayerControl
-import GameWorld
-import SkillShell
-import ItemCommon
-import DataRecordPack
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-## 使用技能书
-#  @param curPlayer 当前玩家
-#  @param curRoleItem 当前主角使用的物品
-#  @param tick 当前时间
-#  @return True or None 返回值为是否使用成功(外层通知特效)
-#  @remarks 技能书效果1的A值为技能typeID,效果2的A值为货币类型,B值为货币数量
-def UseItem(curPlayer, curRoleItem, tick):
-    return PlayerUseSkillBook(curPlayer, curRoleItem, tick)
-
-#---------------------------------------------------------------------
-## 玩家使用技能书 
-#  @param curPlayer 当前玩家
-#  @param curItem 当前物品
-#  @param tick 当前时间
-#  @return None or True
-#  @remarks 
-def PlayerUseSkillBook( curPlayer, curItem, tick ):
-    
-    skillManager = curPlayer.GetSkillManager()
-    #效果1的A值为技能typeID
-    curEffect = curItem.GetEffectByIndex(0)
-    skillTypeID = curEffect.GetEffectValue(0)
-
-    #学习的技能
-    bookSkill = GameWorld.GetGameData().FindSkillByType(skillTypeID,1)
-    if bookSkill == None:
-        GameWorld.Log("学习技能书失败,无此技能 = %s"%(skillTypeID) , curPlayer.GetPlayerID())
-        return
-    
-    #技能书检查
-    if not __CheckSkillBook(curPlayer, curItem , bookSkill, skillTypeID):
-        return
-    GameWorld.DebugLog("技能书学习技能: skillTypeID=%s,name=%s" % (skillTypeID, bookSkill.GetSkillName()))
-    #学习新技能 
-    skillManager.LVUpSkillBySkillTypeID(skillTypeID)
-    PlayerControl.NotifyCode(curPlayer, "Skill_andyshao_31379", [skillTypeID])    
-    
-    DataRecordPack.DR_LearnORUPSkill(curPlayer, skillTypeID, 0)    
-    ItemCommon.DelItem(curPlayer, curItem, 1, True, "SkillBook", {"SkillID":skillTypeID})
-    PlayerControl.PlayerControl(curPlayer).RefreshSkillFightPowerEx(skillTypeID, 0)
-    return True
-
-#---------------------------------------------------------------------
-## 检查使用技能书条件(参数 -> 当前玩家,当前物品,技能书技能)
-#  @param curPlayer 当前玩家
-#  @param curItem 当前物品
-#  @param skill 技能书技能
-#  @param skillTypeID 技能ID
-#  @return False or True
-#  @remarks 
-def __CheckSkillBook(curPlayer, curItem, skillData, skillTypeID):
-
-    #已经激活了的技能无法再次使用技能书
-    if curPlayer.GetSkillManager().FindSkillBySkillTypeID(skillTypeID):
-        #Skill_andyshao_0替换为GeRen_chenxin_739689
-        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_739689")
-        return False
-    
-    #学习条件检查
-    if not SkillShell.CheckLearnSkillCondition(curPlayer, skillData):
-        return False
-    
-    #学习技能所需货币类型、货币数量
-    curEffect = curItem.GetEffectByIndex(1)
-    skillLVNeedMoneyType = curEffect.GetEffectValue(0)
-    skillLVNeedMoneyCount = curEffect.GetEffectValue(1)
-    
-    if skillLVNeedMoneyCount > 0:
-        #付钱
-        if not PlayerControl.PayMoney(curPlayer, skillLVNeedMoneyType, skillLVNeedMoneyCount):
-            return False
-        
-    return True
-
-#---------------------------------------------------------------------
-## 给予客户端DEBUG提示
-#  @param curPlayer 当前玩家
-#  @param curItem 当前物品
-#  @param skill 技能书技能
-#  @return False or True
-#  @remarks 提示在客户端的debug频道上显示
-def Log( curPlayer, msg ):
-    GameWorld.DebugAnswer(curPlayer,  msg )
-    return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Txt_Skill_ByItemList.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Txt_Skill_ByItemList.py
deleted file mode 100644
index 87530e9..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Txt_Skill_ByItemList.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package Item_Txt_Skill_ByItemList
-# @todo: 物品触发技能
-#
-# @author: panwei
-# @date 2010-06-09
-# @version 1.8
-#
-# @change: 2010-07-07 18:00 panwei 新增特殊物品系统提示
-# @change: 2010-07-19 17:15 panwei 调用接口修改
-# @change: 2010-07-29 17:00 panwei 物品触发技能后, 激活玩家(保证持续性Buff处理间隔)
-# @change: "2011-02-23 17:30" panwei 删除外层统一流向记录, 单个物品调用统一流向记录
-# @change: "2011-02-25 14:10" Alee 删除多余提示
-# @change: "2012-06-18 18:00" jiang 修改ItemCommon.DelItem函数的参数用于Oss事件记录
-# @change: "2012-07-18 17:40" Alee 精简流向输出
-# @change: "2015-05-07 11:00" hxp 修改提示
-#------------------------------------------------------------------------------ 
-"""Version = 2015-05-07 11:00"""
-#---------------------------------------------------------------------
-import ItemCommon
-import PlayerControl
-import ChConfig
-#---------------------------------------------------------------------
-#全局变量
-#---------------------------------------------------------------------
-
-#---------------------------------------------------------------------
-##使用物品,触发物品附加技能
-# @param curPlayer 玩家实例
-# @param curRoleItem 物品实例
-# @param tick 时间戳
-# @return 是否使用物品成功
-# @remarks 触发物品表中AddSkill1,AddSkill2,AddSkill3,AddSkill4,AddSkill5字段
-def UseItem(curPlayer, curRoleItem, tick):
-    itemID = curRoleItem.GetItemTypeID()
-    
-    if ItemCommon.ItemUseSkillAddBuff(curPlayer, curRoleItem, tick):
-        #特殊物品给特殊提示
-        __NotifyItemAddSkill(curPlayer, itemID)
-        #激活玩家(保证持续性Buff处理间隔)
-        PlayerControl.SetIsNeedProcess(curPlayer, True)
-        #扣除物品
-        ItemCommon.DelItem(curPlayer, curRoleItem, 1, True)
-        return True
-
-    return False
-
-#---------------------------------------------------------------------
-##特殊物品特殊广播
-# @param curPlayer 玩家实例
-# @param itemID 物品ID
-# @return 返回值无意义
-# @remarks 特殊物品特殊广播
-def __NotifyItemAddSkill(curPlayer, itemID):
-    #@warning: 特殊物品提示暂时就一个, 以后如果新增, 需开表
-    if itemID == ChConfig.Def_ItemID_PetDoubleExp:
-        PlayerControl.NotifyCode(curPlayer, "Pet_hgg_347179", [itemID])
-        
-    return 
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_UseItemGiveZhenQi.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_UseItemGiveZhenQi.py
deleted file mode 100644
index fd83d85..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_UseItemGiveZhenQi.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package Item_UseItemGiveZhenQi
-#
-# @todo: 使用物品给予真气
-# @author jiang
-# @date 2011-11-14 17:30
-# @version 1.5
-#
-# @change: "2011-12-02 17:00" jiang 增加真气提示改到PlayerAddZhenQi()提示
-# @change: "2011-12-28 16:30" jiang  修改Bug #19208, 增加真气改成可以溢出
-# @change: "2012-03-26 15:00" jiang  去除满真气不能使用的限制
-# @change: "2012-06-18 18:00" jiang 修改ItemCommon.DelItem函数的参数用于Oss事件记录
-# @change: "2015-05-20 16:00" hxp 增加批量使用逻辑
-#
-#------------------------------------------------------------------------------ 
-"""Version = 2015-05-20 16:00"""
-#------------------------------------------------------------------------------ 
-import IPY_GameWorld
-import ItemCommon
-import ChConfig
-import PlayerControl
-import GameWorld
-#------------------------------------------------------------------------------ 
-
-##批量使用物品
-# @param curPlayer: 玩家实例
-# @param curRoleItem: 物品实例
-# @param tick: 时间戳
-# @param useCnt: 使用个数
-# @return: 
-def BatchUseItem(curPlayer, curRoleItem, tick, useCnt, exData):
-    itemID = curRoleItem.GetItemTypeID()
-    curEff = curRoleItem.GetEffectByIndex(0)
-    itemZhenQiRivet = curEff.GetEffectValue(0)  # 给予固定值
-    
-    addZhenQi = itemZhenQiRivet
-    if addZhenQi <= 0:
-        return
-    
-    curZhenQi = PlayerControl.GetZhenQi(curPlayer) # 当前真气
-    #真气支持超过20亿,暂不做上限控制
-    #canAddZhenQi = max(0, ChConfig.Def_UpperLimit_DWord - curZhenQi)
-    #canUseCnt = canAddZhenQi / addZhenQi
-    #useCnt = min(useCnt, canUseCnt)
-    
-    if useCnt <= 0:
-        return
-    
-    #扣除物品
-    ItemCommon.DelItem(curPlayer, curRoleItem, useCnt, True, ChConfig.ItemDel_GiveZhenQi)
-    totalAddZhenQi = addZhenQi * useCnt
-    PlayerControl.PlayerAddZhenQi(curPlayer, totalAddZhenQi, True, True, "UseItem", {"ItemID":itemID, "UseCnt":useCnt})
-    afterZhenQi = PlayerControl.GetZhenQi(curPlayer) # 当前真气
-    GameWorld.DebugLog("Item_UseItemGiveZhenQi.BatchUseItem addZhenQi=%s(%s*%s), %s to %s" 
-                       % (totalAddZhenQi, addZhenQi, useCnt, curZhenQi, afterZhenQi))
-    return True, useCnt
-
-##使用物品,给予真气
-# @param curPlayer 玩家实例
-# @param curRoleItem 物品实例
-# @param tick 时间戳
-# @return 使用是否成功
-def UseItem(curPlayer, curRoleItem, tick):
-    return BatchUseItem(curPlayer, curRoleItem, tick, 1, 0)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
index 0e8f249..c297ea6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -125,7 +125,8 @@
     updState = taskState|pow(2, taskID)
     GameWorld.DebugLog("每日任务领奖! taskID=%s,updState=%s" % (taskID, updState), playerID)
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_DailyTaskState, updState)
-    DoAddActivity(curPlayer, ipyData.GetAwardLiveness())
+    awardItemList = ipyData.GetAwardItemList()
+    ItemControler.GivePlayerItemOrMail(curPlayer, awardItemList, event=["DailyTaskAward", False, {}])
     return
 
 def DoAddActivity(curPlayer, addValue):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 3636caf..010aabd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -757,36 +757,36 @@
 
 # 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
 TYPE_Price_CurrencyDict = {
-                           TYPE_Price_Rune:CDBPlayerRefresh_Rune,
-                           TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
-                           TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
-                           TYPE_Price_BourseMoney:None,
-                           TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
-                           TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
                            TYPE_Price_FamilyCoin:CDBPlayerRefresh_FamilyCoin,
-                           TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
-                           TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
-                           TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
-                           TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
-                           TYPE_Price_Honor:CDBPlayerRefresh_Honor,
-                           TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
-                           TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
-                           TYPE_Price_Environment:CDBPlayerRefresh_Environment,
-                           TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
-                           TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
-                           TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
                            TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
                            TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
                            TYPE_Price_HeroSoul:CDBPlayerRefresh_HeroSoul,
-                           TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
-                           TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
-                           TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
-                           TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
-                           TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
                            TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,
                            TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,
                            TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
                            TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
+                           #TYPE_Price_Rune:CDBPlayerRefresh_Rune,
+                           #TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
+                           #TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
+                           #TYPE_Price_BourseMoney:None,
+                           #TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
+                           #TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
+                           #TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
+                           #TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
+                           #TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
+                           #TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
+                           #TYPE_Price_Honor:CDBPlayerRefresh_Honor,
+                           #TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
+                           #TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
+                           #TYPE_Price_Environment:CDBPlayerRefresh_Environment,
+                           #TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
+                           #TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
+                           #TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
+                           #TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
+                           #TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
+                           #TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
+                           #TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
+                           #TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
                            }
 
 # 支持负值的货币及对应0418刷新类型

--
Gitblit v1.8.0