diff --git a/src/server/game/friend_mgr.go b/src/server/game/friend_mgr.go index 912a1992..2a388208 100644 --- a/src/server/game/friend_mgr.go +++ b/src/server/game/friend_mgr.go @@ -97,7 +97,7 @@ func (f *FriendMgr) ZeroUpdate(m *msg.Msg) (interface{}, error) { Now := GoUtil.Now() for k, v := range f.getData().List { for j, msg := range v { - if msg.End < Now-7*24*3600 { + if msg.End < Now-sevendays { f.getData().List[k] = append(f.getData().List[k][:j], f.getData().List[k][j+1:]...) } } diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index eee47408..b67d30d1 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -81,6 +81,7 @@ const ( const ( secondsIn35Days = 35 * 24 * 3600 secondsIn7Days = 7 * 24 * 3600 + secondsIn1Day = 24 * 3600 ) func (c *ChargeMod) InitData() { @@ -272,11 +273,11 @@ func (c *ChargeMod) FireAdReward(ChargeId int) []*item.Item { if PetWorkDay != 0 { Now := GoUtil.Now() if c.AdEndTime < Now { - c.AdEndTime = Now + int64(PetWorkDay*24*3600) + c.AdEndTime = Now + int64(PetWorkDay*secondsIn1Day) } else { - c.AdEndTime += int64(PetWorkDay * 24 * 3600) + c.AdEndTime += int64(PetWorkDay * secondsIn1Day) } - c.PetWorkTime += int64(PetWorkDay * 24 * 3600) + c.PetWorkTime += int64(PetWorkDay * secondsIn1Day) c.Ad = true } return Items diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index 945823f8..d131d678 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -1956,7 +1956,7 @@ func ReqAgreeFriend(player *Player, buf []byte) error { } // 新好友才可以打招呼 if !FriendMod.CheckAddBefore(Uid) { - FriendMod.AddReplyInfo(Uid, friend.REPLY_TYPE_GREETING, "", GoUtil.Now()+24*3600, nil) + FriendMod.AddReplyInfo(Uid, friend.REPLY_TYPE_GREETING, "", GoUtil.Now()+oneday, nil) } FriendMod.AddFriend(Uid) player.PushClientRes(&msg.ResAgreeFriend{ @@ -5070,8 +5070,8 @@ func ReqAddNpc(player *Player, buf []byte) error { player.TeLog("add_npc", map[string]interface{}{ "NpcId": int(req.NpcId), }) - FriendMod.AddReplyInfo(int(req.NpcId), friend.REPLY_TYPE_GREETING, "", GoUtil.Now()+24*3600, nil) - FriendMod.AddReplyInfo(int(req.NpcId), friend.REPLY_TYPE_GREETING_Get, "", GoUtil.Now()+24*3600, nil) + FriendMod.AddReplyInfo(int(req.NpcId), friend.REPLY_TYPE_GREETING, "", GoUtil.Now()+oneday, nil) + FriendMod.AddReplyInfo(int(req.NpcId), friend.REPLY_TYPE_GREETING_Get, "", GoUtil.Now()+oneday, nil) player.AddLog(int(req.NpcId), friend.LOG_TYPE_FRIEND_BECOME_NPC, GoUtil.String(req.NpcId), GoUtil.Now()) player.PushClientRes(&msg.ResAddNpc{ Code: msg.RES_CODE_SUCCESS,