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

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

Browse Source
This commit is contained in:
meixiongfeng 2022-12-26 15:28:33 +08:00
commit 1005882ef5
12 changed files with 1525 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/json/game_hero.json
View File

@ -6452,10 +6452,10 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"skill": 155006011, "skill": 111021011,
"skill1": 155006111, "skill1": 111021111,
"skill2": 155006211, "skill2": 111021211,
"skill3": 155006311, "skill3": 111021311,
"txt": { "txt": {
"key": "atlas_11021", "key": "atlas_11021",
"text": "" "text": ""

15
bin/json/game_herolevelgrow.json
View File

@ -1588,20 +1588,5 @@
"atkgrow": 1300, "atkgrow": 1300,
"defgrow": 1250, "defgrow": 1250,
"speedgrow": 0 "speedgrow": 0
},
{
"id": "11021",
"hp": 0,
"atk": 0,
"def": 0,
"speed": 170,
"cri": 50,
"cridam": 1500,
"effhit": 0,
"effre": 200,
"hpgrow": 1900,
"atkgrow": 1700,
"defgrow": 1700,
"speedgrow": 0
} }
] ]

6
bin/json/game_libraryfetter.json
View File

@ -1,7 +1,7 @@
[ [
{ {
"id": 1, "id": 1,
"fid": 101, "fid": 40001,
"ftype": 1, "ftype": 1,
"name": { "name": {
"key": "fetters_1", "key": "fetters_1",
@ -33,7 +33,7 @@
}, },
{ {
"id": 2, "id": 2,
"fid": 101, "fid": 40001,
"ftype": 1, "ftype": 1,
"name": { "name": {
"key": "fetters_1", "key": "fetters_1",
@ -65,7 +65,7 @@
}, },
{ {
"id": 3, "id": 3,
"fid": 101, "fid": 40001,
"ftype": 1, "ftype": 1,
"name": { "name": {
"key": "fetters_1", "key": "fetters_1",

104
bin/json/game_libraryhero.json
View File

@ -43,9 +43,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "14005", "hid": "14005",
@ -91,10 +89,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
101,
102
]
}, },
{ {
"hid": "14006", "hid": "14006",
@ -140,10 +135,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
101,
102
]
}, },
{ {
"hid": "15004", "hid": "15004",
@ -237,9 +229,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "24003", "hid": "24003",
@ -285,9 +275,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "24004", "hid": "24004",
@ -333,9 +321,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "24005", "hid": "24005",
@ -381,9 +367,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "24008", "hid": "24008",
@ -429,9 +413,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "25001", "hid": "25001",
@ -478,6 +460,7 @@
4 4
], ],
"fid": [ "fid": [
40001,
102 102
] ]
}, },
@ -525,9 +508,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "25004", "hid": "25004",
@ -573,9 +554,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "34001", "hid": "34001",
@ -621,9 +600,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "34003", "hid": "34003",
@ -669,9 +646,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "34004", "hid": "34004",
@ -717,9 +692,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "34006", "hid": "34006",
@ -765,9 +738,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "34008", "hid": "34008",
@ -813,9 +784,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "35001", "hid": "35001",
@ -862,6 +831,7 @@
4 4
], ],
"fid": [ "fid": [
40001,
102 102
] ]
}, },
@ -909,9 +879,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "35003", "hid": "35003",
@ -957,9 +925,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "35004", "hid": "35004",
@ -1005,9 +971,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "35006", "hid": "35006",
@ -1053,9 +1017,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "43005", "hid": "43005",
@ -1100,9 +1062,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "43007", "hid": "43007",
@ -1148,9 +1108,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "44006", "hid": "44006",
@ -1196,9 +1154,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "45001", "hid": "45001",
@ -1244,9 +1200,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "53001", "hid": "53001",
@ -1292,9 +1246,7 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
}, },
{ {
"hid": "54005", "hid": "54005",
@ -1340,8 +1292,6 @@
3, 3,
4 4
], ],
"fid": [ "fid": []
102
]
} }
] ]

1308
bin/json/game_libraryhistory.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_librarystory.json
View File

@ -1,7 +1,7 @@
[ [
{ {
"fid": 101, "fid": 40001,
"stroy": 101, "stroy": 40001,
"prize": [ "prize": [
{ {
"a": "attr", "a": "attr",

4
bin/json/game_mainline.json
View File

@ -144,7 +144,7 @@
}, },
{ {
"a": "hero", "a": "hero",
"t": "43901", "t": "44911",
"n": 5 "n": 5
} }
], ],
@ -189,7 +189,7 @@
}, },
{ {
"a": "hero", "a": "hero",
"t": "43901", "t": "44911",
"n": 5 "n": 5
} }
], ],

12
modules/enchant/api_getlist.go
View File

@ -48,15 +48,15 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListRe
code = pb.ErrorCode_ConfigNoFound code = pb.ErrorCode_ConfigNoFound
return return
} }
iContt := conf.EnchantbossInitial iCont := conf.EnchantbossInitial
atn := conf.EnchantbossCos atn := conf.EnchantbossCos
if iContt > 0 { if iCont > 0 {
res := &cfg.Gameatn{
this.module.DispenseRes(session, []*cfg.Gameatn{&cfg.Gameatn{
A: atn.A, A: atn.A,
T: atn.T, T: atn.T,
N: iContt, N: iCont,
}}, true) }
this.module.DispenseRes(session, []*cfg.Gameatn{res}, true)
} }
} else if err != nil { } else if err != nil {
code = pb.ErrorCode_DBError code = pb.ErrorCode_DBError

6
modules/hunting/api_getlist.go
View File

@ -54,12 +54,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe
iCont := conf.HuntingNum iCont := conf.HuntingNum
atn := conf.HuntingCos atn := conf.HuntingCos
if iCont > 0 { if iCont > 0 {
res := &cfg.Gameatn{
this.module.DispenseRes(session, []*cfg.Gameatn{&cfg.Gameatn{
A: atn.A, A: atn.A,
T: atn.T, T: atn.T,
N: iCont, N: iCont,
}}, true) }
this.module.DispenseRes(session, []*cfg.Gameatn{res}, true)
} }
} else if err != nil { } else if err != nil {

6
modules/viking/api_getlist.go
View File

@ -54,12 +54,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq
iCont := conf.VikingNum iCont := conf.VikingNum
atn := conf.VikingExpeditionCos atn := conf.VikingExpeditionCos
if iCont > 0 { if iCont > 0 {
res := &cfg.Gameatn{
this.module.DispenseRes(session, []*cfg.Gameatn{&cfg.Gameatn{
A: atn.A, A: atn.A,
T: atn.T, T: atn.T,
N: iCont, N: iCont,
}}, true) }
this.module.DispenseRes(session, []*cfg.Gameatn{res}, true)
} }
} }

4
modules/viking/module.go
View File

@ -178,9 +178,7 @@ func (this *Viking) CompleteAllLevel(session comm.IUserSession) (code pb.ErrorCo
} }
mapData["boss"] = list.Boss mapData["boss"] = list.Boss
code = this.ModifyVikingData(session.GetUserId(), mapData) code = this.ModifyVikingData(session.GetUserId(), mapData)
for k := range list.Boss {
list.Boss[k] += 1
}
session.SendMsg(string(this.GetType()), VikingGetListResp, &pb.VikingGetListResp{Data: list}) session.SendMsg(string(this.GetType()), VikingGetListResp, &pb.VikingGetListResp{Data: list})
return return
} }