From de40390778e026d7df4378afbc56d219cedbd06d Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 11 Jul 2023 11:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E5=85=A8=E5=B1=80=E4=BA=8B?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_circulate.json | 320 ++++++++++----------
bin/json/game_ruledesc.json | 6 +-
modules/pagoda/api_racechallengeover.go | 2 +-
pb/pagoda_db.pb.go | 38 +--
sys/configure/structs/Game.CirculateData.go | 17 +-
5 files changed, 198 insertions(+), 185 deletions(-)
diff --git a/bin/json/game_circulate.json b/bin/json/game_circulate.json
index b3fe09567..a2acbfae8 100644
--- a/bin/json/game_circulate.json
+++ b/bin/json/game_circulate.json
@@ -11,7 +11,7 @@
],
"unlock": 1100102,
"floors": 1,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_51",
@@ -56,7 +56,7 @@
],
"unlock": 1100102,
"floors": 2,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_52",
@@ -106,7 +106,7 @@
],
"unlock": 1100102,
"floors": 3,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_53",
@@ -151,7 +151,7 @@
],
"unlock": 1100102,
"floors": 4,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_54",
@@ -201,7 +201,7 @@
],
"unlock": 1100102,
"floors": 5,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_55",
@@ -246,7 +246,7 @@
],
"unlock": 1100102,
"floors": 6,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_56",
@@ -296,7 +296,7 @@
],
"unlock": 1100102,
"floors": 7,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_57",
@@ -341,7 +341,7 @@
],
"unlock": 1100102,
"floors": 8,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_58",
@@ -391,7 +391,7 @@
],
"unlock": 1100102,
"floors": 9,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_59",
@@ -436,7 +436,7 @@
],
"unlock": 1100102,
"floors": 10,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_60",
@@ -486,7 +486,7 @@
],
"unlock": 1100102,
"floors": 11,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_61",
@@ -531,7 +531,7 @@
],
"unlock": 1100102,
"floors": 12,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_62",
@@ -581,7 +581,7 @@
],
"unlock": 1100102,
"floors": 13,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_63",
@@ -626,7 +626,7 @@
],
"unlock": 1100102,
"floors": 14,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_64",
@@ -676,7 +676,7 @@
],
"unlock": 1100102,
"floors": 15,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_65",
@@ -721,7 +721,7 @@
],
"unlock": 1100102,
"floors": 16,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_66",
@@ -771,7 +771,7 @@
],
"unlock": 1100102,
"floors": 17,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_67",
@@ -816,7 +816,7 @@
],
"unlock": 1100102,
"floors": 18,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_68",
@@ -866,7 +866,7 @@
],
"unlock": 1100102,
"floors": 19,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_69",
@@ -911,7 +911,7 @@
],
"unlock": 1100102,
"floors": 20,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_70",
@@ -961,7 +961,7 @@
],
"unlock": 1100102,
"floors": 1,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_71",
@@ -1006,7 +1006,7 @@
],
"unlock": 1100102,
"floors": 2,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_72",
@@ -1056,7 +1056,7 @@
],
"unlock": 1100102,
"floors": 3,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_73",
@@ -1101,7 +1101,7 @@
],
"unlock": 1100102,
"floors": 4,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_74",
@@ -1151,7 +1151,7 @@
],
"unlock": 1100102,
"floors": 5,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_75",
@@ -1196,7 +1196,7 @@
],
"unlock": 1100102,
"floors": 6,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_76",
@@ -1246,7 +1246,7 @@
],
"unlock": 1100102,
"floors": 7,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_77",
@@ -1291,7 +1291,7 @@
],
"unlock": 1100102,
"floors": 8,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_78",
@@ -1341,7 +1341,7 @@
],
"unlock": 1100102,
"floors": 9,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_79",
@@ -1386,7 +1386,7 @@
],
"unlock": 1100102,
"floors": 10,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_80",
@@ -1436,7 +1436,7 @@
],
"unlock": 1100102,
"floors": 11,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_81",
@@ -1481,7 +1481,7 @@
],
"unlock": 1100102,
"floors": 12,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_82",
@@ -1531,7 +1531,7 @@
],
"unlock": 1100102,
"floors": 13,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_83",
@@ -1576,7 +1576,7 @@
],
"unlock": 1100102,
"floors": 14,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_84",
@@ -1626,7 +1626,7 @@
],
"unlock": 1100102,
"floors": 15,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_85",
@@ -1671,7 +1671,7 @@
],
"unlock": 1100102,
"floors": 16,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_86",
@@ -1721,7 +1721,7 @@
],
"unlock": 1100102,
"floors": 17,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_87",
@@ -1766,7 +1766,7 @@
],
"unlock": 1100102,
"floors": 18,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_88",
@@ -1816,7 +1816,7 @@
],
"unlock": 1100102,
"floors": 19,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_89",
@@ -1861,7 +1861,7 @@
],
"unlock": 1100102,
"floors": 20,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_90",
@@ -1911,7 +1911,7 @@
],
"unlock": 1100102,
"floors": 1,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_91",
@@ -1956,7 +1956,7 @@
],
"unlock": 1100102,
"floors": 2,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_92",
@@ -2006,7 +2006,7 @@
],
"unlock": 1100102,
"floors": 3,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_93",
@@ -2051,7 +2051,7 @@
],
"unlock": 1100102,
"floors": 4,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_94",
@@ -2101,7 +2101,7 @@
],
"unlock": 1100102,
"floors": 5,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_95",
@@ -2146,7 +2146,7 @@
],
"unlock": 1100102,
"floors": 6,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_96",
@@ -2196,7 +2196,7 @@
],
"unlock": 1100102,
"floors": 7,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_97",
@@ -2241,7 +2241,7 @@
],
"unlock": 1100102,
"floors": 8,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_98",
@@ -2291,7 +2291,7 @@
],
"unlock": 1100102,
"floors": 9,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_99",
@@ -2336,7 +2336,7 @@
],
"unlock": 1100102,
"floors": 10,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_100",
@@ -2386,7 +2386,7 @@
],
"unlock": 1100102,
"floors": 11,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_101",
@@ -2431,7 +2431,7 @@
],
"unlock": 1100102,
"floors": 12,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_102",
@@ -2481,7 +2481,7 @@
],
"unlock": 1100102,
"floors": 13,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_103",
@@ -2526,7 +2526,7 @@
],
"unlock": 1100102,
"floors": 14,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_104",
@@ -2576,7 +2576,7 @@
],
"unlock": 1100102,
"floors": 15,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_105",
@@ -2621,7 +2621,7 @@
],
"unlock": 1100102,
"floors": 16,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_106",
@@ -2671,7 +2671,7 @@
],
"unlock": 1100102,
"floors": 17,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_107",
@@ -2716,7 +2716,7 @@
],
"unlock": 1100102,
"floors": 18,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_108",
@@ -2766,7 +2766,7 @@
],
"unlock": 1100102,
"floors": 19,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_109",
@@ -2811,7 +2811,7 @@
],
"unlock": 1100102,
"floors": 20,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_110",
@@ -2857,7 +2857,7 @@
"openingtime": [],
"unlock": 1,
"floors": 1,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_1",
@@ -2898,7 +2898,7 @@
"openingtime": [],
"unlock": 1,
"floors": 2,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_2",
@@ -2944,7 +2944,7 @@
"openingtime": [],
"unlock": 1,
"floors": 3,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_3",
@@ -2985,7 +2985,7 @@
"openingtime": [],
"unlock": 1,
"floors": 4,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_4",
@@ -3031,7 +3031,7 @@
"openingtime": [],
"unlock": 1,
"floors": 5,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_5",
@@ -3072,7 +3072,7 @@
"openingtime": [],
"unlock": 1,
"floors": 6,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_6",
@@ -3118,7 +3118,7 @@
"openingtime": [],
"unlock": 1,
"floors": 7,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_7",
@@ -3159,7 +3159,7 @@
"openingtime": [],
"unlock": 1,
"floors": 8,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_8",
@@ -3205,7 +3205,7 @@
"openingtime": [],
"unlock": 1,
"floors": 9,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_9",
@@ -3246,7 +3246,7 @@
"openingtime": [],
"unlock": 1,
"floors": 10,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_10",
@@ -3292,7 +3292,7 @@
"openingtime": [],
"unlock": 1,
"floors": 11,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_11",
@@ -3333,7 +3333,7 @@
"openingtime": [],
"unlock": 1,
"floors": 12,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_12",
@@ -3379,7 +3379,7 @@
"openingtime": [],
"unlock": 1,
"floors": 13,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_13",
@@ -3420,7 +3420,7 @@
"openingtime": [],
"unlock": 1,
"floors": 14,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_14",
@@ -3466,7 +3466,7 @@
"openingtime": [],
"unlock": 1,
"floors": 15,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_15",
@@ -3507,7 +3507,7 @@
"openingtime": [],
"unlock": 1,
"floors": 16,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_16",
@@ -3553,7 +3553,7 @@
"openingtime": [],
"unlock": 1,
"floors": 17,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_17",
@@ -3594,7 +3594,7 @@
"openingtime": [],
"unlock": 1,
"floors": 18,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_18",
@@ -3640,7 +3640,7 @@
"openingtime": [],
"unlock": 1,
"floors": 19,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_19",
@@ -3681,7 +3681,7 @@
"openingtime": [],
"unlock": 1,
"floors": 20,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_20",
@@ -3727,7 +3727,7 @@
"openingtime": [],
"unlock": 1,
"floors": 21,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_21",
@@ -3768,7 +3768,7 @@
"openingtime": [],
"unlock": 1,
"floors": 22,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_22",
@@ -3814,7 +3814,7 @@
"openingtime": [],
"unlock": 1,
"floors": 23,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_23",
@@ -3855,7 +3855,7 @@
"openingtime": [],
"unlock": 1,
"floors": 24,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_24",
@@ -3901,7 +3901,7 @@
"openingtime": [],
"unlock": 1,
"floors": 25,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_25",
@@ -3942,7 +3942,7 @@
"openingtime": [],
"unlock": 1,
"floors": 26,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_26",
@@ -3988,7 +3988,7 @@
"openingtime": [],
"unlock": 1,
"floors": 27,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_27",
@@ -4029,7 +4029,7 @@
"openingtime": [],
"unlock": 1,
"floors": 28,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_28",
@@ -4075,7 +4075,7 @@
"openingtime": [],
"unlock": 1,
"floors": 29,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_29",
@@ -4116,7 +4116,7 @@
"openingtime": [],
"unlock": 1,
"floors": 30,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_30",
@@ -4162,7 +4162,7 @@
"openingtime": [],
"unlock": 1,
"floors": 31,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_31",
@@ -4203,7 +4203,7 @@
"openingtime": [],
"unlock": 1,
"floors": 32,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_32",
@@ -4249,7 +4249,7 @@
"openingtime": [],
"unlock": 1,
"floors": 33,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_33",
@@ -4290,7 +4290,7 @@
"openingtime": [],
"unlock": 1,
"floors": 34,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_34",
@@ -4336,7 +4336,7 @@
"openingtime": [],
"unlock": 1,
"floors": 35,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_35",
@@ -4377,7 +4377,7 @@
"openingtime": [],
"unlock": 1,
"floors": 36,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_36",
@@ -4423,7 +4423,7 @@
"openingtime": [],
"unlock": 1,
"floors": 37,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_37",
@@ -4464,7 +4464,7 @@
"openingtime": [],
"unlock": 1,
"floors": 38,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_38",
@@ -4510,7 +4510,7 @@
"openingtime": [],
"unlock": 1,
"floors": 39,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_39",
@@ -4551,7 +4551,7 @@
"openingtime": [],
"unlock": 1,
"floors": 40,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_40",
@@ -4597,7 +4597,7 @@
"openingtime": [],
"unlock": 1,
"floors": 41,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_41",
@@ -4638,7 +4638,7 @@
"openingtime": [],
"unlock": 1,
"floors": 42,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_42",
@@ -4684,7 +4684,7 @@
"openingtime": [],
"unlock": 1,
"floors": 43,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_43",
@@ -4725,7 +4725,7 @@
"openingtime": [],
"unlock": 1,
"floors": 44,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_44",
@@ -4771,7 +4771,7 @@
"openingtime": [],
"unlock": 1,
"floors": 45,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_45",
@@ -4812,7 +4812,7 @@
"openingtime": [],
"unlock": 1,
"floors": 46,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_46",
@@ -4858,7 +4858,7 @@
"openingtime": [],
"unlock": 1,
"floors": 47,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_47",
@@ -4899,7 +4899,7 @@
"openingtime": [],
"unlock": 1,
"floors": 48,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_48",
@@ -4945,7 +4945,7 @@
"openingtime": [],
"unlock": 1,
"floors": 49,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_49",
@@ -4986,7 +4986,7 @@
"openingtime": [],
"unlock": 1,
"floors": 50,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_50",
@@ -5032,7 +5032,7 @@
"openingtime": [],
"unlock": 1,
"floors": 1,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_1",
@@ -5073,7 +5073,7 @@
"openingtime": [],
"unlock": 1,
"floors": 2,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_2",
@@ -5119,7 +5119,7 @@
"openingtime": [],
"unlock": 1,
"floors": 3,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_3",
@@ -5160,7 +5160,7 @@
"openingtime": [],
"unlock": 1,
"floors": 4,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_4",
@@ -5206,7 +5206,7 @@
"openingtime": [],
"unlock": 1,
"floors": 5,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_5",
@@ -5247,7 +5247,7 @@
"openingtime": [],
"unlock": 1,
"floors": 6,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_6",
@@ -5293,7 +5293,7 @@
"openingtime": [],
"unlock": 1,
"floors": 7,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_7",
@@ -5334,7 +5334,7 @@
"openingtime": [],
"unlock": 1,
"floors": 8,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_8",
@@ -5380,7 +5380,7 @@
"openingtime": [],
"unlock": 1,
"floors": 9,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_9",
@@ -5421,7 +5421,7 @@
"openingtime": [],
"unlock": 1,
"floors": 10,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_10",
@@ -5467,7 +5467,7 @@
"openingtime": [],
"unlock": 1,
"floors": 11,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_11",
@@ -5508,7 +5508,7 @@
"openingtime": [],
"unlock": 1,
"floors": 12,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_12",
@@ -5554,7 +5554,7 @@
"openingtime": [],
"unlock": 1,
"floors": 13,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_13",
@@ -5595,7 +5595,7 @@
"openingtime": [],
"unlock": 1,
"floors": 14,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_14",
@@ -5641,7 +5641,7 @@
"openingtime": [],
"unlock": 1,
"floors": 15,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_15",
@@ -5682,7 +5682,7 @@
"openingtime": [],
"unlock": 1,
"floors": 16,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_16",
@@ -5728,7 +5728,7 @@
"openingtime": [],
"unlock": 1,
"floors": 17,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_17",
@@ -5769,7 +5769,7 @@
"openingtime": [],
"unlock": 1,
"floors": 18,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_18",
@@ -5815,7 +5815,7 @@
"openingtime": [],
"unlock": 1,
"floors": 19,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_19",
@@ -5856,7 +5856,7 @@
"openingtime": [],
"unlock": 1,
"floors": 20,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_20",
@@ -5902,7 +5902,7 @@
"openingtime": [],
"unlock": 1,
"floors": 21,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_21",
@@ -5943,7 +5943,7 @@
"openingtime": [],
"unlock": 1,
"floors": 22,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_22",
@@ -5989,7 +5989,7 @@
"openingtime": [],
"unlock": 1,
"floors": 23,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_23",
@@ -6030,7 +6030,7 @@
"openingtime": [],
"unlock": 1,
"floors": 24,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_24",
@@ -6076,7 +6076,7 @@
"openingtime": [],
"unlock": 1,
"floors": 25,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_25",
@@ -6117,7 +6117,7 @@
"openingtime": [],
"unlock": 1,
"floors": 26,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_26",
@@ -6163,7 +6163,7 @@
"openingtime": [],
"unlock": 1,
"floors": 27,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_27",
@@ -6204,7 +6204,7 @@
"openingtime": [],
"unlock": 1,
"floors": 28,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_28",
@@ -6250,7 +6250,7 @@
"openingtime": [],
"unlock": 1,
"floors": 29,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_29",
@@ -6291,7 +6291,7 @@
"openingtime": [],
"unlock": 1,
"floors": 30,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_30",
@@ -6337,7 +6337,7 @@
"openingtime": [],
"unlock": 1,
"floors": 31,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_31",
@@ -6378,7 +6378,7 @@
"openingtime": [],
"unlock": 1,
"floors": 32,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_32",
@@ -6424,7 +6424,7 @@
"openingtime": [],
"unlock": 1,
"floors": 33,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_33",
@@ -6465,7 +6465,7 @@
"openingtime": [],
"unlock": 1,
"floors": 34,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_34",
@@ -6511,7 +6511,7 @@
"openingtime": [],
"unlock": 1,
"floors": 35,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_35",
@@ -6552,7 +6552,7 @@
"openingtime": [],
"unlock": 1,
"floors": 36,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_36",
@@ -6598,7 +6598,7 @@
"openingtime": [],
"unlock": 1,
"floors": 37,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_37",
@@ -6639,7 +6639,7 @@
"openingtime": [],
"unlock": 1,
"floors": 38,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_38",
@@ -6685,7 +6685,7 @@
"openingtime": [],
"unlock": 1,
"floors": 39,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_39",
@@ -6726,7 +6726,7 @@
"openingtime": [],
"unlock": 1,
"floors": 40,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_40",
@@ -6772,7 +6772,7 @@
"openingtime": [],
"unlock": 1,
"floors": 41,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_41",
@@ -6813,7 +6813,7 @@
"openingtime": [],
"unlock": 1,
"floors": 42,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_42",
@@ -6859,7 +6859,7 @@
"openingtime": [],
"unlock": 1,
"floors": 43,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_43",
@@ -6900,7 +6900,7 @@
"openingtime": [],
"unlock": 1,
"floors": 44,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_44",
@@ -6946,7 +6946,7 @@
"openingtime": [],
"unlock": 1,
"floors": 45,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_45",
@@ -6987,7 +6987,7 @@
"openingtime": [],
"unlock": 1,
"floors": 46,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_46",
@@ -7033,7 +7033,7 @@
"openingtime": [],
"unlock": 1,
"floors": 47,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_47",
@@ -7074,7 +7074,7 @@
"openingtime": [],
"unlock": 1,
"floors": 48,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_48",
@@ -7120,7 +7120,7 @@
"openingtime": [],
"unlock": 1,
"floors": 49,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_49",
@@ -7161,7 +7161,7 @@
"openingtime": [],
"unlock": 1,
"floors": 50,
- "gaineffect": 0,
+ "fightevents": [],
"tabIcon": "",
"tabTitle": {
"key": "circularcamptower_Sheet1_tabTitle_50",
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 6521f04b4..fea83b5b0 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -161,7 +161,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_15",
- "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者升星：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。
守护者觉醒：
使用觉醒强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。
守护者回响：
使用回响强化你的守护者。共鸣强化道具可以再狩猎与宝箱中获得。"
+ "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者升星：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。
守护者觉醒：
可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。
守护者回响：
可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以再狩猎与宝箱中获得。"
}
},
{
@@ -271,7 +271,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_25",
- "text": "这里可以使用回响强化你的守护者。
回响强化道具可在狩猎与宝箱中获得。"
+ "text": "这里可以使用回响强化道具强化你的守护者。
回响强化道具可在狩猎与宝箱中获得。"
}
},
{
@@ -293,7 +293,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_27",
- "text": "这里可以使用觉醒强化你的守护者。
觉醒道具守护之心主要为招募重复守护者获得。"
+ "text": "这里可以使用守护之心强化你的守护者。
觉醒道具守护之心主要为招募重复守护者获得。"
}
},
{
diff --git a/modules/pagoda/api_racechallengeover.go b/modules/pagoda/api_racechallengeover.go
index f9d16d6b8..4d5d05a00 100644
--- a/modules/pagoda/api_racechallengeover.go
+++ b/modules/pagoda/api_racechallengeover.go
@@ -127,7 +127,7 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda
}
race.Race[conf.Restriction].Curfloor += 1
- race.Race[conf.Restriction].Buf = conf.Gaineffect
+ race.Race[conf.Restriction].Task = conf.Fightevents
mapData["race"] = race.Race
errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData)
diff --git a/pb/pagoda_db.pb.go b/pb/pagoda_db.pb.go
index 86142298a..be8df0f7f 100644
--- a/pb/pagoda_db.pb.go
+++ b/pb/pagoda_db.pb.go
@@ -312,12 +312,12 @@ type RaceData struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` // 阵营ID 0:循环塔 1: 阵营1
- Buf int32 `protobuf:"varint,2,opt,name=buf,proto3" json:"buf"` //赛季子技能buff
- Rtime int64 `protobuf:"varint,3,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 客户端不用
- Defeat int32 `protobuf:"varint,4,opt,name=defeat,proto3" json:"defeat"` // 今日战胜的次数
- Endtime int64 `protobuf:"varint,5,opt,name=endtime,proto3" json:"endtime"` //剩余倒计时
- Curfloor int32 `protobuf:"varint,6,opt,name=curfloor,proto3" json:"curfloor"` //当前层数
+ Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` // 阵营ID 0:循环塔 1: 阵营1
+ Task []int32 `protobuf:"varint,2,rep,packed,name=task,proto3" json:"task"` //战斗全局事件
+ Rtime int64 `protobuf:"varint,3,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 客户端不用
+ Defeat int32 `protobuf:"varint,4,opt,name=defeat,proto3" json:"defeat"` // 今日战胜的次数
+ Endtime int64 `protobuf:"varint,5,opt,name=endtime,proto3" json:"endtime"` //剩余倒计时
+ Curfloor int32 `protobuf:"varint,6,opt,name=curfloor,proto3" json:"curfloor"` //当前层数
}
func (x *RaceData) Reset() {
@@ -359,11 +359,11 @@ func (x *RaceData) GetRace() int32 {
return 0
}
-func (x *RaceData) GetBuf() int32 {
+func (x *RaceData) GetTask() []int32 {
if x != nil {
- return x.Buf
+ return x.Task
}
- return 0
+ return nil
}
func (x *RaceData) GetRtime() int64 {
@@ -447,17 +447,17 @@ var file_pagoda_pagoda_db_proto_rawDesc = []byte{
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x09, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c,
- 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44,
+ 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44,
0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, 0x66, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x62, 0x75, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69,
- 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12,
- 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69,
- 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d,
- 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x06, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x42, 0x06, 0x5a,
- 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18,
+ 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x72,
+ 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d,
+ 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64,
+ 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74,
+ 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18,
+ 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x42,
+ 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/sys/configure/structs/Game.CirculateData.go b/sys/configure/structs/Game.CirculateData.go
index 2d0b4a5ea..46763d552 100644
--- a/sys/configure/structs/Game.CirculateData.go
+++ b/sys/configure/structs/Game.CirculateData.go
@@ -18,7 +18,7 @@ type GameCirculateData struct {
Openingtime []int32
Unlock int32
Floors int32
- Gaineffect int32
+ Fightevents []int32
TabIcon string
TabTitle string
Monsterlineup []int32
@@ -56,7 +56,20 @@ func (_v *GameCirculateData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floors"].(float64); !_ok_ { err = errors.New("floors error"); return }; _v.Floors = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gaineffect"].(float64); !_ok_ { err = errors.New("gaineffect error"); return }; _v.Gaineffect = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["fightevents"].([]interface{}); !_ok_ { err = errors.New("fightevents error"); return }
+
+ _v.Fightevents = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Fightevents = append(_v.Fightevents, _list_v_)
+ }
+ }
+
{ var _ok_ bool; if _v.TabIcon, _ok_ = _buf["tabIcon"].(string); !_ok_ { err = errors.New("tabIcon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tabTitle"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TabTitle error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TabTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{