liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新配置

Browse Source
This commit is contained in:
wh_zcy 2022-09-27 13:50:42 +08:00
parent bffcf2e86d
commit b01f0a880e
5 changed files with 143 additions and 983 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_rdtask.json
View File

@ -143,7 +143,8 @@
0 0
], ],
"sidequest": [ "sidequest": [
2005 2005,
2039
] ]
}, },
{ {
@ -156,7 +157,8 @@
0 0
], ],
"sidequest": [ "sidequest": [
2006 2006,
2040
] ]
}, },
{ {

943
bin/json/game_rdtaskbattle.json
View File

@ -2,948 +2,7 @@
{ {
"id": 101, "id": 101,
"FormatList": [ "FormatList": [
101011 700011
],
"captainId": "250011"
},
{
"id": 102,
"FormatList": [
101021
],
"captainId": "250011"
},
{
"id": 103,
"FormatList": [
101031,
101032
],
"captainId": "250011"
},
{
"id": 104,
"FormatList": [
101041,
101042
],
"captainId": "250011"
},
{
"id": 105,
"FormatList": [
101051,
101052
],
"captainId": "250011"
},
{
"id": 106,
"FormatList": [
101061,
101062
],
"captainId": "250011"
},
{
"id": 107,
"FormatList": [
101071,
101072
],
"captainId": "250011"
},
{
"id": 108,
"FormatList": [
101081,
101082
],
"captainId": "250011"
},
{
"id": 109,
"FormatList": [
101091,
101092
],
"captainId": "250011"
},
{
"id": 110,
"FormatList": [
101101,
101102,
101103
],
"captainId": "250011"
},
{
"id": 201,
"FormatList": [
102011
],
"captainId": "250011"
},
{
"id": 202,
"FormatList": [
102021
],
"captainId": "250011"
},
{
"id": 203,
"FormatList": [
102031,
102032
],
"captainId": "250011"
},
{
"id": 204,
"FormatList": [
102041,
102042
],
"captainId": "250011"
},
{
"id": 205,
"FormatList": [
102051,
102052
],
"captainId": "250011"
},
{
"id": 206,
"FormatList": [
102061,
102062
],
"captainId": "250011"
},
{
"id": 207,
"FormatList": [
102071,
102072
],
"captainId": "250011"
},
{
"id": 208,
"FormatList": [
102081,
102082
],
"captainId": "250011"
},
{
"id": 209,
"FormatList": [
102091,
102092
],
"captainId": "250011"
},
{
"id": 210,
"FormatList": [
102101,
102102,
102103
],
"captainId": "250011"
},
{
"id": 301,
"FormatList": [
103011
],
"captainId": "250011"
},
{
"id": 302,
"FormatList": [
103021
],
"captainId": "250011"
},
{
"id": 303,
"FormatList": [
103031,
103032
],
"captainId": "250011"
},
{
"id": 304,
"FormatList": [
103041,
103042
],
"captainId": "250011"
},
{
"id": 305,
"FormatList": [
103051,
103052
],
"captainId": "250011"
},
{
"id": 306,
"FormatList": [
103061,
103062
],
"captainId": "250011"
},
{
"id": 307,
"FormatList": [
103071,
103072
],
"captainId": "250011"
},
{
"id": 308,
"FormatList": [
103081,
103082
],
"captainId": "250011"
},
{
"id": 309,
"FormatList": [
103091,
103092
],
"captainId": "250011"
},
{
"id": 310,
"FormatList": [
103101,
103102,
103103
],
"captainId": "250011"
},
{
"id": 401,
"FormatList": [
104011
],
"captainId": "250011"
},
{
"id": 402,
"FormatList": [
104021
],
"captainId": "250011"
},
{
"id": 403,
"FormatList": [
104031,
104032
],
"captainId": "250011"
},
{
"id": 404,
"FormatList": [
104041,
104042
],
"captainId": "250011"
},
{
"id": 405,
"FormatList": [
104051,
104052
],
"captainId": "250011"
},
{
"id": 406,
"FormatList": [
104061,
104062
],
"captainId": "250011"
},
{
"id": 407,
"FormatList": [
104071,
104072
],
"captainId": "250011"
},
{
"id": 408,
"FormatList": [
104081,
104082
],
"captainId": "250011"
},
{
"id": 409,
"FormatList": [
104091,
104092
],
"captainId": "250011"
},
{
"id": 410,
"FormatList": [
104101,
104102,
104103
],
"captainId": "250011"
},
{
"id": 501,
"FormatList": [
105011
],
"captainId": "250011"
},
{
"id": 502,
"FormatList": [
105021
],
"captainId": "250011"
},
{
"id": 503,
"FormatList": [
105031,
105032
],
"captainId": "250011"
},
{
"id": 504,
"FormatList": [
105041,
105042
],
"captainId": "250011"
},
{
"id": 505,
"FormatList": [
105051,
105052
],
"captainId": "250011"
},
{
"id": 506,
"FormatList": [
105061,
105062
],
"captainId": "250011"
},
{
"id": 507,
"FormatList": [
105071,
105072
],
"captainId": "250011"
},
{
"id": 508,
"FormatList": [
105081,
105082
],
"captainId": "250011"
},
{
"id": 509,
"FormatList": [
105091,
105092
],
"captainId": "250011"
},
{
"id": 510,
"FormatList": [
105101,
105102,
105103
],
"captainId": "250011"
},
{
"id": 601,
"FormatList": [
106011
],
"captainId": "250011"
},
{
"id": 602,
"FormatList": [
106021
],
"captainId": "250011"
},
{
"id": 603,
"FormatList": [
106031,
106032
],
"captainId": "250011"
},
{
"id": 604,
"FormatList": [
106041,
106042
],
"captainId": "250011"
},
{
"id": 605,
"FormatList": [
106051,
106052
],
"captainId": "250011"
},
{
"id": 606,
"FormatList": [
106061,
106062
],
"captainId": "250011"
},
{
"id": 607,
"FormatList": [
106071,
106072
],
"captainId": "250011"
},
{
"id": 608,
"FormatList": [
106081,
106082
],
"captainId": "250011"
},
{
"id": 609,
"FormatList": [
106091,
106092
],
"captainId": "250011"
},
{
"id": 610,
"FormatList": [
106101,
106102,
106103
],
"captainId": "250011"
},
{
"id": 701,
"FormatList": [
107011
],
"captainId": "250011"
},
{
"id": 702,
"FormatList": [
107021
],
"captainId": "250011"
},
{
"id": 703,
"FormatList": [
107031,
107032
],
"captainId": "250011"
},
{
"id": 704,
"FormatList": [
107041,
107042
],
"captainId": "250011"
},
{
"id": 705,
"FormatList": [
107051,
107052
],
"captainId": "250011"
},
{
"id": 706,
"FormatList": [
107061,
107062
],
"captainId": "250011"
},
{
"id": 707,
"FormatList": [
107071,
107072
],
"captainId": "250011"
},
{
"id": 708,
"FormatList": [
107081,
107082
],
"captainId": "250011"
},
{
"id": 709,
"FormatList": [
107091,
107092
],
"captainId": "250011"
},
{
"id": 710,
"FormatList": [
107101,
107102,
107103
],
"captainId": "250011"
},
{
"id": 801,
"FormatList": [
108011
],
"captainId": "250011"
},
{
"id": 802,
"FormatList": [
108021
],
"captainId": "250011"
},
{
"id": 803,
"FormatList": [
108031,
108032
],
"captainId": "250011"
},
{
"id": 804,
"FormatList": [
108041,
108042
],
"captainId": "250011"
},
{
"id": 805,
"FormatList": [
108051,
108052
],
"captainId": "250011"
},
{
"id": 806,
"FormatList": [
108061,
108062
],
"captainId": "250011"
},
{
"id": 807,
"FormatList": [
108071,
108072
],
"captainId": "250011"
},
{
"id": 808,
"FormatList": [
108081,
108082
],
"captainId": "250011"
},
{
"id": 809,
"FormatList": [
108091,
108092
],
"captainId": "250011"
},
{
"id": 810,
"FormatList": [
108101,
108102,
108103
],
"captainId": "250011"
},
{
"id": 901,
"FormatList": [
109011
],
"captainId": "250011"
},
{
"id": 902,
"FormatList": [
109021
],
"captainId": "250011"
},
{
"id": 903,
"FormatList": [
109031,
109032
],
"captainId": "250011"
},
{
"id": 904,
"FormatList": [
109041,
109042
],
"captainId": "250011"
},
{
"id": 905,
"FormatList": [
109051,
109052
],
"captainId": "250011"
},
{
"id": 906,
"FormatList": [
109061,
109062
],
"captainId": "250011"
},
{
"id": 907,
"FormatList": [
109071,
109072
],
"captainId": "250011"
},
{
"id": 908,
"FormatList": [
109081,
109082
],
"captainId": "250011"
},
{
"id": 909,
"FormatList": [
109091,
109092
],
"captainId": "250011"
},
{
"id": 910,
"FormatList": [
109101,
109102,
109103
],
"captainId": "250011"
},
{
"id": 1001,
"FormatList": [
110011
],
"captainId": "250011"
},
{
"id": 1002,
"FormatList": [
110021
],
"captainId": "250011"
},
{
"id": 1003,
"FormatList": [
110031,
110032
],
"captainId": "250011"
},
{
"id": 1004,
"FormatList": [
110041,
110042
],
"captainId": "250011"
},
{
"id": 1005,
"FormatList": [
110051,
110052
],
"captainId": "250011"
},
{
"id": 1006,
"FormatList": [
110061,
110062
],
"captainId": "250011"
},
{
"id": 1007,
"FormatList": [
110071,
110072
],
"captainId": "250011"
},
{
"id": 1008,
"FormatList": [
110081,
110082
],
"captainId": "250011"
},
{
"id": 1009,
"FormatList": [
110091,
110092
],
"captainId": "250011"
},
{
"id": 1010,
"FormatList": [
110101,
110102,
110103
],
"captainId": "250011"
},
{
"id": 1101,
"FormatList": [
111011
],
"captainId": "250011"
},
{
"id": 1102,
"FormatList": [
111021
],
"captainId": "250011"
},
{
"id": 1103,
"FormatList": [
111031,
111032
],
"captainId": "250011"
},
{
"id": 1104,
"FormatList": [
111041,
111042
],
"captainId": "250011"
},
{
"id": 1105,
"FormatList": [
111051,
111052
],
"captainId": "250011"
},
{
"id": 1106,
"FormatList": [
111061,
111062
],
"captainId": "250011"
},
{
"id": 1107,
"FormatList": [
111071,
111072
],
"captainId": "250011"
},
{
"id": 1108,
"FormatList": [
111081,
111082
],
"captainId": "250011"
},
{
"id": 1109,
"FormatList": [
111091,
111092
],
"captainId": "250011"
},
{
"id": 1110,
"FormatList": [
111101,
111102,
111103
],
"captainId": "250011"
},
{
"id": 1201,
"FormatList": [
112011
],
"captainId": "250011"
},
{
"id": 1202,
"FormatList": [
112021
],
"captainId": "250011"
},
{
"id": 1203,
"FormatList": [
112031,
112032
],
"captainId": "250011"
},
{
"id": 1204,
"FormatList": [
112041,
112042
],
"captainId": "250011"
},
{
"id": 1205,
"FormatList": [
112051,
112052
],
"captainId": "250011"
},
{
"id": 1206,
"FormatList": [
112061,
112062
],
"captainId": "250011"
},
{
"id": 1207,
"FormatList": [
112071,
112072
],
"captainId": "250011"
},
{
"id": 1208,
"FormatList": [
112081,
112082
],
"captainId": "250011"
},
{
"id": 1209,
"FormatList": [
112091,
112092
],
"captainId": "250011"
},
{
"id": 1210,
"FormatList": [
112101,
112102,
112103
], ],
"captainId": "250011" "captainId": "250011"
} }

2
bin/json/game_rdtaskcondi.json
View File

@ -555,7 +555,7 @@
"inited": [], "inited": [],
"data1": 1, "data1": 1,
"data2": 6, "data2": 6,
"data3": 1, "data3": 0,
"data4": 0, "data4": 0,
"data5": 0 "data5": 0
}, },

155
bin/json/game_rdtaskside.json
View File

@ -458,7 +458,7 @@
"modelaction": "", "modelaction": "",
"rotation": { "rotation": {
"x": 0, "x": 0,
"y": -180, "y": 90,
"z": 0 "z": 0
}, },
"modelstate": 0, "modelstate": 0,
@ -474,18 +474,7 @@
-1 -1
], ],
"storyEnd": 0, "storyEnd": 0,
"reward": [ "reward": [],
{
"ChooseId": 20004,
"Reward": [
{
"a": "hero",
"t": "44005",
"n": 1
}
]
}
],
"nextTid": 100205, "nextTid": 100205,
"CD": 0 "CD": 0
}, },
@ -502,7 +491,7 @@
"modelaction": "", "modelaction": "",
"rotation": { "rotation": {
"x": 0, "x": 0,
"y": -180, "y": 90,
"z": 0 "z": 0
}, },
"modelstate": 0, "modelstate": 0,
@ -518,7 +507,23 @@
-1 -1
], ],
"storyEnd": 0, "storyEnd": 0,
"reward": [], "reward": [
{
"ChooseId": 20007,
"Reward": [
{
"a": "item",
"t": "30001",
"n": 1
},
{
"a": "hero",
"t": "44005",
"n": 1
}
]
}
],
"nextTid": 100206, "nextTid": 100206,
"CD": 0 "CD": 0
}, },
@ -589,18 +594,7 @@
-1 -1
], ],
"storyEnd": 0, "storyEnd": 0,
"reward": [ "reward": [],
{
"ChooseId": 20008,
"Reward": [
{
"a": "item",
"t": "30001",
"n": 1
}
]
}
],
"nextTid": 100208, "nextTid": 100208,
"CD": 0 "CD": 0
}, },
@ -696,7 +690,28 @@
118 118
], ],
"storyEnd": 0, "storyEnd": 0,
"reward": [], "reward": [
{
"ChooseId": 200012,
"Reward": [
{
"a": "hero",
"t": "44911",
"n": 10
},
{
"a": "hero",
"t": "25004",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 240000
}
]
}
],
"nextTid": 100209, "nextTid": 100209,
"CD": 0 "CD": 0
}, },
@ -1013,9 +1028,9 @@
], ],
"EntityStateChange": [], "EntityStateChange": [],
"EntityInteractive": [ "EntityInteractive": [
false true
], ],
"modelaction": "", "modelaction": "Enter",
"rotation": { "rotation": {
"x": 0, "x": 0,
"y": -90, "y": -90,
@ -1139,7 +1154,23 @@
118 118
], ],
"storyEnd": 0, "storyEnd": 0,
"reward": [], "reward": [
{
"ChooseId": 200019,
"Reward": [
{
"a": "hero",
"t": "44911",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 1500000
}
]
}
],
"nextTid": 100216, "nextTid": 100216,
"CD": 0 "CD": 0
}, },
@ -1586,5 +1617,67 @@
"reward": [], "reward": [],
"nextTid": -1, "nextTid": -1,
"CD": 0 "CD": 0
},
{
"id": 2039,
"objType": 1,
"location": "right",
"point": "model_08",
"storyBegin": 341,
"Entity": [],
"EntityChange": [],
"EntityStateChange": [],
"EntityInteractive": [],
"modelaction": "Run",
"rotation": {
"x": 0,
"y": -90,
"z": 0
},
"modelstate": 0,
"popup": "",
"special": "",
"enableAi": false,
"boxreplace": "",
"timeline": "",
"chooseId": [],
"endTid": [
-1
],
"storyEnd": 0,
"reward": [],
"nextTid": -1,
"CD": 0
},
{
"id": 2040,
"objType": 1,
"location": "right",
"point": "model_08",
"storyBegin": 342,
"Entity": [],
"EntityChange": [],
"EntityStateChange": [],
"EntityInteractive": [],
"modelaction": "",
"rotation": {
"x": 0,
"y": -90,
"z": 0
},
"modelstate": 0,
"popup": "",
"special": "",
"enableAi": false,
"boxreplace": "",
"timeline": "",
"chooseId": [],
"endTid": [
-1
],
"storyEnd": 0,
"reward": [],
"nextTid": -1,
"CD": 0
} }
] ]

20
cmd/v2/ui/tool_term.go
View File

@ -36,9 +36,17 @@ func (this *appTerm) LazyInit(obs observer.Observer) error {
sshConf := service.GetDbService().GetSSHConf(common.BUCKET_SSHCONF) sshConf := service.GetDbService().GetSSHConf(common.BUCKET_SSHCONF)
logrus.Debugf("%v", sshConf) logrus.Debugf("%v", sshConf)
//cmd input //left-top
cmdLast := widget.NewMultiLineEntry() localDir := widget.NewEntry()
cmdLast.PlaceHolder = "命令输入,使用;分隔" localDir.PlaceHolder = `本地目录`
remoteDir := widget.NewEntry()
remoteDir.PlaceHolder = `远程目录`
dirForm := widget.NewForm(
&widget.FormItem{Text: "本地目录:", Widget: localDir},
&widget.FormItem{Text: "远程目录:", Widget: remoteDir},
)
// output panel // output panel
output := widget.NewMultiLineEntry() output := widget.NewMultiLineEntry()
@ -61,7 +69,7 @@ func (this *appTerm) LazyInit(obs observer.Observer) error {
port.Text = sshConf.Port port.Text = sshConf.Port
userName.Text = sshConf.UserName userName.Text = sshConf.UserName
password.Text = sshConf.Password password.Text = sshConf.Password
cmdLast.Text = sshConf.CmdLast
} }
configForm := widget.NewForm( configForm := widget.NewForm(
@ -79,7 +87,6 @@ func (this *appTerm) LazyInit(obs observer.Observer) error {
UserName: userName.Text, UserName: userName.Text,
Password: password.Text, Password: password.Text,
Port: port.Text, Port: port.Text,
CmdLast: cmdLast.Text,
}); err != nil { }); err != nil {
logrus.WithField("err", err).Debug("保存配置") logrus.WithField("err", err).Debug("保存配置")
} }
@ -126,7 +133,6 @@ func (this *appTerm) LazyInit(obs observer.Observer) error {
dialog.ShowError(errors.New("请先连接终端"), toolWin.w) dialog.ShowError(errors.New("请先连接终端"), toolWin.w)
return return
} }
this.sshService.RunShell(cmdLast.Text)
output.SetText(this.sshService.LastResult) output.SetText(this.sshService.LastResult)
} }
@ -135,7 +141,7 @@ func (this *appTerm) LazyInit(obs observer.Observer) error {
// layout // layout
split := container.NewVSplit(container.NewGridWithColumns(2, split := container.NewVSplit(container.NewGridWithColumns(2,
cmdLast, dirForm,
container.NewBorder(configForm, btns, widget.NewSeparator(), nil)), output) container.NewBorder(configForm, btns, widget.NewSeparator(), nil)), output)
split.Offset = 0.25 split.Offset = 0.25
content.Objects = append(content.Objects, split) content.Objects = append(content.Objects, split)