diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index fa74a40d9..3877bebbf 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -2498,14 +2498,14 @@ "ChoseCamp": [], "DisableCamp": [], "DefaultHero": 720021, - "ChoseHero": [ - "24004" - ], + "ChoseHero": [], "DisableHero": [], "LockSlots": [ 5 ], - "HeroCheck": [], + "HeroCheck": [ + "24004" + ], "RedAssistTeam": 720019, "BlueAssistTeam": 720020, "CanFriendHelp": false, diff --git a/bin/json/game_bukashiai.json b/bin/json/game_bukashiai.json index 4bc6bb78f..80c2ad0a8 100644 --- a/bin/json/game_bukashiai.json +++ b/bin/json/game_bukashiai.json @@ -5,8 +5,8 @@ "QualifyingType": 1, "BehaviorCD": 3, "BumpWeight": 50, - "BumpCD": 4, - "BumpFailWeight": 60, + "BumpCD": 1, + "BumpFailWeight": 200, "BumpSuccessWeight": [ 20, 30, @@ -14,6 +14,10 @@ 50, 60 ], + "BumpDodgeWeight": 80, + "GoldEmptyWeight": 40, + "GoldWeight": 10, + "GoldComboMax": 15, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -34,7 +38,7 @@ "QualifyingType": 2, "BehaviorCD": 3, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 50, "BumpSuccessWeight": [ 20, @@ -43,6 +47,10 @@ 50, 60 ], + "BumpDodgeWeight": 70, + "GoldEmptyWeight": 40, + "GoldWeight": 8, + "GoldComboMax": 20, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -63,7 +71,7 @@ "QualifyingType": 3, "BehaviorCD": 3, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 40, "BumpSuccessWeight": [ 20, @@ -72,6 +80,10 @@ 50, 60 ], + "BumpDodgeWeight": 60, + "GoldEmptyWeight": 40, + "GoldWeight": 6, + "GoldComboMax": 40, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -92,7 +104,7 @@ "QualifyingType": 4, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 30, "BumpSuccessWeight": [ 20, @@ -101,6 +113,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 50, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -121,7 +137,7 @@ "QualifyingType": 5, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -130,6 +146,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 60, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -150,7 +170,7 @@ "QualifyingType": 6, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -159,6 +179,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 1000, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -179,7 +203,7 @@ "QualifyingType": 7, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -188,6 +212,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 1000, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -208,7 +236,7 @@ "QualifyingType": 8, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -217,6 +245,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 1000, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -237,7 +269,7 @@ "QualifyingType": 1, "BehaviorCD": 3, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 60, "BumpSuccessWeight": [ 20, @@ -246,6 +278,10 @@ 50, 60 ], + "BumpDodgeWeight": 80, + "GoldEmptyWeight": 40, + "GoldWeight": 10, + "GoldComboMax": 15, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -266,7 +302,7 @@ "QualifyingType": 2, "BehaviorCD": 3, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 50, "BumpSuccessWeight": [ 20, @@ -275,6 +311,10 @@ 50, 60 ], + "BumpDodgeWeight": 70, + "GoldEmptyWeight": 40, + "GoldWeight": 8, + "GoldComboMax": 20, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -295,7 +335,7 @@ "QualifyingType": 3, "BehaviorCD": 3, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 40, "BumpSuccessWeight": [ 20, @@ -304,6 +344,10 @@ 50, 60 ], + "BumpDodgeWeight": 60, + "GoldEmptyWeight": 40, + "GoldWeight": 6, + "GoldComboMax": 40, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -324,7 +368,7 @@ "QualifyingType": 4, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 30, "BumpSuccessWeight": [ 20, @@ -333,6 +377,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 50, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -353,7 +401,7 @@ "QualifyingType": 5, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -362,6 +410,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 60, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -382,7 +434,7 @@ "QualifyingType": 6, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -391,6 +443,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 1000, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -411,7 +467,7 @@ "QualifyingType": 7, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -420,6 +476,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 1000, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, @@ -440,7 +500,7 @@ "QualifyingType": 8, "BehaviorCD": 2, "BumpWeight": 50, - "BumpCD": 4, + "BumpCD": 1, "BumpFailWeight": 20, "BumpSuccessWeight": [ 20, @@ -449,6 +509,10 @@ 50, 60 ], + "BumpDodgeWeight": 50, + "GoldEmptyWeight": 40, + "GoldWeight": 5, + "GoldComboMax": 1000, "HpBumpWeight": 100, "HpBumpCD": 35, "HpBumpFailWeight": 50, diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 11d88785a..dd67ca9d5 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -32468,7 +32468,7 @@ }, "value": 1, "filter": [ - 1101012 + 1101014 ], "filter2": [] }, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index e7ecf6e80..a253d7b11 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -11863,7 +11863,7 @@ "heroimg": "zxgq_qp_icon_gth", "bubbletext": { "key": "main_stage_bubbletext_95", - "text": "哼……传承者……" + "text": "欢迎,我的朋友!" }, "animation": [], "prewarbubbletext": { @@ -40121,8 +40121,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_300", + "text": "希卡普真是越来越不务正业。" }, "animation": [], "prewarbubbletext": { @@ -40202,7 +40202,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_261", + "key": "main_stage_bubbletext_301", "text": "呃呃呃,好冷啊……!!" }, "animation": [], @@ -40283,7 +40283,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_262", + "key": "main_stage_bubbletext_302", "text": "吼吼吼——" }, "animation": [], @@ -40364,7 +40364,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_263", + "key": "main_stage_bubbletext_303", "text": "哦,我的奥丁神啊!!" }, "animation": [], @@ -40445,7 +40445,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_264", + "key": "main_stage_bubbletext_304", "text": "小嗝嗝,快来帮忙。" }, "animation": [], @@ -40562,7 +40562,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_265", + "key": "main_stage_bubbletext_305", "text": "好端端的,龙群怎么会感染瘟疫?" }, "animation": [], @@ -40578,8 +40578,8 @@ "frontstoryid": 401090, "afterstoryid": 401100, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_300", + "text": "阻止埃雷特!" }, "maingroupIcon": "", "mainlineName": { @@ -40695,8 +40695,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_301", + "text": "阻止闹事者!" }, "maingroupIcon": "", "mainlineName": { @@ -40796,7 +40796,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_266", + "key": "main_stage_bubbletext_307", "text": "事关博克岛生存,必须谨慎处理。" }, "animation": [], @@ -40812,8 +40812,8 @@ "frontstoryid": 401110, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_302", + "text": "击败埃雷特!" }, "maingroupIcon": "", "mainlineName": { @@ -40929,8 +40929,8 @@ "frontstoryid": 0, "afterstoryid": 0, "maingroupName": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_maingroupName_303", + "text": "击败闹事村民" }, "maingroupIcon": "", "mainlineName": { @@ -41033,7 +41033,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_268", + "key": "main_stage_bubbletext_309", "text": "别打了,大家都冷静一下!" }, "animation": [], @@ -41120,7 +41120,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_269", + "key": "main_stage_bubbletext_310", "text": "这不是你的错,小嗝嗝。" }, "animation": [], @@ -41240,7 +41240,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_270", + "key": "main_stage_bubbletext_311", "text": "终于又回到了这里。" }, "animation": [], @@ -41324,7 +41324,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_271", + "key": "main_stage_bubbletext_312", "text": "希卡普,我的儿子!!" }, "animation": [], @@ -41492,7 +41492,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_273", + "key": "main_stage_bubbletext_314", "text": "以爱回应忠诚,以荣誉回应英勇。" }, "animation": [], @@ -41579,7 +41579,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_274", + "key": "main_stage_bubbletext_315", "text": "是奥拉夫暴风雪!!" }, "animation": [], @@ -41867,7 +41867,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_277", + "key": "main_stage_bubbletext_318", "text": "怎么办怎么办,暴风雪来了!" }, "animation": [], diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 37d8f50ea..7d70c09c7 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -1898,7 +1898,9 @@ "heroid": 53001, "star": 3, "equip": [], - "newskill": [], + "newskill": [ + 100000004 + ], "lv": 30, "hppro": 100, "atkpro": 2.5, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 8dbf8bd72..0d3fef6ff 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -30170,7 +30170,7 @@ "Type": 2, "Argu": [ 455001212, - 1, + -1, -1 ], "FollowSK": [], @@ -30185,7 +30185,7 @@ { "Id": 255001114, "EmitPR": 1000, - "From": 1, + "From": 13, "Where": [], "Order": "", "Limit": 10, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 57254da3b..7a27bb783 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -61994,9 +61994,7 @@ 255001113 ] }, - "passSkill": [ - 255001113 - ], + "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_100000003_1", "text": "积分boss复活" diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 29d5e88dd..213253ca4 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -15072,7 +15072,7 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_hgbl", "buffeffect": "effect_53001_evil_heiyan", "buffpos": "根节点", "AddTrigger": 0, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 84651791c..87e4538c4 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -4151,8 +4151,8 @@ "text": "" }, "icon": "", - "When": 15, - "FromCheck": "Target=2", + "When": 21, + "FromCheck": "", "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", @@ -4167,7 +4167,7 @@ "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 2, + "MaxEmitTimesInRound": 1, "Callback": [ 255001114 ] diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json index af43de7dd..2e5be2950 100644 --- a/bin/json/game_vikingbossskill.json +++ b/bin/json/game_vikingbossskill.json @@ -104,7 +104,7 @@ "copytype": 4, "name": { "key": "vikingexpedition_bossskill_name_6", - "text": "梦境回廊" + "text": "塔岗监狱" }, "back_png": "xmwg_jyfb_boss1", "introduce": { diff --git a/modules/parkour/ai.go b/modules/parkour/ai.go index c4899e1fb..7237882f4 100644 --- a/modules/parkour/ai.go +++ b/modules/parkour/ai.go @@ -146,17 +146,23 @@ func (this *aiComp) ExceAi(_ai *AI) { func (this *aiComp) ExceAiHandle_Avoid(_ai *AI, handle *AIHandle) { var ( weights []int32 = make([]int32, 0) - conf *cfg.GameBuzkashiGradeData indexhandle int32 ) - weights = append(weights, _ai.Conf.BumpFailWeight) - weights = append(weights, _ai.Conf.BumpSuccessWeight...) - indexhandle = comm.GetRandW(weights) - if indexhandle == 0 { //失败 + if _ai.ContNum >= _ai.Conf.GoldComboMax { + _ai.ContNum = 0 go this.module.avoid(_ai.Bid, _ai.Uid, 0, 0, nil) } else { - conf = this.avoidConf[indexhandle-1] - go this.module.avoid(_ai.Bid, _ai.Uid, conf.Distance, 0, conf) + weights = append(weights, _ai.Conf.BumpFailWeight+_ai.ContNum*_ai.Conf.GoldWeight) + weights = append(weights, _ai.Conf.BumpDodgeWeight) + weights = append(weights, _ai.Conf.GoldEmptyWeight) + indexhandle = comm.GetRandW(weights) + if indexhandle == 0 { //装上 + _ai.ContNum = 0 + go this.module.avoid(_ai.Bid, _ai.Uid, 0, 0, nil) + } else if indexhandle == 1 { //吃金币 + _ai.ContNum++ + go this.module.eat(_ai.Bid, _ai.Uid) + } } handle.cd = _ai.Conf.BumpCD } diff --git a/modules/parkour/core.go b/modules/parkour/core.go index c2712e8bf..776251237 100644 --- a/modules/parkour/core.go +++ b/modules/parkour/core.go @@ -87,4 +87,5 @@ type AI struct { Conf *cfg.GameBukashiAiData //配置 Handles []*AIHandle //操作列表 CD int32 //CD + ContNum int32 //连击数 } diff --git a/sys/configure/structs/Game.BukashiAiData.go b/sys/configure/structs/Game.BukashiAiData.go index f4e8b34b3..81f82b236 100644 --- a/sys/configure/structs/Game.BukashiAiData.go +++ b/sys/configure/structs/Game.BukashiAiData.go @@ -19,6 +19,10 @@ type GameBukashiAiData struct { BumpCD int32 BumpFailWeight int32 BumpSuccessWeight []int32 + BumpDodgeWeight int32 + GoldEmptyWeight int32 + GoldWeight int32 + GoldComboMax int32 HpBumpWeight int32 HpBumpCD int32 HpBumpFailWeight int32 @@ -58,6 +62,10 @@ func (_v *GameBukashiAiData)Deserialize(_buf map[string]interface{}) (err error) } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BumpDodgeWeight"].(float64); !_ok_ { err = errors.New("BumpDodgeWeight error"); return }; _v.BumpDodgeWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GoldEmptyWeight"].(float64); !_ok_ { err = errors.New("GoldEmptyWeight error"); return }; _v.GoldEmptyWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GoldWeight"].(float64); !_ok_ { err = errors.New("GoldWeight error"); return }; _v.GoldWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GoldComboMax"].(float64); !_ok_ { err = errors.New("GoldComboMax error"); return }; _v.GoldComboMax = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpWeight"].(float64); !_ok_ { err = errors.New("HpBumpWeight error"); return }; _v.HpBumpWeight = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpCD"].(float64); !_ok_ { err = errors.New("HpBumpCD error"); return }; _v.HpBumpCD = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpFailWeight"].(float64); !_ok_ { err = errors.New("HpBumpFailWeight error"); return }; _v.HpBumpFailWeight = int32(_tempNum_) }