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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-06-14 18:12:38 +08:00
commit 2892a2d38f
10 changed files with 101990 additions and 123286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bin/json/game_buriedcondi.json
View File

@ -17171,7 +17171,7 @@
], ],
"filter2": [ "filter2": [
"英雄ID", "英雄ID",
"装备数量", "0",
"0", "0",
"0" "0"
] ]
@ -17520,7 +17520,7 @@
"type": 41, "type": 41,
"valid": 0, "valid": 0,
"NPC": 0, "NPC": 0,
"value": 1, "value": 6,
"filter": [ "filter": [
3 3
], ],
@ -19243,7 +19243,7 @@
"NPC": 10964, "NPC": 10964,
"value": 1, "value": 1,
"filter": [ "filter": [
2100103 1200103
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19267,7 +19267,7 @@
"NPC": 10974, "NPC": 10974,
"value": 1, "value": 1,
"filter": [ "filter": [
2100106 1200106
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19291,7 +19291,7 @@
"NPC": 10984, "NPC": 10984,
"value": 1, "value": 1,
"filter": [ "filter": [
2100203 1200203
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19315,7 +19315,7 @@
"NPC": 10994, "NPC": 10994,
"value": 1, "value": 1,
"filter": [ "filter": [
2100206 1200206
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19339,7 +19339,7 @@
"NPC": 11004, "NPC": 11004,
"value": 1, "value": 1,
"filter": [ "filter": [
2100303 1200303
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19363,7 +19363,7 @@
"NPC": 11014, "NPC": 11014,
"value": 1, "value": 1,
"filter": [ "filter": [
2100306 1200306
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19387,7 +19387,7 @@
"NPC": 11024, "NPC": 11024,
"value": 1, "value": 1,
"filter": [ "filter": [
2100403 1200403
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19411,7 +19411,7 @@
"NPC": 11034, "NPC": 11034,
"value": 1, "value": 1,
"filter": [ "filter": [
2100406 1200406
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19435,7 +19435,7 @@
"NPC": 11044, "NPC": 11044,
"value": 1, "value": 1,
"filter": [ "filter": [
2100503 1200503
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19459,7 +19459,7 @@
"NPC": 11054, "NPC": 11054,
"value": 1, "value": 1,
"filter": [ "filter": [
2100506 1200506
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19483,7 +19483,7 @@
"NPC": 11064, "NPC": 11064,
"value": 1, "value": 1,
"filter": [ "filter": [
2100603 1200603
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19507,7 +19507,7 @@
"NPC": 11074, "NPC": 11074,
"value": 1, "value": 1,
"filter": [ "filter": [
2100606 1200606
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19531,7 +19531,7 @@
"NPC": 11084, "NPC": 11084,
"value": 1, "value": 1,
"filter": [ "filter": [
2100703 1200703
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19555,7 +19555,7 @@
"NPC": 11094, "NPC": 11094,
"value": 1, "value": 1,
"filter": [ "filter": [
2100706 1200706
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19579,7 +19579,7 @@
"NPC": 11104, "NPC": 11104,
"value": 1, "value": 1,
"filter": [ "filter": [
2100803 1200803
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19603,7 +19603,7 @@
"NPC": 11114, "NPC": 11114,
"value": 1, "value": 1,
"filter": [ "filter": [
2100806 1200806
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19627,7 +19627,7 @@
"NPC": 11124, "NPC": 11124,
"value": 1, "value": 1,
"filter": [ "filter": [
2100903 1200903
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19651,7 +19651,7 @@
"NPC": 11134, "NPC": 11134,
"value": 1, "value": 1,
"filter": [ "filter": [
2100906 1200906
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19675,7 +19675,7 @@
"NPC": 11144, "NPC": 11144,
"value": 1, "value": 1,
"filter": [ "filter": [
2101003 1201003
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19699,7 +19699,7 @@
"NPC": 11154, "NPC": 11154,
"value": 1, "value": 1,
"filter": [ "filter": [
2101006 1201006
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19723,7 +19723,7 @@
"NPC": 11164, "NPC": 11164,
"value": 1, "value": 1,
"filter": [ "filter": [
2101103 1201103
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19747,7 +19747,7 @@
"NPC": 11174, "NPC": 11174,
"value": 1, "value": 1,
"filter": [ "filter": [
2101106 1201106
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19771,7 +19771,7 @@
"NPC": 11184, "NPC": 11184,
"value": 1, "value": 1,
"filter": [ "filter": [
2101203 1201203
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",
@ -19795,7 +19795,7 @@
"NPC": 11194, "NPC": 11194,
"value": 1, "value": 1,
"filter": [ "filter": [
2101206 1201206
], ],
"filter2": [ "filter2": [
"关卡ID", "关卡ID",

796
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

223591
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

45
bin/json/game_reddot.json
View File

@ -167,7 +167,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero", "path": "Root|Hero1",
"header": "" "header": ""
}, },
{ {
@ -176,7 +176,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero|Heroup", "path": "Root|Hero1|Heroup",
"header": "" "header": ""
}, },
{ {
@ -185,7 +185,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero|Heroup|Btn", "path": "Root|Hero1|Heroup|Btn",
"header": "" "header": ""
}, },
{ {
@ -194,7 +194,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero|Awake", "path": "Root|Hero1|Awake",
"header": "" "header": ""
}, },
{ {
@ -203,7 +203,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero|Awake|Btn", "path": "Root|Hero1|Awake|Btn",
"header": "" "header": ""
}, },
{ {
@ -212,7 +212,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero|Heroup", "path": "Root|Hero1|Heroup",
"header": "" "header": ""
}, },
{ {
@ -221,25 +221,25 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "Root|Hero|Heroup|Btn", "path": "Root|Hero1|Heroup|Btn",
"header": "" "header": ""
}, },
{ {
"id": 20400, "id": 20400,
"msg_type": 0, "msg_type": 0,
"show_type": 2, "show_type": 0,
"count_type": 1, "count_type": 1,
"group": "", "group": "",
"path": "", "path": "Root|Hero",
"header": "" "header": ""
}, },
{ {
"id": 20401, "id": 20401,
"msg_type": 0, "msg_type": 1,
"show_type": 2, "show_type": 2,
"count_type": 1, "count_type": 1,
"group": "", "group": "",
"path": "", "path": "Root|Hero|NewHero",
"header": "" "header": ""
}, },
{ {
@ -392,7 +392,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy",
"header": "" "header": ""
}, },
{ {
@ -401,7 +401,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy|IllustratedBubble",
"header": "" "header": ""
}, },
{ {
@ -410,7 +410,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy|IllustratedBubble|Page1",
"header": "" "header": ""
}, },
{ {
@ -419,7 +419,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy|IllustratedBubble|Page2",
"header": "" "header": ""
}, },
{ {
@ -428,7 +428,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy|IllustratedBubble|Page3",
"header": "" "header": ""
}, },
{ {
@ -437,7 +437,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy|IllustratedBubble|Page4",
"header": "" "header": ""
}, },
{ {
@ -446,16 +446,7 @@
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "group": "",
"path": "", "path": "Root|Smithy|IllustratedBubble|Reward",
"header": ""
},
{
"id": 17107,
"msg_type": 0,
"show_type": 0,
"count_type": 0,
"group": "",
"path": "",
"header": "" "header": ""
} }
] ]

33
bin/json/game_skillafteratk.json
View File

@ -20153,17 +20153,15 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 2,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
4000 3000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [],
255004312
],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -20179,6 +20177,31 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
4000
],
"FollowSK": [],
"SucFollowSK": [
255004313
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255004313,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001105, 390001105,

3
bin/json/game_skillatk.json
View File

@ -12388,7 +12388,8 @@
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
255004311 255004311,
255004312
] ]
}, },
"Desc": { "Desc": {

724
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

1
modules/modulebase.go
View File

@ -35,7 +35,6 @@ type ModuleBase struct {
ModuleEquipment comm.IEquipment //装备模块 ModuleEquipment comm.IEquipment //装备模块
ModuleTask comm.ITask //任务 ModuleTask comm.ITask //任务
ModuleFriend comm.IFriend //好友 ModuleFriend comm.IFriend //好友
// ModuleRtask comm.IRtask //随机任务
ModuleSociaty comm.ISociaty //公会 ModuleSociaty comm.ISociaty //公会
ModulePrivilege comm.IPrivilege // 月卡 ModulePrivilege comm.IPrivilege // 月卡
ModuleSmithy comm.ISmithy //铁建普 ModuleSmithy comm.ISmithy //铁建普

3
modules/worldtask/configure.go
View File

@ -20,7 +20,7 @@ const (
type configureComp struct { type configureComp struct {
modules.MCompConfigure modules.MCompConfigure
lock sync.RWMutex lock sync.RWMutex
worldtaskConf map[int32]*cfg.GameWorldTaskData worldtaskConf map[int32]*cfg.GameWorldTaskData //key 条件ID
} }
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@ -31,6 +31,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
gameWorldAll: cfg.NewGameWorldAll, gameWorldAll: cfg.NewGameWorldAll,
gameburiedCond: cfg.NewGameBuriedCondi, gameburiedCond: cfg.NewGameBuriedCondi,
}) })
this.worldtaskConf = make(map[int32]*cfg.GameWorldTaskData)
configure.RegisterConfigure(gameWorldTask, cfg.NewGameBuriedCondi, this.updateconfigure) configure.RegisterConfigure(gameWorldTask, cfg.NewGameBuriedCondi, this.updateconfigure)
return return
} }

28
modules/worldtask/module.go
View File

@ -40,7 +40,6 @@ func (this *Worldtask) OnInstallComp() {
this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.modelWorldtask = this.RegisterComp(new(ModelWorldtask)).(*ModelWorldtask) this.modelWorldtask = this.RegisterComp(new(ModelWorldtask)).(*ModelWorldtask)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
// conf,err = this.configure.getWorldtaskBattleCfg()
} }
@ -53,6 +52,11 @@ func (this *Worldtask) Start() (err error) {
if err = this.checkWorldtaskConf(); err != nil { if err = this.checkWorldtaskConf(); err != nil {
return err return err
} }
conf, err := this.configure.getWorldtaskCfg()
if err != nil {
return err
}
this.configure.worldtaskConf = conf.GetDataMap()
return return
} }
@ -121,8 +125,6 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
return return
} }
// 检索condId是否是世界任务的完成条件
taskConds := make(map[int32][]*pb.CurrentTask) taskConds := make(map[int32][]*pb.CurrentTask)
finishedCondIds := []*pb.ConIProgress{} finishedCondIds := []*pb.ConIProgress{}
@ -186,11 +188,23 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
if err != nil || curTaskConf == nil { if err != nil || curTaskConf == nil {
return return
} }
var flag bool
if curTaskConf.DeliverNpc == 0 { if curTaskConf.DeliverNpc == 0 {
defer func() { //判断当前任务下的条件是否全部是完成状态
this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf) for _, s := range t.Conds {
this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf) if s.State == pb.BuriedItemFinishState_buried_finish {
}() flag = true
} else {
flag = false
}
}
if flag {
defer func() {
this.modelWorldtask.taskFinish(session, t.TaskId, userTask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
}()
}
} }
currentTasks = append(currentTasks, t) currentTasks = append(currentTasks, t)
} }