上传工会签到获取活跃值

bin/json/game_annulartaskall.json

@@ -2,12 +2,6 @@
   {
     "taskgroup": 10010,
     "taskdetail": [
-      60000010,
-      60000020,
-      60000030,
-      60000040,
-      60000050,
-      60000060,
       60000070,
       60000080,
       60000090,
@@ -52,12 +46,6 @@
   {
     "taskgroup": 10020,
     "taskdetail": [
-      60000010,
-      60000020,
-      60000030,
-      60000040,
-      60000050,
-      60000060,
       60000070,
       60000080,
       60000090,
@@ -102,12 +90,6 @@
   {
     "taskgroup": 10030,
     "taskdetail": [
-      60000010,
-      60000020,
-      60000030,
-      60000040,
-      60000050,
-      60000060,
       60000070,
       60000080,
       60000090,
@@ -152,12 +134,6 @@
   {
     "taskgroup": 10040,
     "taskdetail": [
-      60000010,
-      60000020,
-      60000030,
-      60000040,
-      60000050,
-      60000060,
       60000070,
       60000080,
       60000090,

bin/json/game_battleready.json

@@ -1064,8 +1064,8 @@
     "HideAlienSpace": false,
     "HideFightUI": false,
     "RuleTips": {
-      "key": "battleready_battleready_RuleTips_1",
+      "key": "",
-      "text": "只能上阵热情之火属性的守护者"
+      "text": ""
     },
     "BattleTips": {
       "key": "",
@@ -1074,9 +1074,7 @@
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": false,
-    "ChoseCamp": [
+    "ChoseCamp": [],
-      1
-    ],
     "DisableCamp": [],
     "DefaultHero": 0,
     "ChoseHero": [],
@@ -1101,8 +1099,8 @@
     "HideAlienSpace": false,
     "HideFightUI": false,
     "RuleTips": {
-      "key": "battleready_battleready_RuleTips_2",
+      "key": "",
-      "text": "只能上阵感观之林属性的守护者"
+      "text": ""
     },
     "BattleTips": {
       "key": "",
@@ -1111,9 +1109,7 @@
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": false,
-    "ChoseCamp": [
+    "ChoseCamp": [],
-      2
-    ],
     "DisableCamp": [],
     "DefaultHero": 0,
     "ChoseHero": [],
@@ -1138,8 +1134,8 @@
     "HideAlienSpace": false,
     "HideFightUI": false,
     "RuleTips": {
-      "key": "battleready_battleready_RuleTips_3",
+      "key": "",
-      "text": "只能上阵包容之水属性的守护者"
+      "text": ""
     },
     "BattleTips": {
       "key": "",
@@ -1148,9 +1144,7 @@
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": false,
-    "ChoseCamp": [
+    "ChoseCamp": [],
-      3
-    ],
     "DisableCamp": [],
     "DefaultHero": 0,
     "ChoseHero": [],
@@ -1447,6 +1441,41 @@
     "CanFriendHelp": false,
     "Numrounds": 0
   },
+  {
+    "id": 141,
+    "PlayType": 1,
+    "HeroCount": 5,
+    "readyScene": "scenesfight_role_interface_05",
+    "battleScenes": [
+      "scenesfight_13"
+    ],
+    "BGMusic": "",
+    "LoadingId": 0,
+    "HideAlienSpace": false,
+    "HideFightUI": false,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
+    "BattleTips": {
+      "key": "",
+      "text": ""
+    },
+    "battleEvents": [],
+    "ScoreGroupID": 0,
+    "disableAiCamera": false,
+    "ChoseCamp": [],
+    "DisableCamp": [],
+    "DefaultHero": 0,
+    "ChoseHero": [],
+    "DisableHero": [],
+    "LockSlots": [],
+    "HeroCheck": [],
+    "RedAssistTeam": 0,
+    "BlueAssistTeam": 0,
+    "CanFriendHelp": false,
+    "Numrounds": 0
+  },
   {
     "id": 201,
     "PlayType": 1,
@@ -2537,8 +2566,8 @@
     "HideAlienSpace": false,
     "HideFightUI": false,
     "RuleTips": {
-      "key": "battleready_battleready_RuleTips_1",
+      "key": "",
-      "text": "只能上阵热情之火属性的守护者"
+      "text": ""
     },
     "BattleTips": {
       "key": "",
@@ -2547,9 +2576,7 @@
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": false,
-    "ChoseCamp": [
+    "ChoseCamp": [],
-      1
-    ],
     "DisableCamp": [],
     "DefaultHero": 0,
     "ChoseHero": [],
@@ -2574,8 +2601,8 @@
     "HideAlienSpace": false,
     "HideFightUI": false,
     "RuleTips": {
-      "key": "battleready_battleready_RuleTips_2",
+      "key": "",
-      "text": "只能上阵感观之林属性的守护者"
+      "text": ""
     },
     "BattleTips": {
       "key": "",
@@ -2584,9 +2611,7 @@
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": false,
-    "ChoseCamp": [
+    "ChoseCamp": [],
-      2
-    ],
     "DisableCamp": [],
     "DefaultHero": 0,
     "ChoseHero": [],
@@ -2611,8 +2636,8 @@
     "HideAlienSpace": false,
     "HideFightUI": false,
     "RuleTips": {
-      "key": "battleready_battleready_RuleTips_3",
+      "key": "",
-      "text": "只能上阵包容之水属性的守护者"
+      "text": ""
     },
     "BattleTips": {
       "key": "",
@@ -2621,9 +2646,7 @@
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": false,
-    "ChoseCamp": [
+    "ChoseCamp": [],
-      3
-    ],
     "DisableCamp": [],
     "DefaultHero": 0,
     "ChoseHero": [],

bin/json/game_buriedtype.json

@@ -1451,5 +1451,21 @@
     "id": 249,
     "insert": 1,
     "filter": []
+  },
+  {
+    "id": 250,
+    "insert": 1,
+    "filter": [
+      "lte",
+      "gte"
+    ]
+  },
+  {
+    "id": 251,
+    "insert": 1,
+    "filter": [
+      "lte",
+      "gte"
+    ]
   }
 ]

bin/json/game_buzkashicombo.json

@@ -2,25 +2,29 @@
   {
     "num": 1,
     "ComboMin": 0,
-    "ComboMax": 20,
+    "ComboMax": 5,
-    "value": 10
+    "value": 10,
+    "valuetext": 1000
   },
   {
     "num": 2,
-    "ComboMin": 21,
+    "ComboMin": 6,
-    "ComboMax": 40,
+    "ComboMax": 30,
-    "value": 12
+    "value": 12,
+    "valuetext": 1200
   },
   {
     "num": 3,
-    "ComboMin": 41,
+    "ComboMin": 31,
     "ComboMax": 60,
-    "value": 14
+    "value": 14,
+    "valuetext": 1400
   },
   {
     "num": 4,
     "ComboMin": 61,
     "ComboMax": -1,
-    "value": 18
+    "value": 18,
+    "valuetext": 1800
   }
 ]

bin/json/game_buzkashimount.json

@@ -96,7 +96,7 @@
     "csubtime": 10,
     "energyrecover": 30,
     "maxenergy": 100,
-    "offsetspeed": 15
+    "offsetspeed": 25
   },
   {
     "id": "20030002",
@@ -195,7 +195,7 @@
     "csubtime": 0,
     "energyrecover": 30,
     "maxenergy": 100,
-    "offsetspeed": 15
+    "offsetspeed": 20
   },
   {
     "id": "20030003",

bin/json/game_consumehero.json

@@ -42,6 +42,7 @@
     "bigskillname": "sx_wz_sgyk",
     "bigskillhero": "sx_img_33003",
     "bigskillcolor": 0,
+    "bigskilleffect": "effect_sx_skill_green",
     "get": 107,
     "consume": [],
     "skilltype": 1,
@@ -101,6 +102,7 @@
     "bigskillname": "sx_wz_hhlp",
     "bigskillhero": "sx_img_44003",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [],
     "skilltype": 1,
@@ -160,6 +162,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [],
     "skilltype": 1,
@@ -219,6 +222,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -284,6 +288,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -349,6 +354,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -414,6 +420,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -479,6 +486,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -544,6 +552,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -609,6 +618,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -674,6 +684,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -739,6 +750,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -804,6 +816,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -869,6 +882,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -934,6 +948,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -999,6 +1014,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {
@@ -1064,6 +1080,7 @@
     "bigskillname": "sx_wz_ddxc",
     "bigskillhero": "sx_img_43004",
     "bigskillcolor": 1,
+    "bigskilleffect": "effect_sx_skill_yellow",
     "get": 107,
     "consume": [
       {

bin/json/game_consumeintegral.json

@@ -31,7 +31,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -42,7 +42,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -66,7 +66,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -77,7 +77,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -101,7 +101,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -112,7 +112,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -136,7 +136,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -147,7 +147,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -171,7 +171,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -182,7 +182,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -206,7 +206,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -217,7 +217,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -241,7 +241,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -252,7 +252,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -276,7 +276,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -287,7 +287,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -311,7 +311,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -322,7 +322,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -346,7 +346,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -357,7 +357,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -381,7 +381,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -392,7 +392,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""

bin/json/game_dragonlvitem.json

@@ -111,7 +111,7 @@
     "lv": 1,
     "num": [],
     "item": [],
-    "uplv": 19000001
+    "uplv": 19000005
   },
   {
     "key": 7,
@@ -132,7 +132,7 @@
       2
     ],
     "item": [],
-    "uplv": 19000002
+    "uplv": 19000006
   },
   {
     "key": 8,
@@ -153,7 +153,7 @@
       4
     ],
     "item": [],
-    "uplv": 19000003
+    "uplv": 19000007
   },
   {
     "key": 9,
@@ -174,7 +174,7 @@
       6
     ],
     "item": [],
-    "uplv": 19000004
+    "uplv": 19000008
   },
   {
     "key": 10,
@@ -210,7 +210,7 @@
     "lv": 1,
     "num": [],
     "item": [],
-    "uplv": 19000001
+    "uplv": 19000009
   },
   {
     "key": 12,
@@ -231,7 +231,7 @@
       2
     ],
     "item": [],
-    "uplv": 19000002
+    "uplv": 19000010
   },
   {
     "key": 13,
@@ -252,7 +252,7 @@
       4
     ],
     "item": [],
-    "uplv": 19000003
+    "uplv": 19000011
   },
   {
     "key": 14,
@@ -273,7 +273,7 @@
       6
     ],
     "item": [],
-    "uplv": 19000004
+    "uplv": 19000012
   },
   {
     "key": 15,

bin/json/game_global.json

@@ -119,7 +119,7 @@
     "guild_AcceptApplyMax": 100,
     "guild_ViceAllianceLeader_MaxNum": 3,
     "guild_administrators_MaxNum": 5,
-    "guild_InitiateImpeachmentTime": 1,
+    "guild_InitiateImpeachmentTime": 48,
     "guild_TaskNum": 4,
     "guild_ImpeachmentCountDown": 1,
     "guild_DissolutionCountDown_cd": 1,
@@ -678,7 +678,7 @@
       "t": "10000035",
       "n": 0
     },
-    "passlvmax": 50,
+    "passlvmax": 60,
     "guildboss_roulette": {
       "a": "item",
       "t": "22100001",
@@ -784,6 +784,7 @@
       "n": 1
     },
     "td_dailystage_challenge_num": 2,
-    "td_dailystage_challenge_num_max": 2
+    "td_dailystage_challenge_num_max": 2,
+    "guild_sign_in": 10
   }
 ]

bin/json/game_integral.json

@@ -31,7 +31,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -42,7 +42,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -66,7 +66,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -77,7 +77,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -101,7 +101,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -112,7 +112,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -136,7 +136,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -147,7 +147,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -171,7 +171,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -182,7 +182,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -206,7 +206,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -217,7 +217,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -241,7 +241,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -252,7 +252,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -276,7 +276,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -287,7 +287,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -311,7 +311,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -322,7 +322,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -346,7 +346,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -357,7 +357,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""
@@ -381,7 +381,7 @@
       {
         "a": "attr",
         "t": "consumeexp",
-        "n": 20
+        "n": 50
       },
       {
         "a": "attr",
@@ -392,7 +392,7 @@
     "boxid": 0,
     "deductrewards": [],
     "reducewards": 0,
-    "addwards": 20,
+    "addwards": 50,
     "name": {
       "key": "",
       "text": ""

bin/json/game_integralcondition.json

@@ -7,7 +7,7 @@
     },
     "TaskId": 17100001,
     "iType": 1,
-    "jumpto": 166,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_01",
       "text": "[敌方]暴击伤害降低10%"
@@ -22,7 +22,7 @@
     },
     "TaskId": 17100002,
     "iType": 1,
-    "jumpto": 166,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_02",
       "text": "[敌方]防御降低10%"
@@ -37,7 +37,7 @@
     },
     "TaskId": 17100003,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_03",
       "text": "[敌方]攻击降低10%"
@@ -52,7 +52,7 @@
     },
     "TaskId": 17100004,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_04",
       "text": "[敌方]速度降低10%"
@@ -67,7 +67,7 @@
     },
     "TaskId": 17100005,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_05",
       "text": "[敌方]命中降低10%"
@@ -82,7 +82,7 @@
     },
     "TaskId": 17100006,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_06",
       "text": "[敌方]暴击降低10%"
@@ -97,7 +97,7 @@
     },
     "TaskId": 17100007,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_07",
       "text": "[敌方]受到增益效果持续回合数-1"
@@ -112,7 +112,7 @@
     },
     "TaskId": 17100008,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_08",
       "text": "[敌方]所有减益效果持续回合数+1"
@@ -127,7 +127,7 @@
     },
     "TaskId": 17100009,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_09",
       "text": "[敌方]受到持续伤害增加50%"
@@ -142,7 +142,7 @@
     },
     "TaskId": 17100010,
     "iType": 1,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_10",
       "text": "[敌方]无法触发会心"
@@ -157,7 +157,7 @@
     },
     "TaskId": 0,
     "iType": 2,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_11",
       "text": "[敌方]所有技能冷却回合+1"
@@ -172,7 +172,7 @@
     },
     "TaskId": 0,
     "iType": 2,
-    "jumpto": 0,
+    "jumpto": 150,
     "des": {
       "key": "IntegralBoss_Integralcondition_des_12",
       "text": "[敌方]身上每有一个减益效果受到伤害增加5%"

bin/json/game_mainstage.json

@@ -5125,6 +5125,11 @@
         "a": "equi",
         "t": "10134",
         "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012101",
+        "n": 1
       }
     ],
     "lotteryward": 17110110,
@@ -7124,7 +7129,7 @@
     "timelineplayer": false,
     "stroyshow": false,
     "frontstoryid": 0,
-    "afterstoryid": 0,
+    "afterstoryid": 200810,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -7151,6 +7156,11 @@
         "a": "item",
         "t": "24011001",
         "n": 50
+      },
+      {
+        "a": "item",
+        "t": "24012105",
+        "n": 1
       }
     ],
     "lotteryward": 0,
@@ -7310,7 +7320,7 @@
     "timelineplayer": false,
     "stroyshow": false,
     "frontstoryid": 0,
-    "afterstoryid": 0,
+    "afterstoryid": 200810,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -7337,6 +7347,11 @@
         "a": "item",
         "t": "24011001",
         "n": 50
+      },
+      {
+        "a": "item",
+        "t": "24012106",
+        "n": 1
       }
     ],
     "lotteryward": 0,
@@ -7526,6 +7541,11 @@
         "a": "item",
         "t": "24011001",
         "n": 50
+      },
+      {
+        "a": "item",
+        "t": "24012104",
+        "n": 1
       }
     ],
     "lotteryward": 0,
@@ -8713,7 +8733,7 @@
     "timelineplayer": false,
     "stroyshow": false,
     "frontstoryid": 0,
-    "afterstoryid": 0,
+    "afterstoryid": 200790,
     "maingroupName": {
       "key": "",
       "text": ""
@@ -8740,6 +8760,11 @@
         "a": "item",
         "t": "24011001",
         "n": 50
+      },
+      {
+        "a": "item",
+        "t": "24012102",
+        "n": 1
       }
     ],
     "lotteryward": 0,
@@ -8838,18 +8863,7 @@
       }
     ],
     "lotteryward": 0,
-    "commonaward": [
+    "commonaward": [],
-      {
-        "a": "item",
-        "t": "24011001",
-        "n": 150
-      },
-      {
-        "a": "item",
-        "t": "10000001",
-        "n": 10
-      }
-    ],
     "BattleReadyID": 0,
     "FormatList": [],
     "helphero": [],
@@ -9041,8 +9055,8 @@
       100104
     ],
     "previoustage": 0,
-    "buried_type": 0,
+    "buried_type": 2,
-    "buried": 0,
+    "buried": 2,
     "grouptype": [],
     "Episodetype": 7,
     "stage_param": 0,
@@ -9212,7 +9226,7 @@
     "chapterid": 11001,
     "group_id": 100165,
     "previous_group_id": [
-      100160
+      100130
     ],
     "previoustage": 0,
     "buried_type": 0,
@@ -9304,7 +9318,7 @@
     "chapterid": 11001,
     "group_id": 100166,
     "previous_group_id": [
-      100160
+      100130
     ],
     "previoustage": 0,
     "buried_type": 0,
@@ -9396,7 +9410,7 @@
     "chapterid": 11001,
     "group_id": 100167,
     "previous_group_id": [
-      100160
+      100130
     ],
     "previoustage": 0,
     "buried_type": 0,
@@ -9488,7 +9502,7 @@
     "chapterid": 11001,
     "group_id": 100168,
     "previous_group_id": [
-      100168
+      100130
     ],
     "previoustage": 0,
     "buried_type": 0,
@@ -9572,8 +9586,8 @@
       100168
     ],
     "previoustage": 0,
-    "buried_type": 0,
+    "buried_type": 2,
-    "buried": 0,
+    "buried": 3,
     "grouptype": [],
     "Episodetype": 7,
     "stage_param": 0,
@@ -9605,7 +9619,7 @@
       "key": "",
       "text": ""
     },
-    "hide": true,
+    "hide": false,
     "destroy": true,
     "progress": 0,
     "timelineplayer": false,
@@ -9641,7 +9655,13 @@
       }
     ],
     "lotteryward": 0,
-    "commonaward": [],
+    "commonaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 5
+      }
+    ],
     "BattleReadyID": 0,
     "FormatList": [],
     "helphero": [],
@@ -9732,6 +9752,719 @@
     "star_value": [],
     "challengeward": 0
   },
+  {
+    "id": 1101096,
+    "chapterid": 11001,
+    "group_id": 100171,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 2,
+    "buried": 4,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": true,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 200800,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 3
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 3
+      }
+    ],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101097,
+    "chapterid": 11001,
+    "group_id": 100172,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 2,
+    "buried": 5,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": true,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 200820,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 3
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 3
+      }
+    ],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101098,
+    "chapterid": 11001,
+    "group_id": 100173,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": true,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 200700,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101099,
+    "chapterid": 11001,
+    "group_id": 100174,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": true,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 200780,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
+      },
+      {
+        "a": "item",
+        "t": "24012103",
+        "n": 1
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101100,
+    "chapterid": 11001,
+    "group_id": 100175,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": true,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 200710,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101101,
+    "chapterid": 11001,
+    "group_id": 100176,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": false,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 0,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101102,
+    "chapterid": 11001,
+    "group_id": 100177,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": true,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 0,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
+  {
+    "id": 1101103,
+    "chapterid": 11001,
+    "group_id": 100178,
+    "previous_group_id": [
+      100130
+    ],
+    "previoustage": 0,
+    "buried_type": 0,
+    "buried": 0,
+    "grouptype": [],
+    "Episodetype": 7,
+    "stage_param": 0,
+    "inherit": true,
+    "battle_fail": false,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
+    "move_type": 0,
+    "venturemodel": "",
+    "bubbletalk": {
+      "key": "",
+      "text": ""
+    },
+    "venturetype": 0,
+    "ventureavatar": [],
+    "scene_effect": [],
+    "scene_effectfilter": "",
+    "is_near": false,
+    "openlevel": 1,
+    "EditorStage": 0,
+    "herocolor": 2,
+    "heroimg": "zxgq_qp_icon_gth",
+    "bubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "animation": [],
+    "prewarbubbletext": {
+      "key": "",
+      "text": ""
+    },
+    "hide": false,
+    "destroy": true,
+    "progress": 0,
+    "timelineplayer": false,
+    "stroyshow": false,
+    "frontstoryid": 0,
+    "afterstoryid": 0,
+    "maingroupName": {
+      "key": "",
+      "text": ""
+    },
+    "maingroupIcon": "",
+    "mainlineName": {
+      "key": "",
+      "text": ""
+    },
+    "title": {
+      "key": "",
+      "text": ""
+    },
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "exp": 0,
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
+      }
+    ],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
+    "helphero": [],
+    "banhero": [],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
+    "challengeward": 0
+  },
   {
     "id": 1102000,
     "chapterid": 11002,

bin/json/game_monsterformat.json

@@ -12015,13 +12015,13 @@
     "equip": [],
     "newskill": [],
     "lv": 13,
-    "hppro": 1.93,
+    "hppro": 10,
-    "atkpro": 1.27,
+    "atkpro": 2,
-    "defpro": 0.88,
+    "defpro": 2,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 0,
+    "speed": 100,
     "modelsize": 1
   },
   {
@@ -12035,13 +12035,13 @@
     "equip": [],
     "newskill": [],
     "lv": 13,
-    "hppro": 1,
+    "hppro": 2,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": -1,
+    "speed": 105,
     "modelsize": 1
   },
   {
@@ -12055,13 +12055,13 @@
     "equip": [],
     "newskill": [],
     "lv": 13,
-    "hppro": 1,
+    "hppro": 2,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": -1,
+    "speed": 105,
     "modelsize": 1
   },
   {
@@ -12075,13 +12075,13 @@
     "equip": [],
     "newskill": [],
     "lv": 13,
-    "hppro": 1,
+    "hppro": 2,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": -1,
+    "speed": 105,
     "modelsize": 1
   },
   {
@@ -12095,13 +12095,13 @@
     "equip": [],
     "newskill": [],
     "lv": 13,
-    "hppro": 1,
+    "hppro": 2,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": -1,
+    "speed": 105,
     "modelsize": 1
   },
   {

bin/json/game_shop.json

@@ -427,7 +427,6 @@
       }
     ],
     "shopitem": [
-      30001,
       30004,
       30005,
       30006,

bin/json/game_shopitem.json

@@ -30055,9 +30055,7 @@
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
-    "unlock": [
+    "unlock": []
-      12070011
-    ]
   },
   {
     "key": 808,
@@ -30095,9 +30093,7 @@
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
-    "unlock": [
+    "unlock": []
-      12070011
-    ]
   },
   {
     "key": 809,
@@ -30135,9 +30131,7 @@
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
-    "unlock": [
+    "unlock": []
-      12070011
-    ]
   },
   {
     "key": 810,
@@ -30168,15 +30162,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000015
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000001
     ]
   },
   {
@@ -30208,15 +30204,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000016
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000002
     ]
   },
   {
@@ -30248,15 +30246,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000017
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000003
     ]
   },
   {
@@ -30288,15 +30288,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000018
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000004
     ]
   },
   {
@@ -30328,15 +30330,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000019
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000005
     ]
   },
   {
@@ -30368,15 +30372,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000020
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000006
     ]
   },
   {
@@ -30408,15 +30414,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000021
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000007
     ]
   },
   {
@@ -30448,15 +30456,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000022
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000008
     ]
   },
   {
@@ -30488,15 +30498,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000023
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000009
     ]
   },
   {
@@ -30528,15 +30540,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000024
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000010
     ]
   },
   {
@@ -30568,15 +30582,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000025
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000011
     ]
   },
   {
@@ -30608,15 +30624,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000026
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000012
     ]
   },
   {
@@ -30648,15 +30666,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000027
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000013
     ]
   },
   {
@@ -30688,15 +30708,17 @@
       1000
     ],
     "buyminnum": 1,
-    "buymaxcond": [],
+    "buymaxcond": [
-    "addminnum": 0,
+      20000028
+    ],
+    "addminnum": 1,
     "vip": 0,
     "lvmin": 1,
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999,
     "unlock": [
-      12070011
+      20000014
     ]
   }
 ]

bin/json/game_skillafteratk.json

@@ -33070,7 +33070,7 @@
     "Type": 3,
     "Argu": [
       391000107,
-      500,
+      1000,
       1,
       -1
     ],
@@ -40457,10 +40457,10 @@
       -1,
       1000
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       225002313
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -40496,17 +40496,17 @@
   {
     "Id": 225002314,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       4,
-      1200
+      3000
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -40522,17 +40522,17 @@
   {
     "Id": 225002315,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       4,
-      1300
+      3100
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -40548,17 +40548,17 @@
   {
     "Id": 225002316,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       4,
-      1400
+      3200
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -40574,17 +40574,17 @@
   {
     "Id": 225002317,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       4,
-      1500
+      3300
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -40600,17 +40600,17 @@
   {
     "Id": 225002318,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       4,
-      1600
+      3400
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -40626,7 +40626,7 @@
   {
     "Id": 225002319,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -67646,10 +67646,10 @@
   {
     "Id": 223011311,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 4,
     "TriggerAnim": "",
     "Type": 1,
@@ -67672,10 +67672,10 @@
   {
     "Id": 223011321,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 4,
     "TriggerAnim": "",
     "Type": 1,
@@ -67698,10 +67698,10 @@
   {
     "Id": 223011331,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 4,
     "TriggerAnim": "",
     "Type": 1,
@@ -67724,10 +67724,10 @@
   {
     "Id": 223011341,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 4,
     "TriggerAnim": "",
     "Type": 1,
@@ -67750,10 +67750,10 @@
   {
     "Id": 223011351,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 1,
     "ExecuteCnt": 4,
     "TriggerAnim": "",
     "Type": 1,
@@ -67776,7 +67776,7 @@
   {
     "Id": 223011312,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -67825,7 +67825,7 @@
   {
     "Id": 223011314,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 12,
     "Where": [],
     "Order": "",
     "Limit": 10,

bin/json/game_skillatk.json

@@ -26308,9 +26308,7 @@
         243007211
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      243007211
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_143007211_1",
       "text": "友方受到的【攻击提升】、【防御提升】、【速度提升】效果提升35%。"
@@ -26343,9 +26341,7 @@
         243007211
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      243007211
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_143007211_2",
       "text": "冷却回合减少1回合。"
@@ -26378,9 +26374,7 @@
         243007211
       ]
     },
-    "passSkill": [
+    "passSkill": [],
-      243007211
-    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_143007211_3",
       "text": "冷却回合减少1回合。"
@@ -32459,7 +32453,7 @@
     "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_125002311_1",
-      "text": "净化自身所有减益状态，同时驱散敌方全体所有增益状态，随后对敌方全体造成攻击力120%的伤害，共有50%概率附加2回合【防御下降】状态。若驱散成功，则有100%概率附加【防御下降】状态。"
+      "text": "净化自身所有减益状态，同时驱散敌方全体所有增益状态，随后对敌方造成攻击力120%的伤害，共有50%概率附加2回合【防御下降】状态。若驱散成功，则有100%概率附加【防御下降】状态。"
     },
     "buffid": [],
     "map": ""
@@ -32486,8 +32480,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        225002315,
+        225002311,
-        225002314
+        225002315
       ]
     },
     "passSkill": [],
@@ -32520,8 +32514,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        225002316,
+        225002311,
-        225002314
+        225002316
       ]
     },
     "passSkill": [],
@@ -32554,8 +32548,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        225002317,
+        225002311,
-        225002314
+        225002317
       ]
     },
     "passSkill": [],
@@ -32588,8 +32582,8 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        225002318,
+        225002311,
-        225002314
+        225002318
       ]
     },
     "passSkill": [],
@@ -54552,7 +54546,7 @@
     ],
     "Desc": {
       "key": "skill_skill_atk_Desc_123011311_1",
-      "text": "攻击敌方全体目标4次，每次对其造成攻击力120%的伤害，100%概率附加2回合【流血】，造成暴击后额外附加2回合【流血】"
+      "text": "攻击敌方目标4次，每次对其造成攻击力120%的伤害，100%概率附加2回合【流血】，造成暴击后额外附加2回合【流血】"
     },
     "buffid": [],
     "map": ""

bin/json/game_skillbuff.json

@@ -1750,10 +1750,10 @@
     "golbalbufficon": "",
     "buffIcon": "ty_icon_buff_ss",
     "buffeffect": "",
-    "buffpos": "根节点",
+    "buffpos": "",
     "AddTrigger": 0,
-    "TriggerEffect": "",
+    "TriggerEffect": "effect_15002_skill_2",
-    "TriggerPos": "",
+    "TriggerPos": "根节点",
     "TriggerAnim": "",
     "forbidFloat": 0,
     "ReplaceBuffID": 0

bin/json/game_treasuremap.json

@@ -12,16 +12,211 @@
       }
     ],
     "name": {
-      "key": "treasuremap_map_name_2",
+      "key": "treasuremap_map_name_1",
       "text": "博克岛的藏宝图"
     },
     "explain": {
-      "key": "treasuremap_map_explain_2",
+      "key": "treasuremap_map_explain_1",
       "text": "雕像与雕像之间，好像藏着小秘密~要试着去找找吗？"
     },
+    "describe": {
+      "key": "treasuremap_map_desribe_1",
+      "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+    }
+  },
+  {
+    "id": 2,
+    "pic": "cbt_sp02_00",
+    "chapter": 11001,
+    "type": 2,
+    "unlock": [
+      {
+        "a": "item",
+        "t": "24012101",
+        "n": 1
+      }
+    ],
+    "name": {
+      "key": "treasuremap_map_name_2",
+      "text": "巅峰藏宝图"
+    },
+    "explain": {
+      "key": "treasuremap_map_explain_2",
+      "text": "它存在于最高之峰！稍微下一点点。"
+    },
     "describe": {
       "key": "treasuremap_map_desribe_2",
       "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
     }
+  },
+  {
+    "id": 3,
+    "pic": "cbt_sp01_00",
+    "chapter": 11001,
+    "type": 0,
+    "unlock": [
+      {
+        "a": "item",
+        "t": "24012012",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012013",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012014",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012012",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012013",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012014",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012012",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012013",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012014",
+        "n": 1
+      }
+    ],
+    "name": {
+      "key": "treasuremap_map_name_3",
+      "text": "羊羊藏宝图"
+    },
+    "explain": {
+      "key": "treasuremap_map_explain_3",
+      "text": "他一定很爱羊羊吧。"
+    },
+    "describe": {
+      "key": "treasuremap_map_desribe_3",
+      "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+    }
+  },
+  {
+    "id": 4,
+    "pic": "cbt_sp04_00",
+    "chapter": 11001,
+    "type": 1,
+    "unlock": [
+      {
+        "a": "item",
+        "t": "24012102",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012103",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012102",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012103",
+        "n": 1
+      }
+    ],
+    "name": {
+      "key": "treasuremap_map_name_4",
+      "text": "夹板藏宝图"
+    },
+    "explain": {
+      "key": "treasuremap_map_explain_4",
+      "text": "按照惯例，船上肯定有个藏东西的地方。"
+    },
+    "describe": {
+      "key": "treasuremap_map_desribe_4",
+      "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+    }
+  },
+  {
+    "id": 5,
+    "pic": "cbt_sp05_00",
+    "chapter": 11001,
+    "type": 0,
+    "unlock": [
+      {
+        "a": "item",
+        "t": "24012104",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012105",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012106",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012104",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012105",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012106",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012104",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012105",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24012106",
+        "n": 1
+      }
+    ],
+    "name": {
+      "key": "treasuremap_map_name_5",
+      "text": "符文藏宝图"
+    },
+    "explain": {
+      "key": "treasuremap_map_explain_5",
+      "text": "何等邪恶的符文！呃，大概很邪恶。"
+    },
+    "describe": {
+      "key": "treasuremap_map_desribe_5",
+      "text": "获得这张藏宝图后，可以根据藏宝图在博克岛寻找出隐藏着的宝藏。在没有获得藏宝图时宝藏不会出现，要根据图片位置好好搜寻哦~"
+    }
   }
 ]

bin/json/game_trendchose.json

@@ -253,7 +253,7 @@
     "startstory": 10000351,
     "constory": 10000352,
     "get": [
-      1001
+      1004
     ],
     "aginstory": 0,
     "lose": [],
@@ -278,7 +278,7 @@
     "startstory": 10000371,
     "constory": 10000372,
     "get": [
-      1002
+      1005
     ],
     "aginstory": 0,
     "lose": [],

lego/sys/event/v2/app.go

@@ -1,65 +0,0 @@
-package event_v2
-
-import (
-	"go_dreamfactory/lego/core"
-	"sync"
-)
-
-// 服务容器
-type App struct {
-	//inject.Graph
-	sync.RWMutex
-	events map[core.Event_Key][]Listener // 事件
-}
-
-// 容器的目的是为了创建事件之后，为事件注入观察者，所以为了方便，直接全部解耦
-// 创建
-
-// 新建一个App，可以在其中注册事件
-func NewApp() *App {
-	app := &App{}
-	app.events = make(map[core.Event_Key][]Listener)
-	return app
-}
-
-// 给容器绑定事件,传入 类型-> 观察者的绑定
-// 可以使用反射，传入类型的字符串
-// 否则bind时也可以放置包括通配符的
-func (app *App) Bind(t core.Event_Key, listeners []Listener) {
-	for k := range listeners {
-		app.Listen(t, listeners[k])
-	}
-}
-
-// 监听[事件][监听器]，单独绑定一个监听器
-func (app *App) Listen(str core.Event_Key, listener Listener) {
-	app.Lock()
-	app.events[str] = append(app.events[str], listener)
-	app.Unlock()
-}
-
-// 分发事件，传入各种事件，如果是
-func (app *App) Dispatch(key core.Event_Key, events ...interface{}) {
-	// 容器分发数据
-	for k := range events {
-		// 如果实现了 事件接口 IEvent，则调用事件的观察者模式，得到所有的
-		var observers []Listener
-		if _, ok := events[k].(IEvent); ok {
-			obs := events[k].(IEvent).Observers()
-			observers = append(observers, obs...) // 将事件中自行添加的观察者，放在所有观察者之后
-		}
-
-		if obs, exist := app.events[key]; exist {
-			observers = append(observers, obs...)
-		}
-
-		if len(observers) > 0 {
-			// 得到了所有的观察者，这里通过pipeline来执行，通过next来控制什么时候调用这个观察者
-			new(Pipeline).Send(events[k]).Through(observers).Then(func(context interface{}) {
-
-			})
-		}
-
-	}
-
-}

lego/sys/event/v2/event.go

@@ -1,36 +0,0 @@
-package event_v2
-
-// 事件接口
-type IEvent interface {
-	Attach(listeners ...Listener) // 事件添加观察者
-	Observers() []Listener        // 获取所有的观察者
-	//Detach(listener Listener)
-	DetachIndexOf(index int)
-}
-
-type Event struct {
-	listeners []Listener
-}
-
-func (e *Event) Attach(listeners ...Listener) {
-	e.listeners = append(e.listeners, listeners...)
-}
-
-//func (e *Event) Detach(listener Listener) {
-//	for k := range e.listeners {
-//		if listener == e.listeners[k] {
-//
-//		}
-//	}
-//}
-
-// 移除某个监听器
-func (e *Event) DetachIndexOf(index int) {
-	if len(e.listeners) > index && index > 0 {
-		e.listeners = append(e.listeners[:index], e.listeners[index+1:]...)
-	}
-}
-
-func (e *Event) Observers() []Listener {
-	return e.listeners
-}

lego/sys/event/v2/listener.go

@@ -1,5 +0,0 @@
-package event_v2
-
-// 监听器接口
-
-type Listener func(event interface{},next func(event interface{}))

lego/sys/event/v2/pipeline.go

@@ -1,41 +0,0 @@
-package event_v2
-
-type Pipeline struct {
-	send    interface{} // 穿过管道的上下文
-	through []Listener   // 中间件数组
-	current int          // 当前执行到第几个中间件
-}
-
-func (p *Pipeline) Send(context interface{}) *Pipeline {
-	p.send = context
-	return p
-}
-
-func (p *Pipeline) Through(middlewares []Listener) *Pipeline {
-	p.through = middlewares
-	return p
-}
-
-func (p *Pipeline) Exec() {
-	if len(p.through) > p.current {
-		m := p.through[p.current]
-		p.current += 1
-		m(p.send, func(c interface{}) {
-			p.Exec()
-		})
-	}
-
-}
-
-// 这里是路由的最后一站
-func (p *Pipeline) Then(then func(context interface{})) {
-	// 按照顺序执行
-	// 将then作为最后一站的中间件
-	var m Listener
-	m = func(c interface{}, next func(c interface{})) {
-		then(c)
-		next(c)
-	}
-	p.through = append(p.through, m)
-	p.Exec()
-}

modules/sociaty/api_cross_sign.go

@@ -15,6 +15,8 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er
 	var (
 		atnotemp []*pb.UserAtno
 		atno     []*pb.UserAtno
+		changelv bool
+		err      error
 	)
 
 	if errdata = this.SignCheck(session, req); errdata != nil {
@@ -69,46 +71,42 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.SociatySignReq) (er
 			break
 		}
 	}
-
+	update := map[string]interface{}{}
 	if cfg, ok := this.module.sociatySignConf.GetDataMap()[signCfgId]; ok {
 		// 更新公会经验
 		if cfg.Exp.T == "guildexp" {
-			update := map[string]interface{}{}
 			this.module.modelSociaty.updateSociatyExp(cfg.Exp.N, sociaty, update)
 			// 更新等级
-			if changelv, err := this.module.modelSociaty.changeLv(sociaty, update); err != nil {
+			if changelv, err = this.module.modelSociaty.changeLv(sociaty, update); err != nil {
 				errdata = &pb.ErrorData{
 					Code:    pb.ErrorCode_ConfigNoFound,
-					Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-					Message: err.Error(),
-				}
-			} else if changelv {
-				this.module.modelSociaty.EventApp.Dispatch(comm.EventSociatyRankChanged, &SociatyListen{
-					sociaty: sociaty,
-				})
-				go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
-					this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeWorldtaskid, sociaty.Lv)
-				})
-			}
-			if err := this.module.modelSociaty.updateSociaty(sociaty.Id, update); err != nil {
-				errdata = &pb.ErrorData{
-					Code:    pb.ErrorCode_DBError,
-					Title:   pb.ErrorCode_DBError.ToString(),
 					Message: err.Error(),
 				}
 				return
 			}
 		}
 	}
-
+	sociaty.Activity += this.module.globalConf.GuildSignIn
+	update["activity"] = sociaty.Activity
+	if err = this.module.modelSociaty.updateSociaty(sociaty.Id, update); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
 	rsp := &pb.SociatySignResp{
 		Uid:       uid,
 		SociatyId: sociaty.Id,
 		Reward:    atno,
+		Activity:  sociaty.Activity,
 	}
 
 	session.SendMsg(string(this.module.GetType()), SociatySubTypeSign, rsp)
 	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+		if changelv {
+			this.module.modelSociaty.rankDataChanged(sociaty)
+		}
 		this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "SociatySignReq", atno)
 	})
 	return

modules/sociaty/model_sociaty.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
-	event_v2 "go_dreamfactory/lego/sys/event/v2"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
@@ -35,14 +34,8 @@ const (
 
 type ModelSociaty struct {
 	modules.MCompModel
-	module   *Sociaty
+	module  *Sociaty
-	service  core.IService
+	service core.IService
-	EventApp *event_v2.App
-}
-
-type SociatyListen struct {
-	event_v2.App
-	sociaty *pb.DBSociaty
 }
 
 func (this *ModelSociaty) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@@ -56,8 +49,8 @@ func (this *ModelSociaty) Init(service core.IService, module core.IModule, comp
 	})
 	this.module = module.(*Sociaty)
 	this.service = service
-	this.EventApp = event_v2.NewApp()
+	// this.EventApp = event_v2.NewApp()
-	this.EventApp.Listen(comm.EventSociatyRankChanged, this.rankDataChanged)
+	// this.EventApp.Listen(comm.EventSociatyRankChanged, this.rankDataChanged)
 	return
 }
 
@@ -811,31 +804,24 @@ func (this *ModelSociaty) sort(list []*pb.DBSociatyRank) []*pb.DBSociatyRank {
 
 // 公会等级变化
 // 更新排行榜
-func (this *ModelSociaty) rankDataChanged(event interface{}, next func(event interface{})) {
+func (this *ModelSociaty) rankDataChanged(sociaty *pb.DBSociaty) {
 	var list []*pb.DBSociatyRank
 	if err := this.GetList("", &list); err != nil {
 		log.Errorf("sociaty list err:%v", err)
 		return
 	}
 
-	data := event.(*SociatyListen)
-	if data.sociaty == nil {
-		return
-	}
-
 	newRank := &pb.DBSociatyRank{
-		SociatyId: data.sociaty.Id,
+		SociatyId: sociaty.Id,
-		Name:      data.sociaty.Name,
+		Name:      sociaty.Name,
-		Lv:        data.sociaty.Lv,
+		Lv:        sociaty.Lv,
-		Activity:  data.sociaty.Activity,
+		Activity:  sociaty.Activity,
-		Ctime:     data.sociaty.Ctime,
+		Ctime:     sociaty.Ctime,
 	}
 	if len(list) == 0 || len(list) > 0 && len(list) < 20 {
-		if data != nil {
+		this.AddList("", sociaty.Id, newRank)
-			this.AddList("", data.sociaty.Id, newRank)
-		}
 	} else {
-		this.AddList("", data.sociaty.Id, newRank)
+		this.AddList("", sociaty.Id, newRank)
 		if err := this.GetList("", &list); err != nil {
 			log.Errorf("sociaty list err:%v", err)
 			return
@@ -885,13 +871,10 @@ func (this *ModelSociaty) changeLv(sociaty *pb.DBSociaty, update map[string]inte
 	var (
 		ggl *cfg.GameGuildLv
 	)
-
 	if ggl, err = this.module.configure.getSociatyLvCfg(); err != nil {
 		return
 	}
-
 	curLv := sociaty.Lv
-
 	lv := curLv + 1
 	if conf, ok := ggl.GetDataMap()[lv]; ok {
 		if sociaty.Exp > conf.Exp {

pb/sociaty_msg.pb.go

@@ -2071,6 +2071,7 @@ type SociatySignResp struct {
 	Uid       string      `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
 	SociatyId string      `protobuf:"bytes,2,opt,name=sociatyId,proto3" json:"sociatyId"`
 	Reward    []*UserAtno `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"`
+	Activity  int32       `protobuf:"varint,4,opt,name=activity,proto3" json:"activity"`
 }
 
 func (x *SociatySignResp) Reset() {
@@ -2126,6 +2127,13 @@ func (x *SociatySignResp) GetReward() []*UserAtno {
 	return nil
 }
 
+func (x *SociatySignResp) GetActivity() int32 {
+	if x != nil {
+		return x.Activity
+	}
+	return 0
+}
+
 //日志列表
 type SociatyLogReq struct {
 	state         protoimpl.MessageState
@@ -3964,184 +3972,186 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
 	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x63,
 	0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61,
 	0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63,
-	0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x64, 0x0a, 0x0f, 0x53,
+	0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x80, 0x01, 0x0a, 0x0f,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
-	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
-	0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+	0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
+	0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61,
-	0x64, 0x22, 0x0f, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52,
+	0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x04,
-	0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x0f,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22,
-	0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67,
+	0x31, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73,
-	0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x70, 0x12, 0x1f, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
-	0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x82, 0x01, 0x0a, 0x13,
+	0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x03, 0x6c,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52,
+	0x6f, 0x67, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73,
-	0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x82, 0x01, 0x0a, 0x13, 0x53, 0x6f, 0x63,
-	0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c,
+	0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x32, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e,
+	0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
+	0x6c, 0x69, 0x73, 0x74, 0x1a, 0x37, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2b, 0x0a,
+	0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
+	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x12, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
+	0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x53, 0x6f, 0x63,
+	0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x22, 0x8a, 0x01, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41,
+	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x36, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c,
 	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x6e, 0x74, 0x72,
 	0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x37, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x45,
 	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0x2b, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69,
+	0x22, 0x2b, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76,
-	0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
+	0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x6d, 0x0a,
+	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x6d, 0x0a,
-	0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
+	0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
-	0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
 	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
 	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77,
 	0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x18, 0x0a, 0x16,
+	0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2c, 0x0a, 0x0e,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x8a, 0x01, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f,
-	0x73, 0x70, 0x12, 0x36, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a,
-	0x32, 0x22, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
+	0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42,
-	0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x1a, 0x37, 0x0a, 0x09, 0x4c, 0x69,
+	0x6b, 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73,
-	0x73, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x6d, 0x69, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x02, 0x38, 0x01, 0x22, 0x2b, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63,
+	0x79, 0x50, 0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
+	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x22, 0x6d, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76,
+	0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x15, 0x53,
-	0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e,
+	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c,
+	0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06,
+	0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
+	0x74, 0x79, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
-	0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22,
+	0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xf8, 0x02, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69,
-	0x2c, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65,
+	0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x05,
-	0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+	0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x53, 0x6f,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x35, 0x0a,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54,
-	0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70,
+	0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73,
-	0x12, 0x22, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
+	0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x04,
+	0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x54,
-	0x72, 0x61, 0x6e, 0x6b, 0x22, 0x33, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50,
+	0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x54, 0x69,
-	0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x73,
+	0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+	0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73, 0x65, 0x74, 0x74,
+	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f,
+	0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+	0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x67, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x68, 0x69, 0x67, 0x68, 0x49, 0x6e, 0x74,
+	0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e,
+	0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x0f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67,
+	0x12, 0x26, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x69,
+	0x6e, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x79, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
+	0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73,
 	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63,
+	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61,
-	0x69, 0x61, 0x74, 0x79, 0x50, 0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10,
+	0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e,
-	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x47,
+	0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73, 0x63, 0x68, 0x61,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
-	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63,
+	0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d,
-	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x15, 0x53,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xf8, 0x02, 0x0a, 0x10, 0x53,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x32, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x4d, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65,
-	0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65,
-	0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e,
-	0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73,
-	0x65, 0x74, 0x74, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a,
-	0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x67, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0d, 0x68, 0x69, 0x67, 0x68,
-	0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x65, 0x72,
-	0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x0f, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b,
-	0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0e, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61,
-	0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x73, 0x6f, 0x63,
-	0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x1a, 0x48, 0x0a, 0x0a, 0x54,
-	0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61,
-	0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
-	0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c,
-	0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x05,
-	0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f,
-	0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74,
-	0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54,
-	0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47,
-	0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69,
-	0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72,
-	0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x49, 0x64, 0x22, 0x4c, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68,
+	0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x03, 0x75, 0x69, 0x64, 0x22, 0x39, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
-	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10,
+	0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22,
-	0x22, 0x64, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c,
+	0x4c, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1f,
+	0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a,
-	0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e,
+	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x64, 0x0a,
-	0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06,
+	0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
-	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x39, 0x0a, 0x1b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70,
-	0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61,
-	0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x06,
-	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
-	0x6c, 0x22, 0x29, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
-	0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x74, 0x65,
+	0x6f, 0x72, 0x74, 0x22, 0x39, 0x0a, 0x1b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65, 0x22, 0x98, 0x01, 0x0a,
+	0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
-	0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
+	0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x29,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65,
+	0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65,
-	0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d,
+	0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65, 0x22, 0x98, 0x01, 0x0a, 0x14, 0x53, 0x6f,
-	0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a,
+	0x73, 0x70, 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43,
+	0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d,
-	0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61,
+	0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65,
-	0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+	0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61,
-	0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4b, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c,
-	0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09,
+	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
-	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
+	0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
-	0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
+	0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61,
+	0x49, 0x64, 0x22, 0x4b, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65,
-	0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f,
-	0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
-	0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61,
+	0x2d, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x0e, 0x0a,
+	0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
-	0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1,
-	0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x01, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e,
-	0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x18, 0x0a, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02,
-	0x52, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x6e,
+	0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72,
-	0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22,
+	0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
-	0x46, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71,
+	0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
-	0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x61, 0x6c, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61,
-	0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12,
+	0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01,
-	0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61,
-	0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61,
+	0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x46, 0x0a, 0x0d,
-	0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x2a, 0x42, 0x0a, 0x11, 0x53,
+	0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06,
-	0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e,
+	0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75,
-	0x44, 0x49, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10,
+	0x79, 0x4e, 0x75, 0x6d, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
-	0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42,
+	0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a,
+	0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10,
+	0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c,
+	0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04,
+	0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

sys/configure/structs/Game.BuzkashiComboData.go

@@ -15,6 +15,7 @@ type GameBuzkashiComboData struct {
     ComboMin int32
     ComboMax int32
     Value int32
+    Valuetext int32
 }
 
 const TypeId_GameBuzkashiComboData = -660484187
@@ -28,6 +29,7 @@ func (_v *GameBuzkashiComboData)Deserialize(_buf map[string]interface{}) (err er
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ComboMin"].(float64); !_ok_ { err = errors.New("ComboMin error"); return }; _v.ComboMin = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ComboMax"].(float64); !_ok_ { err = errors.New("ComboMax error"); return }; _v.ComboMax = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["valuetext"].(float64); !_ok_ { err = errors.New("valuetext error"); return }; _v.Valuetext = int32(_tempNum_) }
     return
 }
 

sys/configure/structs/Game.ConsumeHeroData.go

@@ -29,6 +29,7 @@ type GameConsumeHeroData struct {
     Bigskillname string
     Bigskillhero string
     Bigskillcolor int32
+    Bigskilleffect string
     Get int32
     Consume []*Gameatn
     Skilltype int32
@@ -63,6 +64,7 @@ func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; if _v.Bigskillname, _ok_ = _buf["bigskillname"].(string); !_ok_ { err = errors.New("bigskillname error"); return } }
     { var _ok_ bool; if _v.Bigskillhero, _ok_ = _buf["bigskillhero"].(string); !_ok_ { err = errors.New("bigskillhero error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bigskillcolor"].(float64); !_ok_ { err = errors.New("bigskillcolor error"); return }; _v.Bigskillcolor = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Bigskilleffect, _ok_ = _buf["bigskilleffect"].(string); !_ok_ { err = errors.New("bigskilleffect error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["get"].(float64); !_ok_ { err = errors.New("get error"); return }; _v.Get = int32(_tempNum_) }
      {
                 var _arr_ []interface{}

sys/configure/structs/Game.PassConditionType.go

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+const (
+    GamePassConditionType_None = 0
+    GamePassConditionType_RaceFire = 1
+    GamePassConditionType_RaceForest = 2
+    GamePassConditionType_RaceWater = 3
+    GamePassConditionType_RaceLight = 4
+    GamePassConditionType_Victory = 5
+    GamePassConditionType_BloodVolume = 6
+    GamePassConditionType_Defeated = 7
+    GamePassConditionType_Round = 8
+    GamePassConditionType_JobOutput = 9
+    GamePassConditionType_JobDefense = 10
+    GamePassConditionType_JobAuxiliary = 11
+    GamePassConditionType_JobControl = 12
+    GamePassConditionType_Ip1 = 13
+    GamePassConditionType_Ip2 = 14
+    GamePassConditionType_Ip3 = 15
+    GamePassConditionType_Ip4 = 16
+    GamePassConditionType_Ip5 = 17
+    GamePassConditionType_Ip6 = 18
+    GamePassConditionType_Ip7 = 19
+    GamePassConditionType_Ip8 = 20
+    GamePassConditionType_Ip9 = 21
+    GamePassConditionType_Ip10 = 22
+    GamePassConditionType_Ip11 = 23
+    GamePassConditionType_Ip12 = 24
+    GamePassConditionType_ThreeStar = 25
+    GamePassConditionType_FourStar = 26
+    GamePassConditionType_FiveStar = 27
+    GamePassConditionType_Man = 28
+    GamePassConditionType_Female = 29
+)

sys/configure/structs/TEnum.EHeroIp.go

@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+const (
+    TEnumEHeroIp_None = 0
+    TEnumEHeroIp_Ip1 = 1
+    TEnumEHeroIp_Ip2 = 2
+    TEnumEHeroIp_Ip3 = 3
+    TEnumEHeroIp_Ip4 = 4
+    TEnumEHeroIp_Ip5 = 5
+    TEnumEHeroIp_Ip6 = 6
+    TEnumEHeroIp_Ip7 = 7
+    TEnumEHeroIp_Ip8 = 8
+    TEnumEHeroIp_Ip9 = 9
+    TEnumEHeroIp_Ip10 = 10
+    TEnumEHeroIp_Ip11 = 11
+    TEnumEHeroIp_Ip12 = 12
+)

sys/configure/structs/game.globalData.go

@@ -278,6 +278,7 @@ type GameGlobalData struct {
     TdMainstageChallengeItem *Gameatn
     TdDailystageChallengeNum int32
     TdDailystageChallengeNumMax int32
+    GuildSignIn int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -1087,6 +1088,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["td_mainstage_challenge_item"].(map[string]interface{}); !_ok_ { err = errors.New("td_mainstage_challenge_item error"); return }; if _v.TdMainstageChallengeItem, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num error"); return }; _v.TdDailystageChallengeNum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num_max"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num_max error"); return }; _v.TdDailystageChallengeNumMax = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_sign_in"].(float64); !_ok_ { err = errors.New("guild_sign_in error"); return }; _v.GuildSignIn = int32(_tempNum_) }
     return
 }