增加GM

src/server/conf/avatar/AvatarCfg.go

@@ -40,3 +40,17 @@ func CheckExist(Id int) bool {
 	_, ok := data[strconv.Itoa(Id)]
 	return ok
 }
+
+func GetAllId() []int {
+	data, err := gamedata.GetData(CFG_AVATAR)
+	if err != nil {
+		log.Debug("GetAllId err: %v", err)
+		return nil
+	}
+	r := make([]int, 0)
+	for k := range data {
+		Id, _ := strconv.Atoi(k)
+		r = append(r, Id)
+	}
+	return r
+}

src/server/conf/face/FaceCfg.go

@@ -40,3 +40,17 @@ func CheckExist(Id int) bool {
 	_, ok := data[strconv.Itoa(Id)]
 	return ok
 }
+
+func GetAllId() []int {
+	data, err := gamedata.GetData(CFG_FACE)
+	if err != nil {
+		log.Debug("GetAllId err: %v", err)
+		return nil
+	}
+	r := make([]int, 0)
+	for k := range data {
+		Id, _ := strconv.Atoi(k)
+		r = append(r, Id)
+	}
+	return r
+}

src/server/game/Gm.go

@@ -6,14 +6,18 @@ import (
 	"os"
 	"server/GoUtil"
 	"server/conf"
+	avatarCfg "server/conf/avatar"
 	cardCfg "server/conf/card"
 	chargeCfg "server/conf/charge"
 	emojiCfg "server/conf/emoji"
+	faceCfg "server/conf/face"
 	mergeDataCfg "server/conf/mergeData"
 	playroomCfg "server/conf/playroom"
 	"server/db"
+	"server/game/mod/avatar"
 	"server/game/mod/card"
 	"server/game/mod/emoji"
+	"server/game/mod/face"
 	"server/game/mod/friend"
 	"server/game/mod/item"
 	MsgMod "server/game/mod/msg"
@@ -114,6 +118,27 @@ func ReqGmCommand_(player *Player, Command string) error {
 			"PayTime":           GoUtil.Now(),
 		})
 		Charge(player, ChargeId)
+	case "AllFace":
+		Now := GoUtil.Now()
+		FaceMod := player.PlayMod.getFaceMod()
+		FaceList := faceCfg.GetAllId()
+		FaceMod.List = nil
+		for _, v := range FaceList {
+			FaceMod.List[v] = &face.Face{
+				AddTime: Now,
+			}
+		}
+
+		AvatarMod := player.PlayMod.getAvatarMod()
+		AvatarMod.List = nil
+		AvatarList := avatarCfg.GetAllId()
+
+		for _, v := range AvatarList {
+			AvatarMod.List[v] = &avatar.Avatar{
+				AddTime: Now,
+			}
+		}
+		BackUserInfo(player)
 	case "resetFace":
 		FaceMod := player.PlayMod.getFaceMod()
 		FaceMod.List = nil