石阵秘境

This commit is contained in:
meixiongfeng 2023-07-25 19:32:12 +08:00
parent 50c1fa8877
commit a4e8ecfcdd
21 changed files with 2468 additions and 883 deletions

View File

@ -775,6 +775,20 @@
"a": "attr",
"t": "arenacoin",
"n": 1000
},
"guildboss_kill_Preview": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"guildboss_challenge_preview": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -31,7 +31,7 @@
"main": [
{
"key": 2,
"param": 1100308
"param": 1100101
}
],
"wkqbx": 2,
@ -123,7 +123,7 @@
"main": [
{
"key": 2,
"param": 1100108
"param": 1100101
}
],
"wkqbx": 2,
@ -583,7 +583,7 @@
"main": [
{
"key": 2,
"param": 1100608
"param": 1100101
}
],
"wkqbx": 2,
@ -698,7 +698,7 @@
"main": [
{
"key": 2,
"param": 1100308
"param": 1100101
}
],
"wkqbx": 0,
@ -767,7 +767,7 @@
"main": [
{
"key": 2,
"param": 1100304
"param": 1100101
}
],
"wkqbx": 0,
@ -882,7 +882,7 @@
"main": [
{
"key": 2,
"param": 1100508
"param": 1100101
}
],
"wkqbx": 0,
@ -1254,7 +1254,7 @@
},
{
"key": 2,
"param": 1100408
"param": 1100101
}
],
"wkqbx": 0,
@ -1392,7 +1392,7 @@
"main": [
{
"key": 2,
"param": 1100107
"param": 1100101
}
],
"wkqbx": 1,
@ -1507,7 +1507,7 @@
"main": [
{
"key": 2,
"param": 1100108
"param": 1100101
}
],
"wkqbx": 1,
@ -1628,7 +1628,7 @@
"main": [
{
"key": 2,
"param": 1100204
"param": 1100101
}
],
"wkqbx": 0,
@ -1705,7 +1705,7 @@
},
{
"key": 2,
"param": 1100808
"param": 1100101
}
],
"wkqbx": 0,
@ -1732,7 +1732,7 @@
},
{
"key": 2,
"param": 1301208
"param": 1100101
}
],
"wkqbx": 0,
@ -1755,7 +1755,7 @@
"main": [
{
"key": 2,
"param": 1100208
"param": 1100101
}
],
"wkqbx": 0,
@ -1778,7 +1778,7 @@
"main": [
{
"key": 2,
"param": 1100504
"param": 1100101
},
{
"key": 3,
@ -1805,7 +1805,7 @@
"main": [
{
"key": 2,
"param": 1100504
"param": 1100101
}
],
"wkqbx": 0,
@ -1846,7 +1846,7 @@
"main": [
{
"key": 2,
"param": 1100608
"param": 1100101
}
],
"wkqbx": 0,

View File

@ -51,7 +51,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_5",
"text": "这里可以查看各种功夫陪练,完成陪练可以获得高额奖励。<br>完成3/6/9次的陪练还有外奖励可以领取。"
"text": "这里可以查看各种功夫陪练,完成陪练可以获得高额奖励。<br>完成3/6/9次的陪练还有外奖励可以领取。"
}
},
{
@ -62,7 +62,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_6",
"text": "这里可以选择守护者去完成陪练任务,每个陪练任务有不同的等级与阵容要求,满足格外需求还可以获得格外的道具奖励,完成任务可以获得高额奖励。"
"text": "这里可以选择守护者去完成陪练任务,每个陪练任务有不同的等级与阵容要求,满足额外需求还可以获得额外的道具奖励,完成任务可以获得高额奖励。"
}
},
{
@ -260,7 +260,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_24",
"text": "这里可以查看关卡星完成条件,积累一定的关卡星可以获得外的道具奖励。"
"text": "这里可以查看关卡星完成条件,积累一定的关卡星可以获得外的道具奖励。"
}
},
{
@ -381,7 +381,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_35",
"text": "这里可以登记不同职业类别,登记类别提升后,该类别的守护者可以获得外的木桩锻炼经验加成。"
"text": "这里可以登记不同职业类别,登记类别提升后,该类别的守护者可以获得外的木桩锻炼经验加成。"
}
},
{

View File

@ -1,22 +1,14 @@
[
{
"BuffId": 251023111,
"BuffId": 143006311,
"BuffGroupId": 1001,
"Type": 1,
"BuffLevel": 1,
"Quality": 1,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_1",
"text": "攻击buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_1",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_1",
"text": "描述描述描述"
"text": "描述描述描述1"
},
"BuffUpgradeCost": {
"a": "attr",
@ -30,28 +22,20 @@
}
},
{
"BuffId": 251023112,
"BuffId": 125004311,
"BuffGroupId": 1001,
"Type": 1,
"BuffLevel": 2,
"Quality": 1,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_2",
"text": "攻击buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_2",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_2",
"text": "描述描述描述"
"text": "描述描述描述2"
},
"BuffUpgradeCost": {
"a": "attr",
"t": "gold",
"n": 1
"n": 2
},
"BuffSell": {
"a": "attr",
@ -60,28 +44,20 @@
}
},
{
"BuffId": 200000001,
"BuffId": 135006211,
"BuffGroupId": 1002,
"Type": 2,
"Type": 1,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_3",
"text": "防御buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_3",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_3",
"text": "描述描述描述"
"text": "描述描述描述3"
},
"BuffUpgradeCost": {
"a": "attr",
"t": "gold",
"n": 2
"n": 3
},
"BuffSell": {
"a": "attr",
@ -90,28 +66,20 @@
}
},
{
"BuffId": 200000002,
"BuffId": 135006311,
"BuffGroupId": 1002,
"Type": 2,
"Type": 1,
"BuffLevel": 2,
"Quality": 2,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_4",
"text": "防御buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_4",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_4",
"text": "描述描述描述"
"text": "描述描述描述4"
},
"BuffUpgradeCost": {
"a": "attr",
"t": "gold",
"n": 3
"n": 4
},
"BuffSell": {
"a": "attr",
@ -120,23 +88,15 @@
}
},
{
"BuffId": 253005111,
"BuffId": 144004311,
"BuffGroupId": 1003,
"Type": 3,
"Type": 1,
"BuffLevel": 1,
"Quality": 1,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_5",
"text": "辅助buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_5",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_5",
"text": "描述描述描述"
"text": "描述描述描述5"
},
"BuffUpgradeCost": {
"a": "attr",
@ -150,23 +110,15 @@
}
},
{
"BuffId": 253005112,
"BuffId": 124006311,
"BuffGroupId": 1003,
"Type": 3,
"Type": 1,
"BuffLevel": 2,
"Quality": 1,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_6",
"text": "辅助buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_6",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_6",
"text": "描述描述描述"
"text": "描述描述描述6"
},
"BuffUpgradeCost": {
"a": "attr",
@ -180,23 +132,15 @@
}
},
{
"BuffId": 225002011,
"BuffId": 144002311,
"BuffGroupId": 1004,
"Type": 4,
"Type": 1,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_7",
"text": "控制buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_7",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_7",
"text": "描述描述描述"
"text": "描述描述描述7"
},
"BuffUpgradeCost": {
"a": "attr",
@ -210,23 +154,15 @@
}
},
{
"BuffId": 225002012,
"BuffId": 151513211,
"BuffGroupId": 1004,
"Type": 4,
"Type": 1,
"BuffLevel": 2,
"Quality": 2,
"BuffIcon": "",
"buffName": {
"key": "stonehenge_eventconfig_buffName_8",
"text": "控制buff"
},
"BuffDescription": {
"key": "stonehenge_buffconfig_BuffDescription_8",
"text": "描述描述描述"
},
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_8",
"text": "描述描述描述"
"text": "描述描述描述8"
},
"BuffUpgradeCost": {
"a": "attr",
@ -238,5 +174,49 @@
"t": "gold",
"n": 8
}
},
{
"BuffId": 143002311,
"BuffGroupId": 1005,
"Type": 1,
"BuffLevel": 1,
"Quality": 3,
"BuffIcon": "",
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_9",
"text": "描述描述描述9"
},
"BuffUpgradeCost": {
"a": "attr",
"t": "gold",
"n": 8
},
"BuffSell": {
"a": "attr",
"t": "gold",
"n": 9
}
},
{
"BuffId": 115005311,
"BuffGroupId": 1005,
"Type": 1,
"BuffLevel": 2,
"Quality": 3,
"BuffIcon": "",
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_10",
"text": "描述描述描述10"
},
"BuffUpgradeCost": {
"a": "attr",
"t": "gold",
"n": 9
},
"BuffSell": {
"a": "attr",
"t": "gold",
"n": 10
}
}
]

View File

@ -11,6 +11,7 @@
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 11000002,
"probability": 500
},
@ -26,6 +27,7 @@
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
@ -41,6 +43,7 @@
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
@ -56,6 +59,7 @@
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
@ -71,6 +75,7 @@
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
@ -86,6 +91,7 @@
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
}

View File

@ -106,5 +106,200 @@
"text": ""
},
"reword": []
},
{
"id": 302,
"name": {
"key": "worldtask_world_all_name_7",
"text": "支线测试A"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 303,
"name": {
"key": "worldtask_world_all_name_8",
"text": "支线测试B"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 304,
"name": {
"key": "worldtask_world_all_name_9",
"text": "支线测试C"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 305,
"name": {
"key": "worldtask_world_all_name_10",
"text": "支线测试D"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1010,
"name": {
"key": "worldtask_world_all_name_11",
"text": "日常测试1"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1020,
"name": {
"key": "worldtask_world_all_name_12",
"text": "日常测试2"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1030,
"name": {
"key": "worldtask_world_all_name_13",
"text": "日常测试3"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1040,
"name": {
"key": "worldtask_world_all_name_14",
"text": "日常测试4"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1050,
"name": {
"key": "worldtask_world_all_name_15",
"text": "日常测试5"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1060,
"name": {
"key": "worldtask_world_all_name_16",
"text": "日常测试6"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1070,
"name": {
"key": "worldtask_world_all_name_17",
"text": "日常测试7"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1080,
"name": {
"key": "worldtask_world_all_name_18",
"text": "日常测试8"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1090,
"name": {
"key": "worldtask_world_all_name_19",
"text": "日常测试9"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1100,
"name": {
"key": "worldtask_world_all_name_20",
"text": "日常测试10"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 1110,
"name": {
"key": "worldtask_world_all_name_21",
"text": "日常测试11"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
}
]

View File

@ -1,8 +1,10 @@
package stonehenge
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@ -16,18 +18,33 @@ func (this *apiComp) EnterLevelCheck(session comm.IUserSession, req *pb.Stonehen
return
}
// 选择英雄
//进入关卡 选择英雄和buff 一起处理
func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnterLevelReq) (errdata *pb.ErrorData) {
var (
stone *pb.DBStonehenge
update map[string]interface{}
heros []*pb.DBHero
portal int32 // 生成传送门 构造房间数据
confStage *cfg.GameStroneStageData
roomlotteryConf *cfg.GameRoomlotteryData
roomConf *cfg.GameStroneRoomData
szBuff []int32
err error
)
update = make(map[string]interface{})
if errdata = this.EnterLevelCheck(session, req); errdata != nil {
return
}
confStage = this.module.configure.GetStageConfByStageid(req.Stageid, 1)
if confStage == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
}
return
}
portal = confStage.RoomGroup
this.module.Debugf("%v", confStage)
stone = this.module.modelStonehenge.GetStonehengeData(session.GetUserId())
if len(stone.Hero) != 0 || len(stone.Addweight) != 0 {
@ -55,6 +72,37 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
update["hero"] = stone.Hero
stone.Addweight[req.BuffType] = 1
update["addweight"] = stone.Addweight
// 生成传送门
if roomlotteryConf = this.module.configure.GetRoomLotterConfById(portal); roomlotteryConf != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: fmt.Sprintf("GetRoomLotterConfById :%d", portal),
}
return
}
stone.Rooms = &pb.RoomData{
Eventid: map[int32]bool{},
Portal: this.module.configure.GetRoomGroupDataByLottery(confStage.PortalGroup),
Selectbuff: []int32{},
Complete: false,
Index: 1,
Roomid: confStage.RoomGroup, // 第一个房间的房间id读配置
}
if roomConf, err = this.module.configure.GetStoneRoomDataById(portal); err != nil {
return
}
if roomConf.EventrewardGroup != 0 { // 参数校验
szBuff = this.module.configure.GetEventGroupDataByLottery(roomConf.EventrewardGroup)
for _, v := range szBuff {
stone.Rooms.Eventid[v] = true
}
}
update["rooms"] = stone.Rooms
update["curRoomIndes"] = stone.CurRoomIndes
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "enterlevel", &pb.StonehengeEnterLevelResp{
Hero: stone.Hero,

View File

@ -1,8 +1,10 @@
package stonehenge
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
//参数校验
@ -16,11 +18,14 @@ func (this *apiComp) EventCheck(session comm.IUserSession, req *pb.StonehengeEve
return
}
// 结算房间
func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq) (errdata *pb.ErrorData) {
var (
stone *pb.DBStonehenge
update map[string]interface{}
roomConf *cfg.GameStroneRoomData
err error
newEvent int32 // 是否有新的事件
eventConf *cfg.GameStroneEventData
)
update = make(map[string]interface{})
if errdata = this.EventCheck(session, req); errdata != nil {
@ -28,13 +33,47 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
}
stone = this.module.modelStonehenge.GetStonehengeData(session.GetUserId())
stone.StageID = 0
if _, ok := stone.Rooms.Eventid[req.Eventid]; !ok { // 不存在该事件
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid),
}
return
}
if stone.Rooms.Eventid[req.Eventid] { // 重复完成
errdata = &pb.ErrorData{
Code: pb.ErrorCode_StonehengeRepeatedReward,
Title: pb.ErrorCode_StonehengeRepeatedReward.ToString(),
Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid),
}
return
}
update["stageID"] = stone.StageID
if roomConf, err = this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err != nil {
return
}
if eventConf, err = this.module.configure.GetStoneEventDataById(req.Eventid); err != nil {
return
}
// 校验事件有后续事件
if eventConf.Probability >= comm.GetRandNum(0, 1000) { // 命中
newEvent = eventConf.PostEvent
stone.Rooms.Eventid[newEvent] = false //
stone.Rooms.Eventid[req.Eventid] = true //
}
// 校验是否通关
if roomConf.Condition == req.Eventid {
stone.Rooms.Complete = true
}
update["rooms"] = stone.Rooms
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "event", &pb.StonehengeEventResp{
Eventid: req.Eventid,
NewEvent: newEvent,
Room: stone.Rooms,
})
return
}

View File

@ -30,13 +30,19 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
// 校验传送门
if stone.Rooms != nil {
if !stone.Rooms.Complete { // 上一关好没有完成 不能进下一关
errdata = &pb.ErrorData{
Code: pb.ErrorCode_StonehengeGotoRoomFailed,
Message: pb.ErrorCode_StonehengeGotoRoomFailed.ToString(),
}
return
}
for _, v := range stone.Rooms.Portal {
if v == req.Portal {
bCheck = true
break
}
}
}
if !bCheck {
errdata = &pb.ErrorData{

View File

@ -27,7 +27,7 @@ type configureComp struct {
module *Stonehenge
hlock sync.RWMutex
// stronestage
stage map[int32][]*cfg.GameStroneStageData
stage map[int64]*cfg.GameStroneStageData
// buff
buff map[int32]map[int32]struct{} // key buff 类型 value buffid
@ -95,7 +95,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
configure.RegisterConfigure(game_stageconf, cfg.NewGameStroneStage, this.LoadGameStroneStage)
configure.RegisterConfigure(game_buffconf, cfg.NewGameStroneBuff, this.LoadGameStroneBuff)
this.GetGameStroneBuff(2)
return
}
@ -324,9 +323,11 @@ func (this *configureComp) LoadRoomGroupData() {
return
}
func (this *configureComp) GetRoomLotterConfById(id int32) (data *cfg.GameRoomlotteryData) {
if v, err := this.GetConfigure(game_roomlottery); err == nil {
if configure, ok := v.(*cfg.GameRoomlottery); ok {
return configure.Get(id)
data = configure.Get(id)
return
}
}
return
@ -704,9 +705,10 @@ func (this *configureComp) LoadGameStroneStage() {
if configure, ok := v.(*cfg.GameStroneStage); ok {
this.hlock.Lock()
defer this.hlock.Unlock()
this.stage = make(map[int32][]*cfg.GameStroneStageData)
this.stage = make(map[int64]*cfg.GameStroneStageData, 0)
for _, v := range configure.GetDataList() {
this.stage[v.StageId] = append(this.stage[v.StageId], v)
key := int64(v.StageId)<<16 + int64(v.RoomId)
this.stage[key] = v
}
}
}
@ -714,8 +716,10 @@ func (this *configureComp) LoadGameStroneStage() {
return
}
func (this *configureComp) GetStageConfByStageid(stgeid int32) (conf []*cfg.GameStroneStageData) {
return this.stage[stgeid]
// 参数1 关卡id 参数2 层数id
func (this *configureComp) GetStageConfByStageid(stgeid int32, roomid int32) (conf *cfg.GameStroneStageData) {
key := int64(stgeid)<<16 + int64(roomid)
return this.stage[key]
}
func (this *configureComp) LoadGameStroneBuff() {

View File

@ -422,6 +422,8 @@ const (
ErrorCode_StonehengeRepeatedSelectBUff ErrorCode = 4902 // 重复选择buff
ErrorCode_StonehengePortalErr ErrorCode = 4903 // 传送门校验不对
ErrorCode_StonehengeEnterRoomFailed ErrorCode = 4904 // 进入房间失败
ErrorCode_StonehengeRepeatedReward ErrorCode = 4905 // 事件重复完成
ErrorCode_StonehengeGotoRoomFailed ErrorCode = 4906 // 进入房间失败
)
// Enum value maps for ErrorCode.
@ -784,6 +786,8 @@ var (
4902: "StonehengeRepeatedSelectBUff",
4903: "StonehengePortalErr",
4904: "StonehengeEnterRoomFailed",
4905: "StonehengeRepeatedReward",
4906: "StonehengeGotoRoomFailed",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@ -1143,6 +1147,8 @@ var (
"StonehengeRepeatedSelectBUff": 4902,
"StonehengePortalErr": 4903,
"StonehengeEnterRoomFailed": 4904,
"StonehengeRepeatedReward": 4905,
"StonehengeGotoRoomFailed": 4906,
}
)
@ -1177,7 +1183,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2a, 0xf6, 0x41, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x6f, 0x2a, 0xb4, 0x42, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@ -1704,8 +1710,12 @@ var file_errorcode_proto_rawDesc = []byte{
0x12, 0x18, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x6f,
0x72, 0x74, 0x61, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xa7, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74,
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f,
0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xa8, 0x26, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xa8, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74,
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xa9, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74, 0x6f,
0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x46,
0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xaa, 0x26, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -33,6 +33,7 @@ type RoomData struct {
Complete bool `protobuf:"varint,5,opt,name=complete,proto3" json:"complete"` // 房间是否通关
//repeated int32 selectweight = 9; // 进入关卡就要选择的
Index int32 `protobuf:"varint,6,opt,name=index,proto3" json:"index"` // 房间索引
Roomid int32 `protobuf:"varint,7,opt,name=roomid,proto3" json:"roomid"` // 房间id
}
func (x *RoomData) Reset() {
@ -102,6 +103,13 @@ func (x *RoomData) GetIndex() int32 {
return 0
}
func (x *RoomData) GetRoomid() int32 {
if x != nil {
return x.Roomid
}
return 0
}
type DBStonehenge struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -235,7 +243,7 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{
0x0a, 0x1e, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2f, 0x73, 0x74, 0x6f,
0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x1a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe2, 0x01, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfa, 0x01, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x30, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64,
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74,
0x61, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
@ -246,47 +254,49 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{
0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69,
0x6e, 0x64, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65,
0x78, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x45, 0x6e, 0x74, 0x72,
0x78, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28,
0x05, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x76, 0x65,
0x6e, 0x74, 0x69, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e,
0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67,
0x65, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65,
0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64,
0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f,
0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18,
0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61,
0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75,
0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66,
0x66, 0x12, 0x37, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
0x67, 0x65, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65,
0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, 0x06, 0x72,
0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42,
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72,
0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a,
0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74,
0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x04,
0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x12, 0x0e,
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28,
0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x75,
0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x12, 0x1f,
0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x12,
0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05,
0x52, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x12, 0x37, 0x0a, 0x08, 0x75, 0x73, 0x65,
0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42,
0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x62,
0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75,
0x66, 0x66, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x68,
0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69,
0x67, 0x68, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74,
0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67,
0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67,
0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 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, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 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, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 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, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a,
0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 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, 0x08, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77,
0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 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, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -343,9 +343,9 @@ type StonehengeEventReq struct {
unknownFields protoimpl.UnknownFields
Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id
Param1 string `protobuf:"bytes,2,opt,name=param1,proto3" json:"param1"`
Param2 string `protobuf:"bytes,3,opt,name=param2,proto3" json:"param2"`
Param3 string `protobuf:"bytes,4,opt,name=param3,proto3" json:"param3"`
Param1 int32 `protobuf:"varint,2,opt,name=param1,proto3" json:"param1"`
Param2 int32 `protobuf:"varint,3,opt,name=param2,proto3" json:"param2"`
Param3 int32 `protobuf:"varint,4,opt,name=param3,proto3" json:"param3"`
}
func (x *StonehengeEventReq) Reset() {
@ -387,25 +387,25 @@ func (x *StonehengeEventReq) GetEventid() int32 {
return 0
}
func (x *StonehengeEventReq) GetParam1() string {
func (x *StonehengeEventReq) GetParam1() int32 {
if x != nil {
return x.Param1
}
return ""
return 0
}
func (x *StonehengeEventReq) GetParam2() string {
func (x *StonehengeEventReq) GetParam2() int32 {
if x != nil {
return x.Param2
}
return ""
return 0
}
func (x *StonehengeEventReq) GetParam3() string {
func (x *StonehengeEventReq) GetParam3() int32 {
if x != nil {
return x.Param3
}
return ""
return 0
}
type StonehengeEventResp struct {
@ -416,7 +416,7 @@ type StonehengeEventResp struct {
Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id
NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id
Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"`
Reward *UserAssets `protobuf:"bytes,4,opt,name=reward,proto3" json:"reward"` // 完成事件获得的奖励
Reward []*UserAssets `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励
}
func (x *StonehengeEventResp) Reset() {
@ -472,7 +472,7 @@ func (x *StonehengeEventResp) GetRoom() *RoomData {
return nil
}
func (x *StonehengeEventResp) GetReward() *UserAssets {
func (x *StonehengeEventResp) GetReward() []*UserAssets {
if x != nil {
return x.Reward
}
@ -826,7 +826,7 @@ type StonehengeBattleOverResp struct {
Eventid int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id
NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id
Room *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"`
Reward *UserAssets `protobuf:"bytes,4,opt,name=reward,proto3" json:"reward"` // 完成事件获得的奖励
Reward []*UserAssets `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"` // 完成事件获得的奖励
}
func (x *StonehengeBattleOverResp) Reset() {
@ -882,7 +882,7 @@ func (x *StonehengeBattleOverResp) GetRoom() *RoomData {
return nil
}
func (x *StonehengeBattleOverResp) GetReward() *UserAssets {
func (x *StonehengeBattleOverResp) GetReward() []*UserAssets {
if x != nil {
return x.Reward
}
@ -930,10 +930,10 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65,
0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70,
0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72,
0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20,
0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70,
0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70,
0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72,
0x61, 0x6d, 0x33, 0x22, 0x8f, 0x01, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65,
0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76,
@ -941,7 +941,7 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e,
0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d,
0x12, 0x23, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
0x12, 0x23, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72,
0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
@ -978,7 +978,7 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04,
0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f,
0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x23, 0x0a, 0x06, 0x72,
0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}

View File

@ -17,7 +17,8 @@ type GameGuildBossData struct {
BossLv int32
Hp int32
BattleReadyID int32
BossImg int32
HeroId string
PreviewReward []*Gameatn
KillReward []*Gameatn
Boss []int32
Score int32
@ -38,7 +39,21 @@ func (_v *GameGuildBossData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_lv"].(float64); !_ok_ { err = errors.New("boss_lv error"); return }; _v.BossLv = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_img"].(float64); !_ok_ { err = errors.New("boss_img error"); return }; _v.BossImg = int32(_tempNum_) }
{ var _ok_ bool; if _v.HeroId, _ok_ = _buf["heroId"].(string); !_ok_ { err = errors.New("heroId error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["preview_reward"].([]interface{}); !_ok_ { err = errors.New("preview_reward error"); return }
_v.PreviewReward = 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.PreviewReward = append(_v.PreviewReward, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool

View File

@ -22,6 +22,7 @@ type GameMainStageData struct {
Venturemodel string
Venturetype int32
Ventureavatar []string
Herocolor int32
Heroimg string
Bubbletext string
Animation string
@ -45,6 +46,7 @@ type GameMainStageData struct {
Star []int32
StarType []int32
StarValue []int32
Challengeward int32
}
const TypeId_GameMainStageData = -1084910317
@ -91,6 +93,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["herocolor"].(float64); !_ok_ { err = errors.New("herocolor error"); return }; _v.Herocolor = int32(_tempNum_) }
{ var _ok_ bool; if _v.Heroimg, _ok_ = _buf["heroimg"].(string); !_ok_ { err = errors.New("heroimg error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["bubbletext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Bubbletext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Bubbletext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Animation, _ok_ = _buf["animation"].(string); !_ok_ { err = errors.New("animation error"); return } }
@ -218,6 +221,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["challengeward"].(float64); !_ok_ { err = errors.New("challengeward error"); return }; _v.Challengeward = int32(_tempNum_) }
return
}

View File

@ -17,8 +17,6 @@ type GameStroneBuffData struct {
BuffLevel int32
Quality int32
BuffIcon string
BuffName string
BuffDescription string
BuffStory string
BuffUpgradeCost *Gameatn
BuffSell *Gameatn
@ -37,8 +35,6 @@ func (_v *GameStroneBuffData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffLevel"].(float64); !_ok_ { err = errors.New("BuffLevel error"); return }; _v.BuffLevel = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Quality"].(float64); !_ok_ { err = errors.New("Quality error"); return }; _v.Quality = int32(_tempNum_) }
{ var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["BuffIcon"].(string); !_ok_ { err = errors.New("BuffIcon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["buffName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffName, _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["BuffDescription"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffDescription error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffDescription, _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["BuffStory"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BuffStory error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BuffStory, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffUpgradeCost"].(map[string]interface{}); !_ok_ { err = errors.New("BuffUpgradeCost error"); return }; if _v.BuffUpgradeCost, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["BuffSell"].(map[string]interface{}); !_ok_ { err = errors.New("BuffSell error"); return }; if _v.BuffSell, err = DeserializeGameatn(_x_); err != nil { return } }

View File

@ -19,6 +19,7 @@ type GameStroneEventData struct {
Value2 int32
Value3 int32
Value4 int32
CostItem []*Gameatn
PostEvent int32
Probability int32
}
@ -38,6 +39,20 @@ func (_v *GameStroneEventData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value2"].(float64); !_ok_ { err = errors.New("Value2 error"); return }; _v.Value2 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value3"].(float64); !_ok_ { err = errors.New("Value3 error"); return }; _v.Value3 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value4"].(float64); !_ok_ { err = errors.New("Value4 error"); return }; _v.Value4 = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["CostItem"].([]interface{}); !_ok_ { err = errors.New("CostItem error"); return }
_v.CostItem = 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.CostItem = append(_v.CostItem, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PostEvent"].(float64); !_ok_ { err = errors.New("PostEvent error"); return }; _v.PostEvent = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
return

View File

@ -249,6 +249,8 @@ type GameGlobalData struct {
Voucher *Gameatn
Passlvmax int32
GuildbossRoulette *Gameatn
GuildbossKillPreview []*Gameatn
GuildbossChallengePreview []*Gameatn
}
const TypeId_GameGlobalData = 477542761
@ -1003,6 +1005,34 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["voucher"].(map[string]interface{}); !_ok_ { err = errors.New("voucher error"); return }; if _v.Voucher, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passlvmax"].(float64); !_ok_ { err = errors.New("passlvmax error"); return }; _v.Passlvmax = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["guildboss_roulette"].(map[string]interface{}); !_ok_ { err = errors.New("guildboss_roulette error"); return }; if _v.GuildbossRoulette, err = DeserializeGameatn(_x_); err != nil { return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["guildboss_kill_Preview"].([]interface{}); !_ok_ { err = errors.New("guildboss_kill_Preview error"); return }
_v.GuildbossKillPreview = 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.GuildbossKillPreview = append(_v.GuildbossKillPreview, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["guildboss_challenge_preview"].([]interface{}); !_ok_ { err = errors.New("guildboss_challenge_preview error"); return }
_v.GuildbossChallengePreview = 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.GuildbossChallengePreview = append(_v.GuildbossChallengePreview, _list_v_)
}
}
return
}