liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

掠夺战报数据

Browse Source
This commit is contained in:
meixiongfeng 2024-01-24 19:37:03 +08:00
parent e9b4a67c0b
commit 001f3a942c
9 changed files with 188 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bin/json/game_buriedtype.json
View File

@ -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"
]
}
]

4
bin/json/game_global.json
View File

@ -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,

4
bin/json/game_mainchapter.json
View File

@ -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",

25
bin/json/game_opencond.json
View File

@ -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": ""
}
}
]

168
bin/json/game_skillatk.json
View File

@ -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": [

24
modules/integral/api_achieve.go
View File

@ -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,

43
modules/plunder/api_record.go Normal file
View File

@ -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
}

2
modules/plunder/api_unlock.go
View File

@ -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(),

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

@ -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
}