From f6b1972e51bb85ede4dcf4fbc3daf9f660c67cf4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 30 一月 2019 15:40:47 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动(广播红包雨;新增红包GM命令 SetRedPacket)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   83 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index ab6f754..6680a4f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -225,20 +225,30 @@
 OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
+OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
 OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
 OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
 OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
 OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
 OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
+OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
+OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
+OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
+#节日活动类型列表 - 该类型无视开服天,日期到了就开启
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
+#所有的运营活动列表,含节日活动
 OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 
                            OperationActionName_BossReborn,OperationActionName_SpringSale, 
                            OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
                            OperationActionName_RealmPoint, OperationActionName_FlashSale,
                            OperationActionName_WishingWell, OperationActionName_TotalRecharge, 
-                           OperationActionName_WeekParty, OperationActionName_LoginAward, ]
+                           OperationActionName_WeekParty, OperationActionName_LoginAward, 
+                           OperationActionName_NewFairyCeremony, ] \
+                           + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
+                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
@@ -478,6 +488,36 @@
 
 Def_Effect_NPCHurtAddPer = 89 # 对怪物伤害加成
 
+Def_Effect_JobAHurtAddPer = 90 # 对目标战士伤害加成
+Def_Effect_JobBHurtAddPer = 91 # 对目标法师伤害加成
+Def_Effect_JobCHurtAddPer = 92 # 对目标弓箭伤害加成
+Def_Effect_JobAAtkReducePer = 93 # 战士攻击伤害减免
+Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
+Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免
+
+Def_Effect_ZXCloakAttrPer = 96 # 诛仙披风属性加成百分比
+Def_Effect_ZXMaskAttrPer = 97 # 诛仙面具属性加成百分比
+Def_Effect_ZXGloveAttrPer = 98 # 诛仙手套属性加成百分比
+Def_Effect_ZXRuyiAttrPer = 99 # 诛仙如意属性加成百分比
+Def_Effect_ZXPendantAttrPer = 100 # 诛仙吊坠属性加成百分比
+Def_Effect_ZXRingAttrPer = 101 # 诛仙戒指属性加成百分比
+
+Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
+Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
+Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
+Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
+Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
+Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
+Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7
+
+Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
+Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
+Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
+Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
+Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
+Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
+Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
+
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
 #增加%d魔法伤害值,其中a值为伤害值
@@ -571,6 +611,7 @@
     Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)
     
     Def_BT_ZhuXianTower,                      #诛仙塔榜
+    Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
     
     Def_BT_HighLadder,                        #天梯竞技场排行
     Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行
@@ -586,7 +627,7 @@
     Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 33 + 2) 
+) = range(0, 34 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -1349,7 +1390,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 29
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1376,6 +1417,7 @@
 Def_MFPType_GatherSoul, # 聚魂 22
 Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Coat, # 时装 24
+Def_MFPType_ZhuXian, # 诛仙 25
 Def_MFPType_Other, # 其他
 
 #以下暂时没用到,改时再处理
@@ -1669,10 +1711,19 @@
 SuccType_Collect, #采集X物品X次131
 SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)132
 SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)133
-) = range(1, 134)
+SuccType_FeastRedPack_TalkWorld, #节日红包 - 世界频道发言 x次 134
+SuccType_FeastRedPack_Pray, # 节日红包 - 祈祷x次 135
+SuccType_FeastRedPack_KillSpecificNPC, # 节日红包 - 击杀特定NPC x次 136
+SuccType_FeastRedPack_KillBoss, # 节日红包 - 指定类型boss x次 137
+SuccType_FeastRedPack_EnterMap, # 节日红包 - 进入指定地图 x次  138
+SuccType_FeastRedPack_TaskCRun, # 节日红包 - 完成x次日常环任务成就 139
+SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次  140
+SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次  141
+SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次  142
+) = range(1, 143)
 
-
-
+# 节日红包成就类型
+FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
 
 # 连续天规则的成就类型
 ContinueSuccessTypeList = []
@@ -1765,6 +1816,11 @@
     zxetWeapon4,    # 诛仙剑4 132
 ) = range(121, 121 + 12)
 
+# 共享通用装备位,可装备同一类型装备
+ShareEquipPlace = [
+                   [zxetGlove, zxetGlove2],
+                   [zxetRing, zxetRing2],
+                   ]
 
 # 请求进入副本通用检查结果,优先提示的放前面(即索引越大,提示优先级越低)
 EnterFBAskResult = (
@@ -1807,3 +1863,16 @@
 Def_Boss_Func_Dogz, # 神兽功能BOSS
 ) = range(3)
 
+# 红包类型定义
+RedPackType_GoldPacket = 0 # 主动发钻石红包
+RedPackType_OpenServer = 5 # 开服红包
+RedPackType_FeastSysBig = 31 # 节日系统大红包
+RedPackType_FeastSysSmall = 32 # 节日系统小红包
+RedPackType_FeastSucc = 33 # 节日成就红包
+# 节日红包类型
+FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+                       2:[RedPackType_FeastSucc],
+                       }
+

--
Gitblit v1.8.0