From 954e5814e214f8335e3e56113a42c1af142e2a10 Mon Sep 17 00:00:00 2001 From: UnKownOwO <80520429@qq.com> Date: Wed, 21 Dec 2022 21:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8A=80=E8=83=BD=E8=80=90?= =?UTF-8?q?=E5=8A=9B=E8=A1=A8=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game_data_config/csv/AvatarSkillData.csv | 22 +++++++++---------- gs/game/tick_manager.go | 2 +- gs/game/user_stamina.go | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gdconf/game_data_config/csv/AvatarSkillData.csv b/gdconf/game_data_config/csv/AvatarSkillData.csv index 541f4c78..1e08dc61 100644 --- a/gdconf/game_data_config/csv/AvatarSkillData.csv +++ b/gdconf/game_data_config/csv/AvatarSkillData.csv @@ -1,15 +1,15 @@ AvatarSkillId,AbilityName,,,,CostStamina,CostElemType,CostElemVal,,,,,,,,,,,,,,,,,,,, int32,string,,,,int32,int32,int32,,,,,,,,,,,,,,,,,,,, ID,Ability名称,是远程,技能CD,无视冷却缩减属性,消耗体力,消耗能量类型,消耗能量值,可累积次数,TriggerID,索敌范围,索敌公式权重1,索敌公式权重2,索敌公式权重3,索敌公式权重4,是默认镜头,支持按钮拖动,是否显示箭头,是否监控状态,默认锁定,图标名称,升级技能组ID,技能能量键值,消耗能量最小值,CanDoSkill为false强制可用,处理冷却所属技能槽,是否存档,shareCDID -10001,,,0,,1,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, -10002,,,0,,1,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, -10003,,,0,,1,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, -10004,,,0,,1,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, +10001,,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, +10002,,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, +10003,,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, +10004,,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, 10006,,,1,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, 10011,,,0,,0,,,1,1,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, 10101,,,10,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, 10102,,,10,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,, -10111,,,0,,10,,,1,11,CircleLockEnemy,1,1,0.3,0,1,,,,,,0,,,,,, +10111,,,0,,0,,,1,11,CircleLockEnemy,1,1,0.3,0,1,,,,,,0,,,,,, 10012,,,2,,0,,,1,2,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,0,,,,,, 10013,,,0,,15,,,1,3,CircleLockEnemyR5H6HC,1,1,0.3,0,,1,1,,,,233,,,1,,, 10014,,,8,,0,4,30,1,5,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,0,,,,,, @@ -25,10 +25,10 @@ ID,Ability名称,是远程,技能CD,无视冷却缩减属性,消耗体力,消耗 10024,Avatar_Ayaka_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,231,,,,,, 10031,Avatar_Qin_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,331,,,,,, 10032,,,15,,0,,,1,2,CircleLockEnemyR15H10HC,1,1,0.3,0,1,2,1,,,,2132,,,,,, -10033,Avatar_Qin_VortexSmash,,6,,0,,,1,2,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,1,,,,332,,,,,, +10033,Avatar_Qin_VortexSmash,,6,,20,,,1,2,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,1,,,,332,,,,,, 10034,Avatar_Qin_DandelionWind,,20,,0,7,80,1,5,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,339,,,,,, 10035,,,15,1,0,,,1,11,CircleLockEnemyR10,1,1,0.3,0,1,2,1,,,,0,,,,,, -10036,Avatar_Qin_EnterSkill,,30,,,,,1,0,CircleLockEnemyR10,1,1,0.3,0,,,,,,,0,,,,,, +10036,Avatar_Qin_EnterSkill,,30,,0,,,1,0,CircleLockEnemyR10,1,1,0.3,0,,,,,,,0,,,,,, 10037,Avatar_Player_FlyingBomber,,2,1,0,,,1,0,CircleLockEnemyAmborFly,1,1,0.3,0,1,2,1,,,,0,,,,,, 10038,,,1,1,0,,,1,11,CircleLockEnemyR10,1,1,0.3,0,1,2,1,,,,0,,,,,, 10041,Avatar_Ambor_PressShoot,1,0,,0,,,1,0,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,2131,,,,,, @@ -180,13 +180,13 @@ ID,Ability名称,是远程,技能CD,无视冷却缩减属性,消耗体力,消耗 10412,,,12,,0,,,1,2,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,4132,,,,,, 10413,,,0,,15,,,1,3,CircleLockEnemyR5H6HC,1,1,0.3,0,,1,1,,,,4133,,,1,,, 10415,,,15,,0,2,60,1,5,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,4139,,,,,, -10421,Avatar_Keqing_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,4231,,,,,, +10421,Avatar_Keqing_ExtraAttack,,0,,25,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,4231,,,,,, 10422,,,7.5,,0,,,1,2,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,4232,,,,,, 10423,,,0,,0,,,1,3,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,0,,,,,, 10425,,,12,,0,4,40,1,5,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,4239,,,,,, 10431,Avatar_Sucrose_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,4331,,,,,, 10432,,,15,,0,,,1,2,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,4332,,,,,, -10433,,,1,,5,,,1,12,CircleLockEnemy,1,1,0.3,0,1,,,,,,0,,,,,, +10433,,,1,,0,,,1,12,CircleLockEnemy,1,1,0.3,0,1,,,,,,0,,,,,, 10434,,,0,,0,,,1,0,CircleLockEnemy,1,1,0.3,0,1,,,,,,0,,,,,, 10435,,,20,,0,7,80,1,5,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,4339,,,,,, 10441,Avatar_Xinyan_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,4431,,,,,, @@ -244,7 +244,7 @@ ID,Ability名称,是远程,技能CD,无视冷却缩减属性,消耗体力,消耗 10582,,,4,,0,,,3,2,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,1,,,,5832,,,,,, 10583,,,4,,0,,,3,3,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,0,,,,,, 10585,,,22,,0,4,90,1,5,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,5839,,,,,, -10591,Avatar_Heizo_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,5931,,,,,, +10591,Avatar_Heizo_ExtraAttack,,0,,25,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,5931,,,,,, 10592,,,10,,0,,,1,2,CircleLockEnemyR8H6HC,1,1,0.3,0,1,,,,,,5932,,,,,, 10595,,,12,,0,7,40,1,5,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,5939,,,,,, 10602,,,13.5,,0,,,1,22,CircleLockEnemyR15H10HC,1,1,0.3,0,1,,,,,,1032,,,,,, @@ -270,7 +270,7 @@ ID,Ability名称,是远程,技能CD,无视冷却缩减属性,消耗体力,消耗 10655,,,15,,0,4,60,1,5,CircleLockEnemyR8H6HC,1,1,0.3,0,1,,,,,,6539,,,,,, 10656,Avatar_Shinobu_Constellation6_Limbo_Trigger,,60,1,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,1, 10657,Avatar_Shinobu_Constellation6_Limbo_Trigger,,60,1,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,0,,,,,1, -10661,Avatar_Ayato_ExtraAttack,,0,,6000,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,6631,,,,,, +10661,Avatar_Ayato_ExtraAttack,,0,,0,,,1,0,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,6631,,,,,, 10662,,,12,,0,,,1,2,CircleLockEnemyR8H6HC,1,1,0.3,0,1,,,,,,6632,,,,,, 10663,Avatar_Ayato_KendoPose_Click,,0,,0,,,1,0,CircleLockEnemyR10H6HC,1,1,0.3,0,1,,,,,,0,,,,,, 10665,,,20,,0,2,80,1,5,CircleLockEnemyR5H6HC,1,1,0.3,0,1,,,,,,6639,,,,,, diff --git a/gs/game/tick_manager.go b/gs/game/tick_manager.go index 7e747b2a..14d22223 100644 --- a/gs/game/tick_manager.go +++ b/gs/game/tick_manager.go @@ -250,8 +250,8 @@ func (t *TickManager) onTickSecond(now int64) { player.SafePos.Z = player.Pos.Z } } + // 刷怪 if !world.IsBigWorld() && world.owner.SceneLoadState == model.SceneEnterDone { - // 刷怪 scene := world.GetSceneById(3) monsterEntityCount := 0 for _, entity := range scene.entityMap { diff --git a/gs/game/user_stamina.go b/gs/game/user_stamina.go index c3590033..66d088e6 100644 --- a/gs/game/user_stamina.go +++ b/gs/game/user_stamina.go @@ -440,8 +440,8 @@ func (g *GameManager) DrownBackHandler(player *model.Player) { // 一直溺水回到距离最近的位置 ? // 溺水队伍扣血 // 队伍都没血了显示死亡界面 - // 技能耐力消耗配置表 - // 食物影响消耗的耐力 + // 角色技能影响重击耐力消耗 雷神开大后修改重击耐力为20 达达利亚 一斗 + // 食物影响消耗的耐力 还有 角色天赋也会影响 // 先传送玩家再设置角色存活否则同时设置会传送前显示角色实体 if player.StaminaInfo.DrownBackDelay > 20 && player.SceneLoadState == model.SceneEnterDone {