From 2bf027ab273a54080efe5c0ecbcf6745c447ccf8 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 30 Jun 2023 10:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=BC=80=E5=90=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A5=BD=E5=8F=8B=E6=95=B0=E9=87=8F=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_item.json | 20 ++-- bin/json/game_monsterformat.json | 104 +++++++++--------- bin/json/game_opencond.json | 27 +++++ bin/json/game_skillafteratk.json | 2 +- bin/json/game_skillatk.json | 4 +- bin/json/game_worldbattle.json | 72 ++++++++---- modules/sys/model_sys.go | 12 ++ modules/sys/module.go | 14 +-- sys/configure/structs/Game.OpencondType.go | 1 + sys/configure/structs/Game.WorldBattleData.go | 2 + 10 files changed, 162 insertions(+), 96 deletions(-) diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 36859bcc3..674f94559 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -163,7 +163,7 @@ }, "usetype": 1, "color": 4, - "bagtype": 0, + "bagtype": 1, "index": 99, "special_type": 200, "time": 0, @@ -196,7 +196,7 @@ }, "usetype": 1, "color": 5, - "bagtype": 0, + "bagtype": 1, "index": 99, "special_type": 150, "time": 0, @@ -8870,7 +8870,7 @@ "decompose_get": [ { "a": "item", - "t": "15000201", + "t": "15000101", "n": 2 } ], @@ -8933,7 +8933,7 @@ "decompose_get": [ { "a": "item", - "t": "15000202", + "t": "15000102", "n": 2 } ], @@ -8996,7 +8996,7 @@ "decompose_get": [ { "a": "item", - "t": "15000203", + "t": "15000103", "n": 2 } ], @@ -9059,7 +9059,7 @@ "decompose_get": [ { "a": "item", - "t": "15000204", + "t": "15000104", "n": 2 } ], @@ -9110,7 +9110,7 @@ "decompose_get": [ { "a": "item", - "t": "15000301", + "t": "15000201", "n": 2 } ], @@ -9161,7 +9161,7 @@ "decompose_get": [ { "a": "item", - "t": "15000302", + "t": "15000202", "n": 2 } ], @@ -9212,7 +9212,7 @@ "decompose_get": [ { "a": "item", - "t": "15000303", + "t": "15000203", "n": 2 } ], @@ -9263,7 +9263,7 @@ "decompose_get": [ { "a": "item", - "t": "15000304", + "t": "15000204", "n": 2 } ], diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index e6ab3de30..9db6ca338 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -115970,9 +115970,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 3.5, - "atkpro": 1, - "defpro": 0.1, + "hppro": 2.5, + "atkpro": 0.5, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -116270,9 +116270,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, - "atkpro": 1.2, - "defpro": 0.1, + "hppro": 3.5, + "atkpro": 0.65, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -116570,9 +116570,9 @@ "equip": [], "newskill": [], "lv": 25, - "hppro": 5, - "atkpro": 1.3, - "defpro": 0.1, + "hppro": 4.5, + "atkpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -116870,9 +116870,9 @@ "equip": [], "newskill": [], "lv": 30, - "hppro": 6, - "atkpro": 1.3, - "defpro": 0.1, + "hppro": 5.5, + "atkpro": 0.95, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -117170,9 +117170,9 @@ "equip": [], "newskill": [], "lv": 35, - "hppro": 8, - "atkpro": 1.4, - "defpro": 0.1, + "hppro": 6.5, + "atkpro": 1.1, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -117470,9 +117470,9 @@ "equip": [], "newskill": [], "lv": 40, - "hppro": 10, - "atkpro": 1.4, - "defpro": 0.1, + "hppro": 7.5, + "atkpro": 1.25, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -117770,9 +117770,9 @@ "equip": [], "newskill": [], "lv": 45, - "hppro": 12, - "atkpro": 1.5, - "defpro": 0.1, + "hppro": 8.5, + "atkpro": 1.4, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -118070,9 +118070,9 @@ "equip": [], "newskill": [], "lv": 50, - "hppro": 14, - "atkpro": 1.5, - "defpro": 0.1, + "hppro": 9.5, + "atkpro": 1.55, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -118370,9 +118370,9 @@ "equip": [], "newskill": [], "lv": 55, - "hppro": 16, - "atkpro": 2, - "defpro": 0.1, + "hppro": 11, + "atkpro": 1.7, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -118671,7 +118671,7 @@ "newskill": [], "lv": 10, "hppro": 2, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -118970,8 +118970,8 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 3, - "atkpro": 1, + "hppro": 2.5, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -119270,8 +119270,8 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, - "atkpro": 1, + "hppro": 3, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -119570,8 +119570,8 @@ "equip": [], "newskill": [], "lv": 25, - "hppro": 5, - "atkpro": 1, + "hppro": 3.5, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -119870,8 +119870,8 @@ "equip": [], "newskill": [], "lv": 30, - "hppro": 6, - "atkpro": 1, + "hppro": 4, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -120170,8 +120170,8 @@ "equip": [], "newskill": [], "lv": 35, - "hppro": 7, - "atkpro": 1, + "hppro": 6, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -120471,7 +120471,7 @@ "newskill": [], "lv": 40, "hppro": 8, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -120771,7 +120771,7 @@ "newskill": [], "lv": 45, "hppro": 10, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -121071,7 +121071,7 @@ "newskill": [], "lv": 50, "hppro": 12, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -121371,7 +121371,7 @@ "newskill": [], "lv": 55, "hppro": 14, - "atkpro": 1, + "atkpro": 0.8, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -121671,7 +121671,7 @@ "newskill": [], "lv": 10, "hppro": 2, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -121971,7 +121971,7 @@ "newskill": [], "lv": 15, "hppro": 3, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -122271,7 +122271,7 @@ "newskill": [], "lv": 20, "hppro": 4, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -122571,7 +122571,7 @@ "newskill": [], "lv": 25, "hppro": 5, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -122871,7 +122871,7 @@ "newskill": [], "lv": 30, "hppro": 6, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -123171,7 +123171,7 @@ "newskill": [], "lv": 35, "hppro": 7, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -123471,7 +123471,7 @@ "newskill": [], "lv": 40, "hppro": 8, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -123771,7 +123771,7 @@ "newskill": [], "lv": 45, "hppro": 10, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -124071,7 +124071,7 @@ "newskill": [], "lv": 50, "hppro": 11, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, @@ -124371,7 +124371,7 @@ "newskill": [], "lv": 55, "hppro": 12, - "atkpro": 1.5, + "atkpro": 1.2, "defpro": 0.4, "skill1": 1, "skill2": 1, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 22ad4c357..2004c1296 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -1841,5 +1841,32 @@ "uiid": 0, "activateType": 0, "notify": [] + }, + { + "id": "friendMz", + "name": { + "key": "opencond_opencond_name_80", + "text": "好友木桩" + }, + "main": [ + { + "key": 4, + "param": 10 + }, + { + "key": 1, + "param": 10 + } + ], + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "opencond_opencond_prompt_80", + "text": "好友数量" + }, + "uiid": 0, + "activateType": 2, + "notify": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 90c2c91c5..b1a46a20b 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -29230,7 +29230,7 @@ "Argu": [ 1, 4, - 1000 + 800 ], "FollowSK": [], "SucFollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 4101a09cd..638143ad7 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -12196,7 +12196,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113002311_1", - "text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。" + "text": "食人鱼先生对敌方目标造成攻击力500%的伤害；若目标死亡，则附加1次攻击，对随机1个目标造成攻击力300%的伤害，本次攻击无视防御。" }, "buffid": [], "map": "" @@ -15317,7 +15317,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_143001211_1", - "text": "阿比盖尔·斯通对敌方攻击力200%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。" + "text": "阿比盖尔造成攻击力200%的伤害，有75%概率附加2回合[color=#e5621b]攻击下降[/color]状态。" }, "buffid": [ 390001006 diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index a5212e15e..c4bb7ef58 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -10,7 +10,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 102, @@ -23,7 +24,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 103, @@ -36,7 +38,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 104, @@ -49,7 +52,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 105, @@ -62,7 +66,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 106, @@ -75,7 +80,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 107, @@ -88,7 +94,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 108, @@ -101,7 +108,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 109, @@ -114,7 +122,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 110, @@ -127,7 +136,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 111, @@ -140,7 +150,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 112, @@ -153,7 +164,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 113, @@ -166,7 +178,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 114, @@ -179,7 +192,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 115, @@ -192,7 +206,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 116, @@ -205,7 +220,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 117, @@ -218,7 +234,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 118, @@ -231,7 +248,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 119, @@ -244,7 +262,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 120, @@ -257,7 +276,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 121, @@ -270,7 +290,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 122, @@ -283,7 +304,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 123, @@ -296,7 +318,8 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 }, { "id": 180, @@ -309,6 +332,7 @@ "a": "attr", "t": "exp", "n": 0 - } + }, + "carexe": 30 } ] \ No newline at end of file diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index 209e9b77c..eccd2582a 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -99,6 +99,18 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri } else { return "" } + + case 4: + module, err := this.service.GetModule(comm.ModuleFriend) + if err != nil { + this.moduleSys.Debugln(err) + return "" + } + if v, ok := module.(comm.IFriend); ok { + if v.GetFriendCount(uid) < conf.Param { + return "" + } + } } } return condData.Id diff --git a/modules/sys/module.go b/modules/sys/module.go index 9df301afc..d4ef95a60 100644 --- a/modules/sys/module.go +++ b/modules/sys/module.go @@ -70,18 +70,18 @@ func (this *ModuleSys) AutoActivate(session comm.IUserSession, cids []string) bo list, _ := this.modelSys.GetOpenCondList(session.GetUserId()) for _, cid := range cids { opencfg := this.configure.getOpencondCfgByCid(cid) - if opencfg != nil { - if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 - break - } + if opencfg == nil { + continue } - for k, v := range list.Cond { - if k == cid && v != 0 { + if id := this.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 + continue + } else { + if _, ok := list.Cond[cid]; !ok { list.Cond[cid] = 1 szOpen = append(szOpen, cid) - break } } + } if len(szOpen) > 0 { this.modelSys.ChangeOpenCondData(session.GetUserId(), map[string]interface{}{ diff --git a/sys/configure/structs/Game.OpencondType.go b/sys/configure/structs/Game.OpencondType.go index 01706bec6..a7be337cb 100644 --- a/sys/configure/structs/Game.OpencondType.go +++ b/sys/configure/structs/Game.OpencondType.go @@ -13,4 +13,5 @@ const ( GameOpencondType_Platlv = 1 GameOpencondType_Maxmapid = 2 GameOpencondType_Worldtaskid = 3 + GameOpencondType_Friend = 4 ) diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index e67dbac39..396456717 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -16,6 +16,7 @@ type GameWorldBattleData struct { BattleReadyID int32 EventList []int32 Playexp *Gameatn + Carexe int32 } const TypeId_GameWorldBattleData = 1096332216 @@ -56,6 +57,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) } return }