From 36d9603ed7d901b79085ddb0dfd144a121c9cf6e Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期一, 03 九月 2018 15:53:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 110 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt b/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt
new file mode 100644
index 0000000..4f4ce49
--- /dev/null
+++ b/CoreServerGroup/GameServer/GameServerConfig/GeneralProgramme.txt
@@ -0,0 +1,110 @@
+功能文件名	功能路径	功能MD5	功能说明
+DirtyList	\DirtyList\DirtyList	7b351bf5a73546f2fdb6afc2d372902c	服务器脏话列表
+CanRenameFamilyName	\PlayerFamily\CanRenameFamilyName	a28964e39ca209c65e1fbf211d8e774d	是否可以更改家族名字
+AddFamilyHornorValue	\PlayerFamilyWar\AddFamilyHornorValue	b0d318b8bfe3b83398d364f78beca152	帮会战帮会荣誉度计算公式
+AddFamilyBoomValue	\PlayerFamilyWar\AddFamilyBoomValue	960cdcc5efcc012d13c86f6d8e845e92	帮会战帮会繁荣计算公式
+PlayerFriendValue_LV	\PlayerFriend\PlayerFriendValue_LV	b46be1a6b0f26cbebba6baa85ea2e5bf	亲密度相应称谓等级
+FriendSendEnergyCfg	\PlayerFriend\FriendSendEnergyCfg	ff535e727b283fe1097bb71645a9f35d	好友互赠精力配置
+Player_Reborn_Place	\PlayerReborn\Player_Reborn_Place	a01d7d305868d8d7cf5063a139c5e08d	玩家出生位置
+Player_Reborn_CopyMapID	\PlayerReborn\Player_Reborn_CopyMapID	6be7e9f09a937712df6f468de3623a60	玩家出生地图虚拟分线
+ActionNotify	\ActionControl\ActionNotify	0b00ac10b5de83a368b4008c6612ebf8	活动世界通知
+ActionGoOn	\ActionControl\ActionGoOn	436935da696dd293eda2399915dd7c86	"开启服务器, 活动可继续开启"
+ActionControl	\ActionControl\ActionControl	5427a43176792fefc32298d2bee69fd1	活动总开关
+ActionNotifyMerge	\ActionControl\ActionNotifyMerge	58a3b2ea620355acd1196d11c95a88d3	跨服活动世界通知
+ActionGoOnMerge	\ActionControl\ActionGoOnMerge	b0c3996eba3a7ed471cea0b9da44981f	"开启跨服服务器, 活动可继续开启"
+ActionControlMerge	\ActionControl\ActionControlMerge	6ba0f42237cd9711ee4543eb6f54a4f1	跨服活动总开关
+RoleNameFormat	\CreatRole\RoleNameFormat	3b06ca3aeb6e07a2cc8cf97b5e689f5f	角色名字格式
+TestAccID	\CreatRole\TestAccID	3b06ca3aeb6e07a2cc8cf97b5e689f5f	测试账号
+Exam_ZGTX	\Exam\Exam_ZGTX	7ed77cdf2d1d96523adf3552670c8cdb	题库_智冠天下
+Exam_BSL	\Exam\Exam_BSL	d8c7a4848d16ed9c14585c5d80c63392	题库_变色龙
+Exam_JQBD	\Exam\Exam_JQBD	7815c05429228f9dcaf9bfcf19c1939c	题库_举棋不定
+ZGTX_MarkFormula	\Exam\ZGTX_MarkFormula	dd795d6bb6144b6b02630092bd9715f6	答题积分公式_智冠天下
+BSL_MarkFormula	\Exam\BSL_MarkFormula	de6618ac839b73fad7262967201314bc	答题积分公式_变色龙
+JQBD_MarkFormula	\Exam\JQBD_MarkFormula	b92910a75edfdfef67490d9d5e2cd4ac	答题积分公式_举棋不定
+PsycoSwitch	\PsycoSwitch	4561160f999688687b3da4d5b9b91476	"是否开启Psyco优化, 1开始, 0关闭"
+PyReloadVersion	\PyReloadVersion	ab5f1866849d9b7eb340c3b69d267725	脚本重读版本
+FamilyBillboardCmpValue	\Billboard\FamilyBillboardCmpValue	5401e466dd6641fb860a75e6dfb60a26	答题排行榜加权值
+FamilyBillboardCmpValue_ActiveValue	\Billboard\FamilyBillboardCmpValue_ActiveValue	e9e2940ddff25db7776348a1ee27b0b3	家族荣誉排行榜加权值
+FamilyBillboardCmpValue_LV	\Billboard\FamilyBillboardCmpValue_LV	9b259f12fae8a914f460aba6b23921f1	家族等级排行榜加权值
+BillBoardPlayerLoginNotify	\Billboard\BillBoardPlayerLoginNotify	fd0ee769d59ced784dd2f42c3884a9aa	玩家上线全服广播配置
+BillBoardClearSetting	\Billboard\BillBoardClearSetting	399c84245cd128fe7dc8cb412eb6b051	开服务器清除排行榜配置
+BillBoardDropBindLV	\Billboard\BillBoardDropBindLV	fff36b8edff267bb12557bb95c146278	野外掉落绑定等级配置
+Exam_ZXH	\Exam\Exam_ZXH	6172b8be4c5a77e8050a651db8164d5d	题库_真心话
+PlayerRecall_Open	\PlayerRecall\PlayerRecall_Open	a1f470c65871c662b3adc2b92368c053	玩家回归开关
+PlayerRecall_RecallCount	\PlayerRecall\PlayerRecall_RecallCount	1352513c5fa7697b39f704eef8106efc	召回玩家个数奖励
+NotifyFamilyMemberKilled	\NotifyFamilyMemberKilled\NotifyFamilyMemberKilled	ec391d7db848ce0953e589e3f2101f12	中立地图杀死参加帮会争霸战帮会的玩家(帮主、护法、长老)提示
+OpenServerCampaign	\OpenServerCampaign\OpenServerCampaign	34f2e42e75766db20fc585e44b26cc06	开服活动
+MixServerCampaign	\MixServerCampaign\MixServerCampaign	addc833d7caacf50e147b29db29540ea	合服活动
+GmStarAction	\GmStarAction\GmStarAction	8c60fc13e6f7ccd62c6d2573638e2e94	GM开启活动
+EncodingTex	\Encoding\EncodingTex	776e3fb177e8f6787f5fa89b2d2bfded	字符串编码格式检查
+ImpeachNotifyInfo	\GMMailInfo\ImpeachNotifyInfo	e1b09fa7a9166e708b968b2aab22beaa	GM邮件信息
+FamilyLeaderImpeach	\PlayerFamily\FamilyLeaderImpeach	e771cd67eca1424f542ef7b601c58320	家族弹劾时间配置
+FamilyNameFormat	\PlayerFamily\FamilyNameFormat	789d107f8141c62c4d5ceaac9383f282	家族全名格式配置
+FamilyTechID	\PlayerFamily\FamilyTechID	68b1e4add0b4bc1a9fdd3514013fdb23	家族科技ID列表
+FamilyTechLVUP	\PlayerFamily\FamilyTechLVUP	a8bc368f45dcdd2c3e64d71ef90697d8	家族科技升级配置
+FamilyTechMaxLV	\PlayerFamily\FamilyTechMaxLV	de8fa8c40da8197f28b872ed253afcc0	家族科技最大等级
+ActionControlByDayInitOpenServerDay	\ActionControlByDay\ActionControlByDayInitOpenServerDay	17b80c7a4e376c7b231b57e66ab04c1c	根据天数活动
+ActionControlByDayKeyGoOn	\ActionControlByDay\ActionControlByDayKeyGoOn	8e8e728fe20930bdc4513e2c45b8e091	中途开启继续触发根据天数活动key
+ActionControlByDayKeyRepeat	\ActionControlByDay\ActionControlByDayKeyRepeat	dd25939374cf938b3404e8f89b268f41	根据天数活动key循环周期控制
+AreaNameInfo	\MergeServer\AreaNameInfo	74b2f292fbf5fbd67150ef3a62cba820	区服信息和命名规则
+MergeActionMapPos	\MergeServer\MergeActionMapPos	74b2f292fbf5fbd67150ef3a62cba820	跨服活动地图配置
+BillBoardLimit	\Billboard\BillBoardLimit	35b1f5b7932b983364c5bfafeff7f275	排行榜限制条件
+GameWorldBossPrize	\GameWorldBoss\GameWorldBossPrize	6bab3565072350510dc12a0292e3c1bc	世界奖励配置
+GameWorldBossReborn	\GameWorldBoss\GameWorldBossReborn	9fadca4d6b1fb17b7bf74e950180d2bd	世界boss重生配置
+ManorWarMapID	\PlayerManorWar\ManorWarMapID	f5c86f06696671b71efdbd728ff0ec19	领地争夺战地图id配置
+Exam_AnswerTick	\Exam\Exam_AnswerTick	d0d7ae61db88f697c329a47109ad3205	答题时间,即可让你进行选择答案的时间
+Exam_LastTime	\Exam\Exam_LastTime	7c84cfb21a3464138833ab1ddc0b2177	答题活动时间
+Exam_SubjectMaxCnt	\Exam\Exam_SubjectMaxCnt	f183a58d6e2713276839de23ce6f1b4a	答题活动最大题数
+Exam_TimeSetting	\Exam\Exam_TimeSetting	d33afe36b3c35357c48025c793b2d1d9	答题各个阶段时间设置
+Exam_ZXH_Point	\Exam\Exam_ZXH_Point	3d49142a4aaef780e6b16b923276b50a	真心话大冒险的答题分数
+HighLadderDef	\HighLadder\HighLadderDef	8975d286f673c621550e27f1ed7ff4eb	天梯竞技场默认值配置
+HighLadderCanFight	\HighLadder\HighLadderCanFight	43e5dc38bb409013d8cbe04f4d61da6c	天梯竞技场可挑战玩家范围配置
+HighLadderFightFormula	\HighLadder\HighLadderFightFormula	d8cb86da3743af26d1f2a4faf58d33c9	天梯竞技场战斗结果计算公式
+HighLadderNPCProperty	\HighLadder\HighLadderNPCProperty	4997d036e5227c84b3af1b883fdc6e7e	天梯竞技场NPC战斗属性公式
+HighLadderWinMsg	\HighLadder\HighLadderWinMsg	9827b21ca83c20ce1b4c0ca1dad25c50	天梯竞技场消息提示
+HighLadderFightCntAward	\HighLadder\HighLadderFightCntAward	dac791aaabbd720dbbee48a52e006117	天梯竞技场挑战次数额外奖励列表
+TeHuiAction_RechargeRank	\TeHuiAction\TeHuiAction_RechargeRank	c84dd9a10fdb6186862203fc64d51f63	充值排行特惠活动信息配置
+TeHuiAction_CostRank	\TeHuiAction\TeHuiAction_CostRank	b6c8778293e0ddfbc768831495ac4aea	消费排行特惠活动信息配置
+CacheSaveLimit	\PlayerCache\CacheSaveLimit	2ed080b380d7e8111bbb2f2b9642d1a0	玩家查看缓存数据限制配置
+HundredServerActionDay	\ActionHundredServer\HundredServerActionDay	02e1fc66e0f5e93fbcd6774a1d998fe7	百服活动最大天
+HundredServerActionInfo	\ActionHundredServer\HundredServerActionInfo	280eb635802e6d4549dd35eeee08d289	百服活动信息配置
+HundredServerActionOpenDate	\ActionHundredServer\HundredServerActionOpenDate	a82dadd4ac18e671842fef4b85e51b29	百服活动时间控制配置
+EventReportID	\EventReport\EventReportID	4647cc05fa5a0578f67dba651954e563	开放汇报的事件ID
+EventReportMapID	\EventReport\EventReportMapID	caccd69cfc9424af3647fe6c422f04cf	开放汇报在线人数的地图ID列表
+TimeShopRefresh	\Shop\TimeShopRefresh	43c072c03f3a784f62dbbd75ccf4eb47	定时神秘商店刷新时间间隔配置
+MaxServerSlotsRecord	\Slots\MaxServerSlotsRecord	5fb52ec0259f4e681ef04f4e6a8b56e7	老虎机全服抽奖记录最大条数
+FamilyHomeExp	\PlayerFamilyHome\FamilyHomeExp	ce69b934a584c2c9db2d03d998d0b9ce	战盟家园升级经验表
+FamilyHomeOpenLV	\PlayerFamilyHome\FamilyHomeOpenLV	965b1e95d3d24011316e346113f3d11c	战盟家园开放等级
+FamilyHomeResetTime	\PlayerFamilyHome\FamilyHomeResetTime	c8b02dc5dffc5fe21ddae9ecb141810c	战盟家园重置时间
+FamilyHomePlantTimeout	\PlayerFamilyHome\FamilyHomePlantTimeout	106236389a375bac1f0a6c40262883e6	战盟家园植物过期时间
+RedPacketServerLimitInfo	\PlayerRedPacket\RedPacketServerLimitInfo	bae7aa003fae5ac914d86bc0ea7be86b	红包全服限制配置
+GrabRedPacketCfg	\PlayerRedPacket\GrabRedPacketCfg	f6bd776748bd2a846714c775ac44cfe7	抢红包配置
+MaxServerGamblingRecord	\Gambing\MaxServerGamblingRecord	59158b2eb646e5f5bcdc0bcd5d76ed99	转转乐最大记录条数
+MergeBoss_Condition	\MergeBoss\MergeBoss_Condition	b0e3727ede5022451eedcd92583f7a2d	跨服Boss
+MergeBoss_LastHurtAward	\MergeBoss\MergeBoss_LastHurtAward	abf88df0cf50e0659d6ed0a6d4251278	跨服Boss最后一击奖励
+MergeBoss_HurtOrderAward	\MergeBoss\MergeBoss_HurtOrderAward	e18acf8b8ea2041fcfcfcd60378e7d48	跨服Boss伤害排行奖励
+MergeBoss_TotalOrderAward	\MergeBoss\MergeBoss_TotalOrderAward	56e18b0f0856c6f0d567e6af41a8f936	跨服Boss阵营总伤害排行奖励
+MergePK_Season	\MergePK\MergePK_Season	aa3e428850fddefda773b9bb6233bc70	跨服匹配PK赛季配置
+MergePKAward_DayPKCnt	\MergePK\MergePKAward_DayPKCnt	4d01df2f1be013877001cb66240ec298	跨服匹配PK每日PK次数奖励配置
+MergePKAward_DayWinCnt	\MergePK\MergePKAward_DayWinCnt	36e96c9735717a81f35282c9f85487ce	跨服匹配PK每日胜利次数奖励配置
+MergePKAward_FirstWinCnt	\MergePK\MergePKAward_FirstWinCnt	f277159e3812053e083085e8591021e9	跨服匹配首次胜利次数奖励配置
+MergePKAward_SeasonGrade	\MergePK\MergePKAward_SeasonGrade	2b170c4814155c05371f617699e52171	跨服匹配PK赛季段位晋级奖励配置
+MergePKAward_SeasonRank	\MergePK\MergePKAward_SeasonRank	35ac832b1cb10b3e2aa7e4522daf6bc7	跨服匹配PK赛季排名奖励配置
+MergePK_Match	\MergePK\MergePK_Match	85a197058cfc2d99543fd930a82520bd	跨服匹配PK
+MergePK_Score	\MergePK\MergePK_Score	f4703ba914a5103569a8cf446e6ffd52	跨服匹配得分规则配置
+MergePK_LuckyItemMail	\MergePK\MergePK_LuckyItemMail	8ee489c15b235e9d12d27bac73eee7ab	跨服匹配PK幸运物品奖励邮件
+MergePK_WinNotify	\MergePK\MergePK_WinNotify	61c836ce2bceb4315d33dad68e46ada0	跨服匹配连胜次数广播配置
+MergePKWinRecoverCost	\MergePK\MergePKWinRecoverCost	6a8da3ad0e4032a76cadc9a83ccbe90d	跨服匹配恢复连胜次数消耗配置
+MergeKing	\MergeKing\MergeKing	f0edbd4de3f9b4d75a2ea3d2c5e1ce5d	跨服王者争霸
+TruckTime	\PlayerTruck\TruckTime	a24490de5d322b47c8919189195ebbb9	运镖限制时长
+EventMailInfo	\Mail\EventMailInfo	764eb490c392d7e9198a9fbb0565a7c9	游戏邮件事件记录信息
+MailMaxItemCnt	\Mail\MailMaxItemCnt	ece132e7754d9275ca2134e397efb569	单封邮件最大物品数配置
+DiceCfg	\PlayerDice\DiceCfg	f937383b6a5a91041e5220e174b290f2	天降钻石配置
+DiceAwardCfg	\PlayerDice\DiceAwardCfg	c6a94b2f81137ff67b6ade8fc76f7140	天降钻石积分奖励配置
+JXTZ_RankAward	\JXTZ\JXTZ_RankAward	5898a2e6bf290bc764819972af9a5e7e	极限挑战排名奖励配置
+JXTZRankMail	\JXTZ\JXTZRankMail	42eb863c33203ca089c7b214b7f0d708	极限挑战排名邮件配置
+QRCodeRedpackCfg	\QRCodeRedpack\QRCodeRedpackCfg	42eb863c33203ca089c7b214b7f0d708	二维码红包配置
+QRCodeRedpackDayCnt	\QRCodeRedpack\QRCodeRedpackDayCnt	42eb863c33203ca089c7b214b7f0d708	二维码红包每日产出个数控制配置
+QRCodeRedpackNPCDrop	\QRCodeRedpack\QRCodeRedpackNPCDrop	42eb863c33203ca089c7b214b7f0d708	二维码红包NPC掉落概率控制配置
+CarnivalCfg	\Carnival\CarnivalCfg	42eb863c33203ca089c7b214b7f0d708	嘉年华抽奖配置
+CarnivalRecordMaxCnt	\Carnival\CarnivalRecordMaxCnt	42eb863c33203ca089c7b214b7f0d708	嘉年华抽奖记录最多保存数量
\ No newline at end of file

--
Gitblit v1.8.0