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

bin/json/game_global.json

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

bin/json/game_mainline.json

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

services/comp_gateroute.go

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