diff --git a/src/server/conf/emoji/emojiCfg.go b/src/server/conf/emoji/emojiCfg.go
index 6a7d75fa..f61b092a 100644
--- a/src/server/conf/emoji/emojiCfg.go
+++ b/src/server/conf/emoji/emojiCfg.go
@@ -27,3 +27,15 @@ func GetInitList() []int {
 	}
 	return ret
 }
+
+func GetAllList() []int {
+	data, err := gamedata.GetData(CFG_EMOJI)
+	if err != nil {
+		return nil
+	}
+	ret := make([]int, 0)
+	for k := range data {
+		ret = append(ret, GoUtil.Int(k))
+	}
+	return ret
+}
diff --git a/src/server/game/Gm.go b/src/server/game/Gm.go
index 749f0fe7..396eaa4d 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/Gm.go
@@ -121,6 +121,15 @@ func ReqGmCommand_(player *Player, Command string) error {
 				AddTime: now,
 			}
 		}
+	case "addEmoji":
+		EmojiMod := player.PlayMod.getEmojiMod()
+		InitId := emojiCfg.GetAllList()
+		now := GoUtil.Now()
+		for _, v := range InitId {
+			EmojiMod.List[v] = &emoji.Emoji{
+				AddTime: now,
+			}
+		}
 	case "createOrder":
 		Lv := player.GetPlayerBaseMod().GetLevel()
 		EmitList := player.PlayMod.getChessMod().GetEmitList()