1

modules/player/service/cdk_log.go

@@ -12,14 +12,14 @@ type CdkService struct {
 }
 
 func (s *CdkService) CanGet(id uint32) bool {
-	m1, _ := s.TestModel(s.Model).Where("code_id", id).Exist()
+	m1, _ := s.dbm(s.Model).Where("code_id", id).Exist()
 
 	return !m1
 
 }
 
 func (s *CdkService) Log(id uint32) {
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 	data := g.Map{
 		"player_id": s.userid,
 		"code_id":   id,

modules/player/service/done.go

@@ -50,13 +50,13 @@ func (s *DoneService) UpdatePet(ptye model.PetInfo, res ...uint32) {
 func (s *DoneService) update(ptye model.EnumMilestone, args []uint32, results []uint32) {
 
 	if cool.Config.ServerInfo.IsVip != 0 {
-	 
+
 		return
 	}
 	ar := gconv.String(args)
-	if t, _ := s.PModel(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, ar).
+	if t, _ := s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, ar).
 		Wheref(`jsonb_typeof(args) = ?`, "array").Exist(); t {
-		s.PModel(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, ar).
+		s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, ar).
 			Wheref(`jsonb_typeof(args) = ?`, "array").Data(
 			g.Map{
 				"results": results,
@@ -72,14 +72,14 @@ func (s *DoneService) update(ptye model.EnumMilestone, args []uint32, results []
 			"results":   results,
 		}
 
-		s.PModel(s.Model).Data(r).Insert()
+		s.dbm_fix(s.Model).Data(r).Insert()
 	}
 
 }
 
 func (s *DoneService) get(ptye model.EnumMilestone, args []uint32) *model.Milestone {
 	var Barges *model.Milestone
-	s.PModel(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, args).
+	s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, args).
 		Wheref(`jsonb_typeof(args) = ?`, "array").Scan(&Barges)
 	return Barges
 
@@ -88,7 +88,7 @@ func (s *DoneService) get(ptye model.EnumMilestone, args []uint32) *model.Milest
 func (s *DoneService) PetBarge(start, end uint32) []model.Milestone {
 	var Barges []model.Milestone
 
-	s.PModel(s.Model).Where("done_type", model.MilestoneMode.Pet).
+	s.dbm_fix(s.Model).Where("done_type", model.MilestoneMode.Pet).
 		Wheref(`jsonb_typeof(args) = ?`, "array").
 		Wheref(`jsonb_typeof(args) != ?`, "'[]'::jsonb").
 		Wheref(`(args->> 0)::int BETWEEN ? AND ?`, start, end).

modules/player/service/egg.go

@@ -26,7 +26,7 @@ func NewEggService(id uint32) *EggService {
 }
 func (s *EggService) Get() (out *model.Egg) {
 
-	s.TestModel(s.Model).Scan(&out)
+	s.dbm_fix(s.Model).Scan(&out)
 	if out != nil {
 		BreedLeftTime := int64(out.Data.StartTime+out.CurEgg.EggID*uint32(time.Hour/1000000000)) - (time.Now().Unix())
 		if cool.Config.ServerInfo.IsVip != 0 {
@@ -38,7 +38,7 @@ func (s *EggService) Get() (out *model.Egg) {
 		} else {
 			out.Data.HatchLeftTime = uint32(BreedLeftTime)
 		}
-		s.TestModel(s.Model).Save(out)
+		s.dbm(s.Model).Save(out)
 	}
 
 	return
@@ -58,7 +58,7 @@ func (s *EggService) StartBreed(m, f *model.PetInfo) bool {
 		return false
 	}
 	var tt *model.Egg
-	s.TestModel(s.Model).Scan(&tt)
+	s.dbm(s.Model).Scan(&tt)
 	if tt == nil {
 		tt = &model.Egg{}
 		tt.IsVip = cool.Config.ServerInfo.IsVip
@@ -83,13 +83,13 @@ func (s *EggService) StartBreed(m, f *model.PetInfo) bool {
 	//tt.CurEgg = cureff
 	tt.EggList = append(tt.EggList, cureff)
 
-	s.TestModel(s.Model).Save(tt)
+	s.dbm(s.Model).Save(tt)
 	return true
 }
 func (s *EggService) StartEgg(owner, eggc uint32) bool {
 
 	var tt *model.Egg
-	s.TestModel(s.Model).Scan(&tt)
+	s.dbm(s.Model).Scan(&tt)
 	if tt == nil {
 		return false
 	}
@@ -119,14 +119,14 @@ func (s *EggService) StartEgg(owner, eggc uint32) bool {
 	tt.CurEgg = *v
 
 	tt.Data.Intimacy = 1
-	s.TestModel(s.Model).Save(tt)
+	s.dbm(s.Model).Save(tt)
 	return true
 
 }
 func (s *EggService) EffectHatch() uint32 {
 
 	var tt *model.Egg
-	s.TestModel(s.Model).Scan(&tt)
+	s.dbm(s.Model).Scan(&tt)
 	if tt == nil {
 		return 1
 	}
@@ -138,13 +138,13 @@ func (s *EggService) EffectHatch() uint32 {
 	if tt.Data.Intimacy > 5 {
 		tt.Data.Intimacy = 5
 	}
-	s.TestModel(s.Model).Save(tt)
+	s.dbm(s.Model).Save(tt)
 	return tt.Data.Intimacy
 }
 func (s *EggService) GetEgg() *model.PetInfo {
 
 	var tt *model.Egg
-	s.TestModel(s.Model).Scan(&tt)
+	s.dbm(s.Model).Scan(&tt)
 	if tt == nil {
 		return nil
 	}
@@ -176,7 +176,7 @@ func (s *EggService) GetEgg() *model.PetInfo {
 	tt.Data.HatchState = 0
 	p.Generation = uint16(tt.CurEgg.EggID) + 1
 	tt.CurEgg = model.EggInfo{}
-	s.TestModel(s.Model).Save(tt)
+	s.dbm(s.Model).Save(tt)
 
 	return p
 }

modules/player/service/friend.go

@@ -14,7 +14,7 @@ type FriendService struct {
 }
 
 func (s *FriendService) Get() ([]uint32, []uint32) {
-	m1 := s.TestModel(s.Model)
+	m1 := s.dbm(s.Model)
 
 	var talks *model.Friend
 
@@ -26,10 +26,10 @@ func (s *FriendService) Get() ([]uint32, []uint32) {
 }
 
 func (s *FriendService) Add(id uint32) bool {
-	m1, _ := s.TestModel(s.Model).Exist()
+	m1, _ := s.dbm(s.Model).Exist()
 
 	if !m1 {
-		m := s.TestModel(s.Model)
+		m := s.dbm(s.Model)
 		data := g.Map{
 			"player_id": s.userid,
 			"friend":    []uint32{},
@@ -40,7 +40,7 @@ func (s *FriendService) Add(id uint32) bool {
 		m.Data(data).Insert()
 		return true
 	}
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	m.Data(g.Map{
 		"friend": gdb.Raw(fmt.Sprintf("friend|| '%d'::jsonb", id)),
@@ -50,7 +50,7 @@ func (s *FriendService) Add(id uint32) bool {
 }
 func (s *FriendService) Del(id uint32) bool {
 
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	m.Data(g.Map{
 		"friend": gdb.Raw(fmt.Sprintf("jsonb_array_remove(friend, '%d'::jsonb)", id)),

modules/player/service/info.go

@@ -19,7 +19,7 @@ import (
 
 func (s *InfoService) IsReg() bool {
 
-	m := s.PModel(s.Model)
+	m := s.dbm_fix(s.Model)
 
 	record, _ := m.Exist()
 
@@ -31,9 +31,8 @@ func (s *InfoService) IsReg() bool {
 // 实现注册,id+昵称+颜色
 func (s *InfoService) Reg(nick string, color uint32) *model.PlayerInfo {
 
-	m := cool.DBM(s.Model).Where("player_id", s.userid)
 	var tt *model.Player
-	m.Scan(&tt)
+	s.dbm_fix(s.Model).Scan(&tt)
 	if tt == nil {
 		t := model.NewPlayer()
 		t.PlayerID = uint64(s.userid)
@@ -58,7 +57,7 @@ func (s *InfoService) Reg(nick string, color uint32) *model.PlayerInfo {
 
 func (s *InfoService) Person(userid uint32) (out *model.Player) {
 
-	cool.DBM(s.Model).Where("player_id", userid).Scan(&out)
+	s.dbm_fix(s.Model).Scan(&out)
 
 	return
 
@@ -66,9 +65,8 @@ func (s *InfoService) Person(userid uint32) (out *model.Player) {
 
 func (s *InfoService) SetLogin() *model.PlayerInfo {
 
-	m := cool.DBM(s.Model).Where("player_id", s.userid)
 	var tt *model.Player
-	m.Scan(&tt)
+	s.dbm_fix(s.Model).Scan(&tt)
 	if tt == nil {
 		return nil
 	}
@@ -110,7 +108,7 @@ func (s *InfoService) SetLogin() *model.PlayerInfo {
 		//每天login时候检查重置时间，然后把电池，任务，挖矿重置
 		//挖矿需要单独存，因为防止多开挖矿
 		tt.Data.TimeToday = 0 //重置电池
-		tt.Data.FightTime = 60*60*2//重置战斗次数
+		//tt.Data.FightTime = 60 * 60 * 2 //重置战斗次数
 
 		for _, v := range service.NewTaskService().GetDaily() {
 
@@ -123,7 +121,7 @@ func (s *InfoService) SetLogin() *model.PlayerInfo {
 
 		}
 		//defer t.Service.Talk_Reset()
-		_, err := m.Save(tt)
+		_, err := s.dbm_fix(s.Model).Save(tt)
 		if err != nil {
 			panic(err)
 		}
@@ -183,7 +181,7 @@ func (s *InfoService) Save(data model.PlayerInfo) {
 
 		return
 	}
-	m := s.PModel(s.Model)
+	m := s.dbm_fix(s.Model)
 	var tt *model.Player
 	m.Scan(&tt)
 	if tt == nil {

modules/player/service/item.go

@@ -11,7 +11,7 @@ import (
 func (s *ItemService) Exist(itemid uint32) bool {
 
 	var ttt *model.Item
-	s.TestModel(s.Model).Where("item_id", itemid).Scan(&ttt)
+	s.dbm(s.Model).Where("item_id", itemid).Scan(&ttt)
 
 	return ttt != nil
 
@@ -19,7 +19,7 @@ func (s *ItemService) Exist(itemid uint32) bool {
 func (s *ItemService) Get(min, max uint32) []model.Item {
 
 	var ttt []model.Item
-	s.TestModel(s.Model).Where(g.Map{
+	s.dbm(s.Model).Where(g.Map{
 		"item_id <=": max,
 		"item_id >=": min,
 	}).Scan(&ttt)
@@ -32,15 +32,15 @@ func (s *ItemService) UPDATE(id uint32, count int) {
 
 		return
 	}
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	if t, _ := m.Where("item_id", id).Exist(); t {
-		_, err := s.TestModel(s.Model).Where("item_id", id).Increment("item_cnt", count)
+		_, err := s.dbm(s.Model).Where("item_id", id).Increment("item_cnt", count)
 		if err != nil {
 			panic(err)
 		}
 	} else {
-		m := s.TestModel(s.Model)
+		m := s.dbm(s.Model)
 		data := g.Map{
 			"player_id": s.userid,
 			"item_id":   id,
@@ -55,7 +55,7 @@ func (s *ItemService) UPDATE(id uint32, count int) {
 
 func (s *ItemService) CheakItem(id uint32) int64 {
 	var ttt model.Item
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	m.Where("item_id", id).Scan(&ttt)
 	return ttt.ItemCnt

modules/player/service/pet.go

@@ -11,7 +11,7 @@ import (
 // 获取精灵信息   0是仓库,1是放生
 func (s *PetService) PetInfo(flag int) []model.Pet {
 	var tt []model.Pet
-	err := s.TestModel(s.Model).Where("free", flag).Scan(&tt)
+	err := s.dbm(s.Model).Where("free", flag).Scan(&tt)
 	if err != nil {
 		return []model.Pet{}
 	}
@@ -26,7 +26,7 @@ func (s *PetService) PetInfo(flag int) []model.Pet {
 }
 func (s *PetService) PetCount(flag int) int {
 
-	ret, err := s.TestModel(s.Model).Where("player_id", s.userid).Where("free", flag).Count()
+	ret, err := s.dbm(s.Model).Where("free", flag).Count()
 
 	if err != nil {
 		return 0
@@ -38,7 +38,7 @@ func (s *PetService) PetCount(flag int) int {
 
 func (s *PetService) UPdateFree(ctime uint32, free uint32) {
 
-	s.TestModel(s.Model).Where("player_id", s.userid).Where("catch_time", ctime).Data(
+	s.dbm(s.Model).Where("catch_time", ctime).Data(
 
 		"free", free,
 	).Update()
@@ -46,7 +46,7 @@ func (s *PetService) UPdateFree(ctime uint32, free uint32) {
 }
 func (s *PetService) UPdate(t model.PetInfo) {
 
-	m := s.TestModel(s.Model).Where("player_id", s.userid).Where("catch_time", t.CatchTime)
+	m := s.dbm(s.Model).Where("catch_time", t.CatchTime)
 	var tt *model.Pet
 	m.Scan(&tt)
 	if tt == nil {
@@ -60,7 +60,7 @@ func (s *PetService) UPdate(t model.PetInfo) {
 }
 func (s *PetService) PetInfo_One(cachetime uint32) *model.Pet {
 
-	m := s.TestModel(s.Model).Where("player_id", s.userid).Where("catch_time", cachetime)
+	m := s.dbm(s.Model).Where("catch_time", cachetime)
 	var tt *model.Pet
 
 	m.Scan(&tt)
@@ -73,7 +73,7 @@ func (s *PetService) PetInfo_One(cachetime uint32) *model.Pet {
 }
 func (s *PetService) PetInfo_One_ohter(userid, cachetime uint32) model.Pet {
 
-	m := s.TestModel(s.Model).Where("player_id", userid).Where("catch_time", cachetime)
+	m := s.dbm(s.Model).Where("catch_time", cachetime)
 	var tt model.Pet
 
 	m.Scan(&tt)
@@ -82,7 +82,7 @@ func (s *PetService) PetInfo_One_ohter(userid, cachetime uint32) model.Pet {
 }
 func (s *PetService) PetInfo_One_Unscoped(cachetime uint32) *model.Pet {
 
-	m := s.TestModel(s.Model).Where("player_id", s.userid).Where("catch_time", cachetime).Unscoped()
+	m := s.dbm(s.Model).Where("catch_time", cachetime).Unscoped()
 	var tt *model.Pet
 
 	m.Scan(&tt)
@@ -95,13 +95,14 @@ func (s *PetService) PetInfo_One_Unscoped(cachetime uint32) *model.Pet {
 }
 func (s *PetService) Pet_del(cachetime uint32) {
 
-	s.TestModel(s.Model).Where("player_id", s.userid).Where("catch_time", cachetime).Delete()
+	s.dbm(s.Model).Where("catch_time", cachetime).Delete()
 
 }
-func (s *PetService) Pet_LEVEL_all()[]model.Pet {
+func (s *PetService) Pet_LEVEL_all() []model.Pet {
 	var tt []model.Pet
-	s.TestModel(s.Model).Wheref(`(pp.data->>'Level')::INT > 100`, "array").Scan(&tt)
-return tt
+
+	s.dbm(s.Model).Fields().Wheref(`(pp.data->>'Level')::INT > 100`, "array").OrderDesc("(pp.data->>'Level')::INT").Scan(&tt)
+	return tt
 }
 
 // 精灵真正添加后的捕捉时间才是真正的时间

modules/player/service/room.go

@@ -10,9 +10,7 @@ func (s *RoomService) Get(userid uint32) model.BaseHouseEx {
 
 	//todo待测试
 	var ttt model.BaseHouseEx
-	m := s.TestModel(s.Model)
-
-	m.Where("player_id", userid).Scan(&ttt)
+	s.dbm(s.Model).Scan(&ttt)
 
 	return ttt
 
@@ -25,7 +23,7 @@ func (s *RoomService) Set(id []model.FitmentShowInfo) {
 		return
 	}
 	var ttt model.BaseHouseEx
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	m.Scan(&ttt)
 	ttt.PlacedItems = id
@@ -48,7 +46,7 @@ func (s *RoomService) Show(cactime []uint32) {
 
 	//todo待测试
 	var ttt model.BaseHouseEx
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	m.Scan(&ttt)
 	ttt.ShowPokemon = cactime

modules/player/service/talk.go

@@ -25,7 +25,7 @@ func NewTalkService(id uint32) *TalkService {
 
 func (s *TalkService) Cheak(mapid uint32, flag int) (int, bool) {
 
-	m1 := s.PModel(s.Model)
+	m1 := s.dbm(s.Model)
 
 	var talks *model.Talk
 	m1.Where("talk_id", flag).Scan(&talks)
@@ -53,17 +53,17 @@ func (s *TalkService) Cheak(mapid uint32, flag int) (int, bool) {
 }
 func (s *TalkService) Update(flag int) {
 	if cool.Config.ServerInfo.IsVip != 0 {
-		 
+
 		return
 	}
-	m := s.PModel(s.Model).Where("talk_id", flag)
+	m := s.dbm(s.Model).Where("talk_id", flag)
 	if condition, _ := m.Exist(); !condition {
 		talks := model.NewTalk()
 		talks.PlayerID = uint64(s.userid)
 		talks.TalkID = uint32(flag)
-		s.PModel(s.Model).Data(talks).FieldsEx("id").Insert()
+		s.dbm(s.Model).Data(talks).FieldsEx("id").Insert()
 	}
 
-	s.PModel(s.Model).Where("talk_id", flag).Increment("count", 1)
+	s.dbm(s.Model).Where("talk_id", flag).Increment("count", 1)
 
 }

modules/player/service/task.go

@@ -12,7 +12,7 @@ import (
 func (s *TaskService) Exec(id uint32, t func(*model.TaskEX) bool) {
 	var gg model.TaskEX
 
-	m1 := s.PModel(s.Model).Where("task_id", id)
+	m1 := s.dbm(s.Model).Where("task_id", id)
 	m1.Scan(&gg)
 	tre := t(&gg)
 

modules/player/service/title.go

@@ -14,7 +14,7 @@ type TitleService struct {
 }
 
 func (s *TitleService) Get() []uint32 {
-	m1 := s.TestModel(s.Model)
+	m1 := s.dbm(s.Model)
 
 	var talks *model.Title
 
@@ -26,7 +26,7 @@ func (s *TitleService) Get() []uint32 {
 }
 
 func (s *TitleService) Can(id uint32) bool {
-	m1 := s.TestModel(s.Model)
+	m1 := s.dbm(s.Model)
 
 	ok, _ := m1.Wheref(`available_title @> ?::jsonb`, id).Exist()
 
@@ -34,10 +34,10 @@ func (s *TitleService) Can(id uint32) bool {
 }
 
 func (s *TitleService) Give(id uint32) bool {
-	m1, _ := s.TestModel(s.Model).Exist()
+	m1, _ := s.dbm(s.Model).Exist()
 
 	if !m1 {
-		m := s.TestModel(s.Model)
+		m := s.dbm(s.Model)
 		data := g.Map{
 			"player_id":       s.userid,
 			"available_title": []uint32{id},
@@ -47,7 +47,7 @@ func (s *TitleService) Give(id uint32) bool {
 		m.Data(data).Insert()
 		return true
 	}
-	m := s.TestModel(s.Model)
+	m := s.dbm(s.Model)
 
 	m.Data(g.Map{
 		"available_title": gdb.Raw(fmt.Sprintf("available_title|| '%d'::jsonb", id)),

modules/player/service/user.go

@@ -11,17 +11,17 @@ type BaseService struct {
 	*cool.Service
 }
 type UserService struct {
-	Talk   *TalkService //挖矿
-	Task   *TaskService //任务
-	Info   *InfoService //信息
-	Pet    *PetService  //精灵
-	Item   *ItemService //物品
-	Done   *DoneService //完成
-	Room   *RoomService
-	Title  *TitleService
-	Cdk    *CdkService
-	Friend *FriendService
-	Egg    *EggService
+	Talk   *TalkService   //挖矿
+	Task   *TaskService   //任务
+	Info   *InfoService   //信息
+	Pet    *PetService    //精灵
+	Item   *ItemService   //物品
+	Done   *DoneService   //完成
+	Room   *RoomService   //基地
+	Title  *TitleService  //标题
+	Cdk    *CdkService    //cdk
+	Friend *FriendService //好友
+	Egg    *EggService    //孵化
 }
 
 func NewUserService(id uint32) *UserService {
@@ -43,7 +43,7 @@ func NewUserService(id uint32) *UserService {
 
 }
 
-func (s *BaseService) TestModel(m cool.IModel) *gdb.Model {
+func (s *BaseService) dbm(m cool.IModel) *gdb.Model {
 	m1 := cool.DBM(m)
 	if s.userid != 0 {
 		m1.Where("player_id", s.userid)
@@ -53,7 +53,7 @@ func (s *BaseService) TestModel(m cool.IModel) *gdb.Model {
 	return m1
 
 }
-func (s *BaseService) PModel(m cool.IModel) *gdb.Model {
+func (s *BaseService) dbm_fix(m cool.IModel) *gdb.Model {
 	m1 := cool.DBM(m)
 	if s.userid != 0 {
 		m1.Where("player_id", s.userid)