diff --git a/src/HttpServer/jsonconf/DailyTaskConfig.json b/src/HttpServer/jsonconf/DailyTaskConfig.json index 86607fd..da91d2c 100644 --- a/src/HttpServer/jsonconf/DailyTaskConfig.json +++ b/src/HttpServer/jsonconf/DailyTaskConfig.json @@ -27,7 +27,7 @@ "id": 9, "task": "在线%d%mins", "num": 60, - "reward": [3,1.2], + "reward": [3,12000], "RewardVideo": 1, "type": 1 }, diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go index 20e6861..8480ec1 100644 --- a/src/HttpServer/logic/constdef.go +++ b/src/HttpServer/logic/constdef.go @@ -2,46 +2,45 @@ package logic //任务成就类型枚举 协议上报用 const ( - TASKTYPE_PASSLEVEL = 1 //表示通过x关卡 - TASKTYPE_GETREDBAG = 2 //3表示观看x次广告 + TASKTYPE_HEQIANG = 1 //表示合成枪 + TASKTYPE_JIEQIANG = 2 //表示解锁x枪 TASKTYPE_WATCHADS = 3 //领取x次红包 - TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 - TASKTYPE_USEITEM = 5 //5表示使用x次道具 - TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏 + TASKTYPE_GETFLYBOX = 4 //表示领取x空投宝箱 + TASKTYPE_TURNTABLE = 5 //5表示x次转盘 + TASKTYPE_SHOPBUY = 6 //6表示商店购买x次 + TASKTYPE_PASSLEVEL = 7 //表示闯关x次 + ) //任务类型 对应表 const ( - DAILY_TASKTYPE_LOGIN = 1 //1 每日登录 - DAILY_TASKTYPE_GETGUANCNT = 2 //提取存钱罐 - DAILY_TASKTYPE_PASSLEVEL = 3 //近日通过关 - DAILY_TASKTYPE_USEITEM = 4 //使用道具数 - DAILY_TASKTYPE_GETREDBAG = 5 //领取红包次数 - DAILY_TASKTYPE_GETGUANGOLD = 6 //收取金币x枚 - DAILY_TASKTYPE_ONLINEMIN = 7 //在线分钟数 - DAILY_TASKTYPE_PLAYSMALLGAME = 8 //试玩小游戏15s + DAILY_TASKTYPE_ONLINE = 1 //在线x分钟 + DAILY_TASKTYPE_HECHENG = 2 //合成x把枪 + DAILY_TASKTYPE_JIEQIANG = 3 //解锁x把枪 + DAILY_TASKTYPE_WATCHADS = 4 //g观看x广告 + DAILY_TASKTYPE_GETFLYBOX = 5 //领取空投宝箱 + DAILY_TASKTYPE_TURNTABLE = 6 //转盘 + DAILY_TASKTYPE_SHOPBUY = 7 //商店购买枪 + DAILY_TASKTYPE_PASSLEVEL = 8 //闯关 ) //成就类型 对应表 const ( ACHIEVETYPE_WATCHADDS = 1 //累计观看广告次数 - ACHIEVETYPE_USERLV = 2 //人物等级 - ACHIEVETYPE_KILLSTAR = 3 //累计消除星星数 - ACHIEVETYPE_GETGUANCNT = 4 //累计存钱罐提取 - ACHIEVETYPE_USEITEMCNT = 5 //累计道具使用 + ACHIEVETYPE_HEQIANG = 2 //合枪 + ACHIEVETYPE_JIEQIANG = 3 //解枪 + ACHIEVETYPE_PASSLEVEL = 4 //累计闯关 + ) //奖励类型枚举 const ( - REWARDTYPE_STAR = 1 //星星 - REWARDTYPE_CHUI = 2 - REWARDTYPE_SHUA = 3 - REWARDTYPE_SWAP = 4 - REWARDTYPE_ELIMITE = 5 - REWARDTYPE_EXP = 6 - REWARDTYPE_GOLD = 7 + REWARDTYPE_GOLD = 1 //金币 + REWARDTYPE_ZUAN = 2 + REWARDTYPE_REDBAG = 3 + REWARDTYPE_ROSE = 4 ) const ( diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index d89dbfd..44592aa 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -1,6 +1,63 @@ package logic +type TaskListDesc struct { + Taskid int `json:"taskid"` + Taskstatus int `json:"taskstatus"` + Taskprogress int `json:"taskprogress"` +} + +type TaskList struct { + Taskdata []TaskListDesc `json:"taskdata"` +} + +type GettaskrewardReq struct { + Tasktype int `json:"tasktype"` + Taskid int `json:"taskid"` + Gameid string `json:"gameid"` + Channel string `json:"channel"` +} +type GettaskrewardData struct { + Rewardgold int `json:"rewardgold"` + Rewardzuan int `json:"rewardzuan"` + Rewardrose int `json:"rewardrose"` + Addredbag int `json:"addredbag"` + Sumredbag int `json:"sumredbag"` +} +type GettaskrewardResp struct { + Code int `json:"code"` + Message string `json:"message"` + Data GettaskrewardData `json:"data"` +} + +type QuerytaskinfoReq struct { + Tasktype int `json:"tasktype"` + Gameid string `json:"gameid"` + Channel string `json:"channel"` +} + +type QuerytaskinfoResp struct { + Code int `json:"code"` + Message string `json:"message"` + Data TaskList `json:"data"` +} + +type OnlinentfResp struct { + Code int `json:"code"` + Message string `json:"message"` +} + +type UpdatetaskReq struct { + Tasktype int `json:"tasktype"` + Value int `json:"value"` + Gameid string `json:"gameid"` + Channel string `json:"channel"` +} + +type UpdatetaskResp struct { + Code int `json:"code"` + Message string `json:"message"` +} type UserLoginReq struct { Gameid string `json:"gameid"` @@ -214,7 +271,7 @@ type UserData struct { SpecialLevel int //特殊关卡 GuanRedNum int //关卡红包领取进度 JiRedNum int //等级红包领取进度 - RandNum int //随机红包剩余次数 + RandNum int //时长红包 SpecialNum int //特殊关卡红包领取进度 Tili int //体力 ReadNum int //玩家微转发阅读量 diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index c036b6f..688c0b8 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -12,6 +12,7 @@ import ( "errors" "fmt" "io/ioutil" + "math/rand" "net/http" "sort" "strconv" @@ -24,6 +25,21 @@ func SetHeader(w http.ResponseWriter) { w.Header().Set("Access-Control-Allow-Headers", "Content-Type,Uuid") } +func (v *TaskList) Len() int { + return len(v.Taskdata) +} + +func (v *TaskList) Swap(i, j int) { + v.Taskdata[i], v.Taskdata[j] = v.Taskdata[j], v.Taskdata[i] +} + +func (v *TaskList) Less(i, j int) bool { + if v.Taskdata[i].Taskstatus == v.Taskdata[j].Taskstatus { + return v.Taskdata[i].Taskid < v.Taskdata[j].Taskid + } + return v.Taskdata[i].Taskstatus > v.Taskdata[j].Taskstatus +} + func SaveUserInfo(data *UserData, uniqueid string) error { savestr, err := json.Marshal(data) @@ -71,6 +87,24 @@ func (uinfo *UserData) GetWithDrawData(money float32) (int, *WithDrawDesc) { return -1, nil } +func GetTaskConfig(taskid int) *jsonconf.AchieveDesc { + for _, val := range jsonconf.GetJsonConf().TaskConfig { + if val.Id == taskid { + return &val + } + } + return nil +} + +func GetAchieveConfig(taskid int) *jsonconf.AchieveDesc { + for _, val := range jsonconf.GetJsonConf().AchieventConfig { + if val.Id == taskid { + return &val + } + } + return nil +} + func HandlerSyncuserdata(w http.ResponseWriter, data string, uuid int) { SetHeader(w) var resp GetuserdataResp @@ -124,6 +158,359 @@ func HandlerSyncuserdata(w http.ResponseWriter, data string, uuid int) { logger.Info("###HandlerSyncuserdata###rdata:%v", string(respstr)) } +func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel string, uuid int) (int, int, int, int, int) { + logger.Info("RewardUser rtype=%v,num=%v", rtype, num) + switch rtype { + case REWARDTYPE_GOLD: + return num,0, 0, 0, 0 + case REWARDTYPE_ZUAN: + return 0, num, 0, 0, 0 + case REWARDTYPE_REDBAG: + readaddnum := rand.Intn(num/2) + num + goldnum, err := AddCoinToSdk(uuid, readaddnum, gameid, channel, 102) + if err != nil { + logger.Error("RewardUser failer err=%v", err) + } + uinfo.RealGold = goldnum + //uinfo.RealGold += num + return 0, 0, 0, readaddnum,uinfo.RealGold + case REWARDTYPE_ROSE: + return 0, 0, num, 0, 0 + + default: + return 0, 0, 0, 0, 0 + } + return 0, 0, 0, 0, 0 +} + +//处理领取任务 +func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *GettaskrewardResp, list *TaskList, uuid int) error { + isfind := false + index := -1 + var taskdesc *TaskListDesc + for k, val := range list.Taskdata { + if val.Taskid == req.Taskid { + isfind = true + index = k + taskdesc = &val + break + } + } + + logger.Info("HandleGetTaskReward index=%v taskdesc=%v", index, taskdesc) + if isfind && taskdesc != nil && index != -1 { + if taskdesc.Taskstatus != 2 { + //状态不是可领取状态 无法领取 + resp.Code = 1 + resp.Message = "当前任务未完成或已领取" + return errors.New("当前任务未完成或已领取") + } + + //状态对的情况 如果是成就下需要判断前置条件是否被 + if req.Tasktype == 2 && index > 0 { + precfg := GetAchieveConfig(list.Taskdata[index-1].Taskid) + nowcfg := GetAchieveConfig(taskdesc.Taskid) + logger.Info("HandleGetTaskRewardGetTaskConfig precfg=%v nowcfg=%v", precfg, nowcfg) + if precfg != nil && nowcfg != nil && precfg.TaskType == nowcfg.TaskType && list.Taskdata[index-1].Taskstatus != 0 { + resp.Code = 2 + resp.Message = "前置任务还未领取" + return errors.New("当前任务未完成或已领取") + } + } + } else { + resp.Code = 1 + resp.Message = "当前任务id错误" + return errors.New("当前任务id错误") + } + + var cfg *jsonconf.AchieveDesc + if req.Tasktype == 2 { + cfg = GetAchieveConfig(taskdesc.Taskid) + if cfg == nil || len(cfg.Reward) < 2 { + resp.Code = 1 + resp.Message = "网络错误" + return errors.New("获取配置失败") + } + } else { + cfg = GetTaskConfig(taskdesc.Taskid) + if cfg == nil || len(cfg.Reward) < 2 { + resp.Code = 1 + resp.Message = "网络错误" + return errors.New("获取配置失败") + } + } + + //将状态置位已领取 + list.Taskdata[index].Taskstatus = 0 + //发奖励 + sub := len(cfg.Reward) / 2 + for i := 0; i < sub; i++ { + rtype := cfg.Reward[i*2] + rnum := cfg.Reward[i*2+1] + r1, r2, r3, r4, r5 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid) + + resp.Data.Rewardgold += r1 + resp.Data.Rewardzuan += r2 + resp.Data.Rewardrose += r3 + resp.Data.Addredbag += r4 + resp.Data.Sumredbag = r5 + } + + return nil +} + +func (uinfo *UserData) CalcAchieveProgress(ttype int) int { + rtval := 0 + switch ttype { + case ACHIEVETYPE_WATCHADDS: + rtval = uinfo.Achieve.WatchAdsCnt + case ACHIEVETYPE_HEQIANG: + rtval = uinfo.Achieve.HeQiang + case ACHIEVETYPE_JIEQIANG: + rtval = uinfo.Achieve.JieQiang + case ACHIEVETYPE_PASSLEVEL: + rtval = uinfo.Achieve.PassLevel + default: + logger.Error("CalcAchieveProgress type wrong ttype=%v", ttype) + } + + return rtval +} + +//成就返回的是新的成就列表 +func (uinfo *UserData) CalcAchieveList(list *TaskList, uniqueid string) *TaskList { + newlist := new(TaskList) + curtype := -1 //记录当前类型 + + //第一遍首先将所有进度设置为正确的状态 + for k, val := range list.Taskdata { + cfg := GetAchieveConfig(val.Taskid) + if cfg == nil { + logger.Error("CalcAchieveList GetTaskConfig failed id=%v", val.Taskid) + continue + } + + list.Taskdata[k].Taskprogress = uinfo.CalcAchieveProgress(cfg.TaskType) + if val.Taskstatus == 1 { + switch cfg.TaskType { + case ACHIEVETYPE_WATCHADDS: + if uinfo.Achieve.WatchAdsCnt >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + case ACHIEVETYPE_HEQIANG: + if uinfo.Achieve.HeQiang >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + case ACHIEVETYPE_JIEQIANG: + if uinfo.Achieve.JieQiang >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + case ACHIEVETYPE_PASSLEVEL: + if uinfo.Achieve.PassLevel >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + default: + logger.Error("CalcAchieveProgress type wrong ttype=%v", cfg.TaskType) + } + } + + } + + for k, val := range list.Taskdata { + + cfg := GetAchieveConfig(val.Taskid) + if cfg == nil { + logger.Error("CalcAchieveList GetTaskConfig failed id=%v", val.Taskid) + continue + } + + if val.Taskstatus == 2 { + //未领取已完成 只需要加入第一种 + if curtype == cfg.TaskType { + continue + } else { + //将类型加入返回列表 + newlist.Taskdata = append(newlist.Taskdata, list.Taskdata[k]) + curtype = cfg.TaskType + } + } else if val.Taskstatus == 1 { + //未完成 返回第一个 + if curtype == cfg.TaskType { + continue + } else { + //将类型加入返回列表 + newlist.Taskdata = append(newlist.Taskdata, list.Taskdata[k]) + curtype = cfg.TaskType + } + } else { + //已领取 需要判断一下是否最后一项 + if k != len(list.Taskdata)-1 { + //不是最后一条数据 + nextcfg := GetAchieveConfig(list.Taskdata[k+1].Taskid) + if nextcfg != nil { + if nextcfg.TaskType != cfg.TaskType { + //下面一天不是此类型了 + newlist.Taskdata = append(newlist.Taskdata, list.Taskdata[k]) + curtype = cfg.TaskType + } + } + + } else { + //最后一条 加入 + newlist.Taskdata = append(newlist.Taskdata, list.Taskdata[k]) + curtype = cfg.TaskType + } + } + + } + + //保存旧的列表 + SaveTaskInfo(uniqueid, 2, list) + + //将返回的列表排序 + sort.Sort(newlist) + logger.Info("CalcAchieveList alist=%v", newlist) + return newlist +} + +func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) { + + for k, val := range list.Taskdata { + //未完成的才做判断 + if val.Taskstatus != 1 { + continue + } + cfg := GetTaskConfig(val.Taskid) + if cfg == nil { + logger.Error("CalcTaskList GetTaskConfig failed id=%v", val.Taskid) + continue + } + + if cfg.TaskType == DAILY_TASKTYPE_ONLINE { + list.Taskdata[k].Taskprogress = uinfo.Task.OnlineMin + if uinfo.Task.OnlineMin >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_HECHENG { + list.Taskdata[k].Taskprogress = uinfo.Task.HeQiang + if uinfo.Task.HeQiang >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_JIEQIANG { + list.Taskdata[k].Taskprogress = uinfo.Task.JieQiang + if uinfo.Task.JieQiang >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_WATCHADS { + list.Taskdata[k].Taskprogress = uinfo.Task.WatchAdCnt + if uinfo.Task.WatchAdCnt >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_GETFLYBOX { + list.Taskdata[k].Taskprogress = uinfo.Task.GetKongBox + if uinfo.Task.GetKongBox >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_TURNTABLE { + list.Taskdata[k].Taskprogress = uinfo.Task.TurnTableCnt + if uinfo.Task.TurnTableCnt >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_SHOPBUY { + list.Taskdata[k].Taskprogress = uinfo.Task.ShopBuyGun + if uinfo.Task.ShopBuyGun >= cfg.Num { + list.Taskdata[k].Taskstatus = 2 + } + } else if cfg.TaskType == DAILY_TASKTYPE_PASSLEVEL { + list.Taskdata[k].Taskprogress = uinfo.Task.PassLevel + if uinfo.Task.PassLevel > 0 { + list.Taskdata[k].Taskstatus = 2 + } + } + + } + + //需要保存到redis + SaveTaskInfo(uniqueid, 1, list) + + //排序 + sort.Sort(list) +} + +func SaveTaskInfo(uuid string, tasktype int, list *TaskList) error { + savestr, err := json.Marshal(list) + if err != nil { + logger.Error("SaveTaskInfo err =%v", err) + return err + } + + if tasktype == 1 { + err = redishandler.GetRedisClient().HSet(redis.USER_TASKINFO_LIST, uuid, string(savestr)) + } else if tasktype == 2 { + err = redishandler.GetRedisClient().HSet(redis.USER_ACHIEVEMENTINFO_LIST, uuid, string(savestr)) + //logger.Info("SaveTaskInfo savestr=%v", string(savestr)) + } else { + logger.Error("tasktype invalid") + return errors.New("tasktype invalid") + } + return err +} + +func GetTaskInfo(uuid int, tasktype int, channel string) (*TaskList, error) { + unqiueuuid := strconv.Itoa(uuid) + channel + var data string + var err error + if tasktype == 1 { + data, err = redishandler.GetRedisClient().HGet(redis.USER_TASKINFO_LIST, unqiueuuid) + //兼容老的数据 + if err != nil { + //没有读到数据 则去读取一下老的id + olddata, err := redishandler.GetRedisClient().HGet(redis.USER_TASKINFO_LIST, strconv.Itoa(uuid)) + if err == nil { + err = redishandler.GetRedisClient().HSet(redis.USER_TASKINFO_LIST, unqiueuuid, olddata) + if err == nil { + //删除老的数据 以后都走新的数据 + err = redishandler.GetRedisClient().HDel(redis.USER_TASKINFO_LIST, strconv.Itoa(uuid)) + logger.Info("GetTaskInfo uuid=%v do set", uuid) + } + data, err = redishandler.GetRedisClient().HGet(redis.USER_TASKINFO_LIST, unqiueuuid) + } + } + } else if tasktype == 2 { + data, err = redishandler.GetRedisClient().HGet(redis.USER_ACHIEVEMENTINFO_LIST, unqiueuuid) + //成就这一块需要兼容老的数据 + if err != nil { + //没有读到数据 则去读取一下老的id + olddata, err := redishandler.GetRedisClient().HGet(redis.USER_ACHIEVEMENTINFO_LIST, strconv.Itoa(uuid)) + if err == nil { + err = redishandler.GetRedisClient().HSet(redis.USER_ACHIEVEMENTINFO_LIST, unqiueuuid, olddata) + if err == nil { + //删除老的数据 以后都走新的数据 + err = redishandler.GetRedisClient().HDel(redis.USER_ACHIEVEMENTINFO_LIST, strconv.Itoa(uuid)) + logger.Info("GetTaskInfo uuid=%v do set", uuid) + } + data, err = redishandler.GetRedisClient().HGet(redis.USER_ACHIEVEMENTINFO_LIST, unqiueuuid) + } + } + } else { + logger.Error("tasktype invalid") + return nil, errors.New("tasktype invalid") + } + + if err != nil { + return nil, err + } + + var list TaskList + err = json.Unmarshal([]byte(data), &list) + if err != nil { + logger.Error("GetTaskInfo err=%v", err) + return nil, err + } + + return &list, err +} + diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index 8896fb5..e8954c3 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -48,6 +48,11 @@ func startServerHttpServe() { http.HandleFunc("/gunshot/uploadtili", Uploadtili) //上报当前体力 http.HandleFunc("/gunshot/fetchredbag", Fetchredbag) //领取红包 + http.HandleFunc("/gunshot/onlinentf", Onlinentf) //在线通知 + http.HandleFunc("/gunshot/updatetaskandachieve", Updatetaskandachieve) //上报任务事件进度 + http.HandleFunc("/gunshot/querytaskinfo", Querytaskinfo) //拉取任务或者成就列表 + http.HandleFunc("/gunshot/gettaskreward", Gettaskreward) //领取任务或者成就奖励 + err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil) @@ -118,6 +123,90 @@ func Uploadtili(w http.ResponseWriter, r *http.Request) { HandlerUploadtili(w, s, Uuid) } +func Onlinentf(w http.ResponseWriter, r *http.Request) { + + Uuid := 0 + if len(r.Header) > 0 { + Uuid, _ = strconv.Atoi(r.Header.Get("Uuid")) + } + + if Uuid == 0 { + SetHeader(w) + //logger.Error("Uuid is nil!") + return + } + result, _ := ioutil.ReadAll(r.Body) + r.Body.Close() + + s := string(result) + logger.Info("Onlinentf , body:%v,uuid=%v", s, Uuid) + + HandlerOnlinentf(w, s, Uuid) +} + +func Updatetaskandachieve(w http.ResponseWriter, r *http.Request) { + + Uuid := 0 + if len(r.Header) > 0 { + Uuid, _ = strconv.Atoi(r.Header.Get("Uuid")) + } + + if Uuid == 0 { + SetHeader(w) + //logger.Error("Uuid is nil!") + return + } + result, _ := ioutil.ReadAll(r.Body) + r.Body.Close() + + s := string(result) + logger.Info("Fetchredbag , body:%v,uuid=%v", s, Uuid) + + HandlerUpdatetaskandachieve(w, s, Uuid) +} + +func Querytaskinfo(w http.ResponseWriter, r *http.Request) { + + Uuid := 0 + if len(r.Header) > 0 { + Uuid, _ = strconv.Atoi(r.Header.Get("Uuid")) + } + + if Uuid == 0 { + SetHeader(w) + //logger.Error("Uuid is nil!") + return + } + result, _ := ioutil.ReadAll(r.Body) + r.Body.Close() + + s := string(result) + logger.Info("Querytaskinfo , body:%v,uuid=%v", s, Uuid) + + HandlerQuerytaskinfo(w, s, Uuid) +} + +func Gettaskreward(w http.ResponseWriter, r *http.Request) { + + Uuid := 0 + if len(r.Header) > 0 { + Uuid, _ = strconv.Atoi(r.Header.Get("Uuid")) + } + + if Uuid == 0 { + SetHeader(w) + //logger.Error("Uuid is nil!") + return + } + result, _ := ioutil.ReadAll(r.Body) + r.Body.Close() + + s := string(result) + logger.Info("Gettaskreward , body:%v,uuid=%v", s, Uuid) + + HandlerGettaskreward(w, s, Uuid) +} + func Fetchredbag(w http.ResponseWriter, r *http.Request) { Uuid := 0 diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 73a26e2..7d15fb5 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -208,6 +208,227 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) { } +func HandlerOnlinentf(w http.ResponseWriter, data string, uuid int) { + SetHeader(w) + var resp OnlinentfResp + resp.Code = 0 + var rdata CommReq + err := json.Unmarshal([]byte(data), &rdata) + for { + + if err != nil { + logger.Info("json decode HandlerOnlinentf data failed:%v,for:%v", err, data) + resp.Message = "json解析错误" + resp.Code = 1 + break + } + //需要加上渠道才是唯一的玩家id，不同渠道视为不同数据 + uniqueuuid := strconv.Itoa(uuid) + rdata.Channel + uinfo, err := GetUserInfo(uniqueuuid) + if err != nil || uinfo == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + uinfo.Task.OnlineMin++ + + SaveUserInfo(uinfo, uniqueuuid) + + resp.Code = 0 + break + } + + //回包 + respstr, _ := json.Marshal(&resp) + fmt.Fprint(w, string(respstr)) + +} + +func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) { + SetHeader(w) + var resp QuerytaskinfoResp + resp.Code = 0 + var rdata QuerytaskinfoReq + err := json.Unmarshal([]byte(data), &rdata) + for { + if err != nil { + logger.Info("json decode HandlerQuerytaskinfo data failed:%v,for:%v", err, data) + resp.Message = "网络错误" + resp.Code = 1 + break + } + //需要加上渠道才是唯一的玩家id，不同渠道视为不同数据 + uniqueuuid := strconv.Itoa(uuid) + rdata.Channel + uinfo, err := GetUserInfo(uniqueuuid) + if err != nil || uinfo == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + uinfo.HandlePassDay(uuid, rdata.Channel) + + //需要先计算出任务或者成就 + var tasklist *TaskList + //先查询一下当前的任务数据 + tasklist, err = GetTaskInfo(uuid, rdata.Tasktype, rdata.Channel) + if err != nil || tasklist == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + if rdata.Tasktype == 1 { + uinfo.CalcTaskList(tasklist, uniqueuuid) + } else if rdata.Tasktype == 2 { + tasklist = uinfo.CalcAchieveList(tasklist, uniqueuuid) + } else { + uinfo.CalcTaskList(tasklist, uniqueuuid) + } + + if tasklist == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + resp.Data.Taskdata = append(resp.Data.Taskdata, tasklist.Taskdata...) + + resp.Code = 0 + break + } + + //回包 + logger.Info("HandlerQuerytaskinfo,uuid=%v resp=%v", uuid, resp) + respstr, _ := json.Marshal(&resp) + fmt.Fprint(w, string(respstr)) + +} + +func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) { + SetHeader(w) + var resp GettaskrewardResp + resp.Code = 0 + var rdata GettaskrewardReq + err := json.Unmarshal([]byte(data), &rdata) + for { + if err != nil { + logger.Info("json decode HandlerGettaskreward data failed:%v,for:%v", err, data) + resp.Message = "网络错误" + resp.Code = 1 + break + } + + //需要加上渠道才是唯一的玩家id，不同渠道视为不同数据 + uniqueuuid := strconv.Itoa(uuid) + rdata.Channel + uinfo, err := GetUserInfo(uniqueuuid) + if err != nil || uinfo == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + //需要先计算出任务或者成就 + var tasklist *TaskList + //先查询一下当前的任务数据 + tasklist, err = GetTaskInfo(uuid, rdata.Tasktype, rdata.Channel) + if err != nil || tasklist == nil { + logger.Error("GetTaskInfo failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + err = uinfo.HandleGetTaskReward(&rdata, &resp, tasklist, uuid) + logger.Info("HandlerGettaskreward tasklist=%v", tasklist) + logger.Info("HandlerGettaskreward uinfo=%v", uinfo) + if err != nil { + logger.Error("HandleGetTaskReward failed err=%v", err) + resp.Message = "奖励已经领取" + resp.Code = 1 + break + } + + //保存数据 + err = SaveUserInfo(uinfo, uniqueuuid) + err = SaveTaskInfo(uniqueuuid, rdata.Tasktype, tasklist) + + resp.Code = 0 + break + } + + //回包 + respstr, _ := json.Marshal(&resp) + fmt.Fprint(w, string(respstr)) + +} + +func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { + SetHeader(w) + llock.Lock() + defer llock.Unlock() + var resp UpdatetaskResp + resp.Code = 0 + var rdata UpdatetaskReq + err := json.Unmarshal([]byte(data), &rdata) + for { + + if err != nil { + logger.Info("json decode HandlerUpdatetaskandachieve data failed:%v,for:%v", err, data) + resp.Message = "json解析错误" + resp.Code = 1 + break + } + //需要加上渠道才是唯一的玩家id，不同渠道视为不同数据 + uniqueuuid := strconv.Itoa(uuid) + rdata.Channel + uinfo, err := GetUserInfo(uniqueuuid) + if err != nil || uinfo == nil { + logger.Error("redis failed err=%v", err) + resp.Message = "服务器错误" + resp.Code = 1 + break + } + + switch rdata.Tasktype { + case TASKTYPE_HEQIANG: + uinfo.Task.HeQiang += rdata.Value + uinfo.Achieve.HeQiang += rdata.Value + case TASKTYPE_JIEQIANG: + uinfo.Task.JieQiang += rdata.Value + uinfo.Achieve.JieQiang += rdata.Value + case TASKTYPE_WATCHADS: + uinfo.Task.WatchAdCnt += rdata.Value + uinfo.Achieve.WatchAdsCnt += rdata.Value + case TASKTYPE_GETFLYBOX: + uinfo.Task.GetKongBox += rdata.Value + case TASKTYPE_TURNTABLE: + uinfo.Task.TurnTableCnt += rdata.Value + case TASKTYPE_SHOPBUY: + uinfo.Task.ShopBuyGun += rdata.Value + case TASKTYPE_PASSLEVEL: + uinfo.Task.PassLevel += rdata.Value + uinfo.Achieve.PassLevel += rdata.Value + default: + logger.Error("HandlerUpdatetaskandachieve type failed") + } + logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) + SaveUserInfo(uinfo, uniqueuuid) + resp.Code = 0 + break + } + + //回包 + respstr, _ := json.Marshal(&resp) + fmt.Fprint(w, string(respstr)) + +} + func HandlerUploadtili(w http.ResponseWriter, data string, uuid int) { SetHeader(w) llock.Lock() @@ -666,7 +887,15 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { u.GetCashCnt = 0 u.RandNum = RANDNUMLIMIT - + //任务数据重置 + u.Task.PassLevel = 0 + u.Task.ShopBuyGun = 0 + u.Task.TurnTableCnt = 0 + u.Task.GetKongBox = 0 + u.Task.JieQiang = 0 + u.Task.HeQiang = 0 + u.Task.WatchAdCnt = 0 + u.Task.OnlineMin = 0 //签到数据处理 u.IsSignToday = 0 diff --git a/src/common/redis/def.go b/src/common/redis/def.go index 7a3d576..9164ad6 100644 --- a/src/common/redis/def.go +++ b/src/common/redis/def.go @@ -2,5 +2,6 @@ package redis const ( USER_DATA_KEY = "BRAINHOLE_USER_DATA_KEY" //玩家数据 - + USER_TASKINFO_LIST = "STARSTAR_USER_TASKINFO_LIST" //任务列表数据缓存 + USER_ACHIEVEMENTINFO_LIST = "STARSTAR_USER_ACHIEVEMENTINFO_LIST" //成就列表数据缓存 ) -- libgit2 0.21.0