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

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

Browse Source
This commit is contained in:
meixiongfeng 2022-09-20 21:18:46 +08:00
commit 4c4280ebbd
4 changed files with 876 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

836
bin/json/game_herostarup.json
View File

@ -2,7 +2,7 @@
{
"key": 1,
"id": "25001",
"star": 5,
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
@ -12,25 +12,13 @@
3,
4
],
"needracestar": 5,
"needracenum": 5,
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 2,
"id": "25001",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 3,
"id": "14003",
"star": 5,
"needhero": "",
"needherostar": 0,
@ -46,8 +34,8 @@
"gold": 10000
},
{
"key": 4,
"id": "14003",
"key": 3,
"id": "25001",
"star": 6,
"needhero": "",
"needherostar": 0,
@ -58,9 +46,9 @@
"gold": 0
},
{
"key": 5,
"id": "14007",
"star": 5,
"key": 4,
"id": "25004",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
@ -70,12 +58,327 @@
3,
4
],
"needracestar": 5,
"needracenum": 5,
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 5,
"id": "25004",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 6,
"id": "25004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 7,
"id": "25004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 8,
"id": "44006",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 9,
"id": "44006",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 10,
"id": "44006",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 11,
"id": "44006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 12,
"id": "35001",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 13,
"id": "35001",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 14,
"id": "35001",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 15,
"id": "35001",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 16,
"id": "44005",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 17,
"id": "44005",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 18,
"id": "44005",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 19,
"id": "44005",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 20,
"id": "15004",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 21,
"id": "15004",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 22,
"id": "15004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 23,
"id": "15004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 24,
"id": "14007",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 25,
"id": "14007",
"star": 6,
"needhero": "",
@ -86,300 +389,27 @@
"needracenum": 0,
"gold": 0
},
{
"key": 7,
"id": "15004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 8,
"id": "15004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 9,
"id": "15005",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 10,
"id": "15005",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 11,
"id": "24002",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 12,
"id": "24002",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 13,
"id": "24003",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 14,
"id": "24003",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 15,
"id": "24004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 16,
"id": "24004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 17,
"id": "25004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 18,
"id": "25004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 19,
"id": "34006",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 20,
"id": "34006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 21,
"id": "35001",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 22,
"id": "35001",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 23,
"id": "35003",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 24,
"id": "35003",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 25,
"id": "44005",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 26,
"id": "44005",
"star": 6,
"id": "45003",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 27,
"id": "44006",
"star": 5,
"id": "45003",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
@ -389,24 +419,12 @@
3,
4
],
"needracestar": 5,
"needracenum": 5,
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 28,
"id": "44006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 29,
"id": "45003",
"star": 5,
"needhero": "",
@ -423,7 +441,7 @@
"gold": 10000
},
{
"key": 30,
"key": 29,
"id": "45003",
"star": 6,
"needhero": "",
@ -433,5 +451,177 @@
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 30,
"id": "24004",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 31,
"id": "24004",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 32,
"id": "24004",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 33,
"id": "24004",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 34,
"id": "34006",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 35,
"id": "34006",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 36,
"id": "34006",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
},
{
"key": 37,
"id": "24003",
"star": 3,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 3,
"needracenum": 3,
"gold": 10000
},
{
"key": 38,
"id": "24003",
"star": 4,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 4,
"needracenum": 4,
"gold": 10000
},
{
"key": 39,
"id": "24003",
"star": 5,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [
1,
2,
3,
4
],
"needracestar": 5,
"needracenum": 5,
"gold": 10000
},
{
"key": 40,
"id": "24003",
"star": 6,
"needhero": "",
"needherostar": 0,
"needheronum": 0,
"needrace": [],
"needracestar": 0,
"needracenum": 0,
"gold": 0
}
]

360
bin/json/game_mainline.json
View File

File diff suppressed because it is too large Load Diff

2
modules/mail/model_mail.go
View File

@ -32,7 +32,7 @@ func (this *modelMail) Init(service core.IService, module core.IModule, comp cor
func (this *modelMail) MailQueryUserMail(uId string) (mail []*pb.DBMailData, err error) {
if _data, err := this.DB.Find(comm.TableMail, bson.M{"uid": uId}); err == nil {
if _data, err := this.DB.Find(comm.TableMail, bson.M{"uid": uId}, options.Find().SetSort(bson.M{"createtime": -1})); err == nil {
for _data.Next(context.TODO()) {
temp := &pb.DBMailData{}
if err = _data.Decode(temp); err == nil {

2
sys/configure/structs/Game.MainlineData.go
View File

@ -24,6 +24,7 @@ type GameMainlineData struct {
CaptainId string
Battlescene string
Award []*Gameatn
Exp int32
Title string
Desc string
Stroyid []int32
@ -81,6 +82,7 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{