SnxxServerCode.git

parent: 495f9eed | 补丁 | 提交 | ignore whitespace

hxp

2023-07-31 25ba977e81e2adbf551710c11d3725fcdef87007

9788 【BT9】【后端】成就系统（增加成就积分） master 冲突

5个文件已修改

	ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMoney.py	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -1044,7 +1044,12 @@
CDBPlayerRefresh_BTGMPoint, # BT版GM令  240

CDBPlayerRefresh_GuShenMoney, # 古神币  241

CDBPlayerRefresh_GongdePoint, # 功德点  242

) = range(146, 243)

CDBPlayerRefresh_CashPoint, # 现金点  243

CDBPlayerRefresh_ExAttr20, # ExAttr20 244

CDBPlayerRefresh_JiYuan, # 机缘币  245

CDBPlayerRefresh_BTGMYuE, # BTGM余额  246

CDBPlayerRefresh_SuccessScore, # 成就积分  247

) = range(146, 248)



TYPE_Price_Gold_Paper_Money = 5    # 金钱类型，（先用礼券，再用金子）

TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）

@@ -1068,6 +1073,18 @@
TYPE_Price_BTGMPoint = 33    # BT版GM令

TYPE_Price_GuShenMoney = 34    # 古神币

TYPE_Price_GongdePoint = 35    # 功德点

TYPE_Price_CashPoint = 36    # 现金点

TYPE_Price_JiYuan = 37    # 机缘币

TYPE_Price_BTGMYuE = 38    # GM余额

TYPE_Price_SuccessSocre = 39    # 成就积分



#key可用于遍历所有货币，value仅GM相关会用到

MoneyNameDict = {

                 1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令", 
                 16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘", 
                 29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点", 
                 39:"成就积分"

                 }



#以下是旧的金钱类型

TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分

@@ -1096,6 +1113,7 @@
                           TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,

                           TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,

                           TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,

                           TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,

                           }



# 支持负值的货币及对应0418刷新类型


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -304,11 +304,12 @@
Def_ItemID_GuShenMoney = 520               # 直接给古神币

Def_ItemID_GongdePoint = 530               # 直接给功德点

Def_ItemID_TongTianPoint = 720               # 直接给通天令经验点

Def_ItemID_SuccessScore = 590               # 直接给成就积分

Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper, 

                           Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,

                           Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,

                           Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,

                           Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint]

                           Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint, Def_ItemID_SuccessScore]

#---------------------------------------------------------------------

#写死的物品类型都放这边

Def_ItemType_All = -1             #所有类型

@@ -4089,6 +4090,7 @@
Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)

Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本

Def_PDict_Success_PassportAward = "Succ_PassportAward_%s" #成就通行证领奖状态,参数(key编号),按索引位存储0-未领,1-已领

Def_PDict_Success_ScoreAward = "Succ_ScoreAward" # 成就积分奖励记录,按索引位存储0-未领,1-已领



# 通天令

Def_PDict_TTL_StartTime = "TTL_StartTime" # 本轮通天令开始时间戳

@@ -5715,7 +5717,8 @@
Def_RewardType_SponsorDaily, #赞助星级每日奖励 56

Def_RewardType_SponsorStar, #赞助星级礼包奖励 57

Def_RewardType_GubaoItemEff, #古宝特殊效果物品奖励 58

)= range(59)

Def_RewardType_SuccessScore, #成就积分奖励 59

)= range(60)





#boss复活相关活动定义


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMoney.py

@@ -25,11 +25,7 @@
import ShareDefine

import GameWorld



moneyNameDict = {

                 1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令", 
                 16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘", 
                 29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点"

                 }

moneyNameDict = ShareDefine.MoneyNameDict



## GM命令执行入口

#  @param curPlayer 当前玩家


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py

@@ -1068,6 +1068,8 @@
            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_GuShenMoney, itemCount)

        elif itemID == ChConfig.Def_ItemID_GongdePoint:

            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_GongdePoint, itemCount)

        elif itemID == ChConfig.Def_ItemID_SuccessScore:

            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SuccessSocre, itemCount, moneyEventName, addDict)

        return True

    

    def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py

@@ -1044,7 +1044,12 @@
CDBPlayerRefresh_BTGMPoint, # BT版GM令  240

CDBPlayerRefresh_GuShenMoney, # 古神币  241

CDBPlayerRefresh_GongdePoint, # 功德点  242

) = range(146, 243)

CDBPlayerRefresh_CashPoint, # 现金点  243

CDBPlayerRefresh_ExAttr20, # ExAttr20 244

CDBPlayerRefresh_JiYuan, # 机缘币  245

CDBPlayerRefresh_BTGMYuE, # BTGM余额  246

CDBPlayerRefresh_SuccessScore, # 成就积分  247

) = range(146, 248)



TYPE_Price_Gold_Paper_Money = 5    # 金钱类型，（先用礼券，再用金子）

TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）

@@ -1068,6 +1073,18 @@
TYPE_Price_BTGMPoint = 33    # BT版GM令

TYPE_Price_GuShenMoney = 34    # 古神币

TYPE_Price_GongdePoint = 35    # 功德点

TYPE_Price_CashPoint = 36    # 现金点

TYPE_Price_JiYuan = 37    # 机缘币

TYPE_Price_BTGMYuE = 38    # GM余额

TYPE_Price_SuccessSocre = 39    # 成就积分



#key可用于遍历所有货币，value仅GM相关会用到

MoneyNameDict = {

                 1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令", 
                 16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘", 
                 29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点", 
                 39:"成就积分"

                 }



#以下是旧的金钱类型

TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分

@@ -1096,6 +1113,7 @@
                           TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,

                           TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,

                           TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,

                           TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,

                           }



# 支持负值的货币及对应0418刷新类型

			@@ -1044,7 +1044,12 @@
			CDBPlayerRefresh_BTGMPoint, # BT版GM令 240
			CDBPlayerRefresh_GuShenMoney, # 古神币 241
			CDBPlayerRefresh_GongdePoint, # 功德点 242
			) = range(146, 243)
			CDBPlayerRefresh_CashPoint, # 现金点 243
			CDBPlayerRefresh_ExAttr20, # ExAttr20 244
			CDBPlayerRefresh_JiYuan, # 机缘币 245
			CDBPlayerRefresh_BTGMYuE, # BTGM余额 246
			CDBPlayerRefresh_SuccessScore, # 成就积分 247
			) = range(146, 248)

			TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
			TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
			@@ -1068,6 +1073,18 @@
			TYPE_Price_BTGMPoint = 33 # BT版GM令
			TYPE_Price_GuShenMoney = 34 # 古神币
			TYPE_Price_GongdePoint = 35 # 功德点
			TYPE_Price_CashPoint = 36 # 现金点
			TYPE_Price_JiYuan = 37 # 机缘币
			TYPE_Price_BTGMYuE = 38 # GM余额
			TYPE_Price_SuccessSocre = 39 # 成就积分

			#key可用于遍历所有货币，value仅GM相关会用到
			MoneyNameDict = {
			1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令",
			16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘",
			29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点",
			39:"成就积分"
			}

			#以下是旧的金钱类型
			TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分
			@@ -1096,6 +1113,7 @@
			TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
			TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
			TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
			TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
			}

			# 支持负值的货币及对应0418刷新类型

			@@ -304,11 +304,12 @@
			Def_ItemID_GuShenMoney = 520 # 直接给古神币
			Def_ItemID_GongdePoint = 530 # 直接给功德点
			Def_ItemID_TongTianPoint = 720 # 直接给通天令经验点
			Def_ItemID_SuccessScore = 590 # 直接给成就积分
			Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
			Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
			Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
			Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
			Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint]
			Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint, Def_ItemID_SuccessScore]
			#---------------------------------------------------------------------
			#写死的物品类型都放这边
			Def_ItemType_All = -1 #所有类型
			@@ -4089,6 +4090,7 @@
			Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)
			Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本
			Def_PDict_Success_PassportAward = "Succ_PassportAward_%s" #成就通行证领奖状态,参数(key编号),按索引位存储0-未领,1-已领
			Def_PDict_Success_ScoreAward = "Succ_ScoreAward" # 成就积分奖励记录,按索引位存储0-未领,1-已领

			# 通天令
			Def_PDict_TTL_StartTime = "TTL_StartTime" # 本轮通天令开始时间戳
			@@ -5715,7 +5717,8 @@
			Def_RewardType_SponsorDaily, #赞助星级每日奖励 56
			Def_RewardType_SponsorStar, #赞助星级礼包奖励 57
			Def_RewardType_GubaoItemEff, #古宝特殊效果物品奖励 58
			)= range(59)
			Def_RewardType_SuccessScore, #成就积分奖励 59
			)= range(60)


			#boss复活相关活动定义

			@@ -25,11 +25,7 @@
			import ShareDefine
			import GameWorld

			moneyNameDict = {
			1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令",
			16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘",
			29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点"
			}
			moneyNameDict = ShareDefine.MoneyNameDict

			## GM命令执行入口
			# @param curPlayer 当前玩家

			@@ -1068,6 +1068,8 @@
			PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_GuShenMoney, itemCount)
			elif itemID == ChConfig.Def_ItemID_GongdePoint:
			PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_GongdePoint, itemCount)
			elif itemID == ChConfig.Def_ItemID_SuccessScore:
			PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SuccessSocre, itemCount, moneyEventName, addDict)
			return True

			def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):