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-11-17 18:28:35 +08:00
commit 255df66f2f
21 changed files with 680 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_buriedcondi.json
View File

@ -24292,7 +24292,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_728", "key": "buried_buried_condi_tasktxt_728",
"text": "这里收拾收拾" "text": "清扫枯枝"
}, },
"type": 20001, "type": 20001,
"valid": 1, "valid": 1,
@ -24321,7 +24321,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_729", "key": "buried_buried_condi_tasktxt_729",
"text": "那里收拾收拾" "text": "清扫落叶"
}, },
"type": 20001, "type": 20001,
"valid": 1, "valid": 1,

2
bin/json/game_tipstxtmain.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"id": 20020, "id": 20042,
"topname": { "topname": {
"key": "topname_01", "key": "topname_01",
"text": "第一章" "text": "第一章"

26
bin/json/game_worldtask.json
View File

@ -12,11 +12,11 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_1", "key": "worldtask_world_task_task_name_1",
"text": "传承者到底在哪" "text": "月中人的传承到底在哪里"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_1", "key": "worldtask_world_task_task_details_1",
"text": "所有高深的大师都在预言会有一场危机，而我们需要一位传承者，所以，传承者究竟在哪儿？" "text": "所有高深的大师都预言会有一场危机，而我们需要找到月中人的传承。所以，这个“传承”究竟在哪里？"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_1", "key": "worldtask_world_task_npctxt_1",
@ -57,11 +57,11 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_2", "key": "worldtask_world_task_task_name_2",
"text": "解决中轴城危机" "text": "中轴城危机"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_2", "key": "worldtask_world_task_task_details_2",
"text": "看来黑暗的力量渗透的速度比我想象的要快，在见乌龟大师之前，我们得先解决了这些麻烦。" "text": "中轴城几乎被黑沙笼罩，没想到黑暗的力量居然找到了这里。在见乌龟大师之前，先解决这些麻烦吧。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_2", "key": "worldtask_world_task_npctxt_2",
@ -99,11 +99,11 @@
"icon": "25002", "icon": "25002",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_3", "key": "worldtask_world_task_task_name_3",
"text": "传承者的诞生" "text": "石头里蹦出来的人？"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_3", "key": "worldtask_world_task_task_details_3",
"text": "阿宝的寻找有了收获，而现在是见证的时刻，让我们等待传承者的到来吧。" "text": "阿宝把神秘的水晶石头带回中轴城，乌龟大师能从中看出什么玄机吗？我们寻找的传承者究竟在哪里呢？"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_3", "key": "worldtask_world_task_npctxt_3",
@ -140,11 +140,11 @@
"icon": "25003", "icon": "25003",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_4", "key": "worldtask_world_task_task_name_4",
"text": "主角打扫" "text": "炼就钢铁般的灵魂"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_4", "key": "worldtask_world_task_task_details_4",
"text": "我是谁，我在哪儿，我该……打扫？好吧，这好歹我目前唯一感到亲切熟悉的事情。" "text": "据说扫地就能成就钢铁般的灵魂？\n“加油，大概也就扫九个世纪吧！”\n什么？！\n我是谁，我在哪儿，我该……打扫？好吧，这好歹我目前唯一感到亲切熟悉的事情。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_4", "key": "worldtask_world_task_npctxt_4",
@ -188,11 +188,11 @@
"icon": "25005", "icon": "25005",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_5", "key": "worldtask_world_task_task_name_5",
"text": "第一位伙伴" "text": "圣桃树下的灵枝"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_5", "key": "worldtask_world_task_task_details_5",
"text": "我在水池内找到了一根很树枝，我不是说树枝很奇特，只是这根树枝好像是从这根不得了的树上掉落下来的。" "text": "打扫过程中竟意外收获一根神奇的树枝！不过更重要的收获是我有了一位并肩作战的伙伴——阿宝。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_5", "key": "worldtask_world_task_npctxt_5",
@ -252,7 +252,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_6", "key": "worldtask_world_task_task_details_6",
"text": "“不要担心，不要迷茫，遵从你内心的选择吧。”乌龟大师是这样说的。" "text": "乌龟大师说：“我们称之为开始的往往意味着结束 而宣告结束也就是着手开始。”\n难怪阿宝总说大师说话玄乎，真的很难懂啊！"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_6", "key": "worldtask_world_task_npctxt_6",
@ -344,11 +344,11 @@
"icon": "25005", "icon": "25005",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_8", "key": "worldtask_world_task_task_name_8",
"text": "去往鹅爹面摊" "text": "一“面”之交"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_8", "key": "worldtask_world_task_task_details_8",
"text": "阿宝极力推荐他父亲的面摊，我或许应该去尝尝。" "text": "和阿宝相邀去鹅爹面摊吃阳春面，没想到吃面之前还得活动活动筋骨。想跟大家混熟，可不是一件轻松的事情呢。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_8", "key": "worldtask_world_task_npctxt_8",

29
modules/island/api_complete.go
View File

@ -18,7 +18,8 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
var ( var (
info *pb.DBIsland info *pb.DBIsland
conf *cfg.GamePuggsyEventData conf *cfg.GamePuggsyEventData
sconf *cfg.GamePuggsyScoreData sconf []*cfg.GamePuggsyScoreData
conf4 *cfg.GamePuggsyStarData
item *pb.DBIslandItem item *pb.DBIslandItem
award []*pb.UserAtno award []*pb.UserAtno
ok bool ok bool
@ -52,7 +53,6 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
Level: make(map[int32]int32), Level: make(map[int32]int32),
} }
info.Islands[conf.NodeId] = item info.Islands[conf.NodeId] = item
return
} }
if _, ok = item.Level[req.Level]; ok { if _, ok = item.Level[req.Level]; ok {
@ -64,11 +64,11 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
return return
} }
if conf.Type == 2 { //战斗管卡 if conf.Type == 3 { //战斗管卡
if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil { if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
return return
} }
if sconf, err = this.module.configure.getGamePuggsyScoreData(req.Report.Harm); err != nil { if sconf, err = this.module.configure.getGamePuggsyScoreDatas(item.Level[req.Level], req.Report.Harm); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(), Title: pb.ErrorCode_ConfigNoFound.ToString(),
@ -76,8 +76,25 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
} }
return return
} }
item.Level[req.Level] = 1 item.Level[req.Level] = req.Report.Harm
if errdata, award = this.module.DispenseAtno(session, sconf.Reward, true); errdata != nil { reward := []*cfg.Gameatn{}
for _, v := range sconf {
reward = append(reward, v.Reward...)
}
if errdata, award = this.module.DispenseAtno(session, reward, true); errdata != nil {
return
}
} else if conf.Type == 4 {
if conf4, err = this.module.configure.getGamePuggsyStarData(req.AwardId); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
item.Level[req.Level] = req.AwardId
if errdata, award = this.module.DispenseAtno(session, conf4.Drop, true); errdata != nil {
return return
} }
} else { } else {

41
modules/island/configure.go
View File

@ -15,6 +15,7 @@ const (
game_puggsyfight = "game_puggsyfight.json" game_puggsyfight = "game_puggsyfight.json"
game_puggsyscore = "game_puggsyscore.json" game_puggsyscore = "game_puggsyscore.json"
game_puggsypasscheck = "game_puggsypasscheck.json" game_puggsypasscheck = "game_puggsypasscheck.json"
game_puggsystar = "game_puggsystar.json"
) )
// /背包配置管理组件 // /背包配置管理组件
@ -32,6 +33,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight) err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight)
err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore) err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore)
err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck) err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck)
err = this.LoadConfigure(game_puggsystar, cfg.NewGamePuggsyStar)
return return
} }
@ -132,6 +134,26 @@ func (this *ConfigureComp) getGamePuggsyScoreData(harm int32) (results *cfg.Game
return return
} }
// 获取伤害对应的评分组
func (this *ConfigureComp) getGamePuggsyScoreDatas(min, max int32) (confs []*cfg.GamePuggsyScoreData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_puggsyscore); err != nil {
return
} else {
for _, v := range v.(*cfg.GamePuggsyScore).GetDataList() {
if v.RankUp > min && v.RankUp <= max {
confs = append(confs, v)
}
}
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_puggsyscore, fmt.Sprintf("%d-%d", min, max))
this.module.Errorf("err:%v", err)
}
return
}
// 获取伤害对应的评分组 // 获取伤害对应的评分组
func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) { func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) {
var ( var (
@ -144,3 +166,22 @@ func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePugg
} }
return return
} }
// 获取伤害对应的评分组
func (this *ConfigureComp) getGamePuggsyStarData(id int32) (conf *cfg.GamePuggsyStarData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(game_puggsystar); err != nil {
return
} else {
if conf, ok = v.(*cfg.GamePuggsyStar).GetDataMap()[id]; !ok {
err = fmt.Errorf("no found Material:%d configure", id)
this.module.Errorf("err:%v", err)
return
}
}
return
}

10
modules/island/model.go
View File

@ -7,6 +7,7 @@ import (
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils"
"math" "math"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
@ -37,10 +38,11 @@ func (this *modelComp) getmodel(uid string) (result *pb.DBIsland, err error) {
} }
if err == mgo.MongodbNil { if err == mgo.MongodbNil {
result = &pb.DBIsland{ result = &pb.DBIsland{
Id: primitive.NewObjectID().Hex(), Id: primitive.NewObjectID().Hex(),
Uid: uid, Uid: uid,
Islands: make(map[int32]*pb.DBIslandItem), Opentime: utils.GetMonthStart(),
Nodes: make(map[int32]int32), Islands: make(map[int32]*pb.DBIslandItem),
Nodes: make(map[int32]int32),
} }
if err = this.Add(uid, result); err != nil { if err = this.Add(uid, result); err != nil {
this.module.Errorln(err) this.module.Errorln(err)

2
modules/shop/api_getlist.go
View File

@ -84,7 +84,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
tdata = configure.Now().Sub((time.Unix(sdata.LastRefreshTime, 0))) tdata = configure.Now().Sub((time.Unix(sdata.LastRefreshTime, 0)))
switch shopconf.Rtype { switch shopconf.Rtype {
case -1: //一百年不刷新 case -1: //一百年不刷新
ltime = 365 * 100 * 24 * time.Hour * time.Duration(shopconf.Rtime) ltime = 365 * 100 * 24 * time.Hour
case 1: case 1:
ltime = time.Hour * time.Duration(shopconf.Rtime) ltime = time.Hour * time.Duration(shopconf.Rtime)
break break

81
pb/island_db.pb.go
View File

@ -27,12 +27,13 @@ type DBIsland struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
Heroshop []int32 `protobuf:"varint,3,rep,packed,name=heroshop,proto3" json:"heroshop"` //英雄商店 Opentime int64 `protobuf:"varint,3,opt,name=opentime,proto3" json:"opentime"` //开启时间
Islands map[int32]*DBIslandItem `protobuf:"bytes,4,rep,name=islands,proto3" json:"islands" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //岛屿 Heroshop []int32 `protobuf:"varint,4,rep,packed,name=heroshop,proto3" json:"heroshop"` //英雄商店
Nodes map[int32]int32 `protobuf:"bytes,5,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //养成节点 Islands map[int32]*DBIslandItem `protobuf:"bytes,5,rep,name=islands,proto3" json:"islands" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //岛屿
Freeprogress int32 `protobuf:"varint,6,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取天数 Nodes map[int32]int32 `protobuf:"bytes,6,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //养成节点
Payprogress int32 `protobuf:"varint,7,opt,name=payprogress,proto3" json:"payprogress"` Freeprogress int32 `protobuf:"varint,7,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取天数
Vip bool `protobuf:"varint,8,opt,name=vip,proto3" json:"vip"` Payprogress int32 `protobuf:"varint,8,opt,name=payprogress,proto3" json:"payprogress"`
Vip bool `protobuf:"varint,9,opt,name=vip,proto3" json:"vip"`
} }
func (x *DBIsland) Reset() { func (x *DBIsland) Reset() {
@ -81,6 +82,13 @@ func (x *DBIsland) GetUid() string {
return "" return ""
} }
func (x *DBIsland) GetOpentime() int64 {
if x != nil {
return x.Opentime
}
return 0
}
func (x *DBIsland) GetHeroshop() []int32 { func (x *DBIsland) GetHeroshop() []int32 {
if x != nil { if x != nil {
return x.Heroshop return x.Heroshop
@ -131,7 +139,7 @@ type DBIslandItem struct {
Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
Level map[int32]int32 `protobuf:"bytes,2,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key 关卡id value 0或者不存在 表示未通关 不等于 0表示通关 不等于 1 表示 选择的剧情id Level map[int32]int32 `protobuf:"bytes,2,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //key 关卡id value 0或者不存在 表示未通关 不等于 0表示通关 不等于 1 表示 选择的剧情id
Pos *DBVector3 `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos"` Pos string `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos"`
} }
func (x *DBIslandItem) Reset() { func (x *DBIslandItem) Reset() {
@ -180,34 +188,35 @@ func (x *DBIslandItem) GetLevel() map[int32]int32 {
return nil return nil
} }
func (x *DBIslandItem) GetPos() *DBVector3 { func (x *DBIslandItem) GetPos() string {
if x != nil { if x != nil {
return x.Pos return x.Pos
} }
return nil return ""
} }
var File_island_island_db_proto protoreflect.FileDescriptor var File_island_island_db_proto protoreflect.FileDescriptor
var file_island_island_db_proto_rawDesc = []byte{ var file_island_island_db_proto_rawDesc = []byte{
0x0a, 0x16, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2f, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x5f, 0x0a, 0x16, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2f, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x5f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9f, 0x03, 0x0a, 0x08, 0x44, 0x42, 0x49,
0x72, 0x6f, 0x74, 0x6f, 0x22, 0x83, 0x03, 0x0a, 0x08, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x12, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x18,
0x30, 0x0a, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x12,
0x30, 0x0a, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x16, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x49, 0x73, 0x6c, 0x61, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x49, 0x73, 0x6c, 0x61,
0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64,
0x73, 0x12, 0x2a, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x14, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x4e, 0x6f, 0x64, 0x65,
0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x22, 0x0a,
0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x07, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73,
0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73,
0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72,
0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08,
0x52, 0x03, 0x76, 0x69, 0x70, 0x1a, 0x49, 0x0a, 0x0c, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x52, 0x03, 0x76, 0x69, 0x70, 0x1a, 0x49, 0x0a, 0x0c, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
@ -216,19 +225,18 @@ var file_island_island_db_proto_rawDesc = []byte{
0x1a, 0x38, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x1a, 0x38, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 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, 0xa6, 0x01, 0x0a, 0x0c, 0x44, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9a, 0x01, 0x0a, 0x0c, 0x44,
0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x6c,
0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x49, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x49,
0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x70,
0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x1a, 0x38, 0x0a,
0x74, 0x6f, 0x72, 0x33, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x74, 0x6f, 0x33,
} }
var ( var (
@ -250,19 +258,17 @@ var file_island_island_db_proto_goTypes = []interface{}{
nil, // 2: DBIsland.IslandsEntry nil, // 2: DBIsland.IslandsEntry
nil, // 3: DBIsland.NodesEntry nil, // 3: DBIsland.NodesEntry
nil, // 4: DBIslandItem.LevelEntry nil, // 4: DBIslandItem.LevelEntry
(*DBVector3)(nil), // 5: DBVector3
} }
var file_island_island_db_proto_depIdxs = []int32{ var file_island_island_db_proto_depIdxs = []int32{
2, // 0: DBIsland.islands:type_name -> DBIsland.IslandsEntry 2, // 0: DBIsland.islands:type_name -> DBIsland.IslandsEntry
3, // 1: DBIsland.nodes:type_name -> DBIsland.NodesEntry 3, // 1: DBIsland.nodes:type_name -> DBIsland.NodesEntry
4, // 2: DBIslandItem.level:type_name -> DBIslandItem.LevelEntry 4, // 2: DBIslandItem.level:type_name -> DBIslandItem.LevelEntry
5, // 3: DBIslandItem.pos:type_name -> DBVector3 1, // 3: DBIsland.IslandsEntry.value:type_name -> DBIslandItem
1, // 4: DBIsland.IslandsEntry.value:type_name -> DBIslandItem 4, // [4:4] is the sub-list for method output_type
5, // [5:5] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type
5, // [5:5] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name
5, // [5:5] is the sub-list for extension type_name 4, // [4:4] is the sub-list for extension extendee
5, // [5:5] is the sub-list for extension extendee 0, // [0:4] is the sub-list for field type_name
0, // [0:5] is the sub-list for field type_name
} }
func init() { file_island_island_db_proto_init() } func init() { file_island_island_db_proto_init() }
@ -270,7 +276,6 @@ func file_island_island_db_proto_init() {
if File_island_island_db_proto != nil { if File_island_island_db_proto != nil {
return return
} }
file_comm_proto_init()
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_island_island_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_island_island_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBIsland); i { switch v := v.(*DBIsland); i {

127
pb/island_msg.pb.go
View File

@ -232,10 +232,10 @@ type IsLandCompleteReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
Story int32 `protobuf:"varint,2,opt,name=story,proto3" json:"story"` AwardId int32 `protobuf:"varint,2,opt,name=awardId,proto3" json:"awardId"`
Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 打怪事件完成需要提交战报 Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 打怪事件完成需要提交战报
Pos *DBVector3 `protobuf:"bytes,4,opt,name=pos,proto3" json:"pos"` Pos string `protobuf:"bytes,4,opt,name=pos,proto3" json:"pos"`
} }
func (x *IsLandCompleteReq) Reset() { func (x *IsLandCompleteReq) Reset() {
@ -277,9 +277,9 @@ func (x *IsLandCompleteReq) GetLevel() int32 {
return 0 return 0
} }
func (x *IsLandCompleteReq) GetStory() int32 { func (x *IsLandCompleteReq) GetAwardId() int32 {
if x != nil { if x != nil {
return x.Story return x.AwardId
} }
return 0 return 0
} }
@ -291,11 +291,11 @@ func (x *IsLandCompleteReq) GetReport() *BattleReport {
return nil return nil
} }
func (x *IsLandCompleteReq) GetPos() *DBVector3 { func (x *IsLandCompleteReq) GetPos() string {
if x != nil { if x != nil {
return x.Pos return x.Pos
} }
return nil return ""
} }
//海岛探险 关卡完成 回应 //海岛探险 关卡完成 回应
@ -304,9 +304,9 @@ type IsLandCompleteResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
Story int32 `protobuf:"varint,2,opt,name=story,proto3" json:"story"` AwardId int32 `protobuf:"varint,2,opt,name=awardId,proto3" json:"awardId"`
Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励 Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"` //奖励
} }
func (x *IsLandCompleteResp) Reset() { func (x *IsLandCompleteResp) Reset() {
@ -348,9 +348,9 @@ func (x *IsLandCompleteResp) GetLevel() int32 {
return 0 return 0
} }
func (x *IsLandCompleteResp) GetStory() int32 { func (x *IsLandCompleteResp) GetAwardId() int32 {
if x != nil { if x != nil {
return x.Story return x.AwardId
} }
return 0 return 0
} }
@ -767,46 +767,45 @@ var file_island_island_msg_proto_rawDesc = []byte{
0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49,
0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x84, 0x01, 0x0a, 0x11, 0x49, 0x73, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7c, 0x0a, 0x11, 0x49, 0x73, 0x4c,
0x4c, 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14,
0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x25,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
0x72, 0x74, 0x12, 0x1c, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01,
0x0a, 0x2e, 0x44, 0x42, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x33, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x28, 0x09, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x65, 0x0a, 0x12, 0x49, 0x73, 0x4c, 0x61, 0x6e,
0x22, 0x61, 0x0a, 0x12, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x02,
0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x6f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x61, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x1f, 0x0a,
0x72, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x19,
0x61, 0x72, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x0a, 0x17, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65,
0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x36, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x18, 0x49, 0x73, 0x4c,
0x0a, 0x18, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f,
0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f,
0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x68, 0x65, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f,
0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x22, 0x22, 0x0a, 0x0c, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x70, 0x22, 0x22, 0x0a, 0x0c, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65,
0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x64, 0x73, 0x18, 0x01, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52,
0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x63, 0x69, 0x64, 0x73, 0x22, 0x30, 0x0a, 0x0d, 0x49, 0x73, 0x04, 0x63, 0x69, 0x64, 0x73, 0x22, 0x30, 0x0a, 0x0d, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42,
0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e,
0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6e,
0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x35, 0x0a,
0x69, 0x64, 0x22, 0x35, 0x0a, 0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65,
0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x12, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x12, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65,
0x61, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x11, 0x49, 0x73, 0x4c, 0x61,
0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42,
0x32, 0x09, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x05,
0x6f, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a,
0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6f, 0x33,
} }
var ( var (
@ -842,8 +841,7 @@ var file_island_island_msg_proto_goTypes = []interface{}{
(*BattleFormation)(nil), // 16: BattleFormation (*BattleFormation)(nil), // 16: BattleFormation
(*BattleInfo)(nil), // 17: BattleInfo (*BattleInfo)(nil), // 17: BattleInfo
(*BattleReport)(nil), // 18: BattleReport (*BattleReport)(nil), // 18: BattleReport
(*DBVector3)(nil), // 19: DBVector3 (*UserAtno)(nil), // 19: UserAtno
(*UserAtno)(nil), // 20: UserAtno
} }
var file_island_island_msg_proto_depIdxs = []int32{ var file_island_island_msg_proto_depIdxs = []int32{
14, // 0: IsLandInfoResp.info:type_name -> DBIsland 14, // 0: IsLandInfoResp.info:type_name -> DBIsland
@ -851,16 +849,15 @@ var file_island_island_msg_proto_depIdxs = []int32{
16, // 2: IsLandBattleReq.battle:type_name -> BattleFormation 16, // 2: IsLandBattleReq.battle:type_name -> BattleFormation
17, // 3: IsLandBattleResp.info:type_name -> BattleInfo 17, // 3: IsLandBattleResp.info:type_name -> BattleInfo
18, // 4: IsLandCompleteReq.report:type_name -> BattleReport 18, // 4: IsLandCompleteReq.report:type_name -> BattleReport
19, // 5: IsLandCompleteReq.pos:type_name -> DBVector3 19, // 5: IsLandCompleteResp.award:type_name -> UserAtno
20, // 6: IsLandCompleteResp.award:type_name -> UserAtno 19, // 6: IsLandBuyResp.award:type_name -> UserAtno
20, // 7: IsLandBuyResp.award:type_name -> UserAtno 14, // 7: IsLandReceiveResp.info:type_name -> DBIsland
14, // 8: IsLandReceiveResp.info:type_name -> DBIsland 19, // 8: IsLandReceiveResp.award:type_name -> UserAtno
20, // 9: IsLandReceiveResp.award:type_name -> UserAtno 9, // [9:9] is the sub-list for method output_type
10, // [10:10] is the sub-list for method output_type 9, // [9:9] is the sub-list for method input_type
10, // [10:10] is the sub-list for method input_type 9, // [9:9] is the sub-list for extension type_name
10, // [10:10] is the sub-list for extension type_name 9, // [9:9] is the sub-list for extension extendee
10, // [10:10] is the sub-list for extension extendee 0, // [0:9] is the sub-list for field type_name
0, // [0:10] is the sub-list for field type_name
} }
func init() { file_island_island_msg_proto_init() } func init() { file_island_island_msg_proto_init() }

42
sys/configure/structs/Game.PuggsyMake.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamePuggsyMake struct {
_dataMap map[int32]*GamePuggsyMakeData
_dataList []*GamePuggsyMakeData
}
func NewGamePuggsyMake(_buf []map[string]interface{}) (*GamePuggsyMake, error) {
_dataList := make([]*GamePuggsyMakeData, 0, len(_buf))
dataMap := make(map[int32]*GamePuggsyMakeData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamePuggsyMakeData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GamePuggsyMake{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamePuggsyMake) GetDataMap() map[int32]*GamePuggsyMakeData {
return table._dataMap
}
func (table *GamePuggsyMake) GetDataList() []*GamePuggsyMakeData {
return table._dataList
}
func (table *GamePuggsyMake) Get(key int32) *GamePuggsyMakeData {
return table._dataMap[key]
}

47
sys/configure/structs/Game.PuggsyMakeData.go Normal file
View File

@ -0,0 +1,47 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamePuggsyMakeData struct {
Id int32
MakeId int32
Position int32
MakeText string
Subitem int32
Png string
Value int32
}
const TypeId_GamePuggsyMakeData = 1897320479
func (*GamePuggsyMakeData) GetTypeId() int32 {
return 1897320479
}
func (_v *GamePuggsyMakeData)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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["make_id"].(float64); !_ok_ { err = errors.New("make_id error"); return }; _v.MakeId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["position"].(float64); !_ok_ { err = errors.New("position error"); return }; _v.Position = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subitem"].(float64); !_ok_ { err = errors.New("subitem error"); return }; _v.Subitem = int32(_tempNum_) }
{ var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
return
}
func DeserializeGamePuggsyMakeData(_buf map[string]interface{}) (*GamePuggsyMakeData, error) {
v := &GamePuggsyMakeData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.PuggsyStar.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamePuggsyStar struct {
_dataMap map[int32]*GamePuggsyStarData
_dataList []*GamePuggsyStarData
}
func NewGamePuggsyStar(_buf []map[string]interface{}) (*GamePuggsyStar, error) {
_dataList := make([]*GamePuggsyStarData, 0, len(_buf))
dataMap := make(map[int32]*GamePuggsyStarData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamePuggsyStarData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.MakeId] = _v
}
}
return &GamePuggsyStar{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamePuggsyStar) GetDataMap() map[int32]*GamePuggsyStarData {
return table._dataMap
}
func (table *GamePuggsyStar) GetDataList() []*GamePuggsyStarData {
return table._dataList
}
func (table *GamePuggsyStar) Get(key int32) *GamePuggsyStarData {
return table._dataMap[key]
}

66
sys/configure/structs/Game.PuggsyStarData.go Normal file
View File

@ -0,0 +1,66 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamePuggsyStarData struct {
MakeId int32
MakeTitle string
MakeText string
ConditionText string
Png string
Star int32
Score int32
Fire int32
Value int32
Drop []*Gameatn
}
const TypeId_GamePuggsyStarData = -1122304381
func (*GamePuggsyStarData) GetTypeId() int32 {
return -1122304381
}
func (_v *GamePuggsyStarData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["make_id"].(float64); !_ok_ { err = errors.New("make_id error"); return }; _v.MakeId = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeTitle error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["make_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MakeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MakeText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["condition_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ConditionText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ConditionText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fire"].(float64); !_ok_ { err = errors.New("fire error"); return }; _v.Fire = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["drop"].([]interface{}); !_ok_ { err = errors.New("drop error"); return }
_v.Drop = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Drop = append(_v.Drop, _list_v_)
}
}
return
}
func DeserializeGamePuggsyStarData(_buf map[string]interface{}) (*GamePuggsyStarData, error) {
v := &GamePuggsyStarData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.TipstxtMain.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameTipstxtMain struct {
_dataMap map[int32]*GameTipstxtMainData
_dataList []*GameTipstxtMainData
}
func NewGameTipstxtMain(_buf []map[string]interface{}) (*GameTipstxtMain, error) {
_dataList := make([]*GameTipstxtMainData, 0, len(_buf))
dataMap := make(map[int32]*GameTipstxtMainData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameTipstxtMainData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameTipstxtMain{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameTipstxtMain) GetDataMap() map[int32]*GameTipstxtMainData {
return table._dataMap
}
func (table *GameTipstxtMain) GetDataList() []*GameTipstxtMainData {
return table._dataList
}
func (table *GameTipstxtMain) Get(key int32) *GameTipstxtMainData {
return table._dataMap[key]
}

43
sys/configure/structs/Game.TipstxtMainData.go Normal file
View File

@ -0,0 +1,43 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameTipstxtMainData struct {
Id int32
Topname string
Name string
Txt string
Map string
}
const TypeId_GameTipstxtMainData = 1396868959
func (*GameTipstxtMainData) GetTypeId() int32 {
return 1396868959
}
func (_v *GameTipstxtMainData)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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["topname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Topname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Topname, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Map, _ok_ = _buf["map"].(string); !_ok_ { err = errors.New("map error"); return } }
return
}
func DeserializeGameTipstxtMainData(_buf map[string]interface{}) (*GameTipstxtMainData, error) {
v := &GameTipstxtMainData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.TipstxtSence.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameTipstxtSence struct {
_dataMap map[int32]*GameTipstxtSenceData
_dataList []*GameTipstxtSenceData
}
func NewGameTipstxtSence(_buf []map[string]interface{}) (*GameTipstxtSence, error) {
_dataList := make([]*GameTipstxtSenceData, 0, len(_buf))
dataMap := make(map[int32]*GameTipstxtSenceData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameTipstxtSenceData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameTipstxtSence{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameTipstxtSence) GetDataMap() map[int32]*GameTipstxtSenceData {
return table._dataMap
}
func (table *GameTipstxtSence) GetDataList() []*GameTipstxtSenceData {
return table._dataList
}
func (table *GameTipstxtSence) Get(key int32) *GameTipstxtSenceData {
return table._dataMap[key]
}

39
sys/configure/structs/Game.TipstxtSenceData.go Normal file
View File

@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameTipstxtSenceData struct {
Id int32
Topname string
Name string
}
const TypeId_GameTipstxtSenceData = 631971756
func (*GameTipstxtSenceData) GetTypeId() int32 {
return 631971756
}
func (_v *GameTipstxtSenceData)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.Topname, _ok_ = _buf["topname"].(string); !_ok_ { err = errors.New("topname error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
func DeserializeGameTipstxtSenceData(_buf map[string]interface{}) (*GameTipstxtSenceData, error) {
v := &GameTipstxtSenceData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.TrackType.go Normal file
View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameTrackType struct {
_dataMap map[int32]*GameTrackTypeData
_dataList []*GameTrackTypeData
}
func NewGameTrackType(_buf []map[string]interface{}) (*GameTrackType, error) {
_dataList := make([]*GameTrackTypeData, 0, len(_buf))
dataMap := make(map[int32]*GameTrackTypeData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameTrackTypeData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameTrackType{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameTrackType) GetDataMap() map[int32]*GameTrackTypeData {
return table._dataMap
}
func (table *GameTrackType) GetDataList() []*GameTrackTypeData {
return table._dataList
}
func (table *GameTrackType) Get(key int32) *GameTrackTypeData {
return table._dataMap[key]
}

39
sys/configure/structs/Game.TrackTypeData.go Normal file
View File

@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameTrackTypeData struct {
Id int32
TrackType int32
TrackName string
}
const TypeId_GameTrackTypeData = -1868610701
func (*GameTrackTypeData) GetTypeId() int32 {
return -1868610701
}
func (_v *GameTrackTypeData)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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TrackType"].(float64); !_ok_ { err = errors.New("TrackType error"); return }; _v.TrackType = int32(_tempNum_) }
{ var _ok_ bool; if _v.TrackName, _ok_ = _buf["TrackName"].(string); !_ok_ { err = errors.New("TrackName error"); return } }
return
}
func DeserializeGameTrackTypeData(_buf map[string]interface{}) (*GameTrackTypeData, error) {
v := &GameTrackTypeData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

35
sys/configure/structs/Tables.go
View File

@ -304,6 +304,11 @@ type Tables struct {
MoonLv *GameMoonLv MoonLv *GameMoonLv
MoonTask *GameMoonTask MoonTask *GameMoonTask
AskedRecruit *GameAskedRecruit AskedRecruit *GameAskedRecruit
TipstxtMain *GameTipstxtMain
TipstxtSence *GameTipstxtSence
TrackType *GameTrackType
PuggsyStar *GamePuggsyStar
PuggsyMake *GamePuggsyMake
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
@ -2069,5 +2074,35 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.AskedRecruit, err = NewGameAskedRecruit(buf) ; err != nil { if tables.AskedRecruit, err = NewGameAskedRecruit(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_tipstxtmain") ; err != nil {
return nil, err
}
if tables.TipstxtMain, err = NewGameTipstxtMain(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_tipstxtsence") ; err != nil {
return nil, err
}
if tables.TipstxtSence, err = NewGameTipstxtSence(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_tracktype") ; err != nil {
return nil, err
}
if tables.TrackType, err = NewGameTrackType(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_puggsystar") ; err != nil {
return nil, err
}
if tables.PuggsyStar, err = NewGamePuggsyStar(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_puggsymake") ; err != nil {
return nil, err
}
if tables.PuggsyMake, err = NewGamePuggsyMake(buf) ; err != nil {
return nil, err
}
return tables, nil return tables, nil
} }

9
utils/time.go
View File

@ -129,6 +129,15 @@ func IsInCDHour(cdTime int64) bool {
return configure.Now().Unix() < cdTime return configure.Now().Unix() < cdTime
} }
// 获取本月的开始和结束的时间戳
func GetMonthStart() int64 {
t := configure.Now()
monthStartDay := t.AddDate(0, 0, -t.Day()+1)
monthStartTime := time.Date(monthStartDay.Year(), monthStartDay.Month(), monthStartDay.Day(), 0, 0, 0, 0, t.Location())
_d1 := monthStartTime.Unix()
return _d1
}
// 获取本月的开始和结束的时间戳 // 获取本月的开始和结束的时间戳
func GetMonthStartEnd() (int64, int64) { func GetMonthStartEnd() (int64, int64) {
t := configure.Now() t := configure.Now()