diff --git a/src/server/conf/activity/activity_cfg.go b/src/server/conf/activity/activity_cfg.go index 8ab34b62..b6edf150 100644 --- a/src/server/conf/activity/activity_cfg.go +++ b/src/server/conf/activity/activity_cfg.go @@ -107,3 +107,12 @@ func GetActivityTitle(ActId int) (string, string) { } return languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title")), languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title")) } + +func GetActivityRecycleMail(ActId int) (string, string, string) { + data, err := gamedata.GetDataByIntKey(CFG_ACTIVITY, ActId) + if err != nil { + log.Debug("GetActivityRecycleMail err:%v", err) + return "", "", "" + } + return gamedata.GetStringValue(data, "Title"), gamedata.GetStringValue(data, "Mail_Title"), gamedata.GetStringValue(data, "Mail_Content") +} diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index 97017f87..2595beca 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -576,6 +576,11 @@ func ReqGmCommand_(player *Player, Command string) error { BaseMod := player.PlayMod.getBaseMod() BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", "156", GoUtil.UniqueStringFromInt(int(BaseMod.Uid))) player.BackUserInfo() + case "debug": + player.AddPlayroomUpvote(100100129) + i := player.GetPlayroomUpvote(100100129) + log.Debug("debug upvote:%d", i) + default: return fmt.Errorf("Player %d ReqGmCommand:%v not found", player.M_DwUin, arg) } diff --git a/src/server/test/config_test.go b/src/server/test/config_test.go index 93579df5..6b03f3e5 100644 --- a/src/server/test/config_test.go +++ b/src/server/test/config_test.go @@ -2,8 +2,10 @@ package test import ( "fmt" - playroomCfg "server/conf/playroom" + activityCfg "server/conf/activity" + languageCfg "server/conf/language" userCfg "server/conf/user" + "server/msg" "testing" ) @@ -12,7 +14,11 @@ func Test(t *testing.T) { fmt.Println(i) } -func TestGetOrderItemByGrade(t *testing.T) { - itemId := playroomCfg.GetOrderItemByGrade(2) - fmt.Println(itemId) +func TestGetActivityRecycleMail(t *testing.T) { + title, mailTitle, mailContent := activityCfg.GetActivityRecycleMail(1) + fmt.Println("title:", title) + fmt.Println("mailTitle:", mailTitle) + fmt.Println("mailContent:", mailContent) + en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mailTitle) + fmt.Println("en:", en) }