From a19f0a39f4314250f34ee6ba932b507c8e7d4888 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 18 Aug 2023 11:09:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/user/api_login.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 4fe0e6c0e..df8c76e44 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -31,6 +31,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err err error user *pb.DBUser lastLoginTime int64 + tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) rsp := &pb.UserLoginResp{} @@ -105,7 +106,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err // 在logintime更新前判断是否是昨天 if utils.IsYestoday(user.Logintime) { - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype9, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype9, 1)) } else { this.module.ModuleBuried.ResetBuriedByType(user.Uid, comm.Rtype9) } @@ -133,7 +134,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err if this.module.modelUser.isLoginFirst(lastLoginTime) { this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix()))) - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype8, 1)) this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime) // 清理点赞 this.module.ModuleFriend.ResetFriend(user.Uid) @@ -160,18 +161,23 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err } else { //新号 rsp.Ex = &pb.DBUserExpand{} this.module.modelSign.UserSign(session) - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype8, 1)) } this.module.ModuleHero.CheckPeachReward(session, user.Ctime) this.module.RecoverUserPsStart(user.Uid) // 日常登录任务 - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype7, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype7, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype230, 1, int32(configure.Now().Weekday()))) this.module.ModulePrivilege.CheckDailyPrivilegeMail(session) rsp.Data = user rsp.TimeNow = configure.Now().Unix() // 设置服务器时间 session.SendMsg(string(this.module.GetType()), UserSubTypeLogin, rsp) + if len(tasks) > 0 { + go this.module.ModuleBuried.TriggerBuried(session.Clone(), tasks...) + } + event.TriggerEvent(comm.EventUserLogin, session.Clone()) return } From bdb25921b14663a93d83a3a8708d780f3b2f7ce1 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Fri, 18 Aug 2023 11:19:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 2 +- bin/json/game_initial.json | 10 + bin/json/game_mainstage.json | 454 ++++++++++----------------------- 3 files changed, 142 insertions(+), 324 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index c8dd02b04..66d5c6044 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -20826,7 +20826,7 @@ "NPC": 10104, "value": 1, "filter": [ - 1100108 + 1100124 ], "filter2": [ "关卡ID", diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 927914845..46458086d 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -28,5 +28,15 @@ "n": 1 } ] + }, + { + "index": "356", + "var": [ + { + "a": "mts", + "t": "20030001", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 1519a607d..c18faec8b 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -8199,67 +8199,19 @@ "text": "对方人数众多落于下风，悍娇虎及时现身相助，但大龙却不知去向......" }, "exp": 0, - "hero_exp": 330, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - }, - { - "a": "equi", - "t": "11114", - "n": 1 - } - ], - "lotteryward": 17111110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - }, - { - "a": "equi", - "t": "11124", - "n": 1 - } - ], - "BattleReadyID": 119, - "FormatList": [ - 102051 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -8310,67 +8262,19 @@ "text": "大龙终于拿到了心心念念的气功卷轴，只是他的功夫怎么恢复了？" }, "exp": 0, - "hero_exp": 330, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - }, - { - "a": "equi", - "t": "11115", - "n": 1 - } - ], - "lotteryward": 17111110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - }, - { - "a": "equi", - "t": "11125", - "n": 1 - } - ], - "BattleReadyID": 119, - "FormatList": [ - 1000 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -8421,67 +8325,19 @@ "text": "就在和大龙对峙的时候，突然出现一道神秘的强大力量......" }, "exp": 0, - "hero_exp": 330, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - }, - { - "a": "equi", - "t": "11114", - "n": 1 - } - ], - "lotteryward": 17111110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6600 - }, - { - "a": "equi", - "t": "11124", - "n": 1 - } - ], - "BattleReadyID": 119, - "FormatList": [ - 1000 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -8574,7 +8430,7 @@ ], "BattleReadyID": 119, "FormatList": [ - 102081 + 102051 ], "helphero": [], "banhero": [], @@ -8685,7 +8541,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 123011 + 102061 ], "helphero": [], "banhero": [], @@ -8796,7 +8652,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 103021 + 102071 ], "helphero": [], "banhero": [], @@ -8907,7 +8763,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 103031 + 102081 ], "helphero": [], "banhero": [], @@ -8947,7 +8803,7 @@ "venturetype": 0, "ventureavatar": [], "herocolor": 0, - "heroimg": "", + "heroimg": "zxgq_qp_icon_gth", "bubbletext": { "key": "", "text": "" @@ -8976,67 +8832,19 @@ "text": "刚解除误会，就遇到了闻讯而来的警长。" }, "exp": 0, - "hero_exp": 360, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 7200 - }, - { - "a": "equi", - "t": "11013", - "n": 1 - } - ], - "lotteryward": 17111010, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 7200 - }, - { - "a": "equi", - "t": "11023", - "n": 1 - } - ], - "BattleReadyID": 116, - "FormatList": [ - 103041 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -9044,7 +8852,7 @@ "chapterid": 11003, "group_id": 100301, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9129,7 +8937,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 103051 + 102011 ], "helphero": [], "banhero": [], @@ -9155,7 +8963,7 @@ "chapterid": 11003, "group_id": 100302, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9240,7 +9048,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 2000 + 102011 ], "helphero": [], "banhero": [], @@ -9266,7 +9074,7 @@ "chapterid": 11003, "group_id": 100303, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9351,7 +9159,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 2000 + 102011 ], "helphero": [], "banhero": [], @@ -9377,7 +9185,7 @@ "chapterid": 11004, "group_id": 100304, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9462,7 +9270,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 103081 + 102011 ], "helphero": [], "banhero": [], @@ -9488,7 +9296,7 @@ "chapterid": 11004, "group_id": 100305, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9573,7 +9381,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 124011 + 102011 ], "helphero": [], "banhero": [], @@ -9599,7 +9407,7 @@ "chapterid": 11004, "group_id": 100306, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9684,7 +9492,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 104021 + 102011 ], "helphero": [], "banhero": [], @@ -9710,7 +9518,7 @@ "chapterid": 11004, "group_id": 100307, "previous_group_id": [ - 100212 + 100213 ], "previoustage": 0, "Episodetype": 1, @@ -9795,7 +9603,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 104031 + 102011 ], "helphero": [], "banhero": [], @@ -9904,7 +9712,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 104041 + 102011 ], "helphero": [], "banhero": [], @@ -10013,7 +9821,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 104051 + 102011 ], "helphero": [], "banhero": [], @@ -10122,7 +9930,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 3000 + 102011 ], "helphero": [], "banhero": [], @@ -10231,7 +10039,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 3000 + 102011 ], "helphero": [], "banhero": [], @@ -10340,7 +10148,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 104081 + 102011 ], "helphero": [], "banhero": [], @@ -10449,7 +10257,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 125011 + 102011 ], "helphero": [], "banhero": [], @@ -10558,7 +10366,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 105021 + 102011 ], "helphero": [], "banhero": [], @@ -10667,7 +10475,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 105031 + 102011 ], "helphero": [], "banhero": [], @@ -10776,7 +10584,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 105041 + 102011 ], "helphero": [], "banhero": [], @@ -10885,7 +10693,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 105051 + 102011 ], "helphero": [], "banhero": [], @@ -10994,7 +10802,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 4000 + 102011 ], "helphero": [], "banhero": [], @@ -11103,7 +10911,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 4000 + 102011 ], "helphero": [], "banhero": [], @@ -11212,7 +11020,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 105081 + 102011 ], "helphero": [], "banhero": [], @@ -11321,7 +11129,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 126011 + 102011 ], "helphero": [], "banhero": [], @@ -11430,7 +11238,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 106021 + 102011 ], "helphero": [], "banhero": [], @@ -11539,7 +11347,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 106031 + 102011 ], "helphero": [], "banhero": [], @@ -11648,7 +11456,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 106041 + 102011 ], "helphero": [], "banhero": [], @@ -11757,7 +11565,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 106051 + 102011 ], "helphero": [], "banhero": [], @@ -11866,7 +11674,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 5000 + 102011 ], "helphero": [], "banhero": [], @@ -11975,7 +11783,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 5000 + 102011 ], "helphero": [], "banhero": [], @@ -12084,7 +11892,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 106081 + 102011 ], "helphero": [], "banhero": [], @@ -12193,7 +12001,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 127011 + 102011 ], "helphero": [], "banhero": [], @@ -12302,7 +12110,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 107021 + 102011 ], "helphero": [], "banhero": [], @@ -12411,7 +12219,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 107031 + 102011 ], "helphero": [], "banhero": [], @@ -12520,7 +12328,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 107041 + 102011 ], "helphero": [], "banhero": [], @@ -12629,7 +12437,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 107051 + 102011 ], "helphero": [], "banhero": [], @@ -12738,7 +12546,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 6000 + 102011 ], "helphero": [], "banhero": [], @@ -12847,7 +12655,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 6000 + 102011 ], "helphero": [], "banhero": [], @@ -12956,7 +12764,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 107081 + 102011 ], "helphero": [], "banhero": [], @@ -13065,7 +12873,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 128011 + 102011 ], "helphero": [], "banhero": [], @@ -13174,7 +12982,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 108021 + 102011 ], "helphero": [], "banhero": [], @@ -13283,7 +13091,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 108031 + 102011 ], "helphero": [], "banhero": [], @@ -13392,7 +13200,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 108041 + 102011 ], "helphero": [], "banhero": [], @@ -13501,7 +13309,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 108051 + 102011 ], "helphero": [], "banhero": [], @@ -13610,7 +13418,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 7000 + 102011 ], "helphero": [], "banhero": [], @@ -13719,7 +13527,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 7000 + 102011 ], "helphero": [], "banhero": [], @@ -13828,7 +13636,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 108081 + 102011 ], "helphero": [], "banhero": [], @@ -13937,7 +13745,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 129011 + 102011 ], "helphero": [], "banhero": [], @@ -14046,7 +13854,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 109021 + 102011 ], "helphero": [], "banhero": [], @@ -14155,7 +13963,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 109031 + 102011 ], "helphero": [], "banhero": [], @@ -14264,7 +14072,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 109041 + 102011 ], "helphero": [], "banhero": [], @@ -14373,7 +14181,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 109051 + 102011 ], "helphero": [], "banhero": [], @@ -14482,7 +14290,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 8000 + 102011 ], "helphero": [], "banhero": [], @@ -14591,7 +14399,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 8000 + 102011 ], "helphero": [], "banhero": [], @@ -14700,7 +14508,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 109081 + 102011 ], "helphero": [], "banhero": [], @@ -14809,7 +14617,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 130011 + 102011 ], "helphero": [], "banhero": [], @@ -14918,7 +14726,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 110021 + 102011 ], "helphero": [], "banhero": [], @@ -15027,7 +14835,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 110031 + 102011 ], "helphero": [], "banhero": [], @@ -15136,7 +14944,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 110041 + 102011 ], "helphero": [], "banhero": [], @@ -15245,7 +15053,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 110051 + 102011 ], "helphero": [], "banhero": [], @@ -15354,7 +15162,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 9000 + 102011 ], "helphero": [], "banhero": [], @@ -15463,7 +15271,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 9000 + 102011 ], "helphero": [], "banhero": [], @@ -15572,7 +15380,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 110081 + 102011 ], "helphero": [], "banhero": [], @@ -15681,7 +15489,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 131011 + 102011 ], "helphero": [], "banhero": [], @@ -15790,7 +15598,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 111021 + 102011 ], "helphero": [], "banhero": [], @@ -15899,7 +15707,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 111031 + 102011 ], "helphero": [], "banhero": [], @@ -16008,7 +15816,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 111041 + 102011 ], "helphero": [], "banhero": [], @@ -16117,7 +15925,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 111051 + 102011 ], "helphero": [], "banhero": [], @@ -16226,7 +16034,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 10000 + 102011 ], "helphero": [], "banhero": [], @@ -16335,7 +16143,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 10000 + 102011 ], "helphero": [], "banhero": [], @@ -16444,7 +16252,7 @@ ], "BattleReadyID": 118, "FormatList": [ - 111081 + 102011 ], "helphero": [], "banhero": [], @@ -16553,7 +16361,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 132011 + 102011 ], "helphero": [], "banhero": [], @@ -16662,7 +16470,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 112021 + 102011 ], "helphero": [], "banhero": [], @@ -16771,7 +16579,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 112031 + 102011 ], "helphero": [], "banhero": [], @@ -16880,7 +16688,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 112041 + 102011 ], "helphero": [], "banhero": [], @@ -16989,7 +16797,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 112051 + 102011 ], "helphero": [], "banhero": [], @@ -17098,7 +16906,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 11000 + 102011 ], "helphero": [], "banhero": [], @@ -17207,7 +17015,7 @@ ], "BattleReadyID": 116, "FormatList": [ - 11000 + 102011 ], "helphero": [], "banhero": [],