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

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

Browse Source
This commit is contained in:
meixiongfeng 2023-01-14 22:34:19 +08:00
commit 15abc4208e
5 changed files with 814 additions and 780 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

2
modules/user/api_login.go
View File

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