战斗全局事件

This commit is contained in:
meixiongfeng 2023-07-11 11:21:57 +08:00
parent 23327c0026
commit de40390778
5 changed files with 198 additions and 185 deletions

File diff suppressed because it is too large Load Diff

View File

@ -161,7 +161,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_15",
"text": "这里可以查看你获得的所有守护者们,选择守护者点击右侧按钮可以查看详细界面并且强化他们。<br>在强化界面,可以有各种方式强化守护者。<br>守护者等级强化:<br>点击守护者经验条下方的加号按钮可以进入守护者升级界面,使用护身符可以快速提升守护者等级。<br>守护者升星:<br>当守护者等级达到当前星级最大值三星最大等级为30级四星为40级5星为50级可以使用荣耀徽章提升守护者星级并解锁最高等级上限。守护者最高为6星<br>守护者技能等级强化:<br>点击技能图标上方的按钮,可以进入守护者技能升级界面,使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。<br>守护者觉醒:<br>使用觉醒强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。<br>守护者回响:<br>使用回响强化你的守护者。共鸣强化道具可以再狩猎与宝箱中获得。"
"text": "这里可以查看你获得的所有守护者们,选择守护者点击右侧按钮可以查看详细界面并且强化他们。<br>在强化界面,可以有各种方式强化守护者。<br>守护者等级强化:<br>点击守护者经验条下方的加号按钮可以进入守护者升级界面,使用护身符可以快速提升守护者等级。<br>守护者升星:<br>当守护者等级达到当前星级最大值三星最大等级为30级四星为40级5星为50级可以使用荣耀徽章提升守护者星级并解锁最高等级上限。守护者最高为6星<br>守护者技能等级强化:<br>点击技能图标上方的按钮,可以进入守护者技能升级界面,使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。<br>守护者觉醒:<br>可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。<br>守护者回响:<br>可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以再狩猎与宝箱中获得。"
}
},
{
@ -271,7 +271,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_25",
"text": "这里可以使用回响强化你的守护者。<br>回响强化道具可在狩猎与宝箱中获得。"
"text": "这里可以使用回响强化道具强化你的守护者。<br>回响强化道具可在狩猎与宝箱中获得。"
}
},
{
@ -293,7 +293,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_27",
"text": "这里可以使用觉醒强化你的守护者。<br>觉醒道具守护之心主要为招募重复守护者获得。"
"text": "这里可以使用守护之心强化你的守护者。<br>觉醒道具守护之心主要为招募重复守护者获得。"
}
},
{

View File

@ -127,7 +127,7 @@ func (this *apiComp) ChallengeRaceOver(session comm.IUserSession, req *pb.Pagoda
}
race.Race[conf.Restriction].Curfloor += 1
race.Race[conf.Restriction].Buf = conf.Gaineffect
race.Race[conf.Restriction].Task = conf.Fightevents
mapData["race"] = race.Race
errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData)

View File

@ -312,12 +312,12 @@ type RaceData struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` // 阵营ID 0:循环塔 1: 阵营1
Buf int32 `protobuf:"varint,2,opt,name=buf,proto3" json:"buf"` //赛季子技能buff
Rtime int64 `protobuf:"varint,3,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 客户端不用
Defeat int32 `protobuf:"varint,4,opt,name=defeat,proto3" json:"defeat"` // 今日战胜的次数
Endtime int64 `protobuf:"varint,5,opt,name=endtime,proto3" json:"endtime"` //剩余倒计时
Curfloor int32 `protobuf:"varint,6,opt,name=curfloor,proto3" json:"curfloor"` //当前层数
Race int32 `protobuf:"varint,1,opt,name=race,proto3" json:"race"` // 阵营ID 0:循环塔 1: 阵营1
Task []int32 `protobuf:"varint,2,rep,packed,name=task,proto3" json:"task"` //战斗全局事件
Rtime int64 `protobuf:"varint,3,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 客户端不用
Defeat int32 `protobuf:"varint,4,opt,name=defeat,proto3" json:"defeat"` // 今日战胜的次数
Endtime int64 `protobuf:"varint,5,opt,name=endtime,proto3" json:"endtime"` //剩余倒计时
Curfloor int32 `protobuf:"varint,6,opt,name=curfloor,proto3" json:"curfloor"` //当前层数
}
func (x *RaceData) Reset() {
@ -359,11 +359,11 @@ func (x *RaceData) GetRace() int32 {
return 0
}
func (x *RaceData) GetBuf() int32 {
func (x *RaceData) GetTask() []int32 {
if x != nil {
return x.Buf
return x.Task
}
return 0
return nil
}
func (x *RaceData) GetRtime() int64 {
@ -447,17 +447,17 @@ var file_pagoda_pagoda_db_proto_rawDesc = []byte{
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, 0x52, 0x61, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x94, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x96, 0x01, 0x0a, 0x08, 0x52, 0x61, 0x63, 0x65, 0x44,
0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, 0x66, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x62, 0x75, 0x66, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69,
0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12,
0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69,
0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d,
0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x06, 0x20,
0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x05, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18,
0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x72,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d,
0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
0x05, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74,
0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x18,
0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x42,
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -18,7 +18,7 @@ type GameCirculateData struct {
Openingtime []int32
Unlock int32
Floors int32
Gaineffect int32
Fightevents []int32
TabIcon string
TabTitle string
Monsterlineup []int32
@ -56,7 +56,20 @@ func (_v *GameCirculateData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floors"].(float64); !_ok_ { err = errors.New("floors error"); return }; _v.Floors = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gaineffect"].(float64); !_ok_ { err = errors.New("gaineffect error"); return }; _v.Gaineffect = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["fightevents"].([]interface{}); !_ok_ { err = errors.New("fightevents error"); return }
_v.Fightevents = 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.Fightevents = append(_v.Fightevents, _list_v_)
}
}
{ var _ok_ bool; if _v.TabIcon, _ok_ = _buf["tabIcon"].(string); !_ok_ { err = errors.New("tabIcon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["tabTitle"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TabTitle error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TabTitle, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{