From d86939995b8cfece66b936897dbbd3fa46571a21 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 07 十二月 2018 12:37:22 +0800
Subject: [PATCH] 5200 【后端】【1.3.100】骑宠争夺boss每只boss伤害降低,增加灵宠的灵宠也要跟着降低

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   73 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index dc883cc..e0e70a8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -143,7 +143,7 @@
 Def_Notify_WorldKey_ReloadJpegCaptcha = 'ReloadJpegCaptcha'           # 重读tex图形验证码
 Def_Notify_WorldKey_GameServerScriptReloadVersion = 'GameServerScriptReloadVersion' # GameServer 脚本重读版本标记
 Def_Notify_WorldKey_MapServerScriptReloadVersion = 'MapServerScriptReloadVersion'  # MapServer 脚本重读版本标记
-
+Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime"  #启动服务器时间
 Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息,参数为运营活动名
 Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态,参数为日常活动ID
 Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
@@ -232,12 +232,16 @@
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
 OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
+OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
+OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
+OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
 OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 
                            OperationActionName_BossReborn,OperationActionName_SpringSale, 
                            OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
-                           OperationActionName_RealmPoint]
+                           OperationActionName_RealmPoint, OperationActionName_FlashSale,
+                           OperationActionName_WishingWell, OperationActionName_TotalRecharge]
 #需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
@@ -307,7 +311,8 @@
     Def_mitMWUpLevel,         # 法宝进阶
     Def_mitRecycleAttrFruit,  # 回收魂石
     Def_mitDogzEquipPlus,     # 神兽装备强化
-) = range(1, 22)
+    Def_mitRuneCompound,      # 符印合成
+) = range(1, 23)
 
 #---写死的技能ID---
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
@@ -560,16 +565,21 @@
     Def_BT_Campaign_FightPower,               #战力排行(开服活动榜)
     
     Def_BT_FCCostGold,                        #消费排行榜(仙界盛典)
+    Def_BT_Campaign_RuneLV,                   #符印等级(开服活动榜)
+    Def_BT_FBHelpBattle,                      #助战次数排行榜
+    Def_BT_Campaign_GodWeaponLV,              #神兵等级(开服活动榜) 20
+    Def_BT_Campaign_Recharge,                 #累计充值(开服活动榜)
+    Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)
     
     Def_BT_HighLadder,                        #天梯竞技场排行
     Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行
-    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录 20
+    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录
     Def_BT_RechargeTeHui,                     #充值特惠活动排行榜-当前期记录
     
     Def_BT_MixCampaign_PlayerBattle,          #总战斗力(合服活动)
     Def_BT_MixCampaign_Recharge,              #累计充值(合服活动)
     Def_BT_MixCampaign_WinFamilyMember,       #获胜战盟成员,按职位排(合服活动)
-    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动) 25
+    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动)
     
     Def_BT_CostTeHui,                         #消费特惠排行榜
     Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期
@@ -577,7 +587,7 @@
     Def_BT_MergePKWeek,                       #跨服PK周积分榜
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 29 + 2) 
+) = range(0, 34 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -753,7 +763,7 @@
 CDBPlayerRefresh_RealmPoint,            # 境界修炼点
 CDBPlayerRefresh_Ysog,                  # 魔精
 CDBPlayerRefresh_FamilyActivity,        # 仙盟活跃令
-CDBPlayerRefresh_FBHelpPoint,           # 副本助战积分
+CDBPlayerRefresh_Xianyuancoin,          # 仙缘币
 CDBPlayerRefresh_PKState,               # 战斗状态 175
 CDBPlayerRefresh_BossState,             # boss状态
 CDBPlayerRefresh_BaseAtkMin,            # 基础最小攻击
@@ -768,9 +778,14 @@
 CDBPlayerRefresh_TreasureScore,         # 寻宝积分
 CDBPlayerRefresh_Danjing,               # 丹精
 CDBPlayerRefresh_NPCHurtAddPer,         # 对怪物伤害加成
-CDBPlayerRefresh_FinalHurtPer,             # 最终输出伤害百分比
+CDBPlayerRefresh_FinalHurtPer,          # 最终输出伤害百分比
 CDBPlayerRefresh_TalentPoint,           # 天赋点数 190
-) = range(146, 191)
+CDBPlayerRefresh_191,                   # 废弃 191
+CDBPlayerRefresh_GodWeaponLV_1,         # 神兵等级 - 类型1 192
+CDBPlayerRefresh_GodWeaponLV_2,         # 神兵等级 - 类型2 193
+CDBPlayerRefresh_GodWeaponLV_3,         # 神兵等级 - 类型3 194
+CDBPlayerRefresh_GodWeaponLV_4,         # 神兵等级 - 类型4 195
+) = range(146, 196)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -778,7 +793,8 @@
 TYPE_Price_RealmPoint = 13    # 境界修炼点
 TYPE_Price_Ysog = 14    # 魔精
 TYPE_Price_FamilyActivity = 15    # 仙盟活跃令
-TYPE_Price_FBHelpPoint = 16    # 副本助战积分
+TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃
+TYPE_Price_XianyuanCoin = 17    # 仙缘币
 TYPE_Price_Rune = 23    # 符印精华点
 TYPE_Price_RuneSplinters = 24    # 符印碎片
 TYPE_Price_TreasureScore = 25    # 寻宝积分
@@ -809,7 +825,7 @@
                            TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
                            TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
                            TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,
-                           TYPE_Price_FBHelpPoint:CDBPlayerRefresh_FBHelpPoint,
+                           TYPE_Price_XianyuanCoin:CDBPlayerRefresh_Xianyuancoin,
                            TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
                            }
 
@@ -834,7 +850,7 @@
 GameFuncID_Official = 12        # 官爵,境界
 GameFuncID_Family = 15          # 战盟,仙盟
 GameFuncID_GodWeapon = 20       # 神器
-GameFuncID_Talent = 28     # 天赋
+GameFuncID_Talent = 149         # 天赋
 GameFuncID_RefineExp = 60       # 经验炼制,祈愿
 GameFuncID_RefineMoney = 61     # 金币炼制,祈愿
 GameFuncID_WorldLV = 71         # 世界等级
@@ -849,6 +865,10 @@
 GameFuncID_FreeGoods = 130      # 极品白拿
 GameFuncID_OSSail = 132         # 开服特惠
 GameFuncID_HorsePetRobBoss = 139# 骑宠争夺
+GameFuncID_AddPoint = 145       # 加点功能
+GameFuncID_LittleHelper = 146   # 小助手
+GameFuncID_TJG = 147            # 脱机挂
+GameFuncID_SuperGift = 150      # 超值礼包
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -871,7 +891,8 @@
 Def_TalkExtraValue_Bit_VipLv,  # vip等级
 Def_TalkExtraValue_Bit_GM,            #GM
 Def_TalkExtraValue_Bit_JOB, #job
-) = range(0, 3)
+Def_TalkExtraValue_Bit_BubbleBox, #气泡框
+) = range(0, 4)
 
 #聊天信息附加值中某信息数据所占位置
 #{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
@@ -879,6 +900,7 @@
      Def_TalkExtraValue_Bit_VipLv:[0, 2],  # vip等级
      Def_TalkExtraValue_Bit_GM:[2, 3],  # GM
      Def_TalkExtraValue_Bit_JOB:[3, 4],  # job
+     Def_TalkExtraValue_Bit_BubbleBox:[4, 6],  # 气泡框
      }
 
 # 聊天频道 暂用语音
@@ -923,9 +945,9 @@
                                 Def_UniversalGameRecType_DujieHelpCntRecord, # 渡劫副本护法次数5
                                 Def_UniversalGameRecType_TodayPlayerLVInfo, #今日活跃玩家等级信息6
                                 Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
-                                Def_UniversalGameRecType_8,
-                                Def_UniversalGameRecType_9,
-                                Def_UniversalGameRecType_10,
+                                Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,
+                                Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
+                                Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
                                 Def_UniversalGameRecType_11,
                                 Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12
                                 Def_UniversalGameRecType_13,
@@ -1078,7 +1100,11 @@
 Def_Campaign_Type_LV,               # 冲级等级排行 4
 Def_Campaign_Type_RealmLV,          # 境界等级排行 5
 Def_Campaign_Type_FightPower,       # 总战斗力排行 6
-) = range(1, 1 + 6)
+Def_Campaign_Type_RuneLV,           # 符印等级排行 7
+Def_Campaign_Type_GodWeaponLV,      # 神兵等级排行 8
+Def_Campaign_Type_Recharge,         # 累计充值排行 9
+Def_Campaign_Type_PetLV,            # 灵宠等级排行 10
+) = range(1, 1 + 10)
 
 # 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
 Def_Campaign_Billboard_Dict = {
@@ -1088,6 +1114,10 @@
                                Def_Campaign_Type_LV:Def_BT_Campaign_LV,
                                Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
                                Def_Campaign_Type_FightPower:Def_BT_Campaign_FightPower,
+                               Def_Campaign_Type_RuneLV:Def_BT_Campaign_RuneLV,
+                               Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,
+                               Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
+                               Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
                                }
 
 # 活动数据状态
@@ -1472,7 +1502,9 @@
 DailyActionID_BOSSHome, # BOSS之家
 DailyActionID_FamilyRobBoss, # 仙盟抢boss
 DailyActionID_KillNPC, # 野外怪物
-) = range(1, 18 + 1)
+DailyActionID_IceLode, # 冰晶矿脉
+DailyActionID_HelpBattleCheckIn, # 助战登记  20
+) = range(1, 20 + 1)
 
 
 
@@ -1505,7 +1537,7 @@
 SuccType_XXX24 , # 废弃24
 SuccType_XXX25, # 废弃25
 SuccType_EquipPlus, # 强化x次成就26
-SuccType_EquipPlusLV, # x件装备强化等级达到x级27
+SuccType_EquipPlusLV, # x件装备强化等级达到x级27 (已废弃)
 SuccType_KillWorldBoss, # 击杀世界bossx次成就(有伤害就算)28
 SuccType_XXX29, # 废弃29
 SuccType_PassWagicWeapon, # 通关法宝副本30
@@ -1639,6 +1671,7 @@
 NeedResetSuccessTypeList = [
                             SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
                             SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
+                            SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,
                             ]
 
 # 聊天类型, 从100开始, 前100个给c++用

--
Gitblit v1.8.0