refactor(Gateway): 修改服务器类型名称并注释端口配置

- 将 Logic 服务器更名为 Gate 服务器
- 在 docker-compose.yml 中注释掉端口配置

.gitignore

@@ -7,3 +7,4 @@ LogicServer/scripterror.txt
 core.*
 .vscode/
 .idea/
+LogicServer/data/runtime/

DBServer/DBServerLinux.txt

@@ -40,7 +40,7 @@ DBServer = {
 
 	--数据库连接配置
 	SQL = {
-		Host = "127.0.0.1",
+		Host = "192.168.25.110",
 		Port = 3308,
 		DBName = "mir_actor_s1",
 		DBUser = "root",

DBServer/start.sh

@@ -6,6 +6,10 @@ path=`pwd`
 echo "======================【启动】========================"
 datetime=`date "+%Y-%m-%d.%H:%M:%S"`
 
+echo "["$datetime"] 正在启动 build 服务群..."
+
+/data/server/build/run.sh
+ 
 echo "["$datetime"] 正在启动 DB 服务器 [dbserver_r]..."
 
 $path/dbserver_r $path/DBServerLinux.txt

Gateway/GateWay.txt

@@ -10,7 +10,7 @@ GateServer = {
                 },
                 --后台服务器的地址和端口
                 BackServer = {
-                        Host = "127.0.0.1",
+                        Host = "logic",
                         Port = 10318,
                 },
         },

Gateway/start.sh

@@ -6,6 +6,6 @@ path=`pwd`
 echo "======================【启动】========================"
 datetime=`date "+%Y-%m-%d.%H:%M:%S"`
 
-echo "["$datetime"] 正在启动 Logic 服务器 [gateway_r]..."
+echo "["$datetime"] 正在启动 Gate 服务器 [gateway_r]..."
 
 $path/gateway_r $path/GateWay.txt

LogicServer/LogicServerLinux.txt

@@ -13,37 +13,37 @@ LogicServer = {
 
 	--连接：数据服务器
 	DbServer = {
-		Address = "127.0.0.1",
+		Address = "172.36.10.25",
 		Port = 10319,
 	},
 
 	--连接：LocalLog服务器
 	LocalLogServer = {
-		Address = "127.0.0.1",
+		Address = "172.36.10.25",
 		Port = 35010,
 	},
 
 	--连接：会话服务器
 	SessionServer = {
-		Address = "127.0.0.1",
+		Address = "172.36.10.25",
 		Port = 31000,
 	},
 
 	--连接：Log服务器
 	LogServer = {
-		Address = "127.0.0.1",
+		Address = "172.36.10.25",
 		Port = 34000,
 	},
 
 	--连接：AM服务器
 	AMServer = {
-		Host = "127.0.0.1",
+		Host = "172.36.10.25",
 		Port = 5660,
 	},
 
 	--连接：后台服务器
 	MgrServer = {
-		Host = "127.0.0.1",
+		Host = "172.36.10.25",
 		Port = 8500,
 	},
 }

LogicServer/data/config/Merge/ItemMerge.config

@@ -798,7 +798,7 @@ ItemMergeConfig = {
 				mergebutton10 = 1,
 				Eid = 57,
 				second_index = 7,
-				table = { { id = 365, type = 0, count = 5 }, { id = 2, type = 2, count = 1000 } },
+				table = { { id = 365, type = 0, count = 3 }, { id = 2, type = 2, count = 1000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -813,7 +813,7 @@ ItemMergeConfig = {
 				mergebutton10 = 1,
 				Eid = 58,
 				second_index = 7,
-				table = { { id = 366, type = 0, count = 5 }, { id = 2, type = 2, count = 3000 } },
+				table = { { id = 366, type = 0, count = 3 }, { id = 2, type = 2, count = 3000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -828,7 +828,7 @@ ItemMergeConfig = {
 				mergebutton10 = 1,
 				Eid = 59,
 				second_index = 7,
-				table = { { id = 367, type = 0, count = 5 }, { id = 2, type = 2, count = 5000 } },
+				table = { { id = 367, type = 0, count = 3 }, { id = 2, type = 2, count = 5000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -843,7 +843,7 @@ ItemMergeConfig = {
 				mergebutton10 = 1,
 				Eid = 60,
 				second_index = 7,
-				table = { { id = 368, type = 0, count = 5 }, { id = 2, type = 2, count = 8000 } },
+				table = { { id = 368, type = 0, count = 3 }, { id = 2, type = 2, count = 8000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -856,7 +856,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 61,
 				second_index = 7,
-				table = { { id = 369, type = 0, count = 5 }, { id = 2, type = 2, count = 15000 } },
+				table = { { id = 369, type = 0, count = 3 }, { id = 2, type = 2, count = 15000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -869,7 +869,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 62,
 				second_index = 7,
-				table = { { id = 370, type = 0, count = 5 }, { id = 2, type = 2, count = 30000 } },
+				table = { { id = 370, type = 0, count = 3 }, { id = 2, type = 2, count = 30000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -882,7 +882,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 63,
 				second_index = 7,
-				table = { { id = 371, type = 0, count = 5 }, { id = 2, type = 2, count = 50000 } },
+				table = { { id = 371, type = 0, count = 3 }, { id = 2, type = 2, count = 50000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -895,7 +895,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 64,
 				second_index = 7,
-				table = { { id = 863, type = 0, count = 5 }, { id = 2, type = 2, count = 80000 } },
+				table = { { id = 863, type = 0, count = 3 }, { id = 2, type = 2, count = 80000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -908,7 +908,7 @@ ItemMergeConfig = {
 				text = "合成",
 				Eid = 65,
 				second_index = 7,
-				table = { { id = 864, type = 0, count = 5 }, { id = 2, type = 2, count = 120000 } },
+				table = { { id = 864, type = 0, count = 3 }, { id = 2, type = 2, count = 120000 } },
 				openserverday = 1,
 				level = 1,
 				redpointlimit = { zsLevel = 2 },
@@ -1946,6 +1946,19 @@ ItemMergeConfig = {
 			},
 		},
 		[2] = {
+			[72] = {
+				circle = 0,
+				compose = { id = 840, type = 0, count = 1 },
+				index = 3,
+				text = "兑换",
+				buttontxt10 = "合成10次",
+				mergebutton10 = 1,
+				Eid = 72,
+				second_index = 2,
+				table = { { id = 838, type = 0, count = 10 } },
+				openserverday = 1,
+				level = 1,
+			},
 			[73] = {
 				circle = 0,
 				compose = { id = 838, type = 0, count = 10 },

LogicServer/data/config/Platformludashimember.config

@@ -1,31 +0,0 @@
---P-平台福利鲁大师.xlsx 会员礼包
-ludashimemberConfig={
-[1] = {
-	id = 1,
-	type = 1,
-	level = 1,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=2,id=2,count=10000}},
-},
-[2] = {
-	id = 2,
-	type = 1,
-	level = 3,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=2,id=2,count=10000}},
-},
-[3] = {
-	id = 3,
-	type = 2,
-	level = 1,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=2,id=2,count=10000}},
-},
-[4] = {
-	id = 4,
-	type = 2,
-	level = 3,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=2,id=2,count=10000}},
-},
-}

LogicServer/data/config/Platformludashivip.config

@@ -1,21 +0,0 @@
---P-平台福利鲁大师.xlsx 平台vip
-ludashivipConfig={
-[1] = {
-	id = 1,
-	level = 1,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=2,id=2,count=10000}},
-},
-[2] = {
-	id = 2,
-	level = 4,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=421,count=1},{type=7,id=7,count=3},{type=2,id=2,count=10000}},
-},
-[3] = {
-	id = 3,
-	level = 7,
-	reward = {{type=0,id=1277,count=1}},
-	reward1 = {{type=0,id=261,count=1},{type=7,id=7,count=3},{type=2,id=2,count=10000}},
-},
-}

LogicServer/data/config/WholeNotice/NSNotice.config

@@ -14,7 +14,7 @@ NSNoticeConfig={
 	content = "购买|E:-2,19,&U:&C:0x28ee01&T:绿卡特权|，即刻获取大量转生材料、专属麻痹，急速飞升3转！升级打怪快人一步！同时开启大额金币回收！",
 	starttime = 1,
 	stoptime = 2,
-	noticeInterval = 18000,
+	noticeInterval = 1800000,
 	trundle = 0,
 	chatting = 1,
 },
@@ -23,7 +23,7 @@ NSNoticeConfig={
 	content = "购买|E:-2,19,&U:&C:0x28ee01&T:蓝卡特权|，晋升霸主贵族，额外金币收益、切割，属性、打金效率大幅提升，秒升六转不是梦！即刻开启寄售行道具上架，赚取你的第一桶金！",
 	starttime = 1,
 	stoptime = 5,
-	noticeInterval = 36000,
+	noticeInterval = 3600000,
 	trundle = 0,
 	chatting = 1,
 },
@@ -31,7 +31,7 @@ NSNoticeConfig={
 	Noticeid = 4,
 	content = "|E:-2,25,&U:&C:0x28ee01&T:开启狂暴|，攻魔道大幅加成，增加10%伤害加成，输出秒天秒地。打怪回收装备金币+15%，打金效率瞬间提高！",
 	starttime = 1,
-	noticeInterval = 36000,
+	noticeInterval = 3600000,
 	trundle = 0,
 	chatting = 1,
 },

LogicServer/data/config/buff/Buff.config

@@ -2978,11 +2978,11 @@ BuffConf={
 	group = 8,
 	times = 86400,
 	interval = 1,
-	timeoverlay = false,
+	timeoverlay = true,
 	iconshow = 1,
 	icon = 31,
 	issave = true,
-	dieremove = false,
+	dieremove = true,
 },
 [241] = {
 	id = 241,

LogicServer/data/config/cdkey/CommonCdkey.config

@@ -1,52 +1,63 @@
 --AA-礼包码CDKey.xlsx 通码配置
-CommonCDKeyConf={
+CommonCDKeyConf = {
-["VIP666"] = {
+	["VIP666"] = {
-	cdkey = "VIP666",
+		cdkey = "VIP666",
-	awards = {{type=2,id=2,count=500000},{type=0,id=480,count=20},{type=0,id=970,count=5}},
+		awards = { { type = 2, id = 2, count = 500000 }, { type = 0, id = 480, count = 20 }, { type = 0, id = 970, count = 5 } },
-	mailtitle = "系统邮件",
+		mailtitle = "系统邮件",
-	mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
+		mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
-	switch = 1,
+		switch = 1,
-},
+	},
-["VIP888"] = {
+	["VIP888"] = {
-	cdkey = "VIP888",
+		cdkey = "VIP888",
-	awards = {{type=0,id=1018,count=3},{type=0,id=994,count=3},{type=0,id=269,count=5}},
+		awards = { { type = 0, id = 1018, count = 3 }, { type = 0, id = 994, count = 3 }, { type = 0, id = 269, count = 5 } },
-	mailtitle = "系统邮件",
+		mailtitle = "系统邮件",
-	mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
+		mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
-	switch = 1,
+		switch = 1,
-},
+	},
-["VIP999"] = {
+	["VIP999"] = {
-	cdkey = "VIP999",
+		cdkey = "VIP999",
-	awards = {{type=0,id=261,count=20},{type=0,id=421,count=5},{type=0,id=954,count=10}},
+		awards = { { type = 0, id = 261, count = 20 }, { type = 0, id = 421, count = 5 }, { type = 0, id = 954, count = 10 } },
-	mailtitle = "系统邮件",
+		mailtitle = "系统邮件",
-	mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
+		mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
-	switch = 1,
+		switch = 1,
-},
+	},
-["LINUXDO"] = {
+	["LINUXDO"] = {
-	cdkey = "LINUXDO",
+		cdkey = "LINUXDO",
-	awards = {{type=0,id=261,count=100},{type=0,id=421,count=10},{type=0,id=389,count=5},{type=0,id=1270,count=1}},
+		awards = { { type = 0, id = 261, count = 100 }, { type = 0, id = 421, count = 10 }, { type = 0, id = 389, count = 5 }, {
-	mailtitle = "LINUXDO的各位佬,感谢你的支持!",
+			type = 0,
-	mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
+			id = 1270,
-	switch = 1,
+			count = 1,
-},
+		} },
-["weliowork"] = {
+		mailtitle = "LINUXDO的各位佬,感谢你的支持!",
-	cdkey = "weliowork",
+		mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
-	awards = {{type=0,id=1151,count=1},{type=0,id=1166,count=10},{type=0,id=1250,count=1}},
+		switch = 1,
-	mailtitle = "致敬论坛的黑白佬!",
+	},
-	mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
+	["weliowork"] = {
-	switch = 1,
+		cdkey = "weliowork",
-},
+		awards = { { type = 0, id = 1151, count = 1 }, { type = 0, id = 1166, count = 10 }, { type = 0, id = 1250, count = 1 } },
-["newyear"] = {
+		mailtitle = "致敬论坛的黑白佬!",
-	cdkey = "辞旧迎新",
+		mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
-	awards = {{type=0,id=1151,count=1},{type=0,id=1164,count=100},{type=0,id=1250,count=1}},
+		switch = 1,
-	mailtitle = "预祝大家新年快乐,阖家欢乐!",
+	},
-	mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
+	["newyear"] = {
-	switch = 1,
+		cdkey = "辞旧迎新",
-},
+		awards = { { type = 0, id = 1151, count = 1 }, { type = 0, id = 1164, count = 100 }, { type = 0, id = 1250, count = 1 } },
-["bainian"] = {
+		mailtitle = "预祝大家新年快乐,阖家欢乐!",
-	cdkey = "拜年",
+		mailcontent = "尊敬的玩家：感谢您的支持，请查收您的礼包奖励。",
-	awards = {{type=0,id=1151,count=1},{type=0,id=1164,count=100},{type=0,id=1250,count=1}},
+		switch = 1,
-	mailtitle = "给您拜年啦!",
+	},
-	mailcontent = "岁序常易，华章日新。在这辞旧迎新的美好时刻，愿新年的钟声为您带来无尽的喜悦与祥和。愿您在新的一年里，万事胜意，阖家幸福，身体安康，笑口常开！新春快乐，蛇年大吉！。",
+	["bainian"] = {
-	switch = 1,
+		cdkey = "拜年",
-},
+		awards = { { type = 0, id = 1151, count = 1 }, { type = 0, id = 1164, count = 100 }, { type = 0, id = 1250, count = 1 } },
+		mailtitle = "给您拜年啦!",
+		mailcontent = "岁序常易，华章日新。在这辞旧迎新的美好时刻，愿新年的钟声为您带来无尽的喜悦与祥和。愿您在新的一年里，万事胜意，阖家幸福，身体安康，笑口常开！新春快乐，蛇年大吉！。",
+		switch = 1,
+	},
+	["tiancijiyuan"] = {
+		cdkey = "tiancijiyuan",
+		awards = { { type = 0, id = 1395, count = 1 } },
+		mailtitle = "天赐机缘",
+		mailcontent = "国服和奶昔服合并,并降下机缘,附赠给您一个机缘宝箱,看看你的运气吧!宝盒包含了有刈鹿刀,霜华,不争,3阶魔器宝盒,天命之子(时装),5w元宝,黄金宸龙,辉金甲,金牛炎宝盒以及金牛宝盒,是非是欧,全靠运气,最后遥祝大家都能获得自己心仪的物品~",
+		switch = 1,
+	},
 }

LogicServer/data/config/drop/StdItem.txt

@@ -1,3 +0,0 @@
---lua script
---#include "..\..\language\LangCode.config"
---#include ".\StdItems.config"

LogicServer/data/config/drop/dropgroup.config

@@ -2220,6 +2220,11 @@ DropGroupConfig = {
 		type = 2,
 		group = { { rate = 100, id = 2100188 } },
 	},
+	[100882] = {
+		id = 100882,
+		type = 2,
+		group = { { rate = 100, id = 2100189 } },
+	},
 	[110001] = {
 		id = 110001,
 		type = 2,
@@ -8794,6 +8799,7 @@ DropGroupConfig = {
 			{ rate = 0.1, id = 2010049 },
 			{ rate = 20, id = 2100063 },
 			{ rate = 100, id = 2100039 },
+			{ rate = 5, id = 1000600 },
 		},
 	},
 	[200140] = {
@@ -8850,6 +8856,7 @@ DropGroupConfig = {
 			{ rate = 30, id = 2100063 },
 			{ rate = 5, id = 2100069 },
 			{ rate = 100, id = 2100039 },
+			{ rate = 5, id = 1000600 },
 		},
 	},
 	[200141] = {

LogicServer/data/config/drop/droptable.config

@@ -10366,4 +10366,23 @@ DropTableConfig = {
 		},
 		weeklimit = {},
 	},
+	[2100189] = {
+		id = 2100189,
+		type = 2,
+		table = {
+			{ rate = 2, type = 0, id = 1394, count = 1 },
+			{ rate = 2, type = 0, id = 1384, count = 1 },
+			{ rate = 2, type = 0, id = 1385, count = 1 },
+			{ rate = 2, type = 0, id = 1386, count = 1 },
+			{ rate = 2, type = 0, id = 1387, count = 1 },
+
+			{ rate = 2, type = 0, id = 1297, count = 1 },
+			{ rate = 2, type = 0, id = 1129, count = 1 },
+			{ rate = 6, type = 0, id = 380, count = 500 },
+			{ rate = 10, type = 0, id = 1147, count = 3 },
+			{ rate = 30, type = 0, id = 1383, count = 1 },
+			{ rate = 40, type = 0, id = 1382, count = 1 },
+		},
+		weeklimit = {},
+	},
 }

LogicServer/data/config/item/StdItems.config

@@ -27432,7 +27432,7 @@ StdItems = {
 		desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
 		dropBroadcast = 1,
 		dropEffect = 3,
-		dup = 9999,
+		dup = 99999,
 		existScenes = { -1 },
 		icon = 13131,
 		id = 829,
@@ -27463,7 +27463,7 @@ StdItems = {
 		desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
 		dropBroadcast = -1,
 		dropEffect = 14,
-		dup = 9999,
+		dup = 99999,
 		existScenes = { -1 },
 		icon = 13131,
 		id = 830,
@@ -27494,7 +27494,7 @@ StdItems = {
 		desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
 		dropBroadcast = -1,
 		dropEffect = 11,
-		dup = 9999,
+		dup = 99999,
 		existScenes = { -1 },
 		icon = 13131,
 		id = 831,
@@ -27525,7 +27525,7 @@ StdItems = {
 		desc = "可在【合成-换真充-银两兑换】中兑换银两。游戏内BOSS、夺宝有几率爆出，参加各类玩法活动均有机会获得",
 		dropBroadcast = -1,
 		dropEffect = 12,
-		dup = 9999,
+		dup = 99999,
 		existScenes = { -1 },
 		icon = 13131,
 		id = 832,
@@ -34717,7 +34717,7 @@ StdItems = {
 		desc = "该道具不可交易，开服第8天可以开启。使用后立即返还5元宝、并随机抽取一件永久时装！包含红玫瑰、紫玫瑰、黄金裁决、黄金屠龙、黄金嗜魂、黄金羽扇",
 		dropBroadcast = 0,
 		dropGroupid = 151016,
-		dup = 0,
+		dup = 9999,
 		existScenes = { -1 },
 		fashionTips = "bx_show_001",
 		icon = 13532,
@@ -38701,7 +38701,7 @@ StdItems = {
 		desc = "银针[四方]，四大内功装备之一，可以激活内功宝石【银花簪】的共鸣效果",
 		dropBroadcast = -1,
 		dropEffect = 11,
-		dup = 0,
+		dup = 999,
 		existScenes = { -1 },
 		icon = 13611,
 		id = 1170,
@@ -38926,7 +38926,7 @@ StdItems = {
 		desc = "心决[四方]，四大内功装备之一，可以激活内功宝石【养心玉】的共鸣效果",
 		dropBroadcast = -1,
 		dropEffect = 11,
-		dup = 0,
+		dup = 999,
 		existScenes = { -1 },
 		icon = 13606,
 		id = 1175,
@@ -39149,7 +39149,7 @@ StdItems = {
 		desc = "金印[四方]，四大内功装备之一，可以激活内功宝石【金曜珠】的共鸣效果",
 		dropBroadcast = -1,
 		dropEffect = 11,
-		dup = 0,
+		dup = 999,
 		existScenes = { -1 },
 		icon = 13601,
 		id = 1180,
@@ -39372,7 +39372,7 @@ StdItems = {
 		desc = "檀珠[四方]，四大内功装备之一，可以激活内功宝石【黑檀石】的共鸣效果",
 		dropBroadcast = -1,
 		dropEffect = 11,
-		dup = 0,
+		dup = 999,
 		existScenes = { -1 },
 		icon = 13596,
 		id = 1185,
@@ -46540,4 +46540,36 @@ StdItems = {
 		trade = 3,
 		type = 131,
 	},
+	[1395] = {
+		cdTime = 0,
+		colGroup = 0,
+		conds = {},
+		dealPrice = 10,
+		dealType = 0,
+		denyDeal = 1,
+		denyDestroy = 1,
+		denySell = 1,
+		desc = "打开后随机获得三阶魔器中的任意一件，获得随机奖励",
+		dropBroadcast = 0,
+		dropGroupid = 100882,
+		dup = 9999,
+		existScenes = { -1 },
+		icon = 13509,
+		id = 1395,
+		isShowUseBtn = 1,
+		iseffect = 127,
+		itemlvl = 3,
+		name = "天赐机缘盒",
+		packageType = 2,
+		recordLog = 1,
+		recoverid = 0,
+		shape = 0,
+		showQuality = 5,
+		staitcAttrs = {},
+		suggVocation = 0,
+		suitId = 0,
+		time = 0,
+		trade = 3,
+		type = 131,
+	},
 }

LogicServer/data/functions/ActorSystems/Common/Cdkey.lua

@@ -243,7 +243,6 @@ end
 
 --使用通码
 function UseCommonCDKey(pActor, code)
-    print("[DEBUG] UseCommonCDKey, code="..code)
 
     local data = getActorData(pActor)
     local time = System.getCurrMiniTime()
@@ -252,6 +251,12 @@ function UseCommonCDKey(pActor, code)
         return
     end
 
+    -- 2025-4-15 12转130级才能领取
+    if Actor.checkCommonLimit(pActor,130,12,0,0) == false and code == "tiancijiyuan"  then
+        Actor.sendTipmsg(pActor,"请不要使用小号注册进行刷去奖励！")
+        return
+    end
+
     if CommonCDKeyConf[code].switch == 0 then
         local npack = DataPack.allocPacket(pActor, enMiscSystemID, sUseCdkey)
         if npack then

LogicServer/data/language/Zh-CN/TipMsg.config

@@ -1989,23 +1989,28 @@ TipMsg={
 },
 [497] = {
 	id = 497,
-	tipmsg = "%s赞助白卡会员，|C:0xfc21ed&T:智能回收|轻松挂机续航，交易功能直接开启|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
+	tipmsg = "",
+	-- tipmsg = "%s赞助白卡会员，|C:0xfc21ed&T:智能回收|轻松挂机续航，交易功能直接开启|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
 },
 [498] = {
 	id = 498,
-	tipmsg = "%s赞助绿卡会员，|C:0xfc21ed&T:麻痹戒指|三职业通用麻天麻地，打怪回收|C:0xfc21ed&T:金币+18%|，攻速大增|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
+	tipmsg = "",
+	-- tipmsg = "%s赞助绿卡会员，|C:0xfc21ed&T:麻痹戒指|三职业通用麻天麻地，打怪回收|C:0xfc21ed&T:金币+18%|，攻速大增|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
 },
 [499] = {
 	id = 499,
-	tipmsg = "%s赞助蓝卡会员，打怪回收|C:0xfc21ed&T:金币+36%|，打怪|C:0xfc21ed&T:经验+20%|，|C:0xfc21ed&T:切割+20%|打怪砍瓜切菜|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
+	tipmsg = "",
+	-- tipmsg = "%s赞助蓝卡会员，打怪回收|C:0xfc21ed&T:金币+36%|，打怪|C:0xfc21ed&T:经验+20%|，|C:0xfc21ed&T:切割+20%|打怪砍瓜切菜|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
 },
 [500] = {
 	id = 500,
-	tipmsg = "%s赞助紫卡会员，体力永久|C:0xfc21ed&T:+1000|，幸运永久额外|C:0xfc21ed&T:+7|，打怪|C:0xfc21ed&T:经验+40%||E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
+	tipmsg = "",
+	-- tipmsg = "%s赞助紫卡会员，体力永久|C:0xfc21ed&T:+1000|，幸运永久额外|C:0xfc21ed&T:+7|，打怪|C:0xfc21ed&T:经验+40%||E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
 },
 [501] = {
 	id = 501,
-	tipmsg = "%s赞助橙卡会员，|C:0xfc21ed&T:超麻神戒|天地唯我，|C:0xfc21ed&T:暴击倍率+50%|不暴则已一暴惊人|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
+	tipmsg = "",
+	-- tipmsg = "%s赞助橙卡会员，|C:0xfc21ed&T:超麻神戒|天地唯我，|C:0xfc21ed&T:暴击倍率+50%|不暴则已一暴惊人|E:-2,19,&U:&C:0x28ee01&T:[我也要特权]|",
 },
 [502] = {
 	id = 502,

buildConfig/AMServerLinux.txt

@@ -0,0 +1,29 @@
+amconfig=
+{
+	httpport =11001,  							--绑定的http回调的端口
+	amport =5660,  								--连接地址
+	platform =
+	{
+		{
+			spid="wyi2",
+			codeid=1,  							--产品的编号
+			code="djrm",  						--产品的code
+			db="mir_amdb",					--数据库名
+			host="192.168.25.110",					--数据库主机
+			port=3307,							--数据库端口
+			user="root",					--数据库账号
+			pass="mysql_Adkijc",						--数据库密码
+			paykey="GAmqXI8ao8kGAOIQmjFVqg==",	--
+			awdkey="GAmqXI8ao8kGAOIQmjFVqg==",	--
+			bianma="utf8",						--
+
+			--允许的ip列表，最多32个
+			hosts=
+			{
+				"116.22.44.53",
+				"127.0.0.1",
+				"116.233.207.20"
+			}
+		},
+	}
+}

buildConfig/BackStageServerLinux.txt

@@ -0,0 +1,24 @@
+BackServer = 
+{
+	spguid = 1,		--默认的spid
+
+	--监听：服务器参数配置
+	Server = 
+	{ 
+		ServiceName="BackStageServer",
+		BindAddress = "0.0.0.0", 
+		Port = 8500 ,
+		HttpPort = 111,
+	},
+
+	--数据库连接相关
+	SQL = 
+	{ 
+		Host = "192.168.25.110",
+		Port = 3307, 
+		DBName = "mir_command", 
+		DBUser = "root", 
+		DBPass = "mysql_Adkijc",
+		utf8=1,
+	},
+}

buildConfig/LoggerServerLinux.txt

@@ -0,0 +1,29 @@
+LoggerServer = 
+{
+	--监听：服务器参数配置
+	Server = 
+	{ 
+		BindAddress = "0.0.0.0", 
+		Port = 34000 ,
+		ServiceName="LoggerServer",
+	},
+	
+	--监听：发送聊天消息给工具
+	ChatLog = 
+	{ 
+		ServiceName="LogServer",
+		BindAddress = "0.0.0.0", 
+		Port = 35010,
+	},
+
+	--数据库连接相关
+	SQL = 
+	{
+		Host = "192.168.25.110", 	
+		Port = 3307, 
+		DBName = "mir_log_s1", 
+		DBUser = "root", 
+		DBPass = "mysql_Adkijc",
+		utf8=1,
+	},
+}

buildConfig/NameServerLinux.txt

@@ -0,0 +1,24 @@
+NameServer =
+{
+	--服务器名称
+	ServerName = "zgame-nameserver",
+    spguid=1,
+        
+	--监听：名称服务绑定地址和端口
+	NameService = 
+	{ 
+		Address = "0.0.0.0", 
+		Port = 35000 
+	},
+
+	--数据库连接配置
+	SQL = 
+	{ 
+		--Host = "192.168.0.173", 	
+		Host = "192.168.25.110", 
+		Port = 3307, 
+		DBName = "mir_name", 
+		DBUser = "root", 
+		DBPass = "mysql_Adkijc" 
+	}
+}

buildConfig/SessionServerLinux.txt

@@ -0,0 +1,51 @@
+SessionServer =
+{
+	--服务器名称
+	ServerName = "会话服(sid=1)",
+	--SPID（运营商ID）定义
+	SPID = "wyi2",
+	spguid = 1,
+	fcmOpen=false,
+	checksign=0,
+    autoaccount = 1,
+	autocard = 1,
+ 	phptime = 1200,
+
+	--监听：会话服务器
+	SessionService = 
+	{ 
+		Address = "0.0.0.0", 
+		Port = 31000
+	},
+
+	--监听：网关服务器（无用）
+	GateService = 
+	{ 
+		Address = "0.0.0.0", 
+		Port = 21001
+	},
+
+	--连接：Log服务器
+	LogServer = 
+	{
+		Host = "127.0.0.1", 
+		Port = 34000
+	},
+	
+	--连接：AM服务器
+	AMServer =
+	{
+		Host = "127.0.0.1", 
+		Port = 5660
+	},
+
+	--数据库连接配置
+	SQL = 
+	{ 
+		Host = "192.168.25.110", 	
+		Port = 3307, 
+		DBName = "mir_account",
+		DBUser = "root",
+		DBPass = "mysql_Adkijc",
+	}
+}

docker-compose.yml

@@ -1,45 +1,72 @@
 version: '3.8'
 
 services:
-  db:
+  base:
-    image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest
+    image: chuanqi-server-base:latest
-    container_name: chuanqi-server-db
+    networks:
+      network:
+        ipv4_address: 172.36.10.25 
     stdin_open: true
+    # ports:
+      # - 10319:10319
+      # - 35010:35010
+      # - 31000:31000
+      # - 34000:34000
+      # - 5660:5660
+      # - 8500:8500
     volumes:
       - ./DBServer:/data/server/s1/DBServer
       - ./wch:/etc/yum/wch
+      - ./buildConfig/AMServerLinux.txt:/data/server/build/AMServer/AMServerLinux.txt
+      - ./buildConfig/BackStageServerLinux.txt:/data/server/build/BackStageServer/BackStageServerLinux.txt
+      - ./buildConfig/LoggerServerLinux.txt:/data/server/build/LoggerServer/LoggerServerLinux.txt
+      - ./buildConfig/NameServerLinux.txt:/data/server/build/NameServer/NameServerLinux.txt
+      - ./buildConfig/SessionServerLinux.txt:/data/server/build/SessionServer/SessionServerLinux.txt
     entrypoint: "/data/server/s1/DBServer/start.sh"
-    network_mode: "host"
     restart: unless-stopped
     environment:
       TZ: Asia/Shanghai
 
   logic:
     image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest
-    container_name: chuanqi-server-logic
+    networks:
+      - network
+    ports:
+      - 10318:10318
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
     depends_on:
-      - db  # 等待db服务启动
+      - base  
     stdin_open: true
     volumes:
       - ./LogicServer:/data/server/s1/LogicServer
       - ./wch:/etc/yum/wch
     entrypoint: "/data/server/s1/LogicServer/start.sh"
-    network_mode: "host"
     restart: unless-stopped
     environment:
       TZ: Asia/Shanghai
 
   gate:
     image: registry.cn-hangzhou.aliyuncs.com/kubbo/chuanqi-os:latest
-    container_name: chuanqi-server-gate
+    networks:
+      - network
+    ports:
+      - 10317:10317
     depends_on:
-      - logic  # 等待logic服务启动
+      - logic 
     stdin_open: true
     volumes:
       - ./Gateway:/data/server/s1/Gateway
       - ./wch:/etc/yum/wch
     entrypoint: "/data/server/s1/Gateway/start.sh"
-    network_mode: "host"
     restart: unless-stopped
     environment:
-      TZ: Asia/Shanghai
+      TZ: Asia/Shanghai
+networks:
+  network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.36.10.0/24