From b79700e96070ad323d9ec47ab2152642c6c9e5de Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 6 Feb 2023 11:12:34 +0800
Subject: [PATCH] merge

---
 bin/json/game_global.json                |   4 -
 bin/json/game_hero.json                  | 488 -----------------------
 bin/json/game_item.json                  |   3 -
 bin/json/game_opencond.json              | 228 +++++++++++
 modules/worldtask/api_battlestart.go     |  10 +-
 sys/configure/structs/game.globalData.go |   6 -
 sys/configure/structs/game.heroData.go   |   6 -
 7 files changed, 233 insertions(+), 512 deletions(-)

diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index ccaa3c888..99c6ca3c1 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -533,15 +533,11 @@
     "GuildBoss_troop3": 60,
     "zhayantime": 5,
     "rotateAngle": 360,
-<<<<<<< HEAD
     "rotateDizzyTime": 1,
     "moonshopmoney": [
       10,
       20,
       30
     ]
-=======
-    "rotateDizzyTime": 1
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index 3c10aee4b..a43cc3374 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -72,7 +72,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -82,9 +81,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "13002",
@@ -159,7 +155,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -169,9 +164,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "13003",
@@ -246,7 +238,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -256,9 +247,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "13004",
@@ -333,7 +321,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -343,9 +330,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "13005",
@@ -420,7 +404,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -430,9 +413,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14001",
@@ -507,7 +487,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -517,9 +496,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14002",
@@ -594,7 +570,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -604,9 +579,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14003",
@@ -681,7 +653,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -691,9 +662,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14004",
@@ -768,7 +736,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -778,9 +745,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14005",
@@ -855,7 +819,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -865,9 +828,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14006",
@@ -942,7 +902,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -952,9 +911,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "14007",
@@ -1029,7 +985,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1039,9 +994,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "15001",
@@ -1116,7 +1068,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1126,9 +1077,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "15002",
@@ -1203,7 +1151,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1213,9 +1160,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "15003",
@@ -1290,7 +1234,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1300,9 +1243,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "15004",
@@ -1377,7 +1317,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1387,9 +1326,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "23001",
@@ -1464,7 +1400,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1474,9 +1409,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "23002",
@@ -1551,7 +1483,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1561,9 +1492,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "23003",
@@ -1638,7 +1566,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1648,9 +1575,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "23004",
@@ -1725,7 +1649,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1735,9 +1658,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24001",
@@ -1812,7 +1732,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1822,9 +1741,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24002",
@@ -1899,7 +1815,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1909,9 +1824,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24003",
@@ -1986,7 +1898,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -1996,9 +1907,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24004",
@@ -2073,7 +1981,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2083,9 +1990,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24005",
@@ -2160,7 +2064,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2170,9 +2073,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24006",
@@ -2247,7 +2147,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2257,9 +2156,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24007",
@@ -2334,7 +2230,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2344,9 +2239,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24008",
@@ -2421,7 +2313,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2431,9 +2322,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "24009",
@@ -2508,7 +2396,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2518,9 +2405,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "25001",
@@ -2595,7 +2479,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2605,9 +2488,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "25002",
@@ -2682,7 +2562,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2692,9 +2571,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "25003",
@@ -2769,7 +2645,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2779,9 +2654,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "25004",
@@ -2856,7 +2728,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2866,9 +2737,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "33001",
@@ -2943,7 +2811,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -2953,9 +2820,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "33002",
@@ -3030,7 +2894,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3040,9 +2903,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "33003",
@@ -3117,7 +2977,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3127,9 +2986,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "33004",
@@ -3204,7 +3060,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3214,9 +3069,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "33005",
@@ -3291,7 +3143,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3301,9 +3152,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "33006",
@@ -3378,7 +3226,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3388,9 +3235,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34001",
@@ -3465,7 +3309,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3475,9 +3318,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34002",
@@ -3552,7 +3392,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3562,9 +3401,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34003",
@@ -3639,7 +3475,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3649,9 +3484,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34004",
@@ -3726,7 +3558,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3736,9 +3567,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34005",
@@ -3813,7 +3641,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3823,9 +3650,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34006",
@@ -3900,7 +3724,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3910,9 +3733,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34007",
@@ -3987,7 +3807,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -3997,9 +3816,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "34008",
@@ -4074,7 +3890,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4084,9 +3899,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "35001",
@@ -4161,7 +3973,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4171,9 +3982,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "35002",
@@ -4248,7 +4056,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4258,9 +4065,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "35003",
@@ -4335,7 +4139,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4345,9 +4148,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "35004",
@@ -4422,7 +4222,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4432,9 +4231,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "35005",
@@ -4509,7 +4305,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4519,9 +4314,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "35006",
@@ -4596,7 +4388,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4606,9 +4397,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43001",
@@ -4683,7 +4471,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4693,9 +4480,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43002",
@@ -4770,7 +4554,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4780,9 +4563,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43003",
@@ -4857,7 +4637,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4867,9 +4646,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43004",
@@ -4944,7 +4720,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -4954,9 +4729,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43005",
@@ -5031,7 +4803,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5041,9 +4812,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43006",
@@ -5118,7 +4886,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5128,9 +4895,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43007",
@@ -5205,7 +4969,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5215,9 +4978,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44001",
@@ -5292,7 +5052,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5302,9 +5061,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44002",
@@ -5379,7 +5135,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5389,9 +5144,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44003",
@@ -5466,7 +5218,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5476,9 +5227,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44004",
@@ -5553,7 +5301,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5563,9 +5310,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44006",
@@ -5640,7 +5384,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5650,9 +5393,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "45001",
@@ -5727,7 +5467,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5737,9 +5476,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "45002",
@@ -5814,7 +5550,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5824,9 +5559,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "45003",
@@ -5901,7 +5633,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5911,9 +5642,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "45004",
@@ -5988,7 +5716,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -5998,9 +5725,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44005",
@@ -6075,7 +5799,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6085,9 +5808,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "15005",
@@ -6162,7 +5882,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6172,9 +5891,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43901",
@@ -6249,7 +5965,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6259,9 +5974,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43902",
@@ -6336,7 +6048,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6346,9 +6057,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43903",
@@ -6423,7 +6131,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6433,9 +6140,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "42911",
@@ -6510,7 +6214,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6520,9 +6223,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43911",
@@ -6597,7 +6297,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6607,9 +6306,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44911",
@@ -6684,7 +6380,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6694,9 +6389,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "43921",
@@ -6771,7 +6463,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6781,9 +6472,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "44921",
@@ -6858,7 +6546,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6868,9 +6555,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "45921",
@@ -6945,7 +6629,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -6955,9 +6638,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51001",
@@ -7032,7 +6712,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7042,9 +6721,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51002",
@@ -7119,7 +6795,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7129,9 +6804,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51003",
@@ -7206,7 +6878,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7216,9 +6887,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51004",
@@ -7293,7 +6961,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7303,9 +6970,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51005",
@@ -7380,7 +7044,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7390,9 +7053,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51006",
@@ -7467,7 +7127,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7477,9 +7136,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51007",
@@ -7554,7 +7210,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7564,9 +7219,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "54005",
@@ -7641,7 +7293,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7651,9 +7302,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51010",
@@ -7728,7 +7376,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7738,9 +7385,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51011",
@@ -7815,7 +7459,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7825,9 +7468,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51012",
@@ -7902,7 +7542,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7912,9 +7551,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51013",
@@ -7989,7 +7625,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -7999,9 +7634,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "51014",
@@ -8076,7 +7708,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8086,9 +7717,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "54001",
@@ -8163,7 +7791,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8173,9 +7800,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "53001",
@@ -8250,7 +7874,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8260,9 +7883,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "53002",
@@ -8337,7 +7957,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8347,9 +7966,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "53003",
@@ -8424,7 +8040,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8434,9 +8049,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "54002",
@@ -8511,7 +8123,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8521,9 +8132,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "53005",
@@ -8598,7 +8206,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8608,9 +8215,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "53006",
@@ -8685,7 +8289,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8695,9 +8298,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55001",
@@ -8772,7 +8372,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8782,9 +8381,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55002",
@@ -8859,7 +8455,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8869,9 +8464,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55003",
@@ -8946,7 +8538,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -8956,9 +8547,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55004",
@@ -9033,7 +8621,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9043,9 +8630,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55005",
@@ -9120,7 +8704,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9130,9 +8713,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55006",
@@ -9207,7 +8787,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9217,9 +8796,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "55007",
@@ -9294,7 +8870,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9304,9 +8879,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "11021",
@@ -9381,7 +8953,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9391,9 +8962,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "12003",
@@ -9470,7 +9038,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9480,9 +9047,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "63002",
@@ -9557,7 +9121,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9567,9 +9130,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "63003",
@@ -9644,7 +9204,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9654,9 +9213,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "63004",
@@ -9731,7 +9287,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9741,9 +9296,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "64003",
@@ -9818,7 +9370,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9828,9 +9379,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "74002",
@@ -9905,7 +9453,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -9915,9 +9462,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "74003",
@@ -9992,7 +9536,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10002,9 +9545,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "74004",
@@ -10079,7 +9619,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10089,9 +9628,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "83002",
@@ -10166,7 +9702,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10176,9 +9711,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "83006",
@@ -10253,7 +9785,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10263,9 +9794,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "84002",
@@ -10340,7 +9868,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10350,9 +9877,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "94002",
@@ -10427,7 +9951,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10437,9 +9960,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "94005",
@@ -10514,7 +10034,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10524,9 +10043,6 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   },
   {
     "hid": "101004",
@@ -10601,7 +10117,6 @@
         "t": "625001",
         "n": 1
       }
-<<<<<<< HEAD
     ],
     "expitem": [
       {
@@ -10611,8 +10126,5 @@
       }
     ],
     "expitemnum": 3
-=======
-    ]
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 6cd7e8067..af7d50423 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -6376,7 +6376,6 @@
       "key": "itemtipstxt_625001",
       "text": "阿宝的天赋点不足"
     }
-<<<<<<< HEAD
   },
   {
     "id": "625002",
@@ -6421,7 +6420,5 @@
       "key": "itemtipstxt_625002",
       "text": "阿宝的天赋点不足"
     }
-=======
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 2f31504c2..54e480d28 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -9,6 +9,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -31,6 +35,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -53,6 +61,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -75,6 +87,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -97,6 +113,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -119,6 +139,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -141,6 +165,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -163,6 +191,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -185,6 +217,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -207,6 +243,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -229,6 +269,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -251,6 +295,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -273,6 +321,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -295,6 +347,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -317,6 +373,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -339,6 +399,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -361,6 +425,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -383,6 +451,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -405,6 +477,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -427,6 +503,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -449,6 +529,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -471,6 +555,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -493,6 +581,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -515,6 +607,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -537,6 +633,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -559,6 +659,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -581,6 +685,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -603,6 +711,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -647,6 +759,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -669,6 +785,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -691,6 +811,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -713,6 +837,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -735,6 +863,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -757,6 +889,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -779,6 +915,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -801,6 +941,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -823,6 +967,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -845,6 +993,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -867,6 +1019,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -889,6 +1045,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -911,6 +1071,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -933,6 +1097,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -955,6 +1123,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -977,6 +1149,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -999,6 +1175,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1021,6 +1201,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1109,6 +1293,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1131,6 +1319,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1153,6 +1345,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1175,6 +1371,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1197,6 +1397,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1219,6 +1423,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1241,6 +1449,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1263,6 +1475,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1285,6 +1501,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1307,6 +1527,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
@@ -1329,6 +1553,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 2,
+        "param": 1100101
       }
     ],
     "optional": "",
diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go
index 642f9e9f3..f54079ab0 100644
--- a/modules/worldtask/api_battlestart.go
+++ b/modules/worldtask/api_battlestart.go
@@ -47,11 +47,11 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 			resp   *pb.WorldtaskBattleStartResp
 		)
 		code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{
-			Ptype:        pb.PlayType_rtask,
-			Format:       req.Battle,
-			Sysformat:    []int32{battleConf.DefaultHero},
-			Backupformat: []int32{battleConf.AssistTeam},
-			Buleformat:   battleConf.FormatList,
+			Ptype:  pb.PlayType_rtask,
+			Format: req.Battle,
+			// Sysformat:    []int32{battleConf.DefaultHero},
+			// Backupformat: []int32{battleConf.AssistTeam},
+			Buleformat: battleConf.FormatList,
 		})
 
 		if code != pb.ErrorCode_Success {
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index f37eb88f8..6c66806e8 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -173,10 +173,7 @@ type GameGlobalData struct {
     Zhayantime float32
     RotateAngle float32
     RotateDizzyTime float32
-<<<<<<< HEAD
     Moonshopmoney []int32
-=======
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -725,7 +722,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["zhayantime"].(float64); !_ok_ { err = errors.New("zhayantime error"); return }; _v.Zhayantime = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateAngle"].(float64); !_ok_ { err = errors.New("rotateAngle error"); return }; _v.RotateAngle = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateDizzyTime"].(float64); !_ok_ { err = errors.New("rotateDizzyTime error"); return }; _v.RotateDizzyTime = float32(_tempNum_) }
-<<<<<<< HEAD
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -740,8 +736,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
-=======
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
     return
 }
 
diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go
index fa862b171..654c6a772 100644
--- a/sys/configure/structs/game.heroData.go
+++ b/sys/configure/structs/game.heroData.go
@@ -45,11 +45,8 @@ type GameHeroData struct {
     Show int32
     Herofrag []*Gameatn
     Heroskillup []*Gameatn
-<<<<<<< HEAD
     Expitem []*Gameatn
     Expitemnum int32
-=======
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
 }
 
 const TypeId_GameHeroData = 1513828672
@@ -164,7 +161,6 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
-<<<<<<< HEAD
      {
                 var _arr_ []interface{}
                 var _ok_ bool
@@ -180,8 +176,6 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["expitemnum"].(float64); !_ok_ { err = errors.New("expitemnum error"); return }; _v.Expitemnum = int32(_tempNum_) }
-=======
->>>>>>> aa91ee0b32cdb0b335aa055f6492ca110aaa507d
     return
 }