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:
liwei1dao 2023-03-16 16:17:23 +08:00
commit 953dd22db8
10 changed files with 2422 additions and 2418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
bin/json/game_pandamasbuff.json
View File

@ -1,86 +1,86 @@
[ [
{ {
"id": 1001, "id": 1001,
"buff_group": 1000001, "buff_group": 1000001,
"duration": "", "duration": "",
"camp_restriction": 1, "camp_restriction": 1,
"occupational_restrictions": 1, "occupational_restrictions": 1,
"star_limit": 6, "star_limit": 6,
"buffid": 200000001, "buffid": 200000001,
"p": 1667, "p": 1667,
"name": { "name": {
"key": "wuguanbuff200000001", "key": "wuguanbuff200000001",
"text": "攻击力增加2%" "text": "攻击力增加2%"
} }
}, },
{ {
"id": 1002, "id": 1002,
"buff_group": 1000001, "buff_group": 1000001,
"duration": "", "duration": "",
"camp_restriction": 2, "camp_restriction": 2,
"occupational_restrictions": 2, "occupational_restrictions": 2,
"star_limit": 6, "star_limit": 6,
"buffid": 200000002, "buffid": 200000002,
"p": 1667, "p": 1667,
"name": { "name": {
"key": "wuguanbuff200000002", "key": "wuguanbuff200000002",
"text": "防御力增加2%" "text": "防御力增加2%"
} }
}, },
{ {
"id": 1003, "id": 1003,
"buff_group": 1000001, "buff_group": 1000001,
"duration": "", "duration": "",
"camp_restriction": 3, "camp_restriction": 3,
"occupational_restrictions": 3, "occupational_restrictions": 3,
"star_limit": 6, "star_limit": 6,
"buffid": 200000003, "buffid": 200000003,
"p": 1667, "p": 1667,
"name": { "name": {
"key": "wuguanbuff200000003", "key": "wuguanbuff200000003",
"text": "暴击率增加2%" "text": "暴击率增加2%"
} }
}, },
{ {
"id": 1004, "id": 1004,
"buff_group": 1000001, "buff_group": 1000001,
"duration": "", "duration": "",
"camp_restriction": 4, "camp_restriction": 4,
"occupational_restrictions": 4, "occupational_restrictions": 4,
"star_limit": 6, "star_limit": 6,
"buffid": 200000004, "buffid": 200000004,
"p": 1667, "p": 1667,
"name": { "name": {
"key": "wuguanbuff200000004", "key": "wuguanbuff200000004",
"text": "暴击抵抗增加2%" "text": "暴击抵抗增加2%"
} }
}, },
{ {
"id": 1005, "id": 1005,
"buff_group": 1000001, "buff_group": 1000001,
"duration": "", "duration": "",
"camp_restriction": 0, "camp_restriction": 0,
"occupational_restrictions": 0, "occupational_restrictions": 0,
"star_limit": 0, "star_limit": 0,
"buffid": 200000005, "buffid": 200000005,
"p": 1667, "p": 1667,
"name": { "name": {
"key": "wuguanbuff200000005", "key": "wuguanbuff200000005",
"text": "效果命中增加2%" "text": "效果命中增加2%"
} }
}, },
{ {
"id": 1006, "id": 1006,
"buff_group": 1000001, "buff_group": 1000001,
"duration": "", "duration": "",
"camp_restriction": 0, "camp_restriction": 0,
"occupational_restrictions": 0, "occupational_restrictions": 0,
"star_limit": 0, "star_limit": 0,
"buffid": 200000006, "buffid": 200000006,
"p": 1667, "p": 1667,
"name": { "name": {
"key": "wuguanbuff200000006", "key": "wuguanbuff200000006",
"text": "效果抵抗增加2%" "text": "效果抵抗增加2%"
} }
} }
] ]

1792
bin/json/game_pandamasjx.json
View File

File diff suppressed because it is too large Load Diff

300
bin/json/game_pandamasmz.json
View File

@ -1,151 +1,151 @@
[ [
{ {
"lv": 1, "lv": 1,
"name": { "name": {
"key": "muzhuang_1", "key": "muzhuang_1",
"text": "1级木人桩" "text": "1级木人桩"
}, },
"pile_appearance": "Level1", "pile_appearance": "Level1",
"effect": { "effect": {
"key": "muzhuang_xiaoguo_1", "key": "muzhuang_xiaoguo_1",
"text": "每分钟提升经验{0}" "text": "每分钟提升经验{0}"
}, },
"up_lv_consume": [ "up_lv_consume": [
{ {
"a": "item", "a": "item",
"t": "30001", "t": "30001",
"n": 1 "n": 1
}, },
{ {
"a": "item", "a": "item",
"t": "30002", "t": "30002",
"n": 1 "n": 1
}, },
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 5000 "n": 5000
} }
], ],
"min_exp": 10, "min_exp": 10,
"placement_duration": 2, "placement_duration": 2,
"prop_position": 0, "prop_position": 0,
"photo_guide_unlocking": [] "photo_guide_unlocking": []
}, },
{ {
"lv": 2, "lv": 2,
"name": { "name": {
"key": "muzhuang_2", "key": "muzhuang_2",
"text": "2级木人桩" "text": "2级木人桩"
}, },
"pile_appearance": "Level2", "pile_appearance": "Level2",
"effect": { "effect": {
"key": "muzhuang_xiaoguo_2", "key": "muzhuang_xiaoguo_2",
"text": "每分钟提升经验{0}" "text": "每分钟提升经验{0}"
}, },
"up_lv_consume": [ "up_lv_consume": [
{ {
"a": "item", "a": "item",
"t": "30001", "t": "30001",
"n": 1 "n": 1
}, },
{ {
"a": "item", "a": "item",
"t": "30002", "t": "30002",
"n": 1 "n": 1
}, },
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 5000 "n": 5000
} }
], ],
"min_exp": 15, "min_exp": 15,
"placement_duration": 2, "placement_duration": 2,
"prop_position": 1, "prop_position": 1,
"photo_guide_unlocking": [] "photo_guide_unlocking": []
}, },
{ {
"lv": 3, "lv": 3,
"name": { "name": {
"key": "muzhuang_3", "key": "muzhuang_3",
"text": "3级木人桩" "text": "3级木人桩"
}, },
"pile_appearance": "Level2", "pile_appearance": "Level2",
"effect": { "effect": {
"key": "muzhuang_xiaoguo_3", "key": "muzhuang_xiaoguo_3",
"text": "每分钟提升经验{0}" "text": "每分钟提升经验{0}"
}, },
"up_lv_consume": [ "up_lv_consume": [
{ {
"a": "item", "a": "item",
"t": "30001", "t": "30001",
"n": 1 "n": 1
}, },
{ {
"a": "item", "a": "item",
"t": "30002", "t": "30002",
"n": 1 "n": 1
}, },
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 5000 "n": 5000
} }
], ],
"min_exp": 20, "min_exp": 20,
"placement_duration": 2, "placement_duration": 2,
"prop_position": 1, "prop_position": 1,
"photo_guide_unlocking": [] "photo_guide_unlocking": []
}, },
{ {
"lv": 4, "lv": 4,
"name": { "name": {
"key": "muzhuang_4", "key": "muzhuang_4",
"text": "4级木人桩" "text": "4级木人桩"
}, },
"pile_appearance": "Level2", "pile_appearance": "Level2",
"effect": { "effect": {
"key": "muzhuang_xiaoguo_4", "key": "muzhuang_xiaoguo_4",
"text": "每分钟提升经验{0}" "text": "每分钟提升经验{0}"
}, },
"up_lv_consume": [ "up_lv_consume": [
{ {
"a": "item", "a": "item",
"t": "30001", "t": "30001",
"n": 1 "n": 1
}, },
{ {
"a": "item", "a": "item",
"t": "30002", "t": "30002",
"n": 1 "n": 1
}, },
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 5000 "n": 5000
} }
], ],
"min_exp": 25, "min_exp": 25,
"placement_duration": 2, "placement_duration": 2,
"prop_position": 1, "prop_position": 1,
"photo_guide_unlocking": [] "photo_guide_unlocking": []
}, },
{ {
"lv": 5, "lv": 5,
"name": { "name": {
"key": "muzhuang_5", "key": "muzhuang_5",
"text": "5级木人桩" "text": "5级木人桩"
}, },
"pile_appearance": "Level2", "pile_appearance": "Level2",
"effect": { "effect": {
"key": "muzhuang_xiaoguo_5", "key": "muzhuang_xiaoguo_5",
"text": "每分钟提升经验{0}" "text": "每分钟提升经验{0}"
}, },
"up_lv_consume": [], "up_lv_consume": [],
"min_exp": 30, "min_exp": 30,
"placement_duration": 2, "placement_duration": 2,
"prop_position": 1, "prop_position": 1,
"photo_guide_unlocking": [] "photo_guide_unlocking": []
} }
] ]

354
bin/json/game_pandamastjjl.json
View File

@ -1,178 +1,178 @@
[ [
{ {
"atlas_lv": 1, "atlas_lv": 1,
"atlas_score": 0, "atlas_score": 0,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 2, "atlas_lv": 2,
"atlas_score": 50, "atlas_score": 50,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 3, "atlas_lv": 3,
"atlas_score": 100, "atlas_score": 100,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 4, "atlas_lv": 4,
"atlas_score": 150, "atlas_score": 150,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 5, "atlas_lv": 5,
"atlas_score": 200, "atlas_score": 200,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 6, "atlas_lv": 6,
"atlas_score": 250, "atlas_score": 250,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 7, "atlas_lv": 7,
"atlas_score": 300, "atlas_score": 300,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 8, "atlas_lv": 8,
"atlas_score": 350, "atlas_score": 350,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 9, "atlas_lv": 9,
"atlas_score": 400, "atlas_score": 400,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 10, "atlas_lv": 10,
"atlas_score": 450, "atlas_score": 450,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 11, "atlas_lv": 11,
"atlas_score": 500, "atlas_score": 500,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 12, "atlas_lv": 12,
"atlas_score": 550, "atlas_score": 550,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 13, "atlas_lv": 13,
"atlas_score": 600, "atlas_score": 600,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 14, "atlas_lv": 14,
"atlas_score": 650, "atlas_score": 650,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 15, "atlas_lv": 15,
"atlas_score": 700, "atlas_score": 700,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
}, },
{ {
"atlas_lv": 16, "atlas_lv": 16,
"atlas_score": 750, "atlas_score": 750,
"item_id": [ "item_id": [
{ {
"a": "item", "a": "item",
"t": "10002", "t": "10002",
"n": 1 "n": 1
} }
] ]
} }
] ]

178
bin/json/game_pandamasyxjx.json
View File

@ -1,90 +1,90 @@
[ [
{ {
"id": 1, "id": 1,
"describe": { "describe": {
"key": "wuguyanyxjx1", "key": "wuguyanyxjx1",
"text": "添加真诚阵营的英雄获得额外经验值加成" "text": "添加真诚阵营的英雄获得额外经验值加成"
}, },
"camp": 1, "camp": 1,
"occupation": 0, "occupation": 0,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 2, "id": 2,
"describe": { "describe": {
"key": "wuguyanyxjx2", "key": "wuguyanyxjx2",
"text": "添加共情阵营的英雄获得额外经验值加成" "text": "添加共情阵营的英雄获得额外经验值加成"
}, },
"camp": 2, "camp": 2,
"occupation": 0, "occupation": 0,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 3, "id": 3,
"describe": { "describe": {
"key": "wuguyanyxjx3", "key": "wuguyanyxjx3",
"text": "添加直觉阵营的英雄获得额外经验值加成" "text": "添加直觉阵营的英雄获得额外经验值加成"
}, },
"camp": 3, "camp": 3,
"occupation": 0, "occupation": 0,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 4, "id": 4,
"describe": { "describe": {
"key": "wuguyanyxjx4", "key": "wuguyanyxjx4",
"text": "添加责任阵营的英雄获得额外经验值加成" "text": "添加责任阵营的英雄获得额外经验值加成"
}, },
"camp": 4, "camp": 4,
"occupation": 0, "occupation": 0,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 5, "id": 5,
"describe": { "describe": {
"key": "wuguyanyxjx5", "key": "wuguyanyxjx5",
"text": "添加输出职业的英雄获得额外经验值加成" "text": "添加输出职业的英雄获得额外经验值加成"
}, },
"camp": 0, "camp": 0,
"occupation": 1, "occupation": 1,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 6, "id": 6,
"describe": { "describe": {
"key": "wuguyanyxjx6", "key": "wuguyanyxjx6",
"text": "添加防御职业的英雄获得额外经验值加成" "text": "添加防御职业的英雄获得额外经验值加成"
}, },
"camp": 0, "camp": 0,
"occupation": 2, "occupation": 2,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 7, "id": 7,
"describe": { "describe": {
"key": "wuguyanyxjx7", "key": "wuguyanyxjx7",
"text": "添加辅助职业的英雄获得额外经验值加成" "text": "添加辅助职业的英雄获得额外经验值加成"
}, },
"camp": 0, "camp": 0,
"occupation": 3, "occupation": 3,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
}, },
{ {
"id": 8, "id": 8,
"describe": { "describe": {
"key": "wuguyanyxjx8", "key": "wuguyanyxjx8",
"text": "添加控制职业的英雄获得额外经验值加成" "text": "添加控制职业的英雄获得额外经验值加成"
}, },
"camp": 0, "camp": 0,
"occupation": 4, "occupation": 4,
"register": 2, "register": 2,
"exp_bonus": 5 "exp_bonus": 5
} }
] ]

2010
bin/json/game_pandsmasexp.json
View File

File diff suppressed because it is too large Load Diff

2
modules/equipment/api_equip.go
View File

@ -169,7 +169,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
return return
} }
tasks = append(tasks, comm.GettaskParam(comm.Rtype5, 1, utils.ToInt32(hero.HeroID), equipNum)) tasks = append(tasks, comm.GettaskParam(comm.Rtype5, 1, equipNum, utils.ToInt32(hero.HeroID)))
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype5, utils.ToInt32(hero.HeroID), equipNum) // this.module.ModuleRtask.SendToRtask(session, comm.Rtype5, utils.ToInt32(hero.HeroID), equipNum)
for k, v := range equipStr { for k, v := range equipStr {
tasks = append(tasks, comm.GettaskParam(comm.Rtype41, 1, utils.ToInt32(hero.HeroID), v, k)) tasks = append(tasks, comm.GettaskParam(comm.Rtype41, 1, utils.ToInt32(hero.HeroID), v, k))

2
modules/hero/api_strengthenUpStar.go
View File

@ -86,7 +86,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
// 推送 世界任务消息 // 推送 世界任务消息
var szTask []*comm.TaskParam var szTask []*comm.TaskParam
szTask = append(szTask, comm.GettaskParam(comm.Rtype6, utils.ToInt32(_hero.HeroID), _hero.Star)) szTask = append(szTask, comm.GettaskParam(comm.Rtype6, _hero.Star, utils.ToInt32(_hero.HeroID)))
szTask = append(szTask, comm.GettaskParam(comm.Rtype25, 1, utils.ToInt32(_hero.HeroID), _hero.Star)) szTask = append(szTask, comm.GettaskParam(comm.Rtype25, 1, utils.ToInt32(_hero.HeroID), _hero.Star))
if _hero.Star == 4 { if _hero.Star == 4 {

2
modules/hero/model_hero.go
View File

@ -576,7 +576,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
var szTask []*comm.TaskParam var szTask []*comm.TaskParam
szTask = append(szTask, comm.GettaskParam(comm.Rtype147, utils.ToInt32(hero.HeroID), curLv-preLv)) szTask = append(szTask, comm.GettaskParam(comm.Rtype147, utils.ToInt32(hero.HeroID), curLv-preLv))
szTask = append(szTask, comm.GettaskParam(comm.Rtype113, utils.ToInt32(hero.HeroID), curLv-preLv)) szTask = append(szTask, comm.GettaskParam(comm.Rtype113, utils.ToInt32(hero.HeroID), curLv-preLv))
szTask = append(szTask, comm.GettaskParam(comm.Rtype4, utils.ToInt32(hero.HeroID), hero.Lv)) szTask = append(szTask, comm.GettaskParam(comm.Rtype4, hero.Lv, utils.ToInt32(hero.HeroID)))
szTask = append(szTask, comm.GettaskParam(comm.Rtype23, 1, hero.Star, hero.Lv)) szTask = append(szTask, comm.GettaskParam(comm.Rtype23, 1, hero.Star, hero.Lv))
szTask = append(szTask, comm.GettaskParam(comm.Rtype24, 1)) szTask = append(szTask, comm.GettaskParam(comm.Rtype24, 1))
szTask = append(szTask, comm.GettaskParam(comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID))) szTask = append(szTask, comm.GettaskParam(comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID)))

30
modules/hero/module.go
View File

@ -1,6 +1,7 @@
package hero package hero
import ( import (
"context"
"crypto/rand" "crypto/rand"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
@ -944,31 +945,34 @@ func (this *Hero) QueryCrossMultipleHeroinfo(oid []string) (hero []*pb.DBHero, e
if err1 != nil { if err1 != nil {
continue continue
} }
result := make([]bson.M, 0)
for _, v := range oid { for _, v := range oid {
sr := conn.Mgo.FindOne(comm.TableHero, bson.M{ result = append(result, bson.M{"_id": v})
"_id": v, }
}) sr, _ := conn.Mgo.Find(comm.TableHero, bson.M{"$or": result})
for sr.Next(context.TODO()) {
_hero := &pb.DBHero{} _hero := &pb.DBHero{}
if err = sr.Decode(_hero); err != nil { if err = sr.Decode(_hero); err != nil {
this.modelHero.moduleHero.Errorf("find hero error: %v", err) this.modelHero.moduleHero.Errorf("find hero error: %v", err)
} }
hero = append(hero, _hero) hero = append(hero, _hero)
} }
return return
} }
} else { // 不是跨服就查本服 注意 这个接口是给跨服玩法调用 理论上这个分支是不会执行的 } else { // 不是跨服就查本服 注意 这个接口是给跨服玩法调用 理论上这个分支是不会执行的
result := make([]bson.M, 0)
for _, v := range oid { for _, v := range oid {
if res := this.modelHero.DB.FindOne(comm.TableHero, bson.M{ result = append(result, bson.M{"_id": v})
"_id": v, }
}); res == nil { sr, _ := this.modelHero.DB.Find(comm.TableHero, bson.M{"$or": result})
_hero := &pb.DBHero{} for sr.Next(context.TODO()) {
if err = res.Decode(_hero); err != nil { _hero := &pb.DBHero{}
this.modelHero.moduleHero.Errorf("find hero error: %v", err) if err = sr.Decode(_hero); err != nil {
return this.modelHero.moduleHero.Errorf("find hero error: %v", err)
}
hero = append(hero, _hero)
} }
hero = append(hero, _hero)
} }
} }