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

bin/json/game_drop.json

@@ -752,5 +752,57 @@
     ],
     "star": 4,
     "p": 333
+  },
+  {
+    "id": 59,
+    "dropid": 10001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50001",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 60,
+    "dropid": 10001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50002",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 61,
+    "dropid": 10001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50003",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
+  },
+  {
+    "id": 62,
+    "dropid": 10001,
+    "prize": [
+      {
+        "a": "item",
+        "t": "50004",
+        "n": 1
+      }
+    ],
+    "star": 1,
+    "p": 1000
   }
 ]

bin/json/game_equipintensify.json

@@ -247,7 +247,7 @@
     "bonus": 4500,
     "activation": true,
     "probability": 250,
-    "num": 16
+    "num": -1
   },
   {
     "key": 17,
@@ -497,7 +497,7 @@
     "bonus": 4500,
     "activation": true,
     "probability": 250,
-    "num": 16
+    "num": -1
   },
   {
     "key": 33,
@@ -747,7 +747,7 @@
     "bonus": 4500,
     "activation": true,
     "probability": 250,
-    "num": 16
+    "num": -1
   },
   {
     "key": 49,
@@ -997,7 +997,7 @@
     "bonus": 4500,
     "activation": true,
     "probability": 250,
-    "num": 16
+    "num": -1
   },
   {
     "key": 65,
@@ -1247,7 +1247,7 @@
     "bonus": 4500,
     "activation": true,
     "probability": 250,
-    "num": 16
+    "num": -1
   },
   {
     "key": 81,
@@ -1497,6 +1497,6 @@
     "bonus": 4500,
     "activation": true,
     "probability": 250,
-    "num": 16
+    "num": -1
   }
 ]

bin/json/game_equipsuit.json

@@ -10,7 +10,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 1,
@@ -23,7 +29,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 2,
@@ -36,7 +48,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 3,
@@ -49,7 +67,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 4,
@@ -62,7 +86,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 5,
@@ -75,7 +105,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 6,
@@ -88,7 +124,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 7,
@@ -101,7 +143,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 8,
@@ -114,7 +162,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 9,
@@ -127,7 +181,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 100,
@@ -140,7 +200,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 101,
@@ -153,7 +219,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 102,
@@ -166,7 +238,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 103,
@@ -179,7 +257,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 104,
@@ -192,7 +276,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 105,
@@ -205,7 +295,13 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   },
   {
     "suittype": 106,
@@ -218,6 +314,12 @@
     "skillintr": {
       "key": "equip_13215",
       "text": "暴击率+20%"
-    }
+    },
+    "SetBonuses": [
+      [
+        "crit",
+        0.2
+      ]
+    ]
   }
 ]

bin/json/game_heroawaken.json

@@ -50,7 +50,7 @@
     "hid": "13001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "113001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -208,7 +208,7 @@
     "hid": "13002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "113002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -366,7 +366,7 @@
     "hid": "13003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "113003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -524,7 +524,7 @@
     "hid": "13004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "113004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -682,7 +682,7 @@
     "hid": "13005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "113005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -840,7 +840,7 @@
     "hid": "14001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -998,7 +998,7 @@
     "hid": "14002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -1156,7 +1156,7 @@
     "hid": "14003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -1314,7 +1314,7 @@
     "hid": "14004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -1472,7 +1472,7 @@
     "hid": "14005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -1630,7 +1630,7 @@
     "hid": "14006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -1788,7 +1788,7 @@
     "hid": "14007",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "114007211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -1946,7 +1946,7 @@
     "hid": "15001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "115001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -2104,7 +2104,7 @@
     "hid": "15002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "115002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -2262,7 +2262,7 @@
     "hid": "15003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "115003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -2420,7 +2420,7 @@
     "hid": "15004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "115004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -2578,7 +2578,7 @@
     "hid": "23001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "123001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -2736,7 +2736,7 @@
     "hid": "23002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "123002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -2894,7 +2894,7 @@
     "hid": "23003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "123003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -3052,7 +3052,7 @@
     "hid": "23004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "123004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -3210,7 +3210,7 @@
     "hid": "24001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -3368,7 +3368,7 @@
     "hid": "24002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -3526,7 +3526,7 @@
     "hid": "24003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -3684,7 +3684,7 @@
     "hid": "24004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -3842,7 +3842,7 @@
     "hid": "24005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4000,7 +4000,7 @@
     "hid": "24006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4158,7 +4158,7 @@
     "hid": "24007",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124007211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4316,7 +4316,7 @@
     "hid": "24008",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124008211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4474,7 +4474,7 @@
     "hid": "24009",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "124009211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4632,7 +4632,7 @@
     "hid": "25001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "125001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4790,7 +4790,7 @@
     "hid": "25002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "125002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -4948,7 +4948,7 @@
     "hid": "25003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "125003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -5106,7 +5106,7 @@
     "hid": "25004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "125004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -5264,7 +5264,7 @@
     "hid": "33001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "133001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -5422,7 +5422,7 @@
     "hid": "33002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "133002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -5580,7 +5580,7 @@
     "hid": "33003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "133003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -5738,7 +5738,7 @@
     "hid": "33004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "133004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -5896,7 +5896,7 @@
     "hid": "33005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "133005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -6054,7 +6054,7 @@
     "hid": "33006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "133006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -6212,7 +6212,7 @@
     "hid": "34001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -6370,7 +6370,7 @@
     "hid": "34002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -6528,7 +6528,7 @@
     "hid": "34003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -6686,7 +6686,7 @@
     "hid": "34004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -6844,7 +6844,7 @@
     "hid": "34005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7002,7 +7002,7 @@
     "hid": "34006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7160,7 +7160,7 @@
     "hid": "34007",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134007211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7318,7 +7318,7 @@
     "hid": "34008",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "134008211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7476,7 +7476,7 @@
     "hid": "35001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "135001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7634,7 +7634,7 @@
     "hid": "35002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "135002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7792,7 +7792,7 @@
     "hid": "35003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "135003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -7950,7 +7950,7 @@
     "hid": "35004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "135004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -8108,7 +8108,7 @@
     "hid": "35005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "135005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -8266,7 +8266,7 @@
     "hid": "35006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "135006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -8424,7 +8424,7 @@
     "hid": "43001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -8582,7 +8582,7 @@
     "hid": "43002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -8740,7 +8740,7 @@
     "hid": "43003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -8898,7 +8898,7 @@
     "hid": "43004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -9056,7 +9056,7 @@
     "hid": "43005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -9214,7 +9214,7 @@
     "hid": "43006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -9372,7 +9372,7 @@
     "hid": "43007",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "143007211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -9530,7 +9530,7 @@
     "hid": "44001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "144001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -9688,7 +9688,7 @@
     "hid": "44002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "144002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -9846,7 +9846,7 @@
     "hid": "44003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "144003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10004,7 +10004,7 @@
     "hid": "44004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "144004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10162,7 +10162,7 @@
     "hid": "44006",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "144006211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10320,7 +10320,7 @@
     "hid": "45001",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "145001211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10478,7 +10478,7 @@
     "hid": "45002",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "145002211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10636,7 +10636,7 @@
     "hid": "45003",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "145003211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10794,7 +10794,7 @@
     "hid": "45004",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "145004211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -10952,7 +10952,7 @@
     "hid": "44005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "144005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",
@@ -11110,7 +11110,7 @@
     "hid": "15005",
     "phase": 3,
     "phasebonus": [
-      "190012000",
+      "115005211",
       "3"
     ],
     "icon": "js_jx_img_icon03",

bin/json/game_huntingopentime.json

@@ -12,6 +12,10 @@
     "introduce": {
       "key": "hunting_boss_1005",
       "text": "传说中的巨型猩猩是一个非常恐怖的角色，它暴戾且狡猾，与它为敌一定要非常小心"
+    },
+    "opentimetext": {
+      "key": "bossopening_time1",
+      "text": "开启时间：1、2"
     }
   },
   {
@@ -27,6 +31,10 @@
     "introduce": {
       "key": "hunting_boss_1006",
       "text": "火龙可以从嘴里喷出猛烈的火焰，对地面造成毁灭性打击"
+    },
+    "opentimetext": {
+      "key": "bossopening_time2",
+      "text": "开启时间：3、4"
     }
   },
   {
@@ -42,6 +50,10 @@
     "introduce": {
       "key": "hunting_boss_1007",
       "text": "一种变异的老虎，它有着锋利的爪子和牙齿"
+    },
+    "opentimetext": {
+      "key": "bossopening_time3",
+      "text": "开启时间：5、6"
     }
   },
   {
@@ -57,6 +69,10 @@
     "introduce": {
       "key": "hunting_boss_1008",
       "text": "当黑夜来临时，梦魇露出了它的爪牙，会让无辜的人们陷入噩梦中无法自拔"
+    },
+    "opentimetext": {
+      "key": "bossopening_time4",
+      "text": "开启时间：1、7"
     }
   }
 ]

bin/json/game_initial.json

@@ -588,5 +588,15 @@
         "n": 5
       }
     ]
+  },
+  {
+    "index": "67",
+    "var": [
+      {
+        "a": "item",
+        "t": "10004",
+        "n": 5
+      }
+    ]
   }
 ]

bin/json/game_item.json

@@ -132,7 +132,7 @@
     "id": "10004",
     "name": {
       "key": "itemname_10004",
-      "text": "金币自选箱子"
+      "text": "声波自选箱"
     },
     "usetype": 4,
     "color": 4,
@@ -141,7 +141,7 @@
     "special_type": 0,
     "time": 0,
     "effects": "",
-    "box_id": 20001,
+    "box_id": 10001,
     "synthetize_num": 0,
     "access": [
       122
@@ -152,8 +152,8 @@
     "isani": 0,
     "star": 0,
     "race": 0,
-    "img": "wp_icon_0002",
+    "img": "wp_icon_10009",
-    "ico": "wp_icon_0002",
+    "ico": "wp_icon_10009",
     "intr": {
       "key": "itemdesc_10004",
       "text": "可以在以下道具中选择任选1个"
@@ -168,7 +168,7 @@
     "synthetize_deplete": [],
     "tipstxt": {
       "key": "itemtipstxt_10004",
-      "text": "金币自选箱子不足"
+      "text": "声波自选箱不足"
     }
   },
   {

bin/json/game_libraryfetter.json

@@ -6,8 +6,8 @@
     "name": "师徒二人",
     "lv": 1,
     "hid": [
-      25001,
+      "25001",
-      35001
+      "35001"
     ],
     "favorlv": 1,
     "prize": []
@@ -19,8 +19,8 @@
     "name": "师徒二人",
     "lv": 2,
     "hid": [
-      25001,
+      "25001",
-      35001
+      "35001"
     ],
     "favorlv": 2,
     "prize": [
@@ -43,8 +43,8 @@
     "name": "师徒二人",
     "lv": 3,
     "hid": [
-      25001,
+      "25001",
-      35001
+      "35001"
     ],
     "favorlv": 3,
     "prize": [
@@ -67,9 +67,9 @@
     "name": "毫不相干",
     "lv": 1,
     "hid": [
-      11003,
+      "11003",
-      11009,
+      "11009",
-      15004
+      "15004"
     ],
     "favorlv": 1,
     "prize": []
@@ -81,9 +81,9 @@
     "name": "毫不相干",
     "lv": 2,
     "hid": [
-      11003,
+      "11003",
-      11009,
+      "11009",
-      15004
+      "15004"
     ],
     "favorlv": 2,
     "prize": [
@@ -106,9 +106,9 @@
     "name": "毫不相干",
     "lv": 3,
     "hid": [
-      11003,
+      "11003",
-      11009,
+      "11009",
-      15004
+      "15004"
     ],
     "favorlv": 3,
     "prize": [

bin/json/game_libraryhero.json

@@ -1,15 +1,15 @@
 [
   {
-    "hid": 15004,
+    "hid": "15004",
     "name": {
       "key": "hero_15004",
       "text": "小欧"
     },
     "star": 5,
     "history": [
-      150041,
+      "150041",
-      150042,
+      "150042",
-      150043
+      "150043"
     ],
     "favorlv": [
       1,
@@ -26,19 +26,22 @@
       }
     ],
     "endid1": 10009,
-    "endid2": 10010
+    "endid2": 10010,
+    "fid": [
+      102
+    ]
   },
   {
-    "hid": 25001,
+    "hid": "25001",
     "name": {
       "key": "hero_25001",
       "text": "阿宝"
     },
     "star": 5,
     "history": [
-      250011,
+      "250011",
-      250012,
+      "250012",
-      250013
+      "250013"
     ],
     "favorlv": [
       1,
@@ -55,19 +58,22 @@
       }
     ],
     "endid1": 10009,
-    "endid2": 10010
+    "endid2": 10010,
+    "fid": [
+      101
+    ]
   },
   {
-    "hid": 35001,
+    "hid": "35001",
     "name": {
       "key": "hero_35001",
       "text": "师父"
     },
     "star": 4,
     "history": [
-      350011,
+      "350011",
-      350012,
+      "350012",
-      350013
+      "350013"
     ],
     "favorlv": [
       1,
@@ -84,19 +90,22 @@
       }
     ],
     "endid1": 10009,
-    "endid2": 10010
+    "endid2": 10010,
+    "fid": [
+      101
+    ]
   },
   {
-    "hid": 11009,
+    "hid": "11009",
     "name": {
       "key": "hero_35002",
       "text": "希卡普"
     },
     "star": 4,
     "history": [
-      110091,
+      "110091",
-      110092,
+      "110092",
-      110093
+      "110093"
     ],
     "favorlv": [
       1,
@@ -113,6 +122,9 @@
       }
     ],
     "endid1": 10009,
-    "endid2": 10010
+    "endid2": 10010,
+    "fid": [
+      102
+    ]
   }
 ]

bin/json/game_libraryhistory.json

@@ -1,6 +1,6 @@
 [
   {
-    "histroy": 150041,
+    "histroy": "150041",
     "txt": "小欧是个很乖巧的姑娘",
     "prize": [
       {
@@ -11,7 +11,7 @@
     ]
   },
   {
-    "histroy": 150042,
+    "histroy": "150042",
     "txt": "小欧是个很潇洒的姑娘",
     "prize": [
       {
@@ -22,7 +22,7 @@
     ]
   },
   {
-    "histroy": 150043,
+    "histroy": "150043",
     "txt": "小欧是个深情的姑娘",
     "prize": [
       {
@@ -33,7 +33,7 @@
     ]
   },
   {
-    "histroy": 250011,
+    "histroy": "250011",
     "txt": "阿宝长得贼胖",
     "prize": [
       {
@@ -44,7 +44,7 @@
     ]
   },
   {
-    "histroy": 250012,
+    "histroy": "250012",
     "txt": "阿宝长得贼圆",
     "prize": [
       {
@@ -55,7 +55,7 @@
     ]
   },
   {
-    "histroy": 250013,
+    "histroy": "250013",
     "txt": "阿宝长得贼可爱",
     "prize": [
       {
@@ -66,7 +66,7 @@
     ]
   },
   {
-    "histroy": 350011,
+    "histroy": "350011",
     "txt": "师父武功高强",
     "prize": [
       {
@@ -77,7 +77,7 @@
     ]
   },
   {
-    "histroy": 350012,
+    "histroy": "350012",
     "txt": "师父很傲娇",
     "prize": [
       {
@@ -88,7 +88,7 @@
     ]
   },
   {
-    "histroy": 350013,
+    "histroy": "350013",
     "txt": "师父的武功来自于乌龟大师",
     "prize": [
       {
@@ -99,7 +99,7 @@
     ]
   },
   {
-    "histroy": 110091,
+    "histroy": "110091",
     "txt": "希卡普很勇敢",
     "prize": [
       {
@@ -110,7 +110,7 @@
     ]
   },
   {
-    "histroy": 110092,
+    "histroy": "110092",
     "txt": "希卡普很善良",
     "prize": [
       {
@@ -121,7 +121,7 @@
     ]
   },
   {
-    "histroy": 110093,
+    "histroy": "110093",
     "txt": "希卡普很帅气",
     "prize": [
       {

bin/json/game_mainlinechapter.json

@@ -33,7 +33,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -78,7 +78,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -123,7 +123,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -168,7 +168,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -213,7 +213,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -258,7 +258,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -303,7 +303,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -348,7 +348,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -393,7 +393,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -438,7 +438,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -483,7 +483,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },
@@ -528,7 +528,7 @@
     ],
     "award": [
       {
-        "a": "item",
+        "a": "attr",
         "t": "diamond",
         "n": 50
       },

bin/json/game_model.json

@@ -290,7 +290,7 @@
   {
     "id": "14007",
     "preson": "14007",
-    "presonshow": "14007",
+    "presonshow": "14007_exhibition",
     "presonstory": "14007",
     "height": 1,
     "weight": 1,
@@ -362,7 +362,7 @@
   {
     "id": "15003",
     "preson": "15003",
-    "presonshow": "15003",
+    "presonshow": "15004_exhibition",
     "presonstory": "15003",
     "height": 1,
     "weight": 1,
@@ -1610,7 +1610,7 @@
   {
     "id": "44006",
     "preson": "44006",
-    "presonshow": "44006",
+    "presonshow": "44006_exhibition",
     "presonstory": "44006",
     "height": 1,
     "weight": 1,
@@ -1682,8 +1682,8 @@
   {
     "id": "45003",
     "preson": "45003",
-    "presonshow": "45003",
+    "presonshow": "45003_exhibition",
-    "presonstory": "45003",
+    "presonstory": "45003_story",
     "height": 1,
     "weight": 1,
     "ico": "tx_js_45003",

bin/json/game_rdtask.json

@@ -5,7 +5,7 @@
     "type": 2,
     "preTid": 0,
     "condition": [
-      101
+      103
     ],
     "sidequest": [
       1001,
@@ -72,5 +72,93 @@
     "sidequest": [
       1008
     ]
+  },
+  {
+    "id": 100201,
+    "group": 2,
+    "type": 2,
+    "preTid": 0,
+    "condition": [
+      101
+    ],
+    "sidequest": [
+      2001
+    ]
+  },
+  {
+    "id": 100202,
+    "group": 2,
+    "type": 2,
+    "preTid": 100201,
+    "condition": [
+      101
+    ],
+    "sidequest": [
+      2002,
+      2004
+    ]
+  },
+  {
+    "id": 100203,
+    "group": 2,
+    "type": 2,
+    "preTid": 100201,
+    "condition": [
+      101,
+      107
+    ],
+    "sidequest": [
+      2002,
+      2003
+    ]
+  },
+  {
+    "id": 100204,
+    "group": 2,
+    "type": 2,
+    "preTid": 100201,
+    "condition": [
+      101
+    ],
+    "sidequest": [
+      2005
+    ]
+  },
+  {
+    "id": 100205,
+    "group": 2,
+    "type": 2,
+    "preTid": 100204,
+    "condition": [
+      101
+    ],
+    "sidequest": [
+      2007,
+      2006
+    ]
+  },
+  {
+    "id": 100206,
+    "group": 2,
+    "type": 2,
+    "preTid": 100205,
+    "condition": [
+      101
+    ],
+    "sidequest": [
+      2008
+    ]
+  },
+  {
+    "id": 100207,
+    "group": 2,
+    "type": 2,
+    "preTid": 100206,
+    "condition": [
+      101
+    ],
+    "sidequest": [
+      2009
+    ]
   }
 ]

bin/json/game_rdtaskchoose.json

@@ -118,5 +118,65 @@
       0
     ],
     "nextTid": 0
+  },
+  {
+    "id": 20001,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100203
+  },
+  {
+    "id": 20002,
+    "num": 2,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100202
+  },
+  {
+    "id": 20003,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100204
+  },
+  {
+    "id": 20004,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 101,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100205
+  },
+  {
+    "id": 20005,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100206
+  },
+  {
+    "id": 20006,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100207
   }
 ]

bin/json/game_rdtaskcondi.json

@@ -693,7 +693,7 @@
     "id": 170,
     "datatype": 2,
     "type": 1,
-    "data1": 12003,
+    "data1": 25004,
     "data2": 0,
     "data3": 0,
     "data4": 0,

bin/json/game_rdtaskside.json

@@ -51,7 +51,7 @@
       }
     ],
     "CD": 0,
-    "endTid": 101
+    "endTid": -1
   },
   {
     "id": 1002,
@@ -71,7 +71,7 @@
     "nextTid": -1,
     "reward": [],
     "CD": 0,
-    "endTid": 104
+    "endTid": -1
   },
   {
     "id": 1003,
@@ -206,5 +206,228 @@
     "reward": [],
     "CD": 0,
     "endTid": -1
+  },
+  {
+    "id": 2001,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "model_02",
+    "storyBegin": 201,
+    "chooseId": [
+      20001,
+      20002
+    ],
+    "storyEnd": 0,
+    "nextTid": 100202,
+    "reward": [
+      {
+        "ChooseId": 20001,
+        "Reward": [
+          {
+            "a": "hero",
+            "t": "25001",
+            "n": 1
+          }
+        ]
+      },
+      {
+        "ChooseId": 20002,
+        "Reward": [
+          {
+            "a": "hero",
+            "t": "25004",
+            "n": 1
+          }
+        ]
+      }
+    ],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2002,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "model_02",
+    "storyBegin": 202,
+    "chooseId": [
+      20003
+    ],
+    "storyEnd": 0,
+    "nextTid": 0,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2003,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "Enter",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "model_03",
+    "storyBegin": 203,
+    "chooseId": [],
+    "storyEnd": 0,
+    "nextTid": -1,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2004,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "Enter",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "model_03",
+    "storyBegin": 203,
+    "chooseId": [],
+    "storyEnd": 0,
+    "nextTid": -1,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2005,
+    "objType": 2,
+    "location": "right",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "point": "icon_05",
+    "storyBegin": 204,
+    "chooseId": [
+      20004
+    ],
+    "storyEnd": 0,
+    "nextTid": 100205,
+    "reward": [
+      {
+        "ChooseId": 2004,
+        "Reward": [
+          {
+            "a": "hero",
+            "t": "44005",
+            "n": 1
+          }
+        ]
+      }
+    ],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2006,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "Enter",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": 90,
+      "z": 0
+    },
+    "point": "model_02",
+    "storyBegin": 205,
+    "chooseId": [],
+    "storyEnd": 0,
+    "nextTid": -1,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2007,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "Enter",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -90,
+      "z": 0
+    },
+    "point": "model_03",
+    "storyBegin": 206,
+    "chooseId": [
+      20005
+    ],
+    "storyEnd": 0,
+    "nextTid": 100206,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2008,
+    "objType": 2,
+    "location": "left",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "point": "icon_01",
+    "storyBegin": 207,
+    "chooseId": [
+      20006
+    ],
+    "storyEnd": 208,
+    "nextTid": 100207,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
+  {
+    "id": 2009,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "model_02",
+    "storyBegin": 207,
+    "chooseId": [],
+    "storyEnd": 207,
+    "nextTid": 0,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
   }
 ]

bin/json/game_skillafteratk.json

@@ -8331,6 +8331,25 @@
     "FailFollowSK": [],
     "MustHit": false
   },
+  {
+    "Id": 214007310,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": "",
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 6,
+    "Type": 1,
+    "Argu": [
+      1,
+      5,
+      100
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false
+  },
   {
     "Id": 214007311,
     "EmitPR": 1000,
@@ -8343,7 +8362,7 @@
     "Argu": [
       1,
       5,
-      800
+      200
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -8393,6 +8412,25 @@
     "FailFollowSK": [],
     "MustHit": false
   },
+  {
+    "Id": 214007320,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": "",
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 6,
+    "Type": 1,
+    "Argu": [
+      1,
+      5,
+      100
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false
+  },
   {
     "Id": 214007321,
     "EmitPR": 1000,
@@ -8405,7 +8443,7 @@
     "Argu": [
       1,
       5,
-      850
+      250
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -8455,6 +8493,25 @@
     "FailFollowSK": [],
     "MustHit": false
   },
+  {
+    "Id": 214007330,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": "",
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 6,
+    "Type": 1,
+    "Argu": [
+      1,
+      5,
+      100
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false
+  },
   {
     "Id": 214007331,
     "EmitPR": 1000,
@@ -8467,7 +8524,7 @@
     "Argu": [
       1,
       5,
-      850
+      250
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -8517,6 +8574,25 @@
     "FailFollowSK": [],
     "MustHit": false
   },
+  {
+    "Id": 214007340,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": "",
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 6,
+    "Type": 1,
+    "Argu": [
+      1,
+      5,
+      100
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false
+  },
   {
     "Id": 214007341,
     "EmitPR": 1000,
@@ -8529,7 +8605,7 @@
     "Argu": [
       1,
       5,
-      900
+      300
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -8579,6 +8655,25 @@
     "FailFollowSK": [],
     "MustHit": false
   },
+  {
+    "Id": 214007350,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": "",
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 6,
+    "Type": 1,
+    "Argu": [
+      1,
+      5,
+      100
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false
+  },
   {
     "Id": 214007351,
     "EmitPR": 1000,
@@ -8591,7 +8686,7 @@
     "Argu": [
       1,
       5,
-      900
+      300
     ],
     "FollowSK": [],
     "SucFollowSK": [

bin/json/game_skillatk.json

@@ -6107,6 +6107,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        214007310,
         214007311,
         214007312,
         214007313
@@ -6134,6 +6135,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        214007320,
         214007321,
         214007322,
         214007323
@@ -6161,6 +6163,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        214007330,
         214007331,
         214007332,
         214007333
@@ -6188,6 +6191,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        214007340,
         214007341,
         214007342,
         214007343
@@ -6215,6 +6219,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        214007350,
         214007351,
         214007352,
         214007353
@@ -6242,6 +6247,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
+        214007350,
         214007351,
         214007352,
         214007353

bin/json/game_skillbuff.json

@@ -21,9 +21,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z009",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001002,
@@ -47,9 +47,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z003",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001003,
@@ -73,9 +73,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z011",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001004,
@@ -99,9 +99,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z006",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001005,
@@ -125,9 +125,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z008",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001006,
@@ -151,9 +151,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j016",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001007,
@@ -177,9 +177,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j001",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001008,
@@ -203,9 +203,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j006",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip001 HeadNub"
   },
   {
     "Id": 390001009,
@@ -231,7 +231,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip002 HeadNub"
   },
   {
     "Id": 390001010,
@@ -257,7 +257,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip003 HeadNub"
   },
   {
     "Id": 390001011,
@@ -283,7 +283,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip004 HeadNub"
   },
   {
     "Id": 390001101,
@@ -307,9 +307,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j009",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip005 HeadNub"
   },
   {
     "Id": 390001102,
@@ -333,9 +333,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j005",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip006 HeadNub"
   },
   {
     "Id": 390001103,
@@ -357,9 +357,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z007",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip007 HeadNub"
   },
   {
     "Id": 390001104,
@@ -383,9 +383,9 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z002",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip008 HeadNub"
   },
   {
     "Id": 390001105,
@@ -407,9 +407,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j007",
-    "buffeffect": "",
+    "buffeffect": "effect_debuff_yun",
-    "buffpos": ""
+    "buffpos": "Bip009 HeadNub"
   },
   {
     "Id": 390001106,
@@ -431,9 +431,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j008",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip010 HeadNub"
   },
   {
     "Id": 390001107,
@@ -455,9 +455,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j012",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip011 HeadNub"
   },
   {
     "Id": 390001108,
@@ -479,9 +479,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j015",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip012 HeadNub"
   },
   {
     "Id": 390001109,
@@ -503,9 +503,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j004",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip013 HeadNub"
   },
   {
     "Id": 390001110,
@@ -527,9 +527,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j010",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip014 HeadNub"
   },
   {
     "Id": 390001111,
@@ -551,9 +551,9 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z005",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip015 HeadNub"
   },
   {
     "Id": 390001112,
@@ -581,7 +581,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip016 HeadNub"
   },
   {
     "Id": 390001113,
@@ -605,7 +605,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip017 HeadNub"
   },
   {
     "Id": 390001114,
@@ -629,7 +629,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip018 HeadNub"
   },
   {
     "Id": 390001115,
@@ -651,9 +651,9 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j013",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip019 HeadNub"
   },
   {
     "Id": 390001116,
@@ -677,7 +677,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip020 HeadNub"
   },
   {
     "Id": 390001117,
@@ -701,7 +701,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip021 HeadNub"
   },
   {
     "Id": 390001118,
@@ -723,15 +723,15 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j014",
-    "buffeffect": "",
+    "buffeffect": "effect_debuff_sleep",
-    "buffpos": ""
+    "buffpos": "Bip022 HeadNub"
   },
   {
     "Id": 390001119,
     "Name": {
       "key": "skill_buff_390001119",
-      "text": "炎"
+      "text": "气"
     },
     "Desc": {
       "key": "skill_buffdes_390001119",
@@ -747,15 +747,15 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts003",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip023 HeadNub"
   },
   {
     "Id": 390001120,
     "Name": {
       "key": "skill_buff_390001120",
-      "text": "死"
+      "text": "劲"
     },
     "Desc": {
       "key": "skill_buffdes_390001120",
@@ -771,15 +771,15 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts004",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip024 HeadNub"
   },
   {
     "Id": 390001121,
     "Name": {
       "key": "skill_buff_390001121",
-      "text": "缚"
+      "text": "法"
     },
     "Desc": {
       "key": "skill_buffdes_390001121",
@@ -795,9 +795,9 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts005",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip025 HeadNub"
   },
   {
     "Id": 390001122,
@@ -825,7 +825,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip026 HeadNub"
   },
   {
     "Id": 390001123,
@@ -853,7 +853,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip027 HeadNub"
   },
   {
     "Id": 390001124,
@@ -877,7 +877,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip028 HeadNub"
   },
   {
     "Id": 390001125,
@@ -903,9 +903,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z010",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip029 HeadNub"
   },
   {
     "Id": 390001126,
@@ -929,7 +929,55 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip030 HeadNub"
+  },
+  {
+    "Id": 390001127,
+    "Name": {
+      "key": "skill_buff_390001127",
+      "text": "复苏"
+    },
+    "Desc": {
+      "key": "skill_buffdes_390001127",
+      "text": ""
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": 0,
+    "AddEffect": false,
+    "RemoveType": true,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "buffIcon": "ty_zd_buff_z004",
+    "buffeffect": "",
+    "buffpos": "Bip031 HeadNub"
+  },
+  {
+    "Id": 390001128,
+    "Name": {
+      "key": "skill_buff_390001128",
+      "text": "隐匿"
+    },
+    "Desc": {
+      "key": "skill_buffdes_390001128",
+      "text": ""
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": 0,
+    "AddEffect": false,
+    "RemoveType": true,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "buffIcon": "ty_zd_buff_z001",
+    "buffeffect": "",
+    "buffpos": "Bip032 HeadNub"
   },
   {
     "Id": 390001201,
@@ -953,7 +1001,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip033 HeadNub"
   },
   {
     "Id": 390001202,
@@ -982,7 +1030,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip034 HeadNub"
   },
   {
     "Id": 390001204,
@@ -1006,7 +1054,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip035 HeadNub"
   },
   {
     "Id": 390001205,
@@ -1030,7 +1078,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip036 HeadNub"
   },
   {
     "Id": 390001206,
@@ -1054,13 +1102,13 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip037 HeadNub"
   },
   {
     "Id": 390001207,
     "Name": {
       "key": "skill_buff_390001207",
-      "text": "丰收的喜悦"
+      "text": "喜悦"
     },
     "Desc": {
       "key": "skill_buffdes_390001207",
@@ -1076,15 +1124,15 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts007",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip038 HeadNub"
   },
   {
     "Id": 390001208,
     "Name": {
       "key": "skill_buff_390001208",
-      "text": "丰收的喜悦"
+      "text": "喜悦"
     },
     "Desc": {
       "key": "skill_buffdes_390001208",
@@ -1103,15 +1151,15 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts007",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip039 HeadNub"
   },
   {
     "Id": 390001209,
     "Name": {
       "key": "skill_buff_390001209",
-      "text": "引雷"
+      "text": "玄御"
     },
     "Desc": {
       "key": "skill_buffdes_390001209",
@@ -1127,15 +1175,15 @@
     "RemoveType": false,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts001",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip040 HeadNub"
   },
   {
     "Id": 390001210,
     "Name": {
       "key": "skill_buff_390001210",
-      "text": "雷之庇佑"
+      "text": "玄御之佑"
     },
     "Desc": {
       "key": "skill_buffdes_390001210",
@@ -1151,9 +1199,9 @@
     "RemoveType": false,
     "OverlayTimes": 5,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts002",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip041 HeadNub"
   },
   {
     "Id": 390001211,
@@ -1177,9 +1225,9 @@
     "RemoveType": false,
     "OverlayTimes": 5,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts006",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip042 HeadNub"
   },
   {
     "Id": 390001212,
@@ -1203,9 +1251,33 @@
     "RemoveType": false,
     "OverlayTimes": 50,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_ts008",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip043 HeadNub"
+  },
+  {
+    "Id": 390001213,
+    "Name": {
+      "key": "skill_buff_390001213",
+      "text": "链接"
+    },
+    "Desc": {
+      "key": "skill_buffdes_390001212",
+      "text": ""
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": 2,
+    "AddEffect": false,
+    "RemoveType": false,
+    "OverlayTimes": 1,
+    "SameID": false,
+    "buffIcon": "ty_zd_buff_j002",
+    "buffeffect": "",
+    "buffpos": "Bip044 HeadNub"
   },
   {
     "Id": 390001301,
@@ -1231,7 +1303,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip045 HeadNub"
   },
   {
     "Id": 390001302,
@@ -1257,7 +1329,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip046 HeadNub"
   },
   {
     "Id": 390001303,
@@ -1283,7 +1355,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip047 HeadNub"
   },
   {
     "Id": 390001304,
@@ -1309,7 +1381,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip048 HeadNub"
   },
   {
     "Id": 390001305,
@@ -1335,7 +1407,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip049 HeadNub"
   },
   {
     "Id": 390001306,
@@ -1361,7 +1433,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip050 HeadNub"
   },
   {
     "Id": 390001307,
@@ -1387,7 +1459,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip051 HeadNub"
   },
   {
     "Id": 390001311,
@@ -1413,7 +1485,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip052 HeadNub"
   },
   {
     "Id": 390001312,
@@ -1439,7 +1511,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip053 HeadNub"
   },
   {
     "Id": 390001313,
@@ -1465,7 +1537,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip054 HeadNub"
   },
   {
     "Id": 390001314,
@@ -1491,7 +1563,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip055 HeadNub"
   },
   {
     "Id": 390001315,
@@ -1517,7 +1589,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip056 HeadNub"
   },
   {
     "Id": 390001316,
@@ -1543,7 +1615,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip057 HeadNub"
   },
   {
     "Id": 390001317,
@@ -1569,7 +1641,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip058 HeadNub"
   },
   {
     "Id": 390001321,
@@ -1595,7 +1667,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip059 HeadNub"
   },
   {
     "Id": 390001322,
@@ -1621,7 +1693,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip060 HeadNub"
   },
   {
     "Id": 390001323,
@@ -1647,7 +1719,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip061 HeadNub"
   },
   {
     "Id": 390001324,
@@ -1673,7 +1745,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip062 HeadNub"
   },
   {
     "Id": 390001325,
@@ -1699,7 +1771,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip063 HeadNub"
   },
   {
     "Id": 390001326,
@@ -1725,7 +1797,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip064 HeadNub"
   },
   {
     "Id": 390001327,
@@ -1751,7 +1823,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip065 HeadNub"
   },
   {
     "Id": 390001328,
@@ -1777,7 +1849,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip066 HeadNub"
   },
   {
     "Id": 390001401,
@@ -1801,9 +1873,9 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": true,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_j003",
-    "buffeffect": "",
+    "buffeffect": "effect_debuff_zhongdu",
-    "buffpos": ""
+    "buffpos": "Bip067 HeadNub"
   },
   {
     "Id": 390001402,
@@ -1829,7 +1901,7 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip068 HeadNub"
   },
   {
     "Id": 390001403,
@@ -1855,6 +1927,30 @@
     "SameID": false,
     "buffIcon": "",
     "buffeffect": "",
-    "buffpos": ""
+    "buffpos": "Bip069 HeadNub"
+  },
+  {
+    "Id": 390001404,
+    "Name": {
+      "key": "skill_buff_390001404",
+      "text": "流血"
+    },
+    "Desc": {
+      "key": "",
+      "text": ""
+    },
+    "BuffType": 0,
+    "EffectArgu": [],
+    "BufParNum": 1,
+    "RelyCheckArgu": [],
+    "CoexistCheckArgu": [],
+    "Effect": 1,
+    "AddEffect": false,
+    "RemoveType": true,
+    "OverlayTimes": 1,
+    "SameID": true,
+    "buffIcon": "ty_zd_buff_j011",
+    "buffeffect": "",
+    "buffpos": "Bip070 HeadNub"
   }
 ]

cmd/robot/user.go

@@ -27,7 +27,7 @@ var user_builders = []*TestCase{
 		req:      &pb.UserGetTujianReq{},
 		rsp:      &pb.UserGetTujianResp{},
 		// enabled:  true,
-	},{
+	}, {
 		desc:     "获取配置",
 		mainType: string(comm.ModuleUser),
 		subType:  user.UserSubTypeGetSetting,

cmd/v2/FyneApp.toml

@@ -1,7 +1,7 @@
 Website = "http://legu.cc"
 
 [Details]
-  Icon = "Icon.png"
+  Icon = "app.png"
   Name = "RobotGUI"
   ID = "cc.legu.app"
   Version = "1.0.5"

cmd/v2/main.go

@@ -93,6 +93,9 @@ func main() {
 	w.SetFixedSize(true)
 	w.Resize(fyne.NewSize(400, 200))
 	w.CenterOnScreen()
+	w.SetCloseIntercept(func() {
+		app.Quit()
+	})
 	logrus.WithField("version", app.Metadata().Version).Info("app starting")
 	w.Show()
 	appUI.Run()

cmd/v2/ui/protocol.go

@@ -73,6 +73,10 @@ var (
 		ff(comm.ModuleFriend, friend.FriendSubTypeSearch):    &formview.FriendSearchView{},
 		// ff(comm.ModuleFriend, friend.FriendSubTypeZanList):   &formview.FriendZanView{},
 		ff(comm.ModuleFriend, friend.FriendSubTypeRandList):   &formview.FriendRandListView{},
+		ff(comm.ModuleFriend, friend.FriendSubTypeGetreward):  &formview.FriendGetrewardView{},
+		ff(comm.ModuleFriend, friend.FriendSubTypeAssistlist): &formview.FriendAssistListView{},
+		ff(comm.ModuleFriend, friend.FriendSubTypeAssistHero): &formview.FriendAssistHeroView{},
+
 		// shop
 		ff(comm.ModuleShop, "getlist"): &formview.ShopListView{},
 		ff(comm.ModuleShop, "buy"):     &formview.ShopBuyView{},
@@ -161,6 +165,9 @@ var (
 			ff(comm.ModuleFriend, friend.FriendSubTypeSearch),
 			// ff(comm.ModuleFriend, friend.FriendSubTypeZanList),
 			ff(comm.ModuleFriend, friend.FriendSubTypeRandList),
+			ff(comm.ModuleFriend, friend.FriendSubTypeGetreward),
+			ff(comm.ModuleFriend, friend.FriendSubTypeAssistHero),
+			ff(comm.ModuleFriend, friend.FriendSubTypeAssistlist),
 		},
 		"shop": {
 			ff(comm.ModuleShop, "getlist"),
@@ -539,13 +546,28 @@ var (
 			Rsp:      &pb.FriendSearchResp{},
 			Enabled:  true,
 		},
-		// ff(comm.ModuleFriend, friend.FriendSubTypeZanList): {
+		ff(comm.ModuleFriend, friend.FriendSubTypeAssistHero): {
-		// 	NavLabel: "好友点赞",
+			NavLabel: "助战英雄",
-		// 	Desc:     "点赞好友",
+			Desc:     "助战英雄",
-		// 	MainType: string(comm.ModuleFriend),
+			MainType: string(comm.ModuleFriend),
-		// 	SubType:  friend.FriendSubTypeZanList,
+			SubType:  friend.FriendSubTypeAssistHero,
-		// 	Enabled:  true,
+			Enabled:  true,
-		// },
+		},
+		ff(comm.ModuleFriend, friend.FriendSubTypeAssistlist): {
+			NavLabel: "助战列表",
+			Desc:     "助战英雄列表",
+			MainType: string(comm.ModuleFriend),
+			SubType:  friend.FriendSubTypeAssistlist,
+			Enabled:  true,
+		},
+		ff(comm.ModuleFriend, friend.FriendSubTypeGetreward): {
+			NavLabel: "助战奖励",
+			Desc:     "助战奖励",
+			MainType: string(comm.ModuleFriend),
+			SubType:  friend.FriendSubTypeGetreward,
+			Enabled:  true,
+		},
+
 		//shop
 		string(comm.ModuleShop): {
 			NavLabel: "商店",

cmd/v2/ui/toy_userinfo.go

@@ -73,14 +73,11 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
 	)
 
 	// md
-	sign := widget.NewRichTextFromMarkdown(`
+	// sign := widget.NewRichTextFromMarkdown(``)
-	> hello
-	## H
-	`)
 	// layout
 	this.widget = widget.NewCard("", "",
 		container.NewBorder(container.NewHBox(this.titleLabel, layout.NewSpacer(), this.refreshBtn, this.copyBtn),
-			sign, nil, nil, container.NewVScroll(this.dataList)))
+			nil, nil, nil, container.NewVScroll(this.dataList)))
 	this.widget.Resize(fyne.NewSize(ToyWidth, 650))
 
 	this.dataListener()

cmd/v2/ui/views/friend_assisthero.go

@@ -0,0 +1,33 @@
+package formview
+
+import (
+	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/pb"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/widget"
+	"github.com/sirupsen/logrus"
+)
+
+type FriendAssistHeroView struct {
+	BaseformView
+}
+
+func (this *FriendAssistHeroView) CreateView(t *model.TestCase) fyne.CanvasObject {
+
+	heroId := widget.NewEntry()
+	heroId.PlaceHolder = "hero ObjId"
+
+	this.form.AppendItem(widget.NewFormItem("HeroObjID", heroId))
+
+	this.form.OnSubmit = func() {
+		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
+			&pb.FriendAssistheroReq{
+				HeroObjId: heroId.Text,
+			}); err != nil {
+			logrus.Error(err)
+		}
+	}
+	return this.form
+}

cmd/v2/ui/views/friend_assistlist.go

@@ -0,0 +1,24 @@
+package formview
+
+import (
+	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/pb"
+
+	"fyne.io/fyne/v2"
+	"github.com/sirupsen/logrus"
+)
+
+type FriendAssistListView struct {
+	BaseformView
+}
+
+func (this *FriendAssistListView) CreateView(t *model.TestCase) fyne.CanvasObject {
+	this.form.OnSubmit = func() {
+		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
+			&pb.FriendAssistlistReq{}); err != nil {
+			logrus.Error(err)
+		}
+	}
+	return this.form
+}

cmd/v2/ui/views/friend_award.go

@@ -0,0 +1,25 @@
+package formview
+
+import (
+	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/pb"
+
+	"fyne.io/fyne/v2"
+	"github.com/sirupsen/logrus"
+)
+
+type FriendGetrewardView struct {
+	BaseformView
+}
+
+func (this *FriendGetrewardView) CreateView(t *model.TestCase) fyne.CanvasObject {
+
+	this.form.OnSubmit = func() {
+		if err := service.GetPttService().SendToClient(t.MainType, t.SubType,
+			&pb.FriendGetrewardReq{}); err != nil {
+			logrus.Error(err)
+		}
+	}
+	return this.form
+}

comm/const.go

@@ -200,6 +200,7 @@ const (
 	ResExp        = "exp"         //经验
 	ResDiamond    = "diamond"     //钻石
 	ResTaskActive = "taskActive"  //任务活跃度
+	ResFriend     = "friendPoint" //友情点
 )
 
 const (

modules/battle/fight/attribute/attributenumeric.go

@@ -14,29 +14,32 @@ func NewAttributeNumeric(pData float32) *AttributeNumeric {
 }
 
 type AttributeNumeric struct {
-	fixedValue *FixedPoint
+	fixedValue FixedPoint
 	/// <summary>
 	/// 基础数值
 	/// </summary>
-	BaseValue *FixedNumeric
+	BaseValue FixedNumeric
 	/// <summary>
 	/// 附加数值
 	/// </summary>
-	AppendValue *FixedNumeric
+	AppendValue FixedNumeric
 	/// <summary>
 	/// 附加百分比数值
 	/// </summary>
-	ProValue *FixedNumeric
+	ProValue FixedNumeric
 	/// <summary>
 	/// Buff附加数值
 	/// </summary>
-	BuffValue *FixedNumeric
+	BuffValue FixedNumeric
 	/// <summary>
 	/// Buff附加百分比数值
 	/// </summary>
-	BuffProValue *FixedNumeric
+	BuffProValue FixedNumeric
 }
 
+func (this *AttributeNumeric) Fixed() FixedPoint {
+	return this.fixedValue
+}
 func (this *AttributeNumeric) Value() float32 {
 	return this.fixedValue.Scalar()
 }

modules/battle/fight/attribute/fixednumeric.go

@@ -1,33 +1,33 @@
 package attribute
 
-func NewFixedNumeric(pData float32) *FixedNumeric {
+func NewFixedNumeric(pData float32) FixedNumeric {
-	fixed := &FixedNumeric{}
+	fixed := FixedNumeric{}
 	fixed.Set(pData)
 	return fixed
 }
 
 type FixedNumeric struct {
-	baseValue *FixedPoint
+	baseValue FixedPoint
 }
 
-func (this *FixedNumeric) Set(value float32) float32 {
+func (this FixedNumeric) Set(value float32) float32 {
 	this.baseValue = NewFixedPoint(value)
 	return this.baseValue.Scalar()
 }
-func (this *FixedNumeric) Fixed() *FixedPoint {
+func (this FixedNumeric) Fixed() FixedPoint {
 	return this.baseValue
 }
-func (this *FixedNumeric) Value() float32 {
+func (this FixedNumeric) Value() float32 {
 	return this.baseValue.Scalar()
 }
 
 /// <summary>
 /// 减少基本值
 /// </summary>
-func (this *FixedNumeric) Minus(value float32) float32 {
+func (this FixedNumeric) Minus(value float32) float32 {
-	// this.baseValue -= value
+	this.baseValue.Reduce(value)
-	// if this.baseValue.Scalar < 0 {
+	if this.baseValue.Scalar() < 0 {
-	// 	this.baseValue = 0
+		this.baseValue.SetInt(0)
-	// }
+	}
 	return this.baseValue.Scalar()
 }

modules/battle/fight/attribute/fixedpoint.go

@@ -8,8 +8,8 @@ import (
 //基准倍数
 const CARDINAL_NUMBER int = 10000
 
-func NewFixedPoint(value float32) *FixedPoint {
+func NewFixedPoint(value float32) FixedPoint {
-	return &FixedPoint{
+	return FixedPoint{
 		rawValue: int(math.Round(float64(value * float32(CARDINAL_NUMBER)))),
 	}
 }
@@ -18,40 +18,54 @@ type FixedPoint struct {
 	rawValue int
 }
 
-func (this *FixedPoint) Scalar() float32 {
+func (this FixedPoint) SetInt(v int) {
+	this.rawValue = v
+}
+
+func (this FixedPoint) Scalar() float32 {
 	return float32(this.rawValue) * 0.0001
 }
 
-func (this *FixedPoint) ToInt() int {
+func (this FixedPoint) ToInt() int {
 	return this.rawValue / CARDINAL_NUMBER
 }
-func (this *FixedPoint) ToFloat() float32 {
+func (this FixedPoint) ToFloat() float32 {
 	return this.Scalar()
 }
-func (this *FixedPoint) ToString() string {
+func (this FixedPoint) ToString() string {
 	return fmt.Sprintf("%f", this.Scalar())
 }
 
-///+
+/// -
-func (this *FixedPoint) Add(y *FixedPoint) *FixedPoint {
+func (this FixedPoint) Reduce(v float32) {
-	this.rawValue += y.rawValue
+	y := NewFixedPoint(v)
-	return this
+	this.rawValue = this.rawValue - y.rawValue
 }
 
-///-
+/// +
-func (this *FixedPoint) Reduce(y *FixedPoint) *FixedPoint {
+func FixedPoint_Add(x, y FixedPoint) FixedPoint {
-	this.rawValue -= y.rawValue
+	result := FixedPoint{}
-	return this
+	result.rawValue = x.rawValue + y.rawValue
+	return result
 }
 
-///*
+/// -
-func (this *FixedPoint) Multiply(y *FixedPoint) *FixedPoint {
+func FixedPoint_Reduce(x, y FixedPoint) FixedPoint {
-	this.rawValue = (this.rawValue * y.rawValue) / CARDINAL_NUMBER
+	result := FixedPoint{}
-	return this
+	result.rawValue = x.rawValue - y.rawValue
+	return result
+}
+
+/// *
+func FixedPoint_Multiply(x, y FixedPoint) FixedPoint {
+	result := FixedPoint{}
+	result.rawValue = (x.rawValue * y.rawValue) / CARDINAL_NUMBER
+	return result
 }
 
 /// /
-func (this *FixedPoint) Divide(y *FixedPoint) *FixedPoint {
+func FixedPoint_Divide(x, y FixedPoint) FixedPoint {
-	this.rawValue = (this.rawValue * CARDINAL_NUMBER) / y.rawValue
+	result := FixedPoint{}
-	return this
+	result.rawValue = (x.rawValue * CARDINAL_NUMBER) / (y.rawValue)
+	return result
 }

modules/battle/fight/attribute/healthpoint.go

@@ -46,3 +46,10 @@ func (this *HealthPoint) MaxValue() int32 {
 func (this *HealthPoint) Minus(value float32) {
 	this.Hp.Minus(value)
 }
+
+/// <summary>
+/// 剩余血量百分比
+/// </summary>
+func (this *HealthPoint) Percent() float32 {
+	return FixedPoint_Divide(this.Hp.Fixed(), this.CurrMaxHp.Fixed()).Scalar()
+}

modules/comp_configure.go

@@ -18,6 +18,7 @@ const (
 	game_playerlv = "game_playerlv.json" //玩家等级
 	game_facemod  = "game_facemod.json"  // 形象配置表
 	game_drop     = "game_drop.json"     //掉落
+	game_comatn   = "game_comatn.json"   //atn配置表
 )
 
 ///配置管理基础组件
@@ -34,6 +35,7 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
 	err = this.LoadConfigure(game_initial, cfg.NewGameInitial)
 	err = this.LoadConfigure(game_playerlv, cfg.NewGamePlayerlv)
 	err = this.LoadConfigure(game_facemod, cfg.NewGameFacemod)
+	err = this.LoadConfigure(game_comatn, cfg.NewGameComAtn)
 	this._dropMap = make(map[int32][]*cfg.GameDropData, 0)
 	configure.RegisterConfigure(game_drop, cfg.NewGameDrop, this.LoadDropData)
 	return
@@ -110,6 +112,22 @@ func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.GameInitial, err
 	return
 }
 
+func (this *MCompConfigure) GetGlobalAtnConf(key string) *cfg.GameComAtnData {
+	var (
+		configure *cfg.GameComAtn
+		ok        bool
+	)
+	if v, err := this.GetConfigure(game_comatn); err != nil {
+		return nil
+	} else {
+		if configure, ok = v.(*cfg.GameComAtn); !ok {
+			err = fmt.Errorf("%T no is *cfg.Game_comatn", v)
+			return nil
+		}
+	}
+	return configure.Get(key)
+}
+
 // 主角等级经验配置列表
 func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GamePlayerlvData) {
 	if v, err := this.GetConfigure(game_playerlv); err != nil {

modules/friend/api.go

@@ -22,7 +22,8 @@ const (
 	FriendSubTypeRandList   = "randlist"
 	FriendSubTypeAssistHero = "assisthero"
 	FriendSubTypeDel        = "del"
-	FriendSbuTypeAssistlist = "assistlist"
+	FriendSubTypeAssistlist = "assistlist"
+	FriendSubTypeGetreward  = "getreward"
 )
 
 type apiComp struct {

modules/friend/api_assisthero.go

@@ -28,15 +28,22 @@ func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssisth
 		return
 	}
 
-	if err := this.moduleFriend.modelFriend.Change(self.Uid, map[string]interface{}{
+	update := map[string]interface{}{
 		"assistHeroId": req.HeroObjId,
-	}); err != nil {
+	}
+
+	received := self.Received
+	if received == 0 {
+		update["received"] = 1 //设置可领取状态
+	}
+
+	if err := this.moduleFriend.modelFriend.Change(self.Uid, update); err != nil {
 		log.Errorf("Assisthero err:%v", err)
 		code = pb.ErrorCode_FriendApplyError
 		return
 	}
 
-	rsp := &pb.FriendAssistheroResp{HeroObjId: req.HeroObjId}
+	rsp := &pb.FriendAssistheroResp{HeroObjId: req.HeroObjId, Received: received}
 	if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeAssistHero, rsp); err != nil {
 		code = pb.ErrorCode_SystemError
 		return

modules/friend/api_assistlist.go

@@ -37,7 +37,7 @@ func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistl
 		List:      list,
 		HeroObjId: self.AssistHeroId,
 	}
-	if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSbuTypeAssistlist, rsp); err != nil {
+	if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeAssistlist, rsp); err != nil {
 		code = pb.ErrorCode_SystemError
 	}
 	return

modules/friend/api_getreward.go

@@ -0,0 +1,54 @@
+package friend
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data proto.Message) {
+	//获取玩家自己好友数据
+	self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId())
+	if self == nil {
+		code = pb.ErrorCode_FriendSelfNoData
+		return
+	}
+
+	if self.Received != 1 {
+		code = pb.ErrorCode_FriendNoreceived
+		return
+	}
+
+	//发送友情点
+	globalCnf := this.moduleFriend.configure.GetGlobalAtnConf("friend_peize")
+	if globalCnf == nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+
+	received := 2 //已领
+	update := map[string]interface{}{
+		"received": received,
+	}
+	if err := this.moduleFriend.modelFriend.Change(self.Uid, update); err != nil {
+		log.Errorf("Assisthero err:%v", err)
+		code = pb.ErrorCode_FriendApplyError
+		return
+	}
+
+	code = this.moduleFriend.DispenseRes(session, globalCnf.Var, true)
+
+	rsp := &pb.FriendGetrewardResp{Received: int32(received)}
+
+	if err := session.SendMsg(string(this.moduleFriend.GetType()), "getreward", rsp); err != nil {
+		code = pb.ErrorCode_SystemError
+	}
+
+	return
+}

modules/friend/module.go

@@ -45,6 +45,7 @@ func (this *Friend) ResetFriend(uid string) {
 	zanUpdate := map[string]interface{}{
 		"zanIds":     []string{},
 		"getZandIds": []string{},
+		"received":   0, //奖励状态重置
 	}
 	if err := this.modelFriend.Change(uid, zanUpdate); err != nil {
 		log.Error("resetZanFriend err", log.Field{Key: "err", Value: err})

modules/hero/module.go

@@ -63,11 +63,11 @@ func (this *Hero) CreateRepeatHero(session comm.IUserSession, heroCfgId string,
 				initUpdate := map[string]interface{}{}
 				sz := result.GetTujian()
 				if len(sz) == 0 {
-					sz = make(map[string]bool, 0)
+					sz = make(map[string]int32, 0)
 				}
 
 				if _, ok := result.GetTujian()[heroCfgId]; !ok {
-					sz[heroCfgId] = true
+					sz[heroCfgId] = 0
 					initUpdate["tujian"] = sz
 				}
 
@@ -253,11 +253,11 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string]
 			initUpdate := map[string]interface{}{}
 			sz := result.GetTujian()
 			if len(sz) == 0 {
-				sz = make(map[string]bool, 0)
+				sz = make(map[string]int32, 0)
 			}
 			for k := range heros {
 				if _, ok := result.GetTujian()[k]; !ok {
-					sz[k] = true
+					sz[k] = 0
 					initUpdate["tujian"] = sz
 				}
 			}

modules/library/api_getstoryreward.go

@@ -0,0 +1,48 @@
+package library
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) GetStoryRewardCheck(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode) {
+	if req.Hid == "" || req.StoryId == 0 {
+		code = pb.ErrorCode_ReqParameterError
+	}
+	return
+}
+
+func (this *apiComp) GetStoryReward(session comm.IUserSession, req *pb.LibraryGetStoryRewardReq) (code pb.ErrorCode, data proto.Message) {
+
+	code = this.GetStoryRewardCheck(session, req)
+	if code != pb.ErrorCode_Success {
+		return // 参数校验失败直接返回
+	}
+	expand, err := this.module.ModuleUser.GetUserExpand(session.GetUserId())
+	if err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+
+	conf := this.module.configure.GetLibraryHero(req.Hid)
+	for k, v := range expand.Tujian {
+		if k == req.Hid && conf.Rightend == v {
+			code = this.module.DispenseRes(session, conf.Stroyprize, true)
+			// 修改storyID
+
+			sz := make(map[string]interface{}, 0)
+			for k, v := range expand.Tujian {
+				sz[k] = v
+			}
+			sz[req.Hid] = conf.Rightend
+
+			this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), sz)
+
+			break
+		}
+	}
+	return
+}

modules/library/comp_configure.go

@@ -6,49 +6,24 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
-	"sync"
 )
 
 const (
-	game_huntingboss = "game_huntingboss.json"
+	game_libraryhero = "game_libraryhero.json"
-	game_challenge   = "game_huntingchallenge.json"
 )
 
 ///配置管理基础组件
 type configureComp struct {
-	hlock sync.RWMutex
 	modules.MCompConfigure
-	_huntingMap map[int64]*cfg.GameHuntingBossData
 }
 
 //组件初始化接口
 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
 	err = this.MCompConfigure.Init(service, module, comp, options)
 
-	this._huntingMap = make(map[int64]*cfg.GameHuntingBossData, 0)
+	err = this.LoadConfigure(game_libraryhero, cfg.NewGameLibraryHero)
-	configure.RegisterConfigure(game_huntingboss, cfg.NewGameHuntingBoss, func() {
-		if v, err := this.GetConfigure(game_huntingboss); err == nil {
-			if configure, ok := v.(*cfg.GameHuntingBoss); ok {
-				this.hlock.Lock()
-				defer this.hlock.Unlock()
-				for _, value := range configure.GetDataList() {
-					this._huntingMap[int64(value.Type<<16)+int64(value.Difficulty)] = value
-				}
-				return
-			}
-		} else {
-			log.Errorf("get game_huntingboss conf err:%v", err)
-		}
-		return
-	})
-	err = this.LoadConfigure(game_challenge, cfg.NewGameHuntingChallenge)
-	return
-}
 
-// 参数: boss类型 难度
+	return
-func (this *configureComp) GetHuntingBossConfigData(bossType int32, difficulty int32) (data *cfg.GameHuntingBossData) {
-
-	return this._huntingMap[int64(bossType<<16)+int64(difficulty)]
 }
 
 //加载多个配置文件
@@ -68,29 +43,10 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error)
 	return configure.GetConfigure(name)
 }
 
-// get boss Type
+func (this *configureComp) GetLibraryHero(hid string) (data *cfg.GameLibraryHeroData) {
-func (this *configureComp) GetHuntingBossTypeConfigData() (mapType map[int32]struct{}) {
+	if v, err := this.GetConfigure(game_libraryhero); err == nil {
-
+		if configure, ok := v.(*cfg.GameLibraryHero); ok {
-	mapType = make(map[int32]struct{}, 0)
+			data = configure.Get(hid)
-	if v, err := this.GetConfigure(game_huntingboss); err == nil {
-		if configure, ok := v.(*cfg.GameHuntingBoss); ok {
-			this.hlock.Lock()
-			defer this.hlock.Unlock()
-			for _, value := range configure.GetDataList() {
-				if _, ok := mapType[value.Type]; !ok {
-					mapType[value.Type] = struct{}{}
-				}
-			}
-
-		}
-	}
-	return
-}
-
-func (this *configureComp) GetBuyChallengeCount(index int32) (data *cfg.GameHuntingChallengeData) {
-	if v, err := this.GetConfigure(game_challenge); err == nil {
-		if configure, ok := v.(*cfg.GameHuntingChallenge); ok {
-			data = configure.Get(index)
 			return
 		}
 	} else {

modules/library/model_library.go

@@ -3,7 +3,6 @@ package library
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 
@@ -32,13 +31,31 @@ func (this *modelLibrary) modifyLibraryDataByObjId(uid string, data map[string]i
 }
 
 // 获取列表信息
-func (this *modelLibrary) getLibraryList(uid string) (result *pb.DBHero, err error) {
+func (this *modelLibrary) getLibraryList(uid string) []*pb.DBLibrary {
-	result = &pb.DBHero{}
+	libs := make([]*pb.DBLibrary, 0)
-	if err = this.Get(uid, result); err != nil && mgo.MongodbNil != err {
+	err := this.GetList(uid, &libs)
+	if err != nil {
+		return nil
+	}
+	return libs
+}
 
+//创建一条信息
+func (this *modelLibrary) createLibrary(uid string, fetter *pb.DBLibrary) (err error) {
+
+	if err = this.AddList(uid, fetter.Id, fetter); err != nil {
+		this.module.Errorf("%v", err)
 		return
 	}
-
+	return
-	err = nil
+}
-	return result, err
+
+// 通过objid 找对应的数据
+func (this *modelLibrary) getOneLibrary(uid, oid string) *pb.DBLibrary {
+	fetter := &pb.DBLibrary{}
+	err := this.GetListObj(uid, oid, fetter)
+	if err != nil {
+		return nil
+	}
+	return fetter
 }

modules/shop/api_buy.go

@@ -6,9 +6,7 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
 	"math"
-	"time"
 
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -24,9 +22,10 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (co
 func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb.ErrorCode, data proto.Message) {
 	var (
 		err      error
-		ok       bool
 		conf     *cfg.GameShopitemData
-		shopitem *pb.DBShopItem
+		shopData *pb.DBShop
+		filed    string
+		record   *pb.UserShopData
 		need     []*cfg.Gameatn
 		give     []*cfg.Gameatn
 	)
@@ -38,14 +37,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
 		code = pb.ErrorCode_SystemError
 		return
 	}
-	if shopitem, ok = this.module.modelShopItems.QueryUserShopDataByGoodId(session.GetUserId(), req.GoodsId); !ok { //没有购买记录
+	if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil { //没有购买记录
-		shopitem = &pb.DBShopItem{
+		code = pb.ErrorCode_DBError
-			Id:          primitive.NewObjectID().Hex(),
+		return
-			Uid:         session.GetUserId(),
-			GoodsId:     conf.Key,
-			BuyNum:      map[int32]int32{1: 0, 2: 0, 3: 0, 4: 0, 5: 0},
-			LastBuyTime: map[int32]int64{1: 0, 2: 0, 3: 0, 4: 0, 5: 0},
-		}
 	}
 	need = make([]*cfg.Gameatn, len(conf.Need))
 	for i, v := range conf.Need {
@@ -71,21 +65,40 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
 	if code = this.module.DispenseRes(session, give, true); code != pb.ErrorCode_Success {
 		return
 	}
-	if conf.Buyminnum-shopitem.BuyNum[int32(req.ShopType)] < req.BuyNum {
+	switch req.ShopType {
+	case pb.ShopType_GoldShop:
+		filed = "goldShop"
+		record = shopData.GoldShop
+		break
+	case pb.ShopType_DiamondShop:
+		filed = "diamondShop"
+		record = shopData.DiamondShop
+		break
+	case pb.ShopType_PVEShop:
+		filed = "pveShop"
+		record = shopData.PveShop
+		break
+	case pb.ShopType_PVPShop:
+		filed = "pvpShop"
+		record = shopData.PvpShop
+		break
+	case pb.ShopType_AllianceShop:
+		filed = "allianceShop"
+		record = shopData.AllianceShop
+		break
+	}
+	if record == nil {
+		record = &pb.UserShopData{
+			Buy: map[int32]int32{},
+		}
+	}
+	if conf.Buyminnum-record.Buy[req.GoodsId] < req.BuyNum {
 		code = pb.ErrorCode_ShopGoodsIsSoldOut
 		return
 	}
+	record.Buy[req.GoodsId] += req.BuyNum
+	this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: record})
 
-	shopitem.BuyNum[int32(req.ShopType)] += req.BuyNum
-	shopitem.LastBuyTime[int32(req.ShopType)] = time.Now().Unix()
-	if !ok {
-		this.module.modelShopItems.AddList(session.GetUserId(), shopitem.Id, shopitem)
-	} else {
-		this.module.modelShopItems.ChangeList(session.GetUserId(), shopitem.Id, map[string]interface{}{
-			"buyNum":      shopitem.BuyNum,
-			"lastBuyTime": shopitem.LastBuyTime,
-		})
-	}
 	//随机任务
 	this.module.ModuleRtask.SendToRtask(session, comm.Rtype64, 1)
 	for _, v := range give {

modules/shop/api_getlist.go

@@ -2,7 +2,6 @@ package shop
 
 import (
 	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"time"
@@ -28,7 +27,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 		udata      *pb.DBUser
 		sdata      *pb.UserShopData
 		items      []*cfg.GameShopitemData
-		ushoputem  map[int32]*pb.DBShopItem
 		goods      []*pb.ShopItem
 		tdata      time.Duration
 		ltime      time.Duration
@@ -37,22 +35,19 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 	if code = this.GetlistCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-	if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil && err != mgo.MongodbNil {
+	if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil {
-		code = pb.ErrorCode_SystemError
+		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-	if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil && err != mgo.MongodbNil {
+	if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil {
-		code = pb.ErrorCode_SystemError
+		code = pb.ErrorCode_DBError
 		return
 	}
 	if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil {
 		code = pb.ErrorCode_SystemError
 		return
 	}
-	if ushoputem, err = this.module.modelShopItems.QueryUserShopData(session.GetUserId()); err != nil {
+
-		code = pb.ErrorCode_SystemError
-		return
-	}
 	switch req.SType {
 	case pb.ShopType_GoldShop:
 		sdata = shopData.GoldShop
@@ -76,7 +71,9 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 		break
 	}
 	if sdata == nil {
-		sdata = &pb.UserShopData{}
+		sdata = &pb.UserShopData{
+			Buy: map[int32]int32{},
+		}
 	}
 	if shopconf.Rnum > 0 {
 		leftrefnum = shopconf.Rnum - sdata.ManualRefreshNum
@@ -120,7 +117,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 			}
 			items = append(items, randomGoods(_items))
 		}
-		goods = transGoods(req.SType, items, ushoputem)
+		sdata.Buy = make(map[int32]int32)
+		goods = transGoods(items, sdata.Buy)
 		sdata.LastRefreshTime = time.Now().Unix()
 		sdata.ManualRefreshNum++
 		sdata.Items = make([]int32, len(items))
@@ -138,7 +136,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 				}
 				items = append(items, randomGoods(_items))
 			}
-			goods = transGoods(req.SType, items, ushoputem)
+			sdata.Buy = make(map[int32]int32)
+			goods = transGoods(items, sdata.Buy)
 			sdata.LastRefreshTime = time.Now().Unix()
 			sdata.Items = make([]int32, len(items))
 			for i, v := range items {
@@ -150,7 +149,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 				code = pb.ErrorCode_SystemError
 				return
 			}
-			goods = transGoods(req.SType, items, ushoputem)
+			goods = transGoods(items, sdata.Buy)
 		}
 	} else {
 		code = pb.ErrorCode_ReqParameterError

modules/shop/core.go

@@ -31,19 +31,19 @@ func randomGoods(goods []*cfg.GameShopitemData) (result *cfg.GameShopitemData) {
 }
 
 //转换商品对象
-func transGoods(stype pb.ShopType, goods []*cfg.GameShopitemData, ushoputem map[int32]*pb.DBShopItem) (result []*pb.ShopItem) {
+func transGoods(goods []*cfg.GameShopitemData, buy map[int32]int32) (result []*pb.ShopItem) {
 	result = make([]*pb.ShopItem, len(goods))
-	ok := false
+	// ok := false
-	uitem := &pb.DBShopItem{}
+	// uitem := &pb.DBShopItem{}
 	for i, v := range goods {
-		if uitem, ok = ushoputem[v.Key]; !ok {
+		// if uitem, ok = ushoputem[v.Key]; !ok {
-			uitem = &pb.DBShopItem{}
+		// 	uitem = &pb.DBShopItem{}
-		}
+		// }
 		result[i] = &pb.ShopItem{
 			GoodsId: v.Key,
 			Sale:    int32(v.Sale),
 		}
-		result[i].LeftBuyNum = v.Buyminnum - uitem.BuyNum[int32(stype)]
+		result[i].LeftBuyNum = v.Buyminnum - buy[v.Key]
 		result[i].Items = make([]*pb.UserAssets, len(v.Iteminfo))
 		for i1, v1 := range v.Iteminfo {
 			result[i].Items[i1] = &pb.UserAssets{

modules/shop/model_shop.go

@@ -3,6 +3,7 @@ package shop
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 
@@ -31,8 +32,9 @@ func (this *modelShopComp) Init(service core.IService, module core.IModule, comp
 //查询用户装备数据
 func (this *modelShopComp) QueryUserShopData(uId string) (data *pb.DBShop, err error) {
 	data = &pb.DBShop{}
-	if err = this.Get(uId, data); err != nil {
+	if err = this.Get(uId, data); err != nil && err != mgo.MongodbNil {
 		this.module.Errorf("err:%v", err)
 	}
+	err = nil
 	return
 }

modules/shop/model_shopitems.go

@@ -1,72 +0,0 @@
-package shop
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/sys/mgo"
-	"go_dreamfactory/modules"
-	"go_dreamfactory/pb"
-
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/x/bsonx"
-)
-
-///商店物品记录 数据组件
-type modelShopItemsComp struct {
-	modules.MCompModel
-	module *Shop
-}
-
-//组件初始化接口
-func (this *modelShopItemsComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
-	this.MCompModel.Init(service, module, comp, opt)
-	this.module = module.(*Shop)
-	this.TableName = comm.TableShopitems
-	//创建uid索引
-	this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
-		Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}, {Key: "goodsid", Value: bsonx.Int32(1)}},
-	})
-	return
-}
-
-//查询用户装备数据
-func (this *modelShopItemsComp) QueryUserShopData(uId string) (result map[int32]*pb.DBShopItem, err error) {
-	result = make(map[int32]*pb.DBShopItem)
-	data := make([]*pb.DBShopItem, 0)
-	if err = this.GetList(uId, &data); err != nil && err != mgo.MongodbNil {
-		this.module.Errorf("err:%v", err)
-		return
-	}
-	err = nil
-	for _, v := range data {
-		result[v.GoodsId] = v
-	}
-	return
-}
-
-//查询用户装备数据
-func (this *modelShopItemsComp) QueryUserShopDataByGoodId(uId string, goodId int32) (result *pb.DBShopItem, ok bool) {
-	var (
-		err  error
-		data []*pb.DBShopItem
-	)
-	data = make([]*pb.DBShopItem, 0)
-	if err = this.GetList(uId, &data); err != nil {
-		this.module.Errorf("err%v", err)
-		return
-	}
-	for _, v := range data {
-		if v.GoodsId == goodId {
-			result = v
-			ok = true
-			return
-		}
-	}
-	return
-}
-
-//添加用户的商品购买记录
-func (this *modelShopItemsComp) AddUserShopItemData(data *pb.DBShopItem) (err error) {
-	err = this.AddList(data.Uid, data.Id, data)
-	return
-}

modules/shop/module.go

@@ -22,7 +22,6 @@ type Shop struct {
 	api_comp  *apiComp
 	configure *configureComp
 	modelShop *modelShopComp
-	modelShopItems *modelShopItemsComp
 }
 
 //模块名
@@ -41,12 +40,10 @@ func (this *Shop) OnInstallComp() {
 	this.ModuleBase.OnInstallComp()
 	this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
 	this.modelShop = this.RegisterComp(new(modelShopComp)).(*modelShopComp)
-	this.modelShopItems = this.RegisterComp(new(modelShopItemsComp)).(*modelShopItemsComp)
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
 }
 
 //Event------------------------------------------------------------------------------------------------------------
 func (this *Shop) EventUserOffline(session comm.IUserSession) {
 	this.modelShop.Del(session.GetUserId(), db.SetDBMgoLog(false))
-	this.modelShopItems.BatchDelLists(session.GetUserId())
 }

modules/timer/chat.go

@@ -55,7 +55,7 @@ func (this *ChatComp) Start() (err error) {
 			this.takes = make([]cron.EntryID, 0)
 			confs := v.(*cfg.GameChatSystem)
 
-			for k, v1 := range confs.GetDataMap() {
+			for _, v1 := range confs.GetDataMap() {
 				if v1.Type == int32(comm.TimedNotice) { //处理定时任务
 					weekStr := ""
 					for _, w := range v1.Week {
@@ -66,9 +66,9 @@ func (this *ChatComp) Start() (err error) {
 					} else {
 						weekStr = "*"
 					}
-					cronStr := fmt.Sprintf("* %d %d * * %s", v1.TimeM, v1.TimeH, weekStr)
+					cronStr := fmt.Sprintf("0 %d %d ? * %s", v1.TimeM, v1.TimeH, weekStr)
 					this.module.Debug("注册Chat广播公告消息", log.Field{Key: "cronStr", Value: cronStr}, log.Field{Key: "text", Value: v1.Text})
-					if id, err = cron.AddFunc(cronStr, this.chatNoticen(confs.GetDataMap()[k])); err != nil {
+					if id, err = cron.AddFunc(cronStr, this.chatNoticen(v1.Text)); err != nil {
 						this.module.Errorf("cron.AddFunc:%s err:%v", cronStr, err)
 						continue
 					}
@@ -80,24 +80,22 @@ func (this *ChatComp) Start() (err error) {
 	return
 }
 
-func (this *ChatComp) chatNoticen(n *cfg.GameChatSystemData) func() {
+func (this *ChatComp) chatNoticen(content string) func() {
 	return func() {
 		msg := &pb.DBChat{
 			Channel: pb.ChatChannel_System,
 			Stag:    this.service.GetTag(),
 			Ctime:   time.Now().Unix(),
-			Content: n.Text,
+			Content: content,
 		}
 		data, _ := anypb.New(&pb.ChatMessagePush{Chat: msg})
-		this.module.Debug("广播公告消息", log.Field{Key: "chat", Value: msg})
+		this.module.Debug("广播公告消息", log.Field{Key: "chat", Value: content})
 		if err := this.module.service.AcrossClusterBroadcast(context.Background(), msg.Stag, comm.Service_Gateway, string(comm.Rpc_GatewaySendRadioMsg), pb.UserMessage{
 			MainType: string(comm.ModuleChat),
 			SubType:  "message",
 			Data:     data,
 		}, nil); err != nil {
 			this.module.Errorf("err:%v", err)
-		} else {
-			this.module.Debugf("chatNoticen:%s", n.Text)
 		}
 	}
 }

modules/user/module.go

@@ -178,14 +178,25 @@ func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string
 		code = pb.ErrorCode_UserSessionNobeing
 		return
 	}
+
+	userEx, err := this.GetUserExpand(session.GetUserId())
+	if userEx == nil || err != nil {
+		return
+	}
+
 	_change := &pb.UserResChangePush{
 		Gold:    user.Gold,
 		Exp:     user.Exp,
 		Lv:      user.Lv,
 		Vip:     user.Vip,
 		Diamond: user.Diamond,
+		Friend:  userEx.FriendPoint,
 	}
+	//user
 	update := make(map[string]interface{})
+	//user ex
+	updateEx := make(map[string]interface{})
+
 	for key, add := range attrs {
 		if add == 0 {
 			this.Errorf("attr no changed,uid: %s attr: %s add: %d", session.GetUserId(), key, add)
@@ -219,19 +230,38 @@ func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string
 			}
 			_change.Diamond += add
 			update[comm.ResDiamond] = user.Diamond + add
+		case comm.ResFriend:
+			if add < 0 {
+				if userEx.FriendPoint+add < 0 {
+					code = pb.ErrorCode_ResNoEnough
+					return
+				}
+			}
+			_change.Friend += add
+			updateEx[comm.ResFriend] = userEx.FriendPoint + add
 		default:
 			code = pb.ErrorCode_Unknown
 		}
 	}
 
-	if len(update) == 0 {
+	if len(update) == 0 && len(updateEx) == 0 {
-		this.Warn("AddAttributeValue param is empty")
+		this.Error("AttributeValue params null")
 		return
 	}
+
+	if len(update) != 0 {
 		if err := this.modelUser.updateUserAttr(session.GetUserId(), update); err != nil {
 			this.Errorf("AddAttributeValue err:%v", err)
 			code = pb.ErrorCode_DBError
 		}
+	}
+
+	if len(updateEx) != 0 {
+		if err := this.modelExpand.ChangeUserExpand(session.GetUserId(), updateEx); err != nil {
+			this.Errorf("AddAttributeValue ex err:%v", err)
+			code = pb.ErrorCode_DBError
+		}
+	}
 
 	if bPush { //推送玩家账号信息变化消息
 		session.SendMsg(string(this.GetType()), "reschange", _change)

pb/errorcode.pb.go

@@ -78,6 +78,7 @@ const (
 	ErrorCode_FriendZanreceived     ErrorCode = 1113 //已领取点赞
 	ErrorCode_FriendZanSelf         ErrorCode = 1114 //不能给自己点赞
 	ErrorCode_FriendPointLimit      ErrorCode = 1115 //友情点上线
+	ErrorCode_FriendNoreceived      ErrorCode = 1116 //未更换助战没有可领取的奖励
 	// item
 	ErrorCode_ItemsNoEnough        ErrorCode = 1200 //背包物品不足
 	ErrorCode_ItemsNoFoundGird     ErrorCode = 1201 //背包未找到物品格子
@@ -242,6 +243,7 @@ var (
 		1113: "FriendZanreceived",
 		1114: "FriendZanSelf",
 		1115: "FriendPointLimit",
+		1116: "FriendNoreceived",
 		1200: "ItemsNoEnough",
 		1201: "ItemsNoFoundGird",
 		1202: "ItemsGridNumUpper",
@@ -389,6 +391,7 @@ var (
 		"FriendZanreceived":          1113,
 		"FriendZanSelf":              1114,
 		"FriendPointLimit":           1115,
+		"FriendNoreceived":           1116,
 		"ItemsNoEnough":              1200,
 		"ItemsNoFoundGird":           1201,
 		"ItemsGridNumUpper":          1202,
@@ -515,7 +518,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0x90, 0x19, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xa7, 0x19, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -583,141 +586,142 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12,
 	0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66,
 	0x10, 0xda, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69,
-	0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74,
+	0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72,
-	0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15,
+	0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc,
-	0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69,
+	0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75,
-	0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72,
+	0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f,
-	0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a,
+	0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11,
-	0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65,
-	0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d,
+	0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72,
-	0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12,
-	0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e,
+	0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75,
-	0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48,
+	0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74,
-	0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a,
+	0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10,
-	0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a,
+	0xb5, 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73,
-	0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a,
+	0x74, 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e,
-	0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, 0x65, 0x61,
+	0x6f, 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d,
-	0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f,
+	0x61, 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49,
-	0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53,
+	0x6e, 0x69, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48,
-	0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f,
+	0x65, 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13,
-	0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10,
+	0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72,
-	0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f,
+	0x10, 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65,
-	0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e,
+	0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72,
-	0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c,
+	0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18,
-	0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67,
+	0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73,
-	0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61,
+	0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f,
-	0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75,
+	0x4e, 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48,
-	0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48,
+	0x65, 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f,
-	0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12,
+	0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10,
-	0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a,
+	0x9f, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61,
-	0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73,
-	0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54,
+	0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d,
-	0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72,
+	0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65,
-	0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48,
+	0x72, 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a,
-	0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a,
+	0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10,
-	0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10,
+	0xa4, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72,
-	0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78,
+	0x72, 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54,
-	0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74,
+	0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72,
-	0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65,
+	0x6f, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a,
-	0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19,
+	0x0d, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8,
-	0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f,
+	0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72,
-	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72,
+	0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72,
-	0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c,
+	0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a,
-	0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e,
+	0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
-	0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x1e, 0x0a, 0x19,
+	0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72,
-	0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64,
+	0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17,
+	0x10, 0xac, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74,
+	0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71,
+	0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a,
+	0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9,
-	0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43,
+	0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73,
-	0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69,
+	0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70,
+	0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a,
-	0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
+	0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46,
-	0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a,
+	0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a,
-	0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
+	0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65,
-	0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
-	0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19,
+	0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d,
-	0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74,
+	0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75,
-	0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69,
+	0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77,
+	0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b,
-	0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e,
+	0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70,
-	0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73,
+	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a,
-	0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e,
+	0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09,
-	0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
+	0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a,
-	0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73,
+	0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a,
-	0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16,
+	0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c,
-	0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f,
+	0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e,
-	0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63,
+	0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74,
-	0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12,
+	0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a,
-	0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
+	0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f,
-	0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
+	0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f,
-	0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54,
+	0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54,
-	0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61,
+	0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11,
-	0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c,
+	0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9,
-	0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12,
+	0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f,
+	0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f,
-	0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70,
+	0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f,
-	0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
+	0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12,
-	0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72,
+	0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73,
-	0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f,
+	0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a,
-	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67,
+	0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50,
-	0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a,
+	0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e,
-	0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+	0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72,
-	0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61,
+	0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65,
-	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12,
+	0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a,
-	0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f,
+	0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10,
+	0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61,
-	0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65,
+	0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64,
-	0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61,
+	0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61,
-	0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a,
+	0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61,
-	0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e,
+	0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65,
-	0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75,
+	0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68,
-	0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d,
+	0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f,
-	0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53,
+	0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f,
-	0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d,
+	0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47,
-	0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11,
+	0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76,
-	0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73,
+	0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
-	0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e,
+	0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b,
-	0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61,
+	0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a,
-	0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a,
+	0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11,
-	0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73,
+	0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65,
-	0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e,
+	0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65,
-	0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e,
+	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52,
-	0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f,
+	0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68,
-	0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e,
+	0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61,
-	0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b,
+	0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73,
-	0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56,
+	0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11,
-	0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11,
+	0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10,
-	0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78,
+	0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69,
+	0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e,
-	0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f,
+	0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12,
-	0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61,
+	0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c,
-	0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10,
+	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a,
-	0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
+	0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45,
-	0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f,
+	0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f,
-	0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10,
+	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2,
-	0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73,
+	0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79,
-	0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12,
+	0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f,
-	0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61,
+	0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f,
-	0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x18, 0x0a, 0x13,
+	0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63,
+	0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e,
-	0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74,
+	0x10, 0xe5, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46,
-	0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10,
+	0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a,
-	0xa9, 0x14, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53,
+	0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69,
-	0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xaa,
+	0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x6e,
-	0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61,
+	0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
-	0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10,
+	0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65,
-	0xab, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50,
+	0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
+	0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e,
-	0x10, 0xac, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76,
+	0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46,
-	0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xac, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75,
-	0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12,
+	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a,
-	0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75,
+	0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65,
-	0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67,
+	0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75,
-	0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e,
+	0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18,
-	0x74, 0x10, 0x90, 0x15, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/friend_db.pb.go

@@ -32,6 +32,8 @@ type DBFriend struct {
 	ZanIds       []string `protobuf:"bytes,5,rep,name=zanIds,proto3" json:"zanIds" bson:"zanIds"`                   //点赞好友ID
 	GetZandIds   []string `protobuf:"bytes,6,rep,name=getZandIds,proto3" json:"getZandIds" bson:"getZandIds"`       //已接收赞好友ID
 	AssistHeroId string   `protobuf:"bytes,7,opt,name=assistHeroId,proto3" json:"assistHeroId" bson:"assistHeroId"` //助战英雄ID
+	Received     int32    `protobuf:"varint,8,opt,name=received,proto3" json:"received" bson:"received"`            //领取奖励状态0未领1可领2已领
+	UpdateTime   int64    `protobuf:"varint,9,opt,name=updateTime,proto3" json:"updateTime" bson:"updateTime"`      // 更新时间
 }
 
 func (x *DBFriend) Reset() {
@@ -115,11 +117,25 @@ func (x *DBFriend) GetAssistHeroId() string {
 	return ""
 }
 
+func (x *DBFriend) GetReceived() int32 {
+	if x != nil {
+		return x.Received
+	}
+	return 0
+}
+
+func (x *DBFriend) GetUpdateTime() int64 {
+	if x != nil {
+		return x.UpdateTime
+	}
+	return 0
+}
+
 var File_friend_friend_db_proto protoreflect.FileDescriptor
 
 var file_friend_friend_db_proto_rawDesc = []byte{
 	0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
-	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xce, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x46,
+	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x02, 0x0a, 0x08, 0x44, 0x42, 0x46,
 	0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e,
 	0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65,
@@ -132,8 +148,12 @@ var file_friend_friend_db_proto_rawDesc = []byte{
 	0x49, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x65, 0x74, 0x5a, 0x61,
 	0x6e, 0x64, 0x49, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
 	0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x73, 0x73,
-	0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63,
+	0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54,
+	0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/friend_msg.pb.go

@@ -1621,6 +1621,7 @@ type FriendAssistheroResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	HeroObjId string `protobuf:"bytes,1,opt,name=heroObjId,proto3" json:"heroObjId"`
+	Received  int32  `protobuf:"varint,2,opt,name=received,proto3" json:"received"` //领取奖励状态0未领1可领2已领
 }
 
 func (x *FriendAssistheroResp) Reset() {
@@ -1662,6 +1663,13 @@ func (x *FriendAssistheroResp) GetHeroObjId() string {
 	return ""
 }
 
+func (x *FriendAssistheroResp) GetReceived() int32 {
+	if x != nil {
+		return x.Received
+	}
+	return 0
+}
+
 //助战列表
 type FriendAssistlistReq struct {
 	state         protoimpl.MessageState
@@ -1756,6 +1764,92 @@ func (x *FriendAssistlistResp) GetHeroObjId() string {
 	return ""
 }
 
+// 助战奖励
+type FriendGetrewardReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *FriendGetrewardReq) Reset() {
+	*x = FriendGetrewardReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[35]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FriendGetrewardReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FriendGetrewardReq) ProtoMessage() {}
+
+func (x *FriendGetrewardReq) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[35]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FriendGetrewardReq.ProtoReflect.Descriptor instead.
+func (*FriendGetrewardReq) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{35}
+}
+
+type FriendGetrewardResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Received int32 `protobuf:"varint,1,opt,name=received,proto3" json:"received"`
+}
+
+func (x *FriendGetrewardResp) Reset() {
+	*x = FriendGetrewardResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_friend_friend_msg_proto_msgTypes[36]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FriendGetrewardResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FriendGetrewardResp) ProtoMessage() {}
+
+func (x *FriendGetrewardResp) ProtoReflect() protoreflect.Message {
+	mi := &file_friend_friend_msg_proto_msgTypes[36]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FriendGetrewardResp.ProtoReflect.Descriptor instead.
+func (*FriendGetrewardResp) Descriptor() ([]byte, []int) {
+	return file_friend_friend_msg_proto_rawDescGZIP(), []int{36}
+}
+
+func (x *FriendGetrewardResp) GetReceived() int32 {
+	if x != nil {
+		return x.Received
+	}
+	return 0
+}
+
 var File_friend_friend_msg_proto protoreflect.FileDescriptor
 
 var file_friend_friend_msg_proto_rawDesc = []byte{
@@ -1873,18 +1967,24 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
 	0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x68, 0x65, 0x72,
 	0x6f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
-	0x49, 0x64, 0x22, 0x34, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69,
+	0x49, 0x64, 0x22, 0x50, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69,
 	0x73, 0x74, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65,
 	0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68,
-	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65,
+	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65,
-	0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
+	0x69, 0x76, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65,
-	0x55, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c,
+	0x69, 0x76, 0x65, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
+	0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x55, 0x0a, 0x14, 0x46,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61,
+	0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52,
-	0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
+	0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72,
+	0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04,
-	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x6c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72,
+	0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65,
+	0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1899,7 +1999,7 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
 	return file_friend_friend_msg_proto_rawDescData
 }
 
-var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 35)
+var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 37)
 var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendBase)(nil),           // 0: FriendBase
 	(*FriendListReq)(nil),        // 1: FriendListReq
@@ -1936,6 +2036,8 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
 	(*FriendAssistheroResp)(nil), // 32: FriendAssistheroResp
 	(*FriendAssistlistReq)(nil),  // 33: FriendAssistlistReq
 	(*FriendAssistlistResp)(nil), // 34: FriendAssistlistResp
+	(*FriendGetrewardReq)(nil),   // 35: FriendGetrewardReq
+	(*FriendGetrewardResp)(nil),  // 36: FriendGetrewardResp
 }
 var file_friend_friend_msg_proto_depIdxs = []int32{
 	0, // 0: FriendListResp.list:type_name -> FriendBase
@@ -2378,6 +2480,30 @@ func file_friend_friend_msg_proto_init() {
 				return nil
 			}
 		}
+		file_friend_friend_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FriendGetrewardReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_friend_friend_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FriendGetrewardResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2385,7 +2511,7 @@ func file_friend_friend_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_friend_friend_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   35,
+			NumMessages:   37,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/library_db.pb.go

@@ -82,7 +82,7 @@ type DBLibrary struct {
 
 	Id       string          `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                    //ID
 	Uid      string          `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                  //用户ID
-	Fid      int32           `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"`
+	Fid      int32           `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"`                                                                                            // 配置表id 羁绊id
 	Hero     map[int32]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: favorlv
 	Prize    bool            `protobuf:"varint,5,opt,name=prize,proto3" json:"prize"`                                                                                        //是否领奖
 	Fetterlv int32           `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"`                                                                                  // 当前羁绊等级

pb/library_msg.pb.go

@@ -201,6 +201,109 @@ func (x *LibraryGetRewardResp) GetData() *DBLibrary {
 	return nil
 }
 
+// 领取剧情奖励
+type LibraryGetStoryRewardReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Hid     string `protobuf:"bytes,1,opt,name=hid,proto3" json:"hid"`          // 英雄ID
+	StoryId int32  `protobuf:"varint,2,opt,name=storyId,proto3" json:"storyId"` // 故事剧情id
+}
+
+func (x *LibraryGetStoryRewardReq) Reset() {
+	*x = LibraryGetStoryRewardReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_library_library_msg_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LibraryGetStoryRewardReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LibraryGetStoryRewardReq) ProtoMessage() {}
+
+func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message {
+	mi := &file_library_library_msg_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead.
+func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) {
+	return file_library_library_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *LibraryGetStoryRewardReq) GetHid() string {
+	if x != nil {
+		return x.Hid
+	}
+	return ""
+}
+
+func (x *LibraryGetStoryRewardReq) GetStoryId() int32 {
+	if x != nil {
+		return x.StoryId
+	}
+	return 0
+}
+
+type LibraryGetStoryRewardResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *LibraryGetStoryRewardResp) Reset() {
+	*x = LibraryGetStoryRewardResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_library_library_msg_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LibraryGetStoryRewardResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LibraryGetStoryRewardResp) ProtoMessage() {}
+
+func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message {
+	mi := &file_library_library_msg_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead.
+func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) {
+	return file_library_library_msg_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *LibraryGetStoryRewardResp) GetData() *DBLibrary {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_library_library_msg_proto protoreflect.FileDescriptor
 
 var file_library_library_msg_proto_rawDesc = []byte{
@@ -218,8 +321,16 @@ var file_library_library_msg_proto_rawDesc = []byte{
 	0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72,
 	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x68, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x3b, 0x0a,
+	0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79,
+	0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62,
+	0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -234,22 +345,25 @@ func file_library_library_msg_proto_rawDescGZIP() []byte {
 	return file_library_library_msg_proto_rawDescData
 }
 
-var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_library_library_msg_proto_goTypes = []interface{}{
 	(*LibraryGetListReq)(nil),         // 0: LibraryGetListReq
 	(*LibraryGetListResp)(nil),        // 1: LibraryGetListResp
 	(*LibraryGetRewardReq)(nil),       // 2: LibraryGetRewardReq
 	(*LibraryGetRewardResp)(nil),      // 3: LibraryGetRewardResp
-	(*DBLibrary)(nil),            // 4: DBLibrary
+	(*LibraryGetStoryRewardReq)(nil),  // 4: LibraryGetStoryRewardReq
+	(*LibraryGetStoryRewardResp)(nil), // 5: LibraryGetStoryRewardResp
+	(*DBLibrary)(nil),                 // 6: DBLibrary
 }
 var file_library_library_msg_proto_depIdxs = []int32{
-	4, // 0: LibraryGetListResp.data:type_name -> DBLibrary
+	6, // 0: LibraryGetListResp.data:type_name -> DBLibrary
-	4, // 1: LibraryGetRewardResp.data:type_name -> DBLibrary
+	6, // 1: LibraryGetRewardResp.data:type_name -> DBLibrary
-	2, // [2:2] is the sub-list for method output_type
+	6, // 2: LibraryGetStoryRewardResp.data:type_name -> DBLibrary
-	2, // [2:2] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension extendee
+	3, // [3:3] is the sub-list for extension type_name
-	0, // [0:2] is the sub-list for field type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_library_library_msg_proto_init() }
@@ -307,6 +421,30 @@ func file_library_library_msg_proto_init() {
 				return nil
 			}
 		}
+		file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*LibraryGetStoryRewardReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*LibraryGetStoryRewardResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -314,7 +452,7 @@ func file_library_library_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_library_library_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/shop_db.pb.go

@@ -86,6 +86,7 @@ type UserShopData struct {
 	LastRefreshTime  int64           `protobuf:"varint,1,opt,name=LastRefreshTime,proto3" json:"LastRefreshTime"`                                                                  //最后一次刷新时间
 	ManualRefreshNum int32           `protobuf:"varint,2,opt,name=ManualRefreshNum,proto3" json:"ManualRefreshNum"`                                                                //手动刷新次数
 	Items            []int32         `protobuf:"varint,3,rep,packed,name=Items,proto3" json:"Items"`                                                                               //商品列表
+	Buy              map[int32]int32 `protobuf:"bytes,4,rep,name=buy,proto3" json:"buy" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //购买记录
 }
 
 func (x *UserShopData) Reset() {
@@ -141,6 +142,13 @@ func (x *UserShopData) GetItems() []int32 {
 	return nil
 }
 
+func (x *UserShopData) GetBuy() map[int32]int32 {
+	if x != nil {
+		return x.Buy
+	}
+	return nil
+}
+
 type DBShop struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -236,141 +244,49 @@ func (x *DBShop) GetAllianceShop() *UserShopData {
 	return nil
 }
 
-type DBShopItem struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id          string          `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                                                     //装备id
-	Uid         string          `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                                   //装备id
-	GoodsId     int32           `protobuf:"varint,3,opt,name=goodsId,proto3" json:"goodsId" bson:"goodsId"`                                                                                                      //商品Id
-	BuyNum      map[int32]int32 `protobuf:"bytes,4,rep,name=buyNum,proto3" json:"buyNum" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"buyNum"`                //购买数量
-	LastBuyTime map[int32]int64 `protobuf:"bytes,5,rep,name=lastBuyTime,proto3" json:"lastBuyTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"lastBuyTime"` //最后一次购买的时间
-}
-
-func (x *DBShopItem) Reset() {
-	*x = DBShopItem{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_shop_shop_db_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DBShopItem) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DBShopItem) ProtoMessage() {}
-
-func (x *DBShopItem) ProtoReflect() protoreflect.Message {
-	mi := &file_shop_shop_db_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DBShopItem.ProtoReflect.Descriptor instead.
-func (*DBShopItem) Descriptor() ([]byte, []int) {
-	return file_shop_shop_db_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *DBShopItem) GetId() string {
-	if x != nil {
-		return x.Id
-	}
-	return ""
-}
-
-func (x *DBShopItem) GetUid() string {
-	if x != nil {
-		return x.Uid
-	}
-	return ""
-}
-
-func (x *DBShopItem) GetGoodsId() int32 {
-	if x != nil {
-		return x.GoodsId
-	}
-	return 0
-}
-
-func (x *DBShopItem) GetBuyNum() map[int32]int32 {
-	if x != nil {
-		return x.BuyNum
-	}
-	return nil
-}
-
-func (x *DBShopItem) GetLastBuyTime() map[int32]int64 {
-	if x != nil {
-		return x.LastBuyTime
-	}
-	return nil
-}
-
 var File_shop_shop_db_proto protoreflect.FileDescriptor
 
 var file_shop_shop_db_proto_rawDesc = []byte{
 	0x0a, 0x12, 0x73, 0x68, 0x6f, 0x70, 0x2f, 0x73, 0x68, 0x6f, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdc, 0x01, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f,
-	0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72,
+	0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66,
-	0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x4c,
+	0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f,
-	0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2a,
+	0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12,
-	0x0a, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e,
+	0x2a, 0x0a, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
-	0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c,
+	0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61,
-	0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x74,
+	0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x49,
-	0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73,
+	0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d,
-	0x22, 0x8b, 0x02, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x73, 0x12, 0x28, 0x0a, 0x03, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x75,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x29, 0x0a,
+	0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x62, 0x75, 0x79, 0x1a, 0x36, 0x0a, 0x08, 0x42,
-	0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x75, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a, 0x0b, 0x64, 0x69, 0x61, 0x6d,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x02, 0x38, 0x01, 0x22, 0x8b, 0x02, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e,
-	0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x64, 0x69,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
-	0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x70,
+	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x53, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65,
+	0x12, 0x29, 0x0a, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x03, 0x20, 0x01,
-	0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x70, 0x53, 0x68,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
-	0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x06, 0x20,
+	0x61, 0x52, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a, 0x0b, 0x64,
-	0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61,
+	0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x31, 0x0a, 0x0c, 0x61,
+	0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x0b, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07,
-	0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61,
+	0x70, 0x76, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
-	0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x22, 0xb4,
+	0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76,
-	0x02, 0x0a, 0x0a, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a,
+	0x70, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f,
-	0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x31,
-	0x18, 0x0a, 0x07, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07,
-	0x52, 0x07, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x75, 0x79,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44,
-	0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x53, 0x68,
+	0x61, 0x74, 0x61, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f,
-	0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x45, 0x6e, 0x74,
+	0x70, 0x2a, 0x5f, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a,
-	0x72, 0x79, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x3e, 0x0a, 0x0b, 0x6c, 0x61,
+	0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, 0x53,
-	0x73, 0x74, 0x42, 0x75, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
-	0x1c, 0x2e, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x61, 0x73,
+	0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, 0x6f,
-	0x74, 0x42, 0x75, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6c,
+	0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x04,
-	0x61, 0x73, 0x74, 0x42, 0x75, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x75,
+	0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70,
-	0x79, 0x4e, 0x75, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x10, 0x05, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x6f, 0x33,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x4c, 0x61, 0x73, 0x74, 0x42, 0x75, 0x79,
-	0x54, 0x69, 0x6d, 0x65, 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, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x5f, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47,
-	0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61,
-	0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56,
-	0x50, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68,
-	0x6f, 0x70, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65,
-	0x53, 0x68, 0x6f, 0x70, 0x10, 0x05, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -386,28 +302,25 @@ func file_shop_shop_db_proto_rawDescGZIP() []byte {
 }
 
 var file_shop_shop_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_shop_shop_db_proto_goTypes = []interface{}{
 	(ShopType)(0),        // 0: ShopType
 	(*UserShopData)(nil), // 1: UserShopData
 	(*DBShop)(nil),       // 2: DBShop
-	(*DBShopItem)(nil),   // 3: DBShopItem
+	nil,                  // 3: UserShopData.BuyEntry
-	nil,                  // 4: DBShopItem.BuyNumEntry
-	nil,                  // 5: DBShopItem.LastBuyTimeEntry
 }
 var file_shop_shop_db_proto_depIdxs = []int32{
-	1, // 0: DBShop.goldShop:type_name -> UserShopData
+	3, // 0: UserShopData.buy:type_name -> UserShopData.BuyEntry
-	1, // 1: DBShop.diamondShop:type_name -> UserShopData
+	1, // 1: DBShop.goldShop:type_name -> UserShopData
-	1, // 2: DBShop.pvpShop:type_name -> UserShopData
+	1, // 2: DBShop.diamondShop:type_name -> UserShopData
-	1, // 3: DBShop.pveShop:type_name -> UserShopData
+	1, // 3: DBShop.pvpShop:type_name -> UserShopData
-	1, // 4: DBShop.allianceShop:type_name -> UserShopData
+	1, // 4: DBShop.pveShop:type_name -> UserShopData
-	4, // 5: DBShopItem.buyNum:type_name -> DBShopItem.BuyNumEntry
+	1, // 5: DBShop.allianceShop:type_name -> UserShopData
-	5, // 6: DBShopItem.lastBuyTime:type_name -> DBShopItem.LastBuyTimeEntry
+	6, // [6:6] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
-	7, // [7:7] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
-	7, // [7:7] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
-	0, // [0:7] is the sub-list for field type_name
 }
 
 func init() { file_shop_shop_db_proto_init() }
@@ -440,18 +353,6 @@ func file_shop_shop_db_proto_init() {
 				return nil
 			}
 		}
-		file_shop_shop_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DBShopItem); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -459,7 +360,7 @@ func file_shop_shop_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_shop_shop_db_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   5,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/user_msg.pb.go

@@ -574,6 +574,7 @@ type UserResChangePush struct {
 	Lv      int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv" bson:"lv"`                //等级
 	Vip     int32 `protobuf:"varint,4,opt,name=vip,proto3" json:"vip" bson:"vip"`             // vip
 	Diamond int32 `protobuf:"varint,5,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石
+	Friend  int32 `protobuf:"varint,6,opt,name=friend,proto3" json:"friend" bson:"frined"`    //友情点
 }
 
 func (x *UserResChangePush) Reset() {
@@ -643,6 +644,13 @@ func (x *UserResChangePush) GetDiamond() int32 {
 	return 0
 }
 
+func (x *UserResChangePush) GetFriend() int32 {
+	if x != nil {
+		return x.Friend
+	}
+	return 0
+}
+
 //用户设置获取
 type UserGetSettingReq struct {
 	state         protoimpl.MessageState
@@ -1563,77 +1571,79 @@ var file_user_user_msg_proto_rawDesc = []byte{
 	0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x28, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43,
 	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53,
 	0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63,
-	0x63, 0x22, 0x75, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e,
+	0x63, 0x22, 0x8d, 0x01, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61,
-	0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01,
+	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65,
-	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02,
+	0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a,
-	0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03,
+	0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a,
-	0x76, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18,
+	0x03, 0x76, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12,
-	0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x18, 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
-	0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72,
+	0x52, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69,
-	0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a,
+	0x65, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e,
-	0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52,
+	0x64, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74,
-	0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01,
+	0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
+	0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a,
+	0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
-	0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69,
+	0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73,
-	0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
+	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53,
+	0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28,
-	0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22,
+	0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74,
+	0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52,
-	0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73,
-	0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a,
-	0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69,
-	0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10,
-	0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
-	0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79,
-	0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x55,
-	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73,
 	0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43,
-	0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x12, 0x0a,
+	0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
-	0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65,
+	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25,
-	0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69,
+	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65,
-	0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64,
+	0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73,
+	0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69,
-	0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50,
+	0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
-	0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55,
-	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01,
+	0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71,
-	0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20,
+	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
+	0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x65,
+	0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05,
-	0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75,
-	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x6e, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65,
-	0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04,
+	0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73,
-	0x65, 0x79, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65,
+	0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68,
+	0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05,
+	0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65,
-	0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x06, 0x20,
+	0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03,
-	0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79,
+	0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10,
-	0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x07,
+	0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f,
+	0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
-	0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x5b, 0x0a,
+	0x22, 0xe3, 0x01, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52,
-	0x0e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c,
-	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
-	0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x69, 0x67,
+	0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61,
-	0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75,
+	0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52,
-	0x72, 0x65, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73,
+	0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, 0x73, 0x18, 0x04, 0x20,
-	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12,
+	0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73,
-	0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73,
+	0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66,
+	0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19,
-	0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+	0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70,
+	0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x5b, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69,
+	0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x06, 0x66, 0x69, 0x67,
+	0x75, 0x72, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66,
+	0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12,
+	0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x75, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/userexpand.pb.go

@@ -377,7 +377,7 @@ type DBUserExpand struct {
 	InitdataCount          uint32            `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"`                                                                                    //今日初始累计次数
 	Chatchannel            int32             `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"`                                                                                        //跨服聊天频道
 	ModifynameCount        int32             `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"`                                                                                //修改昵称次数
-	Tujian                 map[string]bool   `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`          //图鉴
+	Tujian                 map[string]int32  `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`          //图鉴
 	CurFigure              int32             `protobuf:"varint,9,opt,name=curFigure,proto3" json:"curFigure"`                                                                                            //当前形象
 	Preinstall             map[int32]*Figure `protobuf:"bytes,10,rep,name=preinstall,proto3" json:"preinstall" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //形象预设
 	Activeday              int32             `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"`                                                                                           //日活跃度
@@ -474,7 +474,7 @@ func (x *DBUserExpand) GetModifynameCount() int32 {
 	return 0
 }
 
-func (x *DBUserExpand) GetTujian() map[string]bool {
+func (x *DBUserExpand) GetTujian() map[string]int32 {
 	if x != nil {
 		return x.Tujian
 	}
@@ -655,7 +655,7 @@ var file_userexpand_proto_rawDesc = []byte{
 	0x61, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79,
 	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
 	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f,
+	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0f,
 	0x50, 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
 	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
 	0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,

sys/configure/configure.go

@@ -177,7 +177,7 @@ func (this *Configure) loaderConfigure(name string, handle *configurehandle) (er
 
 //检查配置文件是否有更新
 func (this *Configure) checkConfigure() {
-	log.Debug("Check Configure Update")
+	// log.Debug("Check Configure Update")
 	if dir, err := ioutil.ReadDir(this.options.ConfigurePath); err != nil {
 		log.Errorf("[Configure Sys] checkConfigure err:%v", err)
 	} else {

sys/configure/structs/Game.HuntingOpenTimeData.go

@@ -15,6 +15,7 @@ type GameHuntingOpenTimeData struct {
     Opentime []int32
     Name string
     Introduce string
+    Opentimetext string
 }
 
 const TypeId_GameHuntingOpenTimeData = 1854578068
@@ -41,6 +42,7 @@ func (_v *GameHuntingOpenTimeData)Deserialize(_buf map[string]interface{}) (err
 
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["opentimetext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Opentimetext error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Opentimetext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }
 

sys/configure/structs/Game.LibraryFetterData.go

@@ -16,7 +16,7 @@ type GameLibraryFetterData struct {
     Ftype int32
     Name string
     Lv int32
-    Hid []int32
+    Hid []string
     Favorlv int32
     Prize []*Gameatn
 }
@@ -38,11 +38,11 @@ func (_v *GameLibraryFetterData)Deserialize(_buf map[string]interface{}) (err er
                 var _ok_ bool
                 if _arr_, _ok_ = _buf["hid"].([]interface{}); !_ok_ { err = errors.New("hid error"); return }
 
-                _v.Hid = make([]int32, 0, len(_arr_))
+                _v.Hid = make([]string, 0, len(_arr_))
                 
                 for _, _e_ := range _arr_ {
-                    var _list_v_ int32
+                    var _list_v_ string
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
                     _v.Hid = append(_v.Hid, _list_v_)
                 }
             }

sys/configure/structs/Game.LibraryHero.go

@@ -9,13 +9,13 @@
 package cfg
 
 type GameLibraryHero struct {
-    _dataMap map[int32]*GameLibraryHeroData
+    _dataMap map[string]*GameLibraryHeroData
     _dataList []*GameLibraryHeroData
 }
 
 func NewGameLibraryHero(_buf []map[string]interface{}) (*GameLibraryHero, error) {
 	_dataList := make([]*GameLibraryHeroData, 0, len(_buf))
-	dataMap := make(map[int32]*GameLibraryHeroData)
+	dataMap := make(map[string]*GameLibraryHeroData)
 	for _, _ele_ := range _buf {
 		if _v, err2 := DeserializeGameLibraryHeroData(_ele_); err2 != nil {
 			return nil, err2
@@ -27,7 +27,7 @@ func NewGameLibraryHero(_buf []map[string]interface{}) (*GameLibraryHero, error)
 	return &GameLibraryHero{_dataList:_dataList, _dataMap:dataMap}, nil
 }
 
-func (table *GameLibraryHero) GetDataMap() map[int32]*GameLibraryHeroData {
+func (table *GameLibraryHero) GetDataMap() map[string]*GameLibraryHeroData {
     return table._dataMap
 }
 
@@ -35,7 +35,7 @@ func (table *GameLibraryHero) GetDataList() []*GameLibraryHeroData {
     return table._dataList
 }
 
-func (table *GameLibraryHero) Get(key int32) *GameLibraryHeroData {
+func (table *GameLibraryHero) Get(key string) *GameLibraryHeroData {
     return table._dataMap[key]
 }
 

sys/configure/structs/Game.LibraryHeroData.go

@@ -11,16 +11,17 @@ package cfg
 import "errors"
 
 type GameLibraryHeroData struct {
-    Hid int32
+    Hid string
     Name string
     Star int32
-    History []int32
+    History []string
     Favorlv []int32
     Startid int32
     Rightend int32
     Stroyprize []*Gameatn
     Endid1 int32
     Endid2 int32
+    Fid []int32
 }
 
 const TypeId_GameLibraryHeroData = 1808545443
@@ -30,7 +31,7 @@ func (*GameLibraryHeroData) GetTypeId() int32 {
 }
 
 func (_v *GameLibraryHeroData)Deserialize(_buf map[string]interface{}) (err error) {
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
      {
@@ -38,11 +39,11 @@ func (_v *GameLibraryHeroData)Deserialize(_buf map[string]interface{}) (err erro
                 var _ok_ bool
                 if _arr_, _ok_ = _buf["history"].([]interface{}); !_ok_ { err = errors.New("history error"); return }
 
-                _v.History = make([]int32, 0, len(_arr_))
+                _v.History = make([]string, 0, len(_arr_))
                 
                 for _, _e_ := range _arr_ {
-                    var _list_v_ int32
+                    var _list_v_ string
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
                     _v.History = append(_v.History, _list_v_)
                 }
             }
@@ -79,6 +80,20 @@ func (_v *GameLibraryHeroData)Deserialize(_buf map[string]interface{}) (err erro
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endid1"].(float64); !_ok_ { err = errors.New("endid1 error"); return }; _v.Endid1 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endid2"].(float64); !_ok_ { err = errors.New("endid2 error"); return }; _v.Endid2 = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["fid"].([]interface{}); !_ok_ { err = errors.New("fid error"); return }
+
+                _v.Fid = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.Fid = append(_v.Fid, _list_v_)
+                }
+            }
+
     return
 }
 

sys/configure/structs/Game.LibraryHistory.go

@@ -9,13 +9,13 @@
 package cfg
 
 type GameLibraryHistory struct {
-    _dataMap map[int32]*GameLibraryHistoryData
+    _dataMap map[string]*GameLibraryHistoryData
     _dataList []*GameLibraryHistoryData
 }
 
 func NewGameLibraryHistory(_buf []map[string]interface{}) (*GameLibraryHistory, error) {
 	_dataList := make([]*GameLibraryHistoryData, 0, len(_buf))
-	dataMap := make(map[int32]*GameLibraryHistoryData)
+	dataMap := make(map[string]*GameLibraryHistoryData)
 	for _, _ele_ := range _buf {
 		if _v, err2 := DeserializeGameLibraryHistoryData(_ele_); err2 != nil {
 			return nil, err2
@@ -27,7 +27,7 @@ func NewGameLibraryHistory(_buf []map[string]interface{}) (*GameLibraryHistory,
 	return &GameLibraryHistory{_dataList:_dataList, _dataMap:dataMap}, nil
 }
 
-func (table *GameLibraryHistory) GetDataMap() map[int32]*GameLibraryHistoryData {
+func (table *GameLibraryHistory) GetDataMap() map[string]*GameLibraryHistoryData {
     return table._dataMap
 }
 
@@ -35,7 +35,7 @@ func (table *GameLibraryHistory) GetDataList() []*GameLibraryHistoryData {
     return table._dataList
 }
 
-func (table *GameLibraryHistory) Get(key int32) *GameLibraryHistoryData {
+func (table *GameLibraryHistory) Get(key string) *GameLibraryHistoryData {
     return table._dataMap[key]
 }
 

sys/configure/structs/Game.LibraryHistoryData.go

@@ -11,7 +11,7 @@ package cfg
 import "errors"
 
 type GameLibraryHistoryData struct {
-    Histroy int32
+    Histroy string
     Txt string
     Prize []*Gameatn
 }
@@ -23,7 +23,7 @@ func (*GameLibraryHistoryData) GetTypeId() int32 {
 }
 
 func (_v *GameLibraryHistoryData)Deserialize(_buf map[string]interface{}) (err error) {
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["histroy"].(float64); !_ok_ { err = errors.New("histroy error"); return }; _v.Histroy = int32(_tempNum_) }
+    { var _ok_ bool; if _v.Histroy, _ok_ = _buf["histroy"].(string); !_ok_ { err = errors.New("histroy error"); return } }
     { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } }
      {
                 var _arr_ []interface{}

sys/configure/structs/Game.StroyData.go

@@ -33,9 +33,12 @@ type GameStroyData struct {
     Move string
     Action string
     Sound string
-    Position serialization.Vector3
+    PositionR serialization.Vector3
-    Revolve serialization.Vector3
+    PositionL serialization.Vector3
-    Size serialization.Vector3
+    RevolveR serialization.Vector3
+    RevolveL serialization.Vector3
+    SizeR serialization.Vector3
+    SizeL serialization.Vector3
     Perf string
     Cg string
     Skip bool
@@ -82,28 +85,52 @@ func (_v *GameStroyData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; if _v.Move, _ok_ = _buf["move"].(string); !_ok_ { err = errors.New("move error"); return } }
     { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } }
     { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } }
-    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["position"].(map[string]interface{}); !_ok_ { err = errors.New("position error"); return }
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["positionR"].(map[string]interface{}); !_ok_ { err = errors.New("positionR error"); return }
             var _x_, _y_, _z_ float32;
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
-            _v.Position = serialization.NewVector3(_x_, _y_, _z_)
+            _v.PositionR = serialization.NewVector3(_x_, _y_, _z_)
             }
 
-    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolve"].(map[string]interface{}); !_ok_ { err = errors.New("revolve error"); return }
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["positionL"].(map[string]interface{}); !_ok_ { err = errors.New("positionL error"); return }
             var _x_, _y_, _z_ float32;
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
-            _v.Revolve = serialization.NewVector3(_x_, _y_, _z_)
+            _v.PositionL = serialization.NewVector3(_x_, _y_, _z_)
             }
 
-    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["size"].(map[string]interface{}); !_ok_ { err = errors.New("size error"); return }
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolveR"].(map[string]interface{}); !_ok_ { err = errors.New("revolveR error"); return }
             var _x_, _y_, _z_ float32;
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
             { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
-            _v.Size = serialization.NewVector3(_x_, _y_, _z_)
+            _v.RevolveR = serialization.NewVector3(_x_, _y_, _z_)
+            }
+
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolveL"].(map[string]interface{}); !_ok_ { err = errors.New("revolveL error"); return }
+            var _x_, _y_, _z_ float32;
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+            _v.RevolveL = serialization.NewVector3(_x_, _y_, _z_)
+            }
+
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["sizeR"].(map[string]interface{}); !_ok_ { err = errors.New("sizeR error"); return }
+            var _x_, _y_, _z_ float32;
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+            _v.SizeR = serialization.NewVector3(_x_, _y_, _z_)
+            }
+
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["sizeL"].(map[string]interface{}); !_ok_ { err = errors.New("sizeL error"); return }
+            var _x_, _y_, _z_ float32;
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+            _v.SizeL = serialization.NewVector3(_x_, _y_, _z_)
             }
 
     { var _ok_ bool; if _v.Perf, _ok_ = _buf["perf"].(string); !_ok_ { err = errors.New("perf error"); return } }

sys/configure/structs/game.equipSuitData.go

@@ -16,6 +16,7 @@ type GameEquipSuitData struct {
     Skill int32
     Skillname string
     Skillintr string
+    SetBonuses map[string]float32
 }
 
 const TypeId_GameEquipSuitData = -1986764885
@@ -30,6 +31,23 @@ func (_v *GameEquipSuitData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillname error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillintr error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["SetBonuses"].([]interface{}); !_ok_ { err = errors.New("SetBonuses error"); return }
+
+                _v.SetBonuses = make(map[string]float32)
+                
+                for _, _e_ := range _arr_ {
+                    var _kv_ []interface{}
+                    if _kv_, _ok_ = _e_.([]interface{}); !_ok_ || len(_kv_) != 2 { err = errors.New("SetBonuses error"); return }
+                    var _key_ string
+                    {  if _key_, _ok_ = _kv_[0].(string); !_ok_ { err = errors.New("_key_ error"); return } }
+                    var _value_ float32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _kv_[1].(float64); !_ok_ { err = errors.New("_value_ error"); return }; _value_ = float32(_x_) }
+                    _v.SetBonuses[_key_] = _value_
+                }
+                }
     return
 }
 

sys/configure/structs/game.heroData.go

@@ -40,6 +40,7 @@ type GameHeroData struct {
     Enteranivalue int32
     Camerainterval float32
     Equiprcom []string
+    Angle int32
 }
 
 const TypeId_GameHeroData = 1513828672
@@ -123,6 +124,7 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["angle"].(float64); !_ok_ { err = errors.New("angle error"); return }; _v.Angle = int32(_tempNum_) }
     return
 }