diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json index 4231094c8..d67a8eb00 100644 --- a/bin/json/game_playerinfor_overview.json +++ b/bin/json/game_playerinfor_overview.json @@ -12,6 +12,7 @@ "vague": "Person/10000/10000MT.prefab", "pvpAnimator": "Person/10000/10000_MPvp.controller", "mainq": "Person/10000/10000M_q.prefab", + "vagueq": "Person/10000/10000MT_q.prefab", "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_1", @@ -31,6 +32,7 @@ "vague": "Person/10000/10000WT.prefab", "pvpAnimator": "Person/10000/10000_WPvp.controller", "mainq": "Person/10000/10000W_q.prefab", + "vagueq": "Person/10000/10000WT_q.prefab", "playerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_2", @@ -50,6 +52,7 @@ "vague": "", "pvpAnimator": "", "mainq": "", + "vagueq": "", "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_3", @@ -69,6 +72,7 @@ "vague": "", "pvpAnimator": "", "mainq": "", + "vagueq": "", "playerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_4", @@ -88,6 +92,7 @@ "vague": "", "pvpAnimator": "", "mainq": "", + "vagueq": "", "playerhead": "tx_js_nz", "name": { "key": "playerinfor_playerinfor_overview_name_5", @@ -107,6 +112,7 @@ "vague": "", "pvpAnimator": "", "mainq": "", + "vagueq": "", "playerhead": "tx_js_nvz", "name": { "key": "playerinfor_playerinfor_overview_name_6", diff --git a/bin/json/game_pushgift.json b/bin/json/game_pushgift.json index 5c6cab357..fecd6c689 100644 --- a/bin/json/game_pushgift.json +++ b/bin/json/game_pushgift.json @@ -12,7 +12,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1001, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 1500, "isdayrepeat": 0, @@ -32,7 +38,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1002, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 1000, "isdayrepeat": 0, @@ -52,7 +64,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1003, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 1000, "isdayrepeat": 0, @@ -72,7 +90,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1004, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 900, "isdayrepeat": 0, @@ -92,7 +116,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1005, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 900, "isdayrepeat": 0, @@ -112,7 +142,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1006, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 600, "isdayrepeat": 0, @@ -132,7 +168,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1007, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 600, "isdayrepeat": 0, @@ -152,7 +194,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1008, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 1500, "isdayrepeat": 0, @@ -172,7 +220,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1009, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 1000, "isdayrepeat": 0, @@ -192,7 +246,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1010, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 1000, "isdayrepeat": 0, @@ -212,7 +272,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1011, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 900, "isdayrepeat": 0, @@ -232,7 +298,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1012, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 900, "isdayrepeat": 0, @@ -252,7 +324,13 @@ "resource": "", "integral": [], "condition": 0, - "lbid": 1013, + "lbid": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ], "time": 240, "rebate": 600, "isdayrepeat": 0, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index e40e6c3f9..9aafde824 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -22,6 +22,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -53,6 +54,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -84,6 +86,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -115,6 +118,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -146,6 +150,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -178,6 +183,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -210,6 +216,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -245,6 +252,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -277,6 +285,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -309,6 +318,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -339,6 +349,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -369,6 +380,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -401,6 +413,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -433,6 +446,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -461,6 +475,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -491,6 +506,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -520,6 +536,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -548,6 +565,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -576,6 +594,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -605,6 +624,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -635,6 +655,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -665,6 +686,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -693,6 +715,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -726,6 +749,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -754,6 +778,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -782,6 +807,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -811,6 +837,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -839,6 +866,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -869,6 +897,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -898,6 +927,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -926,6 +956,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -954,6 +985,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -982,6 +1014,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1015,6 +1048,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1048,6 +1082,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -1076,6 +1111,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1109,6 +1145,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1137,6 +1174,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1169,6 +1207,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1197,6 +1236,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1230,6 +1270,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1263,6 +1304,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -1295,6 +1337,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 10, "SameID": false, @@ -1329,6 +1372,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 10, "SameID": false, @@ -1358,6 +1402,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1390,6 +1435,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 8, "SameID": false, @@ -1419,6 +1465,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1448,6 +1495,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1480,6 +1528,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1509,6 +1558,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1541,6 +1591,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 5, "SameID": false, @@ -1573,6 +1624,7 @@ ], "AddEffect": true, "RemoveType": false, + "Priority": 0, "NotOverlay": 1, "OverlayTimes": 5, "SameID": false, @@ -1604,6 +1656,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 50, "SameID": false, @@ -1635,6 +1688,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1663,6 +1717,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1694,6 +1749,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1726,6 +1782,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 2, "SameID": false, @@ -1756,6 +1813,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1787,6 +1845,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 8, "SameID": false, @@ -1818,6 +1877,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1849,6 +1909,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1880,6 +1941,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1911,6 +1973,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1942,6 +2005,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -1973,6 +2037,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2004,6 +2069,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2035,6 +2101,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2066,6 +2133,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2097,6 +2165,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2128,6 +2197,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2159,6 +2229,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2190,6 +2261,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2221,6 +2293,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2252,6 +2325,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2283,6 +2357,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2314,6 +2389,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2345,6 +2421,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2376,6 +2453,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2407,6 +2485,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2438,6 +2517,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2469,6 +2549,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2500,6 +2581,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2531,6 +2613,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2562,6 +2645,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2593,6 +2677,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2624,6 +2709,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2659,6 +2745,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": true, @@ -2689,6 +2776,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2719,6 +2807,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2752,6 +2841,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, @@ -2783,6 +2873,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -2815,6 +2906,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, @@ -2845,6 +2937,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -2876,6 +2969,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -2906,6 +3000,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, @@ -2936,6 +3031,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -2966,6 +3062,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, @@ -2996,6 +3093,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3024,6 +3122,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, @@ -3054,6 +3153,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, @@ -3084,6 +3184,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, @@ -3114,6 +3215,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3146,6 +3248,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3176,6 +3279,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3209,6 +3313,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -3237,6 +3342,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3267,6 +3373,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3297,6 +3404,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 10, "SameID": false, @@ -3326,6 +3434,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3358,6 +3467,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, @@ -3389,6 +3499,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3419,6 +3530,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 5, "SameID": true, @@ -3450,6 +3562,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": false, @@ -3478,6 +3591,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3511,6 +3625,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": true, @@ -3542,6 +3657,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -3571,6 +3687,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, @@ -3602,6 +3719,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -3635,6 +3753,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3666,6 +3785,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 3, "SameID": false, @@ -3697,6 +3817,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3728,6 +3849,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3759,6 +3881,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3790,6 +3913,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3818,6 +3942,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3850,6 +3975,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3882,6 +4008,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -3913,6 +4040,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -3945,6 +4073,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": true, @@ -3974,6 +4103,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -4004,6 +4134,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, "SameID": false, @@ -4032,6 +4163,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -4060,6 +4192,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4091,6 +4224,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -4122,6 +4256,7 @@ ], "AddEffect": false, "RemoveType": true, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 0, "SameID": false, @@ -4153,6 +4288,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4181,6 +4317,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4212,6 +4349,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4243,6 +4381,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4274,6 +4413,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4305,6 +4445,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4336,6 +4477,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4367,6 +4509,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4398,6 +4541,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4429,6 +4573,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -4460,6 +4605,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4491,6 +4637,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4522,6 +4669,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4553,6 +4701,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4584,6 +4733,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4615,6 +4765,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4646,6 +4797,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, "SameID": true, @@ -4677,6 +4829,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, "SameID": true, @@ -4708,6 +4861,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4738,6 +4892,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 1, "OverlayTimes": 1, "SameID": false, @@ -4769,6 +4924,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4800,6 +4956,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4831,6 +4988,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4862,6 +5020,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4893,6 +5052,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4924,6 +5084,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4955,6 +5116,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -4986,6 +5148,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5017,6 +5180,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5048,6 +5212,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5079,6 +5244,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5110,6 +5276,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5141,6 +5308,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5174,6 +5342,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5207,6 +5376,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5238,6 +5408,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, "SameID": true, @@ -5269,6 +5440,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 6, "SameID": true, @@ -5300,6 +5472,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5331,6 +5504,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, @@ -5362,6 +5536,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 1, "SameID": false, @@ -5393,6 +5568,7 @@ ], "AddEffect": false, "RemoveType": false, + "Priority": 0, "NotOverlay": 0, "OverlayTimes": 99, "SameID": true, diff --git a/comm/const.go b/comm/const.go index 90d4a0557..bea127fcf 100644 --- a/comm/const.go +++ b/comm/const.go @@ -345,6 +345,8 @@ const ( //开服任务 TableStoryline = "storyline" + + TableGameMiner = "miner" ) // RPC服务接口定义处 diff --git a/modules/uigame/api_getminer.go b/modules/uigame/api_getminer.go new file mode 100644 index 000000000..24b0554ba --- /dev/null +++ b/modules/uigame/api_getminer.go @@ -0,0 +1,77 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + "go_dreamfactory/utils" +) + +//参数校验 +func (this *apiComp) GetMinerCheck(session comm.IUserSession, req *pb.UiGameGetMinerReq) (errdata *pb.ErrorData) { + + return +} + +func (this *apiComp) GetMiner(session comm.IUserSession, req *pb.UiGameGetMinerReq) (errdata *pb.ErrorData) { + if errdata = this.GetMinerCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + var ( + activity *pb.DBHuodong + err error + hdData *pb.DBMinerData // 玩家的活动数据 + update map[string]interface{} // + ) + update = make(map[string]interface{}) + curTime := configure.Now().Unix() + if activity, err = this.module.ModuleActivity.GetHdInfoByHdId(req.Hdid); err != nil { // 活动不存在 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityInvalid, + Title: pb.ErrorCode_ActivityInvalid.ToString(), + } + return + } + if activity.Stime > curTime || curTime > activity.Etime { // 不在活动范围内数据不给活动记录数据 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityNotIntime, + Title: pb.ErrorCode_ActivityNotIntime.ToString(), + } + return + } + + // 获取玩家活动数据 + hdData, _ = this.module.modelMiner.getMinerList(session.GetUserId(), activity.Id) + if e, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { + + if conf, err := this.module.configure.GetMinerConsumConf(); err == nil { + bchange := false + // 清除每日获得的碎片数据 + if !utils.IsToday(hdData.Lasttime) { + hdData.Lasttime = configure.Now().Unix() + hdData.Val = 0 + update["val"] = hdData.Val + update["lasttime"] = hdData.Lasttime + bchange = true + } + if conf.Getmax > hdData.Val { // 超过今日上限 + if e.ConsumPs/conf.Usepawer >= hdData.Val { + hdData.Val = e.ConsumPs / conf.Usepawer + if conf.Getmax < hdData.Val { // 超过今日上限 + hdData.Val = conf.Getmax + update["val"] = hdData.Val + bchange = true + } + } + } + if bchange { + this.module.modelMiner.modifyMinerListByObjId(session.GetUserId(), update) + } + } + } + + list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) + + session.SendMsg(string(this.module.GetType()), "getminer", &pb.UiGameGetMinerResp{Data: list}) + return +} diff --git a/modules/uigame/api_getlist.go b/modules/uigame/api_getpuzzle.go similarity index 100% rename from modules/uigame/api_getlist.go rename to modules/uigame/api_getpuzzle.go diff --git a/modules/uigame/api_minerfinish.go b/modules/uigame/api_minerfinish.go new file mode 100644 index 000000000..ccae8d127 --- /dev/null +++ b/modules/uigame/api_minerfinish.go @@ -0,0 +1,61 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +//参数校验 +func (this *apiComp) MinerFinishCheck(session comm.IUserSession, req *pb.UiGameMinerFinishReq) (errdata *pb.ErrorData) { + if req.Hdid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + } + return +} + +// 点击某个格子进行拼图 +func (this *apiComp) MinerFinish(session comm.IUserSession, req *pb.UiGameMinerFinishReq) (errdata *pb.ErrorData) { + if errdata = this.MinerFinishCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + + var ( + atno []*pb.UserAtno + ) + list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) + if conf, err := this.module.configure.GetMinerConsumConf(); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } else { + list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) + if list.BReward { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityRepatReward, + Title: pb.ErrorCode_ActivityRepatReward.ToString(), + } + return + } + + if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); errdata != nil { + return + } + // 记录数据 + list.BReward = true + update := make(map[string]interface{}, 0) + update["bReward"] = list.BReward + this.module.modelMiner.modifyMinerListByObjId(session.GetUserId(), update) // 修改进度 + } + + session.SendMsg(string(this.module.GetType()), "minerFinish", &pb.UiGameMinerFinishResp{ + Data: list, + Atno: atno, + }) + return +} diff --git a/modules/uigame/api_minergrid.go b/modules/uigame/api_minergrid.go new file mode 100644 index 000000000..6296b15cd --- /dev/null +++ b/modules/uigame/api_minergrid.go @@ -0,0 +1,57 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +//参数校验 +func (this *apiComp) MinerKeyCheck(session comm.IUserSession, req *pb.UiGameMinerKeyReq) (errdata *pb.ErrorData) { + if req.Hdid == "" { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + } + return + } + return +} + +// 点击某个格子进行拼图 +func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyReq) (errdata *pb.ErrorData) { + if errdata = this.MinerKeyCheck(session, req); errdata != nil { + return // 参数校验失败直接返回 + } + var ( + atno []*pb.UserAtno + ) + list, _ := this.module.modelMiner.getMinerList(session.GetUserId(), req.Hdid) + if _, ok := list.Gotarr[req.Cid]; ok { // 重复拼图 + return + } + + // 校验消耗 + if conf, err := this.module.configure.GetMinerConsumConf(); err == nil { + if conf.Cost.N > 0 { + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{conf.Cost}, true); errdata != nil { + return + } + } + if conf.Itemget.N > 0 { + if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{conf.Itemget}, true); errdata != nil { + return + } + } + } + + list.Gotarr[req.Cid] = 1 + update := make(map[string]interface{}, 0) + update["gotarr"] = list.Gotarr + this.module.modelMiner.modifyMinerListByObjId(session.GetUserId(), update) // 修改进度 + session.SendMsg(string(this.module.GetType()), "minerkey", &pb.UiGameMinerKeyResp{ + Data: list, + Atno: atno, + }) + return +} diff --git a/modules/uigame/comp_configure.go b/modules/uigame/comp_configure.go index bac2df365..9d509ae72 100644 --- a/modules/uigame/comp_configure.go +++ b/modules/uigame/comp_configure.go @@ -1,27 +1,26 @@ package uigame import ( - "fmt" + "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - "sync" ) -var moduleName = "viking" +var moduleName = "uigame" const ( game_puzzle = "game_uigamepuzzle.json" game_lattice = "game_uigamelattice.json" + game_miner = "game_uigameminer.json" game_consum = "game_uigameconsum.json" ) ///配置管理基础组件 type configureComp struct { module *UiGame - hlock sync.RWMutex modules.MCompConfigure } @@ -32,6 +31,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.LoadMultiConfigure(map[string]interface{}{ game_puzzle: cfg.NewGameUiGamePuzzle, game_lattice: cfg.NewGameUiGameLattice, + game_miner: cfg.NewGameUiGameMiner, game_consum: cfg.NewGameUiGameConsum, }) @@ -81,7 +81,7 @@ func (this *configureComp) GetPuzzleConsumConf() (conf *cfg.GameUiGameConsumData } } } - this.module.Errorf("GetPuzzleConf conf not found key :puzzle") + err = comm.NewNotFoundConfErr(moduleName, game_consum, "1") return } @@ -96,7 +96,7 @@ func (this *configureComp) GetLatticeConsumConf() (conf *cfg.GameUiGameConsumDat } } } - this.module.Errorf("GetLatticeConsumConf conf not found key :puzzle") + err = comm.NewNotFoundConfErr(moduleName, game_consum, "2") return } @@ -111,7 +111,36 @@ func (this *configureComp) GetLatticeConf(id int32) (conf *cfg.GameUiGameLattice } } } - err = fmt.Errorf("GetLatticeConf conf not found key :%d", id) - this.module.Errorf("GetLatticeConf conf not found key :%d", id) + err = comm.NewNotFoundConfErr(moduleName, game_lattice, id) + return +} + +// 获取矿工体力消耗 +func (this *configureComp) GetMinerConsumConf() (conf *cfg.GameUiGameConsumData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_consum); err == nil { + if configure, ok := v.(*cfg.GameUiGameConsum); ok { + if conf = configure.Get(3); conf != nil { + return + } + } + } + err = comm.NewNotFoundConfErr(moduleName, game_consum, "3") + return +} +func (this *configureComp) GetMinerConf(id int32) (conf *cfg.GameUiGameMinerData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_miner); err == nil { + if configure, ok := v.(*cfg.GameUiGameMiner); ok { + if conf = configure.Get(id); conf != nil { + return + } + } + } + err = comm.NewNotFoundConfErr(moduleName, game_miner, id) return } diff --git a/modules/uigame/model_miner.go b/modules/uigame/model_miner.go new file mode 100644 index 000000000..c8600b898 --- /dev/null +++ b/modules/uigame/model_miner.go @@ -0,0 +1,55 @@ +package uigame + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelMiner struct { + modules.MCompModel + module *UiGame +} + +func (this *modelMiner) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = string(comm.TableGameMiner) + err = this.MCompModel.Init(service, module, comp, options) + this.module = module.(*UiGame) + // uid 创建索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +func (this *modelMiner) getMinerList(uid string, hid string) (result *pb.DBMinerData, err error) { + result = &pb.DBMinerData{} + if err = this.Get(uid, result); err != nil { + if mgo.MongodbNil == err { + result = &pb.DBMinerData{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Hdoid: hid, + Gotarr: map[int32]int32{}, + Lasttime: 0, + Val: 0, + BReward: false, + } + err = nil + this.module.modelMiner.Add(uid, result) + } + return + } + err = nil + return result, err +} + +func (this *modelMiner) modifyMinerListByObjId(uid string, data map[string]interface{}) error { + return this.Change(uid, data) +} diff --git a/modules/uigame/module.go b/modules/uigame/module.go index 9149502c0..67d79a677 100644 --- a/modules/uigame/module.go +++ b/modules/uigame/module.go @@ -19,6 +19,7 @@ type UiGame struct { configure *configureComp service base.IRPCXService modelLattice *modelLattice + modelMiner *modelMiner } func NewModule() core.IModule { @@ -40,6 +41,7 @@ func (this *UiGame) OnInstallComp() { this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelPuzzle = this.RegisterComp(new(modelPuzzle)).(*modelPuzzle) this.modelLattice = this.RegisterComp(new(modelLattice)).(*modelLattice) + this.modelMiner = this.RegisterComp(new(modelMiner)).(*modelMiner) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } @@ -99,4 +101,100 @@ func (this *UiGame) HDPSTodayConsum(uid string, ps int32) { } } } + if v, ok := activity[pb.HdType_HdLattice]; ok { // 迷宫小游戏 + if v.Stime <= curTime && curTime <= v.Etime { // 活动时间范围内 + if rst, err := this.modelLattice.getLatticeList(uid, v.Id); err == nil { + if conf, err := this.configure.GetLatticeConsumConf(); err == nil { + update := make(map[string]interface{}) + // 清除每日获得的碎片数据 + if !utils.IsToday(rst.Lasttime) { + rst.Lasttime = configure.Now().Unix() + rst.Val = 0 + update["val"] = rst.Val + update["lasttime"] = rst.Lasttime + } + if conf.Getmax > rst.Val { // 超过今日上限 + tmp := ps / conf.Usepawer + if tmp > rst.Val { + l := rst.Val + rst.Val = tmp + if conf.Getmax < rst.Val { // 超过今日上限 + rst.Val = conf.Getmax + } + sub := rst.Val - l // 增长的 + s, ok := this.GetUserSession(uid) + if sub > 0 { + var res *cfg.Gameatn + res = &cfg.Gameatn{ + A: conf.Itemget.A, + T: conf.Itemget.T, + N: conf.Itemget.N * sub, + } + this.DispenseRes(s, []*cfg.Gameatn{res}, true) + } + + update["val"] = rst.Val + + this.modelLattice.modifyLatticeListByObjId(uid, update) + // 推送活动数据进度变化 + if ok { + s.SendMsg(string(this.GetType()), "latticechange", &pb.UiGameLatticeChangePush{ + Data: rst, + }) + s.Push() + } + } + } + } + } + } + } + if v, ok := activity[pb.HdType_HdMiner]; ok { // 矿工小游戏 + if v.Stime <= curTime && curTime <= v.Etime { // 活动时间范围内 + if rst, err := this.modelMiner.getMinerList(uid, v.Id); err == nil { + if conf, err := this.configure.GetMinerConsumConf(); err == nil { + update := make(map[string]interface{}) + // 清除每日获得的碎片数据 + if !utils.IsToday(rst.Lasttime) { + rst.Lasttime = configure.Now().Unix() + rst.Val = 0 + update["val"] = rst.Val + update["lasttime"] = rst.Lasttime + } + if conf.Getmax > rst.Val { // 超过今日上限 + tmp := ps / conf.Usepawer + if tmp > rst.Val { + l := rst.Val + rst.Val = tmp + if conf.Getmax < rst.Val { // 超过今日上限 + rst.Val = conf.Getmax + } + sub := rst.Val - l // 增长的 + s, ok := this.GetUserSession(uid) + if sub > 0 { + var res *cfg.Gameatn + res = &cfg.Gameatn{ + A: conf.Itemget.A, + T: conf.Itemget.T, + N: conf.Itemget.N * sub, + } + this.DispenseRes(s, []*cfg.Gameatn{res}, true) + } + + update["val"] = rst.Val + + this.modelMiner.modifyMinerListByObjId(uid, update) + // 推送活动数据进度变化 + if ok { + s.SendMsg(string(this.GetType()), "minerchange", &pb.UiGameMinerChangePush{ + Data: rst, + }) + s.Push() + } + } + } + } + } + } + } } diff --git a/pb/uigame_msg.pb.go b/pb/uigame_msg.pb.go index 2b6c2a6b6..b3af37d24 100644 --- a/pb/uigame_msg.pb.go +++ b/pb/uigame_msg.pb.go @@ -807,6 +807,53 @@ func (x *UiGameLatticeFinishResp) GetAtno() []*UserAtno { return nil } +type UiGameLatticeChangePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLatticeData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *UiGameLatticeChangePush) Reset() { + *x = UiGameLatticeChangePush{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameLatticeChangePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameLatticeChangePush) ProtoMessage() {} + +func (x *UiGameLatticeChangePush) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UiGameLatticeChangePush.ProtoReflect.Descriptor instead. +func (*UiGameLatticeChangePush) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *UiGameLatticeChangePush) GetData() *DBLatticeData { + if x != nil { + return x.Data + } + return nil +} + ////////////矿工 type UiGameGetMinerReq struct { state protoimpl.MessageState @@ -819,7 +866,7 @@ type UiGameGetMinerReq struct { func (x *UiGameGetMinerReq) Reset() { *x = UiGameGetMinerReq{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[15] + mi := &file_uigame_uigame_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -832,7 +879,7 @@ func (x *UiGameGetMinerReq) String() string { func (*UiGameGetMinerReq) ProtoMessage() {} func (x *UiGameGetMinerReq) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[15] + mi := &file_uigame_uigame_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -845,7 +892,7 @@ func (x *UiGameGetMinerReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameGetMinerReq.ProtoReflect.Descriptor instead. func (*UiGameGetMinerReq) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{15} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{16} } func (x *UiGameGetMinerReq) GetHdid() string { @@ -867,7 +914,7 @@ type UiGameGetMinerResp struct { func (x *UiGameGetMinerResp) Reset() { *x = UiGameGetMinerResp{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[16] + mi := &file_uigame_uigame_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -880,7 +927,7 @@ func (x *UiGameGetMinerResp) String() string { func (*UiGameGetMinerResp) ProtoMessage() {} func (x *UiGameGetMinerResp) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[16] + mi := &file_uigame_uigame_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -893,7 +940,7 @@ func (x *UiGameGetMinerResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameGetMinerResp.ProtoReflect.Descriptor instead. func (*UiGameGetMinerResp) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{16} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{17} } func (x *UiGameGetMinerResp) GetData() *DBMinerData { @@ -915,7 +962,7 @@ type UiGameMinerKeyReq struct { func (x *UiGameMinerKeyReq) Reset() { *x = UiGameMinerKeyReq{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[17] + mi := &file_uigame_uigame_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -928,7 +975,7 @@ func (x *UiGameMinerKeyReq) String() string { func (*UiGameMinerKeyReq) ProtoMessage() {} func (x *UiGameMinerKeyReq) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[17] + mi := &file_uigame_uigame_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -941,7 +988,7 @@ func (x *UiGameMinerKeyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerKeyReq.ProtoReflect.Descriptor instead. func (*UiGameMinerKeyReq) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{17} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{18} } func (x *UiGameMinerKeyReq) GetHdid() string { @@ -970,7 +1017,7 @@ type UiGameMinerKeyResp struct { func (x *UiGameMinerKeyResp) Reset() { *x = UiGameMinerKeyResp{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[18] + mi := &file_uigame_uigame_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -983,7 +1030,7 @@ func (x *UiGameMinerKeyResp) String() string { func (*UiGameMinerKeyResp) ProtoMessage() {} func (x *UiGameMinerKeyResp) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[18] + mi := &file_uigame_uigame_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -996,7 +1043,7 @@ func (x *UiGameMinerKeyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerKeyResp.ProtoReflect.Descriptor instead. func (*UiGameMinerKeyResp) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{18} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{19} } func (x *UiGameMinerKeyResp) GetData() *DBMinerData { @@ -1020,12 +1067,13 @@ type UiGameMinerRewardReq struct { unknownFields protoimpl.UnknownFields Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 活动ID + Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id"` } func (x *UiGameMinerRewardReq) Reset() { *x = UiGameMinerRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[19] + mi := &file_uigame_uigame_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1038,7 +1086,7 @@ func (x *UiGameMinerRewardReq) String() string { func (*UiGameMinerRewardReq) ProtoMessage() {} func (x *UiGameMinerRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[19] + mi := &file_uigame_uigame_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1051,7 +1099,7 @@ func (x *UiGameMinerRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerRewardReq.ProtoReflect.Descriptor instead. func (*UiGameMinerRewardReq) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{19} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{20} } func (x *UiGameMinerRewardReq) GetHdid() string { @@ -1061,6 +1109,13 @@ func (x *UiGameMinerRewardReq) GetHdid() string { return "" } +func (x *UiGameMinerRewardReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + // 获取活动列表 type UiGameMinerRewardResp struct { state protoimpl.MessageState @@ -1074,7 +1129,7 @@ type UiGameMinerRewardResp struct { func (x *UiGameMinerRewardResp) Reset() { *x = UiGameMinerRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[20] + mi := &file_uigame_uigame_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1087,7 +1142,7 @@ func (x *UiGameMinerRewardResp) String() string { func (*UiGameMinerRewardResp) ProtoMessage() {} func (x *UiGameMinerRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[20] + mi := &file_uigame_uigame_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1100,7 +1155,7 @@ func (x *UiGameMinerRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerRewardResp.ProtoReflect.Descriptor instead. func (*UiGameMinerRewardResp) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{20} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{21} } func (x *UiGameMinerRewardResp) GetData() *DBMinerData { @@ -1129,7 +1184,7 @@ type UiGameMinerChangePush struct { func (x *UiGameMinerChangePush) Reset() { *x = UiGameMinerChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_uigame_uigame_msg_proto_msgTypes[21] + mi := &file_uigame_uigame_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1142,7 +1197,7 @@ func (x *UiGameMinerChangePush) String() string { func (*UiGameMinerChangePush) ProtoMessage() {} func (x *UiGameMinerChangePush) ProtoReflect() protoreflect.Message { - mi := &file_uigame_uigame_msg_proto_msgTypes[21] + mi := &file_uigame_uigame_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1155,7 +1210,7 @@ func (x *UiGameMinerChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use UiGameMinerChangePush.ProtoReflect.Descriptor instead. func (*UiGameMinerChangePush) Descriptor() ([]byte, []int) { - return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{21} + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{22} } func (x *UiGameMinerChangePush) GetData() *DBMinerData { @@ -1165,6 +1220,108 @@ func (x *UiGameMinerChangePush) GetData() *DBMinerData { return nil } +type UiGameMinerFinishReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 活动ID +} + +func (x *UiGameMinerFinishReq) Reset() { + *x = UiGameMinerFinishReq{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameMinerFinishReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameMinerFinishReq) ProtoMessage() {} + +func (x *UiGameMinerFinishReq) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[23] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UiGameMinerFinishReq.ProtoReflect.Descriptor instead. +func (*UiGameMinerFinishReq) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{23} +} + +func (x *UiGameMinerFinishReq) GetHdid() string { + if x != nil { + return x.Hdid + } + return "" +} + +type UiGameMinerFinishResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBMinerData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` // 奖励 +} + +func (x *UiGameMinerFinishResp) Reset() { + *x = UiGameMinerFinishResp{} + if protoimpl.UnsafeEnabled { + mi := &file_uigame_uigame_msg_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UiGameMinerFinishResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UiGameMinerFinishResp) ProtoMessage() {} + +func (x *UiGameMinerFinishResp) ProtoReflect() protoreflect.Message { + mi := &file_uigame_uigame_msg_proto_msgTypes[24] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UiGameMinerFinishResp.ProtoReflect.Descriptor instead. +func (*UiGameMinerFinishResp) Descriptor() ([]byte, []int) { + return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{24} +} + +func (x *UiGameMinerFinishResp) GetData() *DBMinerData { + if x != nil { + return x.Data + } + return nil +} + +func (x *UiGameMinerFinishResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + var File_uigame_uigame_msg_proto protoreflect.FileDescriptor var file_uigame_uigame_msg_proto_rawDesc = []byte{ @@ -1236,35 +1393,48 @@ var file_uigame_uigame_msg_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, - 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x69, 0x47, 0x61, 0x6d, - 0x65, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, + 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x3d, 0x0a, 0x17, 0x55, 0x69, 0x47, 0x61, 0x6d, + 0x65, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, + 0x47, 0x65, 0x74, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, + 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, + 0x36, 0x0a, 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x6e, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, 0x0a, 0x11, 0x55, 0x69, 0x47, 0x61, 0x6d, + 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, - 0x22, 0x36, 0x0a, 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4d, 0x69, 0x6e, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x39, 0x0a, 0x11, 0x55, 0x69, 0x47, 0x61, - 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, - 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x63, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, - 0x65, 0x72, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, - 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, - 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x2a, 0x0a, 0x14, 0x55, 0x69, - 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, + 0x69, 0x64, 0x22, 0x55, 0x0a, 0x12, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, + 0x72, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, + 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, + 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x3a, 0x0a, 0x14, 0x55, 0x69, 0x47, + 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, + 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, + 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, + 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, + 0x39, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, + 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2a, 0x0a, 0x14, 0x55, 0x69, + 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, 0x58, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, - 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, - 0x22, 0x39, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x43, - 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x4d, 0x69, 0x6e, 0x65, - 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1279,7 +1449,7 @@ func file_uigame_uigame_msg_proto_rawDescGZIP() []byte { return file_uigame_uigame_msg_proto_rawDescData } -var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25) var file_uigame_uigame_msg_proto_goTypes = []interface{}{ (*UiGameGetPuzzleReq)(nil), // 0: UiGameGetPuzzleReq (*UiGameGetPuzzleResp)(nil), // 1: UiGameGetPuzzleResp @@ -1296,43 +1466,49 @@ var file_uigame_uigame_msg_proto_goTypes = []interface{}{ (*UiGameLatticeRewardResp)(nil), // 12: UiGameLatticeRewardResp (*UiGameLatticeFinishReq)(nil), // 13: UiGameLatticeFinishReq (*UiGameLatticeFinishResp)(nil), // 14: UiGameLatticeFinishResp - (*UiGameGetMinerReq)(nil), // 15: UiGameGetMinerReq - (*UiGameGetMinerResp)(nil), // 16: UiGameGetMinerResp - (*UiGameMinerKeyReq)(nil), // 17: UiGameMinerKeyReq - (*UiGameMinerKeyResp)(nil), // 18: UiGameMinerKeyResp - (*UiGameMinerRewardReq)(nil), // 19: UiGameMinerRewardReq - (*UiGameMinerRewardResp)(nil), // 20: UiGameMinerRewardResp - (*UiGameMinerChangePush)(nil), // 21: UiGameMinerChangePush - (*DBPuzzleData)(nil), // 22: DBPuzzleData - (*UserAtno)(nil), // 23: UserAtno - (*DBLatticeData)(nil), // 24: DBLatticeData - (*DBMinerData)(nil), // 25: DBMinerData + (*UiGameLatticeChangePush)(nil), // 15: UiGameLatticeChangePush + (*UiGameGetMinerReq)(nil), // 16: UiGameGetMinerReq + (*UiGameGetMinerResp)(nil), // 17: UiGameGetMinerResp + (*UiGameMinerKeyReq)(nil), // 18: UiGameMinerKeyReq + (*UiGameMinerKeyResp)(nil), // 19: UiGameMinerKeyResp + (*UiGameMinerRewardReq)(nil), // 20: UiGameMinerRewardReq + (*UiGameMinerRewardResp)(nil), // 21: UiGameMinerRewardResp + (*UiGameMinerChangePush)(nil), // 22: UiGameMinerChangePush + (*UiGameMinerFinishReq)(nil), // 23: UiGameMinerFinishReq + (*UiGameMinerFinishResp)(nil), // 24: UiGameMinerFinishResp + (*DBPuzzleData)(nil), // 25: DBPuzzleData + (*UserAtno)(nil), // 26: UserAtno + (*DBLatticeData)(nil), // 27: DBLatticeData + (*DBMinerData)(nil), // 28: DBMinerData } var file_uigame_uigame_msg_proto_depIdxs = []int32{ - 22, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData - 22, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData - 23, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno - 22, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData - 23, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno - 22, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData - 24, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData - 24, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData - 23, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno - 24, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData - 23, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno - 24, // 11: UiGameLatticeFinishResp.data:type_name -> DBLatticeData - 23, // 12: UiGameLatticeFinishResp.atno:type_name -> UserAtno - 25, // 13: UiGameGetMinerResp.data:type_name -> DBMinerData - 25, // 14: UiGameMinerKeyResp.data:type_name -> DBMinerData - 23, // 15: UiGameMinerKeyResp.atno:type_name -> UserAtno - 25, // 16: UiGameMinerRewardResp.data:type_name -> DBMinerData - 23, // 17: UiGameMinerRewardResp.atno:type_name -> UserAtno - 25, // 18: UiGameMinerChangePush.data:type_name -> DBMinerData - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 25, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData + 25, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData + 26, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno + 25, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData + 26, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno + 25, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData + 27, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData + 27, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData + 26, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno + 27, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData + 26, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno + 27, // 11: UiGameLatticeFinishResp.data:type_name -> DBLatticeData + 26, // 12: UiGameLatticeFinishResp.atno:type_name -> UserAtno + 27, // 13: UiGameLatticeChangePush.data:type_name -> DBLatticeData + 28, // 14: UiGameGetMinerResp.data:type_name -> DBMinerData + 28, // 15: UiGameMinerKeyResp.data:type_name -> DBMinerData + 26, // 16: UiGameMinerKeyResp.atno:type_name -> UserAtno + 28, // 17: UiGameMinerRewardResp.data:type_name -> DBMinerData + 26, // 18: UiGameMinerRewardResp.atno:type_name -> UserAtno + 28, // 19: UiGameMinerChangePush.data:type_name -> DBMinerData + 28, // 20: UiGameMinerFinishResp.data:type_name -> DBMinerData + 26, // 21: UiGameMinerFinishResp.atno:type_name -> UserAtno + 22, // [22:22] is the sub-list for method output_type + 22, // [22:22] is the sub-list for method input_type + 22, // [22:22] is the sub-list for extension type_name + 22, // [22:22] is the sub-list for extension extendee + 0, // [0:22] is the sub-list for field type_name } func init() { file_uigame_uigame_msg_proto_init() } @@ -1524,7 +1700,7 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameGetMinerReq); i { + switch v := v.(*UiGameLatticeChangePush); i { case 0: return &v.state case 1: @@ -1536,7 +1712,7 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameGetMinerResp); i { + switch v := v.(*UiGameGetMinerReq); i { case 0: return &v.state case 1: @@ -1548,7 +1724,7 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameMinerKeyReq); i { + switch v := v.(*UiGameGetMinerResp); i { case 0: return &v.state case 1: @@ -1560,7 +1736,7 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameMinerKeyResp); i { + switch v := v.(*UiGameMinerKeyReq); i { case 0: return &v.state case 1: @@ -1572,7 +1748,7 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameMinerRewardReq); i { + switch v := v.(*UiGameMinerKeyResp); i { case 0: return &v.state case 1: @@ -1584,7 +1760,7 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UiGameMinerRewardResp); i { + switch v := v.(*UiGameMinerRewardReq); i { case 0: return &v.state case 1: @@ -1596,6 +1772,18 @@ func file_uigame_uigame_msg_proto_init() { } } file_uigame_uigame_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameMinerRewardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_uigame_uigame_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UiGameMinerChangePush); i { case 0: return &v.state @@ -1607,6 +1795,30 @@ func file_uigame_uigame_msg_proto_init() { return nil } } + file_uigame_uigame_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameMinerFinishReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_uigame_uigame_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UiGameMinerFinishResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1614,7 +1826,7 @@ func file_uigame_uigame_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_uigame_uigame_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 22, + NumMessages: 25, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index 57e3045d2..708c19488 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -83,4 +83,7 @@ const ( GameBuffType_HAS_BUFF_ADD_DMG = 90 GameBuffType_BUFF_DOT_ADD_DMG = 91 GameBuffType_MODIFY_BUFF_ADD_PROB = 92 + GameBuffType_SHILED_CAN_ADD = 93 + GameBuffType_SPECIAL_SHIELD = 94 + GameBuffType_PROB_RESISTBUFF = 95 ) diff --git a/sys/configure/structs/Game.FightEventType.go b/sys/configure/structs/Game.FightEventType.go index b016b1e6d..f004db03c 100644 --- a/sys/configure/structs/Game.FightEventType.go +++ b/sys/configure/structs/Game.FightEventType.go @@ -41,4 +41,5 @@ const ( GameFightEventType_OnStealBuffEnd = 29 GameFightEventType_OnRebirthEnd = 30 GameFightEventType_OnShiftBuffEnd = 31 + GameFightEventType_OnAddShieldEnd = 32 ) diff --git a/sys/configure/structs/Game.HeroupstoryChapterData.go b/sys/configure/structs/Game.HeroupstoryChapterData.go index f5e3cddeb..0dea5a44e 100644 --- a/sys/configure/structs/Game.HeroupstoryChapterData.go +++ b/sys/configure/structs/Game.HeroupstoryChapterData.go @@ -14,6 +14,7 @@ import "bright/serialization" type GameHeroupstoryChapterData struct { Key int32 Hero int32 + Chaptername string Chapter int32 Onlevel int32 Onlevelstory []int32 @@ -40,6 +41,7 @@ func (*GameHeroupstoryChapterData) GetTypeId() int32 { func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["chaptername"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Chaptername error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Chaptername, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { 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["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.PlayerInfor_overviewData.go b/sys/configure/structs/Game.PlayerInfor_overviewData.go index 4ce0b7c9d..bb35886d9 100644 --- a/sys/configure/structs/Game.PlayerInfor_overviewData.go +++ b/sys/configure/structs/Game.PlayerInfor_overviewData.go @@ -21,6 +21,7 @@ type GamePlayerInfor_overviewData struct { Vague string PvpAnimator string Mainq string + Vagueq string Playerhead string Name string } @@ -55,6 +56,7 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{}) { var _ok_ bool; if _v.Vague, _ok_ = _buf["vague"].(string); !_ok_ { err = errors.New("vague error"); return } } { var _ok_ bool; if _v.PvpAnimator, _ok_ = _buf["pvpAnimator"].(string); !_ok_ { err = errors.New("pvpAnimator error"); return } } { var _ok_ bool; if _v.Mainq, _ok_ = _buf["mainq"].(string); !_ok_ { err = errors.New("mainq error"); return } } + { var _ok_ bool; if _v.Vagueq, _ok_ = _buf["vagueq"].(string); !_ok_ { err = errors.New("vagueq error"); return } } { var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return diff --git a/sys/configure/structs/Game.PropertyType.go b/sys/configure/structs/Game.PropertyType.go index f38d37acc..dd4c311e8 100644 --- a/sys/configure/structs/Game.PropertyType.go +++ b/sys/configure/structs/Game.PropertyType.go @@ -116,5 +116,7 @@ const ( GamePropertyType_CritResist = 104 GamePropertyType_Shield = 105 GamePropertyType_Shield_Per = 106 - GamePropertyType_Max = 107 + GamePropertyType_Base_Shield = 107 + GamePropertyType_Ext_Shield = 108 + GamePropertyType_Max = 109 ) diff --git a/sys/configure/structs/Game.PushGiftData.go b/sys/configure/structs/Game.PushGiftData.go index bf459b0d1..3de203688 100644 --- a/sys/configure/structs/Game.PushGiftData.go +++ b/sys/configure/structs/Game.PushGiftData.go @@ -17,7 +17,7 @@ type GamePushGiftData struct { Resource string Integral []int32 Condition int32 - Lbid int32 + Lbid []*Gameatn Time int32 Rebate int32 Isdayrepeat int32 @@ -51,7 +51,20 @@ func (_v *GamePushGiftData)Deserialize(_buf map[string]interface{}) (err error) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lbid"].(float64); !_ok_ { err = errors.New("lbid error"); return }; _v.Lbid = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["lbid"].([]interface{}); !_ok_ { err = errors.New("lbid error"); return } + + _v.Lbid = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Lbid = append(_v.Lbid, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rebate"].(float64); !_ok_ { err = errors.New("rebate error"); return }; _v.Rebate = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isdayrepeat"].(float64); !_ok_ { err = errors.New("isdayrepeat error"); return }; _v.Isdayrepeat = int32(_tempNum_) } diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go index 37d7078a7..6eaca6c80 100644 --- a/sys/configure/structs/game.skillBuffData.go +++ b/sys/configure/structs/game.skillBuffData.go @@ -22,6 +22,7 @@ type GameSkillBuffData struct { Effect []int32 AddEffect bool RemoveType bool + Priority int32 NotOverlay int32 OverlayTimes byte SameID bool @@ -101,6 +102,7 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.AddEffect, _ok_ = _buf["AddEffect"].(bool); !_ok_ { err = errors.New("AddEffect error"); return } } { var _ok_ bool; if _v.RemoveType, _ok_ = _buf["RemoveType"].(bool); !_ok_ { err = errors.New("RemoveType error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Priority"].(float64); !_ok_ { err = errors.New("Priority error"); return }; _v.Priority = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["NotOverlay"].(float64); !_ok_ { err = errors.New("NotOverlay error"); return }; _v.NotOverlay = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["OverlayTimes"].(float64); !_ok_ { err = errors.New("OverlayTimes error"); return }; _v.OverlayTimes = byte(_tempNum_) } { var _ok_ bool; if _v.SameID, _ok_ = _buf["SameID"].(bool); !_ok_ { err = errors.New("SameID error"); return } }