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:
wh_zcy 2023-05-30 10:14:10 +08:00
commit 6c81d4e177
12 changed files with 1530 additions and 1720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1506
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

355
bin/json/game_buriedtype.json
View File

File diff suppressed because it is too large Load Diff

686
bin/json/game_hero.json
View File

File diff suppressed because it is too large Load Diff

475
bin/json/game_herostarup.json
View File

File diff suppressed because it is too large Load Diff

205
bin/json/game_skillafteratk.json
View File

@ -2328,7 +2328,7 @@
"Argu": [
1,
4,
3200
1500
],
"FollowSK": [],
"SucFollowSK": [
@ -2377,7 +2377,7 @@
"Argu": [
1,
4,
3250
1600
],
"FollowSK": [],
"SucFollowSK": [
@ -2426,7 +2426,7 @@
"Argu": [
1,
4,
3300
1700
],
"FollowSK": [],
"SucFollowSK": [
@ -2475,7 +2475,7 @@
"Argu": [
1,
4,
3350
1800
],
"FollowSK": [],
"SucFollowSK": [
@ -2524,7 +2524,7 @@
"Argu": [
1,
4,
3400
1900
],
"FollowSK": [],
"SucFollowSK": [
@ -2573,7 +2573,7 @@
"Argu": [
1,
4,
3600
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -2619,7 +2619,7 @@
"Argu": [
1,
4,
3650
2250
],
"FollowSK": [],
"SucFollowSK": [
@ -2665,7 +2665,7 @@
"Argu": [
1,
4,
3700
2300
],
"FollowSK": [],
"SucFollowSK": [
@ -2711,7 +2711,7 @@
"Argu": [
1,
4,
3750
2450
],
"FollowSK": [],
"SucFollowSK": [
@ -2757,7 +2757,7 @@
"Argu": [
1,
4,
4000
3000
],
"FollowSK": [],
"SucFollowSK": [
@ -2831,7 +2831,7 @@
"Argu": [
1,
4,
4050
3100
],
"FollowSK": [],
"SucFollowSK": [
@ -2905,7 +2905,7 @@
"Argu": [
1,
4,
4100
3200
],
"FollowSK": [],
"SucFollowSK": [
@ -2979,7 +2979,7 @@
"Argu": [
1,
4,
4150
3300
],
"FollowSK": [],
"SucFollowSK": [
@ -3053,7 +3053,7 @@
"Argu": [
1,
4,
4200
3400
],
"FollowSK": [],
"SucFollowSK": [
@ -7070,7 +7070,7 @@
"Argu": [
1,
4,
3800
8500
],
"FollowSK": [
244006325
@ -7116,7 +7116,7 @@
"Argu": [
1,
4,
3800
9500
],
"FollowSK": [
244006335
@ -7162,7 +7162,7 @@
"Argu": [
1,
4,
3800
10500
],
"FollowSK": [
244006345
@ -7208,7 +7208,7 @@
"Argu": [
1,
4,
3800
11000
],
"FollowSK": [
244006355
@ -13321,54 +13321,6 @@
{
"Id": 245001111,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
500
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001112,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Argu": [
3,
1,
1
],
"FollowSK": [],
"SucFollowSK": [
245001113
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001113,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
@ -13391,10 +13343,58 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001112,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
1,
4,
1500
],
"FollowSK": [],
"SucFollowSK": [
245001113
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001113,
"EmitPR": 700,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 32,
"Argu": [
3,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001114,
"EmitPR": 1000,
"From": 2,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@ -13427,7 +13427,7 @@
"Argu": [
1,
4,
500
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -13452,7 +13452,7 @@
"Argu": [
1,
4,
500
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -13500,8 +13500,9 @@
"Type": 19,
"Argu": [
390001406,
1000,
1,
99,
-1,
1000
],
"FollowSK": [],
@ -13516,6 +13517,31 @@
{
"Id": 245001311,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
445001311,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [
245001316
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001312,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
@ -13528,9 +13554,7 @@
1000
],
"FollowSK": [],
"SucFollowSK": [
245001312
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -13539,7 +13563,7 @@
"RevisiParams": []
},
{
"Id": 245001312,
"Id": 245001313,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -13562,7 +13586,7 @@
"RevisiParams": []
},
{
"Id": 245001313,
"Id": 245001314,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -13573,11 +13597,11 @@
"Argu": [
1,
4,
1200
5000
],
"FollowSK": [],
"SucFollowSK": [
245001314
245001315
],
"FailFollowSK": [],
"MustHit": false,
@ -13587,7 +13611,7 @@
"RevisiParams": []
},
{
"Id": 245001314,
"Id": 245001315,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -13610,31 +13634,6 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001315,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
445001311,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [
245001316
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245001316,
"EmitPR": 1000,

3
bin/json/game_skillatk.json
View File

@ -9080,8 +9080,9 @@
"ChildSkill": {
"Id": [
245001311,
245001312,
245001313,
245001315
245001314
]
},
"Desc": {

6
bin/json/game_skillpassive.json
View File

@ -715,8 +715,8 @@
"FromCheck": "Target=3",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "Effect=3,Succ=1",
"AfterSkillCheck": "SkillID=245001112",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
@ -731,7 +731,7 @@
"FromCheck": "",
"TargetCheck": "Target=2",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"AfterSkillCheck": "SkillID=245001312",
"BuffCheck": "Effect=3,Succ=1",
"AddCon": [],
"PasPr": 1000,

3
modules/buried/module.go
View File

@ -279,13 +279,14 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
if bitem, ok = bdata.Items[int32(cond.Id)]; !ok {
if autoActivated { //自动激活
bitem = &pb.DBBuriedItem{
bdata.Items[int32(cond.Id)] = &pb.DBBuriedItem{
Conid: cond.Id,
State: pb.BuriedItemState_Activated,
Value: 0,
Statistics: make([]string, 0),
Timestamp: time.Now().Unix(),
}
bitem = bdata.Items[int32(cond.Id)]
} else {
return
}

2
modules/hero/model_hero.go
View File

@ -590,7 +590,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype147, utils.ToInt32(hero.HeroID), curLv-preLv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype113, curLv-preLv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype4, hero.Lv, utils.ToInt32(hero.HeroID)))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype23, 1, hero.Star, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam2(comm.Rtype23, hero.HeroID, hero.Star, hero.Lv))
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype24, 1))
// szTask = append(szTask, comm.GetBuriedParam(comm.Rtype29, 1, hero.Lv, utils.ToInt32(hero.HeroID)))

4
modules/library/api_usegift.go
View File

@ -93,9 +93,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
}
}
}
if likeStates == 0 {
addExp *= req.Counts
}
res = append(res, &cfg.Gameatn{
A: "item",
T: req.Items,

3
modules/smithy/api_forgeequip.go
View File

@ -202,9 +202,9 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
} else { // 普通打造
// 获取掉落id
newdrop := this.module.modelStove.CheckUnlockSuid(req.ReelId, stove.Data[req.ReelId].Lv, reelcfg.BasicDrop)
res := this.module.configure.GetDropReward(newdrop)
// 检查是否命中双倍打造
for i := 0; i < int(req.Count); i++ {
res := this.module.configure.GetDropReward(newdrop)
if ok := this.module.modelStove.CheckForgetwoEquip(req.ReelId, stove.Data[req.ReelId].Lv, addProbability); ok {
if code, atno = this.module.DispenseAtno(session, res, true); code == pb.ErrorCode_Success {
for _, v := range atno {
@ -214,6 +214,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
}
}
}
if code, atno = this.module.DispenseAtno(session, res, true); code == pb.ErrorCode_Success {
for _, v := range atno {
if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success {

2
modules/worldtask/module.go
View File

@ -35,7 +35,7 @@ func (this *Worldtask) Init(service core.IService, module core.IModule, options
func (this *Worldtask) OnInstallComp() {
this.ModuleBase.OnInstallComp()
event.RegisterGO(comm.EventBuriedComplete, this.TCondFinishNotify)
event.Register(comm.EventBuriedComplete, this.TCondFinishNotify)
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.modelWorldtask = this.RegisterComp(new(ModelWorldtask)).(*ModelWorldtask)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)