diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json index 425a5f9d1..13ad15afc 100644 --- a/bin/json/game_rdtask.json +++ b/bin/json/game_rdtask.json @@ -5,7 +5,7 @@ "type": 2, "preTid": 0, "condition": [ - 101 + 103 ], "sidequest": [ 1001, @@ -72,5 +72,93 @@ "sidequest": [ 1008 ] + }, + { + "id": 100201, + "group": 2, + "type": 2, + "preTid": 0, + "condition": [ + 101 + ], + "sidequest": [ + 2001 + ] + }, + { + "id": 100202, + "group": 2, + "type": 2, + "preTid": 100201, + "condition": [ + 101 + ], + "sidequest": [ + 2002, + 2004 + ] + }, + { + "id": 100203, + "group": 2, + "type": 2, + "preTid": 100201, + "condition": [ + 101, + 107 + ], + "sidequest": [ + 2002, + 2003 + ] + }, + { + "id": 100204, + "group": 2, + "type": 2, + "preTid": 100201, + "condition": [ + 101 + ], + "sidequest": [ + 2005 + ] + }, + { + "id": 100205, + "group": 2, + "type": 2, + "preTid": 100204, + "condition": [ + 101 + ], + "sidequest": [ + 2007, + 2006 + ] + }, + { + "id": 100206, + "group": 2, + "type": 2, + "preTid": 100205, + "condition": [ + 101 + ], + "sidequest": [ + 2008 + ] + }, + { + "id": 100207, + "group": 2, + "type": 2, + "preTid": 100206, + "condition": [ + 101 + ], + "sidequest": [ + 2009 + ] } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index b8541c0f8..5cfb6710b 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -118,5 +118,65 @@ 0 ], "nextTid": 0 + }, + { + "id": 20001, + "num": 1, + "preTid": 0, + "gotoLevel": 0, + "needItem": [ + 0 + ], + "nextTid": 100203 + }, + { + "id": 20002, + "num": 2, + "preTid": 0, + "gotoLevel": 0, + "needItem": [ + 0 + ], + "nextTid": 100202 + }, + { + "id": 20003, + "num": 1, + "preTid": 0, + "gotoLevel": 0, + "needItem": [ + 0 + ], + "nextTid": 100204 + }, + { + "id": 20004, + "num": 1, + "preTid": 0, + "gotoLevel": 101, + "needItem": [ + 0 + ], + "nextTid": 100205 + }, + { + "id": 20005, + "num": 1, + "preTid": 0, + "gotoLevel": 0, + "needItem": [ + 0 + ], + "nextTid": 100206 + }, + { + "id": 20006, + "num": 1, + "preTid": 0, + "gotoLevel": 0, + "needItem": [ + 0 + ], + "nextTid": 100207 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index d2340d6a5..b2ed6f923 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -693,7 +693,7 @@ "id": 170, "datatype": 2, "type": 1, - "data1": 12003, + "data1": 25004, "data2": 0, "data3": 0, "data4": 0, diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index 823eeebfa..77afdc26c 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -51,7 +51,7 @@ } ], "CD": 0, - "endTid": 101 + "endTid": -1 }, { "id": 1002, @@ -71,7 +71,7 @@ "nextTid": -1, "reward": [], "CD": 0, - "endTid": 104 + "endTid": -1 }, { "id": 1003, @@ -206,5 +206,228 @@ "reward": [], "CD": 0, "endTid": -1 + }, + { + "id": 2001, + "objType": 1, + "location": "middle", + "modelaction": "", + "modelstate": 0, + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "point": "model_02", + "storyBegin": 201, + "chooseId": [ + 20001, + 20002 + ], + "storyEnd": 0, + "nextTid": 100202, + "reward": [], + "CD": 0, + "endTid": -1 + }, + { + "id": 2002, + "objType": 1, + "location": "middle", + "modelaction": "", + "modelstate": 0, + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "point": "model_02", + "storyBegin": 202, + "chooseId": [ + 20003 + ], + "storyEnd": 0, + "nextTid": 0, + "reward": [ + { + "ChooseId": 20001, + "Reward": [ + { + "a": "hero", + "t": "25001", + "n": 1 + } + ] + }, + { + "ChooseId": 20002, + "Reward": [ + { + "a": "hero", + "t": "25004", + "n": 1 + } + ] + } + ], + "CD": 0, + "endTid": -1 + }, + { + "id": 2003, + "objType": 1, + "location": "middle", + "modelaction": "Enter", + "modelstate": 0, + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "point": "model_03", + "storyBegin": 203, + "chooseId": [], + "storyEnd": 0, + "nextTid": -1, + "reward": [], + "CD": 0, + "endTid": -1 + }, + { + "id": 2004, + "objType": 1, + "location": "middle", + "modelaction": "Enter", + "modelstate": 0, + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "point": "model_03", + "storyBegin": 203, + "chooseId": [], + "storyEnd": 0, + "nextTid": -1, + "reward": [], + "CD": 0, + "endTid": -1 + }, + { + "id": 2005, + "objType": 2, + "location": "right", + "modelaction": "", + "modelstate": 0, + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "point": "icon_05", + "storyBegin": 204, + "chooseId": [ + 20004 + ], + "storyEnd": 0, + "nextTid": 100205, + "reward": [ + { + "ChooseId": 2004, + "Reward": [ + { + "a": "hero", + "t": "44005", + "n": 1 + } + ] + } + ], + "CD": 0, + "endTid": -1 + }, + { + "id": 2006, + "objType": 1, + "location": "middle", + "modelaction": "Enter", + "modelstate": 0, + "rotation": { + "x": 0, + "y": 90, + "z": 0 + }, + "point": "model_02", + "storyBegin": 205, + "chooseId": [], + "storyEnd": 0, + "nextTid": -1, + "reward": [], + "CD": 0, + "endTid": -1 + }, + { + "id": 2007, + "objType": 1, + "location": "middle", + "modelaction": "Enter", + "modelstate": 0, + "rotation": { + "x": 0, + "y": -90, + "z": 0 + }, + "point": "model_03", + "storyBegin": 206, + "chooseId": [ + 20005 + ], + "storyEnd": 0, + "nextTid": 100206, + "reward": [], + "CD": 0, + "endTid": -1 + }, + { + "id": 2008, + "objType": 2, + "location": "left", + "modelaction": "", + "modelstate": 0, + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "point": "icon_01", + "storyBegin": 207, + "chooseId": [ + 20006 + ], + "storyEnd": 208, + "nextTid": 100207, + "reward": [], + "CD": 0, + "endTid": -1 + }, + { + "id": 2009, + "objType": 1, + "location": "middle", + "modelaction": "", + "modelstate": 0, + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "point": "model_02", + "storyBegin": 207, + "chooseId": [], + "storyEnd": 207, + "nextTid": 0, + "reward": [], + "CD": 0, + "endTid": -1 } ] \ No newline at end of file diff --git a/cmd/v2/FyneApp.toml b/cmd/v2/FyneApp.toml index 53a47ed61..4e9b49fc0 100644 --- a/cmd/v2/FyneApp.toml +++ b/cmd/v2/FyneApp.toml @@ -1,7 +1,7 @@ Website = "http://legu.cc" [Details] - Icon = "Icon.png" + Icon = "app.png" Name = "RobotGUI" ID = "cc.legu.app" Version = "1.0.5" diff --git a/cmd/v2/app.png b/cmd/v2/app.png new file mode 100644 index 000000000..7bf4070c8 Binary files /dev/null and b/cmd/v2/app.png differ diff --git a/cmd/v2/main.go b/cmd/v2/main.go index a90513c1d..1d47cc07e 100644 --- a/cmd/v2/main.go +++ b/cmd/v2/main.go @@ -93,6 +93,9 @@ func main() { w.SetFixedSize(true) w.Resize(fyne.NewSize(400, 200)) w.CenterOnScreen() + w.SetCloseIntercept(func() { + app.Quit() + }) logrus.WithField("version", app.Metadata().Version).Info("app starting") w.Show() appUI.Run()