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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2022-09-16 14:15:57 +08:00
commit 0bac28f7fd
16 changed files with 11473 additions and 13057 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
bin/json/game_equip.json
View File

@ -26,7 +26,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -63,7 +63,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -102,7 +102,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -139,7 +139,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -178,7 +178,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -215,7 +215,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -252,7 +252,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -289,7 +289,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -328,7 +328,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -365,7 +365,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -404,7 +404,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -441,7 +441,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -478,7 +478,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -515,7 +515,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -554,7 +554,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -591,7 +591,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -630,7 +630,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -667,7 +667,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -704,7 +704,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -741,7 +741,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -780,7 +780,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -817,7 +817,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -856,7 +856,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -893,7 +893,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -930,7 +930,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -967,7 +967,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1006,7 +1006,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1043,7 +1043,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1082,7 +1082,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1119,7 +1119,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1156,7 +1156,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1193,7 +1193,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1232,7 +1232,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1269,7 +1269,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1308,7 +1308,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1345,7 +1345,7 @@
], ],
"addlibrary": 1001, "addlibrary": 1001,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1382,7 +1382,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1419,7 +1419,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1458,7 +1458,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1495,7 +1495,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1534,7 +1534,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1571,7 +1571,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1608,7 +1608,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1645,7 +1645,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1684,7 +1684,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1721,7 +1721,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1760,7 +1760,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1797,7 +1797,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1834,7 +1834,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1871,7 +1871,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1910,7 +1910,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1947,7 +1947,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -1986,7 +1986,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2023,7 +2023,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2060,7 +2060,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2097,7 +2097,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2136,7 +2136,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2173,7 +2173,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2212,7 +2212,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2249,7 +2249,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2286,7 +2286,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2323,7 +2323,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2362,7 +2362,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2399,7 +2399,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2438,7 +2438,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2475,7 +2475,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2512,7 +2512,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_01", "ico": "zc_icon_01",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2549,7 +2549,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_02", "ico": "zc_icon_02",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2588,7 +2588,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_03", "ico": "zc_icon_03",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2625,7 +2625,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_04", "ico": "zc_icon_04",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2664,7 +2664,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_05", "ico": "zc_icon_05",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",
@ -2701,7 +2701,7 @@
], ],
"addlibrary": 1101, "addlibrary": 1101,
"ico": "zc_icon_06", "ico": "zc_icon_06",
"use_skip": 0, "use_skip": 102,
"sale": [ "sale": [
{ {
"a": "attr", "a": "attr",

24014
bin/json/game_mainline.json
View File

File diff suppressed because it is too large Load Diff

36
bin/json/game_mainlinechapter.json
View File

@ -29,8 +29,7 @@
106, 106,
107, 107,
108, 108,
109, 109
110
], ],
"award": [ "award": [
{ {
@ -75,8 +74,7 @@
206, 206,
207, 207,
208, 208,
209, 209
210
], ],
"award": [ "award": [
{ {
@ -121,8 +119,7 @@
306, 306,
307, 307,
308, 308,
309, 309
310
], ],
"award": [ "award": [
{ {
@ -167,8 +164,7 @@
406, 406,
407, 407,
408, 408,
409, 409
410
], ],
"award": [ "award": [
{ {
@ -213,8 +209,7 @@
506, 506,
507, 507,
508, 508,
509, 509
510
], ],
"award": [ "award": [
{ {
@ -259,8 +254,7 @@
606, 606,
607, 607,
608, 608,
609, 609
610
], ],
"award": [ "award": [
{ {
@ -305,8 +299,7 @@
706, 706,
707, 707,
708, 708,
709, 709
710
], ],
"award": [ "award": [
{ {
@ -351,8 +344,7 @@
806, 806,
807, 807,
808, 808,
809, 809
810
], ],
"award": [ "award": [
{ {
@ -397,8 +389,7 @@
906, 906,
907, 907,
908, 908,
909, 909
910
], ],
"award": [ "award": [
{ {
@ -443,8 +434,7 @@
1006, 1006,
1007, 1007,
1008, 1008,
1009, 1009
1010
], ],
"award": [ "award": [
{ {
@ -489,8 +479,7 @@
1106, 1106,
1107, 1107,
1108, 1108,
1109, 1109
1110
], ],
"award": [ "award": [
{ {
@ -535,8 +524,7 @@
1206, 1206,
1207, 1207,
1208, 1208,
1209, 1209
1210
], ],
"award": [ "award": [
{ {

24
bin/json/game_rdtaskchoose.json
View File

@ -3,7 +3,7 @@
"id": 10001, "id": 10001,
"num": 1, "num": 1,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -12,7 +12,7 @@
"id": 10002, "id": 10002,
"num": 2, "num": 2,
"preTid": 104, "preTid": 104,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -21,7 +21,7 @@
"id": 10003, "id": 10003,
"num": 1, "num": 1,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -30,7 +30,7 @@
"id": 10004, "id": 10004,
"num": 1, "num": 1,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -39,7 +39,7 @@
"id": 10005, "id": 10005,
"num": 2, "num": 2,
"preTid": 105, "preTid": 105,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -48,7 +48,7 @@
"id": 10006, "id": 10006,
"num": 1, "num": 1,
"preTid": 105, "preTid": 105,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -57,7 +57,7 @@
"id": 10007, "id": 10007,
"num": 2, "num": 2,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -66,7 +66,7 @@
"id": 10008, "id": 10008,
"num": 3, "num": 3,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -75,7 +75,7 @@
"id": 10009, "id": 10009,
"num": 1, "num": 1,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -84,7 +84,7 @@
"id": 100010, "id": 100010,
"num": 2, "num": 2,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -93,7 +93,7 @@
"id": 100011, "id": 100011,
"num": 1, "num": 1,
"preTid": 105, "preTid": 105,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]
@ -102,7 +102,7 @@
"id": 100012, "id": 100012,
"num": 2, "num": 2,
"preTid": 0, "preTid": 0,
"gotoLevel": "", "gotoLevel": 0,
"needItem": [ "needItem": [
0 0
] ]

80
bin/json/game_taskround.json
View File

@ -12,7 +12,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 5, "active": 5,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -29,7 +29,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 10, "active": 10,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -46,7 +46,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -63,7 +63,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -80,7 +80,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -97,7 +97,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -114,7 +114,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -131,7 +131,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -148,7 +148,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -165,7 +165,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -182,7 +182,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 10, "active": 10,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -199,7 +199,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 15, "active": 15,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -216,7 +216,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 20, "active": 20,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -233,7 +233,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -250,7 +250,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -267,7 +267,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -284,7 +284,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -301,7 +301,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -318,7 +318,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -335,7 +335,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 25, "active": 25,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [] "reword": []
}, },
@ -352,7 +352,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon01", "icon": "rw_cj_icon01",
"reword": [ "reword": [
{ {
@ -380,7 +380,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30102, "id_after": 30102,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon02", "icon": "rw_cj_icon02",
"reword": [ "reword": [
{ {
@ -408,7 +408,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30103, "id_after": 30103,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon09", "icon": "rw_cj_icon09",
"reword": [ "reword": [
{ {
@ -436,7 +436,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30104, "id_after": 30104,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon10", "icon": "rw_cj_icon10",
"reword": [ "reword": [
{ {
@ -464,7 +464,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30105, "id_after": 30105,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon11", "icon": "rw_cj_icon11",
"reword": [ "reword": [
{ {
@ -492,7 +492,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30106, "id_after": 30106,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon12", "icon": "rw_cj_icon12",
"reword": [ "reword": [
{ {
@ -520,7 +520,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30107, "id_after": 30107,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon13", "icon": "rw_cj_icon13",
"reword": [ "reword": [
{ {
@ -548,7 +548,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30108, "id_after": 30108,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon14", "icon": "rw_cj_icon14",
"reword": [ "reword": [
{ {
@ -576,7 +576,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30109, "id_after": 30109,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon15", "icon": "rw_cj_icon15",
"reword": [ "reword": [
{ {
@ -604,7 +604,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30110, "id_after": 30110,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon16", "icon": "rw_cj_icon16",
"reword": [ "reword": [
{ {
@ -632,7 +632,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30111, "id_after": 30111,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon17", "icon": "rw_cj_icon17",
"reword": [ "reword": [
{ {
@ -660,7 +660,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30112, "id_after": 30112,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon18", "icon": "rw_cj_icon18",
"reword": [ "reword": [
{ {
@ -688,7 +688,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30113, "id_after": 30113,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon01", "icon": "rw_cj_icon01",
"reword": [ "reword": [
{ {
@ -716,7 +716,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30114, "id_after": 30114,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon02", "icon": "rw_cj_icon02",
"reword": [ "reword": [
{ {
@ -744,7 +744,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30115, "id_after": 30115,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon09", "icon": "rw_cj_icon09",
"reword": [ "reword": [
{ {
@ -772,7 +772,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30116, "id_after": 30116,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon10", "icon": "rw_cj_icon10",
"reword": [ "reword": [
{ {
@ -800,7 +800,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30117, "id_after": 30117,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon11", "icon": "rw_cj_icon11",
"reword": [ "reword": [
{ {
@ -828,7 +828,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30118, "id_after": 30118,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon12", "icon": "rw_cj_icon12",
"reword": [ "reword": [
{ {
@ -856,7 +856,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 30119, "id_after": 30119,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon13", "icon": "rw_cj_icon13",
"reword": [ "reword": [
{ {
@ -884,7 +884,7 @@
"restrictive_condition": 0, "restrictive_condition": 0,
"active": 0, "active": 0,
"id_after": 0, "id_after": 0,
"jump_interface": "mainworld", "jump_interface": 103,
"icon": "rw_cj_icon14", "icon": "rw_cj_icon14",
"reword": [ "reword": [
{ {

9
modules/hero/api_resonance.go
View File

@ -67,18 +67,13 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
if _costHero.Block { if _costHero.Block {
code = pb.ErrorCode_HeroIsLock code = pb.ErrorCode_HeroIsLock
} }
// if v1.T == _costHero.HeroID && v1.N != v {
// code = pb.ErrorCode_HeroNoEnough
// return
// }
_costMaphero[k] = _costHero _costMaphero[k] = _costHero
} }
} }
for k, v := range szCostHero { for k, v := range szCostHero {
c := this.module.DelCard(session.GetUserId(), _costMaphero[k], v) code = this.module.DelCard(session.GetUserId(), _costMaphero[k], v)
if c != pb.ErrorCode_Success { if code != pb.ErrorCode_Success {
code = c
return return
} }
ChangeList = append(ChangeList, _costMaphero[k]) ChangeList = append(ChangeList, _costMaphero[k])

5
modules/hero/api_strengthenUpStar.go
View File

@ -120,9 +120,8 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
return return
} }
for k, v := range mapCostHero { for k, v := range mapCostHero {
c := this.module.DelCard(session.GetUserId(), CostHeroObj[k], v) code = this.module.DelCard(session.GetUserId(), CostHeroObj[k], v)
if c != pb.ErrorCode_Success { if code != pb.ErrorCode_Success {
code = pb.ErrorCode_DBError
this.module.Errorf("del hero err card:%s,count = %d", k, v) this.module.Errorf("del hero err card:%s,count = %d", k, v)
this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, starConf.Gold, true) // 回退金币 this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, starConf.Gold, true) // 回退金币
return return

47
modules/mainline/api_challengeover.go
View File

@ -23,7 +23,6 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Mainl
func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineChallengeOverReq) (code pb.ErrorCode, data proto.Message) { func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineChallengeOverReq) (code pb.ErrorCode, data proto.Message) {
var ( var (
mainline *pb.DBMainline // 当前章节信息 mainline *pb.DBMainline // 当前章节信息
bBranch bool // 当前挑战关卡是不是分支
res []*cfg.Gameatn // 小章节奖励 res []*cfg.Gameatn // 小章节奖励
) )
res = make([]*cfg.Gameatn, 0) res = make([]*cfg.Gameatn, 0)
@ -56,52 +55,50 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
res = append(res, node.Award...) res = append(res, node.Award...)
mainline.MainlineId = int32(req.MainlineId) mainline.MainlineId = int32(req.MainlineId)
if bBranch {
mainline.BranchID = append(mainline.BranchID, int32(req.MainlineId)) // 记录分支关卡
}
mainline.BranchID = append(mainline.BranchID, int32(req.MainlineId)) mainline.BranchID = append(mainline.BranchID, int32(req.MainlineId))
update := map[string]interface{}{ update := map[string]interface{}{
"mainlineId": req.MainlineId, "mainlineId": req.MainlineId,
"chapterId": mainline.ChapterId, "chapterId": mainline.ChapterId,
"branchID": mainline.BranchID, "branchID": mainline.BranchID,
} }
if node.Episodetype == 5 { // 打完boss 设置领奖状态
update["awaredID"] = pb.AwaredType_TypeAvailable
mainline.AwaredID = pb.AwaredType_TypeAvailable
}
err := this.module.modelMainline.modifyMainlineData(session.GetUserId(), mainline.Id, update) err := this.module.modelMainline.modifyMainlineData(session.GetUserId(), mainline.Id, update)
if err != nil { if err != nil {
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
return return
} }
newChaptConfig := this.module.modelMainline.checkNewCapter(mainline.ChapterId+1, mainline.Intensity, mainline.MainlineId)
if node.EndFlag > 0 { // 切换下个难度 if node.Episodetype == 5 { // 挑战完成 boss关
if mainline.Intensity < comm.MaxMainlineIntensity { // 配置文件校验
_data := &pb.DBMainline{}
_data.Id = primitive.NewObjectID().Hex()
_data.ChapterId = 1 // 默认第一章节
_mData := make(map[string]interface{}, 0)
_data.Uid = session.GetUserId()
_data.Intensity = mainline.Intensity + 1 // 难度+1
_mData[_data.Id] = _data
this.module.modelMainline.addNewChapter(session.GetUserId(), _mData)
session.SendMsg(string(this.module.GetType()), MainlineNewChapterPush, &pb.MainlineNewChapterPush{Data: _data})
}
} else if newChaptConfig != nil {
// 如果本章节打完 则创建新的章节
_data := &pb.DBMainline{} _data := &pb.DBMainline{}
conf := this.module.configure.GetMainlineChapter(mainline.ChapterId + 1)
_data.Id = primitive.NewObjectID().Hex() _data.Id = primitive.NewObjectID().Hex()
_data.ChapterId = mainline.ChapterId + 1 _data.ChapterId = mainline.ChapterId + 1
_data.MainlineId = int32(req.MainlineId) if conf == nil { // 这里就是切换下一个难度了
if mainline.Intensity < comm.MaxMainlineIntensity {
_data.Intensity = mainline.Intensity + 1 // 难度+1
_data.ChapterId = 1 // 默认第一章节
} else { // 全部通关 领奖拜拜
if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success {
this.module.Debugf("DispenseRes err:+%v", res)
}
session.SendMsg(string(this.module.GetType()), MainlineChallengeOverResp, &pb.MainlineChallengeOverResp{Data: mainline})
return
}
}
_mData := make(map[string]interface{}, 0) _mData := make(map[string]interface{}, 0)
_data.Uid = session.GetUserId() _data.Uid = session.GetUserId()
_mData[_data.Id] = _data _mData[_data.Id] = _data
this.module.modelMainline.addNewChapter(session.GetUserId(), _mData) this.module.modelMainline.addNewChapter(session.GetUserId(), _mData)
// 推送新的章节 session.SendMsg(string(this.module.GetType()), MainlineNewChapterPush, &pb.MainlineNewChapterPush{Data: _data}) // 推送新的章节
session.SendMsg(string(this.module.GetType()), MainlineNewChapterPush, &pb.MainlineNewChapterPush{Data: _data})
} }
// 发奖 // 发奖
code = this.module.DispenseRes(session, res, true) if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success {
if code != pb.ErrorCode_Success { this.module.Debugf("DispenseRes err:+%v", res)
return
} }
session.SendMsg(string(this.module.GetType()), MainlineChallengeOverResp, &pb.MainlineChallengeOverResp{Data: mainline}) session.SendMsg(string(this.module.GetType()), MainlineChallengeOverResp, &pb.MainlineChallengeOverResp{Data: mainline})
return return

13
modules/mainline/api_getReward.go
View File

@ -29,21 +29,22 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.MainlineGetRew
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError
return return
} }
if _obj.AwaredID != 0 { if _obj.AwaredID != pb.AwaredType_TypeReceived {
code = pb.ErrorCode_MainlineRepeatReward // 重复领奖 code = pb.ErrorCode_MainlineRepeatReward // 重复领奖
return return
} }
if _obj.AwaredID != pb.AwaredType_TypeAvailable {
code = pb.ErrorCode_MainlineCompleteReward // 通关才能领奖
return
}
// 校验是不是通关了 // 校验是不是通关了
chaptConfig := this.module.configure.GetMainlineChapter(int32(_obj.ChapterId)) // 根据配置文件找 chaptConfig := this.module.configure.GetMainlineChapter(int32(_obj.ChapterId)) // 根据配置文件找
if chaptConfig == nil { if chaptConfig == nil {
code = pb.ErrorCode_ConfigNoFound code = pb.ErrorCode_ConfigNoFound
return return
} }
if chaptConfig.Episode[len(chaptConfig.Episode)-1] != _obj.MainlineId {
code = pb.ErrorCode_MainlineCompleteReward // 通关才能领奖 _obj.AwaredID = pb.AwaredType_TypeReceived // 设置领奖标记
return
}
_obj.AwaredID = 1 // 设置领奖标记
update := map[string]interface{}{ update := map[string]interface{}{
"awaredID": _obj.AwaredID, "awaredID": _obj.AwaredID,
} }

19
modules/mainline/comp_configure.go
View File

@ -17,10 +17,9 @@ const (
///配置管理基础组件 ///配置管理基础组件
type configureComp struct { type configureComp struct {
modules.MCompConfigure modules.MCompConfigure
module *Mainline module *Mainline
hlock sync.RWMutex hlock sync.RWMutex
_mapMainline map[int64]*cfg.GameMainlineData _mapMainline map[int64]*cfg.GameMainlineData
_mapMainlineNextC map[int64]*cfg.GameMainlineData // 获取下一章节的对象
} }
//组件初始化接口 //组件初始化接口
@ -31,10 +30,8 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
game_mainlinechapter: cfg.NewGameMainlineChapter, game_mainlinechapter: cfg.NewGameMainlineChapter,
}) })
this._mapMainline = make(map[int64]*cfg.GameMainlineData, 0) this._mapMainline = make(map[int64]*cfg.GameMainlineData, 0)
this._mapMainlineNextC = make(map[int64]*cfg.GameMainlineData, 0)
configure.RegisterConfigure(game_mainline, cfg.NewGameMainline, this.GetMainline) configure.RegisterConfigure(game_mainline, cfg.NewGameMainline, this.GetMainline)
this.module.modelMainline.checkNewCapter(1, 1, 110)
return return
} }
@ -46,11 +43,6 @@ func (this *configureComp) GetMainline() {
for _, value := range configure.GetDataList() { for _, value := range configure.GetDataList() {
this._mapMainline[int64(value.Id<<16)+int64(value.Intensity)] = value this._mapMainline[int64(value.Id<<16)+int64(value.Intensity)] = value
} }
for _, value := range configure.GetDataList() {
if _, ok := this._mapMainlineNextC[int64(value.Intensity<<16)+int64(value.Chapter)]; !ok {
this._mapMainlineNextC[int64(value.Intensity<<16)+int64(value.Chapter)] = value
}
}
return return
} }
} else { } else {
@ -64,11 +56,6 @@ func (this *configureComp) GetMainlineConfigData(id, intensity int32) *cfg.GameM
return this._mapMainline[int64(id<<16)+int64(intensity)] return this._mapMainline[int64(id<<16)+int64(intensity)]
} }
// intensity + chapter
func (this *configureComp) GetMainlineChapterConfigData(intensity, chapter int32) *cfg.GameMainlineData {
return this._mapMainlineNextC[int64(intensity<<16)+int64(chapter)]
}
//读取配置数据 //读取配置数据
func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { func (this *configureComp) GetConfigure(name string) (v interface{}, err error) {
return configure.GetConfigure(name) return configure.GetConfigure(name)

14
modules/mainline/model_mainline.go
View File

@ -5,7 +5,6 @@ import (
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
) )
type ModelMainline struct { type ModelMainline struct {
@ -42,19 +41,6 @@ func (this *ModelMainline) addNewChapter(uId string, data map[string]interface{}
return nil return nil
} }
// check NewCapter
func (this *ModelMainline) checkNewCapter(chapter, intensity, id int32) *cfg.GameMainlineData {
conf := this.module.configure.GetMainlineChapter(chapter)
if conf != nil {
nextChaptConfig := this.module.configure.GetMainlineChapterConfigData(intensity, chapter) // 查下一章节
if nextChaptConfig.Previoustage == id {
return nextChaptConfig
}
}
return nil
}
// 获取指定章节数据 // 获取指定章节数据
func (this *ModelMainline) getOneChapterInfo(uid, obj string) *pb.DBMainline { func (this *ModelMainline) getOneChapterInfo(uid, obj string) *pb.DBMainline {
data := &pb.DBMainline{} data := &pb.DBMainline{}

2
modules/rtask/api_choose.go
View File

@ -73,7 +73,7 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
return return
} }
if chooseCnf.GotoLevel == "" { if chooseCnf.GotoLevel == 0 {
// 更新完成的任务 // 更新完成的任务
frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId) frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
if rtask.FrtaskIds == nil { if rtask.FrtaskIds == nil {

107
pb/mainline_db.pb.go
View File

@ -20,18 +20,67 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
) )
type AwaredType int32
const (
AwaredType_TypeNil AwaredType = 0
AwaredType_TypeAvailable AwaredType = 1 // 可领取
AwaredType_TypeReceived AwaredType = 2 // 已领取
)
// Enum value maps for AwaredType.
var (
AwaredType_name = map[int32]string{
0: "TypeNil",
1: "TypeAvailable",
2: "TypeReceived",
}
AwaredType_value = map[string]int32{
"TypeNil": 0,
"TypeAvailable": 1,
"TypeReceived": 2,
}
)
func (x AwaredType) Enum() *AwaredType {
p := new(AwaredType)
*p = x
return p
}
func (x AwaredType) String() string {
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
}
func (AwaredType) Descriptor() protoreflect.EnumDescriptor {
return file_mainline_mainline_db_proto_enumTypes[0].Descriptor()
}
func (AwaredType) Type() protoreflect.EnumType {
return &file_mainline_mainline_db_proto_enumTypes[0]
}
func (x AwaredType) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
// Deprecated: Use AwaredType.Descriptor instead.
func (AwaredType) EnumDescriptor() ([]byte, []int) {
return file_mainline_mainline_db_proto_rawDescGZIP(), []int{0}
}
type DBMainline struct { type DBMainline struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
ChapterId int32 `protobuf:"varint,3,opt,name=chapterId,proto3" json:"chapterId" bson:"chapterId"` //章节ID ChapterId int32 `protobuf:"varint,3,opt,name=chapterId,proto3" json:"chapterId" bson:"chapterId"` //章节ID
MainlineId int32 `protobuf:"varint,4,opt,name=mainlineId,proto3" json:"mainlineId" bson:"mainlineId"` //主线关卡ID MainlineId int32 `protobuf:"varint,4,opt,name=mainlineId,proto3" json:"mainlineId" bson:"mainlineId"` //主线关卡ID
AwaredID int32 `protobuf:"varint,5,opt,name=awaredID,proto3" json:"awaredID" bson:"awaredID"` //是否领奖(设置int是考虑后续扩展有多个宝箱情况) AwaredID AwaredType `protobuf:"varint,5,opt,name=awaredID,proto3,enum=AwaredType" json:"awaredID" bson:"awaredID"` //是否领奖(设置int是考虑后续扩展有多个宝箱情况)
BranchID []int32 `protobuf:"varint,6,rep,packed,name=branchID,proto3" json:"branchID" bson:"branchID"` // 记录所有通关的关卡数据 BranchID []int32 `protobuf:"varint,6,rep,packed,name=branchID,proto3" json:"branchID" bson:"branchID"` // 记录所有通关的关卡数据
Intensity int32 `protobuf:"varint,7,opt,name=intensity,proto3" json:"intensity"` // 难度 Intensity int32 `protobuf:"varint,7,opt,name=intensity,proto3" json:"intensity"` // 难度
} }
func (x *DBMainline) Reset() { func (x *DBMainline) Reset() {
@ -94,11 +143,11 @@ func (x *DBMainline) GetMainlineId() int32 {
return 0 return 0
} }
func (x *DBMainline) GetAwaredID() int32 { func (x *DBMainline) GetAwaredID() AwaredType {
if x != nil { if x != nil {
return x.AwaredID return x.AwaredID
} }
return 0 return AwaredType_TypeNil
} }
func (x *DBMainline) GetBranchID() []int32 { func (x *DBMainline) GetBranchID() []int32 {
@ -119,21 +168,25 @@ var File_mainline_mainline_db_proto protoreflect.FileDescriptor
var file_mainline_mainline_db_proto_rawDesc = []byte{ var file_mainline_mainline_db_proto_rawDesc = []byte{
0x0a, 0x1a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x0a, 0x1a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x6c,
0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc2, 0x01, 0x0a, 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a,
0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x52, 0x09, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6d,
0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x0a, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x08, 0x61,
0x77, 0x61, 0x72, 0x65, 0x64, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x77, 0x61, 0x72, 0x65, 0x64, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e,
0x77, 0x61, 0x72, 0x65, 0x64, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x41, 0x77, 0x61, 0x72, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x61, 0x77, 0x61, 0x72,
0x68, 0x49, 0x44, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x64, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x49, 0x44,
0x68, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x49, 0x44,
0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79, 0x18, 0x07, 0x20,
0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79, 0x2a, 0x3e,
0x33, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07,
0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x54, 0x79, 0x70,
0x65, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c,
0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x02, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -148,16 +201,19 @@ func file_mainline_mainline_db_proto_rawDescGZIP() []byte {
return file_mainline_mainline_db_proto_rawDescData return file_mainline_mainline_db_proto_rawDescData
} }
var file_mainline_mainline_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_mainline_mainline_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_mainline_mainline_db_proto_goTypes = []interface{}{ var file_mainline_mainline_db_proto_goTypes = []interface{}{
(*DBMainline)(nil), // 0: DBMainline (AwaredType)(0), // 0: AwaredType
(*DBMainline)(nil), // 1: DBMainline
} }
var file_mainline_mainline_db_proto_depIdxs = []int32{ var file_mainline_mainline_db_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type 0, // 0: DBMainline.awaredID:type_name -> AwaredType
0, // [0:0] is the sub-list for method input_type 1, // [1:1] is the sub-list for method output_type
0, // [0:0] is the sub-list for extension type_name 1, // [1:1] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension extendee 1, // [1:1] is the sub-list for extension type_name
0, // [0:0] is the sub-list for field type_name 1, // [1:1] is the sub-list for extension extendee
0, // [0:1] is the sub-list for field type_name
} }
func init() { file_mainline_mainline_db_proto_init() } func init() { file_mainline_mainline_db_proto_init() }
@ -184,13 +240,14 @@ func file_mainline_mainline_db_proto_init() {
File: protoimpl.DescBuilder{ File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_mainline_mainline_db_proto_rawDesc, RawDescriptor: file_mainline_mainline_db_proto_rawDesc,
NumEnums: 0, NumEnums: 1,
NumMessages: 1, NumMessages: 1,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },
GoTypes: file_mainline_mainline_db_proto_goTypes, GoTypes: file_mainline_mainline_db_proto_goTypes,
DependencyIndexes: file_mainline_mainline_db_proto_depIdxs, DependencyIndexes: file_mainline_mainline_db_proto_depIdxs,
EnumInfos: file_mainline_mainline_db_proto_enumTypes,
MessageInfos: file_mainline_mainline_db_proto_msgTypes, MessageInfos: file_mainline_mainline_db_proto_msgTypes,
}.Build() }.Build()
File_mainline_mainline_db_proto = out.File File_mainline_mainline_db_proto = out.File

8
sys/configure/structs/Game.MainlineData.go
View File

@ -17,16 +17,12 @@ type GameMainlineData struct {
EndFlag int32 EndFlag int32
Previoustage int32 Previoustage int32
Order int32 Order int32
Linearnum int32
Chapter int32 Chapter int32
Episodetype int32 Episodetype int32
Episodelocation serialization.Vector2 Episodelocation serialization.Vector2
Model string
Effect string
FormatList []int32 FormatList []int32
CaptainId string CaptainId string
Battlescene string Battlescene string
Sceneeffect string
Award []*Gameatn Award []*Gameatn
Title string Title string
Desc string Desc string
@ -46,7 +42,6 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endFlag"].(float64); !_ok_ { err = errors.New("endFlag error"); return }; _v.EndFlag = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endFlag"].(float64); !_ok_ { err = errors.New("endFlag error"); return }; _v.EndFlag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["order"].(float64); !_ok_ { err = errors.New("order error"); return }; _v.Order = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["order"].(float64); !_ok_ { err = errors.New("order error"); return }; _v.Order = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["linearnum"].(float64); !_ok_ { err = errors.New("linearnum error"); return }; _v.Linearnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) }
{ var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["Episodelocation"].(map[string]interface{}); !_ok_ { err = errors.New("Episodelocation error"); return } { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["Episodelocation"].(map[string]interface{}); !_ok_ { err = errors.New("Episodelocation error"); return }
@ -56,8 +51,6 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error)
_v.Episodelocation = serialization.NewVector2(_x_, _y_) _v.Episodelocation = serialization.NewVector2(_x_, _y_)
} }
{ var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } }
{ var _ok_ bool; if _v.Effect, _ok_ = _buf["effect"].(string); !_ok_ { err = errors.New("effect error"); return } }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool
@ -74,7 +67,6 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } } { var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } }
{ var _ok_ bool; if _v.Battlescene, _ok_ = _buf["battlescene"].(string); !_ok_ { err = errors.New("battlescene error"); return } } { var _ok_ bool; if _v.Battlescene, _ok_ = _buf["battlescene"].(string); !_ok_ { err = errors.New("battlescene error"); return } }
{ var _ok_ bool; if _v.Sceneeffect, _ok_ = _buf["sceneeffect"].(string); !_ok_ { err = errors.New("sceneeffect error"); return } }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

4
sys/configure/structs/game.rdtaskChooseData.go
View File

@ -14,7 +14,7 @@ type GameRdtaskChooseData struct {
Id int32 Id int32
Num int32 Num int32
PreTid int32 PreTid int32
GotoLevel string GotoLevel int32
NeedItem []int32 NeedItem []int32
} }
@ -28,7 +28,7 @@ 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["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["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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) }
{ var _ok_ bool; if _v.GotoLevel, _ok_ = _buf["gotoLevel"].(string); !_ok_ { err = errors.New("gotoLevel error"); return } } { 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 _arr_ []interface{}
var _ok_ bool var _ok_ bool

4
sys/configure/structs/game.taskRoundData.go
View File

@ -20,7 +20,7 @@ type GameTaskRoundData struct {
RestrictiveCondition int32 RestrictiveCondition int32
Active int32 Active int32
IdAfter int32 IdAfter int32
JumpInterface string JumpInterface int32
Icon string Icon string
Reword []*Gameatn Reword []*Gameatn
} }
@ -41,7 +41,7 @@ func (_v *GameTaskRoundData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["restrictive_condition"].(float64); !_ok_ { err = errors.New("restrictive_condition error"); return }; _v.RestrictiveCondition = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["restrictive_condition"].(float64); !_ok_ { err = errors.New("restrictive_condition error"); return }; _v.RestrictiveCondition = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_after"].(float64); !_ok_ { err = errors.New("id_after error"); return }; _v.IdAfter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_after"].(float64); !_ok_ { err = errors.New("id_after error"); return }; _v.IdAfter = int32(_tempNum_) }
{ var _ok_ bool; if _v.JumpInterface, _ok_ = _buf["jump_interface"].(string); !_ok_ { err = errors.New("jump_interface error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jump_interface"].(float64); !_ok_ { err = errors.New("jump_interface error"); return }; _v.JumpInterface = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ {
var _arr_ []interface{} var _arr_ []interface{}