Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
196463f14d
1
bin/dist/css/381.457c64c2.css
vendored
Normal file
1
bin/dist/css/381.457c64c2.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
bin/dist/css/731.a4081466.css
vendored
Normal file
1
bin/dist/css/731.a4081466.css
vendored
Normal file
File diff suppressed because one or more lines are too long
2
bin/dist/index.html
vendored
2
bin/dist/index.html
vendored
@ -1 +1 @@
|
|||||||
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>vue_dreamfactory</title><script defer="defer" src="/js/chunk-vendors.c91d0b23.js"></script><script defer="defer" src="/js/app.dd3c20bb.js"></script><link href="/css/chunk-vendors.0fb08ef9.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue_dreamfactory doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>vue_dreamfactory</title><script defer="defer" src="/js/chunk-vendors.e6136249.js"></script><script defer="defer" src="/js/app.bda94d79.js"></script><link href="/css/chunk-vendors.0fb08ef9.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue_dreamfactory doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||||
2
bin/dist/js/227.e93ca9e5.js
vendored
Normal file
2
bin/dist/js/227.e93ca9e5.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
bin/dist/js/227.e93ca9e5.js.map
vendored
Normal file
1
bin/dist/js/227.e93ca9e5.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
42
bin/dist/js/381.85bb0601.js
vendored
Normal file
42
bin/dist/js/381.85bb0601.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
bin/dist/js/381.85bb0601.js.map
vendored
Normal file
1
bin/dist/js/381.85bb0601.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
2
bin/dist/js/731.67cb7b01.js
vendored
Normal file
2
bin/dist/js/731.67cb7b01.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
bin/dist/js/731.67cb7b01.js.map
vendored
Normal file
1
bin/dist/js/731.67cb7b01.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
2
bin/dist/js/app.bda94d79.js
vendored
Normal file
2
bin/dist/js/app.bda94d79.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
bin/dist/js/app.bda94d79.js.map
vendored
Normal file
1
bin/dist/js/app.bda94d79.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
20
bin/dist/js/chunk-vendors.e6136249.js
vendored
Normal file
20
bin/dist/js/chunk-vendors.e6136249.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
bin/dist/js/chunk-vendors.e6136249.js.map
vendored
Normal file
1
bin/dist/js/chunk-vendors.e6136249.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -1,6 +1,7 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"id": 10001,
|
"id": 10001,
|
||||||
|
"scene": "LevelDemo",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
110211,
|
110211,
|
||||||
110212
|
110212
|
||||||
@ -9,12 +10,8 @@
|
|||||||
1001,
|
1001,
|
||||||
1002
|
1002
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
110211,
|
|
||||||
110212
|
|
||||||
],
|
|
||||||
"passdroplist": [
|
"passdroplist": [
|
||||||
1001,
|
|
||||||
1002
|
1002
|
||||||
],
|
],
|
||||||
"award": [
|
"award": [
|
||||||
@ -27,17 +24,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10002,
|
"id": 10002,
|
||||||
|
"scene": "LevelDemo",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
110212,
|
110212,
|
||||||
110213
|
110213
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1002
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
110212
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -48,17 +46,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10003,
|
"id": 10003,
|
||||||
|
"scene": "LevelDemo",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
110213,
|
110213,
|
||||||
110214
|
110214
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1003
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
110213
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -69,17 +68,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 20001,
|
"id": 20001,
|
||||||
|
"scene": "LevelDemo",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
110214,
|
110214,
|
||||||
110215
|
110215
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1004
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
110214
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -90,17 +90,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 20002,
|
"id": 20002,
|
||||||
|
"scene": "LevelDemo",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
110215,
|
110215,
|
||||||
110216
|
110216
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1005
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
110215
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -111,17 +112,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 20003,
|
"id": 20003,
|
||||||
|
"scene": "LevelDemo",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
110216,
|
110216,
|
||||||
120031
|
120031
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1006
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
110216
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -132,17 +134,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 30001,
|
"id": 30001,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
120031,
|
120031,
|
||||||
120032
|
120032
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1007
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
120031
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -153,17 +156,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 30002,
|
"id": 30002,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
120032,
|
120032,
|
||||||
120033
|
120033
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1008
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
120032
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -174,17 +178,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 30003,
|
"id": 30003,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
120033,
|
120033,
|
||||||
120034
|
120034
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1009
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
120033
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -195,17 +200,18 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 40001,
|
"id": 40001,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
120034,
|
120034,
|
||||||
120035
|
120035
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1010
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
120034
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -216,16 +222,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 40002,
|
"id": 40002,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
120035
|
120035
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1011
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
120035
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -236,16 +243,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 40003,
|
"id": 40003,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
120036
|
120036
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1012
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
120036
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -256,16 +264,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 50001,
|
"id": 50001,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
130011
|
130011
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1013
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
130011
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -276,16 +285,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 50002,
|
"id": 50002,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
130012
|
130012
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1014
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
130012
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
@ -296,16 +306,17 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 50003,
|
"id": 50003,
|
||||||
|
"scene": "LevelDemo_Fcamer",
|
||||||
"formatList": [
|
"formatList": [
|
||||||
130013
|
130013
|
||||||
],
|
],
|
||||||
"droplist": [
|
"droplist": [
|
||||||
1015
|
1001
|
||||||
],
|
],
|
||||||
"passformatList": [
|
"passformatList": [],
|
||||||
130013
|
"passdroplist": [
|
||||||
|
1001
|
||||||
],
|
],
|
||||||
"passdroplist": [],
|
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
{
|
{
|
||||||
"id": 110211,
|
"id": 110211,
|
||||||
"formatList": [
|
"formatList": [
|
||||||
101072,
|
101071,
|
||||||
101073
|
101072
|
||||||
],
|
],
|
||||||
"award": [
|
"award": [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -73863,5 +73863,16 @@
|
|||||||
"atkpro": 1,
|
"atkpro": 1,
|
||||||
"defpro": 0.8,
|
"defpro": 0.8,
|
||||||
"modelsize": 1
|
"modelsize": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Id": 710003,
|
||||||
|
"pos": 5,
|
||||||
|
"captainId": 0,
|
||||||
|
"monster": 140071,
|
||||||
|
"lv": 10,
|
||||||
|
"hppro": 0.6,
|
||||||
|
"atkpro": 1,
|
||||||
|
"defpro": 0.8,
|
||||||
|
"modelsize": 1
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -10,7 +10,9 @@
|
|||||||
3,
|
3,
|
||||||
4
|
4
|
||||||
],
|
],
|
||||||
"AssistTeam": 101011,
|
"AssistTeam": 710003,
|
||||||
"EventList": []
|
"EventList": [
|
||||||
|
12
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
File diff suppressed because it is too large
Load Diff
@ -232,7 +232,8 @@ const ( //Rpc
|
|||||||
|
|
||||||
// 充值发货
|
// 充值发货
|
||||||
Rpc_ModulePayDelivery core.Rpc_Key = "Rpc_ModulePayDelivery" //充值发货
|
Rpc_ModulePayDelivery core.Rpc_Key = "Rpc_ModulePayDelivery" //充值发货
|
||||||
|
// 配置更新
|
||||||
|
Rpc_ConfigureUpDate core.Rpc_Key = "Rpc_ConfigureUpDate" //配置更新
|
||||||
// 羁绊信息
|
// 羁绊信息
|
||||||
Rpc_ModuleFetter core.Rpc_Key = "Rpc_ModuleFetter"
|
Rpc_ModuleFetter core.Rpc_Key = "Rpc_ModuleFetter"
|
||||||
|
|
||||||
|
|||||||
3
go.mod
3
go.mod
@ -10,6 +10,7 @@ require (
|
|||||||
github.com/atotto/clipboard v0.1.4
|
github.com/atotto/clipboard v0.1.4
|
||||||
github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
|
github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394
|
||||||
github.com/boltdb/bolt v1.3.1
|
github.com/boltdb/bolt v1.3.1
|
||||||
|
github.com/gin-gonic/autotls v0.0.5
|
||||||
github.com/gin-gonic/gin v1.8.1
|
github.com/gin-gonic/gin v1.8.1
|
||||||
github.com/go-playground/validator/v10 v10.10.1
|
github.com/go-playground/validator/v10 v10.10.1
|
||||||
github.com/go-redis/redis/v8 v8.11.5
|
github.com/go-redis/redis/v8 v8.11.5
|
||||||
@ -175,7 +176,7 @@ require (
|
|||||||
go.opentelemetry.io/otel/trace v1.6.3 // indirect
|
go.opentelemetry.io/otel/trace v1.6.3 // indirect
|
||||||
go.uber.org/atomic v1.7.0 // indirect
|
go.uber.org/atomic v1.7.0 // indirect
|
||||||
go.uber.org/zap v1.17.0 // indirect
|
go.uber.org/zap v1.17.0 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503
|
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
|
||||||
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd // indirect
|
golang.org/x/image v0.0.0-20220601225756-64ec528b34cd // indirect
|
||||||
golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee // indirect
|
golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee // indirect
|
||||||
golang.org/x/mod v0.7.0 // indirect
|
golang.org/x/mod v0.7.0 // indirect
|
||||||
|
|||||||
9
go.sum
9
go.sum
@ -173,6 +173,8 @@ github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vml
|
|||||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||||
|
github.com/gin-gonic/autotls v0.0.5 h1:SXQWwWGDJHujDlthIij1+jxn3m5IPV8I9Za9bcPzMdo=
|
||||||
|
github.com/gin-gonic/autotls v0.0.5/go.mod h1:RK6LjOz47xARPGuceCOz3pQcYruxM0bVB7jb4AsDYeI=
|
||||||
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
|
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
|
||||||
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
|
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
|
||||||
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
|
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
|
||||||
@ -861,8 +863,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
|
|||||||
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 h1:vJ2V3lFLg+bBhgroYuRfyN583UzVveQmIXjc8T/y3to=
|
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
|
||||||
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -964,6 +966,7 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
|
|||||||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||||
|
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
|
||||||
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
|
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
|
||||||
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
@ -993,6 +996,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
|
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -1075,6 +1079,7 @@ golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
|
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
|
||||||
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
|||||||
@ -49,7 +49,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen
|
|||||||
}
|
}
|
||||||
cd, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{
|
cd, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{
|
||||||
Ptype: pb.PlayType_academy,
|
Ptype: pb.PlayType_academy,
|
||||||
Redformat: level.UsFormatList,
|
Format: nil,
|
||||||
|
Sysformat: level.UsFormatList,
|
||||||
|
Backupformat: nil,
|
||||||
Buleformat: level.FormatList,
|
Buleformat: level.FormatList,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
|
|||||||
@ -49,7 +49,9 @@ func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeaching
|
|||||||
}
|
}
|
||||||
cd, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{
|
cd, record = this.module.battle.CreateEveBattle(session, &pb.BattleEVEReq{
|
||||||
Ptype: pb.PlayType_heroteaching,
|
Ptype: pb.PlayType_heroteaching,
|
||||||
Redformat: level.UsFormatList,
|
Format: nil,
|
||||||
|
Sysformat: level.UsFormatList,
|
||||||
|
Backupformat: nil,
|
||||||
Buleformat: level.FormatList,
|
Buleformat: level.FormatList,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
|
|||||||
@ -52,7 +52,6 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
|
|||||||
Ptype: req.Ptype,
|
Ptype: req.Ptype,
|
||||||
State: pb.BBattleState_in,
|
State: pb.BBattleState_in,
|
||||||
RedCompId: session.GetUserId(),
|
RedCompId: session.GetUserId(),
|
||||||
Redflist: make([]*pb.DBBattleFormt, len(req.Redformat)),
|
|
||||||
BlueCompId: "",
|
BlueCompId: "",
|
||||||
Buleflist: make([]*pb.DBBattleFormt, len(req.Buleformat)),
|
Buleflist: make([]*pb.DBBattleFormt, len(req.Buleformat)),
|
||||||
}
|
}
|
||||||
@ -60,15 +59,103 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
|
|||||||
captain int32
|
captain int32
|
||||||
masters []*pb.BattleRole
|
masters []*pb.BattleRole
|
||||||
)
|
)
|
||||||
for i, v := range req.Redformat {
|
|
||||||
|
if req.Format != nil {
|
||||||
|
model := db.NewDBModel(comm.TableHero, time.Hour, conn)
|
||||||
|
record.Redflist = make([]*pb.DBBattleFormt, 1)
|
||||||
|
record.Redflist[0] = &pb.DBBattleFormt{
|
||||||
|
Leadpos: req.Format.Leadpos,
|
||||||
|
Team: make([]*pb.BattleRole, len(req.Format.Format)),
|
||||||
|
}
|
||||||
|
//自己的英雄阵营
|
||||||
|
for i, v := range req.Format.Format {
|
||||||
|
if v != "" {
|
||||||
|
hero := &pb.DBHero{}
|
||||||
|
if err := model.GetListObj(session.GetUserId(), v, hero); err != nil {
|
||||||
|
code = pb.ErrorCode_HeroNoExist
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tid := 100 + i
|
||||||
|
if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
record.Redflist[0].Team[i] = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//好友的英雄阵营
|
||||||
|
for i, v := range req.Format.Friendformat {
|
||||||
|
if v != "" {
|
||||||
|
var (
|
||||||
|
hero *pb.DBHero
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
// 获取好友英雄信息
|
||||||
|
if this.module.IsCross() {
|
||||||
|
if hero, err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
code = pb.ErrorCode_HeroNoExist
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else { //获取跨服数据
|
||||||
|
hero = &pb.DBHero{}
|
||||||
|
if err = this.module.service.AcrossClusterRpcCall(
|
||||||
|
context.Background(),
|
||||||
|
this.module.GetCrossTag(),
|
||||||
|
comm.Service_Worker,
|
||||||
|
string(comm.Rpc_ModuleFriendUseAssitHero),
|
||||||
|
pb.RPCGeneralReqA2{Param1: session.GetUserId(), Param2: v},
|
||||||
|
hero); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tid := 100 + i
|
||||||
|
if record.Redflist[0].Team[i], code = this.createBattleRole(hero, tid, i); code != pb.ErrorCode_Success {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
record.Redflist[0].Team[i].Ishelp = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if req.Sysformat != nil && len(req.Sysformat) > 0 {
|
||||||
|
for i, v := range req.Sysformat {
|
||||||
|
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
record.Redflist[i].Systeam = masters
|
||||||
|
if record.Redflist[i].Leadpos == -1 && captain != -1 {
|
||||||
|
record.Redflist[i].Leadpos = captain
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if req.Backupformat != nil && len(req.Backupformat) > 0 {
|
||||||
|
for i, v := range req.Backupformat {
|
||||||
|
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
record.Redflist[i].Backupteam = masters
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
record.Redflist = make([]*pb.DBBattleFormt, len(req.Sysformat))
|
||||||
|
for i, v := range req.Sysformat {
|
||||||
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
|
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
record.Redflist[i] = &pb.DBBattleFormt{
|
record.Redflist[i] = &pb.DBBattleFormt{
|
||||||
Leadpos: captain,
|
Leadpos: captain,
|
||||||
Team: masters,
|
Systeam: masters,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if req.Backupformat != nil && len(req.Backupformat) > 0 {
|
||||||
|
for i, v := range req.Backupformat {
|
||||||
|
if captain, masters, code = this.createMasterRoles(100, i, v); code != pb.ErrorCode_Success {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
record.Redflist[i].Backupteam = masters
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for i, v := range req.Buleformat {
|
for i, v := range req.Buleformat {
|
||||||
if captain, masters, code = this.createMasterRoles(200, i, v); code != pb.ErrorCode_Success {
|
if captain, masters, code = this.createMasterRoles(200, i, v); code != pb.ErrorCode_Success {
|
||||||
return
|
return
|
||||||
@ -270,6 +357,7 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
|
|||||||
code = pb.ErrorCode_ConfigNoFound
|
code = pb.ErrorCode_ConfigNoFound
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
captain = -1
|
||||||
roles = make([]*pb.BattleRole, len(result))
|
roles = make([]*pb.BattleRole, len(result))
|
||||||
for i, v := range result {
|
for i, v := range result {
|
||||||
if v != nil {
|
if v != nil {
|
||||||
|
|||||||
@ -19,8 +19,9 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
|
|||||||
var (
|
var (
|
||||||
iswin bool
|
iswin bool
|
||||||
info *pb.DBCombatUser
|
info *pb.DBCombatUser
|
||||||
|
level *cfg.GameCombatLevelData
|
||||||
manster *cfg.GameCombatMansterData
|
manster *cfg.GameCombatMansterData
|
||||||
|
pass bool
|
||||||
// group []*cfg.GameTeachingData
|
// group []*cfg.GameTeachingData
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
@ -35,6 +36,10 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
|
|||||||
code = pb.ErrorCode_DBError
|
code = pb.ErrorCode_DBError
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if level, err = this.module.configure.getCombatLevel(info.Currlevel); err != nil {
|
||||||
|
code = pb.ErrorCode_DBError
|
||||||
|
return
|
||||||
|
}
|
||||||
if manster, err = this.module.configure.getGameCombatManster(req.Manster); err != nil {
|
if manster, err = this.module.configure.getGameCombatManster(req.Manster); err != nil {
|
||||||
code = pb.ErrorCode_ConfigNoFound
|
code = pb.ErrorCode_ConfigNoFound
|
||||||
return
|
return
|
||||||
@ -53,7 +58,39 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.module.DispenseRes(session, manster.Award, true)
|
this.module.DispenseRes(session, manster.Award, true)
|
||||||
|
for _, v := range level.Passdroplist {
|
||||||
|
ispass := false
|
||||||
|
for _, v1 := range info.Passdrop {
|
||||||
|
if v == v1 {
|
||||||
|
ispass = true
|
||||||
}
|
}
|
||||||
session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Issucc: true})
|
}
|
||||||
|
if !ispass {
|
||||||
|
pass = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, v := range level.PassformatList {
|
||||||
|
ispass := false
|
||||||
|
for _, v1 := range info.Passmanster {
|
||||||
|
if v == v1 {
|
||||||
|
ispass = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !ispass {
|
||||||
|
pass = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if pass {
|
||||||
|
if err = this.module.modelCombat.delInfo(session.GetUserId()); err != nil {
|
||||||
|
code = pb.ErrorCode_DBError
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.module.DispenseRes(session, level.Award, true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Issucc: true, Pass: pass})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,7 @@ package combat
|
|||||||
import (
|
import (
|
||||||
"go_dreamfactory/comm"
|
"go_dreamfactory/comm"
|
||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
|
cfg "go_dreamfactory/sys/configure/structs"
|
||||||
|
|
||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
)
|
)
|
||||||
@ -17,6 +18,7 @@ func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq)
|
|||||||
func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data proto.Message) {
|
func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data proto.Message) {
|
||||||
var (
|
var (
|
||||||
info *pb.DBCombatUser
|
info *pb.DBCombatUser
|
||||||
|
level *cfg.GameCombatLevelData
|
||||||
atns []*pb.UserAssets
|
atns []*pb.UserAssets
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
@ -28,7 +30,10 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (cod
|
|||||||
code = pb.ErrorCode_DBError
|
code = pb.ErrorCode_DBError
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if level, err = this.module.configure.getCombatLevel(info.Currlevel); err != nil {
|
||||||
|
code = pb.ErrorCode_DBError
|
||||||
|
return
|
||||||
|
}
|
||||||
for _, v := range info.Passdrop {
|
for _, v := range info.Passdrop {
|
||||||
if v == req.Drop {
|
if v == req.Drop {
|
||||||
code = pb.ErrorCode_ReqParameterError
|
code = pb.ErrorCode_ReqParameterError
|
||||||
@ -51,6 +56,40 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (cod
|
|||||||
N: v.N,
|
N: v.N,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Code: code, Atns: atns})
|
|
||||||
|
pass := true
|
||||||
|
for _, v := range level.Passdroplist {
|
||||||
|
ispass := false
|
||||||
|
for _, v1 := range info.Passdrop {
|
||||||
|
if v == v1 {
|
||||||
|
ispass = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !ispass {
|
||||||
|
pass = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, v := range level.PassformatList {
|
||||||
|
ispass := false
|
||||||
|
for _, v1 := range info.Passmanster {
|
||||||
|
if v == v1 {
|
||||||
|
ispass = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !ispass {
|
||||||
|
pass = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if pass {
|
||||||
|
if err = this.module.modelCombat.delInfo(session.GetUserId()); err != nil {
|
||||||
|
code = pb.ErrorCode_DBError
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.module.DispenseRes(session, level.Award, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Code: code, Atns: atns, Pass: pass})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
42
modules/web/api_upload.go
Normal file
42
modules/web/api_upload.go
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
package web
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"go_dreamfactory/comm"
|
||||||
|
"go_dreamfactory/lego/sys/gin/engine"
|
||||||
|
"go_dreamfactory/pb"
|
||||||
|
"go_dreamfactory/sys/configure"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
//上传配置文件
|
||||||
|
func (this *Api_Comp) Upload(c *engine.Context) {
|
||||||
|
filenum := c.PostForm("filenum")
|
||||||
|
if filenum != "" {
|
||||||
|
if n, err := strconv.Atoi(filenum); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
if fn, err := c.FormFile(fmt.Sprintf("file_%d", i)); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
if err = c.SaveUploadedFile(fn, fmt.Sprintf("%s/%s", configure.ConfigurePath(), fn.Filename)); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := this.module.service.RpcBroadcast(
|
||||||
|
context.Background(),
|
||||||
|
comm.Service_Worker,
|
||||||
|
string(comm.Rpc_ConfigureUpDate),
|
||||||
|
&pb.EmptyReq{},
|
||||||
|
&pb.EmptyResp{}); err != nil {
|
||||||
|
this.module.Errorln(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -36,13 +36,12 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
|
|||||||
record *pb.DBBattleRecord
|
record *pb.DBBattleRecord
|
||||||
resp *pb.WorldtaskBattleStartResp
|
resp *pb.WorldtaskBattleStartResp
|
||||||
)
|
)
|
||||||
code, record = b.CreatePveBattle(session, &pb.BattlePVEReq{
|
code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{
|
||||||
Ptype: pb.PlayType_rtask,
|
Ptype: pb.PlayType_rtask,
|
||||||
Format: &pb.BattleFormation{
|
Format: req.Battle,
|
||||||
Leadpos: req.Leadpos,
|
Sysformat: []int32{battleConf.DefaultHero},
|
||||||
Format: req.Teamids,
|
Backupformat: []int32{battleConf.AssistTeam},
|
||||||
},
|
Buleformat: battleConf.FormatList,
|
||||||
Mformat: battleConf.FormatList,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
if code != pb.ErrorCode_Success {
|
if code != pb.ErrorCode_Success {
|
||||||
@ -59,6 +58,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
|
|||||||
Redflist: record.Redflist,
|
Redflist: record.Redflist,
|
||||||
BlueCompId: record.BlueCompId,
|
BlueCompId: record.BlueCompId,
|
||||||
Buleflist: record.Buleflist,
|
Buleflist: record.Buleflist,
|
||||||
|
Tasks: battleConf.EventList,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -396,7 +396,9 @@ type DBBattleFormt struct {
|
|||||||
unknownFields protoimpl.UnknownFields
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
Leadpos int32 `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
|
Leadpos int32 `protobuf:"varint,1,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
|
||||||
Team []*BattleRole `protobuf:"bytes,2,rep,name=team,proto3" json:"team"`
|
Team []*BattleRole `protobuf:"bytes,2,rep,name=team,proto3" json:"team"` //自己的战队
|
||||||
|
Systeam []*BattleRole `protobuf:"bytes,3,rep,name=systeam,proto3" json:"systeam"` //系统辅助战队
|
||||||
|
Backupteam []*BattleRole `protobuf:"bytes,4,rep,name=backupteam,proto3" json:"backupteam"` //后援战队
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *DBBattleFormt) Reset() {
|
func (x *DBBattleFormt) Reset() {
|
||||||
@ -445,6 +447,20 @@ func (x *DBBattleFormt) GetTeam() []*BattleRole {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *DBBattleFormt) GetSysteam() []*BattleRole {
|
||||||
|
if x != nil {
|
||||||
|
return x.Systeam
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *DBBattleFormt) GetBackupteam() []*BattleRole {
|
||||||
|
if x != nil {
|
||||||
|
return x.Backupteam
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
//战斗记录
|
//战斗记录
|
||||||
type DBBattleRecord struct {
|
type DBBattleRecord struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
@ -615,58 +631,63 @@ var file_battle_battle_db_proto_rawDesc = []byte{
|
|||||||
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
||||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
||||||
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x0d, 0x44, 0x42, 0x42,
|
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9e, 0x01, 0x0a, 0x0d, 0x44, 0x42,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c,
|
||||||
0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61,
|
0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65,
|
||||||
0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03,
|
0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20,
|
||||||
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
|
0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65,
|
||||||
0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xa7, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74,
|
0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61,
|
||||||
0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
|
0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c,
|
0x52, 0x6f, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x2b, 0x0a,
|
||||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21,
|
0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28,
|
||||||
0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e,
|
0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x0a,
|
||||||
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70,
|
0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xa7, 0x03, 0x0a, 0x0e, 0x44,
|
||||||
0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e,
|
0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a,
|
||||||
0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79,
|
0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a,
|
||||||
0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01,
|
0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69,
|
||||||
0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74,
|
0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
|
||||||
0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74,
|
0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
|
||||||
0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12,
|
0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18,
|
||||||
0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01,
|
0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65,
|
||||||
0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a,
|
0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65,
|
||||||
0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12,
|
||||||
0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52,
|
0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d,
|
||||||
0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75,
|
0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73,
|
||||||
0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62,
|
0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49,
|
||||||
0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c,
|
0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70,
|
||||||
0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44,
|
0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08,
|
||||||
0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75,
|
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
|
||||||
0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64,
|
0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e,
|
||||||
0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44,
|
0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01,
|
||||||
0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75,
|
0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c,
|
||||||
0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75,
|
0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28,
|
||||||
0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
|
0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
|
||||||
0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2a,
|
0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b,
|
||||||
0x39, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a,
|
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28,
|
||||||
0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12,
|
0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70,
|
||||||
0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10,
|
0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a,
|
||||||
0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x2a, 0x99, 0x01, 0x0a, 0x08, 0x50,
|
0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e,
|
||||||
0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10,
|
0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65,
|
||||||
0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12,
|
0x73, 0x75, 0x6c, 0x74, 0x2a, 0x39, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79,
|
||||||
0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72,
|
0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70,
|
||||||
0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e,
|
0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a,
|
||||||
0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12,
|
0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x2a,
|
||||||
0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06,
|
0x99, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04,
|
||||||
0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x61,
|
0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69,
|
||||||
0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, 0x65, 0x72, 0x6f,
|
0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02,
|
||||||
0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x63, 0x6f,
|
0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68,
|
||||||
0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69,
|
||||||
0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07,
|
0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74,
|
||||||
0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74,
|
0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07,
|
||||||
0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10,
|
0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a,
|
||||||
0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75,
|
0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12,
|
||||||
0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x2a, 0x1f, 0x0a, 0x0c, 0x42,
|
||||||
0x6f, 0x74, 0x6f, 0x33,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69,
|
||||||
|
0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c,
|
||||||
|
0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04,
|
||||||
|
0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12,
|
||||||
|
0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
|
||||||
|
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -699,18 +720,20 @@ var file_battle_battle_db_proto_depIdxs = []int32{
|
|||||||
8, // 1: BattleRole.equipSkill:type_name -> SkillData
|
8, // 1: BattleRole.equipSkill:type_name -> SkillData
|
||||||
7, // 2: BattleRole.property:type_name -> BattleRole.PropertyEntry
|
7, // 2: BattleRole.property:type_name -> BattleRole.PropertyEntry
|
||||||
4, // 3: DBBattleFormt.team:type_name -> BattleRole
|
4, // 3: DBBattleFormt.team:type_name -> BattleRole
|
||||||
0, // 4: DBBattleRecord.btype:type_name -> BattleType
|
4, // 4: DBBattleFormt.systeam:type_name -> BattleRole
|
||||||
1, // 5: DBBattleRecord.ptype:type_name -> PlayType
|
4, // 5: DBBattleFormt.backupteam:type_name -> BattleRole
|
||||||
2, // 6: DBBattleRecord.state:type_name -> BBattleState
|
0, // 6: DBBattleRecord.btype:type_name -> BattleType
|
||||||
5, // 7: DBBattleRecord.redflist:type_name -> DBBattleFormt
|
1, // 7: DBBattleRecord.ptype:type_name -> PlayType
|
||||||
5, // 8: DBBattleRecord.buleflist:type_name -> DBBattleFormt
|
2, // 8: DBBattleRecord.state:type_name -> BBattleState
|
||||||
3, // 9: DBBattleRecord.roundresult:type_name -> DBBattleComp
|
5, // 9: DBBattleRecord.redflist:type_name -> DBBattleFormt
|
||||||
3, // 10: DBBattleRecord.result:type_name -> DBBattleComp
|
5, // 10: DBBattleRecord.buleflist:type_name -> DBBattleFormt
|
||||||
11, // [11:11] is the sub-list for method output_type
|
3, // 11: DBBattleRecord.roundresult:type_name -> DBBattleComp
|
||||||
11, // [11:11] is the sub-list for method input_type
|
3, // 12: DBBattleRecord.result:type_name -> DBBattleComp
|
||||||
11, // [11:11] is the sub-list for extension type_name
|
13, // [13:13] is the sub-list for method output_type
|
||||||
11, // [11:11] is the sub-list for extension extendee
|
13, // [13:13] is the sub-list for method input_type
|
||||||
0, // [0:11] is the sub-list for field type_name
|
13, // [13:13] is the sub-list for extension type_name
|
||||||
|
13, // [13:13] is the sub-list for extension extendee
|
||||||
|
0, // [0:13] is the sub-list for field type_name
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_battle_battle_db_proto_init() }
|
func init() { file_battle_battle_db_proto_init() }
|
||||||
|
|||||||
@ -155,8 +155,10 @@ type BattleEVEReq struct {
|
|||||||
|
|
||||||
Ptype PlayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型
|
Ptype PlayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=PlayType" json:"ptype"` //玩法类型
|
||||||
Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title"` //战斗标题
|
Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title"` //战斗标题
|
||||||
Redformat []int32 `protobuf:"varint,3,rep,packed,name=redformat,proto3" json:"redformat"` //红方
|
Format *BattleFormation `protobuf:"bytes,3,opt,name=format,proto3" json:"format"` //布阵信息
|
||||||
Buleformat []int32 `protobuf:"varint,4,rep,packed,name=buleformat,proto3" json:"buleformat"` //蓝方
|
Sysformat []int32 `protobuf:"varint,4,rep,packed,name=sysformat,proto3" json:"sysformat"` //系统辅助
|
||||||
|
Backupformat []int32 `protobuf:"varint,5,rep,packed,name=backupformat,proto3" json:"backupformat"` //后援辅助
|
||||||
|
Buleformat []int32 `protobuf:"varint,6,rep,packed,name=buleformat,proto3" json:"buleformat"` //蓝方
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *BattleEVEReq) Reset() {
|
func (x *BattleEVEReq) Reset() {
|
||||||
@ -205,9 +207,23 @@ func (x *BattleEVEReq) GetTitle() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *BattleEVEReq) GetRedformat() []int32 {
|
func (x *BattleEVEReq) GetFormat() *BattleFormation {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.Redformat
|
return x.Format
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *BattleEVEReq) GetSysformat() []int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Sysformat
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *BattleEVEReq) GetBackupformat() []int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Backupformat
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -628,69 +644,74 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
|
|||||||
0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03,
|
0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03,
|
||||||
0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72,
|
0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72,
|
||||||
0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
|
0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09,
|
||||||
0x52, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x83,
|
0x52, 0x0c, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xd1,
|
||||||
0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12,
|
0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x56, 0x45, 0x52, 0x65, 0x71, 0x12,
|
||||||
0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09,
|
0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09,
|
||||||
0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65,
|
0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65,
|
||||||
0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||||
0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72,
|
0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f,
|
0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
|
||||||
0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d,
|
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x61, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f,
|
0x12, 0x1c, 0x0a, 0x09, 0x73, 0x79, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20,
|
||||||
0x72, 0x6d, 0x61, 0x74, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50,
|
0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x79, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x22,
|
||||||
0x56, 0x45, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
|
0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
|
||||||
0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52,
|
0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x66, 0x6f, 0x72, 0x6d,
|
||||||
0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
|
0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x06,
|
0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d,
|
||||||
0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42,
|
0x61, 0x74, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06,
|
0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70,
|
||||||
0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20,
|
||||||
0x22, 0x5b, 0x0a, 0x0c, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f,
|
||||||
0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
|
0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
|
||||||
0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20,
|
0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x06,
|
0x72, 0x6d, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18,
|
||||||
0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44,
|
0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x5b,
|
||||||
0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa1, 0x01,
|
0x0a, 0x0c, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10,
|
||||||
0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f,
|
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
|
||||||
0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e,
|
0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12,
|
0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x6f,
|
||||||
0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
|
0x72, 0x6d, 0x61, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
|
||||||
0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d,
|
0x65, 0x72, 0x6f, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xa1, 0x01, 0x0a, 0x0c,
|
||||||
0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x50, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05,
|
||||||
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d,
|
0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c,
|
||||||
0x61, 0x74, 0x12, 0x2d, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
|
||||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d,
|
0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69,
|
||||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
0x74, 0x6c, 0x65, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x74, 0x22, 0xa4, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
|
0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d,
|
||||||
0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
|
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x64, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
0x12, 0x2d, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
|
||||||
0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18,
|
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x56, 0x50, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79,
|
0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22,
|
||||||
0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79,
|
0xa4, 0x02, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e,
|
||||||
0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54,
|
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14,
|
||||||
0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65,
|
0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74,
|
||||||
0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72,
|
0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
|
||||||
0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66,
|
0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65,
|
||||||
0x6c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42,
|
0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66,
|
0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70,
|
||||||
0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70,
|
0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43,
|
||||||
0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f,
|
0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64,
|
||||||
0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73,
|
0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69,
|
||||||
0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74,
|
0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
|
||||||
0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69,
|
0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69,
|
||||||
0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28,
|
0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64,
|
||||||
0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74,
|
0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70,
|
||||||
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66,
|
0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18,
|
||||||
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f,
|
0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74,
|
||||||
0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f,
|
0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, 0x52,
|
||||||
0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73,
|
0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x89, 0x01, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||||
0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73,
|
0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
|
||||||
0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b,
|
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
|
||||||
0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
|
0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74,
|
||||||
0x74, 0x61, 0x73, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74,
|
||||||
0x6f, 0x74, 0x6f, 0x33,
|
0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x18,
|
||||||
|
0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x12, 0x22,
|
||||||
|
0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x04,
|
||||||
|
0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61,
|
||||||
|
0x73, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||||
|
0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -722,22 +743,23 @@ var file_battle_battle_msg_proto_goTypes = []interface{}{
|
|||||||
}
|
}
|
||||||
var file_battle_battle_msg_proto_depIdxs = []int32{
|
var file_battle_battle_msg_proto_depIdxs = []int32{
|
||||||
8, // 0: BattleEVEReq.ptype:type_name -> PlayType
|
8, // 0: BattleEVEReq.ptype:type_name -> PlayType
|
||||||
8, // 1: BattlePVEReq.ptype:type_name -> PlayType
|
1, // 1: BattleEVEReq.format:type_name -> BattleFormation
|
||||||
1, // 2: BattlePVEReq.format:type_name -> BattleFormation
|
8, // 2: BattlePVEReq.ptype:type_name -> PlayType
|
||||||
9, // 3: PVPFormation.format:type_name -> DBHero
|
1, // 3: BattlePVEReq.format:type_name -> BattleFormation
|
||||||
8, // 4: BattlePVPReq.ptype:type_name -> PlayType
|
9, // 4: PVPFormation.format:type_name -> DBHero
|
||||||
4, // 5: BattlePVPReq.redformat:type_name -> PVPFormation
|
8, // 5: BattlePVPReq.ptype:type_name -> PlayType
|
||||||
4, // 6: BattlePVPReq.buleformat:type_name -> PVPFormation
|
4, // 6: BattlePVPReq.redformat:type_name -> PVPFormation
|
||||||
10, // 7: BattleInfo.btype:type_name -> BattleType
|
4, // 7: BattlePVPReq.buleformat:type_name -> PVPFormation
|
||||||
8, // 8: BattleInfo.ptype:type_name -> PlayType
|
10, // 8: BattleInfo.btype:type_name -> BattleType
|
||||||
11, // 9: BattleInfo.redflist:type_name -> DBBattleFormt
|
8, // 9: BattleInfo.ptype:type_name -> PlayType
|
||||||
11, // 10: BattleInfo.buleflist:type_name -> DBBattleFormt
|
11, // 10: BattleInfo.redflist:type_name -> DBBattleFormt
|
||||||
6, // 11: BattleReport.info:type_name -> BattleInfo
|
11, // 11: BattleInfo.buleflist:type_name -> DBBattleFormt
|
||||||
12, // [12:12] is the sub-list for method output_type
|
6, // 12: BattleReport.info:type_name -> BattleInfo
|
||||||
12, // [12:12] is the sub-list for method input_type
|
13, // [13:13] is the sub-list for method output_type
|
||||||
12, // [12:12] is the sub-list for extension type_name
|
13, // [13:13] is the sub-list for method input_type
|
||||||
12, // [12:12] is the sub-list for extension extendee
|
13, // [13:13] is the sub-list for extension type_name
|
||||||
0, // [0:12] is the sub-list for field type_name
|
13, // [13:13] is the sub-list for extension extendee
|
||||||
|
0, // [0:13] is the sub-list for field type_name
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_battle_battle_msg_proto_init() }
|
func init() { file_battle_battle_msg_proto_init() }
|
||||||
|
|||||||
@ -272,8 +272,7 @@ type WorldtaskBattleStartReq struct {
|
|||||||
unknownFields protoimpl.UnknownFields
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
|
BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
|
||||||
Leadpos int32 `protobuf:"varint,2,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
|
Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"` //战斗类型
|
||||||
Teamids []string `protobuf:"bytes,3,rep,name=teamids,proto3" json:"teamids"` //阵容信息
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *WorldtaskBattleStartReq) Reset() {
|
func (x *WorldtaskBattleStartReq) Reset() {
|
||||||
@ -315,16 +314,9 @@ func (x *WorldtaskBattleStartReq) GetBattleConfId() int32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *WorldtaskBattleStartReq) GetLeadpos() int32 {
|
func (x *WorldtaskBattleStartReq) GetBattle() *BattleFormation {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.Leadpos
|
return x.Battle
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (x *WorldtaskBattleStartReq) GetTeamids() []string {
|
|
||||||
if x != nil {
|
|
||||||
return x.Teamids
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -560,35 +552,34 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
|
|||||||
0x49, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e,
|
0x49, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e,
|
||||||
0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x6e,
|
0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x6e,
|
||||||
0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
0x0a, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x71, 0x0a, 0x17, 0x57,
|
0x0a, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x17, 0x57,
|
||||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
|
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
|
||||||
0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61,
|
0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61,
|
||||||
0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65,
|
0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61,
|
||||||
0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61,
|
0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74,
|
||||||
0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18,
|
0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61,
|
||||||
0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x3b,
|
0x74, 0x74, 0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
|
||||||
0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70,
|
||||||
0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e,
|
0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
|
||||||
0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66,
|
||||||
0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7d, 0x0a, 0x18, 0x57,
|
0x6f, 0x22, 0x7d, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61,
|
||||||
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69,
|
0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
|
||||||
0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
|
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
|
||||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12,
|
0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
|
||||||
0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18,
|
0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74,
|
||||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
|
0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70,
|
||||||
0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20,
|
0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74,
|
||||||
0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
|
0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
|
||||||
0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f,
|
0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74,
|
||||||
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e,
|
0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
|
||||||
0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
|
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
|
||||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22,
|
0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61,
|
||||||
0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69,
|
0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12,
|
||||||
0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73,
|
0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||||
0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f,
|
0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74,
|
||||||
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73,
|
0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
|
||||||
0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
0x33,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -616,20 +607,22 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
|
|||||||
(*WorldtaskBattleFinishResp)(nil), // 8: WorldtaskBattleFinishResp
|
(*WorldtaskBattleFinishResp)(nil), // 8: WorldtaskBattleFinishResp
|
||||||
(*WorldtaskFinishIdsPush)(nil), // 9: WorldtaskFinishIdsPush
|
(*WorldtaskFinishIdsPush)(nil), // 9: WorldtaskFinishIdsPush
|
||||||
(*DBWorldtask)(nil), // 10: DBWorldtask
|
(*DBWorldtask)(nil), // 10: DBWorldtask
|
||||||
(*BattleInfo)(nil), // 11: BattleInfo
|
(*BattleFormation)(nil), // 11: BattleFormation
|
||||||
(*BattleReport)(nil), // 12: BattleReport
|
(*BattleInfo)(nil), // 12: BattleInfo
|
||||||
(*Worldtask)(nil), // 13: Worldtask
|
(*BattleReport)(nil), // 13: BattleReport
|
||||||
|
(*Worldtask)(nil), // 14: Worldtask
|
||||||
}
|
}
|
||||||
var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
|
var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
|
||||||
10, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
|
10, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
|
||||||
11, // 1: WorldtaskBattleStartResp.info:type_name -> BattleInfo
|
11, // 1: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
|
||||||
12, // 2: WorldtaskBattleFinishReq.report:type_name -> BattleReport
|
12, // 2: WorldtaskBattleStartResp.info:type_name -> BattleInfo
|
||||||
13, // 3: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
|
13, // 3: WorldtaskBattleFinishReq.report:type_name -> BattleReport
|
||||||
4, // [4:4] is the sub-list for method output_type
|
14, // 4: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
|
||||||
4, // [4:4] is the sub-list for method input_type
|
5, // [5:5] is the sub-list for method output_type
|
||||||
4, // [4:4] is the sub-list for extension type_name
|
5, // [5:5] is the sub-list for method input_type
|
||||||
4, // [4:4] is the sub-list for extension extendee
|
5, // [5:5] is the sub-list for extension type_name
|
||||||
0, // [0:4] is the sub-list for field type_name
|
5, // [5:5] is the sub-list for extension extendee
|
||||||
|
0, // [0:5] is the sub-list for field type_name
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_worldtask_worldtask_msg_proto_init() }
|
func init() { file_worldtask_worldtask_msg_proto_init() }
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"go_dreamfactory/comm"
|
"go_dreamfactory/comm"
|
||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
|
"go_dreamfactory/sys/configure"
|
||||||
"go_dreamfactory/sys/db"
|
"go_dreamfactory/sys/db"
|
||||||
"reflect"
|
"reflect"
|
||||||
"sync"
|
"sync"
|
||||||
@ -87,6 +88,7 @@ func (this *SCompGateRoute) Start() (err error) {
|
|||||||
this.service.RegisterFunctionName(string(comm.Rpc_GatewayRoute), this.ReceiveMsg) //注册网关路由接收接口
|
this.service.RegisterFunctionName(string(comm.Rpc_GatewayRoute), this.ReceiveMsg) //注册网关路由接收接口
|
||||||
this.service.RegisterFunctionName(string(comm.Rpc_GatewayNoticeUserLogin), this.NoticeUserLogin) //注册用户登录通知
|
this.service.RegisterFunctionName(string(comm.Rpc_GatewayNoticeUserLogin), this.NoticeUserLogin) //注册用户登录通知
|
||||||
this.service.RegisterFunctionName(string(comm.Rpc_GatewayNoticeUserClose), this.NoticeUserClose) //注册用户离线通知
|
this.service.RegisterFunctionName(string(comm.Rpc_GatewayNoticeUserClose), this.NoticeUserClose) //注册用户离线通知
|
||||||
|
this.service.RegisterFunctionName(string(comm.Rpc_ConfigureUpDate), this.ConfigureUpDate) //注册配置更新
|
||||||
err = this.ServiceCompBase.Start()
|
err = this.ServiceCompBase.Start()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -198,6 +200,12 @@ func (this *SCompGateRoute) NoticeUserClose(ctx context.Context, args *pb.Notice
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//RPC_ConfigureUpDate 接收配置更新消息
|
||||||
|
func (this *SCompGateRoute) ConfigureUpDate(ctx context.Context, args *pb.EmptyReq, reply *pb.EmptyResp) error {
|
||||||
|
configure.Update()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
//获取用户的会话对象
|
//获取用户的会话对象
|
||||||
func (this *SCompGateRoute) GetUserSession(udata *pb.CacheUser) (session comm.IUserSession) {
|
func (this *SCompGateRoute) GetUserSession(udata *pb.CacheUser) (session comm.IUserSession) {
|
||||||
session = this.pools.Get().(comm.IUserSession)
|
session = this.pools.Get().(comm.IUserSession)
|
||||||
|
|||||||
@ -47,6 +47,10 @@ type Configure struct {
|
|||||||
offsettime time.Duration //偏移时间
|
offsettime time.Duration //偏移时间
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *Configure) ConfigurePath() string {
|
||||||
|
return this.options.ConfigurePath
|
||||||
|
}
|
||||||
|
|
||||||
func (this *Configure) Start() (err error) {
|
func (this *Configure) Start() (err error) {
|
||||||
timer := time.NewTicker(time.Second * time.Duration(this.options.CheckInterval))
|
timer := time.NewTicker(time.Second * time.Duration(this.options.CheckInterval))
|
||||||
go func() {
|
go func() {
|
||||||
@ -69,6 +73,10 @@ func (this *Configure) Stop() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *Configure) Update() {
|
||||||
|
this.checkConfigure()
|
||||||
|
}
|
||||||
|
|
||||||
//服务当前时间
|
//服务当前时间
|
||||||
func (this *Configure) Now() time.Time {
|
func (this *Configure) Now() time.Time {
|
||||||
return time.Now().Add(this.offsettime)
|
return time.Now().Add(this.offsettime)
|
||||||
|
|||||||
@ -15,8 +15,10 @@ type (
|
|||||||
ModTime time.Time // 文件修改时间
|
ModTime time.Time // 文件修改时间
|
||||||
}
|
}
|
||||||
ISys interface {
|
ISys interface {
|
||||||
|
ConfigurePath() string
|
||||||
Start() (err error)
|
Start() (err error)
|
||||||
Stop() (err error)
|
Stop() (err error)
|
||||||
|
Update()
|
||||||
RegisterConfigure(name string, fn interface{}, callback func()) (err error) //注册配置
|
RegisterConfigure(name string, fn interface{}, callback func()) (err error) //注册配置
|
||||||
GetConfigure(name string) (v interface{}, err error) //获取配置
|
GetConfigure(name string) (v interface{}, err error) //获取配置
|
||||||
Now() time.Time //服务器当前时间
|
Now() time.Time //服务器当前时间
|
||||||
@ -42,12 +44,20 @@ func NewSys(option ...Option) (sys ISys, err error) {
|
|||||||
defsys, err = newSys(options)
|
defsys, err = newSys(options)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
func ConfigurePath() string {
|
||||||
|
return defsys.ConfigurePath()
|
||||||
|
}
|
||||||
|
|
||||||
func Start() (err error) {
|
func Start() (err error) {
|
||||||
return defsys.Start()
|
return defsys.Start()
|
||||||
}
|
}
|
||||||
func Stop() (err error) {
|
func Stop() (err error) {
|
||||||
return defsys.Stop()
|
return defsys.Stop()
|
||||||
}
|
}
|
||||||
|
func Update() {
|
||||||
|
defsys.Update()
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterConfigure(name string, fn interface{}, callback func()) (err error) {
|
func RegisterConfigure(name string, fn interface{}, callback func()) (err error) {
|
||||||
return defsys.RegisterConfigure(name, fn, callback)
|
return defsys.RegisterConfigure(name, fn, callback)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user