From 83e99309c3fad4063cda09dfa07f5d2d1e41201c Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 20 Sep 2022 14:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_rdtask.json | 90 ++++++++++++- bin/json/game_rdtaskchoose.json | 60 +++++++++ bin/json/game_rdtaskcondi.json | 2 +- bin/json/game_rdtaskside.json | 227 +++++++++++++++++++++++++++++++- cmd/v2/FyneApp.toml | 2 +- cmd/v2/app.png | Bin 0 -> 5677 bytes cmd/v2/main.go | 3 + 7 files changed, 379 insertions(+), 5 deletions(-) create mode 100644 cmd/v2/app.png 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 0000000000000000000000000000000000000000..7bf4070c8ae5af7b871dfb50adc27b0e4c79b17f GIT binary patch literal 5677 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 TqqUhj00000NkvXXu0mjfo16n< literal 0 HcmV?d00001 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()