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 2023-05-26 18:59:11 +08:00
commit e232fbb71d
5 changed files with 122 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
bin/json/game_rdtaskcondi.json
View File

@ -7863,7 +7863,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10141,
"data1": 1,
"data2": 1,
"data3": 1,
@ -7880,7 +7880,7 @@
},
"type": 148,
"valid": 0,
"NPC": 0,
"NPC": 10151,
"data1": 3,
"data2": 0,
"data3": 0,
@ -7897,7 +7897,7 @@
},
"type": 148,
"valid": 0,
"NPC": 0,
"NPC": 10161,
"data1": 3,
"data2": 0,
"data3": 0,
@ -7914,7 +7914,7 @@
},
"type": 175,
"valid": 0,
"NPC": 0,
"NPC": 10171,
"data1": 100,
"data2": 0,
"data3": 0,
@ -7931,7 +7931,7 @@
},
"type": 166,
"valid": 0,
"NPC": 0,
"NPC": 10181,
"data1": 3,
"data2": 0,
"data3": 0,
@ -7948,7 +7948,7 @@
},
"type": 166,
"valid": 0,
"NPC": 0,
"NPC": 10191,
"data1": 6,
"data2": 0,
"data3": 0,
@ -7965,7 +7965,7 @@
},
"type": 177,
"valid": 0,
"NPC": 0,
"NPC": 10201,
"data1": 1,
"data2": 0,
"data3": 0,
@ -7982,7 +7982,7 @@
},
"type": 177,
"valid": 0,
"NPC": 0,
"NPC": 10211,
"data1": 4,
"data2": 0,
"data3": 0,
@ -7999,7 +7999,7 @@
},
"type": 177,
"valid": 0,
"NPC": 0,
"NPC": 10221,
"data1": 6,
"data2": 0,
"data3": 0,
@ -8016,7 +8016,7 @@
},
"type": 179,
"valid": 0,
"NPC": 0,
"NPC": 10231,
"data1": 1,
"data2": 2,
"data3": 0,
@ -8033,7 +8033,7 @@
},
"type": 179,
"valid": 0,
"NPC": 0,
"NPC": 10241,
"data1": 2,
"data2": 3,
"data3": 0,
@ -8050,7 +8050,7 @@
},
"type": 179,
"valid": 0,
"NPC": 0,
"NPC": 10251,
"data1": 3,
"data2": 5,
"data3": 0,
@ -8067,7 +8067,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10261,
"data1": 10,
"data2": 3,
"data3": 0,
@ -8084,7 +8084,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10271,
"data1": 1,
"data2": 11,
"data3": 3,
@ -8101,7 +8101,7 @@
},
"type": 180,
"valid": 0,
"NPC": 0,
"NPC": 10281,
"data1": 1,
"data2": 1,
"data3": 0,
@ -8118,7 +8118,7 @@
},
"type": 93,
"valid": 0,
"NPC": 0,
"NPC": 10291,
"data1": 6,
"data2": 1,
"data3": 0,
@ -8135,7 +8135,7 @@
},
"type": 93,
"valid": 0,
"NPC": 0,
"NPC": 10301,
"data1": 6,
"data2": 2,
"data3": 0,
@ -8152,7 +8152,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10311,
"data1": 10,
"data2": 4,
"data3": 0,
@ -8169,7 +8169,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10321,
"data1": 1,
"data2": 11,
"data3": 6,
@ -8186,7 +8186,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10331,
"data1": 1,
"data2": 21,
"data3": 5,
@ -8203,7 +8203,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10341,
"data1": 1,
"data2": 11,
"data3": 7,
@ -8220,7 +8220,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10351,
"data1": 1,
"data2": 21,
"data3": 6,
@ -8237,7 +8237,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10361,
"data1": 12,
"data2": 5,
"data3": 0,
@ -8254,7 +8254,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10371,
"data1": 1,
"data2": 11,
"data3": 8,
@ -8271,7 +8271,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10381,
"data1": 1,
"data2": 21,
"data3": 7,
@ -8288,7 +8288,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10391,
"data1": 3,
"data2": 6,
"data3": 0,
@ -8305,7 +8305,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10401,
"data1": 1,
"data2": 11,
"data3": 9,
@ -8322,7 +8322,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10411,
"data1": 1,
"data2": 21,
"data3": 8,
@ -8339,7 +8339,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10421,
"data1": 8,
"data2": 6,
"data3": 0,
@ -8356,7 +8356,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10431,
"data1": 1,
"data2": 11,
"data3": 10,
@ -8373,7 +8373,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10441,
"data1": 1,
"data2": 21,
"data3": 9,
@ -8390,7 +8390,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10451,
"data1": 15,
"data2": 6,
"data3": 0,
@ -8407,7 +8407,7 @@
},
"type": 181,
"valid": 0,
"NPC": 0,
"NPC": 10461,
"data1": 1,
"data2": 11,
"data3": 2,
@ -8424,7 +8424,7 @@
},
"type": 181,
"valid": 0,
"NPC": 0,
"NPC": 10471,
"data1": 1,
"data2": 11,
"data3": 3,
@ -8441,7 +8441,7 @@
},
"type": 50,
"valid": 0,
"NPC": 0,
"NPC": 10481,
"data1": 30,
"data2": 6,
"data3": 0,
@ -8458,7 +8458,7 @@
},
"type": 152,
"valid": 0,
"NPC": 0,
"NPC": 10491,
"data1": 1,
"data2": 0,
"data3": 0,
@ -8475,7 +8475,7 @@
},
"type": 152,
"valid": 0,
"NPC": 0,
"NPC": 10501,
"data1": 2,
"data2": 0,
"data3": 0,
@ -8492,7 +8492,7 @@
},
"type": 152,
"valid": 0,
"NPC": 0,
"NPC": 10511,
"data1": 3,
"data2": 0,
"data3": 0,
@ -8509,7 +8509,7 @@
},
"type": 182,
"valid": 0,
"NPC": 0,
"NPC": 10521,
"data1": 2,
"data2": 0,
"data3": 0,
@ -8526,7 +8526,7 @@
},
"type": 182,
"valid": 0,
"NPC": 0,
"NPC": 10531,
"data1": 4,
"data2": 0,
"data3": 0,
@ -8543,7 +8543,7 @@
},
"type": 182,
"valid": 0,
"NPC": 0,
"NPC": 10541,
"data1": 6,
"data2": 0,
"data3": 0,
@ -8560,7 +8560,7 @@
},
"type": 183,
"valid": 0,
"NPC": 0,
"NPC": 10551,
"data1": 1,
"data2": 0,
"data3": 0,
@ -8577,7 +8577,7 @@
},
"type": 184,
"valid": 0,
"NPC": 0,
"NPC": 10561,
"data1": 1,
"data2": 0,
"data3": 0,
@ -8594,7 +8594,7 @@
},
"type": 185,
"valid": 0,
"NPC": 0,
"NPC": 10571,
"data1": 1,
"data2": 0,
"data3": 0,
@ -8611,7 +8611,7 @@
},
"type": 185,
"valid": 0,
"NPC": 0,
"NPC": 10581,
"data1": 3,
"data2": 0,
"data3": 0,
@ -8628,7 +8628,7 @@
},
"type": 185,
"valid": 0,
"NPC": 0,
"NPC": 10591,
"data1": 5,
"data2": 0,
"data3": 0,
@ -8645,7 +8645,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10601,
"data1": 1,
"data2": 31,
"data3": 2,
@ -8662,7 +8662,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10611,
"data1": 1,
"data2": 31,
"data3": 3,
@ -8679,7 +8679,7 @@
},
"type": 111,
"valid": 0,
"NPC": 0,
"NPC": 10621,
"data1": 5,
"data2": 25,
"data3": 0,
@ -8696,7 +8696,7 @@
},
"type": 111,
"valid": 0,
"NPC": 0,
"NPC": 10631,
"data1": 5,
"data2": 40,
"data3": 0,
@ -8713,7 +8713,7 @@
},
"type": 111,
"valid": 0,
"NPC": 0,
"NPC": 10641,
"data1": 5,
"data2": 50,
"data3": 0,
@ -8730,7 +8730,7 @@
},
"type": 186,
"valid": 0,
"NPC": 0,
"NPC": 10651,
"data1": 3,
"data2": 0,
"data3": 0,
@ -8747,7 +8747,7 @@
},
"type": 186,
"valid": 0,
"NPC": 0,
"NPC": 10661,
"data1": 8,
"data2": 0,
"data3": 0,
@ -8764,7 +8764,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10671,
"data1": 1,
"data2": 31,
"data3": 4,
@ -8781,7 +8781,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10681,
"data1": 1,
"data2": 31,
"data3": 5,
@ -8798,7 +8798,7 @@
},
"type": 186,
"valid": 0,
"NPC": 0,
"NPC": 10691,
"data1": 10,
"data2": 0,
"data3": 0,
@ -8815,7 +8815,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10701,
"data1": 1,
"data2": 31,
"data3": 6,
@ -8832,7 +8832,7 @@
},
"type": 111,
"valid": 0,
"NPC": 0,
"NPC": 10711,
"data1": 10,
"data2": 0,
"data3": 0,
@ -8849,7 +8849,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10721,
"data1": 1,
"data2": 31,
"data3": 7,
@ -8866,7 +8866,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10731,
"data1": 1,
"data2": 31,
"data3": 8,
@ -8883,7 +8883,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10741,
"data1": 1,
"data2": 31,
"data3": 9,
@ -8900,7 +8900,7 @@
},
"type": 73,
"valid": 0,
"NPC": 0,
"NPC": 10751,
"data1": 1,
"data2": 31,
"data3": 10,

62
modules/hero/api_buy.go
View File

@ -115,62 +115,12 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb
}
}
for _, v := range need {
if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) {
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
switch v.T {
case comm.ResGold:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 1))
break
case comm.ResExp:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 3))
break
case comm.ResDiamond:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.VipExp:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.ResTaskActive:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.ResFriend:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 4))
break
case comm.StarCoin:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 9))
break
case comm.SociatyCoin:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 8))
break
case comm.ArenaCoin:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 11))
break
case comm.ResPs:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 12))
break
case comm.Moongold:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 14))
break
case comm.Talent1:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Talent2:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Talent3:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Talent4:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Merchantmoney:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 15))
break
}
}
}
// for _, v := range need {
// if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) {
// // this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, utils.ToInt32(v.T)))
// }
// }
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), tasks...)
session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{
IsSucc: true,

1
modules/practice/api_getgymbuff.go
View File

@ -28,6 +28,7 @@ func (this *apiComp) GetGymBuff(session comm.IUserSession, req *pb.PracticeGetGy
code = pb.ErrorCode_ConfigNoFound
return
}
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype185, 1))
session.SendMsg(string(this.module.GetType()), "getgymbuff", &pb.PracticeGetGymBuffResp{Buffid: buff.Id})
return
}

2
modules/practice/api_gymrefresh.go
View File

@ -67,7 +67,7 @@ func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRe
"gymrefresh": room.Gymrefresh,
"lastrefresh": room.Lastrefresh,
})
go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype185, 1))
session.SendMsg(string(this.module.GetType()), "gymrefresh", &pb.PracticeGymRefreshResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh})
return
}

54
modules/shop/api_buy.go
View File

@ -127,8 +127,58 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
tasks = append(tasks, comm.GettaskParam(comm.Rtype66, 1, int32(req.ShopType)))
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype66, 1, int32(req.ShopType))
for _, v := range need {
if v.A == comm.AttrType && (v.T == comm.ResGold || v.T == comm.ResDiamond) {
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, utils.ToInt32(v.T)))
if v.A == comm.AttrType {
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, utils.ToInt32(v.T)))
switch v.T {
case comm.ResGold:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 1))
break
case comm.ResExp:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 3))
break
case comm.ResDiamond:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.VipExp:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.ResTaskActive:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.ResFriend:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 4))
break
case comm.StarCoin:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 9))
break
case comm.SociatyCoin:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 8))
break
case comm.ArenaCoin:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 11))
break
case comm.ResPs:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 12))
break
case comm.Moongold:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 14))
break
case comm.Talent1:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Talent2:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Talent3:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Talent4:
// tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 2))
break
case comm.Merchantmoney:
tasks = append(tasks, comm.GettaskParam(comm.Rtype67, v.N, 15))
break
}
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
}
}