fix: 修复登录空指针及战斗效果

modules/base/service/base_sys_log.go

@@ -109,11 +109,11 @@ func (s *BaseSysLogService) Record(ctx g.Ctx) {
 		"params": baseSysLog.Params,
 	})
 }
-func (s *BaseSysLogService) RecordFight(userid uint32, desc string) {
+func (s *BaseSysLogService) RecordLog(userid uint32, desc string) {
 
 	baseSysLog := model.NewBaseSysLog()
 	baseSysLog.UserID = uint(userid)
-	baseSysLog.Action = "fight"
+	baseSysLog.Action = "panic"
 
 	baseSysLog.Params = desc
 	m := cool.DBM(s.Model)

modules/config/service/pet_fusion_service.go

@@ -58,8 +58,6 @@ func (s *PetFusionService) Data(p1, p2, rand uint32) uint32 {
 		return 0
 	}
 
-	return 0
-
 }
 func (s *PetFusionService) getData(p1, p2 uint32) []model.PetFusion {
 

modules/player/service/egg.go

@@ -156,7 +156,7 @@ func (s *EggService) GetEgg() *model.PetInfo {
 		return nil
 
 	}
-	mpets, isshiny := service.NewEggService().GetResult(tt.CurEgg.MalePetID, tt.CurEgg.FeMalePetID,tt.CurEgg.EggID+tt.Data.Intimacy)
+	mpets, isshiny := service.NewEggService().GetResult(tt.CurEgg.MalePetID, tt.CurEgg.FeMalePetID, tt.CurEgg.EggID)
 	if mpets == 0 {
 		return nil
 	}