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 2022-11-11 14:27:26 +08:00
commit a67aa5347e
5 changed files with 1242 additions and 1097 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
bin/json/game_herostrategy.json
View File

@ -4,13 +4,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -25,13 +25,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -46,13 +46,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -67,13 +67,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -88,13 +88,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -109,13 +109,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -130,13 +130,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -151,13 +151,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -172,13 +172,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -193,13 +193,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -214,13 +214,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -235,13 +235,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -256,13 +256,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -277,13 +277,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -298,13 +298,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -319,13 +319,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -340,13 +340,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -361,13 +361,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -382,13 +382,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -403,13 +403,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -424,13 +424,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -445,13 +445,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -466,13 +466,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -487,13 +487,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -508,13 +508,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -529,13 +529,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -550,13 +550,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -571,13 +571,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -592,13 +592,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -613,13 +613,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -634,13 +634,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -655,13 +655,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -676,13 +676,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -697,13 +697,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -718,13 +718,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -739,13 +739,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -760,13 +760,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -781,13 +781,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -802,13 +802,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -823,13 +823,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -844,13 +844,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -865,13 +865,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -886,13 +886,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -907,13 +907,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -928,13 +928,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -949,13 +949,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -970,13 +970,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -991,13 +991,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{
@ -1012,13 +1012,13 @@
"task": [
1,
2,
11
3
],
"us_FormatList": [
101021
710001
],
"FormatList": [
101011
710002
],
"award": [
{

261
bin/json/game_sign.json
View File

@ -9,7 +9,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 2,
@ -21,7 +22,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 3,
@ -33,7 +35,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 4,
@ -45,7 +48,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 5,
@ -57,7 +61,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 6,
@ -69,7 +74,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 7,
@ -81,6 +87,13 @@
"t": "90002",
"n": 1
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 1
}
]
},
{
@ -93,7 +106,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 9,
@ -105,7 +119,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 10,
@ -117,7 +132,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 11,
@ -129,7 +145,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 12,
@ -141,7 +158,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 13,
@ -153,7 +171,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 14,
@ -165,6 +184,13 @@
"t": "90002",
"n": 1
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 1
}
]
},
{
@ -177,7 +203,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 16,
@ -189,7 +216,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 17,
@ -201,7 +229,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 18,
@ -213,7 +242,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 19,
@ -225,7 +255,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 20,
@ -237,7 +268,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 21,
@ -249,6 +281,13 @@
"t": "90002",
"n": 1
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 1
}
]
},
{
@ -261,7 +300,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 23,
@ -273,7 +313,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 24,
@ -285,7 +326,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 25,
@ -297,7 +339,8 @@
"t": "90002",
"n": 1
}
]
],
"extra": []
},
{
"id": 26,
@ -309,7 +352,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 27,
@ -321,7 +365,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 28,
@ -333,7 +378,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 29,
@ -345,7 +391,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 30,
@ -357,7 +404,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 31,
@ -369,7 +417,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 32,
@ -381,6 +430,13 @@
"t": "90002",
"n": 2
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 2
}
]
},
{
@ -393,7 +449,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 34,
@ -405,7 +462,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 35,
@ -417,7 +475,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 36,
@ -429,7 +488,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 37,
@ -441,7 +501,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 38,
@ -453,7 +514,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 39,
@ -465,6 +527,13 @@
"t": "90002",
"n": 2
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 2
}
]
},
{
@ -477,7 +546,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 41,
@ -489,7 +559,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 42,
@ -501,7 +572,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 43,
@ -513,7 +585,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 44,
@ -525,7 +598,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 45,
@ -537,7 +611,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 46,
@ -549,6 +624,13 @@
"t": "90002",
"n": 2
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 2
}
]
},
{
@ -561,7 +643,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 48,
@ -573,7 +656,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 49,
@ -585,7 +669,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 50,
@ -597,7 +682,8 @@
"t": "90002",
"n": 2
}
]
],
"extra": []
},
{
"id": 51,
@ -609,7 +695,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 52,
@ -621,7 +708,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 53,
@ -633,7 +721,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 54,
@ -645,7 +734,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 55,
@ -657,7 +747,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 56,
@ -669,7 +760,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 57,
@ -681,6 +773,13 @@
"t": "90002",
"n": 3
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 3
}
]
},
{
@ -693,7 +792,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 59,
@ -705,7 +805,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 60,
@ -717,7 +818,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 61,
@ -729,7 +831,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 62,
@ -741,7 +844,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 63,
@ -753,7 +857,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 64,
@ -765,6 +870,13 @@
"t": "90002",
"n": 3
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 3
}
]
},
{
@ -777,7 +889,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 66,
@ -789,7 +902,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 67,
@ -801,7 +915,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 68,
@ -813,7 +928,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 69,
@ -825,7 +941,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 70,
@ -837,7 +954,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 71,
@ -849,6 +967,13 @@
"t": "90002",
"n": 3
}
],
"extra": [
{
"a": "item",
"t": "90002",
"n": 3
}
]
},
{
@ -861,7 +986,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 73,
@ -873,7 +999,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 74,
@ -885,7 +1012,8 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
},
{
"id": 75,
@ -897,6 +1025,7 @@
"t": "90002",
"n": 3
}
]
],
"extra": []
}
]

2
modules/rtask/model_record.go
View File

@ -43,7 +43,7 @@ func (this *ModelRtaskRecord) getRecord(uid string) *pb.DBRtaskRecord {
record := &pb.DBRtaskRecord{}
if err := this.Get(uid, record); err != nil {
if err != mongo.ErrNoDocuments {
log.Warnf("获取玩家任务条件 err:%v", err)
log.Warnf("获取玩家任务条件 uid:%s err:%v", uid, err)
}
}
return record

1
modules/user/api_sign.go
View File

@ -57,6 +57,7 @@ func (this *apiComp) Sign(session comm.IUserSession, req *pb.UserSignReq) (code
if _data != nil { // 发奖
if bReward {
this.module.DispenseRes(session, _data.Loopgift, true)
this.module.DispenseRes(session, _data.Extra, true)
}
} else {
if bReward {

15
sys/configure/structs/Game.SignData.go
View File

@ -15,6 +15,7 @@ type GameSignData struct {
Day int32
Group int32
Loopgift []*Gameatn
Extra []*Gameatn
}
const TypeId_GameSignData = -1850890877
@ -41,6 +42,20 @@ func (_v *GameSignData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["extra"].([]interface{}); !_ok_ { err = errors.New("extra error"); return }
_v.Extra = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Extra = append(_v.Extra, _list_v_)
}
}
return
}