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",

modules/user/api_login.go

@@ -133,6 +133,8 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 		} else {
 			rsp.Ex = expand
 		}
+	} else {
+		rsp.Ex = &pb.DBUserExpand{}
 	}
 
 	this.module.RecoverUserPsStart(user.Uid)