From 44753e24c51a98232d1b9ec61a514fee3286e29a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 22 Aug 2023 14:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=AE=B1=E9=92=A5=E5=8C=99=E6=AF=8F?= =?UTF-8?q?=E6=97=A5=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_global.json | 3 +- bin/json/game_skillafteratk.json | 62 ++++++++++-------------- bin/json/game_skillatk.json | 35 ++++++++----- bin/json/game_skillbuff.json | 14 +++--- comm/imodule.go | 2 + modules/items/module.go | 22 +++++++++ modules/user/api_login.go | 1 + sys/configure/structs/game.globalData.go | 2 + 8 files changed, 84 insertions(+), 57 deletions(-) diff --git a/bin/json/game_global.json b/bin/json/game_global.json index ac1289e86..dfff0cd7b 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -823,6 +823,7 @@ "Passcheck4_DayNum": 3, "Passcheck4_WeekNum": 6, "stonehenge_KeyMaxNum": 8, - "stonehenge_DayNum": 1 + "stonehenge_DayNum": 1, + "stonehenge_KeyItemId": "10000039" } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index e764c4809..ee7e5e366 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -1749,7 +1749,7 @@ 390001107, 800, 1, - 1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -1818,7 +1818,7 @@ 390001107, 800, 1, - 1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -1887,7 +1887,7 @@ 390001107, 800, 1, - 1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -6735,12 +6735,10 @@ "Argu": [ 2, 2, - 350 + 250 ], "FollowSK": [], - "SucFollowSK": [ - 215005316 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -16228,11 +16226,11 @@ 4, 3200 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 235006112, 235006113 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -16296,11 +16294,11 @@ 4, 3300 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 235006112, 235006113 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -16322,11 +16320,11 @@ 4, 3400 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 235006112, 235006113 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -16348,11 +16346,11 @@ 4, 3500 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 235006112, 235006113 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -16374,11 +16372,11 @@ 4, 3600 ], - "FollowSK": [], - "SucFollowSK": [ + "FollowSK": [ 235006112, 235006113 ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -16542,7 +16540,7 @@ "Argu": [ 2, 2, - 1500 + 150 ], "FollowSK": [], "SucFollowSK": [ @@ -16588,7 +16586,7 @@ "Argu": [ 2, 2, - 2000 + 200 ], "FollowSK": [], "SucFollowSK": [ @@ -16613,7 +16611,7 @@ "Argu": [ 2, 2, - 2500 + 250 ], "FollowSK": [], "SucFollowSK": [ @@ -16638,7 +16636,7 @@ "Argu": [ 2, 2, - 3000 + 300 ], "FollowSK": [], "SucFollowSK": [ @@ -16663,7 +16661,7 @@ "Argu": [ 2, 2, - 3500 + 350 ], "FollowSK": [], "SucFollowSK": [ @@ -17061,9 +17059,7 @@ 3500 ], "FollowSK": [], - "SucFollowSK": [ - 224005112 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -17110,9 +17106,7 @@ 3600 ], "FollowSK": [], - "SucFollowSK": [ - 224005112 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -17135,9 +17129,7 @@ 3700 ], "FollowSK": [], - "SucFollowSK": [ - 224005112 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -17160,9 +17152,7 @@ 3800 ], "FollowSK": [], - "SucFollowSK": [ - 224005112 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -17185,9 +17175,7 @@ 3900 ], "FollowSK": [], - "SucFollowSK": [ - 224005112 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 1b3bbe0e4..4ddf80ba7 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -962,7 +962,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_124003111_1", - "text": "对敌方1个目标造成攻击力300%的伤害，并有70%的概率附加1回合[color=#37d8a9]睡眠[/color]状态。" + "text": "对敌方1个目标造成攻击力300%的伤害，并有50%的概率附加1回合[color=#37d8a9]睡眠[/color]状态。" }, "buffid": [ 390001118 @@ -1191,7 +1191,8 @@ "text": "对敌方造成4次攻击力125%的伤害，使敌方目标各减少20%行动值，并有80%概率附加1回合[color=#37d8a9]睡眠[/color]，2回合[color=#e5621b]禁疗[/color]状态。" }, "buffid": [ - 390001118 + 390001118, + 390001107 ], "map": "" }, @@ -1225,7 +1226,8 @@ "text": "降低的行动值提升至25%。" }, "buffid": [ - 390001118 + 390001118, + 390001107 ], "map": "" }, @@ -1259,7 +1261,8 @@ "text": "效果触发几率提升至90%。" }, "buffid": [ - 390001118 + 390001118, + 390001107 ], "map": "" }, @@ -1293,7 +1296,8 @@ "text": "降低的行动值提升至30%。" }, "buffid": [ - 390001118 + 390001118, + 390001107 ], "map": "" }, @@ -1327,7 +1331,8 @@ "text": "效果触发几率提升至100%。" }, "buffid": [ - 390001118 + 390001118, + 390001107 ], "map": "" }, @@ -1358,7 +1363,8 @@ "text": "冷却时间减少1回合。" }, "buffid": [ - 390001118 + 390001118, + 390001107 ], "map": "" }, @@ -4509,7 +4515,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111_1", - "text": "对敌方1个目标攻击2次，每次造成攻击力100%的伤害，并为己方当前生命值最低的队友回复自身5%的最大生命值。" + "text": "对敌方1个目标攻击2次，第一次造成攻击力100%的伤害，第二次造成100%的伤害，并为己方当前生命值最低的队友回复自身5%的最大生命值。" }, "buffid": [], "map": "" @@ -4539,7 +4545,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111_2", - "text": "伤害提升至110%。" + "text": "第二次伤害提升至120%。" }, "buffid": [], "map": "" @@ -4569,7 +4575,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111_3", - "text": "伤害提升至120%。" + "text": "第二次伤害提升至140%。" }, "buffid": [], "map": "" @@ -4599,7 +4605,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111_4", - "text": "伤害提升至130%。" + "text": "第二次伤害提升至160%。" }, "buffid": [], "map": "" @@ -4629,7 +4635,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_115005111_5", - "text": "伤害提升至140%。" + "text": "第二次伤害提升至180%。" }, "buffid": [], "map": "" @@ -12459,6 +12465,7 @@ "Target": 2, "ChildSkill": { "Id": [ + 224005112, 224005111 ] }, @@ -12490,6 +12497,7 @@ "Target": 2, "ChildSkill": { "Id": [ + 224005112, 224005121 ] }, @@ -12521,6 +12529,7 @@ "Target": 2, "ChildSkill": { "Id": [ + 224005112, 224005131 ] }, @@ -12552,6 +12561,7 @@ "Target": 2, "ChildSkill": { "Id": [ + 224005112, 224005141 ] }, @@ -12583,6 +12593,7 @@ "Target": 2, "ChildSkill": { "Id": [ + 224005112, 224005151 ] }, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 7bad10a73..539dcb77f 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -582,7 +582,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001107", - "text": "无法恢复生命。" + "text": "效果持续期间，无法恢复生命。" }, "BuffType": 26, "EffectArgu": [], @@ -795,7 +795,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001114", - "text": "不会失手。" + "text": "效果持续期间，所有的伤害类技能都不会触发失手。" }, "BuffType": 38, "EffectArgu": [], @@ -824,7 +824,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001115", - "text": "无法附加增益状态。" + "text": "效果持续期间，守护者无法被附加增益状态。" }, "BuffType": 39, "EffectArgu": [], @@ -883,7 +883,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001117", - "text": "免除死亡。" + "text": "效果持续期间，守护者不会死亡，效果结束时若目标血量小于1则立即死亡。" }, "BuffType": 36, "EffectArgu": [ @@ -914,7 +914,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001118", - "text": "睡眠。" + "text": "效果持续期间，守护者无法行动，受到伤害类技能效果后立即解除此状态。" }, "BuffType": 41, "EffectArgu": [], @@ -6940,7 +6940,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001548", - "text": "所有角色速度全部拉到上场所有角色中最低的那个角色的速度。" + "text": "所有守护者速度全部拉到上场所有守护者中最低的那个守护者的速度。" }, "BuffType": 89, "EffectArgu": [], @@ -7595,7 +7595,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001543", - "text": "角色获得其他护盾时该护盾会增加等量的护盾量。" + "text": "守护者获得其他护盾时该护盾会增加等量的护盾量。" }, "BuffType": 94, "EffectArgu": [], diff --git a/comm/imodule.go b/comm/imodule.go index 932483c62..e14cbaabc 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -85,6 +85,8 @@ type ( UseItem(session IUserSession, gid string, amount int32, slt int32) (errdata *pb.ErrorData) //清理物品 CleanItemById(session IUserSession, t string) (errdata *pb.ErrorData) + // + InitItemBagData(session IUserSession) (errdata *pb.ErrorData) } //英雄 diff --git a/modules/items/module.go b/modules/items/module.go index d270e71f6..eb4f38c93 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -387,3 +387,25 @@ func (this *Items) CleanItemById(session comm.IUserSession, t string) (errdata * } return } + +func (this *Items) InitItemBagData(session comm.IUserSession) (errdata *pb.ErrorData) { + var ( + tmp int32 + ) + maxMum := this.ModuleTools.GetGlobalConf().StonehengeKeyMaxNum + dayNum := this.ModuleTools.GetGlobalConf().StonehengeDayNum + BoxKey := this.ModuleTools.GetGlobalConf().StonehengeKeyItemId + curNum := int32(this.QueryItemAmount(session.GetUserId(), BoxKey)) + tmp = curNum + if curNum < maxMum { + tmp += dayNum + if tmp > maxMum { + tmp = maxMum + } + // 发钥匙 + if tmp-curNum > 0 { + this.AddItem(session, BoxKey, tmp-curNum, true) + } + } + return +} diff --git a/modules/user/api_login.go b/modules/user/api_login.go index df8c76e44..92d511573 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -139,6 +139,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err // 清理点赞 this.module.ModuleFriend.ResetFriend(user.Uid) this.module.modelSign.UserSign(session) + this.module.ModuleItems.InitItemBagData(session) } // 判断昨日是否登录 diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 86c0bd8fc..9bb2bdcf3 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -265,6 +265,7 @@ type GameGlobalData struct { Passcheck4WeekNum int32 StonehengeKeyMaxNum int32 StonehengeDayNum int32 + StonehengeKeyItemId string } const TypeId_GameGlobalData = 477542761 @@ -1087,6 +1088,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Passcheck4_WeekNum"].(float64); !_ok_ { err = errors.New("Passcheck4_WeekNum error"); return }; _v.Passcheck4WeekNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stonehenge_KeyMaxNum"].(float64); !_ok_ { err = errors.New("stonehenge_KeyMaxNum error"); return }; _v.StonehengeKeyMaxNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stonehenge_DayNum"].(float64); !_ok_ { err = errors.New("stonehenge_DayNum error"); return }; _v.StonehengeDayNum = int32(_tempNum_) } + { var _ok_ bool; if _v.StonehengeKeyItemId, _ok_ = _buf["stonehenge_KeyItemId"].(string); !_ok_ { err = errors.New("stonehenge_KeyItemId error"); return } } return }