Compare commits
2 Commits
7e366960c2
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f6781ca4b | |||
|
|
fe82801742 |
@@ -40,10 +40,10 @@ DBServer = {
|
||||
|
||||
--数据库连接配置
|
||||
SQL = {
|
||||
Host = "127.0.0.1",
|
||||
Port = 3306,
|
||||
Host = "192.168.25.110",
|
||||
Port = 3308,
|
||||
DBName = "mir_actor_s1",
|
||||
DBUser = "root",
|
||||
DBPass = "mysql_y8NXNT",
|
||||
DBPass = "mysql_Adkijc",
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ GateServer = {
|
||||
},
|
||||
--后台服务器的地址和端口
|
||||
BackServer = {
|
||||
Host = "127.0.0.1",
|
||||
Host = "logic",
|
||||
Port = 10318,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -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
|
||||
@@ -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,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -3,10 +3,10 @@ CrossSourceServerConfig={
|
||||
[1] = {
|
||||
kfid = 1,
|
||||
openday = {1,-1},
|
||||
GateAddr = "127.0.0.1",
|
||||
GateAddr = "100.88.157.105",
|
||||
GatePort = 10001,
|
||||
CrossIP = "127.0.0.1",
|
||||
CrossPort = 10002,
|
||||
map = {id=1,range={53,36,3,3,}},
|
||||
map = {id=150,range={53,36,3,3,}},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,163 +1,102 @@
|
||||
MonthCardConfig = {
|
||||
[1] = {
|
||||
idx = 1,
|
||||
name = "免费特权",
|
||||
dailyAward = {},
|
||||
buyAward = { { id = 474, type = 0, count = 1 } },
|
||||
consume = { id = 2, type = 2, count = 10000 },
|
||||
},
|
||||
[2] = {
|
||||
idx = 2,
|
||||
name = "月卡",
|
||||
dailyAward = { { id = 302, type = 0, count = 1 }, { id = 269, type = 0, count = 1 }, { id = 261, type = 0, count = 5 } },
|
||||
buyAward = { { id = 249, type = 0, count = 1 }, { id = 302, type = 0, count = 8 } },
|
||||
consume = { id = 4, type = 4, count = 280 },
|
||||
},
|
||||
[3] = {
|
||||
idx = 3,
|
||||
name = "大药月卡",
|
||||
dailyAward = { { id = 311, type = 0, count = 1 } },
|
||||
buyAward = { { id = 3, type = 3, count = 66 }, { id = 11, type = 11, count = 5 } },
|
||||
consume = { id = 4, type = 4, count = 1000 },
|
||||
},
|
||||
[4] = {
|
||||
idx = 4,
|
||||
name = "永久卡",
|
||||
dailyAward = { { id = 7, type = 7, count = 10 }, { id = 2, type = 2, count = 200000 } },
|
||||
buyAward = { { id = 462, type = 0, count = 1 }, { id = 468, type = 0, count = 1 } },
|
||||
consume = { id = 4, type = 4, count = 1580 },
|
||||
},
|
||||
[5] = {
|
||||
idx = 5,
|
||||
dailyAward = {},
|
||||
Ybprice = 2,
|
||||
superRightLV = 1,
|
||||
name = "白卡",
|
||||
ViewType = 2,
|
||||
buyAward = {
|
||||
{ id = 474, type = 0, count = 1 },
|
||||
{ id = 261, type = 0, count = 50 },
|
||||
{ id = 926, type = 0, count = 1 },
|
||||
{ id = 3, type = 3, count = 18 },
|
||||
{ id = 1058, type = 0, count = 1 },
|
||||
{ id = 300, type = 0, count = 2 },
|
||||
},
|
||||
pictures = { "tq_p_1_1", "tq_p_1_2", "tq_p_1_3" },
|
||||
consume = { id = 1242, type = 0, count = 2 },
|
||||
},
|
||||
[6] = {
|
||||
idx = 6,
|
||||
dailyAward = {},
|
||||
Ybprice = 10,
|
||||
superRightLV = 2,
|
||||
name = "绿卡",
|
||||
ViewType = 2,
|
||||
buyAward = {
|
||||
{ id = 475, type = 0, count = 1 },
|
||||
{ id = 823, type = 0, count = 1 },
|
||||
{ id = 261, type = 0, count = 100 },
|
||||
{ id = 367, type = 0, count = 1 },
|
||||
{ id = 249, type = 0, count = 2 },
|
||||
{ id = 927, type = 0, count = 1 },
|
||||
},
|
||||
pictures = { "tq_p_2_2", "tq_p_2_1", "tq_p_2_3" },
|
||||
consume = { id = 1242, type = 0, count = 6 },
|
||||
},
|
||||
[7] = {
|
||||
idx = 7,
|
||||
dailyAward = {},
|
||||
Ybprice = 20,
|
||||
superRightLV = 3,
|
||||
name = "蓝卡",
|
||||
ViewType = 2,
|
||||
buyAward = {
|
||||
{ id = 468, type = 0, count = 1 },
|
||||
{ id = 507, type = 0, count = 1 },
|
||||
{ id = 853, type = 0, count = 113 },
|
||||
{ id = 854, type = 0, count = 113 },
|
||||
{ id = 249, type = 0, count = 2 },
|
||||
{ id = 928, type = 0, count = 1 },
|
||||
},
|
||||
pictures = { "tq_p_4_3", "tq_p_3_1", "tq_p_3_3" },
|
||||
consume = { id = 1242, type = 0, count = 16 },
|
||||
},
|
||||
[8] = {
|
||||
idx = 8,
|
||||
dailyAward = {},
|
||||
Ybprice = 70,
|
||||
superRightLV = 4,
|
||||
name = "紫卡",
|
||||
ViewType = 2,
|
||||
buyAward = {
|
||||
{ id = 929, type = 0, count = 1 },
|
||||
{ id = 976, type = 0, count = 1 },
|
||||
{ id = 852, type = 0, count = 30 },
|
||||
{ id = 250, type = 0, count = 2 },
|
||||
{ id = 853, type = 0, count = 450 },
|
||||
{ id = 854, type = 0, count = 450 },
|
||||
},
|
||||
pictures = { "tq_p_4_2", "tq_p_4_1", "tq_p_3_2" },
|
||||
consume = { id = 1242, type = 0, count = 40 },
|
||||
},
|
||||
[9] = {
|
||||
idx = 9,
|
||||
dailyAward = {},
|
||||
Ybprice = 220,
|
||||
superRightLV = 5,
|
||||
name = "橙卡",
|
||||
ViewType = 2,
|
||||
heraldid = "tq_btnt14_2",
|
||||
buyAward = {
|
||||
{ id = 930, type = 0, count = 1 },
|
||||
{ id = 824, type = 0, count = 1 },
|
||||
{ id = 953, type = 0, count = 14 },
|
||||
{ id = 977, type = 0, count = 1 },
|
||||
{ id = 300, type = 0, count = 50 },
|
||||
{ id = 250, type = 0, count = 10 },
|
||||
},
|
||||
pictures = { "tq_p_5_2", "tq_p_5_1", "tq_p_5_3" },
|
||||
consume = { id = 1242, type = 0, count = 100 },
|
||||
},
|
||||
[10] = { idx = 10, name = "首充卡", superRightLV = -1 },
|
||||
[11] = { idx = 11, name = "白卡" },
|
||||
[12] = {
|
||||
idx = 12,
|
||||
dailyAward = {},
|
||||
Ybprice = 250,
|
||||
superRightLV = 6,
|
||||
displaylimit = { openDay = 1, vip = 0, zsLevel = 11 },
|
||||
name = "橙星",
|
||||
ViewType = 2,
|
||||
heraldid = "tq_btnt14_4",
|
||||
buyAward = {
|
||||
{ id = 1073, type = 0, count = 1 },
|
||||
{ id = 1146, type = 0, count = 1 },
|
||||
{ id = 1066, type = 0, count = 300 },
|
||||
{ id = 1115, type = 0, count = 1 },
|
||||
{ id = 970, type = 0, count = 666 },
|
||||
{ id = 300, type = 0, count = 100 },
|
||||
},
|
||||
pictures = { "tq_p_6_2", "tq_p_6_1", "tq_p_6_3" },
|
||||
consume = { id = 1242, type = 0, count = 250 },
|
||||
},
|
||||
[13] = {
|
||||
idx = 13,
|
||||
dailyAward = {},
|
||||
Ybprice = 350,
|
||||
superRightLV = 7,
|
||||
displaylimit = { openDay = 1, vip = 0, zsLevel = 12 },
|
||||
name = "橙月",
|
||||
ViewType = 2,
|
||||
heraldid = "tq_btnt14_3",
|
||||
buyAward = {
|
||||
{ id = 1273, type = 0, count = 1 },
|
||||
{ id = 1272, type = 0, count = 1 },
|
||||
{ id = 1241, type = 0, count = 1 },
|
||||
{ id = 265, type = 0, count = 1888 },
|
||||
{ id = 970, type = 0, count = 666 },
|
||||
{ id = 852, type = 0, count = 158 },
|
||||
},
|
||||
pictures = { "tq_p_7_2", "tq_p_7_1", "tq_p_7_3" },
|
||||
consume = { id = 1242, type = 0, count = 350 },
|
||||
},
|
||||
}
|
||||
--AB-特权.xlsx 特权
|
||||
MonthCardConfig={
|
||||
[1] = {
|
||||
idx = 1,
|
||||
name = "免费特权",
|
||||
consume = {type=2,id=2,count=10000},
|
||||
buyAward = {{type=0,id=474,count=1}},
|
||||
dailyAward = {},
|
||||
},
|
||||
[2] = {
|
||||
idx = 2,
|
||||
name = "月卡",
|
||||
consume = {type=4,id=4,count=280},
|
||||
buyAward = {{type=0,id=249,count=1},{type=0,id=302,count=8}},
|
||||
dailyAward = {{type=0,id=302,count=1},{type=0,id=269,count=1},{type=0,id=261,count=5}},
|
||||
},
|
||||
[3] = {
|
||||
idx = 3,
|
||||
name = "大药月卡",
|
||||
consume = {type=4,id=4,count=1000},
|
||||
buyAward = {{type=3,id=3,count=66},{type=11,id=11,count=5}},
|
||||
dailyAward = {{type=0,id=311,count=1}},
|
||||
},
|
||||
[4] = {
|
||||
idx = 4,
|
||||
name = "永久卡",
|
||||
consume = {type=4,id=4,count=1580},
|
||||
buyAward = {{type=0,id=462,count=1},{type=0,id=468,count=1}},
|
||||
dailyAward = {{type=7,id=7,count=10},{type=2,id=2,count=200000}},
|
||||
},
|
||||
[5] = {
|
||||
idx = 5,
|
||||
name = "白卡",
|
||||
superRightLV = 1,
|
||||
consume = {type=0,id=1242,count=2},
|
||||
buyAward = {{type=0,id=474,count=1},{type=0,id=261,count=50},{type=0,id=926,count=1},{type=3,id=3,count=18},{type=0,id=1058,count=1},{type=0,id=300,count=2}},
|
||||
dailyAward = {},
|
||||
},
|
||||
[6] = {
|
||||
idx = 6,
|
||||
name = "绿卡",
|
||||
superRightLV = 2,
|
||||
consume = {type=0,id=1242,count=10},
|
||||
buyAward = {{type=0,id=475,count=1},{type=0,id=823,count=1},{type=0,id=261,count=100},{type=0,id=367,count=1},{type=0,id=249,count=2},{type=0,id=927,count=1}},
|
||||
dailyAward = {},
|
||||
},
|
||||
[7] = {
|
||||
idx = 7,
|
||||
name = "蓝卡",
|
||||
superRightLV = 3,
|
||||
consume = {type=0,id=1242,count=20},
|
||||
buyAward = {{type=0,id=468,count=1},{type=0,id=507,count=1},{type=0,id=853,count=113},{type=0,id=854,count=113},{type=0,id=249,count=2},{type=0,id=928,count=1}},
|
||||
dailyAward = {},
|
||||
JiShouCount = 1,
|
||||
},
|
||||
[8] = {
|
||||
idx = 8,
|
||||
name = "紫卡",
|
||||
superRightLV = 4,
|
||||
consume = {type=0,id=1242,count=70},
|
||||
buyAward = {{type=0,id=929,count=1},{type=0,id=976,count=1},{type=0,id=852,count=30},{type=0,id=250,count=2},{type=0,id=853,count=450},{type=0,id=854,count=450}},
|
||||
dailyAward = {},
|
||||
JiShouCount = 2,
|
||||
},
|
||||
[9] = {
|
||||
idx = 9,
|
||||
name = "橙卡",
|
||||
superRightLV = 5,
|
||||
consume = {type=0,id=1242,count=220},
|
||||
buyAward = {{type=0,id=930,count=1},{type=0,id=824,count=1},{type=0,id=953,count=14},{type=0,id=977,count=1},{type=0,id=300,count=50},{type=0,id=250,count=10},},
|
||||
dailyAward = {},
|
||||
JiShouCount = 3,
|
||||
},
|
||||
[10] = {
|
||||
idx = 10,
|
||||
name = "首充卡",
|
||||
superRightLV = -1,
|
||||
AtvPaoDianPlus = 20,
|
||||
},
|
||||
[11] = {
|
||||
idx = 11,
|
||||
name = "白卡",
|
||||
},
|
||||
[12] = {
|
||||
idx = 12,
|
||||
name = "橙星",
|
||||
superRightLV = 6,
|
||||
consume = {type=0,id=1242,count=250},
|
||||
buyAward = {{type=0,id=1073,count=1},{type=0,id=1146,count=1},{type=0,id=1066,count=300},{type=0,id=1115,count=1},{type=0,id=970,count=666},{type=0,id=300,count=100},},
|
||||
dailyAward = {},
|
||||
JiShouCount = 3,
|
||||
},
|
||||
[13] = {
|
||||
idx = 13,
|
||||
name = "橙月",
|
||||
superRightLV = 7,
|
||||
consume = {type=0,id=1242,count=350},
|
||||
buyAward = {{type=0,id=1273,count=1},{type=0,id=1272,count=1},{type=0,id=1241,count=1},{type=0,id=265,count=1888},{type=0,id=970,count=666},{type=0,id=852,count=158},},
|
||||
dailyAward = {},
|
||||
JiShouCount = 3,
|
||||
},
|
||||
}
|
||||
@@ -6,7 +6,7 @@ ShopConfig = {
|
||||
shopid = 1,
|
||||
shoptype = 1,
|
||||
Tabshop = 1,
|
||||
shop = { id = 4, type = 4, count = 5 },
|
||||
shop = { id = 4, type = 4, count = 100 },
|
||||
buytype = {},
|
||||
daylimit = 0,
|
||||
levellimit = 1,
|
||||
@@ -110,7 +110,7 @@ ShopConfig = {
|
||||
buytype = {},
|
||||
daylimit = 0,
|
||||
levellimit = 1,
|
||||
price = { id = 4, type = 4, count = 500 },
|
||||
price = { id = 4, type = 4, count = 88 },
|
||||
},
|
||||
[94] = {
|
||||
reincarnationlimit = 0,
|
||||
@@ -122,7 +122,7 @@ ShopConfig = {
|
||||
buytype = { { limit = { { value = 0, times = 1 } }, type = 3 } },
|
||||
daylimit = 0,
|
||||
levellimit = 1,
|
||||
price = { id = 3, type = 3, count = 88888 },
|
||||
price = { id = 3, type = 3, count = 188 },
|
||||
},
|
||||
},
|
||||
[2] = {
|
||||
|
||||
6
buildConfig/AMServerLinux.txt
Normal file → Executable file
6
buildConfig/AMServerLinux.txt
Normal file → Executable file
@@ -9,10 +9,10 @@ amconfig=
|
||||
codeid=1, --产品的编号
|
||||
code="djrm", --产品的code
|
||||
db="mir_amdb", --数据库名
|
||||
host="127.0.0.1", --数据库主机
|
||||
port=3306, --数据库端口
|
||||
host="192.168.25.110", --数据库主机
|
||||
port=3307, --数据库端口
|
||||
user="root", --数据库账号
|
||||
pass="mysql_y8NXNT", --数据库密码
|
||||
pass="mysql_Adkijc", --数据库密码
|
||||
paykey="GAmqXI8ao8kGAOIQmjFVqg==", --
|
||||
awdkey="GAmqXI8ao8kGAOIQmjFVqg==", --
|
||||
bianma="utf8", --
|
||||
|
||||
6
buildConfig/BackStageServerLinux.txt
Normal file → Executable file
6
buildConfig/BackStageServerLinux.txt
Normal file → Executable file
@@ -14,11 +14,11 @@ BackServer =
|
||||
--数据库连接相关
|
||||
SQL =
|
||||
{
|
||||
Host = "127.0.0.1",
|
||||
Port = 3306,
|
||||
Host = "192.168.25.110",
|
||||
Port = 3307,
|
||||
DBName = "mir_command",
|
||||
DBUser = "root",
|
||||
DBPass = "mysql_y8NXNT",
|
||||
DBPass = "mysql_Adkijc",
|
||||
utf8=1,
|
||||
},
|
||||
}
|
||||
6
buildConfig/LoggerServerLinux.txt
Normal file → Executable file
6
buildConfig/LoggerServerLinux.txt
Normal file → Executable file
@@ -19,11 +19,11 @@ LoggerServer =
|
||||
--数据库连接相关
|
||||
SQL =
|
||||
{
|
||||
Host = "127.0.0.1",
|
||||
Port = 3306,
|
||||
Host = "192.168.25.110",
|
||||
Port = 3307,
|
||||
DBName = "mir_log_s1",
|
||||
DBUser = "root",
|
||||
DBPass = "mysql_y8NXNT",
|
||||
DBPass = "mysql_Adkijc",
|
||||
utf8=1,
|
||||
},
|
||||
}
|
||||
6
buildConfig/NameServerLinux.txt
Normal file → Executable file
6
buildConfig/NameServerLinux.txt
Normal file → Executable file
@@ -15,10 +15,10 @@ NameServer =
|
||||
SQL =
|
||||
{
|
||||
--Host = "192.168.0.173",
|
||||
Host = "127.0.0.1",
|
||||
Port = 3306,
|
||||
Host = "192.168.25.110",
|
||||
Port = 3307,
|
||||
DBName = "mir_name",
|
||||
DBUser = "root",
|
||||
DBPass = "mysql_y8NXNT"
|
||||
DBPass = "mysql_Adkijc"
|
||||
}
|
||||
}
|
||||
|
||||
6
buildConfig/SessionServerLinux.txt
Normal file → Executable file
6
buildConfig/SessionServerLinux.txt
Normal file → Executable file
@@ -42,10 +42,10 @@ SessionServer =
|
||||
--数据库连接配置
|
||||
SQL =
|
||||
{
|
||||
Host = "127.0.0.1",
|
||||
Port = 3306,
|
||||
Host = "192.168.25.110",
|
||||
Port = 3307,
|
||||
DBName = "mir_account",
|
||||
DBUser = "root",
|
||||
DBPass = "mysql_y8NXNT",
|
||||
DBPass = "mysql_Adkijc",
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,19 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
db:
|
||||
base:
|
||||
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
|
||||
@@ -14,37 +23,50 @@ services:
|
||||
- ./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
|
||||
Reference in New Issue
Block a user