server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save

Browse Source
This commit is contained in:
殷勇 2023-08-17 14:36:58 +08:00
parent ea732fd78d
commit 65d12328be
4 changed files with 75 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
database/frienddb.sql
View File

@ -43,9 +43,6 @@ CREATE TABLE `t_guild` (
`name` varchar(48) NOT NULL, `name` varchar(48) NOT NULL,
`leader_account_id` varchar(60) NOT NULL, `leader_account_id` varchar(60) NOT NULL,
`max_members` int(11) DEFAULT '0', `max_members` int(11) DEFAULT '0',
`level` int(11) DEFAULT '0',
`exp` int(11) DEFAULT '0',
`badge` int(11) DEFAULT '0',
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
PRIMARY KEY (`idx`), PRIMARY KEY (`idx`),
@ -56,6 +53,7 @@ drop table if exists t_guild_members;
CREATE TABLE `t_guild_members` ( CREATE TABLE `t_guild_members` (
`guild_id` bigint(20) NOT NULL, `guild_id` bigint(20) NOT NULL,
`account_id` varchar(60) COLLATE utf8_bin NOT NULL, `account_id` varchar(60) COLLATE utf8_bin NOT NULL,
`level` tinyint DEFAULT '0' COMMENT '成员阶级1会长,2干部,3群众',
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
PRIMARY KEY (`guild_id`,`account_id`), PRIMARY KEY (`guild_id`,`account_id`),
@ -68,16 +66,15 @@ CREATE TABLE `t_guild_logs` (
`idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
`guild_id` bigint(20) NOT NULL, `guild_id` bigint(20) NOT NULL,
`account_id` varchar(60) COLLATE utf8_bin NOT NULL, `account_id` varchar(60) COLLATE utf8_bin NOT NULL,
`log_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '日志类型', `log_type` tinyint NOT NULL DEFAULT '0' COMMENT '日志类型',
`content` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '日志内容', `content` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '日志内容',
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
PRIMARY KEY (`idx`), PRIMARY KEY (`idx`),
KEY `guild_name` (`guild_id`,`account_id`,`log_type`), KEY `guild_name` (`guild_id`,`account_id`, log_type),
KEY `createtime` (`createtime`) KEY `createtime` (`createtime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会日志表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会日志表';
drop table if exists `t_guild_pending_request`; drop table if exists `t_guild_pending_request`;
CREATE TABLE `t_guild_pending_request` ( CREATE TABLE `t_guild_pending_request` (
`guild_id` bigint(20) NOT NULL, `guild_id` bigint(20) NOT NULL,
@ -87,4 +84,4 @@ CREATE TABLE `t_guild_pending_request` (
PRIMARY KEY (`guild_id`,`account_id`), PRIMARY KEY (`guild_id`,`account_id`),
KEY `account_id` (`account_id`), KEY `account_id` (`account_id`),
KEY `createtime` (`createtime`) KEY `createtime` (`createtime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会请求申请表' ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会申请表'

38
server/imserver/guild.go
View File

@ -9,7 +9,7 @@ type GuildMember struct {
} }
type Guild struct { type Guild struct {
ID string ID int
Name string Name string
LeaderID string LeaderID string
Members []GuildMember Members []GuildMember
@ -48,39 +48,3 @@ func (g *Guild) RemoveMember(accountId string) error {
g.Members = append(g.Members[:index], g.Members[index+1:]...) g.Members = append(g.Members[:index], g.Members[index+1:]...)
return nil return nil
} }
// PromoteMember 提升成员为干部
func (g *Guild) PromoteMember(accountId string) error {
if accountId == g.LeaderID {
return errors.New("cannot promote leader")
}
index := g.findMemberIndex(accountId)
if index == -1 {
return errors.New("member not found")
}
g.Members[index].Level = 2
return nil
}
// DemoteMember 解除成员干部身份
func (g *Guild) DemoteMember(accountId string) error {
if accountId == g.LeaderID {
return errors.New("cannot demote leader")
}
index := g.findMemberIndex(accountId)
if index == -1 {
return errors.New("member not found")
}
g.Members[index].Level = 3
return nil
}
// Disband 解散公会
func (g *Guild) Disband() error {
// 清空成员列表等解散公会
return nil
}

96
server/imserver/guildmgr.go
View File

@ -3,34 +3,36 @@ package main
import ( import (
"cs" "cs"
"errors" "errors"
"fmt"
) )
type GuildMgr struct { type GuildMgr struct {
cs.MsgHandlerImpl cs.MsgHandlerImpl
Guilds map[string]*Guild // 公会ID -> 公会列表 Guilds map[int]*Guild // 公会ID -> 公会列表
pendingAccountIds map[string][]string // 公会ID -> 申请者账户ID列表 pendingAccountIds map[int][]string // 公会ID -> 申请者账户ID列表
Logs []string // 公会日志 Logs []string // 公会日志
} }
func NewGuildMgr() *GuildMgr { func NewGuildMgr() *GuildMgr {
return &GuildMgr{ return &GuildMgr{
Guilds: make(map[string]*Guild), Guilds: make(map[int]*Guild),
pendingAccountIds: make(map[string][]string), pendingAccountIds: make(map[int][]string),
Logs: []string{}, Logs: []string{},
} }
} }
// CreateGuild 创建公会 var guildID = 0
func (gm *GuildMgr) CreateGuild(name string, leaderID string, maxMembers int) (string, error) {
if maxMembers <= 0 {
return "", errors.New("invalid maxMembers")
}
guildID := "123" // CreateGuild 创建公会
func (gm *GuildMgr) CreateGuild(name string, leaderID string, maxMembers int) (int, error) {
if maxMembers <= 0 {
return 0, errors.New("invalid maxMembers")
}
if _, exists := gm.Guilds[guildID]; exists { if _, exists := gm.Guilds[guildID]; exists {
return "", errors.New("guild already exists") return 0, errors.New("guild already exists")
} }
guildID++
newGuild := &Guild{ newGuild := &Guild{
ID: guildID, ID: guildID,
@ -44,37 +46,50 @@ func (gm *GuildMgr) CreateGuild(name string, leaderID string, maxMembers int) (s
} }
// ApplyToGuild 申请加入公会 // ApplyToGuild 申请加入公会
func (gm *GuildMgr) ApplyToGuild(guildID string, applicantID string) error { func (gm *GuildMgr) ApplyToGuild(guildID int, applicantAccountId string) error {
if _, exists := gm.Guilds[guildID]; !exists { if _, exists := gm.Guilds[guildID]; !exists {
return errors.New("guild not found") return errors.New("guild not found")
} }
guild := gm.Guilds[guildID] guild := gm.Guilds[guildID]
// 获取即时人数, 是否需要锁
if len(guild.Members) >= guild.MaxMembers { if len(guild.Members) >= guild.MaxMembers {
return errors.New("guild is full") return errors.New("guild is full")
} }
gm.pendingAccountIds[guildID] = append(gm.pendingAccountIds[guildID], applicantID) gm.pendingAccountIds[guildID] = append(gm.pendingAccountIds[guildID], applicantAccountId)
return nil return nil
} }
// ApproveApplication 批准申请加入公会 // ApproveApplication 批准申请加入公会
func (gm *GuildMgr) ApproveApplication(guildID string, applicantID string) error { func (gm *GuildMgr) ApproveApplication(guildID int, applicantAccountId string) error {
guild, exists := gm.Guilds[guildID] guild, exists := gm.Guilds[guildID]
if !exists { if !exists {
return errors.New("guild not found") return errors.New("guild not found")
} }
applicants, pendingExists := gm.pendingAccountIds[guildID] for guildId, guild := range gm.Guilds {
for _, member := range guild.Members {
if applicantAccountId == member.AccountId {
errMsg := fmt.Sprintf("Player:%s has joined other guild:%d", applicantAccountId, guildId)
return errors.New(errMsg)
}
}
}
pendingAccountIds, pendingExists := gm.pendingAccountIds[guildID]
if !pendingExists { if !pendingExists {
return errors.New("no pending applications for this guild") return errors.New("no pending applications for this guild")
} }
for i, appID := range applicants { for i, accountId := range pendingAccountIds {
if appID == applicantID { if accountId == applicantAccountId {
newMember := GuildMember{AccountId: applicantID, Username: applicantID, Level: 3} newMember := GuildMember{AccountId: applicantAccountId, Username: applicantAccountId, Level: 3}
guild.Members = append(guild.Members, newMember) err := guild.AddMember(newMember)
gm.pendingAccountIds[guildID] = append(applicants[:i], applicants[i+1:]...) if err != nil {
return err
}
gm.pendingAccountIds[guildID] = append(pendingAccountIds[:i], pendingAccountIds[i+1:]...)
return nil return nil
} }
} }
@ -83,15 +98,15 @@ func (gm *GuildMgr) ApproveApplication(guildID string, applicantID string) error
} }
// RejectApplication 拒绝申请加入公会 // RejectApplication 拒绝申请加入公会
func (gm *GuildMgr) RejectApplication(guildID string, applicantID string) error { func (gm *GuildMgr) RejectApplication(guildID int, applicantAccountId string) error {
applicants, exists := gm.pendingAccountIds[guildID] pendingAccountIds, exists := gm.pendingAccountIds[guildID]
if !exists { if !exists {
return errors.New("no pending applications for this guild") return errors.New("no pending applications for this guild")
} }
for i, appID := range applicants { for i, accountId := range pendingAccountIds {
if appID == applicantID { if accountId == applicantAccountId {
gm.pendingAccountIds[guildID] = append(applicants[:i], applicants[i+1:]...) gm.pendingAccountIds[guildID] = append(pendingAccountIds[:i], pendingAccountIds[i+1:]...)
return nil return nil
} }
} }
@ -100,7 +115,7 @@ func (gm *GuildMgr) RejectApplication(guildID string, applicantID string) error
} }
// JoinGuild 加入公会 // JoinGuild 加入公会
func (gm *GuildMgr) JoinGuild(guildID, memberID string) error { func (gm *GuildMgr) JoinGuild(guildID int, memberID string) error {
guild, exists := gm.Guilds[guildID] guild, exists := gm.Guilds[guildID]
if !exists { if !exists {
return errors.New("guild not found") return errors.New("guild not found")
@ -116,7 +131,7 @@ func (gm *GuildMgr) JoinGuild(guildID, memberID string) error {
} }
// LeaveGuild 离开公会 // LeaveGuild 离开公会
func (gm *GuildMgr) LeaveGuild(guildID string, memberID string) error { func (gm *GuildMgr) LeaveGuild(guildID int, memberID string) error {
guild, exists := gm.Guilds[guildID] guild, exists := gm.Guilds[guildID]
if !exists { if !exists {
return errors.New("guild not found") return errors.New("guild not found")
@ -133,7 +148,7 @@ func (gm *GuildMgr) LeaveGuild(guildID string, memberID string) error {
} }
// DismissMember 开除成员 // DismissMember 开除成员
func (gm *GuildMgr) DismissMember(guildID string, memberID string) error { func (gm *GuildMgr) DismissMember(guildID int, memberID string) error {
guild, exists := gm.Guilds[guildID] guild, exists := gm.Guilds[guildID]
if !exists { if !exists {
return errors.New("guild not found") return errors.New("guild not found")
@ -154,7 +169,7 @@ func (gm *GuildMgr) DismissMember(guildID string, memberID string) error {
} }
// PromoteMember 提升成员为干部 // PromoteMember 提升成员为干部
func (gm *GuildMgr) PromoteMember(guildID string, memberID string) error { func (gm *GuildMgr) PromoteMember(guildID int, memberID string) error {
guild, exists := gm.Guilds[guildID] guild, exists := gm.Guilds[guildID]
if !exists { if !exists {
return errors.New("guild not found") return errors.New("guild not found")
@ -175,7 +190,7 @@ func (gm *GuildMgr) PromoteMember(guildID string, memberID string) error {
} }
// DemoteMember 解除成员干部身份 // DemoteMember 解除成员干部身份
func (gm *GuildMgr) DemoteMember(guildID string, memberID string) error { func (gm *GuildMgr) DemoteMember(guildID int, memberID string) error {
guild, exists := gm.Guilds[guildID] guild, exists := gm.Guilds[guildID]
if !exists { if !exists {
return errors.New("guild not found") return errors.New("guild not found")
@ -226,6 +241,27 @@ func (gm *GuildMgr) RandomGuilds() []Guild {
return nil return nil
} }
func (gm *GuildMgr) Disband(guildID int, accountId string) error {
guild, exists := gm.Guilds[guildID]
if !exists {
return errors.New("guild not found")
}
if accountId != guild.LeaderID {
return errors.New("cannot disband guild")
}
guildName := guild.Name
guild.Members = nil
delete(gm.pendingAccountIds, guildID)
delete(gm.Guilds, guildID)
// Write log about the guild disbandment
gm.WriteLog("Guild disbanded: " + guildName)
return nil
}
func containsSubstring(s, substr string) bool { func containsSubstring(s, substr string) bool {
return len(s) >= len(substr) && s[len(s)-len(substr):] == substr return len(s) >= len(substr) && s[len(s)-len(substr):] == substr
} }

8
server/imserver/guildmgr_test.go
View File

@ -6,13 +6,11 @@ import (
) )
func TestGuild(t *testing.T) { func TestGuild(t *testing.T) {
// Test the basic functionality
guildMgr := NewGuildMgr() guildMgr := NewGuildMgr()
leaderID := "apple"
memberID := "sony"
leaderID := "leader_account_id" guildID, err := guildMgr.CreateGuild("GuildWorld", leaderID, 10)
memberID := "member_account_id"
guildID, err := guildMgr.CreateGuild("Awesome Guild", leaderID, 10)
if err != nil { if err != nil {
fmt.Println("Error:", err) fmt.Println("Error:", err)
return return