``` feat(pet): 重构宠物繁殖系统，添加蛋孵化功能

modules/player/service/egg.go

@@ -0,0 +1,48 @@
+package service
+
+import (
+	"blazing/cool"
+	"blazing/modules/player/model"
+	"time"
+)
+
+type EggService struct {
+	BaseService
+}
+
+func NewEggService(id uint32) *EggService {
+	return &EggService{
+
+		BaseService: BaseService{userid: id,
+
+			Service: &cool.Service{Model: model.NewEgg()},
+		},
+	}
+
+}
+func (s *EggService) Get() (out *model.Egg) {
+
+	s.TestModel(s.Model).Scan(&out)
+
+	return
+
+}
+func (s *EggService) StartBreed(m, f *model.PetInfo) bool {
+
+	var tt *model.Egg
+	s.TestModel(s.Model).Scan(&tt)
+	if tt == nil {
+		tt = &model.Egg{}
+	}
+	if tt.Data.HatchState != 0 {
+		return false
+
+	}
+	tt.Data.StartTime = uint32(time.Now().Unix())
+	tt.Data.HatchState = 1
+	tt.Data.FeMalePetCatchTime = f.CatchTime
+	tt.Data.MalePetCatchTime = m.CatchTime
+	tt.Data.FeMalePetID = f.ID
+	tt.Data.MalePetID = m.ID
+	return true
+}

modules/player/service/info.go

@@ -53,17 +53,11 @@ func (s *InfoService) Reg(nick string, color uint32) {
 	//go s.InitTask()
 }
 
-func (s *InfoService) Person(userid uint32) *model.PlayerInfo {
+func (s *InfoService) Person(userid uint32) (out *model.PlayerEX) {
 
-	m := cool.DBM(s.Model).Where("player_id", userid)
-	var tt model.PlayerEX
-	err := m.Scan(&tt)
-	if err != nil {
-		return nil
-	}
+	cool.DBM(s.Model).Where("player_id", userid).Scan(&out)
 
-	ret := tt.Data
-	return &ret
+	return
 
 }
 func (s *InfoService) GetCache() *model.PlayerInfo {

modules/player/service/pet.go

@@ -116,7 +116,7 @@ RETURNING max_ts;
 `, service.NewBaseSysUserService().Model.TableName())
 
 	// 执行 Raw SQL 并扫描返回值
-	ret, err := cool.DBM(service.NewBaseSysUserService().Model).Raw(sql, s.userid).All()
+	ret, _ := cool.DBM(service.NewBaseSysUserService().Model).Raw(sql, s.userid).All()
 	//fmt.Println(ret, err)
 	y.CatchTime = ret.Array()[0].Uint32()
 	m1 := cool.DBM(s.Model).Where("player_id", s.userid)
@@ -127,7 +127,7 @@ RETURNING max_ts;
 	player.Free = 0
 	player.IsVip = cool.Config.ServerInfo.IsVip
 
-	_, err = m1.Insert(player)
+	_, err := m1.Insert(player)
 	if err != nil {
 		panic(err)
 	}

modules/player/service/user.go

@@ -22,6 +22,7 @@ type UserService struct {
 	Title  *TitleService
 	Cdk    *CdkService
 	Friend *FriendService
+	Egg    *EggService
 }
 
 func NewUserService(id uint32) *UserService {
@@ -38,6 +39,7 @@ func NewUserService(id uint32) *UserService {
 		Title:  NewTitleService(id),
 		Cdk:    NewCdkService(id),
 		Friend: NewFriendService(id),
+		Egg:    NewEggService(id),
 	}
 
 }