diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index d35e585..e781856 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -3,12 +3,16 @@ package logic type UserLoginReq struct { Fromid int `json:"fromid"` Sharetype int `json:"sharetype"` + Gameid string `json:"gameid"` + Channel string `json:"channel"` } type UserLoginData struct { Walletgold int `json:"walletgold"` Leftads int `json:"leftads"` Guangold int `json:"guangold"` + Userlv int `json:"userlv"` + Userexp int `json:"userexp"` } type UserLoginResp struct { diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index dad60f6..18c9aaf 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -470,7 +470,7 @@ func InitTaskAndAchievement(uuid int) error{ tmp.Taskstatus = 1 tmp.Taskid = val.Id tmp.Taskprogress = 0 - tasklist.Taskdata = append(tasklist.Taskdata,tmp) + achievelist.Taskdata = append(achievelist.Taskdata,tmp) } err = SaveTaskInfo(uuid,2,achievelist) @@ -550,7 +550,7 @@ func (u *UserData) HandlePassDay() { SaveUserInfo(u) } -func GetUserData(uuid int, resp *UserLoginResp) error{ +func GetUserData(uuid int, req *UserLoginReq,resp *UserLoginResp) error{ data,err := GetUserInfo(uuid) if err != nil || data == nil{ resp.Code = ERROR_SRV_ERROR @@ -562,7 +562,10 @@ func GetUserData(uuid int, resp *UserLoginResp) error{ data.HandlePassDay() //此处处理一下从sdk拉取钱包金币数量 - //todo + gold,err := GetCoinFromSdk(uuid,req.Gameid,req.Channel) + if err != nil { + data.RealGold = gold + } SaveUserInfo(data) @@ -684,6 +687,10 @@ func (uinfo* UserData) AddUserExp(num int) bool { return isup } +func GetCoinFromSdk(uuid int,gameid string,channel string) (int,error) { + return 0,nil +} + func AddCoinToSdk(uuid int,goldnum int,gameid string,channel string,atype int) (int,error) { //暂时先不对接 接口调通遗憾对接后台 return 0,nil diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index d1ac39c..324b3d7 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -689,7 +689,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) { err = InitUserInfo(&rdata, &resp, uuid) } else { //已经登陆过了 需要获取玩家数据 - err = GetUserData(uuid, &resp) + err = GetUserData(uuid, &rdata,&resp) } if err != nil { -- libgit2 0.21.0