From 25ba977e81e2adbf551710c11d3725fcdef87007 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 31 七月 2023 16:45:35 +0800
Subject: [PATCH] 9788 【BT9】【后端】成就系统(增加成就积分) master 冲突

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 0ef5df6..2ce90b3 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/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刷新类型

--
Gitblit v1.8.0