From db66582ce2f8edc96641e487b517cab9befd5135 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 22 Jan 2024 16:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_monsterformat.json | 2 +-
 bin/json/game_skillpassive.json  | 6 +++---
 sys/configure/structs/Tables.go  | 6 ------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 3fa8ae8bc..f08595b4e 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -123801,7 +123801,7 @@
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 165,
+    "speed": 155,
     "modelsize": 1
   },
   {
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index 6ea20ee96..373608b15 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -13431,7 +13431,7 @@
     "icon": "",
     "When": 16,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000116,OverlayNum=25",
+    "TargetCheck": "Target=2,HasBuff=391000116,OverlayNum=25",
     "MainSkillCheck": "SkillPos=5",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -13457,7 +13457,7 @@
     "icon": "",
     "When": 16,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000123,OverlayNum=25",
+    "TargetCheck": "Target=2,HasBuff=391000123,OverlayNum=25",
     "MainSkillCheck": "SkillPos=5",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -13483,7 +13483,7 @@
     "icon": "",
     "When": 16,
     "FromCheck": "Target=3",
-    "TargetCheck": "Target=2,BuffTotalOverlayNumLess=391000127,OverlayNum=25",
+    "TargetCheck": "Target=2,HasBuff=391000127,OverlayNum=25",
     "MainSkillCheck": "SkillPos=5",
     "AfterSkillCheck": "",
     "BuffCheck": "",
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 35412d277..1d605a879 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -344,10 +344,7 @@ type Tables struct {
     FightingSkilllv *GameFightingSkilllv
     FightingSkill *GameFightingSkill
     FightingSkillStar *GameFightingSkillStar
-<<<<<<< HEAD
     ExpeditionBoos *GameExpeditionBoos
-=======
->>>>>>> aa8ed334061993a5bd1bbe28c4fa53dc67763781
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -2353,14 +2350,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil {
         return nil, err
     }
-<<<<<<< HEAD
     if buf, err = loader("game_expeditionboos") ; err != nil {
         return nil, err
     }
     if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil {
         return nil, err
     }
-=======
->>>>>>> aa8ed334061993a5bd1bbe28c4fa53dc67763781
     return tables, nil
 }