diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 08c1dd5db..56f37be54 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -9868,7 +9868,7 @@ "decompose_get": [ { "a": "item", - "t": "15000201", + "t": "15000101", "n": 2 } ], @@ -9931,7 +9931,7 @@ "decompose_get": [ { "a": "item", - "t": "15000202", + "t": "15000102", "n": 2 } ], @@ -9994,7 +9994,7 @@ "decompose_get": [ { "a": "item", - "t": "15000203", + "t": "15000103", "n": 2 } ], @@ -10057,7 +10057,7 @@ "decompose_get": [ { "a": "item", - "t": "15000204", + "t": "15000104", "n": 2 } ], @@ -10108,7 +10108,7 @@ "decompose_get": [ { "a": "item", - "t": "15000301", + "t": "15000201", "n": 2 } ], @@ -10159,7 +10159,7 @@ "decompose_get": [ { "a": "item", - "t": "15000302", + "t": "15000202", "n": 2 } ], @@ -10210,7 +10210,7 @@ "decompose_get": [ { "a": "item", - "t": "15000303", + "t": "15000203", "n": 2 } ], @@ -10261,7 +10261,7 @@ "decompose_get": [ { "a": "item", - "t": "15000304", + "t": "15000204", "n": 2 } ], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 6cce6095e..1c7aa22e6 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -27302,12 +27302,12 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 3, + "ExecuteCnt": 1, "Type": 1, "Argu": [ 1, 4, - 1000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -29536,10 +29536,10 @@ { "Id": 253003211, "EmitPR": 1000, - "From": 4, + "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 11, "Argu": [ diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 195657863..d0531f51e 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -8477,7 +8477,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_153001211_1", - "text": "对敌方1个目标发起5段攻击,每段攻击可造成攻击力60%的伤害,并会吸收目标10%行动值。" + "text": "对敌方1个目标发起5段攻击,每段攻击可造成攻击力40%的伤害,并会吸收目标10%行动值。" }, "buffid": [], "map": "" @@ -8687,7 +8687,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151002211_1", - "text": "攻击一个目标,造成攻击力120%的伤害。" + "text": "攻击一个目标,造成攻击力120%的伤害。50%概率添加2回合[color=#e5621b]防御下降[/color] 。" }, "buffid": [ 390001007 @@ -8747,7 +8747,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151003211_1", - "text": "攻击一个目标,造成攻击力120%的伤害。" + "text": "攻击一个目标,造成攻击力120%的伤害。25%概率添加2回合[color=#e5621b]眩晕[/color] 。" }, "buffid": [ 390001105 @@ -8778,7 +8778,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151004111_1", - "text": "对敌方1个目标发起2段攻击,每段可造成攻击力50%的伤害,并有20%概率减少目标20%行动值。" + "text": "对目标造成2段攻击力125%的伤害,20%概率添加1回合[color=#e5621b]防御下降[/color]。" }, "buffid": [], "map": "" @@ -8807,7 +8807,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151004211_1", - "text": "对敌方发起2段攻击,每段可造成攻击180%的伤害,若发生暴击,可使目标减少10%行动值。" + "text": "对目标造成攻击力400%的伤害,添加2回合[color=#e5621b]攻击下降[/color] 。" }, "buffid": [], "map": "" @@ -8836,7 +8836,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151005111_1", - "text": "对敌方一个目标发起两段攻击,每段造成攻击力75%的伤害。" + "text": "对目标造成2段攻击力100%的伤害并降低目标20%行动值。" }, "buffid": [], "map": "" @@ -8865,7 +8865,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151005211_1", - "text": "对敌方1个目标发起攻击,造成攻击力180%的伤害,并附加2回合[color=#e5621b]攻击下降[/color]状态。" + "text": "对敌方全体造成2段攻击力200%的伤害并降低目标10%行动值" }, "buffid": [ 390001006 @@ -20826,7 +20826,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151006211_1", - "text": "对敌方发起3次攻击,每次造成攻击力30%的伤害。" + "text": "对敌方发起1次攻击,造成攻击力300%的伤害。" }, "buffid": [], "map": "" @@ -22120,7 +22120,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_153003111_1", - "text": "对敌方1个目标发起两段攻击力50%的伤害,并有20%概率为自身附加2回合[color=#37d8a9]免疫[/color] 状态。" + "text": "对敌方1个目标发起两段攻击力10%的伤害,并有20%概率为自身附加2回合[color=#37d8a9]免疫[/color] 状态。" }, "buffid": [], "map": "" @@ -22149,7 +22149,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_153003211_1", - "text": "对敌方1个目标造成攻击100%的无视防御伤害。" + "text": "对敌方群体造成攻击200%的无视防御伤害。" }, "buffid": [], "map": "" @@ -23761,7 +23761,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151012111_1", - "text": "对敌方1个目标发起攻击造成攻击力100%的伤害。" + "text": "对敌方1个目标发起攻击造成攻击力300%的伤害。" }, "buffid": [], "map": "" @@ -23790,7 +23790,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151012211_1", - "text": "对敌方发起攻击,造成攻击力80%的伤害,有15%概率附加2回合[color=#e5621b]无法获得增益[/color] 效果的状态。" + "text": "对敌方发起攻击,造成攻击力250%的伤害,有15%概率附加2回合[color=#e5621b]无法获得增益[/color] 效果的状态。" }, "buffid": [], "map": "" @@ -23966,7 +23966,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151010211_1", - "text": "对敌方一个目标发起4段攻击,每段可造成攻击力45%的伤害,每段触发暴击时增加自身15%行动值。" + "text": "对敌方一个目标发起4段攻击,每段可造成攻击力100%的伤害,每段触发暴击时增加自身15%行动值。" }, "buffid": [], "map": "" @@ -23995,7 +23995,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151011111_1", - "text": "对敌方一个目标造成100%攻击力的伤害,并有20%概率附加1回合[color=#e5621b]沉默[/color]状态。" + "text": "对敌方一个目标造成300%攻击力的伤害,并有20%概率附加1回合[color=#e5621b]沉默[/color]状态。" }, "buffid": [], "map": "" @@ -24024,7 +24024,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151011211_1", - "text": "对敌方发起攻击,造成100%的攻击力的伤害,对存在减益状态的目标伤害提升15%。" + "text": "对敌方发起攻击,造成350%的攻击力的伤害,对存在减益状态的目标伤害提升15%。" }, "buffid": [], "map": "" @@ -26213,7 +26213,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_153002111_1", - "text": "对敌方一个目标发起两段攻击50%的伤害,每段为自身回复5%最大生命值。" + "text": "对敌方一个目标发起两段攻击120%的伤害,每段为自身回复5%最大生命值。" }, "buffid": [], "map": "" @@ -26242,7 +26242,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_153002211_1", - "text": "对敌方一个目标造成180%攻击力的伤害,并吸收目标15%行动值。" + "text": "对敌方一个目标造成400%攻击力的伤害,并吸收目标15%行动值。" }, "buffid": [], "map": "" @@ -26712,7 +26712,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151022111_1", - "text": "为BOSS附加2回合[color=#37d8a9]免疫[/color] [color=#37d8a9]攻击提升[/color]。" + "text": "为BOSS附加2回合[color=#37d8a9]免疫[/color] ,[color=#37d8a9]攻击提升[/color]。" }, "buffid": [], "map": "" @@ -27002,7 +27002,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151050111_1", - "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害" + "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害。" }, "buffid": [], "map": "" @@ -27031,7 +27031,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151050211_1", - "text": "对敌方全体发起攻击造成攻击力250%的伤害,并施加2回合[color=#e5621b]中毒[/color] 状态" + "text": "对敌方全体发起攻击造成攻击力250%的伤害,并施加2回合[color=#e5621b]中毒[/color] 状态。" }, "buffid": [], "map": "" @@ -27060,7 +27060,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151051111_1", - "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害" + "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害。" }, "buffid": [], "map": "" @@ -27118,7 +27118,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151052111_1", - "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害" + "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害。" }, "buffid": [], "map": "" @@ -27176,7 +27176,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151053111_1", - "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害" + "text": "对敌方1个目标发起攻击,造成攻击力200%的伤害。" }, "buffid": [], "map": "" @@ -27205,7 +27205,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_151053211_1", - "text": "对敌方全体发起攻击,造成攻击力250%的伤害,有15%概率附加2回合[color=#e5621b]无法获得增益[/color] 的状态" + "text": "对敌方全体发起攻击,造成攻击力250%的伤害,有15%概率附加2回合[color=#e5621b]无法获得增益[/color] 的状态。" }, "buffid": [], "map": "" diff --git a/modules/pagoda/api_getrace.go b/modules/pagoda/api_getrace.go index ab088d419..68c65d46d 100644 --- a/modules/pagoda/api_getrace.go +++ b/modules/pagoda/api_getrace.go @@ -18,6 +18,7 @@ func (this *apiComp) GetRace(session comm.IUserSession, req *pb.PagodaGetRaceReq var ( bChange bool + sesaon int32 // 循环塔id ) list, err := this.module.modelRacePagoda.getPagodaRaceList(session.GetUserId()) if err != nil { @@ -38,6 +39,20 @@ func (this *apiComp) GetRace(session comm.IUserSession, req *pb.PagodaGetRaceReq bChange = true } } + if k >= 10 { + sesaon = k + } + } + if sesaon == 0 { + list.Race[10] = &pb.RaceData{ + Race: 10, + Task: []int32{}, + Rtime: configure.Now().Unix(), + Defeat: 0, + Endtime: this.module.GetSeasonData(), + Curfloor: 0, + } + bChange = true } if bChange { mapData := make(map[string]interface{}, 0) diff --git a/modules/pagoda/model_race.go b/modules/pagoda/model_race.go index beb195f90..bf28fbfc1 100644 --- a/modules/pagoda/model_race.go +++ b/modules/pagoda/model_race.go @@ -30,7 +30,9 @@ func (this *ModelRace) Init(service core.IService, module core.IModule, comp cor // 获取爬塔信息 func (this *ModelRace) getPagodaRaceList(uid string) (result *pb.DBPagodaRace, err error) { - result = &pb.DBPagodaRace{} + result = &pb.DBPagodaRace{ + Race: map[int32]*pb.RaceData{}, + } if err = this.Get(uid, result); err != nil && err == mgo.MongodbNil { // 初始一条数据 result.Id = primitive.NewObjectID().Hex() result.Uid = uid diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index 4a0d11e62..551e576ca 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -10,6 +10,7 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/db" + "go_dreamfactory/utils" "github.com/go-redis/redis/v8" ) @@ -196,3 +197,10 @@ func (this *Pagoda) CheckPagodaMaxFloor(uid string, pagodaType int32) int32 { } return 0 } + +func (this *Pagoda) GetSeasonData() (endSeasonTime int64) { + + _, endSeasonTime = utils.GetMonthStartEnd() //+ int64((6-d)*3600*24) + + return endSeasonTime +}