From 829b402ada8d8f83bb723dbb8b1cedaa8830a915 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 3 Jan 2024 16:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_achievetask.json | 36 +++++++++++------------ bin/json/game_arenachallengenpc.json | 24 +++++++-------- bin/json/game_asklibrary.json | 42 +++++++++++++-------------- bin/json/game_buriedcondi.json | 14 ++++----- bin/json/game_shop.json | 2 +- comm/imodule.go | 2 +- modules/hero/model_hero.go | 27 ++++++++++------- modules/hero/module.go | 24 ++++----------- modules/hunting/api_challengeover.go | 5 ++-- modules/integral/api_challengeover.go | 21 +++++--------- modules/viking/api_challengeover.go | 4 ++- 11 files changed, 95 insertions(+), 106 deletions(-) diff --git a/bin/json/game_achievetask.json b/bin/json/game_achievetask.json index 685f6883e..d4fff6d62 100644 --- a/bin/json/game_achievetask.json +++ b/bin/json/game_achievetask.json @@ -12,7 +12,7 @@ }, "task_buried": 16000001, "task_icon": "cj_icon_lb_ty03", - "task_quality": 1, + "task_quality": 0, "task_reward": [ { "a": "attr", @@ -35,7 +35,7 @@ }, "task_buried": 16000002, "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, + "task_quality": 1, "task_reward": [ { "a": "attr", @@ -58,7 +58,7 @@ }, "task_buried": 16000003, "task_icon": "cj_icon_lb_ty01", - "task_quality": 3, + "task_quality": 2, "task_reward": [ { "a": "attr", @@ -81,7 +81,7 @@ }, "task_buried": 16000004, "task_icon": "cj_icon_lb_ty03", - "task_quality": 1, + "task_quality": 0, "task_reward": [ { "a": "attr", @@ -104,7 +104,7 @@ }, "task_buried": 16000005, "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, + "task_quality": 1, "task_reward": [ { "a": "attr", @@ -127,7 +127,7 @@ }, "task_buried": 16000006, "task_icon": "cj_icon_lb_ty01", - "task_quality": 3, + "task_quality": 2, "task_reward": [ { "a": "attr", @@ -150,7 +150,7 @@ }, "task_buried": 16000007, "task_icon": "cj_icon_lb_ty03", - "task_quality": 1, + "task_quality": 0, "task_reward": [ { "a": "attr", @@ -173,7 +173,7 @@ }, "task_buried": 16000008, "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, + "task_quality": 1, "task_reward": [ { "a": "attr", @@ -196,7 +196,7 @@ }, "task_buried": 16000009, "task_icon": "cj_icon_lb_ty01", - "task_quality": 3, + "task_quality": 2, "task_reward": [ { "a": "attr", @@ -219,7 +219,7 @@ }, "task_buried": 16000010, "task_icon": "cj_icon_lb_ty03", - "task_quality": 1, + "task_quality": 0, "task_reward": [ { "a": "attr", @@ -242,7 +242,7 @@ }, "task_buried": 16000011, "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, + "task_quality": 1, "task_reward": [ { "a": "attr", @@ -265,7 +265,7 @@ }, "task_buried": 16000012, "task_icon": "cj_icon_lb_ty01", - "task_quality": 3, + "task_quality": 2, "task_reward": [ { "a": "attr", @@ -288,7 +288,7 @@ }, "task_buried": 16000013, "task_icon": "cj_icon_lb_ty03", - "task_quality": 1, + "task_quality": 0, "task_reward": [ { "a": "attr", @@ -311,7 +311,7 @@ }, "task_buried": 16000014, "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, + "task_quality": 1, "task_reward": [ { "a": "attr", @@ -334,7 +334,7 @@ }, "task_buried": 16000015, "task_icon": "cj_icon_lb_ty01", - "task_quality": 3, + "task_quality": 2, "task_reward": [ { "a": "attr", @@ -357,7 +357,7 @@ }, "task_buried": 16000016, "task_icon": "cj_icon_lb_ty03", - "task_quality": 1, + "task_quality": 0, "task_reward": [ { "a": "attr", @@ -380,7 +380,7 @@ }, "task_buried": 16000017, "task_icon": "cj_icon_lb_ty02", - "task_quality": 2, + "task_quality": 1, "task_reward": [ { "a": "attr", @@ -403,7 +403,7 @@ }, "task_buried": 16000018, "task_icon": "cj_icon_lb_ty01", - "task_quality": 3, + "task_quality": 2, "task_reward": [ { "a": "attr", diff --git a/bin/json/game_arenachallengenpc.json b/bin/json/game_arenachallengenpc.json index 0a00db33d..52c98ff8a 100644 --- a/bin/json/game_arenachallengenpc.json +++ b/bin/json/game_arenachallengenpc.json @@ -1,7 +1,7 @@ [ { "id": 1, - "open_cond": 1, + "open_cond": 0, "open_value": 6, "afterid": 0, "BattleReadyID": 110, @@ -37,7 +37,7 @@ }, { "id": 2, - "open_cond": 1, + "open_cond": 0, "open_value": 8, "afterid": 1, "BattleReadyID": 110, @@ -73,7 +73,7 @@ }, { "id": 3, - "open_cond": 1, + "open_cond": 0, "open_value": 10, "afterid": 2, "BattleReadyID": 110, @@ -109,7 +109,7 @@ }, { "id": 4, - "open_cond": 1, + "open_cond": 0, "open_value": 12, "afterid": 3, "BattleReadyID": 110, @@ -145,7 +145,7 @@ }, { "id": 5, - "open_cond": 1, + "open_cond": 0, "open_value": 14, "afterid": 4, "BattleReadyID": 110, @@ -181,7 +181,7 @@ }, { "id": 6, - "open_cond": 1, + "open_cond": 0, "open_value": 16, "afterid": 5, "BattleReadyID": 110, @@ -217,7 +217,7 @@ }, { "id": 7, - "open_cond": 1, + "open_cond": 0, "open_value": 18, "afterid": 6, "BattleReadyID": 110, @@ -253,7 +253,7 @@ }, { "id": 8, - "open_cond": 1, + "open_cond": 0, "open_value": 20, "afterid": 7, "BattleReadyID": 110, @@ -289,7 +289,7 @@ }, { "id": 9, - "open_cond": 1, + "open_cond": 0, "open_value": 22, "afterid": 8, "BattleReadyID": 110, @@ -325,7 +325,7 @@ }, { "id": 10, - "open_cond": 1, + "open_cond": 0, "open_value": 24, "afterid": 9, "BattleReadyID": 110, @@ -361,7 +361,7 @@ }, { "id": 11, - "open_cond": 1, + "open_cond": 0, "open_value": 27, "afterid": 10, "BattleReadyID": 110, @@ -397,7 +397,7 @@ }, { "id": 12, - "open_cond": 1, + "open_cond": 0, "open_value": 30, "afterid": 11, "BattleReadyID": 110, diff --git a/bin/json/game_asklibrary.json b/bin/json/game_asklibrary.json index a13e0ecab..146cf2825 100644 --- a/bin/json/game_asklibrary.json +++ b/bin/json/game_asklibrary.json @@ -2,7 +2,7 @@ { "id": 1, "ExaminationGroup": 1001, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_01", "text": "菲奥娜父亲的真实身份是？" @@ -33,7 +33,7 @@ { "id": 2, "ExaminationGroup": 1001, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_02", "text": "诺斯是我们“守护联盟”的创始人之一，也是一位尊贵的守护神。那请问他成神之前是干什么的呢？" @@ -64,7 +64,7 @@ { "id": 3, "ExaminationGroup": 1001, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_03", "text": "匹诺曹的良心是什么？" @@ -95,7 +95,7 @@ { "id": 4, "ExaminationGroup": 1002, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_04", "text": "阿宝的亲生父亲是谁？" @@ -126,7 +126,7 @@ { "id": 5, "ExaminationGroup": 1002, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_05", "text": "希卡普的黑龙，和那条白龙，生的龙是什么品种？" @@ -157,7 +157,7 @@ { "id": 6, "ExaminationGroup": 1002, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_06", "text": "马达加斯加企鹅团最喜欢吃什么？" @@ -188,7 +188,7 @@ { "id": 7, "ExaminationGroup": 1003, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_07", "text": "博肯族女仆布里奇特告别王子逃走时，留在台阶上的鞋子是什么？" @@ -219,7 +219,7 @@ { "id": 8, "ExaminationGroup": 1003, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_08", "text": "史莱克向菲欧娜求婚时送她的戒指里刻着什么字？" @@ -250,7 +250,7 @@ { "id": 9, "ExaminationGroup": 1003, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_09", "text": "穿靴猫有一次冒险死于炮弹爆炸，那次冒险中他本来想偷什么？" @@ -281,7 +281,7 @@ { "id": 10, "ExaminationGroup": 1004, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_10", "text": "巴布女王的老爹，做的手势叫什么名字？" @@ -312,7 +312,7 @@ { "id": 11, "ExaminationGroup": 1004, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_11", "text": "瓜哥发明的腰带是用什么做的？" @@ -343,7 +343,7 @@ { "id": 12, "ExaminationGroup": 1004, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_12", "text": "悍娇虎最喜欢什么口味的食物？" @@ -374,7 +374,7 @@ { "id": 13, "ExaminationGroup": 1005, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_13", "text": "亲衣节时，戈伯的汤加进了什么意外的调料？" @@ -405,7 +405,7 @@ { "id": 14, "ExaminationGroup": 1005, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_14", "text": "雷霆狂花出阵时，众人涂在脸上的颜料是什么来源？" @@ -436,7 +436,7 @@ { "id": 15, "ExaminationGroup": 1005, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_15", "text": "骇客蛛的黑客知识在哪个网站上学的？" @@ -467,7 +467,7 @@ { "id": 16, "ExaminationGroup": 1006, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_16", "text": "希卡普的老妈瓦尔卡做的丸子，被戈伯评价像什么一样？" @@ -498,7 +498,7 @@ { "id": 17, "ExaminationGroup": 1006, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_17", "text": "什么植物能让龙轻轻一闻，就欲仙欲死，欲罢不能？" @@ -529,7 +529,7 @@ { "id": 18, "ExaminationGroup": 1006, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_18", "text": "以下哪个不是冰霜杰克的特征？" @@ -560,7 +560,7 @@ { "id": 19, "ExaminationGroup": 1007, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_19", "text": "哪种龙的蛋孵化时会发生强烈的爆炸？" @@ -591,7 +591,7 @@ { "id": 20, "ExaminationGroup": 1007, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_20", "text": "阿宝的乳名是什么？" @@ -622,7 +622,7 @@ { "id": 21, "ExaminationGroup": 1007, - "type": 1, + "type": 0, "topic": { "key": "ask_ask_library_topic_21", "text": "马达加斯加企鹅团的军师叫什么？" diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 1b820c472..1e538f278 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -11979,7 +11979,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" @@ -12006,7 +12006,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" @@ -12259,7 +12259,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" @@ -12286,7 +12286,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" @@ -12313,7 +12313,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" @@ -12340,7 +12340,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" @@ -12367,7 +12367,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": -160, + "NPC": -166, "tipstxt": { "key": "", "text": "" diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index feb267c9d..8ab36fd07 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -412,7 +412,7 @@ "text": "巅峰商店" }, "upper_shop": { - "key": "shop_shop_upper_shop_15", + "key": "", "text": "" }, "opencond": "shop15", diff --git a/comm/imodule.go b/comm/imodule.go index 237be4408..10c2a8374 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -112,7 +112,7 @@ type ( CleanData(uid string) // 英雄加经验 - AddHerosExp(session IUserSession, heroObjs []string, exp int32) (curAddExp []int32, errdata *pb.ErrorData) + AddHerosExp(session IUserSession, heroObjs []string, exp int32) (curAddExp map[string]int32, errdata *pb.ErrorData) // 英雄练功 KungFuHero(session IUserSession, heroObjID string, bKongfu bool, kongfuUid string) (errdata *pb.ErrorData) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index d019ddfca..9b7534e67 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -398,14 +398,14 @@ func (this *ModelHero) cleanData(uid string) { } } -func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, exp int32, model *db.DBModel) (curAddExp []int32, errdata *pb.ErrorData) { +func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, exp int32, model *db.DBModel) (curAddExp map[string]int32, errdata *pb.ErrorData) { var ( tasks []*pb.BuriedParam changeupdate map[string]interface{} = make(map[string]interface{}) maxlvhero *pb.DBHero ) - curAddExp = make([]int32, len(heros)) - for i, hero := range heros { + curAddExp = make(map[string]int32, len(heros)) + for _, hero := range heros { var ( preLv int32 //加经验之前的等级 curExp int32 // 加经验之后的经验 @@ -446,21 +446,23 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, var maxExp int32 maxExp = _data.Heroexp if maxLv <= curLv && curExp >= maxExp { // 加经验之前校验是否达到最大等级 - curAddExp[i] = 0 // 已经满级的时候 - //code = pb.ErrorCode_HeroMaxLv // + curAddExp[hero.Id] = 0 this.module.Debugf("英雄已经满级 不需要升级heroid:%s,addexp:%d", hero.Id, exp) return } - curExp += exp // 先把经验加上 - for { // 死循环判断一键升级 + var fullexp int32 // 溢出的经验 + curExp += exp // 先把经验加上 + for { // 死循环判断一键升级 if _data.Heroexp == 0 { - curAddExp[i] = exp - (curExp - maxExp) // 减去超过部分的经验 + fullexp = (curExp - maxExp) + //curAddExp[hero.Id] = exp - (curExp - maxExp) // 减去超过部分的经验 curExp = 0 break } maxExp = _data.Heroexp if maxLv <= curLv && curExp >= maxExp { // 设置最大经验和等级 - curAddExp[i] = exp - (curExp - maxExp) // 减去超过部分的经验 + fullexp = (curExp - maxExp) + //curAddExp[hero.Id] = exp - (curExp - maxExp) // 减去超过部分的经验 curLv = maxLv curExp = maxExp break @@ -472,14 +474,17 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, curLv += 1 // 经验够了 那么等级+1 _data = this.module.configure.GetHeroLv(curLv) if _data == nil { // 等级加失败了 回到原来的等级 + fullexp = (curExp - maxExp) curLv -= 1 break } } } - if curAddExp[i] != 0 { - curAddExp[i] = exp // 真正加的经验 + if curAddExp[hero.Id] == 0 { + curAddExp[hero.Id] = exp // 真正加的经验 + } else { + curAddExp[hero.Id] = (exp - fullexp) } this.module.Debugf("add hero exp :old lv:%d,old exp:%d,new lv:%d,new exp:%d,addexp:%d", hero.Lv, hero.Exp, curLv, curExp, exp) diff --git a/modules/hero/module.go b/modules/hero/module.go index 92e56fa8f..9cd4a35d3 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -835,15 +835,14 @@ func (this *Hero) CheckPeachReward(session comm.IUserSession, ctime int64) { return } -func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp int32) (curAddExp []int32, errdata *pb.ErrorData) { +func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp int32) (curAddExp map[string]int32, errdata *pb.ErrorData) { var ( ids []string = make([]string, 0) heros []*pb.DBHero changeHero []*pb.DBHero // 变化的英雄 - addExp []int32 err error ) - curAddExp = make([]int32, len(heroObjs)) + curAddExp = make(map[string]int32, len(heroObjs)) for _, v := range heroObjs { if v != "" { ids = append(ids, v) @@ -860,16 +859,10 @@ func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp } return } - if addExp, errdata = this.modelHero.AddCardExp(session, heros, exp, model); errdata != nil { + if curAddExp, errdata = this.modelHero.AddCardExp(session, heros, exp, model); errdata != nil { return } - for i, v := range heros { - for n, id := range heroObjs { - if v.Id == id { - curAddExp[n] = addExp[i] - } - } - } + changeHero = append(changeHero, heros...) } } else { @@ -881,16 +874,9 @@ func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp return } - if addExp, errdata = this.modelHero.AddCardExp(session, heros, exp, nil); errdata != nil { + if curAddExp, errdata = this.modelHero.AddCardExp(session, heros, exp, nil); errdata != nil { return } - for i, v := range heros { - for n, id := range heroObjs { - if v.Id == id { - curAddExp[n] = addExp[i] - } - } - } changeHero = append(changeHero, heros...) } if len(changeHero) > 0 { diff --git a/modules/hunting/api_challengeover.go b/modules/hunting/api_challengeover.go index d82391c97..a386bee0d 100644 --- a/modules/hunting/api_challengeover.go +++ b/modules/hunting/api_challengeover.go @@ -165,11 +165,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha for _, v := range req.Report.Info.Redflist[0].Team { if v.Oid != "" && !v.Ishelp { // 助战英雄不加经验 heroObjs = append(heroObjs, v.Oid) - changExp[v.Oid] = cfgHunting.Heroexp } } } - this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgHunting.Heroexp) + if changExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgHunting.Heroexp); errdata != nil { + return + } } errdata = this.module.ModifyHuntingData(session.GetUserId(), mapData) diff --git a/modules/integral/api_challengeover.go b/modules/integral/api_challengeover.go index ca0e813b4..8ee47400d 100644 --- a/modules/integral/api_challengeover.go +++ b/modules/integral/api_challengeover.go @@ -21,14 +21,13 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Integ ///挑战主线关卡 func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralChallengeOverReq) (errdata *pb.ErrorData) { var ( - update map[string]interface{} - res []*cfg.Gameatn - first bool // 是否是首通 - line []*pb.LineUp // 阵容数据 - harm int32 - changExp map[string]int32 - atno []*pb.UserAtno // atno 类型 - curAddExp []int32 + update map[string]interface{} + res []*cfg.Gameatn + first bool // 是否是首通 + line []*pb.LineUp // 阵容数据 + harm int32 + changExp map[string]int32 + atno []*pb.UserAtno // atno 类型 ) changExp = make(map[string]int32) harm = req.Report.Harm @@ -139,17 +138,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh if v.HeroID != "" { if !v.Ishelp { // 助战英雄不加经验 heroObjs = append(heroObjs, v.Oid) - changExp[v.Oid] = 0 } } } } - if curAddExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgData.Heroexp); errdata != nil { + if changExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgData.Heroexp); errdata != nil { return } - for pos, v := range heroObjs { - changExp[v] = curAddExp[pos] - } } err = this.module.modelIntegral.modifyIntegralData(session.GetUserId(), update) diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 526a0ae4d..b0e6bcc57 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -214,7 +214,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal } } } - this.module.ModuleHero.AddHerosExp(session, heroObjs, vikingCfg.Heroexp) + if changExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, vikingCfg.Heroexp); errdata != nil { + return + } } session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{