From fd9fb02ca70a2f2f160169711d64564db12eca2f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 18:32:35 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=A7=AF=E5=88=86boss=20=E6=88=91=E6=96=B9?=
=?UTF-8?q?=20=E6=88=96=E6=95=8C=E6=96=B9=20buff=20=E5=B8=A6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_integralbuff.json | 398 ++++++++++++++++++
comm/imodule.go | 2 +-
modules/battle/modelBattle.go | 14 +-
modules/battle/module.go | 4 +-
modules/integral/api_challenge.go | 43 +-
modules/integral/comp_configure.go | 17 +
sys/configure/structs/Game.IntegralBuff.go | 42 ++
.../structs/Game.IntegralBuffData.go | 62 +++
sys/configure/structs/Tables.go | 7 +
9 files changed, 568 insertions(+), 21 deletions(-)
create mode 100644 bin/json/game_integralbuff.json
create mode 100644 sys/configure/structs/Game.IntegralBuff.go
create mode 100644 sys/configure/structs/Game.IntegralBuffData.go
diff --git a/bin/json/game_integralbuff.json b/bin/json/game_integralbuff.json
new file mode 100644
index 000000000..960378881
--- /dev/null
+++ b/bin/json/game_integralbuff.json
@@ -0,0 +1,398 @@
+[
+ {
+ "skillid": 310001001,
+ "type": 1,
+ "val": 1,
+ "show": 1,
+ "incompatibility": [
+ 310001002
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_01",
+ "text": "我方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_01",
+ "text": "我方守护者生命上限提升30%"
+ }
+ },
+ {
+ "skillid": 310001002,
+ "type": 1,
+ "val": 2,
+ "show": 1,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_02",
+ "text": "我方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_02",
+ "text": "我方守护者受到伤害降低30%"
+ }
+ },
+ {
+ "skillid": 310001003,
+ "type": 1,
+ "val": 3,
+ "show": 1,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_03",
+ "text": "我方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_03",
+ "text": "守护者血量低于30%时，伤害提升60%"
+ }
+ },
+ {
+ "skillid": 310001004,
+ "type": 2,
+ "val": 1,
+ "show": 1,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_04",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_04",
+ "text": "敌方全体伤害提升10%"
+ }
+ },
+ {
+ "skillid": 310001005,
+ "type": 2,
+ "val": 2,
+ "show": 1,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_05",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_05",
+ "text": "敌方全体伤害提升20%"
+ }
+ },
+ {
+ "skillid": 310001006,
+ "type": 2,
+ "val": 3,
+ "show": 1,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_06",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_06",
+ "text": "敌方全体伤害提升30%"
+ }
+ },
+ {
+ "skillid": 310001007,
+ "type": 2,
+ "val": 1,
+ "show": 2,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_07",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_07",
+ "text": "敌方全体速度+2"
+ }
+ },
+ {
+ "skillid": 310001008,
+ "type": 2,
+ "val": 2,
+ "show": 2,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_08",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_08",
+ "text": "敌方全体速度+3"
+ }
+ },
+ {
+ "skillid": 310001009,
+ "type": 2,
+ "val": 3,
+ "show": 2,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_09",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_09",
+ "text": "敌方全体速度+4"
+ }
+ },
+ {
+ "skillid": 310001010,
+ "type": 2,
+ "val": 1,
+ "show": 3,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_10",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_10",
+ "text": "我方守护者受到的治疗效果降低10%"
+ }
+ },
+ {
+ "skillid": 310001011,
+ "type": 2,
+ "val": 2,
+ "show": 3,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_11",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_11",
+ "text": "我方守护者受到的治疗效果降低20%"
+ }
+ },
+ {
+ "skillid": 310001012,
+ "type": 2,
+ "val": 3,
+ "show": 3,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_12",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_12",
+ "text": "我方守护者受到的治疗效果降低30%"
+ }
+ },
+ {
+ "skillid": 310001013,
+ "type": 2,
+ "val": 1,
+ "show": 4,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_13",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_13",
+ "text": "战斗开始后，我方随机2名守护者获得2回合的流血"
+ }
+ },
+ {
+ "skillid": 310001014,
+ "type": 2,
+ "val": 1,
+ "show": 5,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_14",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_14",
+ "text": "敌方造成的流血和眩晕将额外增加1回合持续时间"
+ }
+ },
+ {
+ "skillid": 310001015,
+ "type": 2,
+ "val": 2,
+ "show": 5,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_15",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_15",
+ "text": "敌方攻击眩晕状态的敌人时，无视受击者15%防御"
+ }
+ },
+ {
+ "skillid": 310001016,
+ "type": 2,
+ "val": 3,
+ "show": 5,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_16",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_16",
+ "text": "敌方攻击处于流血状态的敌人时，额外增加40%暴击伤害"
+ }
+ },
+ {
+ "skillid": 310001017,
+ "type": 2,
+ "val": 1,
+ "show": 6,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_17",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_17",
+ "text": "每3回合，驱散敌方全部减益1次"
+ }
+ },
+ {
+ "skillid": 310001018,
+ "type": 2,
+ "val": 2,
+ "show": 6,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_18",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_18",
+ "text": "除BOSS外，所有友方技能最大冷却时间增加1回合"
+ }
+ },
+ {
+ "skillid": 310001019,
+ "type": 2,
+ "val": 3,
+ "show": 6,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_19",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_19",
+ "text": "每3回合，驱散我方守护者全部增益1次"
+ }
+ },
+ {
+ "skillid": 310001020,
+ "type": 2,
+ "val": 1,
+ "show": 7,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_20",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_20",
+ "text": "战斗开始后，我方全体各自失去20%生命"
+ }
+ },
+ {
+ "skillid": 310001021,
+ "type": 2,
+ "val": 1,
+ "show": 8,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_21",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_21",
+ "text": "敌方会心提升20%"
+ }
+ },
+ {
+ "skillid": 310001022,
+ "type": 2,
+ "val": 2,
+ "show": 8,
+ "incompatibility": [
+ 310001001
+ ],
+ "name": {
+ "key": "IntegralBoss_Integralbuff_name_22",
+ "text": "敌方增益"
+ },
+ "icon": "wp_icon_10021",
+ "des": {
+ "key": "IntegralBoss_Integralbuff_des_22",
+ "text": "敌方全体免疫控制效果（小怪生效）"
+ }
+ }
+]
\ No newline at end of file
diff --git a/comm/imodule.go b/comm/imodule.go
index 2183856e8..6b4ef4032 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -338,7 +338,7 @@ type (
CreateStoneBattle(session IUserSession, stoneBattle *pb.StroneBattleReq) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
// 可以携带debuff 的战斗
- CreateDebuffBattle(session IUserSession, req *pb.BattlePVEReq, dibuff []int32) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
+ CreateDebuffBattle(session IUserSession, req *pb.BattlePVEReq, webuff []int32, dibuff []int32) (errdata *pb.ErrorData, record *pb.DBBattleRecord)
// 跑服务端战斗
RunServerBattle(session IUserSession, req *pb.BattleRunReq) (errdata *pb.ErrorData, record *pb.BattleRunResp)
diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index 7900ab2f5..2f9f983b4 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -1206,7 +1206,7 @@ func (this *modelBattleComp) creatStoneBattle(session comm.IUserSession, stoneBa
}
// 创建pve 战斗记录
-func (this *modelBattleComp) createAddDebuffPve(session comm.IUserSession, stag string, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEReq, conf *cfg.GameBattleReadyData, dibuff []int32) (record *pb.DBBattleRecord, errdata *pb.ErrorData) {
+func (this *modelBattleComp) createAddDebuffPve(session comm.IUserSession, stag string, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEReq, conf *cfg.GameBattleReadyData, webuff []int32, dibuff []int32) (record *pb.DBBattleRecord, errdata *pb.ErrorData) {
var (
heros []*pb.DBHero = make([]*pb.DBHero, 5)
captain int32
@@ -1257,6 +1257,15 @@ func (this *modelBattleComp) createAddDebuffPve(session comm.IUserSession, stag
} else {
record.Redflist[0].Team[i] = nil
}
+ sz := make([]*pb.DySkillData, 0)
+ for _, key := range webuff {
+ sz = append(sz, &pb.DySkillData{
+ SkillID: key,
+ SkillLv: 1, //不纠结 积分boss debuff技能等级只能是1级
+ Param: 0,
+ })
+ }
+ record.Redflist[0].Team[i].BattleBeforeSkill = append(record.Redflist[0].Team[i].BattleBeforeSkill, sz...)
}
//好友的英雄阵营
for i, v := range req.Format.Friendformat {
@@ -1294,6 +1303,7 @@ func (this *modelBattleComp) createAddDebuffPve(session comm.IUserSession, stag
}
}
+ // 我方buff 带入
if conf.DefaultHero != 0 {
if captain, masters, errdata = this.createMasterRoles(1100, 0, conf.DefaultHero); errdata != nil {
@@ -1324,7 +1334,7 @@ func (this *modelBattleComp) createAddDebuffPve(session comm.IUserSession, stag
Param: 0,
})
}
- v1.BattleBeforeSkill = append(v1.BattleBeforeSkill)
+ v1.BattleBeforeSkill = append(v1.BattleBeforeSkill, sz...)
}
}
record.Buleflist[i] = &pb.DBBattleFormt{
diff --git a/modules/battle/module.go b/modules/battle/module.go
index 32f97cf8f..5e4556c05 100644
--- a/modules/battle/module.go
+++ b/modules/battle/module.go
@@ -619,7 +619,7 @@ func (this *Battle) CreateStoneBattle(session comm.IUserSession, stoneBattle *pb
}
// 创建pve战斗
-func (this *Battle) CreateDebuffBattle(session comm.IUserSession, req *pb.BattlePVEReq, dibuff []int32) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
+func (this *Battle) CreateDebuffBattle(session comm.IUserSession, req *pb.BattlePVEReq, webuff []int32, dibuff []int32) (errdata *pb.ErrorData, record *pb.DBBattleRecord) {
var (
conf *cfg.GameBattleReadyData
conn *db.DBConn
@@ -674,7 +674,7 @@ func (this *Battle) CreateDebuffBattle(session comm.IUserSession, req *pb.Battle
}
}
- if record, errdata = this.modelBattle.createAddDebuffPve(session, stag, conn, pb.BattleType_pve, req, conf, dibuff); errdata != nil {
+ if record, errdata = this.modelBattle.createAddDebuffPve(session, stag, conn, pb.BattleType_pve, req, conf, webuff, dibuff); errdata != nil {
return
}
if flag {
diff --git a/modules/integral/api_challenge.go b/modules/integral/api_challenge.go
index 7c06c1b95..cf3d7445e 100644
--- a/modules/integral/api_challenge.go
+++ b/modules/integral/api_challenge.go
@@ -20,7 +20,8 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.IntegralC
// /挑战主线关卡
func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChallengeReq) (errdata *pb.ErrorData) {
var (
- dibuff []int32
+ dibuff []int32 // 敌方buff
+ webuff []int32 // 我方buff
)
errdata = this.ChallengeCheck(session, req)
if errdata != nil {
@@ -52,23 +53,33 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
}
return
}
- if list.Itype == 2 { // 事件模式
- var condiIds []int32
- if confList := this.configure.GetIntegralCondition(); len(confList) > 0 {
- for _, v := range confList {
- condiIds = append(condiIds, v.Id)
- }
- }
+ // TODU 稍后处理任务校验
+ // if list.Itype == 2 { // 事件模式
+ // var condiIds []int32
+ // if confList := this.configure.GetIntegralCondition(); len(confList) > 0 {
+ // for _, v := range confList {
+ // condiIds = append(condiIds, v.Id)
+ // }
+ // }
- if _, progress, err := this.module.ModuleBuried.CheckCondition(session, condiIds...); err == nil {
- condiIds = []int32{}
- for _, v := range progress { // 没有完成的
- if v.State == pb.BuriedItemFinishState_buried_finish {
- condiIds = append(condiIds, v.Conid)
- }
+ // if _, progress, err := this.module.ModuleBuried.CheckCondition(session, condiIds...); err == nil {
+ // condiIds = []int32{}
+ // for _, v := range progress { // 没有完成的
+ // if v.State == pb.BuriedItemFinishState_buried_finish {
+ // condiIds = append(condiIds, v.Conid)
+ // }
+ // }
+ // }
+ // dibuff = this.module.configure.GetIntegralConditionByKeys(condiIds)
+ // }
+ for _, v := range req.Buff {
+ if c, err := this.module.configure.GetIntegralBuffByKey(v); err != nil {
+ if c.Type == 1 {
+ webuff = append(webuff, v)
+ } else if c.Type == 2 {
+ dibuff = append(dibuff, v)
}
}
- dibuff = this.module.configure.GetIntegralConditionByKeys(condiIds)
}
errdata, record := this.module.battle.CreateDebuffBattle(session, &pb.BattlePVEReq{
Rulesid: cfgData.BattleReadyID,
@@ -76,7 +87,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
Title: "",
Format: req.Battle,
Mformat: cfgData.Boss,
- }, dibuff)
+ }, webuff, dibuff)
if errdata != nil {
return
diff --git a/modules/integral/comp_configure.go b/modules/integral/comp_configure.go
index bb12d2d3d..04eaf8cb0 100644
--- a/modules/integral/comp_configure.go
+++ b/modules/integral/comp_configure.go
@@ -16,6 +16,7 @@ const (
game_integralcondition = "game_integralcondition.json"
game_integralreward = "game_integralreward.json"
game_integraltime = "game_integraltime.json"
+ game_integralbuff = "game_integralbuff.json"
)
///配置管理基础组件
@@ -35,6 +36,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.LoadMultiConfigure(map[string]interface{}{
game_integraltime: cfg.NewGameIntegralTime,
game_integralcondition: cfg.NewGameIntegralCondition,
+ game_integralbuff: cfg.NewGameIntegralBuff,
})
configure.RegisterConfigure(game_integralboss, cfg.NewGameIntegralBoss, this.LoadStageBoss)
configure.RegisterConfigure(game_integralreward, cfg.NewGameIntegralReward, this.LoadIntegralReward)
@@ -200,3 +202,18 @@ func (this *configureComp) GetIntegralConditionByTask(taskid int32) (result *cfg
}
return
}
+
+func (this *configureComp) GetIntegralBuffByKey(skillId int32) (result *cfg.GameIntegralBuffData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_integralbuff); err == nil {
+ if configure, ok := v.(*cfg.GameIntegralBuff); ok {
+ if result = configure.Get(skillId); result != nil {
+ return
+ }
+ }
+ }
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_integralbuff, skillId)
+ return
+}
diff --git a/sys/configure/structs/Game.IntegralBuff.go b/sys/configure/structs/Game.IntegralBuff.go
new file mode 100644
index 000000000..ceb7fada7
--- /dev/null
+++ b/sys/configure/structs/Game.IntegralBuff.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameIntegralBuff struct {
+ _dataMap map[int32]*GameIntegralBuffData
+ _dataList []*GameIntegralBuffData
+}
+
+func NewGameIntegralBuff(_buf []map[string]interface{}) (*GameIntegralBuff, error) {
+ _dataList := make([]*GameIntegralBuffData, 0, len(_buf))
+ dataMap := make(map[int32]*GameIntegralBuffData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameIntegralBuffData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Skillid] = _v
+ }
+ }
+ return &GameIntegralBuff{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameIntegralBuff) GetDataMap() map[int32]*GameIntegralBuffData {
+ return table._dataMap
+}
+
+func (table *GameIntegralBuff) GetDataList() []*GameIntegralBuffData {
+ return table._dataList
+}
+
+func (table *GameIntegralBuff) Get(key int32) *GameIntegralBuffData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.IntegralBuffData.go b/sys/configure/structs/Game.IntegralBuffData.go
new file mode 100644
index 000000000..9f585718e
--- /dev/null
+++ b/sys/configure/structs/Game.IntegralBuffData.go
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameIntegralBuffData struct {
+ Skillid int32
+ Type int32
+ Val int32
+ Show int32
+ Incompatibility []int32
+ Name string
+ Icon string
+ Des string
+}
+
+const TypeId_GameIntegralBuffData = 1837461221
+
+func (*GameIntegralBuffData) GetTypeId() int32 {
+ return 1837461221
+}
+
+func (_v *GameIntegralBuffData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["val"].(float64); !_ok_ { err = errors.New("val error"); return }; _v.Val = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show"].(float64); !_ok_ { err = errors.New("show error"); return }; _v.Show = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["incompatibility"].([]interface{}); !_ok_ { err = errors.New("incompatibility error"); return }
+
+ _v.Incompatibility = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Incompatibility = append(_v.Incompatibility, _list_v_)
+ }
+ }
+
+ {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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ return
+}
+
+func DeserializeGameIntegralBuffData(_buf map[string]interface{}) (*GameIntegralBuffData, error) {
+ v := &GameIntegralBuffData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 353e3e9a0..c695952b2 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -331,6 +331,7 @@ type Tables struct {
IntegralBoss *GameIntegralBoss
IntegralReward *GameIntegralReward
IntegralCondition *GameIntegralCondition
+ IntegralBuff *GameIntegralBuff
IntegralTime *GameIntegralTime
Restore *GameRestore
CatchbugSetstage *GameCatchbugSetstage
@@ -2278,6 +2279,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.IntegralCondition, err = NewGameIntegralCondition(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_integralbuff") ; err != nil {
+ return nil, err
+ }
+ if tables.IntegralBuff, err = NewGameIntegralBuff(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_integraltime") ; err != nil {
return nil, err
}
From 730bd569715d377861ac7ddecf582daa3202e90c Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 18:43:45 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E7=A7=AF=E5=88=86boss=20buff=20=E5=B8=A6?=
=?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/integral/api_challenge.go | 1 +
pb/battle_msg.pb.go | 256 ++++++++++++++++--------------
pb/battle_struct.pb.go | 188 ++++++++++++++++------
pb/integral_msg.pb.go | 101 ++++++------
4 files changed, 329 insertions(+), 217 deletions(-)
diff --git a/modules/integral/api_challenge.go b/modules/integral/api_challenge.go
index cf3d7445e..121e858ea 100644
--- a/modules/integral/api_challenge.go
+++ b/modules/integral/api_challenge.go
@@ -104,6 +104,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
Buleflist: record.Buleflist,
Tasks: record.Tasks,
Params: []float32{cfgData.Coefficient}, // 伤害系数
+ Buffer: req.Buff,
},
Nandu: req.Nandu,
})
diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go
index 67d0db638..021379814 100644
--- a/pb/battle_msg.pb.go
+++ b/pb/battle_msg.pb.go
@@ -900,6 +900,7 @@ type BattleInfo struct {
Buleflist []*DBBattleFormt `protobuf:"bytes,9,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表
Tasks []int32 `protobuf:"varint,10,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表
Params []float32 `protobuf:"fixed32,11,rep,packed,name=params,proto3" json:"params"` //需要代入战斗中的参数列表
+ Buffer []int32 `protobuf:"varint,12,rep,packed,name=buffer,proto3" json:"buffer"` // 战斗buff 带入
}
func (x *BattleInfo) Reset() {
@@ -1011,6 +1012,13 @@ func (x *BattleInfo) GetParams() []float32 {
return nil
}
+func (x *BattleInfo) GetBuffer() []int32 {
+ if x != nil {
+ return x.Buffer
+ }
+ return nil
+}
+
type BattleCmd struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -2312,7 +2320,7 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28,
- 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x0a, 0x42,
+ 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xee, 0x02, 0x0a, 0x0a, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
@@ -2334,129 +2342,131 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a,
0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70,
0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x02, 0x52, 0x06, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x73, 0x22, 0x51, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64,
- 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e,
- 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
- 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52,
- 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
- 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74,
- 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74,
- 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20,
- 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64,
- 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75,
- 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
- 0x74, 0x61, 0x73, 0x6b, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70,
- 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74,
- 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14,
- 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72,
- 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72,
- 0x61, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65,
- 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c,
- 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63,
- 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74,
- 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
- 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
- 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
- 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x0c, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69,
- 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x0d,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a,
- 0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d,
- 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x07, 0x72,
- 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
- 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a,
- 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
- 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69,
- 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02,
- 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61,
- 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a,
- 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d,
- 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08,
- 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
- 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53,
- 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69,
- 0x64, 0x65, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63,
- 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x18, 0x0c, 0x20,
+ 0x03, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0x51, 0x0a, 0x09, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74,
+ 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79,
+ 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xca,
+ 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12,
+ 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+ 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
+ 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77,
+ 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18,
+ 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
+ 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63,
+ 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c,
+ 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x06, 0x20, 0x03,
+ 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b,
+ 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18,
+ 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05,
+ 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f,
+ 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76,
+ 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
+ 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69,
+ 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64,
+ 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65,
+ 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63,
+ 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68,
+ 0x65, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e,
+ 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75,
+ 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73,
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
+ 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x2e,
+ 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+ 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55,
+ 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12,
+ 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+ 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
+ 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f,
+ 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
+ 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53,
+ 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
+ 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+ 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64,
+ 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12,
+ 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73,
+ 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22,
+ 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a,
+ 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73,
+ 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75,
+ 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43,
+ 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
- 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
- 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
- 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
- 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
- 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43,
- 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28,
- 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
- 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69,
- 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72,
- 0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06,
- 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44,
- 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75,
- 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03,
- 0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f,
- 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
- 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c,
- 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65,
- 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70,
- 0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70,
- 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
- 0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01,
- 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64,
- 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52,
- 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07,
- 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72,
- 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
- 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x12, 0x2e, 0x0a, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
- 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
- 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64,
+ 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
+ 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
+ 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a,
+ 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69,
+ 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b,
+ 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+ 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+ 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f,
+ 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43,
+ 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73,
+ 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61,
+ 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f,
+ 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d,
+ 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72,
+ 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a,
+ 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65,
+ 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32,
+ 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70,
+ 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74,
+ 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45,
+ 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a,
+ 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50,
+ 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14,
+ 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74,
+ 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28,
+ 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+ 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+ 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x09, 0x64, 0x65, 0x66, 0x66,
+ 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64,
+ 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+ 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go
index 5cf2d8144..5c8eb16c7 100644
--- a/pb/battle_struct.pb.go
+++ b/pb/battle_struct.pb.go
@@ -632,11 +632,12 @@ type ComStartAction struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- From int32 `protobuf:"varint,1,opt,name=from,proto3" json:"from"` //当前出手角色
- Target int32 `protobuf:"varint,2,opt,name=target,proto3" json:"target"` //预选攻击目标
- CurRound int32 `protobuf:"varint,3,opt,name=curRound,proto3" json:"curRound"` //当前回合
- CanAtk bool `protobuf:"varint,4,opt,name=canAtk,proto3" json:"canAtk"` //是否能攻击
- SkillInfo []*ComSkillInfo `protobuf:"bytes,5,rep,name=skillInfo,proto3" json:"skillInfo"` //技能数据
+ From int32 `protobuf:"varint,1,opt,name=from,proto3" json:"from"` //当前出手角色
+ Target int32 `protobuf:"varint,2,opt,name=target,proto3" json:"target"` //预选攻击目标
+ OwnerRound int32 `protobuf:"varint,3,opt,name=ownerRound,proto3" json:"ownerRound"` //角色自己战斗回合数
+ CurRound int32 `protobuf:"varint,4,opt,name=curRound,proto3" json:"curRound"` //当前回合
+ CanAtk bool `protobuf:"varint,5,opt,name=canAtk,proto3" json:"canAtk"` //是否能攻击
+ SkillInfo []*ComSkillInfo `protobuf:"bytes,6,rep,name=skillInfo,proto3" json:"skillInfo"` //技能数据
}
func (x *ComStartAction) Reset() {
@@ -685,6 +686,13 @@ func (x *ComStartAction) GetTarget() int32 {
return 0
}
+func (x *ComStartAction) GetOwnerRound() int32 {
+ if x != nil {
+ return x.OwnerRound
+ }
+ return 0
+}
+
func (x *ComStartAction) GetCurRound() int32 {
if x != nil {
return x.CurRound
@@ -2146,7 +2154,8 @@ type ComUpdateScore struct {
Socre int32 `protobuf:"varint,3,opt,name=socre,proto3" json:"socre"` //积分
ExtraSocre int32 `protobuf:"varint,4,opt,name=extraSocre,proto3" json:"extraSocre"` //额外积分
Rate int32 `protobuf:"varint,5,opt,name=rate,proto3" json:"rate"` //当前积分倍率
- Stage int32 `protobuf:"varint,6,opt,name=stage,proto3" json:"stage"` //为0不显示
+ Stage int32 `protobuf:"varint,6,opt,name=stage,proto3" json:"stage"` //羽毛层数
+ ShowStage bool `protobuf:"varint,7,opt,name=showStage,proto3" json:"showStage"` //是否显示羽毛
}
func (x *ComUpdateScore) Reset() {
@@ -2223,6 +2232,68 @@ func (x *ComUpdateScore) GetStage() int32 {
return 0
}
+func (x *ComUpdateScore) GetShowStage() bool {
+ if x != nil {
+ return x.ShowStage
+ }
+ return false
+}
+
+type ComInBattleMaxScore struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //评分组ID
+ Grade int32 `protobuf:"varint,2,opt,name=grade,proto3" json:"grade"` //当前积分对应的档次
+}
+
+func (x *ComInBattleMaxScore) Reset() {
+ *x = ComInBattleMaxScore{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_battle_battle_struct_proto_msgTypes[31]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ComInBattleMaxScore) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ComInBattleMaxScore) ProtoMessage() {}
+
+func (x *ComInBattleMaxScore) ProtoReflect() protoreflect.Message {
+ mi := &file_battle_battle_struct_proto_msgTypes[31]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ComInBattleMaxScore.ProtoReflect.Descriptor instead.
+func (*ComInBattleMaxScore) Descriptor() ([]byte, []int) {
+ return file_battle_battle_struct_proto_rawDescGZIP(), []int{31}
+}
+
+func (x *ComInBattleMaxScore) GetGroupId() int32 {
+ if x != nil {
+ return x.GroupId
+ }
+ return 0
+}
+
+func (x *ComInBattleMaxScore) GetGrade() int32 {
+ if x != nil {
+ return x.Grade
+ }
+ return 0
+}
+
var File_battle_battle_struct_proto protoreflect.FileDescriptor
var file_battle_battle_struct_proto_rawDesc = []byte{
@@ -2281,15 +2352,17 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61,
0x6e, 0x45, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e,
- 0x45, 0x6d, 0x69, 0x74, 0x22, 0x9d, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72,
+ 0x45, 0x6d, 0x69, 0x74, 0x22, 0xbd, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72,
0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74,
0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72,
- 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12,
- 0x16, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x67, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x6e,
+ 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x6f,
+ 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12,
+ 0x16, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
- 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d,
+ 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d,
0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x49, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
0x43, 0x44, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d,
@@ -2417,7 +2490,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67,
0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72,
0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e,
- 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xa0,
+ 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xbe,
0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x6f, 0x72,
0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67,
@@ -2428,33 +2501,39 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x72, 0x61, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18,
0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73,
0x74, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67,
- 0x65, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73,
- 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63,
- 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63,
- 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69,
- 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03,
- 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f,
- 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12,
- 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12,
- 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10,
- 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12,
- 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12,
- 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a,
- 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10,
- 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12,
- 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50,
- 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65,
- 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
- 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11,
- 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c,
- 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a,
- 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d,
- 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12,
- 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f,
- 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12,
- 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05,
- 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
- 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, 0x18, 0x07,
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, 0x22,
+ 0x45, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x49, 0x6e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4d, 0x61,
+ 0x78, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
+ 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63,
+ 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66,
+ 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f,
+ 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49,
+ 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73,
+ 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69,
+ 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72,
+ 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69,
+ 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61,
+ 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72,
+ 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75,
+ 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72,
+ 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65,
+ 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f,
+ 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d,
+ 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09,
+ 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63,
+ 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42,
+ 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65,
+ 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10,
+ 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10,
+ 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69,
+ 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69,
+ 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75,
+ 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10,
+ 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04,
+ 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -2470,7 +2549,7 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte {
}
var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 31)
+var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 32)
var file_battle_battle_struct_proto_goTypes = []interface{}{
(EffectTipsType)(0), // 0: EffectTipsType
(*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt
@@ -2504,19 +2583,20 @@ var file_battle_battle_struct_proto_goTypes = []interface{}{
(*ComExtraEffect)(nil), // 29: ComExtraEffect
(*ComTriggerPassive)(nil), // 30: ComTriggerPassive
(*ComUpdateScore)(nil), // 31: ComUpdateScore
- (*DBHero)(nil), // 32: DBHero
- (*BattleRole)(nil), // 33: BattleRole
- (*BattleCmd)(nil), // 34: BattleCmd
+ (*ComInBattleMaxScore)(nil), // 32: ComInBattleMaxScore
+ (*DBHero)(nil), // 33: DBHero
+ (*BattleRole)(nil), // 34: BattleRole
+ (*BattleCmd)(nil), // 35: BattleCmd
}
var file_battle_battle_struct_proto_depIdxs = []int32{
- 32, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
- 33, // 1: ComInitFight.roles:type_name -> BattleRole
+ 33, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero
+ 34, // 1: ComInitFight.roles:type_name -> BattleRole
7, // 2: ComStartAction.skillInfo:type_name -> ComSkillInfo
7, // 3: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo
13, // 4: ComSkillAtk.comList:type_name -> ComSkillAfterAtk
- 34, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd
+ 35, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd
0, // 6: ComModifyHealth.tips:type_name -> EffectTipsType
- 33, // 7: ComCreateRoles.roles:type_name -> BattleRole
+ 34, // 7: ComCreateRoles.roles:type_name -> BattleRole
0, // 8: ComEffectTips.type:type_name -> EffectTipsType
7, // 9: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo
10, // [10:10] is the sub-list for method output_type
@@ -2907,6 +2987,18 @@ func file_battle_battle_struct_proto_init() {
return nil
}
}
+ file_battle_battle_struct_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ComInBattleMaxScore); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -2914,7 +3006,7 @@ func file_battle_battle_struct_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_battle_battle_struct_proto_rawDesc,
NumEnums: 1,
- NumMessages: 31,
+ NumMessages: 32,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/integral_msg.pb.go b/pb/integral_msg.pb.go
index f9cfd0c1c..5f79f441e 100644
--- a/pb/integral_msg.pb.go
+++ b/pb/integral_msg.pb.go
@@ -113,6 +113,7 @@ type IntegralChallengeReq struct {
Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // boos 难度
Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"`
+ Buff []int32 `protobuf:"varint,3,rep,packed,name=buff,proto3" json:"buff"` // 传入的buff
}
func (x *IntegralChallengeReq) Reset() {
@@ -161,6 +162,13 @@ func (x *IntegralChallengeReq) GetBattle() *BattleFormation {
return nil
}
+func (x *IntegralChallengeReq) GetBuff() []int32 {
+ if x != nil {
+ return x.Buff
+ }
+ return nil
+}
+
type IntegralChallengeResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -555,56 +563,57 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64,
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e,
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
- 0x22, 0x56, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c,
+ 0x22, 0x6a, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c,
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28,
0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
- 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4e, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65,
- 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73,
- 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
- 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
- 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x57, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65,
- 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
- 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
- 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
- 0x74, 0x22, 0xde, 0x01, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68,
- 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
- 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
- 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04,
- 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61,
- 0x74, 0x6e, 0x6f, 0x12, 0x41, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x03,
- 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43,
- 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
- 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68,
- 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
- 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
- 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
- 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65,
- 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74,
- 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65,
- 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52,
- 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74,
- 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
- 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f,
- 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
- 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22,
- 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c,
- 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x68, 0x0a, 0x14,
- 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74,
- 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
- 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x07, 0x66,
- 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44,
- 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x07, 0x66,
- 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x75, 0x66, 0x66,
+ 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x75, 0x66, 0x66, 0x22, 0x4e, 0x0a, 0x15,
+ 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+ 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x57, 0x0a, 0x18,
+ 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
+ 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25,
+ 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+ 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
+ 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xde, 0x01, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
+ 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52,
+ 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f,
+ 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f,
+ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
+ 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x12, 0x41, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65,
+ 0x78, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67,
+ 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72,
+ 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72,
+ 0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65,
+ 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+ 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
+ 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
+ 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14,
+ 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
+ 0x74, 0x79, 0x70, 0x65, 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+ 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42,
+ 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61,
+ 0x74, 0x61, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77,
+ 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52,
+ 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61,
+ 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75,
+ 0x22, 0x68, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b,
+ 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b,
+ 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
+ 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12,
+ 0x29, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e,
+ 0x6b, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+ 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
From c5bb75fdfc8ef362b898fd85e1d037da970b4c22 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 18:50:07 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=20=E8=B4=A7=E7=89=A9?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/plunder/api_getlist.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules/plunder/api_getlist.go b/modules/plunder/api_getlist.go
index da8e490fb..2d1f53d81 100644
--- a/modules/plunder/api_getlist.go
+++ b/modules/plunder/api_getlist.go
@@ -56,6 +56,8 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe
list.Source, err = this.module.modelPlunder.refreshGoodsInfo()
list.Setout = []int32{}
update["setout"] = list.Setout
+ update["source"] = list.Source
+
}
// 校验解锁的是否到期
for _, v := range list.Line {
From e9b4a67c0b596d0afc4e2af0e34ccdd00ac1e596 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 19:26:03 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=A7=AF=E5=88=86boss=20=E6=88=90=E5=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_integralachieve.json | 392 ++++++++++++++++++
modules/integral/api_achieve.go | 61 +++
modules/integral/comp_configure.go | 17 +
modules/integral/model_integral.go | 1 +
modules/plunder/api_develop.go | 4 +-
pb/errorcode.pb.go | 37 +-
pb/integral_db.pb.go | 89 ++--
pb/integral_msg.pb.go | 200 +++++++--
sys/configure/structs/Game.IntegralAchieve.go | 42 ++
.../structs/Game.IntegralAchieveData.go | 56 +++
sys/configure/structs/Tables.go | 14 +-
11 files changed, 825 insertions(+), 88 deletions(-)
create mode 100644 bin/json/game_integralachieve.json
create mode 100644 modules/integral/api_achieve.go
create mode 100644 sys/configure/structs/Game.IntegralAchieve.go
create mode 100644 sys/configure/structs/Game.IntegralAchieveData.go
diff --git a/bin/json/game_integralachieve.json b/bin/json/game_integralachieve.json
new file mode 100644
index 000000000..76319cac9
--- /dev/null
+++ b/bin/json/game_integralachieve.json
@@ -0,0 +1,392 @@
+[
+ {
+ "id": 1001,
+ "type": 1,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_01",
+ "text": "通关难度1"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1002,
+ "type": 1,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_02",
+ "text": "通关难度2"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1003,
+ "type": 1,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_03",
+ "text": "通关难度3"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1004,
+ "type": 1,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_04",
+ "text": "通关难度4"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1005,
+ "type": 1,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_05",
+ "text": "通关难度5"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1006,
+ "type": 1,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_06",
+ "text": "通关难度6"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1007,
+ "type": 2,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_07",
+ "text": "噩梦侵袭进行3场战斗"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1008,
+ "type": 2,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_08",
+ "text": "噩梦侵袭任意难度获得A及以上评级"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1009,
+ "type": 2,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_09",
+ "text": "噩梦侵袭任意难度获得EX++评级"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1010,
+ "type": 2,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_10",
+ "text": "触发5次敌方全体复活"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1011,
+ "type": 2,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_11",
+ "text": "完成10次BOSS击杀"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1012,
+ "type": 3,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_12",
+ "text": "使用异化效果组合A通关任意难度挑战"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1013,
+ "type": 3,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_13",
+ "text": "使用异化效果组合B通关任意难度挑战"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1014,
+ "type": 3,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_14",
+ "text": "使用异化效果组合C通关任意难度挑战"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ },
+ {
+ "id": 1015,
+ "type": 3,
+ "des": {
+ "key": "IntegralBoss_Integralachieve_des_15",
+ "text": "使用异化效果组合D通关任意难度挑战"
+ },
+ "reward": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ },
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 200
+ }
+ ],
+ "taskid": 0
+ }
+]
\ No newline at end of file
diff --git a/modules/integral/api_achieve.go b/modules/integral/api_achieve.go
new file mode 100644
index 000000000..14cc97ba9
--- /dev/null
+++ b/modules/integral/api_achieve.go
@@ -0,0 +1,61 @@
+package integral
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+ cfg "go_dreamfactory/sys/configure/structs"
+)
+
+//参数校验
+func (this *apiComp) GetAchieveCheck(session comm.IUserSession, req *pb.IntegralGetAchieveReq) (errdata *pb.ErrorData) {
+
+ return
+}
+
+func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAchieveReq) (errdata *pb.ErrorData) {
+
+ var (
+ list *pb.DBIntegralBoss
+ err error
+ conf *cfg.GameIntegralAchieveData
+ atno []*pb.UserAtno
+ )
+ list, err = this.module.modelIntegral.getIntegralList(session)
+ if err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ }
+ return
+ }
+ if conf, err = this.module.configure.GetIntegralAchieveByKey(req.Id); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_ConfigNoFound,
+ Title: pb.ErrorCode_ConfigNoFound.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if _, ok := list.Achieve[req.Id]; ok {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_TntegralRepleteAchive,
+ Title: pb.ErrorCode_TntegralRepleteAchive.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
+ if conf.Taskid != 0 {
+ if ok, _, err := this.module.ModuleBuried.CheckCondition(session, conf.Taskid); !ok || err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_TaskNoFinished,
+ Title: pb.ErrorCode_TaskNoFinished.ToString(),
+ Message: err.Error(),
+ }
+ }
+ }
+ session.SendMsg(string(this.module.GetType()), "getachieve", &pb.IntegralGetAchieveResp{
+ Achieve: list.Achieve,
+ Award: atno,
+ })
+ return
+}
diff --git a/modules/integral/comp_configure.go b/modules/integral/comp_configure.go
index 04eaf8cb0..c96e4e055 100644
--- a/modules/integral/comp_configure.go
+++ b/modules/integral/comp_configure.go
@@ -17,6 +17,7 @@ const (
game_integralreward = "game_integralreward.json"
game_integraltime = "game_integraltime.json"
game_integralbuff = "game_integralbuff.json"
+ game_integralachieve = "game_integralachieve.json"
)
///配置管理基础组件
@@ -37,6 +38,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
game_integraltime: cfg.NewGameIntegralTime,
game_integralcondition: cfg.NewGameIntegralCondition,
game_integralbuff: cfg.NewGameIntegralBuff,
+ game_integralachieve: cfg.NewGameIntegralAchieve,
})
configure.RegisterConfigure(game_integralboss, cfg.NewGameIntegralBoss, this.LoadStageBoss)
configure.RegisterConfigure(game_integralreward, cfg.NewGameIntegralReward, this.LoadIntegralReward)
@@ -217,3 +219,18 @@ func (this *configureComp) GetIntegralBuffByKey(skillId int32) (result *cfg.Game
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_integralbuff, skillId)
return
}
+
+func (this *configureComp) GetIntegralAchieveByKey(id int32) (result *cfg.GameIntegralAchieveData, err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(game_integralachieve); err == nil {
+ if configure, ok := v.(*cfg.GameIntegralAchieve); ok {
+ if result = configure.Get(id); result != nil {
+ return
+ }
+ }
+ }
+ err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_integralachieve, id)
+ return
+}
diff --git a/modules/integral/model_integral.go b/modules/integral/model_integral.go
index d3dbe3419..ef915c8a4 100644
--- a/modules/integral/model_integral.go
+++ b/modules/integral/model_integral.go
@@ -54,6 +54,7 @@ func (this *modelIntegral) getIntegralList(session comm.IUserSession) (result *p
result.Buff = make(map[int32]int32)
result.Score = make(map[int32]int32)
result.Line = make(map[int32]*pb.LineData, 0)
+ result.Achieve = make(map[int32]int32) // 初始化成就
// 获取当前的hid
curTime := configure.Now().Unix()
szConf := this.module.configure.GetIntegralITime()
diff --git a/modules/plunder/api_develop.go b/modules/plunder/api_develop.go
index b4d15198f..0b6e734e8 100644
--- a/modules/plunder/api_develop.go
+++ b/modules/plunder/api_develop.go
@@ -38,7 +38,7 @@ func (this *apiComp) Develop(session comm.IUserSession, req *pb.PlunderDevelopRe
}
return
}
- if _, ok := list.Develop[conf.Itype]; ok {
+ if _, ok := list.Develop[req.Cid]; ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_PlundeAlreadyLearn,
Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(),
@@ -55,7 +55,7 @@ func (this *apiComp) Develop(session comm.IUserSession, req *pb.PlunderDevelopRe
return
}
}
- list.Develop[conf.Itype] = 1
+ list.Develop[req.Cid] = 1
update["develop"] = list.Develop
this.module.modelPlunder.changePlunderData(session.GetUserId(), update)
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 1cd5e3661..b885d6dd5 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -472,6 +472,7 @@ const (
ErrorCode_EntertainNoSkillCard ErrorCode = 5212 //技能卡不足
// integral
ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限
+ ErrorCode_TntegralRepleteAchive ErrorCode = 5302 // 重复激活
//plunder
ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据
ErrorCode_PlunderLineUnlock ErrorCode = 5402 // 队列没解锁
@@ -890,6 +891,7 @@ var (
5211: "EntertainNoGamePlayering",
5212: "EntertainNoSkillCard",
5301: "TntegralDayMaxChallenge",
+ 5302: "TntegralRepleteAchive",
5401: "PlunderNotFoundShip",
5402: "PlunderLineUnlock",
5403: "PlundeRepleteRecive",
@@ -1304,6 +1306,7 @@ var (
"EntertainNoGamePlayering": 5211,
"EntertainNoSkillCard": 5212,
"TntegralDayMaxChallenge": 5301,
+ "TntegralRepleteAchive": 5302,
"PlunderNotFoundShip": 5401,
"PlunderLineUnlock": 5402,
"PlundeRepleteRecive": 5403,
@@ -1347,7 +1350,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, 0xe6, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0x82, 0x4d, 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,
@@ -1948,21 +1951,23 @@ var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4e, 0x6f, 0x53, 0x6b, 0x69,
0x6c, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x10, 0xdc, 0x28, 0x12, 0x1c, 0x0a, 0x17, 0x54, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x61, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c,
- 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64,
- 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99,
- 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65,
- 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x9a, 0x2a, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75,
- 0x6e, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65,
- 0x10, 0x9b, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69,
- 0x70, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75,
- 0x6e, 0x64, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a,
- 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44,
- 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
- 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11,
- 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0,
- 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61,
- 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
- 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x1a, 0x0a, 0x15, 0x54, 0x6e, 0x74, 0x65, 0x67,
+ 0x72, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x63, 0x68, 0x69, 0x76, 0x65,
+ 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f,
+ 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16, 0x0a,
+ 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c, 0x6f,
+ 0x63, 0x6b, 0x10, 0x9a, 0x2a, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x52,
+ 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, 0x12,
+ 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, 0x61,
+ 0x63, 0x68, 0x10, 0x9c, 0x2a, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4e,
+ 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f,
+ 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10,
+ 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70,
+ 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c,
+ 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a,
+ 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65,
+ 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/integral_db.pb.go b/pb/integral_db.pb.go
index d509f8ae7..63f50f47b 100644
--- a/pb/integral_db.pb.go
+++ b/pb/integral_db.pb.go
@@ -41,6 +41,7 @@ type DBIntegralBoss struct {
Score map[int32]int32 `protobuf:"bytes,14,rep,name=score,proto3" json:"score" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 难度 value 积分
Uinfo *BaseUserInfo `protobuf:"bytes,15,opt,name=uinfo,proto3" json:"uinfo"` //用户基础
Line map[int32]*LineData `protobuf:"bytes,16,rep,name=line,proto3" json:"line" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+ Achieve map[int32]int32 `protobuf:"bytes,17,rep,name=achieve,proto3" json:"achieve" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 成就奖励 key 成就id
}
func (x *DBIntegralBoss) Reset() {
@@ -187,6 +188,13 @@ func (x *DBIntegralBoss) GetLine() map[int32]*LineData {
return nil
}
+func (x *DBIntegralBoss) GetAchieve() map[int32]int32 {
+ if x != nil {
+ return x.Achieve
+ }
+ return nil
+}
+
// 积分boss 排行
type DBIntegralRank struct {
state protoimpl.MessageState
@@ -274,7 +282,7 @@ var file_integral_integral_db_proto_rawDesc = []byte{
0x72, 0x61, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f,
0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x22, 0x8e, 0x05, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+ 0x6f, 0x22, 0x82, 0x06, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
0x42, 0x6f, 0x73, 0x73, 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, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18,
@@ -303,29 +311,36 @@ var file_integral_integral_db_proto_rawDesc = []byte{
0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2d, 0x0a, 0x04,
0x6c, 0x69, 0x6e, 0x65, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x49,
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x4c, 0x69, 0x6e, 0x65,
- 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x42,
- 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, 0x38, 0x0a, 0x0a, 0x53, 0x63, 0x6f, 0x72, 0x65, 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, 0x42,
- 0x0a, 0x09, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
- 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a,
- 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c,
- 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
- 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
- 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49,
- 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61,
- 0x6e, 0x64, 0x75, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75,
- 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x05,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x61,
+ 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44,
+ 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x2e, 0x41, 0x63,
+ 0x68, 0x69, 0x65, 0x76, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x61, 0x63, 0x68, 0x69,
+ 0x65, 0x76, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x42, 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, 0x38, 0x0a, 0x0a,
+ 0x53, 0x63, 0x6f, 0x72, 0x65, 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, 0x42, 0x0a, 0x09, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e,
+ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52,
- 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x41, 0x63,
+ 0x68, 0x69, 0x65, 0x76, 0x65, 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, 0x22, 0x90, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x49, 0x6e, 0x74,
+ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e,
+ 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55,
+ 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14,
+ 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e,
+ 0x61, 0x6e, 0x64, 0x75, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x6c, 0x69,
+ 0x6e, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x44,
+ 0x61, 0x74, 0x61, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+ 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -340,29 +355,31 @@ func file_integral_integral_db_proto_rawDescGZIP() []byte {
return file_integral_integral_db_proto_rawDescData
}
-var file_integral_integral_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_integral_integral_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_integral_integral_db_proto_goTypes = []interface{}{
(*DBIntegralBoss)(nil), // 0: DBIntegralBoss
(*DBIntegralRank)(nil), // 1: DBIntegralRank
nil, // 2: DBIntegralBoss.BuffEntry
nil, // 3: DBIntegralBoss.ScoreEntry
nil, // 4: DBIntegralBoss.LineEntry
- (*BaseUserInfo)(nil), // 5: BaseUserInfo
- (*LineData)(nil), // 6: LineData
+ nil, // 5: DBIntegralBoss.AchieveEntry
+ (*BaseUserInfo)(nil), // 6: BaseUserInfo
+ (*LineData)(nil), // 7: LineData
}
var file_integral_integral_db_proto_depIdxs = []int32{
2, // 0: DBIntegralBoss.buff:type_name -> DBIntegralBoss.BuffEntry
3, // 1: DBIntegralBoss.score:type_name -> DBIntegralBoss.ScoreEntry
- 5, // 2: DBIntegralBoss.uinfo:type_name -> BaseUserInfo
+ 6, // 2: DBIntegralBoss.uinfo:type_name -> BaseUserInfo
4, // 3: DBIntegralBoss.line:type_name -> DBIntegralBoss.LineEntry
- 5, // 4: DBIntegralRank.uinfo:type_name -> BaseUserInfo
- 6, // 5: DBIntegralRank.line:type_name -> LineData
- 6, // 6: DBIntegralBoss.LineEntry.value:type_name -> LineData
- 7, // [7:7] is the sub-list for method output_type
- 7, // [7:7] is the sub-list for method input_type
- 7, // [7:7] is the sub-list for extension type_name
- 7, // [7:7] is the sub-list for extension extendee
- 0, // [0:7] is the sub-list for field type_name
+ 5, // 4: DBIntegralBoss.achieve:type_name -> DBIntegralBoss.AchieveEntry
+ 6, // 5: DBIntegralRank.uinfo:type_name -> BaseUserInfo
+ 7, // 6: DBIntegralRank.line:type_name -> LineData
+ 7, // 7: DBIntegralBoss.LineEntry.value:type_name -> LineData
+ 8, // [8:8] is the sub-list for method output_type
+ 8, // [8:8] is the sub-list for method input_type
+ 8, // [8:8] is the sub-list for extension type_name
+ 8, // [8:8] is the sub-list for extension extendee
+ 0, // [0:8] is the sub-list for field type_name
}
func init() { file_integral_integral_db_proto_init() }
@@ -404,7 +421,7 @@ func file_integral_integral_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_integral_integral_db_proto_rawDesc,
NumEnums: 0,
- NumMessages: 5,
+ NumMessages: 6,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/integral_msg.pb.go b/pb/integral_msg.pb.go
index 5f79f441e..d2838b299 100644
--- a/pb/integral_msg.pb.go
+++ b/pb/integral_msg.pb.go
@@ -549,6 +549,109 @@ func (x *IntegralRankListResp) GetFriends() []*DBIntegralRank {
return nil
}
+// 领取成就
+type IntegralGetAchieveReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` // 成就id
+}
+
+func (x *IntegralGetAchieveReq) Reset() {
+ *x = IntegralGetAchieveReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_integral_integral_msg_proto_msgTypes[10]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *IntegralGetAchieveReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IntegralGetAchieveReq) ProtoMessage() {}
+
+func (x *IntegralGetAchieveReq) ProtoReflect() protoreflect.Message {
+ mi := &file_integral_integral_msg_proto_msgTypes[10]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use IntegralGetAchieveReq.ProtoReflect.Descriptor instead.
+func (*IntegralGetAchieveReq) Descriptor() ([]byte, []int) {
+ return file_integral_integral_msg_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *IntegralGetAchieveReq) GetId() int32 {
+ if x != nil {
+ return x.Id
+ }
+ return 0
+}
+
+type IntegralGetAchieveResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Achieve map[int32]int32 `protobuf:"bytes,1,rep,name=achieve,proto3" json:"achieve" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 成就奖励 key 成就id
+ Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
+}
+
+func (x *IntegralGetAchieveResp) Reset() {
+ *x = IntegralGetAchieveResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_integral_integral_msg_proto_msgTypes[11]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *IntegralGetAchieveResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IntegralGetAchieveResp) ProtoMessage() {}
+
+func (x *IntegralGetAchieveResp) ProtoReflect() protoreflect.Message {
+ mi := &file_integral_integral_msg_proto_msgTypes[11]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use IntegralGetAchieveResp.ProtoReflect.Descriptor instead.
+func (*IntegralGetAchieveResp) Descriptor() ([]byte, []int) {
+ return file_integral_integral_msg_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *IntegralGetAchieveResp) GetAchieve() map[int32]int32 {
+ if x != nil {
+ return x.Achieve
+ }
+ return nil
+}
+
+func (x *IntegralGetAchieveResp) GetAward() []*UserAtno {
+ if x != nil {
+ return x.Award
+ }
+ return nil
+}
+
var File_integral_integral_msg_proto protoreflect.FileDescriptor
var file_integral_integral_msg_proto_rawDesc = []byte{
@@ -612,8 +715,22 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12,
0x29, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e,
- 0x6b, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
- 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6b, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x15, 0x49, 0x6e,
+ 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65,
+ 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x02, 0x69, 0x64, 0x22, 0xb5, 0x01, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+ 0x47, 0x65, 0x74, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e,
+ 0x0a, 0x07, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x24, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x63, 0x68,
+ 0x69, 0x65, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x12, 0x1f,
+ 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+ 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a,
+ 0x3a, 0x0a, 0x0c, 0x41, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 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 (
@@ -628,7 +745,7 @@ func file_integral_integral_msg_proto_rawDescGZIP() []byte {
return file_integral_integral_msg_proto_rawDescData
}
-var file_integral_integral_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_integral_integral_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_integral_integral_msg_proto_goTypes = []interface{}{
(*IntegralGetListReq)(nil), // 0: IntegralGetListReq
(*IntegralGetListResp)(nil), // 1: IntegralGetListResp
@@ -640,31 +757,36 @@ var file_integral_integral_msg_proto_goTypes = []interface{}{
(*IntegralGetRewardResp)(nil), // 7: IntegralGetRewardResp
(*IntegralRankListReq)(nil), // 8: IntegralRankListReq
(*IntegralRankListResp)(nil), // 9: IntegralRankListResp
- nil, // 10: IntegralChallengeOverResp.HeroexpEntry
- (*DBIntegralBoss)(nil), // 11: DBIntegralBoss
- (*BattleFormation)(nil), // 12: BattleFormation
- (*BattleInfo)(nil), // 13: BattleInfo
- (*BattleReport)(nil), // 14: BattleReport
- (*UserAtno)(nil), // 15: UserAtno
- (*DBIntegralRank)(nil), // 16: DBIntegralRank
+ (*IntegralGetAchieveReq)(nil), // 10: IntegralGetAchieveReq
+ (*IntegralGetAchieveResp)(nil), // 11: IntegralGetAchieveResp
+ nil, // 12: IntegralChallengeOverResp.HeroexpEntry
+ nil, // 13: IntegralGetAchieveResp.AchieveEntry
+ (*DBIntegralBoss)(nil), // 14: DBIntegralBoss
+ (*BattleFormation)(nil), // 15: BattleFormation
+ (*BattleInfo)(nil), // 16: BattleInfo
+ (*BattleReport)(nil), // 17: BattleReport
+ (*UserAtno)(nil), // 18: UserAtno
+ (*DBIntegralRank)(nil), // 19: DBIntegralRank
}
var file_integral_integral_msg_proto_depIdxs = []int32{
- 11, // 0: IntegralGetListResp.data:type_name -> DBIntegralBoss
- 12, // 1: IntegralChallengeReq.battle:type_name -> BattleFormation
- 13, // 2: IntegralChallengeResp.info:type_name -> BattleInfo
- 14, // 3: IntegralChallengeOverReq.report:type_name -> BattleReport
- 11, // 4: IntegralChallengeOverResp.data:type_name -> DBIntegralBoss
- 15, // 5: IntegralChallengeOverResp.atno:type_name -> UserAtno
- 10, // 6: IntegralChallengeOverResp.heroexp:type_name -> IntegralChallengeOverResp.HeroexpEntry
- 11, // 7: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
- 15, // 8: IntegralGetRewardResp.award:type_name -> UserAtno
- 16, // 9: IntegralRankListResp.ranks:type_name -> DBIntegralRank
- 16, // 10: IntegralRankListResp.friends:type_name -> DBIntegralRank
- 11, // [11:11] is the sub-list for method output_type
- 11, // [11:11] is the sub-list for method input_type
- 11, // [11:11] is the sub-list for extension type_name
- 11, // [11:11] is the sub-list for extension extendee
- 0, // [0:11] is the sub-list for field type_name
+ 14, // 0: IntegralGetListResp.data:type_name -> DBIntegralBoss
+ 15, // 1: IntegralChallengeReq.battle:type_name -> BattleFormation
+ 16, // 2: IntegralChallengeResp.info:type_name -> BattleInfo
+ 17, // 3: IntegralChallengeOverReq.report:type_name -> BattleReport
+ 14, // 4: IntegralChallengeOverResp.data:type_name -> DBIntegralBoss
+ 18, // 5: IntegralChallengeOverResp.atno:type_name -> UserAtno
+ 12, // 6: IntegralChallengeOverResp.heroexp:type_name -> IntegralChallengeOverResp.HeroexpEntry
+ 14, // 7: IntegralGetRewardResp.data:type_name -> DBIntegralBoss
+ 18, // 8: IntegralGetRewardResp.award:type_name -> UserAtno
+ 19, // 9: IntegralRankListResp.ranks:type_name -> DBIntegralRank
+ 19, // 10: IntegralRankListResp.friends:type_name -> DBIntegralRank
+ 13, // 11: IntegralGetAchieveResp.achieve:type_name -> IntegralGetAchieveResp.AchieveEntry
+ 18, // 12: IntegralGetAchieveResp.award:type_name -> UserAtno
+ 13, // [13:13] is the sub-list for method output_type
+ 13, // [13:13] is the sub-list for method input_type
+ 13, // [13:13] is the sub-list for extension type_name
+ 13, // [13:13] is the sub-list for extension extendee
+ 0, // [0:13] is the sub-list for field type_name
}
func init() { file_integral_integral_msg_proto_init() }
@@ -796,6 +918,30 @@ func file_integral_integral_msg_proto_init() {
return nil
}
}
+ file_integral_integral_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*IntegralGetAchieveReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_integral_integral_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*IntegralGetAchieveResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
}
type x struct{}
out := protoimpl.TypeBuilder{
@@ -803,7 +949,7 @@ func file_integral_integral_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_integral_integral_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 11,
+ NumMessages: 14,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.IntegralAchieve.go b/sys/configure/structs/Game.IntegralAchieve.go
new file mode 100644
index 000000000..b4788306b
--- /dev/null
+++ b/sys/configure/structs/Game.IntegralAchieve.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameIntegralAchieve struct {
+ _dataMap map[int32]*GameIntegralAchieveData
+ _dataList []*GameIntegralAchieveData
+}
+
+func NewGameIntegralAchieve(_buf []map[string]interface{}) (*GameIntegralAchieve, error) {
+ _dataList := make([]*GameIntegralAchieveData, 0, len(_buf))
+ dataMap := make(map[int32]*GameIntegralAchieveData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameIntegralAchieveData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameIntegralAchieve{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameIntegralAchieve) GetDataMap() map[int32]*GameIntegralAchieveData {
+ return table._dataMap
+}
+
+func (table *GameIntegralAchieve) GetDataList() []*GameIntegralAchieveData {
+ return table._dataList
+}
+
+func (table *GameIntegralAchieve) Get(key int32) *GameIntegralAchieveData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.IntegralAchieveData.go b/sys/configure/structs/Game.IntegralAchieveData.go
new file mode 100644
index 000000000..7455f3ff4
--- /dev/null
+++ b/sys/configure/structs/Game.IntegralAchieveData.go
@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameIntegralAchieveData struct {
+ Id int32
+ Type int32
+ Des string
+ Reward []*Gameatn
+ Taskid int32
+}
+
+const TypeId_GameIntegralAchieveData = -1383728045
+
+func (*GameIntegralAchieveData) GetTypeId() int32 {
+ return -1383728045
+}
+
+func (_v *GameIntegralAchieveData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
+
+ _v.Reward = 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.Reward = append(_v.Reward, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskid"].(float64); !_ok_ { err = errors.New("taskid error"); return }; _v.Taskid = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameIntegralAchieveData(_buf map[string]interface{}) (*GameIntegralAchieveData, error) {
+ v := &GameIntegralAchieveData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 509d68329..b0157afa9 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -331,6 +331,7 @@ type Tables struct {
IntegralBoss *GameIntegralBoss
IntegralReward *GameIntegralReward
IntegralCondition *GameIntegralCondition
+ IntegralAchieve *GameIntegralAchieve
IntegralBuff *GameIntegralBuff
IntegralTime *GameIntegralTime
Restore *GameRestore
@@ -352,7 +353,6 @@ type Tables struct {
SystemChatText *GameSystemChatText
SystemStroyTalk *GameSystemStroyTalk
ActiveKing *GameActiveKing
- ActiveTask *GameActiveTask
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -2280,6 +2280,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.IntegralCondition, err = NewGameIntegralCondition(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_integralachieve") ; err != nil {
+ return nil, err
+ }
+ if tables.IntegralAchieve, err = NewGameIntegralAchieve(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_integralbuff") ; err != nil {
return nil, err
}
@@ -2406,11 +2412,5 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ActiveKing, err = NewGameActiveKing(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_activetask") ; err != nil {
- return nil, err
- }
- if tables.ActiveTask, err = NewGameActiveTask(buf) ; err != nil {
- return nil, err
- }
return tables, nil
}
From 001f3a942c928fbbc6d09a000e8076af1bd67416 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 19:37:03 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=E6=88=98=E6=8A=A5?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_buriedtype.json | 45 +++++++++
bin/json/game_global.json | 4 +-
bin/json/game_mainchapter.json | 4 +-
bin/json/game_opencond.json | 25 +++++
bin/json/game_skillatk.json | 168 +++++++++-----------------------
modules/integral/api_achieve.go | 24 +++--
modules/plunder/api_record.go | 43 ++++++++
modules/plunder/api_unlock.go | 2 +-
sys/configure/structs/Tables.go | 14 +--
9 files changed, 188 insertions(+), 141 deletions(-)
create mode 100644 modules/plunder/api_record.go
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 36f45be0b..cbd3839ff 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1479,5 +1479,50 @@
"id": 253,
"insert": 1,
"filter": []
+ },
+ {
+ "id": 254,
+ "insert": 1,
+ "filter": [
+ "eq"
+ ]
+ },
+ {
+ "id": 255,
+ "insert": 2,
+ "filter": [
+ "eq"
+ ]
+ },
+ {
+ "id": 256,
+ "insert": 1,
+ "filter": [
+ "eq",
+ "gte"
+ ]
+ },
+ {
+ "id": 257,
+ "insert": 2,
+ "filter": [
+ "gte"
+ ]
+ },
+ {
+ "id": 258,
+ "insert": 2,
+ "filter": [
+ "eq",
+ "gte"
+ ]
+ },
+ {
+ "id": 259,
+ "insert": 3,
+ "filter": [
+ "eq",
+ "eq"
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index cec4fae93..c0e5f2a21 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -790,8 +790,8 @@
"enhanceboss_ps": 10,
"plunder_pvp_battlereadyid": 105,
"plunder_pvp_college_num": {
- "a": "attr",
- "t": "plundercollege",
+ "a": "item",
+ "t": "30000001",
"n": 400
},
"plunder_pvp_college_time": 7,
diff --git a/bin/json/game_mainchapter.json b/bin/json/game_mainchapter.json
index af5eeb350..84ba947a9 100644
--- a/bin/json/game_mainchapter.json
+++ b/bin/json/game_mainchapter.json
@@ -145,7 +145,7 @@
"key": "mainchapter_main_chapter_describe_3",
"text": "探索罪恶都市，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得美肚鲨！"
},
- "achunlock": 11001001,
+ "achunlock": 11003005,
"venturecurrency": [
{
"a": "item",
@@ -190,7 +190,7 @@
"key": "mainchapter_main_chapter_describe_4",
"text": "探索精灵王国，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得穿靴子的猫！"
},
- "achunlock": 11001001,
+ "achunlock": 11004005,
"venturecurrency": [
{
"a": "item",
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 401bf2b6c..c58933a22 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -3006,5 +3006,30 @@
"key": "opencond_opencond_kqbx_text_115",
"text": "是否加入工会功能开启"
}
+ },
+ {
+ "id": "playersyn",
+ "name": {
+ "key": "opencond_opencond_name_116",
+ "text": "多人同屏"
+ },
+ "opencondi": [
+ 18000042
+ ],
+ "wkqbx": 0,
+ "img": "",
+ "prompt": {
+ "key": "",
+ "text": ""
+ },
+ "uiid": 0,
+ "activateType": false,
+ "notify": [],
+ "kqbx": false,
+ "kqbx_ui": "",
+ "kqbx_text": {
+ "key": "",
+ "text": ""
+ }
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 044026ea0..6cf641306 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -30050,124 +30050,7 @@
{
"id": 123003311,
"level": 1,
- "MaxLV": 5,
- "UnavailablePlayTypes": [],
- "SkillFlag": 4,
- "EffectFlag": 10,
- "Priority": 3,
- "Name": {
- "key": "skill_skill_atk_Name_123003311",
- "text": "向死而生"
- },
- "ico": "jn_23003_3",
- "CorrectPos": 0,
- "IsMelee": 0,
- "act": "Skill_3",
- "Type": 1,
- "CD": 8,
- "Where": [],
- "Target": 1,
- "ChildSkill": {
- "Id": [
- 223003315,
- 223003316
- ]
- },
- "passSkill": [
- 223003316
- ],
- "Desc": {
- "key": "skill_skill_atk_Desc_123003311_1",
- "text": "黛塔黛恩为己方1个目标附加2回合[color=#37d8a9]攻击提升[/color]，若目标身上已有攻击提升则附加1回合[color=#37d8a9]暴击伤害提升[/color]。"
- },
- "buffid": [
- 390001457,
- 390001001
- ],
- "map": ""
- },
- {
- "id": 123003311,
- "level": 2,
- "MaxLV": 5,
- "UnavailablePlayTypes": [],
- "SkillFlag": 4,
- "EffectFlag": 10,
- "Priority": 3,
- "Name": {
- "key": "skill_skill_atk_Name_123003311",
- "text": "向死而生"
- },
- "ico": "jn_23003_3",
- "CorrectPos": 0,
- "IsMelee": 0,
- "act": "Skill_3",
- "Type": 1,
- "CD": 7,
- "Where": [],
- "Target": 1,
- "ChildSkill": {
- "Id": [
- 223003315,
- 223003316
- ]
- },
- "passSkill": [
- 223003316
- ],
- "Desc": {
- "key": "skill_skill_atk_Desc_123003311_2",
- "text": "冷却时间减少1回合。"
- },
- "buffid": [
- 390001457,
- 390001001
- ],
- "map": ""
- },
- {
- "id": 123003311,
- "level": 3,
- "MaxLV": 5,
- "UnavailablePlayTypes": [],
- "SkillFlag": 4,
- "EffectFlag": 10,
- "Priority": 3,
- "Name": {
- "key": "skill_skill_atk_Name_123003311",
- "text": "向死而生"
- },
- "ico": "jn_23003_3",
- "CorrectPos": 0,
- "IsMelee": 0,
- "act": "Skill_3",
- "Type": 1,
- "CD": 6,
- "Where": [],
- "Target": 1,
- "ChildSkill": {
- "Id": [
- 223003315,
- 223003316
- ]
- },
- "passSkill": [
- 223003316
- ],
- "Desc": {
- "key": "skill_skill_atk_Desc_123003311_3",
- "text": "冷却时间减少1回合。"
- },
- "buffid": [
- 390001457,
- 390001001
- ],
- "map": ""
- },
- {
- "id": 123003311,
- "level": 4,
- "MaxLV": 5,
+ "MaxLV": 3,
"UnavailablePlayTypes": [],
"SkillFlag": 4,
"EffectFlag": 10,
@@ -30194,8 +30077,8 @@
223003316
],
"Desc": {
- "key": "skill_skill_atk_Desc_123003311_4",
- "text": "冷却时间减少1回合。"
+ "key": "skill_skill_atk_Desc_123003311_1",
+ "text": "黛塔黛恩为己方1个目标附加2回合[color=#37d8a9]攻击提升[/color]，若目标身上已有攻击提升则附加1回合[color=#37d8a9]暴击伤害提升[/color]。"
},
"buffid": [
390001457,
@@ -30205,8 +30088,8 @@
},
{
"id": 123003311,
- "level": 5,
- "MaxLV": 5,
+ "level": 2,
+ "MaxLV": 3,
"UnavailablePlayTypes": [],
"SkillFlag": 4,
"EffectFlag": 10,
@@ -30233,7 +30116,46 @@
223003316
],
"Desc": {
- "key": "skill_skill_atk_Desc_123003311_5",
+ "key": "skill_skill_atk_Desc_123003311_2",
+ "text": "冷却时间减少1回合。"
+ },
+ "buffid": [
+ 390001457,
+ 390001001
+ ],
+ "map": ""
+ },
+ {
+ "id": 123003311,
+ "level": 3,
+ "MaxLV": 3,
+ "UnavailablePlayTypes": [],
+ "SkillFlag": 4,
+ "EffectFlag": 10,
+ "Priority": 3,
+ "Name": {
+ "key": "skill_skill_atk_Name_123003311",
+ "text": "向死而生"
+ },
+ "ico": "jn_23003_3",
+ "CorrectPos": 0,
+ "IsMelee": 0,
+ "act": "Skill_3",
+ "Type": 1,
+ "CD": 3,
+ "Where": [],
+ "Target": 1,
+ "ChildSkill": {
+ "Id": [
+ 223003315,
+ 223003316
+ ]
+ },
+ "passSkill": [
+ 223003316
+ ],
+ "Desc": {
+ "key": "skill_skill_atk_Desc_123003311_3",
"text": "冷却时间减少1回合。"
},
"buffid": [
diff --git a/modules/integral/api_achieve.go b/modules/integral/api_achieve.go
index 14cc97ba9..75813500e 100644
--- a/modules/integral/api_achieve.go
+++ b/modules/integral/api_achieve.go
@@ -15,11 +15,13 @@ func (this *apiComp) GetAchieveCheck(session comm.IUserSession, req *pb.Integral
func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAchieveReq) (errdata *pb.ErrorData) {
var (
- list *pb.DBIntegralBoss
- err error
- conf *cfg.GameIntegralAchieveData
- atno []*pb.UserAtno
+ list *pb.DBIntegralBoss
+ err error
+ conf *cfg.GameIntegralAchieveData
+ atno []*pb.UserAtno
+ update map[string]interface{}
)
+ update = make(map[string]interface{})
list, err = this.module.modelIntegral.getIntegralList(session)
if err != nil {
errdata = &pb.ErrorData{
@@ -36,7 +38,7 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc
}
return
}
- if _, ok := list.Achieve[req.Id]; ok {
+ if _, ok := list.Achieve[req.Id]; ok { // 重复激活
errdata = &pb.ErrorData{
Code: pb.ErrorCode_TntegralRepleteAchive,
Title: pb.ErrorCode_TntegralRepleteAchive.ToString(),
@@ -44,7 +46,7 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc
}
return
}
- if conf.Taskid != 0 {
+ if conf.Taskid != 0 { // 校验任务
if ok, _, err := this.module.ModuleBuried.CheckCondition(session, conf.Taskid); !ok || err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_TaskNoFinished,
@@ -53,6 +55,16 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc
}
}
}
+ list.Achieve[req.Id] = 1
+ update["achieve"] = list.Achieve // 更新数据
+ if err = this.module.modelIntegral.modifyIntegralData(session.GetUserId(), update); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Title: pb.ErrorCode_DBError.ToString(),
+ Message: err.Error(),
+ }
+ return
+ }
session.SendMsg(string(this.module.GetType()), "getachieve", &pb.IntegralGetAchieveResp{
Achieve: list.Achieve,
Award: atno,
diff --git a/modules/plunder/api_record.go b/modules/plunder/api_record.go
new file mode 100644
index 000000000..5650af847
--- /dev/null
+++ b/modules/plunder/api_record.go
@@ -0,0 +1,43 @@
+package plunder
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+func (this *apiComp) RecordCheck(session comm.IUserSession, req *pb.PlunderRecordReq) (errdata *pb.ErrorData) {
+ return
+}
+
+// 获取基本信息
+func (this *apiComp) Record(session comm.IUserSession, req *pb.PlunderRecordReq) (errdata *pb.ErrorData) {
+ var (
+ err error
+ info *pb.DBPlunderRecord
+ list *pb.DBPlunder
+ )
+ if errdata = this.RecordCheck(session, req); errdata != nil {
+ return
+ }
+ if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Message: err.Error(),
+ }
+ return
+ }
+
+ if info, err = this.module.modelRecord.getPlunderRecordData(list.Landid); err != nil {
+ errdata = &pb.ErrorData{
+ Code: pb.ErrorCode_DBError,
+ Message: err.Error(),
+ }
+ return
+ }
+
+ session.SendMsg(string(this.module.GetType()), "getlist", &pb.PlunderRecordResp{
+ Info: info,
+ })
+
+ return
+}
diff --git a/modules/plunder/api_unlock.go b/modules/plunder/api_unlock.go
index 1930475c7..8e2601c60 100644
--- a/modules/plunder/api_unlock.go
+++ b/modules/plunder/api_unlock.go
@@ -28,7 +28,7 @@ func (this *apiComp) Unlock(session comm.IUserSession, req *pb.PlunderUnlockReq)
}
return
}
- if int32(len(list.Line)) >= req.Pos {
+ if int32(len(list.Line)) <= req.Pos {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index b0157afa9..509d68329 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -331,7 +331,6 @@ type Tables struct {
IntegralBoss *GameIntegralBoss
IntegralReward *GameIntegralReward
IntegralCondition *GameIntegralCondition
- IntegralAchieve *GameIntegralAchieve
IntegralBuff *GameIntegralBuff
IntegralTime *GameIntegralTime
Restore *GameRestore
@@ -353,6 +352,7 @@ type Tables struct {
SystemChatText *GameSystemChatText
SystemStroyTalk *GameSystemStroyTalk
ActiveKing *GameActiveKing
+ ActiveTask *GameActiveTask
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -2280,12 +2280,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.IntegralCondition, err = NewGameIntegralCondition(buf) ; err != nil {
return nil, err
}
- if buf, err = loader("game_integralachieve") ; err != nil {
- return nil, err
- }
- if tables.IntegralAchieve, err = NewGameIntegralAchieve(buf) ; err != nil {
- return nil, err
- }
if buf, err = loader("game_integralbuff") ; err != nil {
return nil, err
}
@@ -2412,5 +2406,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ActiveKing, err = NewGameActiveKing(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_activetask") ; err != nil {
+ return nil, err
+ }
+ if tables.ActiveTask, err = NewGameActiveTask(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
From 77986baa2eed97964ab16a2bc1109778c2cd78b5 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 19:45:01 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/plunder/api_record.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/plunder/api_record.go b/modules/plunder/api_record.go
index 5650af847..6217043a3 100644
--- a/modules/plunder/api_record.go
+++ b/modules/plunder/api_record.go
@@ -35,7 +35,7 @@ func (this *apiComp) Record(session comm.IUserSession, req *pb.PlunderRecordReq)
return
}
- session.SendMsg(string(this.module.GetType()), "getlist", &pb.PlunderRecordResp{
+ session.SendMsg(string(this.module.GetType()), "record", &pb.PlunderRecordResp{
Info: info,
})
From 686333c5b51708cfaeadd2483ecd1b8f258c590e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 20:03:32 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=E8=88=B9=E6=9C=AA?=
=?UTF-8?q?=E5=88=B0=E8=BE=BE=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/plunder/api_reach.go | 6 ++---
pb/errorcode.pb.go | 47 ++++++++++++++++++++----------------
2 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/modules/plunder/api_reach.go b/modules/plunder/api_reach.go
index f16c71237..eebe03bec 100644
--- a/modules/plunder/api_reach.go
+++ b/modules/plunder/api_reach.go
@@ -70,10 +70,10 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (
}
return
} else {
- if land.Ship[oid].Line.Etime >= configure.Now().Unix() { // 还没到时间 船没到达
+ if land.Ship[oid].Line.Etime > configure.Now().Unix() { // 还没到时间 船没到达
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_DBError,
- Message: err.Error(),
+ Code: pb.ErrorCode_TntegralShipUnReach,
+ Title: pb.ErrorCode_TntegralShipUnReach.ToString(),
}
return
}
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index b885d6dd5..7d9fed95c 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -472,7 +472,8 @@ const (
ErrorCode_EntertainNoSkillCard ErrorCode = 5212 //技能卡不足
// integral
ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限
- ErrorCode_TntegralRepleteAchive ErrorCode = 5302 // 重复激活
+ ErrorCode_TntegralRepeatedAchive ErrorCode = 5302 // 重复激活
+ ErrorCode_TntegralShipUnReach ErrorCode = 5303 // 船 未到达
//plunder
ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据
ErrorCode_PlunderLineUnlock ErrorCode = 5402 // 队列没解锁
@@ -891,7 +892,8 @@ var (
5211: "EntertainNoGamePlayering",
5212: "EntertainNoSkillCard",
5301: "TntegralDayMaxChallenge",
- 5302: "TntegralRepleteAchive",
+ 5302: "TntegralRepeatedAchive",
+ 5303: "TntegralShipUnReach",
5401: "PlunderNotFoundShip",
5402: "PlunderLineUnlock",
5403: "PlundeRepleteRecive",
@@ -1306,7 +1308,8 @@ var (
"EntertainNoGamePlayering": 5211,
"EntertainNoSkillCard": 5212,
"TntegralDayMaxChallenge": 5301,
- "TntegralRepleteAchive": 5302,
+ "TntegralRepeatedAchive": 5302,
+ "TntegralShipUnReach": 5303,
"PlunderNotFoundShip": 5401,
"PlunderLineUnlock": 5402,
"PlundeRepleteRecive": 5403,
@@ -1350,7 +1353,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, 0x82, 0x4d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0x9d, 0x4d, 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,
@@ -1951,23 +1954,25 @@ var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4e, 0x6f, 0x53, 0x6b, 0x69,
0x6c, 0x6c, 0x43, 0x61, 0x72, 0x64, 0x10, 0xdc, 0x28, 0x12, 0x1c, 0x0a, 0x17, 0x54, 0x6e, 0x74,
0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x61, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c,
- 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x1a, 0x0a, 0x15, 0x54, 0x6e, 0x74, 0x65, 0x67,
- 0x72, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x63, 0x68, 0x69, 0x76, 0x65,
- 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f,
- 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16, 0x0a,
- 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c, 0x6f,
- 0x63, 0x6b, 0x10, 0x9a, 0x2a, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x52,
- 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, 0x12,
- 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, 0x61,
- 0x63, 0x68, 0x10, 0x9c, 0x2a, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4e,
- 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f,
- 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10,
- 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70,
- 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c,
- 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a,
- 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65,
- 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x1b, 0x0a, 0x16, 0x54, 0x6e, 0x74, 0x65, 0x67,
+ 0x72, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x63, 0x68, 0x69, 0x76,
+ 0x65, 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+ 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xb7, 0x29, 0x12, 0x18,
+ 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
+ 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e,
+ 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x9a, 0x2a,
+ 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74,
+ 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c,
+ 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a,
+ 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c,
+ 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64,
+ 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a,
+ 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69,
+ 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55,
+ 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e,
+ 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1,
+ 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x33,
}
var (
From a53fc05aa73dc2d4f5f3716c67da4f6c13277d3c Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 24 Jan 2024 20:07:08 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=A7=AF=E5=88=86boss=E6=88=90=E5=B0=B1?=
=?UTF-8?q?=E5=A5=96=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/integral/api_achieve.go | 7 ++++--
modules/plunder/api_reach.go | 4 ++--
pb/errorcode.pb.go | 41 ++++++++++++++++-----------------
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/modules/integral/api_achieve.go b/modules/integral/api_achieve.go
index 75813500e..6db3be76b 100644
--- a/modules/integral/api_achieve.go
+++ b/modules/integral/api_achieve.go
@@ -40,8 +40,8 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc
}
if _, ok := list.Achieve[req.Id]; ok { // 重复激活
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_TntegralRepleteAchive,
- Title: pb.ErrorCode_TntegralRepleteAchive.ToString(),
+ Code: pb.ErrorCode_TntegralRepeatedAchive,
+ Title: pb.ErrorCode_TntegralRepeatedAchive.ToString(),
Message: err.Error(),
}
return
@@ -65,6 +65,9 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc
}
return
}
+ if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); err != nil {
+ return
+ }
session.SendMsg(string(this.module.GetType()), "getachieve", &pb.IntegralGetAchieveResp{
Achieve: list.Achieve,
Award: atno,
diff --git a/modules/plunder/api_reach.go b/modules/plunder/api_reach.go
index eebe03bec..2eae71df3 100644
--- a/modules/plunder/api_reach.go
+++ b/modules/plunder/api_reach.go
@@ -72,8 +72,8 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (
} else {
if land.Ship[oid].Line.Etime > configure.Now().Unix() { // 还没到时间 船没到达
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_TntegralShipUnReach,
- Title: pb.ErrorCode_TntegralShipUnReach.ToString(),
+ Code: pb.ErrorCode_PlundeShipUnReach,
+ Title: pb.ErrorCode_PlundeShipUnReach.ToString(),
}
return
}
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 7d9fed95c..9f0c9e822 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -473,7 +473,6 @@ const (
// integral
ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限
ErrorCode_TntegralRepeatedAchive ErrorCode = 5302 // 重复激活
- ErrorCode_TntegralShipUnReach ErrorCode = 5303 // 船 未到达
//plunder
ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据
ErrorCode_PlunderLineUnlock ErrorCode = 5402 // 队列没解锁
@@ -484,6 +483,7 @@ const (
ErrorCode_PlundeShipRunning ErrorCode = 5407 //运输中
ErrorCode_PlundeUnlock ErrorCode = 5408 //已解锁
ErrorCode_PlundeAlreadyLearn ErrorCode = 5409 //重复学习
+ ErrorCode_PlundeShipUnReach ErrorCode = 5410 // 船 未到达
)
// Enum value maps for ErrorCode.
@@ -893,7 +893,6 @@ var (
5212: "EntertainNoSkillCard",
5301: "TntegralDayMaxChallenge",
5302: "TntegralRepeatedAchive",
- 5303: "TntegralShipUnReach",
5401: "PlunderNotFoundShip",
5402: "PlunderLineUnlock",
5403: "PlundeRepleteRecive",
@@ -903,6 +902,7 @@ var (
5407: "PlundeShipRunning",
5408: "PlundeUnlock",
5409: "PlundeAlreadyLearn",
+ 5410: "PlundeShipUnReach",
}
ErrorCode_value = map[string]int32{
"Success": 0,
@@ -1309,7 +1309,6 @@ var (
"EntertainNoSkillCard": 5212,
"TntegralDayMaxChallenge": 5301,
"TntegralRepeatedAchive": 5302,
- "TntegralShipUnReach": 5303,
"PlunderNotFoundShip": 5401,
"PlunderLineUnlock": 5402,
"PlundeRepleteRecive": 5403,
@@ -1319,6 +1318,7 @@ var (
"PlundeShipRunning": 5407,
"PlundeUnlock": 5408,
"PlundeAlreadyLearn": 5409,
+ "PlundeShipUnReach": 5410,
}
)
@@ -1353,7 +1353,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, 0x9d, 0x4d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0x9b, 0x4d, 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,
@@ -1956,23 +1956,22 @@ var file_errorcode_proto_rawDesc = []byte{
0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x61, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c,
0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x1b, 0x0a, 0x16, 0x54, 0x6e, 0x74, 0x65, 0x67,
0x72, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x63, 0x68, 0x69, 0x76,
- 0x65, 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
- 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xb7, 0x29, 0x12, 0x18,
- 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e,
- 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e,
- 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x9a, 0x2a,
- 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74,
- 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c,
- 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a,
- 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c,
- 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64,
- 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a,
- 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69,
- 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55,
- 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e,
- 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1,
- 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x65, 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e,
+ 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16,
+ 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c,
+ 0x6f, 0x63, 0x6b, 0x10, 0x9a, 0x2a, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
+ 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a,
+ 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65,
+ 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65,
+ 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a,
+ 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67,
+ 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69,
+ 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50,
+ 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17,
+ 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c,
+ 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64,
+ 0x65, 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xa2, 0x2a, 0x42,
+ 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (