配置同步

bin/json/game_battleready.json

@@ -1110,9 +1110,9 @@
     "id": 201,
     "PlayType": 0,
     "HeroCount": 5,
-    "readyScene": "scenesfight_role_interface_03",
+    "readyScene": "scenesfight_role_interface_04",
     "battleScenes": [
-      "scenesfight_05_01"
+      "scenesfight_08"
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
@@ -1140,9 +1140,9 @@
     "id": 202,
     "PlayType": 0,
     "HeroCount": 5,
-    "readyScene": "scenesfight_role_interface_03",
+    "readyScene": "scenesfight_role_interface_04",
     "battleScenes": [
-      "scenesfight_05_01"
+      "scenesfight_08"
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
@@ -1170,9 +1170,9 @@
     "id": 203,
     "PlayType": 0,
     "HeroCount": 5,
-    "readyScene": "scenesfight_role_interface_03",
+    "readyScene": "scenesfight_role_interface_04",
     "battleScenes": [
-      "scenesfight_05_01"
+      "scenesfight_08"
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
@@ -1270,9 +1270,7 @@
       "key": "",
       "text": ""
     },
-    "battleEvents": [
+    "battleEvents": [],
-      109
-    ],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
     "ChoseCamp": [],
@@ -1285,5 +1283,33 @@
     "AssistTeam": 0,
     "CanFriendHelp": 0,
     "Numrounds": 0
+  },
+  {
+    "id": 207,
+    "PlayType": 0,
+    "HeroCount": 5,
+    "readyScene": "scenesfight_role_interface_04",
+    "battleScenes": [
+      "scenesfight_08"
+    ],
+    "HideAlienSpace": 0,
+    "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
+    "battleEvents": [],
+    "ScoreGroupID": 0,
+    "disableAiCamera": 0,
+    "ChoseCamp": [],
+    "DisableCamp": [],
+    "DefaultHero": 720018,
+    "ChoseHero": [],
+    "DisableHero": [],
+    "LockSlots": [],
+    "HeroCheck": [],
+    "AssistTeam": 0,
+    "CanFriendHelp": 0,
+    "Numrounds": 0
   }
 ]

bin/json/game_cardpool.json

@@ -2,7 +2,7 @@
   {
     "key": 1,
     "card_pool_type": "inevitable_20001",
-    "id": "13005",
+    "id": "24001",
     "weight": 1000
   },
   {

bin/json/game_fightglobalevent.json

@@ -658,8 +658,8 @@
       "key": "",
       "text": ""
     },
-    "When": 3,
+    "When": 20,
-    "FromCheck": "Side=2,HeroID=33002",
+    "FromCheck": "Side=2",
     "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",

bin/json/game_hero.json

@@ -456,7 +456,7 @@
     "type": 1,
     "ip": 4,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "14002",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -1344,7 +1344,7 @@
     "type": 1,
     "ip": 1,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "23003",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -1492,7 +1492,7 @@
     "type": 1,
     "ip": 6,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "24001",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -3564,7 +3564,7 @@
     "type": 1,
     "ip": 11,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "35002",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -3712,7 +3712,7 @@
     "type": 1,
     "ip": 6,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "35004",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -4156,7 +4156,7 @@
     "type": 1,
     "ip": 5,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "43004",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -4452,7 +4452,7 @@
     "type": 1,
     "ip": 6,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "44001",
     "rotation": "0|0|0",
     "revolve": 0,
@@ -4600,7 +4600,7 @@
     "type": 1,
     "ip": 5,
     "sd": 1,
-    "handbook": -1,
+    "handbook": 1,
     "prefab": "44003",
     "rotation": "0|0|0",
     "revolve": 0,

bin/json/game_heroupstorychapter.json

@@ -21,6 +21,10 @@
         "n": 3000
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_01",
+      "text": "未开启提示1"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_01",
       "text": "测试文本1"
@@ -54,6 +58,10 @@
         "n": 3010
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_02",
+      "text": "未开启提示2"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_02",
       "text": "测试文本2"
@@ -87,6 +95,10 @@
         "n": 3020
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_03",
+      "text": "未开启提示3"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_03",
       "text": "测试文本3"
@@ -115,6 +127,10 @@
     "startstory": 0,
     "battle": 0,
     "reward": [],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_04",
+      "text": "未开启提示4"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_04",
       "text": "测试文本4"
@@ -148,6 +164,10 @@
         "n": 3040
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_05",
+      "text": "未开启提示5"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_05",
       "text": "测试文本5"
@@ -179,6 +199,10 @@
         "n": 3050
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_06",
+      "text": "未开启提示6"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_06",
       "text": "测试文本6"
@@ -212,6 +236,10 @@
         "n": 3060
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_07",
+      "text": "未开启提示7"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_07",
       "text": "测试文本7"
@@ -245,6 +273,10 @@
         "n": 3070
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_08",
+      "text": "未开启提示8"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_08",
       "text": "测试文本8"
@@ -273,6 +305,10 @@
     "startstory": 0,
     "battle": 0,
     "reward": [],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_09",
+      "text": "未开启提示9"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_09",
       "text": "测试文本9"
@@ -306,6 +342,10 @@
         "n": 3090
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_10",
+      "text": "未开启提示10"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_10",
       "text": "测试文本10"
@@ -337,6 +377,10 @@
         "n": 3100
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_11",
+      "text": "未开启提示11"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_11",
       "text": "测试文本11"
@@ -370,6 +414,10 @@
         "n": 3110
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_12",
+      "text": "未开启提示12"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_12",
       "text": "测试文本12"
@@ -403,6 +451,10 @@
         "n": 3120
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_13",
+      "text": "未开启提示13"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_13",
       "text": "测试文本13"
@@ -431,6 +483,10 @@
     "startstory": 0,
     "battle": 0,
     "reward": [],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_14",
+      "text": "未开启提示14"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_14",
       "text": "测试文本14"
@@ -464,6 +520,10 @@
         "n": 3140
       }
     ],
+    "tipstxt": {
+      "key": "heroupstory_heroupstory_chapter_txt_15",
+      "text": "未开启提示15"
+    },
     "txt": {
       "key": "heroupstory_heroupstory_chapter_txt_15",
       "text": "测试文本15"

bin/json/game_monsterformat.json

@@ -232576,7 +232576,7 @@
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 95,
+    "speed": 115,
     "modelsize": 1
   },
   {
@@ -232710,13 +232710,13 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.6,
+    "hppro": 0.8,
     "atkpro": 0.5,
     "defpro": 0.1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 69,
+    "speed": 110,
     "modelsize": 1
   },
   {
@@ -232730,13 +232730,13 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.6,
+    "hppro": 0.8,
     "atkpro": 0.5,
     "defpro": 0.1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 60,
+    "speed": 90,
     "modelsize": 1
   },
   {
@@ -232750,13 +232750,13 @@
     "equip": [],
     "newskill": [],
     "lv": 4,
-    "hppro": 0.6,
+    "hppro": 0.8,
     "atkpro": 0.5,
     "defpro": 0.1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 64,
+    "speed": 90,
     "modelsize": 1
   },
   {
@@ -238170,7 +238170,7 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 1,
+    "hppro": 0.3,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
@@ -238299,6 +238299,26 @@
     "speed": 80,
     "modelsize": 1
   },
+  {
+    "Id": 720018,
+    "pos": 1,
+    "captainId": 0,
+    "IsBoss": 0,
+    "bossHpCnt": 0,
+    "heroid": 25001,
+    "star": 3,
+    "equip": [],
+    "newskill": [],
+    "lv": 1,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 105,
+    "modelsize": 1
+  },
   {
     "Id": 800001,
     "pos": 1,

bin/json/game_opencond.json

@@ -242,6 +242,10 @@
       {
         "key": 1,
         "param": 1
+      },
+      {
+        "key": 3,
+        "param": 20090
       }
     ],
     "wkqbx": 0,
@@ -249,7 +253,7 @@
     "img": "zc_icon_01",
     "prompt": {
       "key": "opencond_opencond_prompt_10",
-      "text": "主线关卡通关达到第1章的第1关开启"
+      "text": "继续完成更多主线任务开启"
     },
     "uiid": 166,
     "activateType": 0,

bin/json/game_recharge.json

@@ -708,7 +708,13 @@
         "n": 980
       }
     ],
-    "diamond_num_double": [],
+    "diamond_num_double": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 980
+      }
+    ],
     "channel": "0",
     "text": "0",
     "show": "98元",
@@ -728,7 +734,13 @@
         "n": 980
       }
     ],
-    "diamond_num_double": [],
+    "diamond_num_double": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 980
+      }
+    ],
     "channel": "0",
     "text": "0",
     "show": "30元",

bin/json/game_worldbattle.json

@@ -46,7 +46,7 @@
     "FormatList": [
       700014
     ],
-    "BattleReadyID": 203,
+    "BattleReadyID": 207,
     "EventList": [],
     "playexp": {
       "a": "attr",
@@ -60,7 +60,7 @@
     "FormatList": [
       700015
     ],
-    "BattleReadyID": 117,
+    "BattleReadyID": 203,
     "EventList": [],
     "playexp": {
       "a": "attr",

bin/json/game_worldtask.json

@@ -1049,7 +1049,7 @@
     ],
     "deliver_npc": 10218,
     "taskend_removeitem": [],
-    "auto_accept": 0,
+    "auto_accept": 1,
     "tasktips": 0,
     "lock_add": 0,
     "reword": [

sys/configure/structs/Game.BuffType.go

@@ -107,4 +107,13 @@ const (
     GameBuffType_FIGHT_VOLITION = 114
     GameBuffType_WEAKENS = 115
     GameBuffType_CONCEAL = 116
+    GameBuffType_BUFF_COUNT_ADD_BE_DMG = 117
+    GameBuffType_TRE_BY_FRIEND_TRE = 118
+    GameBuffType_HAS_BUFF_ADD_BE_DMG = 119
+    GameBuffType_IGNORE_DEF_PER_HAS_PROB = 120
+    GameBuffType_ADJUST_PRO_BY_PRO = 121
+    GameBuffType_ADJUST_PRO_BY_REAL_DMG = 122
+    GameBuffType_ADJUST_PRO_BY_PRO_OVERFLOW = 123
+    GameBuffType_HAS_SHIELD_REFLEX_DMG = 124
+    GameBuffType_ADJUST_PRO_FULL_EMIT_SKILL = 125
 )

sys/configure/structs/Game.HeroupstoryChapterData.go

@@ -24,6 +24,7 @@ type GameHeroupstoryChapterData struct {
     Startstory int32
     Battle int32
     Reward []*Gameatn
+    Tipstxt string
     Txt string
     Circle string
     Qq int32
@@ -95,6 +96,7 @@ func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (e
                 }
             }
 
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tipstxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Tipstxt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Tipstxt, _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["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; if _v.Circle, _ok_ = _buf["circle"].(string); !_ok_ { err = errors.New("circle error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["qq"].(float64); !_ok_ { err = errors.New("qq error"); return }; _v.Qq = int32(_tempNum_) }