Commit 68652b9fa59f069f86a186b4f69c40063c1a43e6
1 parent
f2f654b2
Exists in
master
and in
4 other branches
提交
Showing
3 changed files
with
15 additions
and
4 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -3,12 +3,16 @@ package logic | @@ -3,12 +3,16 @@ package logic | ||
| 3 | type UserLoginReq struct { | 3 | type UserLoginReq struct { |
| 4 | Fromid int `json:"fromid"` | 4 | Fromid int `json:"fromid"` |
| 5 | Sharetype int `json:"sharetype"` | 5 | Sharetype int `json:"sharetype"` |
| 6 | + Gameid string `json:"gameid"` | ||
| 7 | + Channel string `json:"channel"` | ||
| 6 | } | 8 | } |
| 7 | 9 | ||
| 8 | type UserLoginData struct { | 10 | type UserLoginData struct { |
| 9 | Walletgold int `json:"walletgold"` | 11 | Walletgold int `json:"walletgold"` |
| 10 | Leftads int `json:"leftads"` | 12 | Leftads int `json:"leftads"` |
| 11 | Guangold int `json:"guangold"` | 13 | Guangold int `json:"guangold"` |
| 14 | + Userlv int `json:"userlv"` | ||
| 15 | + Userexp int `json:"userexp"` | ||
| 12 | } | 16 | } |
| 13 | 17 | ||
| 14 | type UserLoginResp struct { | 18 | type UserLoginResp struct { |
src/HttpServer/logic/function.go
| @@ -470,7 +470,7 @@ func InitTaskAndAchievement(uuid int) error{ | @@ -470,7 +470,7 @@ func InitTaskAndAchievement(uuid int) error{ | ||
| 470 | tmp.Taskstatus = 1 | 470 | tmp.Taskstatus = 1 |
| 471 | tmp.Taskid = val.Id | 471 | tmp.Taskid = val.Id |
| 472 | tmp.Taskprogress = 0 | 472 | tmp.Taskprogress = 0 |
| 473 | - tasklist.Taskdata = append(tasklist.Taskdata,tmp) | 473 | + achievelist.Taskdata = append(achievelist.Taskdata,tmp) |
| 474 | } | 474 | } |
| 475 | 475 | ||
| 476 | err = SaveTaskInfo(uuid,2,achievelist) | 476 | err = SaveTaskInfo(uuid,2,achievelist) |
| @@ -550,7 +550,7 @@ func (u *UserData) HandlePassDay() { | @@ -550,7 +550,7 @@ func (u *UserData) HandlePassDay() { | ||
| 550 | SaveUserInfo(u) | 550 | SaveUserInfo(u) |
| 551 | } | 551 | } |
| 552 | 552 | ||
| 553 | -func GetUserData(uuid int, resp *UserLoginResp) error{ | 553 | +func GetUserData(uuid int, req *UserLoginReq,resp *UserLoginResp) error{ |
| 554 | data,err := GetUserInfo(uuid) | 554 | data,err := GetUserInfo(uuid) |
| 555 | if err != nil || data == nil{ | 555 | if err != nil || data == nil{ |
| 556 | resp.Code = ERROR_SRV_ERROR | 556 | resp.Code = ERROR_SRV_ERROR |
| @@ -562,7 +562,10 @@ func GetUserData(uuid int, resp *UserLoginResp) error{ | @@ -562,7 +562,10 @@ func GetUserData(uuid int, resp *UserLoginResp) error{ | ||
| 562 | data.HandlePassDay() | 562 | data.HandlePassDay() |
| 563 | 563 | ||
| 564 | //此处处理一下从sdk拉取钱包金币数量 | 564 | //此处处理一下从sdk拉取钱包金币数量 |
| 565 | - //todo | 565 | + gold,err := GetCoinFromSdk(uuid,req.Gameid,req.Channel) |
| 566 | + if err != nil { | ||
| 567 | + data.RealGold = gold | ||
| 568 | + } | ||
| 566 | 569 | ||
| 567 | SaveUserInfo(data) | 570 | SaveUserInfo(data) |
| 568 | 571 | ||
| @@ -684,6 +687,10 @@ func (uinfo* UserData) AddUserExp(num int) bool { | @@ -684,6 +687,10 @@ func (uinfo* UserData) AddUserExp(num int) bool { | ||
| 684 | return isup | 687 | return isup |
| 685 | } | 688 | } |
| 686 | 689 | ||
| 690 | +func GetCoinFromSdk(uuid int,gameid string,channel string) (int,error) { | ||
| 691 | + return 0,nil | ||
| 692 | +} | ||
| 693 | + | ||
| 687 | func AddCoinToSdk(uuid int,goldnum int,gameid string,channel string,atype int) (int,error) { | 694 | func AddCoinToSdk(uuid int,goldnum int,gameid string,channel string,atype int) (int,error) { |
| 688 | //暂时先不对接 接口调通遗憾对接后台 | 695 | //暂时先不对接 接口调通遗憾对接后台 |
| 689 | return 0,nil | 696 | return 0,nil |
src/HttpServer/logic/logic.go
| @@ -689,7 +689,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) { | @@ -689,7 +689,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) { | ||
| 689 | err = InitUserInfo(&rdata, &resp, uuid) | 689 | err = InitUserInfo(&rdata, &resp, uuid) |
| 690 | } else { | 690 | } else { |
| 691 | //已经登陆过了 需要获取玩家数据 | 691 | //已经登陆过了 需要获取玩家数据 |
| 692 | - err = GetUserData(uuid, &resp) | 692 | + err = GetUserData(uuid, &rdata,&resp) |
| 693 | } | 693 | } |
| 694 | 694 | ||
| 695 | if err != nil { | 695 | if err != nil { |