From 52b75ba114317d1c6d46558e9e47f0f0fedfc8e1 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 21 Nov 2022 20:04:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E9=A2=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/v2/ui/views/task_activelist.go | 7 +++--- modules/task/api_activereceive.go | 36 +++++++++++++----------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/cmd/v2/ui/views/task_activelist.go b/cmd/v2/ui/views/task_activelist.go index 570a531c7..3c0354757 100644 --- a/cmd/v2/ui/views/task_activelist.go +++ b/cmd/v2/ui/views/task_activelist.go @@ -50,13 +50,14 @@ func (this *TaskActiveListView) CreateView(t *model.TestCase) fyne.CanvasObject //receive button receiveBtn := widget.NewButtonWithIcon("领取", theme.ConfirmIcon(), func() { - if len(this.itemList.SelItemIds) != 1 { + selItemId := this.itemList.SelItemId + if selItemId == "" { dialog.ShowError(errors.New("请选择一项"), this.w) return } if err := service.GetPttService().SendToClient( t.MainType, "activereceive", - &pb.TaskActiveReceiveReq{Id: this.itemList.SelItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil { + &pb.TaskActiveReceiveReq{Id: selItemId, TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil { logrus.Error(err) return } @@ -94,7 +95,7 @@ func (this *TaskActiveListView) dataListener() { for _, v := range rsp.List { item := common.Item{ Id: cast.ToString(v.Id), - Text: fmt.Sprintf("%s R:%d", cast.ToString(v.RId), v.Received), + Text: fmt.Sprintf("任务ID:%s 领取状态:%d", cast.ToString(v.RId), v.Received), } this.itemList.AddItem(item) } diff --git a/modules/task/api_activereceive.go b/modules/task/api_activereceive.go index 0b63ce9aa..499d0d94c 100644 --- a/modules/task/api_activereceive.go +++ b/modules/task/api_activereceive.go @@ -36,7 +36,16 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive // code = pb.ErrorCode_TaskReceived // return // } + ue, err := this.moduleTask.ModuleUser.GetUserExpand(uid) + if err != nil { + code = pb.ErrorCode_DBError + return + } + if ue == nil { + code = pb.ErrorCode_UserExpandNull + return + } var rewards []*cfg.Gameatn // 玩家的 activeList := this.moduleTask.modelTaskActive.getActiveListByTag(uid, comm.TaskTag(req.TaskTag)) @@ -49,33 +58,18 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive } // get user expand - ue, err := this.moduleTask.ModuleUser.GetUserExpand(uid) - if err != nil { - code = pb.ErrorCode_DBError - return - } - - if ue == nil { - code = pb.ErrorCode_UserExpandNull - return - } update := make(map[string]interface{}) if req.TaskTag == int32(comm.TASK_DAILY) { - if ue.Activeday >= conf.Active { - update["received"] = 1 - } else { - code = pb.ErrorCode_TaskActiveNoenough - return + if ue.Activeday < conf.Active { + continue } } else if req.TaskTag == int32(comm.TASK_WEEKLY) { - if ue.Activeweek >= conf.Active { - update["received"] = 1 - } else { - code = pb.ErrorCode_TaskActiveNoenough - return + if ue.Activeweek < conf.Active { + continue } } + update["received"] = 1 if len(update) > 0 { if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(), v.Id, @@ -102,7 +96,7 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive Id: req.Id, } - err := session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, resp) + err = session.SendMsg(string(this.moduleTask.GetType()), TaskSubTypeActiveReceive, resp) if err != nil { code = pb.ErrorCode_SystemError } From 657701c82fe8700726ebe04b242d174d2193102c Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 22 Nov 2022 09:38:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 210 ++++++++++++++++++++++++------------- modules/rtask/module.go | 2 +- modules/user/api_create.go | 2 +- modules/user/model_user.go | 1 - 4 files changed, 141 insertions(+), 74 deletions(-) diff --git a/comm/const.go b/comm/const.go index a35854fcf..4a7d6b1cf 100644 --- a/comm/const.go +++ b/comm/const.go @@ -359,77 +359,145 @@ const ( // 随机任务类型 const ( - Rtype1 TaskType = 1 //英雄指定 - Rtype2 TaskType = 2 //主线之内触发了剧情Id - Rtype3 TaskType = 3 //每日任务 - Rtype4 TaskType = 4 //指定英雄的等级限制 - Rtype5 TaskType = 5 //指定英雄的装备数量 - Rtype6 TaskType = 6 //指定英雄的星级 - Rtype7 TaskType = 7 //日常登录一次 - Rtype8 TaskType = 8 //累计登陆xx天 - Rtype9 TaskType = 9 //连续登陆xx天 - Rtype10 TaskType = 10 //拥有xx个好友 - Rtype11 TaskType = 11 //赠送X次友情点 - Rtype12 TaskType = 12 //使用好友助战英雄xx次 - Rtype13 TaskType = 13 //更换X次助战英雄 - Rtype14 TaskType = 14 //累计xx次普通招募 - Rtype15 TaskType = 15 //累计xx次阵营招募 - Rtype16 TaskType = 16 //招募获得xx品质英雄xx个 - Rtype17 TaskType = 17 //普通招募十连，获得xx个以上xx星英雄 - Rtype18 TaskType = 18 //xx次普通招募 - Rtype19 TaskType = 19 //xx次阵营招募 - Rtype20 TaskType = 20 //用户等级达到xx级 - Rtype21 TaskType = 21 //英雄合成xx次 - Rtype22 TaskType = 22 //合成xx英雄 - Rtype23 TaskType = 23 //拥有xx个xx星级的xx等级英雄 - Rtype24 TaskType = 24 //为任意英雄提升xx次等级 - Rtype25 TaskType = 25 //xx名xx英雄升至xx星 - Rtype26 TaskType = 26 //xx名英雄从三星升四星 - Rtype27 TaskType = 27 //xx名英雄从四星升五星 - Rtype28 TaskType = 28 //xx名英雄从五星升六星 - Rtype29 TaskType = 29 //拥有xx个xx级及以上的【xx】英雄 - Rtype30 TaskType = 30 //获得xx个品质为xx的英雄 - Rtype31 TaskType = 31 //获得xx个品质为xx以上的英雄 - Rtype32 TaskType = 32 //xx个品质为xx的英雄升到xx级 - Rtype33 TaskType = 33 //xx个品质为xx以及以上英雄升到xx级 - Rtype34 TaskType = 34 //xx个英雄觉醒达到xx阶段 - Rtype35 TaskType = 35 //xx英雄觉醒达到xx阶段 - Rtype36 TaskType = 36 //xx位xx品质xx职业英雄（xx阵营）觉醒达到xx阶段 - Rtype37 TaskType = 37 //xx名xx品质英雄满共鸣、等级、觉醒 - Rtype38 TaskType = 38 //xx英雄满级、共鸣、觉醒至最高状态 - Rtype39 TaskType = 39 //累计英雄共鸣xx次 - Rtype40 TaskType = 40 //xx个英雄共鸣满xx次 - Rtype41 TaskType = 41 //xx名英雄穿戴xx件xx星级的装备 - Rtype42 TaskType = 42 //xx名英雄穿戴xx件xx等级的装备 - Rtype43 TaskType = 43 //将xx件装备强化至xx级 - Rtype44 TaskType = 44 //任意装备强化到xx级 - Rtype45 TaskType = 45 //将xx件xx星【xx】套装装备强化至xx级 - Rtype46 TaskType = 46 //为xx名英雄穿戴完整xx星【xx】套装装备 - Rtype47 TaskType = 47 //累计强化装备成功xx次 - Rtype48 TaskType = 48 //xx次xx星的二件套装备强化至xx并穿戴 - Rtype49 TaskType = 49 //xx次xx星的四件套装备强化至xx并穿戴 - Rtype50 TaskType = 50 //获得xx星以上装备xx件 - Rtype51 TaskType = 51 //在铁匠铺中获得xx件xx星装备 - Rtype52 TaskType = 52 //xx英雄提升xx次技能等级 - Rtype53 TaskType = 53 //技能升级累计xx次 - Rtype54 TaskType = 54 //x名卡牌角色技能全满级 - Rtype55 TaskType = 55 //xx品质英雄提升xx次技能等级 - Rtype56 TaskType = 56 //拥有xx名技能升级xx次的xx职业英雄 - Rtype57 TaskType = 57 //xx名英雄技能满级 - Rtype58 TaskType = 58 //通关任意普通爬塔层数 - Rtype59 TaskType = 59 //通关普通爬塔xx层 - Rtype60 TaskType = 60 //任意主线副本通关1次 - Rtype61 TaskType = 61 //通关主线关卡xx - Rtype62 TaskType = 62 //世界聊天发言xx次 - Rtype63 TaskType = 63 //日常任务活跃度达到xx - Rtype64 TaskType = 64 //任意商品购买xx次 - Rtype65 TaskType = 65 //在商店购买xx商品xx件 - Rtype66 TaskType = 66 //xx商店购买任意商品xx次 - Rtype67 TaskType = 67 //商店购物消耗xx货币xx个 - Rtype68 TaskType = 68 //任意渠道消耗xx金币 - Rtype69 TaskType = 69 //与其他玩家切磋xx次 - Rtype70 TaskType = 70 //通关世界任务XX关卡 - Rtype71 TaskType = 71 //完成一次捏人 + Rtype1 TaskType = 1 //英雄指定 + Rtype2 TaskType = 2 //主线之内触发了剧情Id + Rtype3 TaskType = 3 //每日任务 + Rtype4 TaskType = 4 //指定英雄的等级限制 + Rtype5 TaskType = 5 //指定英雄的装备数量 + Rtype6 TaskType = 6 //指定英雄的星级 + Rtype7 TaskType = 7 //日常登录一次 + Rtype8 TaskType = 8 //累计登陆xx天 + Rtype9 TaskType = 9 //连续登陆xx天 + Rtype10 TaskType = 10 //拥有xx个好友 + Rtype11 TaskType = 11 //赠送X次友情点 + Rtype12 TaskType = 12 //使用好友助战英雄xx次 + Rtype13 TaskType = 13 //更换X次助战英雄 + Rtype14 TaskType = 14 //累计xx次普通招募 + Rtype15 TaskType = 15 //累计xx次阵营招募 + Rtype16 TaskType = 16 //招募获得xx品质英雄xx个 + Rtype17 TaskType = 17 //普通招募十连，获得xx个以上xx星英雄 + Rtype18 TaskType = 18 //xx次普通招募 + Rtype19 TaskType = 19 //xx次阵营招募 + Rtype20 TaskType = 20 //用户等级达到xx级 + Rtype21 TaskType = 21 //英雄合成xx次 + Rtype22 TaskType = 22 //合成xx英雄 + Rtype23 TaskType = 23 //拥有xx个xx星级的xx等级英雄 + Rtype24 TaskType = 24 //为任意英雄提升xx次等级 + Rtype25 TaskType = 25 //xx名xx英雄升至xx星 + Rtype26 TaskType = 26 //xx名英雄从三星升四星 + Rtype27 TaskType = 27 //xx名英雄从四星升五星 + Rtype28 TaskType = 28 //xx名英雄从五星升六星 + Rtype29 TaskType = 29 //拥有xx个xx级及以上的【xx】英雄 + Rtype30 TaskType = 30 //获得xx个品质为xx的英雄 + Rtype31 TaskType = 31 //获得xx个品质为xx以上的英雄 + Rtype32 TaskType = 32 //xx个品质为xx的英雄升到xx级 + Rtype33 TaskType = 33 //xx个品质为xx以及以上英雄升到xx级 + Rtype34 TaskType = 34 //xx个英雄觉醒达到xx阶段 + Rtype35 TaskType = 35 //xx英雄觉醒达到xx阶段 + Rtype36 TaskType = 36 //xx位xx品质xx职业英雄（xx阵营）觉醒达到xx阶段 + Rtype37 TaskType = 37 //xx名xx品质英雄满共鸣、等级、觉醒 + Rtype38 TaskType = 38 //xx英雄满级、共鸣、觉醒至最高状态 + Rtype39 TaskType = 39 //累计英雄共鸣xx次 + Rtype40 TaskType = 40 //xx个英雄共鸣满xx次 + Rtype41 TaskType = 41 //xx名英雄穿戴xx件xx星级的装备 + Rtype42 TaskType = 42 //xx名英雄穿戴xx件xx等级的装备 + Rtype43 TaskType = 43 //将xx件装备强化至xx级 + Rtype44 TaskType = 44 //任意装备强化到xx级 + Rtype45 TaskType = 45 //将xx件xx星【xx】套装装备强化至xx级 + Rtype46 TaskType = 46 //为xx名英雄穿戴完整xx星【xx】套装装备 + Rtype47 TaskType = 47 //累计强化装备成功xx次 + Rtype48 TaskType = 48 //xx次xx星的二件套装备强化至xx并穿戴 + Rtype49 TaskType = 49 //xx次xx星的四件套装备强化至xx并穿戴 + Rtype50 TaskType = 50 //获得xx星以上装备xx件 + Rtype51 TaskType = 51 //在铁匠铺中获得xx件xx星装备 + Rtype52 TaskType = 52 //xx英雄提升xx次技能等级 + Rtype53 TaskType = 53 //技能升级累计xx次 + Rtype54 TaskType = 54 //x名卡牌角色技能全满级 + Rtype55 TaskType = 55 //xx品质英雄提升xx次技能等级 + Rtype56 TaskType = 56 //拥有xx名技能升级xx次的xx职业英雄 + Rtype57 TaskType = 57 //xx名英雄技能满级 + Rtype58 TaskType = 58 //通关任意普通爬塔层数 + Rtype59 TaskType = 59 //通关普通爬塔xx层 + Rtype60 TaskType = 60 //任意主线副本通关1次 + Rtype61 TaskType = 61 //通关主线关卡xx + Rtype62 TaskType = 62 //世界聊天发言xx次 + Rtype63 TaskType = 63 //日常任务活跃度达到xx + Rtype64 TaskType = 64 //任意商品购买xx次 + Rtype65 TaskType = 65 //在商店购买xx商品xx件 + Rtype66 TaskType = 66 //xx商店购买任意商品xx次 + Rtype67 TaskType = 67 //商店购物消耗xx货币xx个 + Rtype68 TaskType = 68 //任意渠道消耗xx金币 + Rtype69 TaskType = 69 //与其他玩家切磋xx次 + Rtype70 TaskType = 70 //通关世界任务XX关卡 + Rtype72 TaskType = 72 //完成一次捏人 + Rtype73 TaskType = 73 //通关难度A维京远征指定BOSSN次（从接到任务开始，只有通关A难度进度才+1） + Rtype74 TaskType = 74 //通关难度A维京远征指定BOSS（检查最高难度记录是否超过了此难度，超过则完成） + Rtype75 TaskType = 75 //自动战斗通关难度A的维京远征指定BOSS（从接到任务开始，若全程无手动操作（不包含变速）且挑战难度大于等于A则判断任务完成） + Rtype76 TaskType = 76 //通关维京远征指定BOSSN次(从创号开始记录，通关任意难度进度都+1) + Rtype77 TaskType = 77 //通关难度A及以上维京远征指定BOSSN次(从接到任务开始，若通关难度大于等于设定难度，则进度+1) + Rtype78 TaskType = 78 //通关难度A维京远征指定BOSS时间达到XX秒以内(检查最高记录是否超过了此难度，超过则完成) + Rtype79 TaskType = 79 //使用好友助战英雄通关A难度的指定维京远征BOSS(从接到任务开始，通关阵营中包含好友助战英雄，难度大于等于A的指定维京远征BOSS时任务完成。) + Rtype80 TaskType = 80 //通关难度A指定狩猎BOOS难度N次(从接到任务开始，只有通关A难度进度才+1) + Rtype81 TaskType = 81 //通关A难度狩猎BOOS(检查最高难度记录是否达到了此难度，达到则完成) + Rtype82 TaskType = 82 //通关狩猎指定BOOSN次（历史）(从创号开始记录登陆天数，通关任意难度进度都+1) + Rtype83 TaskType = 83 //通关难度A及以上指定狩猎BOOSN次(从接到任务开始，若通关难度大于等于设定难度，则进度+1) + Rtype84 TaskType = 84 //普通塔达到XX层(检查最高难度记录是否达到了此难度，达到则完成) + Rtype85 TaskType = 85 //赛季塔达到XX层(检查最高难度记录是否达到了此难度，达到则完成) + Rtype86 TaskType = 86 //本赛季的赛季塔达到XX层(检查本赛季最高难度记录是否达到了此难度，达到则完成) + Rtype87 TaskType = 87 //发现月之秘境N次(从接到任务开始，发现一次则进度+1) + Rtype88 TaskType = 88 //完成月之秘境N次(从接到任务开始，打完一个月之秘境则进度+1（耗尽BOSS挑战次数）) + Rtype89 TaskType = 89 //任意招募N次(从接到任务开始，普通招募和阵营招募都算，单抽1次，10连抽算10次) + Rtype90 TaskType = 90 //进行N次普通招募10连抽(从接到任务开始，单抽点10次不算，10连抽才进度+1) + Rtype91 TaskType = 91 //进行N次阵营招募10连抽(从接到任务开始，单抽点10次不算，10连抽才进度+1) + Rtype92 TaskType = 92 //强化装备N次(从接到任务开始，强化任意装备，失败和成功进度都+1) + Rtype93 TaskType = 93 //拥有一套强化到N级的A套装(记录A套装中每个部位的最高强化等级，并将这些强化等级中最低的数值计入进度，如果达到了任务所需的强化等级则完成任务。) + Rtype94 TaskType = 94 //装备附魔N次（历史）(从创号开始记录，附魔成功进度+1) + Rtype95 TaskType = 95 //装备洗练N次（历史）(从创号开始记录，洗练成功进度+1) + Rtype96 TaskType = 96 //强化失败N次(从接到任务开始，强化失败进度+1) + Rtype97 TaskType = 97 //获得X星X套装的装备N件（时段）(从接到任务开始，每获得1件X星X套装的装备则进度+1) + Rtype98 TaskType = 98 //穿戴N套强化A级的装备(打开任务时，检查英雄身上的装备的最低等级，当最低等级超过A则任务进度+1。) + Rtype99 TaskType = 99 //获得N个初始属性大于等于A条的B星装备(从接到任务开始，每次获得强化为0级的A星装备时判断属性条目，大于或等于B进度+1) + Rtype100 TaskType = 100 //职业武器强化成功N次（历史）(从创号开始记录，强化成功进度+1) + Rtype101 TaskType = 101 //获得X星职业武器N件（历史）(从创号开始记录，每获得1件X星职业武器则进度+1) + Rtype102 TaskType = 102 //阵营饰品强化成功N次（历史）(从创号开始记录，强化成功进度+1) + Rtype103 TaskType = 103 //获得X星阵营饰品N件（历史）(从创号开始记录，每获得1件X星阵营饰品则进度+1) + Rtype104 TaskType = 104 //消费N个钻石（历史）(从创号开始记录，每次消耗钻石增加消耗额的进度) + Rtype105 TaskType = 105 //商店刷新N次(从接到任务开始，每次刷新商店进度+1) + Rtype106 TaskType = 106 //跨服聊天发言N次(从接到任务开始，每次跨服发言成功进度+1) + Rtype107 TaskType = 107 //赠送N个人好感度(从接到任务开始，每赠送1个好友好感度则进度+1) + Rtype108 TaskType = 108 //助战英雄被使用X次(从接到任务开始，每被使用1次则进度+1) + Rtype109 TaskType = 109 //加入公会(打开任务时，检查是否加入了公会，加入则完成) + Rtype110 TaskType = 110 //激活X个英雄图鉴(打开任务时，检查英雄图鉴激活数量并计入进度，达到了任务所需个数则完成任务。) + Rtype111 TaskType = 111 //拥有N个X级英雄(打开任务时，检查达到X级的英雄数量，达到任务所需个数则完成任务，) + Rtype112 TaskType = 112 //养成N个X级英雄(从接到任务开始，英雄升级时，如果英雄的初始等级 Date: Tue, 22 Nov 2022 10:43:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=81=93=E5=85=B7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_item.json | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 50065ebe9..923d42f20 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -349,11 +349,11 @@ "key": "itemname_10009", "text": "被封印的魔法书" }, - "usetype": 3, + "usetype": 9, "color": 1, "bagtype": 1, "index": 9, - "special_type": 0, + "special_type": 5, "time": 0, "effects": "", "box_id": 0, @@ -392,11 +392,11 @@ "key": "itemname_10010", "text": "古代硬币" }, - "usetype": 3, + "usetype": 9, "color": 1, "bagtype": 1, "index": 10, - "special_type": 0, + "special_type": 5, "time": 0, "effects": "", "box_id": 0, @@ -435,11 +435,11 @@ "key": "itemname_10011", "text": "坏掉的钟表" }, - "usetype": 3, + "usetype": 9, "color": 2, "bagtype": 1, "index": 11, - "special_type": 0, + "special_type": 10, "time": 0, "effects": "", "box_id": 0, @@ -478,11 +478,11 @@ "key": "itemname_10012", "text": "木材" }, - "usetype": 3, + "usetype": 9, "color": 2, "bagtype": 1, "index": 12, - "special_type": 0, + "special_type": 10, "time": 0, "effects": "", "box_id": 0, @@ -521,11 +521,11 @@ "key": "itemname_10013", "text": "四叶草" }, - "usetype": 3, + "usetype": 9, "color": 3, "bagtype": 1, "index": 13, - "special_type": 0, + "special_type": 20, "time": 0, "effects": "", "box_id": 0, @@ -564,11 +564,11 @@ "key": "itemname_10014", "text": "冒险家勋章" }, - "usetype": 3, + "usetype": 9, "color": 4, "bagtype": 1, "index": 14, - "special_type": 0, + "special_type": 50, "time": 0, "effects": "", "box_id": 0, @@ -607,11 +607,11 @@ "key": "itemname_10015", "text": "猫猫护身符" }, - "usetype": 3, + "usetype": 9, "color": 5, "bagtype": 1, "index": 15, - "special_type": 0, + "special_type": 100, "time": 0, "effects": "", "box_id": 0, @@ -650,11 +650,11 @@ "key": "itemname_10016", "text": "人造钻石" }, - "usetype": 3, + "usetype": 9, "color": 6, "bagtype": 1, "index": 16, - "special_type": 0, + "special_type": 200, "time": 0, "effects": "", "box_id": 0, @@ -977,7 +977,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1026,7 +1026,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1075,7 +1075,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1124,7 +1124,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1173,7 +1173,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1222,7 +1222,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1271,7 +1271,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1320,7 +1320,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1369,7 +1369,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1412,7 +1412,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1455,7 +1455,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, @@ -1498,7 +1498,7 @@ 109 ], "use_skip": 109, - "upper_limit": 999, + "upper_limit": -1, "uselv": 0, "isani": 0, "star": 0, From bd702168b2867f92fd9f0a8d29f69414a7273d77 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 22 Nov 2022 11:00:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=89=E9=86=92?= =?UTF-8?q?=E6=9D=90=E6=96=99=E5=90=88=E6=88=90=E6=B6=88=E8=80=97=E9=87=91?= =?UTF-8?q?=E5=B8=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/chat/module.go | 5 +++-- modules/items/api_useItem.go | 2 +- modules/moonfantasy/modelDream.go | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/chat/module.go b/modules/chat/module.go index 376d72919..c6f7010f9 100644 --- a/modules/chat/module.go +++ b/modules/chat/module.go @@ -11,6 +11,7 @@ import ( "go_dreamfactory/lego/utils/codec/json" "go_dreamfactory/modules" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" "time" "google.golang.org/protobuf/types/known/anypb" @@ -82,7 +83,7 @@ func (this *Chat) OnInstallComp() { //Event------------------------------------------------------------------------------------------------------------ func (this *Chat) EventUserOffline(session comm.IUserSession) { if err := this.modelChat.removeCrossChannelMember(session); err != nil { - this.Debug("EventUserOffline:", log.Fields{ "uid": session.GetUserId(),"err":err.Error()}) + this.Debug("EventUserOffline:", log.Fields{"uid": session.GetUserId(), "err": err.Error()}) } } @@ -226,7 +227,7 @@ func (this *Chat) SendSysChatToWorld(ctype comm.ChatSystemType, appenddata inter Channel: pb.ChatChannel_System, Ctype: pb.ChatType_Text, Stag: this.service.GetTag(), - Ctime: time.Now().Unix(), + Ctime: configure.Now().Unix(), Content: fmt.Sprintf(st.Text, agrs...), Display: st.Display, } diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 5ae37100c..ac65ed1bb 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -139,7 +139,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) N: v.N * int32(req.Amount), }) } - if code = this.module.ConsumeRes(session, itemcf.SynthetizeDeplete, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, sale, true); code != pb.ErrorCode_Success { return } diff --git a/modules/moonfantasy/modelDream.go b/modules/moonfantasy/modelDream.go index 23cbf44ed..370ad77ee 100644 --- a/modules/moonfantasy/modelDream.go +++ b/modules/moonfantasy/modelDream.go @@ -127,6 +127,7 @@ func (this *modelDreamComp) trigger(session comm.IUserSession) { Avatar: user.Avatar, Uname: user.Name, Slv: user.Lv, + Ctime: configure.Now().Unix(), Stag: session.GetServiecTag(), Content: mdata.Monster, AppendStr: mdata.Id,