diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index c966e2bbc..fbb3ee938 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -2076,6 +2076,31 @@ }, "uiid": 0, "activateType": 0, + "notify": [ + "dailytask" + ] + }, + { + "id": "hackerspider", + "name": { + "key": "opencond_opencond_name_88", + "text": "功能入口合集" + }, + "main": [ + { + "key": 1, + "param": 4 + } + ], + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "opencond_opencond_prompt_86", + "text": "主角等级达到4开启" + }, + "uiid": 0, + "activateType": 0, "notify": [] } ] \ No newline at end of file diff --git a/modules/robot/modulerobot_wtask.go b/modules/robot/modulerobot_wtask.go index 0c0219ed8..fe3d0c447 100644 --- a/modules/robot/modulerobot_wtask.go +++ b/modules/robot/modulerobot_wtask.go @@ -250,6 +250,7 @@ func (this *ModuleRobot_WTask) findtask() (conf *cfg.GameWorldTaskData) { for _, v := range this.info.Activations { //可接取任务列表 if conf, err = this.getGameWorldTaskData(v); err != nil { log.Error("[Robot 世界任务配置未找到]", log.Field{Key: "task", Value: v}, log.Field{Key: "err", Value: err.Error()}) + return } if conf.Des == 2 { //优先找到主线任务 return diff --git a/services/cmd/main.go b/services/cmd/main.go index 7e21a4f2c..36287d83f 100644 --- a/services/cmd/main.go +++ b/services/cmd/main.go @@ -256,6 +256,19 @@ func syncServer() { cd /data/dreamworksserver/s110; python stopserver.py; python install.py; python start.py; curl -XPOST -s -L 'https://oapi.dingtalk.com/robot/send?access_token=c6d2066cd4b36882b5dc3033e359a1c1b259eb4fd6cb69f397a65f544dbce86f' -H 'Content-Type: application/json' -H "charset:utf-8" -d '{"msgtype": "text","text": {"content": "* 服务启动--QA测试服"}}'; `) + case "battle": + exesshcomd("10.0.0.9", ` + cd /home/liwei/dfbattle/output; ./stop.sh; + cd /home/liwei/fightdll; svn update; + sudo cp -f /home/liwei/fightdll/FightRunner.dll /home/liwei/dfbattle/lib/FightRunner.dll; + sudo cp -f /home/liwei/fightdll/GameFight.dll /home/liwei/dfbattle/lib/GameFight.dll; + sudo cp -f /home/liwei/fightdll/GameProto.dll /home/liwei/dfbattle/lib/GameProto.dll; + sudo cp -r -f /home/liwei/fightdll/GameConfig/* /home/liwei/dfbattle/GameConfig/; + cd /home/liwei/dfbattle; dotnet clean; dotnet build -o output; + sudo cp -r -f /home/liwei/dfbattle/GameConfig/* /home/liwei/dfbattle/output/GameConfig/; + cd /home/liwei/dfbattle/output; ./start.sh ; + cd /home/liwei/dfbattle; git add ./lib/* ./GameConfig/*; git commit -m 同步战斗服; git push; + `) } } }