mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 15:52:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
flswld
2023-03-03 15:26:32 +08:00
parent 353403606d
commit ea7a071d2a
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
gs/game/player_fight_sync.go
View File

@@ -422,17 +422,23 @@ func (g *GameManager) AoiPlayerMove(player *model.Player, oldPos *model.Vector,
if trigger.Event != constant.LUA_EVENT_ENTER_REGION {
continue
}
cond := CallLuaFunc(group.GetLuaState(), trigger.Condition,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{param1: region.ConfigId, targetEntityId: entityId})
if !cond {
continue
if trigger.Condition != "" {
cond := CallLuaFunc(group.GetLuaState(), trigger.Condition,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{param1: region.ConfigId, targetEntityId: entityId})
if !cond {
continue
}
}
ok := CallLuaFunc(group.GetLuaState(), trigger.Action,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{})
if !ok {
continue
logger.Debug("scene group trigger fire, trigger: %v, uid: %v", trigger, player.PlayerID)
if trigger.Action != "" {
logger.Debug("scene group trigger do action, trigger: %v, uid: %v", trigger, player.PlayerID)
ok := CallLuaFunc(group.GetLuaState(), trigger.Action,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{})
if !ok {
logger.Error("trigger action fail, trigger: %v, uid: %v", trigger, player.PlayerID)
}
}
updateQuest = g.TriggerFire(dbQuest, trigger)
}
@@ -442,17 +448,23 @@ func (g *GameManager) AoiPlayerMove(player *model.Player, oldPos *model.Vector,
if trigger.Event != constant.LUA_EVENT_LEAVE_REGION {
continue
}
cond := CallLuaFunc(group.GetLuaState(), trigger.Condition,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{param1: region.ConfigId, targetEntityId: entityId})
if !cond {
continue
if trigger.Condition != "" {
cond := CallLuaFunc(group.GetLuaState(), trigger.Condition,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{param1: region.ConfigId, targetEntityId: entityId})
if !cond {
continue
}
}
ok := CallLuaFunc(group.GetLuaState(), trigger.Action,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{})
if !ok {
continue
logger.Debug("scene group trigger fire, trigger: %v, uid: %v", trigger, player.PlayerID)
if trigger.Action != "" {
logger.Debug("scene group trigger do action, trigger: %v, uid: %v", trigger, player.PlayerID)
ok := CallLuaFunc(group.GetLuaState(), trigger.Action,
&LuaCtx{uid: player.PlayerID},
&LuaEvt{})
if !ok {
logger.Error("trigger action fail, trigger: %v, uid: %v", trigger, player.PlayerID)
}
}
}
}