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-08-11 22:01:52 +08:00
commit 8525c7646f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/json/game_stonetalent.json
View File

@ -85,7 +85,7 @@
{ {
"Id": 4, "Id": 4,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "js_jx_img_icon01", "NodeIcon": "mj_icon_attack",
"listIndex": 1, "listIndex": 1,
"Front": [ "Front": [
2, 2,
@ -113,7 +113,7 @@
{ {
"Id": 5, "Id": 5,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "js_jx_img_icon01", "NodeIcon": "mj_icon_attack",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
4 4
@ -140,7 +140,7 @@
{ {
"Id": 6, "Id": 6,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
5 5
@ -167,7 +167,7 @@
{ {
"Id": 7, "Id": 7,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
5 5
@ -194,7 +194,7 @@
{ {
"Id": 8, "Id": 8,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 2, "listIndex": 2,
"Front": [ "Front": [
6, 6,
@ -222,7 +222,7 @@
{ {
"Id": 9, "Id": 9,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
8 8
@ -249,7 +249,7 @@
{ {
"Id": 10, "Id": 10,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
8 8
@ -276,7 +276,7 @@
{ {
"Id": 11, "Id": 11,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
9 9
@ -303,7 +303,7 @@
{ {
"Id": 12, "Id": 12,
"NodeType": 1, "NodeType": 1,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
10 10
@ -330,7 +330,7 @@
{ {
"Id": 13, "Id": 13,
"NodeType": 2, "NodeType": 2,
"NodeIcon": "Lifemj_icon_life", "NodeIcon": "mj_icon_attack",
"listIndex": 3, "listIndex": 3,
"Front": [ "Front": [
11, 11,

2
modules/stonehenge/api_event.go
View File

@ -101,7 +101,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
} }
buffid := stone.Rooms.Selectbuff[pos] buffid := stone.Rooms.Selectbuff[pos]
// 加入收藏 // 加入收藏
if conf, err := this.module.configure.GetStoneBuffDataById(buffid); err != nil { if conf, err := this.module.configure.GetStoneBuffDataById(buffid); err == nil {
stone.Userbuff[buffid] = 1 stone.Userbuff[buffid] = 1
stone.Rooms.Selectbuff = []int32{} stone.Rooms.Selectbuff = []int32{}
update["userbuff"] = stone.Userbuff update["userbuff"] = stone.Userbuff

2
modules/stonehenge/api_gotoroom.go
View File

@ -121,7 +121,7 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
this.module.modelStonehenge.AddNewEvent(szEvent, stone) this.module.modelStonehenge.AddNewEvent(szEvent, stone)
} }
stone.Rooms.Portal = this.module.configure.GetRoomGroupDataByLottery(req.Portal) //stone.Rooms.Portal = this.module.configure.GetRoomGroupDataByLottery(req.Portal)
// 校验是否进boss // 校验是否进boss
if this.module.configure.GetFloorConfByStageId(stone.StageID)-1 == stone.CurRoomIndes { if this.module.configure.GetFloorConfByStageId(stone.StageID)-1 == stone.CurRoomIndes {
if stage := this.module.modelStonehenge.GetStoneBoosData(stone.StageID); stage != nil { if stage := this.module.modelStonehenge.GetStoneBoosData(stone.StageID); stage != nil {