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

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

Browse Source
This commit is contained in:
liwei1dao 2023-01-14 22:30:05 +08:00
commit 212673e0b3
5 changed files with 822 additions and 789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

646
bin/json/game_drawcard.json
View File

File diff suppressed because it is too large Load Diff

15
bin/json/game_global.json
View File

@ -110,17 +110,17 @@
}, },
"base_pool2": { "base_pool2": {
"s": 1, "s": 1,
"e": 29, "e": 99999,
"p": "base_pool2" "p": "base_pool2"
}, },
"base_pool3": { "base_pool3": {
"s": 29, "s": 100000,
"e": 999, "e": 999999999,
"p": "base_pool6" "p": "base_pool6"
}, },
"base_pool4": { "base_pool4": {
"s": 1000, "s": 99999999,
"e": 99999999, "e": 999999999,
"p": "base_pool7" "p": "base_pool7"
}, },
"base_pool5": { "base_pool5": {
@ -141,7 +141,7 @@
"base_pool_star3": 970, "base_pool_star3": 970,
"base_pool_star4": 27, "base_pool_star4": 27,
"base_pool_star5": 3, "base_pool_star5": 3,
"camp_pool_star3": 9000, "camp_pool_star3": 9500,
"camp_pool_star4": 900, "camp_pool_star4": 900,
"camp_pool_star5": 100, "camp_pool_star5": 100,
"gourmet": 36000, "gourmet": 36000,
@ -524,6 +524,7 @@
}, },
"GuildBoss_MaxBuyNum": 5, "GuildBoss_MaxBuyNum": 5,
"GuildBoss_troop2": 45, "GuildBoss_troop2": 45,
"GuildBoss_troop3": 60 "GuildBoss_troop3": 60,
"zhayantime": 3
} }
] ]

5
bin/json/game_mainline.json
View File

@ -64,11 +64,6 @@
"t": "gold", "t": "gold",
"n": 1650 "n": 1650
}, },
{
"a": "hero",
"t": "14007",
"n": 1
},
{ {
"a": "attr", "a": "attr",
"t": "exp", "t": "exp",

926
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

19
services/comp_gateroute.go
View File

@ -8,6 +8,7 @@ import (
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
"go_dreamfactory/sys/db" "go_dreamfactory/sys/db"
"reflect" "reflect"
"runtime"
"sync" "sync"
"time" "time"
@ -118,15 +119,15 @@ func (this *SCompGateRoute) RegisterRoute(methodName string, comp reflect.Value,
//Rpc_GatewayRoute服务接口的接收函数 //Rpc_GatewayRoute服务接口的接收函数
func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessage, reply *pb.RPCMessageReply) (err error) { func (this *SCompGateRoute) ReceiveMsg(ctx context.Context, args *pb.AgentMessage, reply *pb.RPCMessageReply) (err error) {
method := fmt.Sprintf("%s.%s", args.MainType, args.SubType) method := fmt.Sprintf("%s.%s", args.MainType, args.SubType)
// defer func() { //程序异常 收集异常信息传递给前端显示 defer func() { //程序异常 收集异常信息传递给前端显示
// if r := recover(); r != nil { if r := recover(); r != nil {
// buf := make([]byte, 4096) buf := make([]byte, 4096)
// l := runtime.Stack(buf, false) l := runtime.Stack(buf, false)
// reply.Code = pb.ErrorCode_Exception reply.Code = pb.ErrorCode_Exception
// reply.ErrorMessage = fmt.Sprintf("%v: %s", r, buf[:l]) reply.ErrorMessage = fmt.Sprintf("%v: %s", r, buf[:l])
// log.Errorf("[Handle Api] m:%s reply:%s", method, reply) log.Errorf("[Handle Api] m:%s reply:%s", method, reply)
// } }
// }() }()
//获取用户消息处理函数 //获取用户消息处理函数
this.mrlock.RLock() this.mrlock.RLock()
msghandle, ok := this.msghandles[method] msghandle, ok := this.msghandles[method]