2025/07/07
This commit is contained in:
parent
1027b63cb5
commit
275fa7dc2b
98
server/.idea/workspace.xml
generated
98
server/.idea/workspace.xml
generated
@ -9,13 +9,23 @@
|
||||
<change beforePath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0.tmp" beforeDir="false" afterPath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0.tmp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0000000000000000-0000000000000000.wal" beforeDir="false" afterPath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0000000000000000-0000000000000000.wal" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/fruit_room.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/fruit_room.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/game/model/role_battle.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/game/model/role_battle.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/game/msg/fruit_msg.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/game/msg/fruit_msg.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/login.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/login.pb.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/login.proto" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/login.proto" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/user.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/user.pb.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/user.proto" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/user.proto" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/baseserver/hook_event.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/baseserver/hook_event.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/buildlinux.bat" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/buildlinux.bat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/config_csv.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/config_csv.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/auth" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/auth" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/battleboss" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/battleboss" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/battlerecord" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/battlerecord" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/aoi_config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/aoi_config.yaml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/db" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/db" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/game" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/game" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/gate" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/gate" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/gmweb" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/gmweb" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/guild" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/guild" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/rank" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/rank" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/serverlist" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/serverlist" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/social" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/social" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run_config/serverlist - 副本.yaml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/start_all.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/start_all.sh" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -52,44 +62,44 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"DefaultGoTemplateProperty": "Go File",
|
||||
"Go Build.auth.executor": "Run",
|
||||
"Go Build.battleboss.executor": "Run",
|
||||
"Go Build.battlerecord.executor": "Run",
|
||||
"Go Build.db.executor": "Run",
|
||||
"Go Build.fruit.executor": "Run",
|
||||
"Go Build.game.executor": "Debug",
|
||||
"Go Build.game1.executor": "Debug",
|
||||
"Go Build.game2.executor": "Debug",
|
||||
"Go Build.gate.executor": "Debug",
|
||||
"Go Build.gate1.executor": "Run",
|
||||
"Go Build.gate2.executor": "Debug",
|
||||
"Go Build.gmweb.executor": "Run",
|
||||
"Go Build.guild.executor": "Run",
|
||||
"Go Build.rank.executor": "Run",
|
||||
"Go Build.serverlist.executor": "Run",
|
||||
"Go Build.social.executor": "Run",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.go.formatter.settings.were.checked": "true",
|
||||
"RunOnceActivity.go.migrated.go.modules.settings": "true",
|
||||
"RunOnceActivity.go.modules.automatic.dependencies.download": "true",
|
||||
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"go.import.settings.migrated": "true",
|
||||
"go.sdk.automatically.set": "true",
|
||||
"last_opened_file_path": "C:/Users/letme/Desktop/Work/LeGang/ro-webgl-server/server/roserver/fruit",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"run.configurations.included.in.services": "true",
|
||||
"service.view.auto.scroll.from.source": "true",
|
||||
"settings.editor.selected.configurable": "go.sdk"
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"DefaultGoTemplateProperty": "Go File",
|
||||
"Go Build.auth.executor": "Run",
|
||||
"Go Build.battleboss.executor": "Run",
|
||||
"Go Build.battlerecord.executor": "Run",
|
||||
"Go Build.db.executor": "Run",
|
||||
"Go Build.fruit.executor": "Run",
|
||||
"Go Build.game.executor": "Debug",
|
||||
"Go Build.game1.executor": "Run",
|
||||
"Go Build.game2.executor": "Debug",
|
||||
"Go Build.gate.executor": "Debug",
|
||||
"Go Build.gate1.executor": "Run",
|
||||
"Go Build.gate2.executor": "Debug",
|
||||
"Go Build.gmweb.executor": "Run",
|
||||
"Go Build.guild.executor": "Run",
|
||||
"Go Build.rank.executor": "Run",
|
||||
"Go Build.serverlist.executor": "Run",
|
||||
"Go Build.social.executor": "Run",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.go.formatter.settings.were.checked": "true",
|
||||
"RunOnceActivity.go.migrated.go.modules.settings": "true",
|
||||
"RunOnceActivity.go.modules.automatic.dependencies.download": "true",
|
||||
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"go.import.settings.migrated": "true",
|
||||
"go.sdk.automatically.set": "true",
|
||||
"last_opened_file_path": "C:/Users/letme/Desktop/Work/LeGang/ro-webgl-server/server/roserver/fruit",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"run.configurations.included.in.services": "true",
|
||||
"service.view.auto.scroll.from.source": "true",
|
||||
"settings.editor.selected.configurable": "go.sdk"
|
||||
}
|
||||
}]]></component>
|
||||
}</component>
|
||||
<component name="RunAnythingCache">
|
||||
<option name="myCommands">
|
||||
<command value="msg *serverproto.S" />
|
||||
|
||||
@ -55,7 +55,7 @@ func (this *ServerTCPEventHook) InEvent(in rocommon.ProcEvent) rocommon.ProcEven
|
||||
if in.Session().RecvPingNum() >= 10 { //50s打印一次，收到10次打印一次
|
||||
in.Session().IncRecvPingNum(-1)
|
||||
if ctx.RawContextData("ctx", &sid) {
|
||||
util.InfoF("[RecvServicePing]Receive PingReq from session=%v node=%v", in.Session().ID(), sid.ID)
|
||||
//util.InfoF("[RecvServicePing]Receive PingReq from session=%v node=%v", in.Session().ID(), sid.ID)
|
||||
}
|
||||
}
|
||||
if msg.NeedAck {
|
||||
|
||||
@ -24,6 +24,9 @@ go build -o %linuxpath%/auth ./auth
|
||||
echo "[social] build linux ELF file"
|
||||
go build -o %linuxpath%/social ./social
|
||||
|
||||
echo "[fruit] build linux ELF file"
|
||||
go build -o %linuxpath%/fruit ./fruit
|
||||
|
||||
::echo "[server_aoi] build linux ELF file"
|
||||
::go build -o %linuxpath%/server_aoi ./server_aoi
|
||||
|
||||
|
||||
66
server/roserver/config/csv/MapCfg.csv
Normal file
66
server/roserver/config/csv/MapCfg.csv
Normal file
@ -0,0 +1,66 @@
|
||||
地图id,地图名字,地图描述,美术场景,背景音乐,战斗背景音乐,BOSS战背景音乐
|
||||
Id,Name,Description,LevelName,BgmMusic,BattleMusic,BossBattleMusic
|
||||
int,string,string,string,string,string,string
|
||||
1,普隆德拉南门,普隆德拉南门,Scene_5v5_my,bgm_01,bgm_01,bgm_01
|
||||
2,迷藏森林,迷藏森林,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
3,吉芬地下,吉芬地下,Scene_5v5_my,bgm_13,bgm_13,bgm_13
|
||||
4,兽人村落,兽人村落,Scene_5v5_my,bgm_15,bgm_15,bgm_15
|
||||
5,苏克拉特沙漠,苏克拉特沙漠,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
6,金字塔,金字塔,Scene_5v5_my,bgm_14,bgm_14,bgm_14
|
||||
7,斐扬树林,斐扬树林,Scene_5v5_my,bgm_07,bgm_07,bgm_07
|
||||
8,斐扬迷宫,斐扬迷宫,Scene_5v5_my,bgm_08,bgm_08,bgm_08
|
||||
9,克雷斯特汉姆,克雷斯特汉姆,Scene_5v5_my,bgm_19,bgm_19,bgm_19
|
||||
10,剑石林,剑石林,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
11,瓦姆高地,瓦姆高地,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
12,焦土平原,焦土平原,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
13,虚影峡谷,虚影峡谷,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
14,莱蒂斯丘陵,莱蒂斯丘陵,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
15,地下矿道,地下矿道,Scene_5v5_my,bgm_18,bgm_18,bgm_18
|
||||
16,火焰沼泽,火焰沼泽,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
17,火神洞,火神洞,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
18,沉灰盆地,沉灰盆地,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
19,雷鸣峡湾,雷鸣峡湾,Scene_5v5_my,bgm_20,bgm_20,bgm_20
|
||||
20,薪火营地,薪火营地,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
21,风箱山谷,风箱山谷,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
22,聚金矿洞,聚金矿洞,Scene_5v5_my,bgm_18,bgm_18,bgm_18
|
||||
23,炎息熔炉,炎息熔炉,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
24,凯萨督姆,凯萨督姆,Scene_5v5_my,bgm_19,bgm_19,bgm_19
|
||||
25,孤山,孤山,Scene_5v5_my,bgm_16,bgm_16,bgm_16
|
||||
26,斯露德莫丹,斯露德莫丹,Scene_5v5_my,bgm_16,bgm_16,bgm_16
|
||||
27,格尼塔海德,格尼塔海德,Scene_5v5_my,bgm_01,bgm_01,bgm_01
|
||||
28,汶巴拉,汶巴拉,Scene_5v5_my,bgm_01,bgm_01,bgm_01
|
||||
29,掠影谷,掠影谷,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
30,希恩达尔,希恩达尔,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
31,霜火帷幕,霜火帷幕,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
32,尼伯龙根,尼伯龙根,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
33,迷雾森林,迷雾森林,Scene_5v5_my,bgm_07,bgm_07,bgm_07
|
||||
34,花影巢穴,花影巢穴,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
35,浮光塔,浮光塔,Scene_5v5_my,bgm_13,bgm_13,bgm_13
|
||||
36,不竭之泉,不竭之泉,Scene_5v5_my,bgm_16,bgm_16,bgm_16
|
||||
37,罪骨深渊,罪骨深渊,Scene_5v5_my,bgm_01,bgm_01,bgm_01
|
||||
38,埃琉德尼尔,埃琉德尼尔,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
39,杜阿特,杜阿特,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
40,尖刀河,尖刀河,Scene_5v5_my,bgm_20,bgm_20,bgm_20
|
||||
41,拥光湖,拥光湖,Scene_5v5_my,bgm_20,bgm_20,bgm_20
|
||||
42,回魂灶,回魂灶,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
43,格尼帕,格尼帕,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
44,海拉之门,海拉之门,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
45,绽灵路,绽灵路,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
46,野火之心,野火之心,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
47,重生盆地,重生盆地,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
48,神灵王座,神灵王座,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
49,魔晶矿洞,魔晶矿洞,Scene_5v5_my,bgm_18,bgm_18,bgm_18
|
||||
50,腐化森林,腐化森林,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
51,堕天之痕,堕天之痕,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
52,梦语平原,梦语平原,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
53,加姆高地,加姆高地,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
54,暮光之堤,暮光之堤,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
55,魔咒边镇,魔咒边镇,Scene_5v5_my,bgm_19,bgm_19,bgm_19
|
||||
56,黄昏原野,黄昏原野,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
57,毒液林,毒液林,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
58,岩沙之城,岩沙之城,Scene_5v5_my,bgm_18,bgm_18,bgm_18
|
||||
59,云顶图书馆,云顶图书馆,Scene_5v5_my,bgm_05,bgm_05,bgm_05
|
||||
60,旅者营地,旅者营地,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
61,飓风峡湾,飓风峡湾,Scene_5v5_my,bgm_12,bgm_12,bgm_12
|
||||
62,衰败工厂,衰败工厂,Scene_5v5_my,bgm_21,bgm_21,bgm_21
|
||||
63,辉煌古城,辉煌古城,Scene_5v5_my,bgm_17,bgm_17,bgm_17
|
||||
|
@ -83,6 +83,7 @@ const (
|
||||
CFG_LevelCfg = "LevelCfg.csv"
|
||||
CFG_LineMissionCfg = "LineMissionCfg.csv"
|
||||
CFG_MailCfg = "MailCfg.csv"
|
||||
CFG_MapCfg = "MapCfg.csv"
|
||||
CFG_MissionCfg = "MissionCfg.csv"
|
||||
CFG_NatureCfg = "NatureCfg.csv"
|
||||
CFG_NpcCfg = "NpcCfg.csv"
|
||||
@ -233,6 +234,7 @@ func configNameListInit() {
|
||||
CFGNameList["LevelCfg"] = LevelCfgLoad
|
||||
CFGNameList["LineMissionCfg"] = LineMissionCfgLoad
|
||||
CFGNameList["MailCfg"] = MailCfgLoad
|
||||
CFGNameList["MapCfg"] = MapCfgLoad
|
||||
CFGNameList["MissionCfg"] = MissionCfgLoad
|
||||
CFGNameList["NatureCfg"] = NatureCfgLoad
|
||||
CFGNameList["NpcCfg"] = NpcCfgLoad
|
||||
@ -414,6 +416,7 @@ func ConfigInit(path string) {
|
||||
LevelCfgLoad(path)
|
||||
LineMissionCfgLoad(path)
|
||||
MailCfgLoad(path)
|
||||
MapCfgLoad(path)
|
||||
MissionCfgLoad(path)
|
||||
NatureCfgLoad(path)
|
||||
NpcCfgLoad(path)
|
||||
@ -2300,6 +2303,27 @@ func MailCfgLoad(path string) {
|
||||
}
|
||||
}
|
||||
|
||||
var MapCfgLoader map[int32]*MapCfg
|
||||
|
||||
type MapCfg struct {
|
||||
Id int32 `csv:"Id"` //地图id
|
||||
Name string `csv:"Name"` //地图名字
|
||||
Description string `csv:"Description"` //地图描述
|
||||
LevelName string `csv:"LevelName"` //美术场景
|
||||
BgmMusic string `csv:"BgmMusic"` //背景音乐
|
||||
BattleMusic string `csv:"BattleMusic"` //战斗背景音乐
|
||||
BossBattleMusic string `csv:"BossBattleMusic"` //BOSS战背景音乐
|
||||
}
|
||||
|
||||
func MapCfgLoad(path string) {
|
||||
cfg := []*MapCfg{}
|
||||
MapCfgLoader = map[int32]*MapCfg{}
|
||||
loadCsvCfg(path+"MapCfg.csv", &cfg)
|
||||
for _, row := range cfg {
|
||||
MapCfgLoader[row.Id] = row
|
||||
}
|
||||
}
|
||||
|
||||
var MissionCfgLoader map[int32]*MissionCfg
|
||||
|
||||
type MissionCfg struct {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user