diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json index 75aaaeb32..6850f6143 100644 --- a/bin/json/game_rdtask.json +++ b/bin/json/game_rdtask.json @@ -127,13 +127,13 @@ { "id": 100205, "group": 2, - "type": 3, + "type": 2, "preTid": 100204, "condition": [ 101 ], "sidequest": [ - 2010 + 2006 ] }, { @@ -146,7 +146,7 @@ ], "sidequest": [ 2007, - 2006 + 2008 ] }, { @@ -158,8 +158,129 @@ 101 ], "sidequest": [ - 2008, - 2006 + 2009, + 2010, + 2011 + ] + }, + { + "id": 100208, + "group": 2, + "type": 2, + "preTid": 100207, + "condition": [ + 101 + ], + "sidequest": [ + 2012 + ] + }, + { + "id": 100209, + "group": 2, + "type": 2, + "preTid": 100208, + "condition": [ + 101 + ], + "sidequest": [ + 2013 + ] + }, + { + "id": 100210, + "group": 2, + "type": 2, + "preTid": 100209, + "condition": [ + 101 + ], + "sidequest": [ + 2014 + ] + }, + { + "id": 100211, + "group": 2, + "type": 2, + "preTid": 100210, + "condition": [ + 101 + ], + "sidequest": [ + 2015 + ] + }, + { + "id": 100212, + "group": 2, + "type": 2, + "preTid": 100211, + "condition": [ + 101 + ], + "sidequest": [ + 2016 + ] + }, + { + "id": 100213, + "group": 2, + "type": 2, + "preTid": 100212, + "condition": [ + 101 + ], + "sidequest": [ + 2017 + ] + }, + { + "id": 100214, + "group": 2, + "type": 2, + "preTid": 100213, + "condition": [ + 101 + ], + "sidequest": [ + 2018 + ] + }, + { + "id": 100215, + "group": 2, + "type": 2, + "preTid": 100214, + "condition": [ + 101 + ], + "sidequest": [ + 2019 + ] + }, + { + "id": 100216, + "group": 2, + "type": 2, + "preTid": 100215, + "condition": [ + 101 + ], + "sidequest": [ + 2020 + ] + }, + { + "id": 100217, + "group": 2, + "type": 2, + "preTid": 100216, + "condition": [ + 101 + ], + "sidequest": [ + 2021 ] } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 31cfaf0de..88efa335c 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -3,11 +3,6 @@ "id": 10001, "num": 1, "preTid": 0, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -17,11 +12,6 @@ "id": 10002, "num": 2, "preTid": 104, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -31,11 +21,6 @@ "id": 10003, "num": 1, "preTid": 0, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -45,11 +30,6 @@ "id": 10004, "num": 1, "preTid": 0, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -59,11 +39,6 @@ "id": 10005, "num": 2, "preTid": 105, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -73,11 +48,6 @@ "id": 10006, "num": 1, "preTid": 105, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -87,11 +57,6 @@ "id": 10007, "num": 2, "preTid": 0, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -101,11 +66,6 @@ "id": 10008, "num": 3, "preTid": 0, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], @@ -115,15 +75,6 @@ "id": 10009, "num": 1, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [ - false - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -133,15 +84,6 @@ "id": 100010, "num": 2, "preTid": 105, - "Entity": [ - "Earth" - ], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [ - false - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -151,15 +93,6 @@ "id": 100011, "num": 1, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [ - false - ], - "gotoLevel": 101, "needItem": [ 0 ], @@ -169,15 +102,6 @@ "id": 100012, "num": 2, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [ - false - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -186,16 +110,7 @@ { "id": 20001, "num": 1, - "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [ - false - ], - "gotoLevel": 0, + "preTid": 104, "needItem": [ 0 ], @@ -205,17 +120,6 @@ "id": 20002, "num": 2, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [ - "globe" - ], - "EntityStateChange": [], - "EntityInteractive": [ - true - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -225,17 +129,6 @@ "id": 20003, "num": 1, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [ - "globe" - ], - "EntityStateChange": [], - "EntityInteractive": [ - true - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -245,17 +138,6 @@ "id": 20004, "num": 1, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [ - "globe" - ], - "EntityStateChange": [], - "EntityInteractive": [ - true - ], - "gotoLevel": 101, "needItem": [ 0 ], @@ -265,17 +147,6 @@ "id": 20005, "num": 1, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [ - "globe" - ], - "EntityStateChange": [], - "EntityInteractive": [ - true - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -285,17 +156,6 @@ "id": 20006, "num": 1, "preTid": 0, - "Entity": [ - "Earth" - ], - "EntityChange": [ - "globe" - ], - "EntityStateChange": [], - "EntityInteractive": [ - true - ], - "gotoLevel": 0, "needItem": [ 0 ], @@ -305,14 +165,90 @@ "id": 20007, "num": 1, "preTid": 0, - "Entity": [], - "EntityChange": [], - "EntityStateChange": [], - "EntityInteractive": [], - "gotoLevel": 0, "needItem": [ 0 ], "nextTid": 100206 + }, + { + "id": 20008, + "num": 1, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100207 + }, + { + "id": 20009, + "num": 2, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 0 + }, + { + "id": 200010, + "num": 2, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100212 + }, + { + "id": 200011, + "num": 2, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100213 + }, + { + "id": 200012, + "num": 2, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100209 + }, + { + "id": 200013, + "num": 1, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100210 + }, + { + "id": 200014, + "num": 1, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100211 + }, + { + "id": 200015, + "num": 1, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 0 + }, + { + "id": 200016, + "num": 1, + "preTid": 0, + "needItem": [ + 0 + ], + "nextTid": 100217 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index b2ed6f923..d970e03a8 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -53,8 +53,8 @@ "id": 106, "datatype": 2, "type": 6, - "data1": 25001, - "data2": 5, + "data1": 45003, + "data2": 4, "data3": 0, "data4": 0, "data5": 0 @@ -173,7 +173,7 @@ "id": 118, "datatype": 2, "type": 18, - "data1": 2, + "data1": 1, "data2": 0, "data3": 0, "data4": 0, @@ -514,7 +514,7 @@ "datatype": 2, "type": 52, "data1": 1, - "data2": 25001, + "data2": 45003, "data3": 0, "data4": 0, "data5": 0 diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index be9f1aafb..888202ddc 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -4,6 +4,7 @@ "objType": 1, "location": "middle", "point": "model_07", + "storyBegin": 1, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -18,7 +19,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 1, "timeline": "", "chooseId": [ 10001, @@ -66,6 +66,7 @@ "objType": 1, "location": "middle", "point": "model_04", + "storyBegin": 2, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -80,7 +81,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 2, "timeline": "", "chooseId": [], "endTid": -1, @@ -94,6 +94,7 @@ "objType": 2, "location": "right", "point": "icon_03", + "storyBegin": 6, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -108,7 +109,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 6, "timeline": "", "chooseId": [ 10003, @@ -125,6 +125,7 @@ "objType": 1, "location": "middle", "point": "model_04", + "storyBegin": 3, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -139,7 +140,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 3, "timeline": "", "chooseId": [ 10005, @@ -157,6 +157,7 @@ "objType": 1, "location": "middle", "point": "model_07", + "storyBegin": 4, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -171,7 +172,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 4, "timeline": "", "chooseId": [], "endTid": -1, @@ -185,6 +185,7 @@ "objType": 2, "location": "right", "point": "icon_03", + "storyBegin": 8, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -199,7 +200,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 8, "timeline": "", "chooseId": [ 10008, @@ -216,6 +216,7 @@ "objType": 2, "location": "left", "point": "icon_01", + "storyBegin": 10, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -230,7 +231,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 10, "timeline": "", "chooseId": [ 100010, @@ -248,6 +248,7 @@ "objType": 2, "location": "", "point": "icon_04", + "storyBegin": 12, "Entity": [], "EntityChange": [], "EntityStateChange": [], @@ -262,7 +263,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 12, "timeline": "", "chooseId": [], "endTid": -1, @@ -276,6 +276,7 @@ "objType": 1, "location": "middle", "point": "model_02", + "storyBegin": 201, "Entity": [ "Earth" ], @@ -294,7 +295,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [ 20001, @@ -332,6 +332,7 @@ "objType": 1, "location": "middle", "point": "model_02", + "storyBegin": 202, "Entity": [ "Earth" ], @@ -350,7 +351,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [ 20003 @@ -358,7 +358,7 @@ "endTid": -1, "storyEnd": 0, "reward": [], - "nextTid": 0, + "nextTid": 100204, "CD": 0 }, { @@ -366,6 +366,7 @@ "objType": 1, "location": "middle", "point": "model_03", + "storyBegin": 203, "Entity": [ "Earth" ], @@ -384,7 +385,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [], "endTid": -1, @@ -398,6 +398,7 @@ "objType": 1, "location": "middle", "point": "model_03", + "storyBegin": 203, "Entity": [ "Earth" ], @@ -416,7 +417,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [], "endTid": -1, @@ -430,6 +430,7 @@ "objType": 2, "location": "right", "point": "icon_05", + "storyBegin": 204, "Entity": [ "Earth" ], @@ -448,7 +449,6 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [ 20004 @@ -472,18 +472,83 @@ }, { "id": 2006, - "objType": 1, - "location": "middle", - "point": "model_02", + "objType": 2, + "location": "right", + "point": "icon_05", + "storyBegin": 207, "Entity": [ "Earth" ], - "EntityChange": [ - "globe" - ], + "EntityChange": [], "EntityStateChange": [], "EntityInteractive": [ - true + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 20007 + ], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": 100206, + "CD": 0 + }, + { + "id": 2007, + "objType": 1, + "location": "middle", + "point": "model_03", + "storyBegin": 217, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "Enter", + "rotation": { + "x": 0, + "y": -90, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": -1, + "CD": 0 + }, + { + "id": 2008, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 218, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false ], "modelaction": "Enter", "rotation": { @@ -495,43 +560,11 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", - "chooseId": [], - "endTid": -1, - "storyEnd": 0, - "reward": [], - "nextTid": -1, - "CD": 0 - }, - { - "id": 2007, - "objType": 1, - "location": "middle", - "point": "model_03", - "Entity": [ - "Earth" + "chooseId": [ + 20008, + 20009 ], - "EntityChange": [ - "globe" - ], - "EntityStateChange": [], - "EntityInteractive": [ - true - ], - "modelaction": "Enter", - "rotation": { - "x": 0, - "y": -90, - "z": 0 - }, - "modelstate": 0, - "popup": "", - "special": "", - "boxreplace": "", - "storyBegin": 0, - "timeline": "", - "chooseId": [], "endTid": -1, "storyEnd": 0, "reward": [], @@ -539,31 +572,29 @@ "CD": 0 }, { - "id": 2008, + "id": 2009, "objType": 1, "location": "middle", - "point": "model_03", + "point": "model_07", + "storyBegin": 219, "Entity": [ "Earth" ], - "EntityChange": [ - "globe" - ], + "EntityChange": [], "EntityStateChange": [], "EntityInteractive": [ - true + false ], - "modelaction": "Enter", + "modelaction": "", "rotation": { "x": 0, - "y": -90, + "y": -180, "z": 0 }, "modelstate": 0, "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [], "endTid": -1, @@ -573,10 +604,280 @@ "CD": 0 }, { - "id": 2009, + "id": 2010, + "objType": 1, + "location": "middle", + "point": "model_03", + "storyBegin": 220, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -90, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": -1, + "CD": 0 + }, + { + "id": 2011, "objType": 1, "location": "middle", "point": "model_02", + "storyBegin": 221, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": 90, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": -1, + "CD": 0 + }, + { + "id": 2012, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 212, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200012, + 200015 + ], + "endTid": 118, + "storyEnd": 209, + "reward": [], + "nextTid": 100209, + "CD": 0 + }, + { + "id": 2013, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 213, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200013, + 200015 + ], + "endTid": 152, + "storyEnd": 210, + "reward": [], + "nextTid": 100210, + "CD": 0 + }, + { + "id": 2014, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 214, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200014, + 200015 + ], + "endTid": 146, + "storyEnd": 211, + "reward": [], + "nextTid": 100211, + "CD": 0 + }, + { + "id": 2015, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 222, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200010 + ], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": 100212, + "CD": 0 + }, + { + "id": 2016, + "objType": 2, + "location": "left", + "point": "icon_01", + "storyBegin": 223, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200011 + ], + "endTid": 158, + "storyEnd": 0, + "reward": [], + "nextTid": 100213, + "CD": 0 + }, + { + "id": 2017, + "objType": 2, + "location": "left", + "point": "icon_01", + "storyBegin": 224, + "Entity": [ + "Earth" + ], + "EntityChange": [], + "EntityStateChange": [], + "EntityInteractive": [ + false + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [], + "endTid": -1, + "storyEnd": 0, + "reward": [], + "nextTid": 100214, + "CD": 0 + }, + { + "id": 2018, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 225, "Entity": [ "Earth" ], @@ -597,20 +898,20 @@ "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [], "endTid": -1, "storyEnd": 0, "reward": [], - "nextTid": 0, + "nextTid": 100215, "CD": 0 }, { - "id": 2010, - "objType": 2, - "location": "right", - "point": "icon_05", + "id": 2019, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 215, "Entity": [ "Earth" ], @@ -624,22 +925,93 @@ "modelaction": "", "rotation": { "x": 0, - "y": 0, + "y": -180, "z": 0 }, "modelstate": 0, "popup": "", "special": "", "boxreplace": "", - "storyBegin": 0, "timeline": "", "chooseId": [ - 20007 + 200012, + 200015 ], - "endTid": -1, + "endTid": 118, "storyEnd": 0, "reward": [], - "nextTid": 100206, + "nextTid": 100215, + "CD": 0 + }, + { + "id": 2020, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 216, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [ + 200016, + 200015 + ], + "endTid": 106, + "storyEnd": 0, + "reward": [], + "nextTid": 100215, + "CD": 0 + }, + { + "id": 2021, + "objType": 1, + "location": "middle", + "point": "model_02", + "storyBegin": 226, + "Entity": [ + "Earth" + ], + "EntityChange": [ + "globe" + ], + "EntityStateChange": [], + "EntityInteractive": [ + true + ], + "modelaction": "", + "rotation": { + "x": 0, + "y": -180, + "z": 0 + }, + "modelstate": 0, + "popup": "", + "special": "", + "boxreplace": "", + "timeline": "", + "chooseId": [], + "endTid": 161, + "storyEnd": 0, + "reward": [], + "nextTid": 100215, "CD": 0 } ] \ No newline at end of file diff --git a/cmd/v2/ui/tool_gen.go b/cmd/v2/ui/tool_gen.go index ddde87b61..2f53123a7 100644 --- a/cmd/v2/ui/tool_gen.go +++ b/cmd/v2/ui/tool_gen.go @@ -12,7 +12,6 @@ import ( "os/exec" "path/filepath" "runtime" - "time" "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" @@ -60,7 +59,8 @@ func (this *appGen) LazyInit(obs observer.Observer) error { // client client := widget.NewEntry() - client.PlaceHolder = `配置Luban Client.exe路径 例如: Luban.Client\Luban.Client.exe` + client.Text = `Luban.Client\Luban.Client.exe` + client.PlaceHolder = `配置Luban Client.exe路径` //define define := widget.NewEntry() @@ -172,8 +172,11 @@ func (this *appGen) LazyInit(obs observer.Observer) error { this.goChkList = this.goList.createList() // 覆盖 -go - go_overrideBtn := &widget.Button{Text: "覆盖Go", Icon: theme.ConfirmIcon()} + go_allSelBtn := &widget.Button{Icon: theme.CheckButtonCheckedIcon()} + go_allCancelBtn := &widget.Button{Icon: theme.CheckButtonIcon()} + go_overrideBtn := &widget.Button{Text: "覆盖", Icon: theme.ConfirmIcon()} go_overrideBtn.Hide() + go_allSelBtn.Hide() go_overrideBtn.OnTapped = func() { go_overrideBtn.Disable() defer func() { @@ -198,8 +201,11 @@ func (this *appGen) LazyInit(obs observer.Observer) error { this.jsonChkList = this.jsonList.createList() // 覆盖 -go - json_overrideBtn := &widget.Button{Text: "覆盖Json", Icon: theme.ConfirmIcon()} + json_allSelBtn := &widget.Button{Icon: theme.CheckButtonCheckedIcon()} + json_allCancelBtn := &widget.Button{Icon: theme.CheckButtonIcon()} + json_overrideBtn := &widget.Button{Text: "覆盖", Icon: theme.ConfirmIcon()} json_overrideBtn.Hide() + json_allSelBtn.Hide() json_overrideBtn.OnTapped = func() { json_overrideBtn.Disable() defer func() { @@ -255,12 +261,12 @@ func (this *appGen) LazyInit(obs observer.Observer) error { // 更新列表 if genTypeText == "go" { - this.goList.changeItem(filepath.Join(tmpDir.Text, "go")) + this.goList.changeItem(filepath.Join(tmpDir.Text, "go"), filepath.Join(projectDir.Text, outputCodeDir.Text)) this.goList.titleLabel.SetText(fmt.Sprintf("(%d/%d个)", len(this.goList.selItemIds), this.goList.fileTotal)) go_overrideBtn.Show() this.goList.titleLabel.Show() } else if genTypeText == "json" { - this.jsonList.changeItem(filepath.Join(tmpDir.Text, "json")) + this.jsonList.changeItem(filepath.Join(tmpDir.Text, "json"), filepath.Join(projectDir.Text, outputJsonDir.Text)) this.jsonList.titleLabel.SetText(fmt.Sprintf("(%d/%d)", len(this.jsonList.selItemIds), this.jsonList.fileTotal)) json_overrideBtn.Show() this.jsonList.titleLabel.Show() @@ -269,14 +275,17 @@ func (this *appGen) LazyInit(obs observer.Observer) error { // layout left := container.NewVBox(form, container.NewHBox(&layout.Spacer{}, saveBtn, genBtn)) - right := container.NewBorder( - container.NewHBox(widget.NewLabel("Go文件"), this.goList.titleLabel, &layout.Spacer{}, widget.NewLabel("Json文件"), this.jsonList.titleLabel), - container.NewHBox(go_overrideBtn, &layout.Spacer{}, json_overrideBtn), nil, nil, - container.NewMax( - container.NewGridWithColumns(2, - container.NewVScroll(this.goChkList), - container.NewVScroll(this.jsonChkList), - ))) + right := container.NewGridWithColumns(2, + container.NewBorder( + container.NewHBox(go_allCancelBtn, go_overrideBtn, widget.NewLabel("Go文件"), this.goList.titleLabel), + nil, nil, nil, + container.NewMax(container.NewVScroll(this.goChkList))), + container.NewBorder( + container.NewHBox(json_allCancelBtn, json_overrideBtn, widget.NewLabel("Json文件"), this.jsonList.titleLabel), + nil, nil, nil, + container.NewMax(container.NewVScroll(this.jsonChkList)), + ), + ) content.Objects = append(content.Objects, container.NewGridWithColumns(2, left, right)) @@ -299,6 +308,24 @@ func NewFileList() *fileList { } } +func (f *fileList) cretaeHeader() *widget.List { + // header + return widget.NewList( + func() int { + return 1 + }, + func() fyne.CanvasObject { + return container.NewGridWithColumns(3, + widget.NewLabelWithStyle("", fyne.TextAlignLeading, fyne.TextStyle{}), + widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{})) + }, + func(id widget.ListItemID, item fyne.CanvasObject) { + item.(*fyne.Container).Objects[0].(*widget.Label).SetText(common.APP_MONITOR_TITLE_ID) + item.(*fyne.Container).Objects[1].(*widget.Label).SetText(common.APP_MONITOR_TITLE_DATA) + }, + ) +} + func (f *fileList) createList() *widget.List { return widget.NewListWithData(f.dataBinding, func() fyne.CanvasObject { @@ -325,29 +352,44 @@ func (f *fileList) createList() *widget.List { ) } -func (f *fileList) changeItem(dir string) { +func (f *fileList) changeItem(tmpDir, projectDir string) { + f.fileTotal = 0 + f.selItemIds = []string{} f.itemListData = model.NewItemModelList() - files, err := ioutil.ReadDir(dir) + tmpFiles, err := ioutil.ReadDir(tmpDir) if err != nil { logrus.Error(err) return } - now := time.Now().Unix() - for _, file := range files { - if !file.IsDir() { - // 仅筛选出变更的文件 - if now-file.ModTime().Unix() < 5 { - fm := &model.ItemModel{ - Id: file.Name(), - Label: file.Name(), - } - f.itemListData.DataList = append(f.itemListData.DataList, fm) - f.selItemIds = append(f.selItemIds, fm.Id) - f.fileTotal++ - logrus.Debugf("%v", fm.Id) - } + projectFiles, err := ioutil.ReadDir(projectDir) + if err != nil { + logrus.Error(err) + return + } + pfMap := make(map[string]int64) + for _, v := range projectFiles { + if !v.IsDir() { + pfMap[v.Name()] = v.ModTime().Unix() + } + } + + for _, file := range tmpFiles { + if !file.IsDir() { + if pfTime, ok := pfMap[file.Name()]; ok { + if file.ModTime().Unix() <= pfTime { + continue + } + } + fm := &model.ItemModel{ + Id: file.Name(), + Label: file.Name(), + } + f.itemListData.DataList = append(f.itemListData.DataList, fm) + f.selItemIds = append(f.selItemIds, fm.Id) + f.fileTotal++ + logrus.Debugf("%v", fm.Id) } } diff --git a/sys/configure/structs/Game.RdtaskSideData.go b/sys/configure/structs/Game.RdtaskSideData.go index 8d4e6ec07..4f289dab3 100644 --- a/sys/configure/structs/Game.RdtaskSideData.go +++ b/sys/configure/structs/Game.RdtaskSideData.go @@ -16,6 +16,7 @@ type GameRdtaskSideData struct { ObjType int32 Location string Point string + StoryBegin int32 Entity []string EntityChange []string EntityStateChange []string @@ -26,7 +27,6 @@ type GameRdtaskSideData struct { Popup string Special string Boxreplace string - StoryBegin int32 Timeline string ChooseId []int32 EndTid int32 @@ -47,6 +47,7 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["objType"].(float64); !_ok_ { err = errors.New("objType error"); return }; _v.ObjType = int32(_tempNum_) } { var _ok_ bool; if _v.Location, _ok_ = _buf["location"].(string); !_ok_ { err = errors.New("location error"); return } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyBegin"].(float64); !_ok_ { err = errors.New("storyBegin error"); return }; _v.StoryBegin = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -116,7 +117,6 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; if _v.Popup, _ok_ = _buf["popup"].(string); !_ok_ { err = errors.New("popup error"); return } } { var _ok_ bool; if _v.Special, _ok_ = _buf["special"].(string); !_ok_ { err = errors.New("special error"); return } } { var _ok_ bool; if _v.Boxreplace, _ok_ = _buf["boxreplace"].(string); !_ok_ { err = errors.New("boxreplace error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyBegin"].(float64); !_ok_ { err = errors.New("storyBegin error"); return }; _v.StoryBegin = int32(_tempNum_) } { var _ok_ bool; if _v.Timeline, _ok_ = _buf["timeline"].(string); !_ok_ { err = errors.New("timeline error"); return } } { var _arr_ []interface{} diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go index 823210034..ed2a5f17e 100644 --- a/sys/configure/structs/game.rdtaskChooseData.go +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -14,11 +14,6 @@ type GameRdtaskChooseData struct { Id int32 Num int32 PreTid int32 - Entity []string - EntityChange []string - EntityStateChange []string - EntityInteractive []bool - GotoLevel int32 NeedItem []int32 NextTid int32 } @@ -33,63 +28,6 @@ func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["Entity"].([]interface{}); !_ok_ { err = errors.New("Entity error"); return } - - _v.Entity = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.Entity = append(_v.Entity, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["EntityChange"].([]interface{}); !_ok_ { err = errors.New("EntityChange error"); return } - - _v.EntityChange = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.EntityChange = append(_v.EntityChange, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["EntityStateChange"].([]interface{}); !_ok_ { err = errors.New("EntityStateChange error"); return } - - _v.EntityStateChange = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.EntityStateChange = append(_v.EntityStateChange, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["EntityInteractive"].([]interface{}); !_ok_ { err = errors.New("EntityInteractive error"); return } - - _v.EntityInteractive = make([]bool, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ bool - { var _ok_ bool; if _list_v_, _ok_ = _e_.(bool); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.EntityInteractive = append(_v.EntityInteractive, _list_v_) - } - } - - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gotoLevel"].(float64); !_ok_ { err = errors.New("gotoLevel error"); return }; _v.GotoLevel = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool