Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
2884bf156f
@ -1902,7 +1902,7 @@
|
|||||||
"completetask": [
|
"completetask": [
|
||||||
12070490
|
12070490
|
||||||
],
|
],
|
||||||
"deliver_npc": 10478,
|
"deliver_npc": 0,
|
||||||
"auto_accept": 1,
|
"auto_accept": 1,
|
||||||
"reword": [
|
"reword": [
|
||||||
{
|
{
|
||||||
@ -2010,7 +2010,7 @@
|
|||||||
"completetask": [
|
"completetask": [
|
||||||
12070520
|
12070520
|
||||||
],
|
],
|
||||||
"deliver_npc": 10508,
|
"deliver_npc": 0,
|
||||||
"auto_accept": 0,
|
"auto_accept": 0,
|
||||||
"reword": [
|
"reword": [
|
||||||
{
|
{
|
||||||
|
@ -131,6 +131,8 @@ func (this *modelArena) updateArenaUserInfo(info *pb.DBArenaUser) (err error) {
|
|||||||
"defendtotaluum": info.Defendtotaluum,
|
"defendtotaluum": info.Defendtotaluum,
|
||||||
"loc": []float64{float64(dan), float64(rand.Int31n(100)) / 1000.0},
|
"loc": []float64{float64(dan), float64(rand.Int31n(100)) / 1000.0},
|
||||||
"isdef": info.Isdef,
|
"isdef": info.Isdef,
|
||||||
|
"name": info.Name,
|
||||||
|
"avatar": info.Avatar,
|
||||||
"lv": info.Lv,
|
"lv": info.Lv,
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user