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-03-02 14:20:45 +08:00
commit 31abefaa86
13 changed files with 207 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_pandamasjs.json
View File

@ -1,14 +1,14 @@
[
{
"id": 1,
"unlock_condition": "6000001"
"unlock_condition": 6000001
},
{
"id": 2,
"unlock_condition": "6000002"
"unlock_condition": 6000002
},
{
"id": 3,
"unlock_condition": "6000003"
"unlock_condition": 6000003
}
]

6
comm/imodule.go
View File

@ -6,9 +6,14 @@ import (
)
type (
//红点接口
IReddot interface {
Reddot(session IUserSession, rid ...ReddotType) (reddot map[ReddotType]bool)
}
//任务完成
ITaskComplete interface {
TaskComplete(session IUserSession,taskid int32)
}
)
/*
@ -422,6 +427,7 @@ type (
}
//练功房
IPractice interface {
ITaskComplete
AddItems(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode)
}
)

8
modules/practice/api_expulsion.go
View File

@ -186,10 +186,16 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
if code = this.module.DispenseRes(_session, append(ants1, ants2...), true); code != pb.ErrorCode_Success {
return
}
if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false); code != pb.ErrorCode_Success {
return
}
} else {
if _, code = this.module.ModuleHero.AddHeroExp(_session, pillar.Hero, exp); code != pb.ErrorCode_Success {
return
}
if code = this.module.ModuleHero.KungFuHero(_session, pillar.Hero, false); code != pb.ErrorCode_Success {
return
}
res := make([]*pb.UserAssets, 0)
for _, v := range ants1 {
res = append(res, &pb.UserAssets{
@ -226,6 +232,6 @@ func (this *apiComp) Expulsion(session comm.IUserSession, req *pb.PracticeExpuls
this.module.modelPandata.Change(pillar.Uid, map[string]interface{}{
"knapsack": froom.Knapsack,
})
session.SendMsg(string(this.module.GetType()), "expulsion", &pb.PracticeExpulsionResp{})
session.SendMsg(string(this.module.GetType()), "expulsion", &pb.PracticeExpulsionResp{Pillar: pillar, Knapsack: froom.Knapsack})
return
}

18
modules/practice/api_friendromm.go
View File

@ -18,11 +18,29 @@ func (this *apiComp) FriendRomm(session comm.IUserSession, req *pb.PracticeFrien
var (
err error
room *pb.DBPracticeRoom
maxlv int32
)
if room, err = this.module.modelPandata.queryUserMartialhall(req.Fuid); err != nil {
code = pb.ErrorCode_DBError
return
}
if room.Pillar1.Isunlock {
maxlv = room.Pillar1.Lv
}
if room.Pillar2.Isunlock && maxlv < room.Pillar2.Lv {
maxlv = room.Pillar2.Lv
}
if room.Pillar3.Isunlock && maxlv < room.Pillar3.Lv {
maxlv = room.Pillar3.Lv
}
if maxlv > 0 && (!room.Pillarf.Isunlock || room.Pillarf.Lv < maxlv) {
room.Pillarf.Isunlock = true
room.Pillarf.Lv = maxlv
this.module.modelPandata.Change(req.Fuid, map[string]interface{}{
"pillarf": room.Pillarf,
})
}
session.SendMsg(string(this.module.GetType()), "friendromm", &pb.PracticeFriendRommResp{Info: room})
return
}

2
modules/practice/api_loot.go
View File

@ -56,6 +56,7 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (c
return
}
extra += tconfigure.Duration
froom.Pillarf.Prop = req.Teacher
}
if req.Prop != "" {
if room.Knapsack[req.Prop] == 1 { //已经被使用
@ -68,6 +69,7 @@ func (this *apiComp) Loot(session comm.IUserSession, req *pb.PracticeLootReq) (c
return
}
extra += pconfigure.Duration
froom.Pillarf.Prop = req.Prop
}
froom.Pillarf.Hero = req.Hero
froom.Pillarf.Start = configure.Now().Unix()

3
modules/practice/api_practice.go
View File

@ -74,6 +74,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
return
}
extra += tconfigure.Duration
pillar.Teacher = req.Teacher
}
if req.Prop != "" {
if room.Knapsack[req.Prop] == 1 { //已经被使用
@ -86,8 +87,10 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic
return
}
extra += pconfigure.Duration
pillar.Prop = req.Prop
}
pillar.Hero = req.Hero
pillar.Start = configure.Now().Unix()
if extra >= 0 {
pillar.End = configure.Now().Add(time.Minute * (time.Duration(pillarconfigure.PlacementDuration))).Unix()

6
modules/practice/api_receive.go
View File

@ -88,7 +88,9 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
return
}
}
if code = this.module.ModuleHero.KungFuHero(session, pillar.Hero, false); code != pb.ErrorCode_Success {
return
}
//计算经验收益
if configure.Now().After(time.Unix(pillar.Expend, 0)) {
minutes := int32(time.Unix(pillar.Expend, 0).Sub(time.Unix(pillar.Start, 0)).Minutes())
@ -230,6 +232,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR
})
}
session.SendMsg(string(this.module.GetType()), "receive", &pb.PracticeReceiveResp{})
session.SendMsg(string(this.module.GetType()), "receive", &pb.PracticeReceiveResp{Pillar: pillar, Knapsack: room.Knapsack})
return
}

15
modules/practice/configure.go
View File

@ -9,6 +9,7 @@ import (
const (
game_pandamasmz = "game_pandamasmz.json"
pandamas_js = "pandamas_js.json"
game_pandamasjs = "game_pandamasjs.json"
game_pandamasjx = "game_pandamasjx.json"
game_pandamasyxjx = "game_pandamasyxjx.json"
@ -25,6 +26,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Practice)
this.LoadConfigure(game_pandamasmz, cfg.NewGamePandamasMz)
this.LoadConfigure(pandamas_js, cfg.NewGamePandamasJs)
this.LoadConfigure(game_pandamasjs, cfg.NewGamePandamasJs)
this.LoadConfigure(game_pandamasjx, cfg.NewGamePandamasJx)
this.LoadConfigure(game_pandamasyxjx, cfg.NewGamePandamasYxjx)
@ -49,6 +51,19 @@ func (this *configureComp) getGamePandamasMz(lv int32) (configure *cfg.GamePanda
return
}
func (this *configureComp) getGamePandamasJs() (configure []*cfg.GamePandamasJsData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_pandamasjx); err != nil {
this.module.Errorln(err)
return
} else {
configure = v.(*cfg.GamePandamasJs).GetDataList()
}
return
}
func (this *configureComp) getGamePandamasJx(id string) (configure *cfg.GamePandamasJxData, err error) {
var (
v interface{}

48
modules/practice/module.go
View File

@ -6,6 +6,7 @@ import (
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
/*
@ -83,3 +84,50 @@ func (this *Practice) AddItems(session comm.IUserSession, items map[string]int32
session.SendMsg(string(this.GetType()), "jxitem", &pb.PracticeJXItemPush{Id: id})
return
}
//完成世界任务
func (this *Practice) TaskComplete(session comm.IUserSession, taskid int32) {
var (
configure []*cfg.GamePandamasJsData
room *pb.DBPracticeRoom
err error
)
if configure, err = this.configure.getGamePandamasJs(); err != nil {
this.Errorln(err)
return
}
if room, err = this.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil {
this.Errorln(err)
return
}
for _, v := range configure {
if v.UnlockCondition == taskid {
switch v.Id {
case 1:
if !room.Pillar1.Isunlock {
room.Pillar1.Isunlock = true
}
this.modelPandata.Change(session.GetUserId(), map[string]interface{}{
"pillar1": room.Pillar1,
})
break
case 2:
if !room.Pillar2.Isunlock {
room.Pillar2.Isunlock = true
}
this.modelPandata.Change(session.GetUserId(), map[string]interface{}{
"pillar2": room.Pillar2,
})
break
case 3:
if !room.Pillar3.Isunlock {
room.Pillar3.Isunlock = true
}
this.modelPandata.Change(session.GetUserId(), map[string]interface{}{
"pillar3": room.Pillar3,
})
break
}
}
}
}

1
modules/user/api_login.go
View File

@ -120,6 +120,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
}
// 清理点赞
this.module.ModuleFriend.ResetFriend(user.Uid)
}
rsp.Data = user

3
modules/user/model_expand.go
View File

@ -72,13 +72,14 @@ func (this *ModelExpand) ChangeUserExpand(uid string, value map[string]interface
}
// 累计登录天数
// 累计登录天数 和 全局buff清理
func (this *ModelExpand) updateLoginDay(uid string, timestamp int64) (err error) {
var de *pb.DBUserExpand
if de, err = this.GetUserExpand(uid); err == nil {
count := de.LoginAddCount + 1
update := map[string]interface{}{
"loginAddCount": count,
"globalbuff": 0,
}
// 更新连续等登录天数

127
pb/practice_msg.pb.go
View File

@ -595,6 +595,9 @@ type PracticeExpulsionResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]int32 `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
}
func (x *PracticeExpulsionResp) Reset() {
@ -629,6 +632,20 @@ func (*PracticeExpulsionResp) Descriptor() ([]byte, []int) {
return file_practice_practice_msg_proto_rawDescGZIP(), []int{11}
}
func (x *PracticeExpulsionResp) GetPillar() *DBPracticePillar {
if x != nil {
return x.Pillar
}
return nil
}
func (x *PracticeExpulsionResp) GetKnapsack() map[string]int32 {
if x != nil {
return x.Knapsack
}
return nil
}
///领取收益
type PracticeReceiveReq struct {
state protoimpl.MessageState
@ -689,6 +706,9 @@ type PracticeReceiveResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Pillar *DBPracticePillar `protobuf:"bytes,1,opt,name=pillar,proto3" json:"pillar"`
Knapsack map[string]int32 `protobuf:"bytes,2,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源
}
func (x *PracticeReceiveResp) Reset() {
@ -723,6 +743,20 @@ func (*PracticeReceiveResp) Descriptor() ([]byte, []int) {
return file_practice_practice_msg_proto_rawDescGZIP(), []int{13}
}
func (x *PracticeReceiveResp) GetPillar() *DBPracticePillar {
if x != nil {
return x.Pillar
}
return nil
}
func (x *PracticeReceiveResp) GetKnapsack() map[string]int32 {
if x != nil {
return x.Knapsack
}
return nil
}
///登记满级英雄
type PracticeEnrolledReq struct {
state protoimpl.MessageState
@ -932,26 +966,47 @@ var file_practice_practice_msg_proto_rawDesc = []byte{
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72,
0x22, 0x16, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75,
0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63,
0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
0x70, 0x22, 0x42, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63,
0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a,
0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3f, 0x0a, 0x13,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64,
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x72,
0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x40, 0x0a,
0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65,
0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x68,
0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22,
0x24, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4a, 0x58, 0x49, 0x74, 0x65,
0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x22, 0xc1, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x61,
0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65,
0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50,
0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x12, 0x40, 0x0a,
0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x24, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x78, 0x70, 0x75, 0x6c, 0x73,
0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x1a,
0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x42, 0x0a, 0x12,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52,
0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x22, 0xbd, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x63,
0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x70, 0x69, 0x6c, 0x6c,
0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61,
0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x06, 0x70, 0x69, 0x6c,
0x6c, 0x61, 0x72, 0x12, 0x3e, 0x0a, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18,
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x4b, 0x6e, 0x61, 0x70,
0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, 0x70, 0x73,
0x61, 0x63, 0x6b, 0x1a, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x22, 0x3f, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72, 0x6f,
0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a,
0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x72,
0x6f, 0x22, 0x40, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x72,
0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f,
0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
0x12, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68,
0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x12, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x4a,
0x58, 0x49, 0x74, 0x65, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -966,7 +1021,7 @@ func file_practice_practice_msg_proto_rawDescGZIP() []byte {
return file_practice_practice_msg_proto_rawDescData
}
var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
var file_practice_practice_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_practice_practice_msg_proto_goTypes = []interface{}{
(*PracticeInfoReq)(nil), // 0: PracticeInfoReq
(*PracticeInfoResp)(nil), // 1: PracticeInfoResp
@ -985,19 +1040,25 @@ var file_practice_practice_msg_proto_goTypes = []interface{}{
(*PracticeEnrolledReq)(nil), // 14: PracticeEnrolledReq
(*PracticeEnrolledResp)(nil), // 15: PracticeEnrolledResp
(*PracticeJXItemPush)(nil), // 16: PracticeJXItemPush
(*DBPracticeRoom)(nil), // 17: DBPracticeRoom
(*DBPracticePillar)(nil), // 18: DBPracticePillar
nil, // 17: PracticeExpulsionResp.KnapsackEntry
nil, // 18: PracticeReceiveResp.KnapsackEntry
(*DBPracticeRoom)(nil), // 19: DBPracticeRoom
(*DBPracticePillar)(nil), // 20: DBPracticePillar
}
var file_practice_practice_msg_proto_depIdxs = []int32{
17, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
17, // 1: PracticeFriendRommResp.info:type_name -> DBPracticeRoom
18, // 2: PracticePracticeResp.pillar:type_name -> DBPracticePillar
18, // 3: PracticeLootResp.pillar:type_name -> DBPracticePillar
4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name
4, // [4:4] is the sub-list for extension extendee
0, // [0:4] is the sub-list for field type_name
19, // 0: PracticeInfoResp.info:type_name -> DBPracticeRoom
19, // 1: PracticeFriendRommResp.info:type_name -> DBPracticeRoom
20, // 2: PracticePracticeResp.pillar:type_name -> DBPracticePillar
20, // 3: PracticeLootResp.pillar:type_name -> DBPracticePillar
20, // 4: PracticeExpulsionResp.pillar:type_name -> DBPracticePillar
17, // 5: PracticeExpulsionResp.knapsack:type_name -> PracticeExpulsionResp.KnapsackEntry
20, // 6: PracticeReceiveResp.pillar:type_name -> DBPracticePillar
18, // 7: PracticeReceiveResp.knapsack:type_name -> PracticeReceiveResp.KnapsackEntry
8, // [8:8] is the sub-list for method output_type
8, // [8:8] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension type_name
8, // [8:8] is the sub-list for extension extendee
0, // [0:8] is the sub-list for field type_name
}
func init() { file_practice_practice_msg_proto_init() }
@ -1218,7 +1279,7 @@ func file_practice_practice_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_practice_practice_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 17,
NumMessages: 19,
NumExtensions: 0,
NumServices: 0,
},

4
sys/configure/structs/Game.PandamasJsData.go
View File

@ -12,7 +12,7 @@ import "errors"
type GamePandamasJsData struct {
Id int32
UnlockCondition string
UnlockCondition int32
}
const TypeId_GamePandamasJsData = -1008362572
@ -23,7 +23,7 @@ func (*GamePandamasJsData) GetTypeId() int32 {
func (_v *GamePandamasJsData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.UnlockCondition, _ok_ = _buf["unlock_condition"].(string); !_ok_ { err = errors.New("unlock_condition error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock_condition"].(float64); !_ok_ { err = errors.New("unlock_condition error"); return }; _v.UnlockCondition = int32(_tempNum_) }
return
}