liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-12-21 11:47:32 +08:00
commit 40cc979580
7 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/sociaty/api_cross_setting.go
View File

@ -14,7 +14,7 @@ func (this *apiComp) SettingCheck(session comm.IUserSession, req *pb.SociatySett
Code: pb.ErrorCode_SociatyNoticeTextLen,
Title: pb.ErrorCode_SociatyNoticeTextLen.ToString(),
}
} else if req.ApplyLv == 0 || req.Icon == "" {
} else if req.ApplyLv == 0 || req.Icon == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),

3
modules/sociaty/model_sociaty.go
View File

@ -70,9 +70,6 @@ func (this *ModelSociaty) create(sociaty *pb.DBSociaty) error {
sociaty.Id = _id
sociaty.Ctime = configure.Now().Unix()
sociaty.Lv = 1 //默认1级
if sociaty.Icon == "" {
sociaty.Icon = "1000" //默认图标
}
if sociaty.ApplyLv == 0 {
sociaty.ApplyLv = 1 //默认玩家入会等级
}

1
modules/sociaty/module.go
View File

@ -408,7 +408,6 @@ func (this *Sociaty) CreateSociaty(uid, sociatyName string) error {
sociaty := &pb.DBSociaty{
Creater: uid,
Name: sociatyName,
Icon: "wp_icon_10015",
ApplyLv: 1,
}

1
modules/user/module.go
View File

@ -293,7 +293,6 @@ func (this *User) RpcCreateSociaty(ctx context.Context, req *pb.RPCGeneralReqA2,
_id := primitive.NewObjectID().Hex()
sociaty.Creater = req.Param1
sociaty.Name = req.Param2
sociaty.Icon = "wp_icon_10015"
sociaty.ApplyLv = 1
sociaty.Id = _id
sociaty.Ctime = configure.Now().Unix()

8
pb/guildgve_msg.pb.go
View File

@ -297,7 +297,7 @@ type GuildGveRankItem struct {
unknownFields protoimpl.UnknownFields
Guildid string `protobuf:"bytes,1,opt,name=guildid,proto3" json:"guildid"`
Icon string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon"`
Icon int32 `protobuf:"varint,2,opt,name=icon,proto3" json:"icon"`
Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name"`
KillCount int32 `protobuf:"varint,4,opt,name=killCount,proto3" json:"killCount"`
LastKillTime int64 `protobuf:"varint,5,opt,name=lastKillTime,proto3" json:"lastKillTime"`
@ -343,11 +343,11 @@ func (x *GuildGveRankItem) GetGuildid() string {
return ""
}
func (x *GuildGveRankItem) GetIcon() string {
func (x *GuildGveRankItem) GetIcon() int32 {
if x != nil {
return x.Icon
}
return ""
return 0
}
func (x *GuildGveRankItem) GetName() string {
@ -1173,7 +1173,7 @@ var file_guildgve_guildgve_msg_proto_rawDesc = []byte{
0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61,
0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x69, 0x6c, 0x6c,
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6b, 0x69, 0x6c,

8
pb/sociaty_db.pb.go
View File

@ -84,7 +84,7 @@ type DBSociaty struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Creater string `protobuf:"bytes,2,opt,name=creater,proto3" json:"creater" bson:"creater"` //创建人
Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name" bson:"name"` //公会名称
Icon string `protobuf:"bytes,4,opt,name=icon,proto3" json:"icon" bson:"icon"` //公会图标
Icon int32 `protobuf:"varint,4,opt,name=icon,proto3" json:"icon" bson:"icon"` //公会图标id
Notice string `protobuf:"bytes,5,opt,name=notice,proto3" json:"notice" bson:"notice"` //公告
Exp int32 `protobuf:"varint,6,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验
Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级
@ -154,11 +154,11 @@ func (x *DBSociaty) GetName() string {
return ""
}
func (x *DBSociaty) GetIcon() string {
func (x *DBSociaty) GetIcon() int32 {
if x != nil {
return x.Icon
}
return ""
return 0
}
func (x *DBSociaty) GetNotice() string {
@ -1182,7 +1182,7 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{
0x61, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61,
0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18,
0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e,
0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e,
0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74,
0x69, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28,

16
pb/sociaty_msg.pb.go
View File

@ -80,7 +80,7 @@ type SociatyCreateReq struct {
unknownFields protoimpl.UnknownFields
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"` //公会名称
Icon string `protobuf:"bytes,2,opt,name=icon,proto3" json:"icon"` //公会图标
Icon int32 `protobuf:"varint,2,opt,name=icon,proto3" json:"icon"` //公会图标id
Notice string `protobuf:"bytes,3,opt,name=notice,proto3" json:"notice"` //公告
IsApplyCheck bool `protobuf:"varint,4,opt,name=isApplyCheck,proto3" json:"isApplyCheck"` //审批
ApplyLv int32 `protobuf:"varint,5,opt,name=applyLv,proto3" json:"applyLv"` //限制等级
@ -125,11 +125,11 @@ func (x *SociatyCreateReq) GetName() string {
return ""
}
func (x *SociatyCreateReq) GetIcon() string {
func (x *SociatyCreateReq) GetIcon() int32 {
if x != nil {
return x.Icon
}
return ""
return 0
}
func (x *SociatyCreateReq) GetNotice() string {
@ -459,7 +459,7 @@ type SociatySettingReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Icon string `protobuf:"bytes,1,opt,name=icon,proto3" json:"icon"` //公会图标
Icon int32 `protobuf:"varint,1,opt,name=icon,proto3" json:"icon"` //公会图标
Notice string `protobuf:"bytes,2,opt,name=notice,proto3" json:"notice"` //公告
IsApplyCheck bool `protobuf:"varint,3,opt,name=isApplyCheck,proto3" json:"isApplyCheck"` //审批
ApplyLv int32 `protobuf:"varint,4,opt,name=applyLv,proto3" json:"applyLv"` //限制等级
@ -497,11 +497,11 @@ func (*SociatySettingReq) Descriptor() ([]byte, []int) {
return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{7}
}
func (x *SociatySettingReq) GetIcon() string {
func (x *SociatySettingReq) GetIcon() int32 {
if x != nil {
return x.Icon
}
return ""
return 0
}
func (x *SociatySettingReq) GetNotice() string {
@ -3831,7 +3831,7 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
0x74, 0x6f, 0x22, 0x90, 0x01, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x72,
0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69,
0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12,
0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12,
0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x73, 0x41, 0x70, 0x70,
0x6c, 0x79, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69,
@ -3862,7 +3862,7 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
0x0a, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x73,
0x74, 0x22, 0x7d, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74,
0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f,
0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f,
0x74, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69,
0x63, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x68, 0x65,
0x63, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x73, 0x41, 0x70, 0x70, 0x6c,