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 2024-02-20 15:05:26 +08:00
commit a411cdb3e7
14 changed files with 2470 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2328
bin/json/game_horoscope.json
View File

File diff suppressed because it is too large Load Diff

112
bin/json/game_item.json
View File

@ -16149,53 +16149,6 @@
"id": "17060010",
"name": {
"key": "item_item_name_17060010",
"text": "感观之林自选箱"
},
"usetype": 4,
"color": 3,
"bagtype": 1,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 22000004,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_17060010",
"intr": {
"key": "item_item_intr_17060010",
"text": "开启后，从宝箱中自选一名紫色感观之林守护者的碎片"
},
"describe": {
"key": "item_item_describe_17060010",
"text": "紫色感观之林守护者自选箱。"
},
"dialogue": {
"key": "item_item_dialogue_17060010",
"text": ""
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"gm": 0
},
{
"id": "17060011",
"name": {
"key": "item_item_name_17060011",
"text": "热情之火自选箱"
},
"usetype": 4,
@ -16217,17 +16170,17 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_17060011",
"img": "item_17060010",
"intr": {
"key": "item_item_intr_17060011",
"key": "item_item_intr_17060010",
"text": "开启后，从宝箱中自选一名紫色热情之火守护者的碎片"
},
"describe": {
"key": "item_item_describe_17060011",
"key": "item_item_describe_17060010",
"text": "紫色热情之火守护者自选箱。"
},
"dialogue": {
"key": "item_item_dialogue_17060011",
"key": "item_item_dialogue_17060010",
"text": ""
},
"sale": [
@ -16240,9 +16193,9 @@
"gm": 0
},
{
"id": "17060012",
"id": "17060011",
"name": {
"key": "item_item_name_17060012",
"key": "item_item_name_17060011",
"text": "包容之水自选箱"
},
"usetype": 4,
@ -16264,15 +16217,62 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_17060012",
"img": "item_17060011",
"intr": {
"key": "item_item_intr_17060012",
"key": "item_item_intr_17060011",
"text": "开启后，从宝箱中自选一名紫色包容之水守护者的碎片"
},
"describe": {
"key": "item_item_describe_17060012",
"key": "item_item_describe_17060011",
"text": "紫色包容之水守护者自选箱。"
},
"dialogue": {
"key": "item_item_dialogue_17060011",
"text": ""
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"gm": 0
},
{
"id": "17060012",
"name": {
"key": "item_item_name_17060012",
"text": "感观之林自选箱"
},
"usetype": 4,
"color": 3,
"bagtype": 1,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 22000004,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_17060012",
"intr": {
"key": "item_item_intr_17060012",
"text": "开启后，从宝箱中自选一名紫色感观之林守护者的碎片"
},
"describe": {
"key": "item_item_describe_17060012",
"text": "紫色感观之林守护者自选箱。"
},
"dialogue": {
"key": "item_item_dialogue_17060012",
"text": ""

56
bin/json/game_mainstage.json
View File

@ -43883,8 +43883,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_320",
"text": "我要告状，我要告状！"
},
"animation": [],
"prewarbubbletext": {
@ -43966,8 +43966,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_321",
"text": "不行，就是不行！"
},
"animation": [],
"prewarbubbletext": {
@ -43992,11 +43992,11 @@
},
"title": {
"key": "mainchapter_main_stage_title_322",
"text": ""
"text": "奇怪的拳猴"
},
"desc": {
"key": "mainchapter_main_stage_desc_305",
"text": ""
"text": "小伊和盖爆发激烈的争吵，这时突然一群铁拳猴朝我们袭来，这究竟是福是祸？"
},
"exp": 0,
"hero_exp": 800,
@ -44087,8 +44087,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_322",
"text": "奇怪……"
},
"animation": [],
"prewarbubbletext": {
@ -44427,8 +44427,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_326",
"text": "小伊，你太让人失望！"
},
"animation": [],
"prewarbubbletext": {
@ -44704,8 +44704,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_329",
"text": "嘎嘎嘎——"
},
"animation": [],
"prewarbubbletext": {
@ -44730,11 +44730,11 @@
},
"title": {
"key": "mainchapter_main_stage_title_330",
"text": ""
"text": "暴走的铁拳猴"
},
"desc": {
"key": "mainchapter_main_stage_desc_313",
"text": ""
"text": "拳猴受污浊之气的影响愈发狂躁，净化迫在眉睫！"
},
"exp": 0,
"hero_exp": 800,
@ -44823,8 +44823,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_330",
"text": "就是这里了！"
},
"animation": [],
"prewarbubbletext": {
@ -44839,8 +44839,8 @@
"frontstoryid": 402150,
"afterstoryid": 402160,
"maingroupName": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_maingroupName_310",
"text": "再遇猩猩怪"
},
"maingroupIcon": "",
"mainlineName": {
@ -44849,11 +44849,11 @@
},
"title": {
"key": "mainchapter_main_stage_title_331",
"text": ""
"text": "最后的阻拦"
},
"desc": {
"key": "mainchapter_main_stage_desc_314",
"text": ""
"text": "最后的关头，怎么老是你！没办法只能硬着头皮上了！"
},
"exp": 0,
"hero_exp": 800,
@ -44958,8 +44958,8 @@
"frontstoryid": 0,
"afterstoryid": 0,
"maingroupName": {
"key": "",
"text": ""
"key": "mainchapter_main_stage_maingroupName_311",
"text": "决战猩猩怪"
},
"maingroupIcon": "",
"mainlineName": {
@ -44968,11 +44968,11 @@
},
"title": {
"key": "mainchapter_main_stage_title_332",
"text": ""
"text": "决战！巨型猩猩怪"
},
"desc": {
"key": "mainchapter_main_stage_desc_315",
"text": ""
"text": "个人的力量终是有限的，家园应该由我们共同来守护！"
},
"exp": 0,
"hero_exp": 800,
@ -45059,8 +45059,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_332",
"text": "准备好净化吧！"
},
"animation": [],
"prewarbubbletext": {
@ -45140,8 +45140,8 @@
"herocolor": 1,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
"key": "main_stage_bubbletext_333",
"text": "小伊，等一下！"
},
"animation": [],
"prewarbubbletext": {

8
bin/json/game_puggsyscore.json
View File

@ -4,13 +4,7 @@
"boss_id": 810301,
"rank_low": 0,
"rank_up": 19999,
"reward": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
"reward": []
},
{
"id": 2,

16
bin/json/game_ruledesc.json
View File

@ -894,5 +894,21 @@
"key": "ruledesc_ruledesc_content_56",
"text": "EX++：666667以上<br>EX+：500001~666666<br>EX：400001~500000<br>SSS：300001~400000<br>SS：200001~300000<br>S：100001~200000<br>A+：80001~100000<br>A：70001~80000<br>B：60001~70000<br>C：30001~60000<br>F：30000以下"
}
},
{
"key": 57,
"id": 10048,
"title": {
"key": "ruledesc_ruledesc_title_49",
"text": "成就说明"
},
"titlecontent": {
"key": "ruledesc_ruledesc_titlecontent_57",
"text": ""
},
"content": {
"key": "ruledesc_ruledesc_content_57",
"text": "这里能查看所有获得的成就。"
}
}
]

12
bin/json/game_worldall.json
View File

@ -9,7 +9,7 @@
"key": "worldtask_world_all_titlename_0",
"text": "序章"
},
"task_icon": "",
"task_icon": "rw_img_xz",
"task_txt": {
"key": "worldtask_world_all_task_txt_1",
"text": "完成所有任务有可以领取额外奖励"
@ -32,7 +32,7 @@
"key": "worldtask_world_all_titlename_1",
"text": "第一章"
},
"task_icon": "",
"task_icon": "rw_img_d1z",
"task_txt": {
"key": "worldtask_world_all_task_txt_2",
"text": "完成所有任务有可以领取额外奖励"
@ -55,7 +55,7 @@
"key": "worldtask_world_all_titlename_2",
"text": "第二章"
},
"task_icon": "",
"task_icon": "rw_img_d2z",
"task_txt": {
"key": "worldtask_world_all_task_txt_3",
"text": "完成所有任务有可以领取额外奖励"
@ -78,7 +78,7 @@
"key": "worldtask_world_all_titlename_3",
"text": "第三章"
},
"task_icon": "",
"task_icon": "rw_img_d3z",
"task_txt": {
"key": "worldtask_world_all_task_txt_4",
"text": "完成所有任务有可以领取额外奖励"
@ -101,7 +101,7 @@
"key": "worldtask_world_all_titlename_4",
"text": "第四章"
},
"task_icon": "",
"task_icon": "rw_img_hdlm",
"task_txt": {
"key": "worldtask_world_all_task_txt_5",
"text": "完成所有任务有可以领取额外奖励"
@ -124,7 +124,7 @@
"key": "worldtask_world_all_titlename_5",
"text": "第五章"
},
"task_icon": "",
"task_icon": "rw_img_mdjsj",
"task_txt": {
"key": "worldtask_world_all_task_txt_6",
"text": "完成所有任务有可以领取额外奖励"

14
modules/horoscope/configure.go
View File

@ -55,11 +55,13 @@ func (this *configureComp) getMaxHoroscopes() (result map[int32]*cfg.GameHorosco
} else {
result = make(map[int32]*cfg.GameHoroscopeData)
for _, v := range v.(*cfg.GameHoroscope).GetDataMap() {
if _, ok = result[v.NodeId]; !ok {
result[v.NodeId] = v
}
if v.Lv > result[v.NodeId].Lv {
result[v.NodeId] = v
if v.Type == 1 {
if _, ok = result[v.NodeId]; !ok {
result[v.NodeId] = v
}
if v.Lv > result[v.NodeId].Lv {
result[v.NodeId] = v
}
}
}
}
@ -75,7 +77,7 @@ func (this *configureComp) getHoroscopebylv(nodeid, lv int32) (result *cfg.GameH
this.module.Errorln(err)
} else {
for _, v := range v.(*cfg.GameHoroscope).GetDataMap() {
if v.NodeId == nodeid && v.Lv == lv {
if v.Type == 1 && v.NodeId == nodeid && v.Lv == lv {
result = v
return
}

8
modules/horoscope/modelhoroscope.go
View File

@ -169,9 +169,11 @@ func (this *modelHoroscope) reddot(session comm.IUserSession) bool {
}
for _, v := range horoscope.GetDataList() {
if lv, ok := info.Nodes[v.NodeId]; !ok && v.Lv > lv {
if errdata = this.module.CheckRes(session, v.CostItem); errdata == nil {
return true
if v.Type == 1 {
if lv, ok := info.Nodes[v.NodeId]; !ok && v.Lv > lv {
if errdata = this.module.CheckRes(session, v.CostItem); errdata == nil {
return true
}
}
}
}

2
modules/island/api_refresheroshop.go
View File

@ -33,7 +33,7 @@ func (this *apiComp) RefresHeroShop(session comm.IUserSession, req *pb.IsLandRef
}
info.Refreshed++
pricekey := this.module.ModuleTools.GetGlobalConf().PuggsyBuy
if res, err := this.module.ModuleTools.GetPriceGroupCost(pricekey, info.Refreshed); len(res) > 0 {
if res, err := this.module.ModuleTools.GetPriceGroupCost(pricekey, info.Refreshed); err == nil {
need = append(need, res...)
} else {
errdata = &pb.ErrorData{

4
modules/island/api_upgrade.go
View File

@ -16,8 +16,8 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.IsLandUpgra
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.IsLandUpgradeReq) (errdata *pb.ErrorData) {
var (
info *pb.DBIsland
conf *cfg.GamePuggsySkillData
front *cfg.GamePuggsySkillData
conf *cfg.GameHoroscopeData
front *cfg.GameHoroscopeData
err error
)
if errdata = this.UpgradeCheck(session, req); errdata != nil {

23
modules/island/configure.go
View File

@ -10,13 +10,14 @@ import (
)
const (
game_puggsyevent = "game_puggsyevent.json"
game_puggsyskill = "game_puggsyskill.json"
game_puggsyevent = "game_puggsyevent.json"
// game_puggsyskill = "game_puggsyskill.json"
game_puggsyfight = "game_puggsyfight.json"
game_puggsyscore = "game_puggsyscore.json"
game_passcheck = "game_passcheck.json"
game_puggsystar = "game_puggsystar.json"
game_puggsyrecruit = "game_puggsyrecruit.json"
game_horoscope = "game_horoscope.json" //购买挑战记录
)
// /背包配置管理组件
@ -30,12 +31,14 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*IsLand)
err = this.LoadConfigure(game_puggsyevent, cfg.NewGamePuggsyEvent)
err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill)
// err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill)
err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight)
err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore)
err = this.LoadConfigure(game_passcheck, cfg.NewGamePassCheck)
err = this.LoadConfigure(game_puggsystar, cfg.NewGamePuggsyStar)
err = this.LoadConfigure(game_puggsyrecruit, cfg.NewGamePuggsyRecruit)
err = this.LoadConfigure(game_horoscope, cfg.NewGameHoroscope)
return
}
@ -78,16 +81,16 @@ func (this *ConfigureComp) getGamePuggsyFightData(id int32) (configure *cfg.Game
}
//技能节点
func (this *ConfigureComp) getGamePuggsySkillData(id int32) (configure *cfg.GamePuggsySkillData, err error) {
func (this *ConfigureComp) getGamePuggsySkillData(id int32) (configure *cfg.GameHoroscopeData, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(game_puggsyskill); err != nil {
if v, err = this.GetConfigure(game_horoscope); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
if configure, ok = v.(*cfg.GamePuggsySkill).GetDataMap()[id]; !ok {
if configure, ok = v.(*cfg.GameHoroscope).GetDataMap()[id]; !ok {
err = fmt.Errorf("no found Material:%d configure", id)
this.module.Errorf("err:%v", err)
return
@ -97,16 +100,16 @@ func (this *ConfigureComp) getGamePuggsySkillData(id int32) (configure *cfg.Game
}
//技能节点
func (this *ConfigureComp) getGamePuggsySkilllvData(nid, lv int32) (conf *cfg.GamePuggsySkillData, err error) {
func (this *ConfigureComp) getGamePuggsySkilllvData(nid, lv int32) (conf *cfg.GameHoroscopeData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_puggsyskill); err != nil {
if v, err = this.GetConfigure(game_horoscope); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
for _, v := range v.(*cfg.GamePuggsySkill).GetDataList() {
if v.NodeId == nid && v.Lv == lv {
for _, v := range v.(*cfg.GameHoroscope).GetDataList() {
if v.Type == 2 && v.NodeId == nid && v.Lv == lv {
conf = v
return
}

2
modules/island/model.go
View File

@ -59,7 +59,7 @@ func (this *modelComp) getmodel(uid string) (result *pb.DBIsland, err error) {
//计算属性
func (this *modelComp) compute(info *pb.DBIsland, heros []*pb.DBHero) (err error) {
var (
node *cfg.GamePuggsySkillData
node *cfg.GameHoroscopeData
property map[int32]int32 = make(map[int32]int32)
)

1
modules/island/modelhero.go
View File

@ -57,6 +57,7 @@ func (this *modelHeroComp) updateHeroProperty(uid string, hero *pb.DBHero) (err
"juexingLv": hero.JuexingLv,
"property": hero.Property,
"juexProperty": hero.JuexProperty,
"lv": hero.Lv,
}
if err = this.ChangeList(uid, hero.Id, update); err != nil {
this.module.Errorln(err)

6
modules/parkour/api_Info.go
View File

@ -4,6 +4,7 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils"
)
@ -84,10 +85,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (er
}
if !utils.IsSameWeek(info.Weektime) {
info.Weektime = configure.Now().Unix()
info.Weekintegral = 0
update["weekintegral"] = 0
update["weekintegral"] = info.Weekintegral
update["weektime"] = info.Weektime
}
info.User = comm.GetUserBaseInfo(user)
update["user"] = info.User
if err = this.module.parkourComp.Change(session.GetUserId(), update); err != nil {