liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei 2023-07-07 14:09:57 +08:00
commit 14d1702f96
7 changed files with 374 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
bin/json/game_caravancity.json
View File

@ -9,7 +9,7 @@
{
"a": "item",
"t": "10000005",
"n": 1
"n": 10
}
],
"cityexlock": [
@ -33,10 +33,10 @@
"citytype": 1,
"citytypenum": 2,
"special": [
"21000001",
"21000002",
"21000003",
"21000004"
"21000004",
"21000005"
],
"specialnum": 500,
"exspecial": [
@ -62,7 +62,7 @@
{
"a": "item",
"t": "10000005",
"n": 1
"n": 5
}
],
"cityexlock": [
@ -86,10 +86,10 @@
"citytype": 1,
"citytypenum": 3,
"special": [
"21000001",
"21000002",
"21000003",
"21000007"
"21000006",
"21000007",
"21000008",
"21000009"
],
"specialnum": 500,
"exspecial": [
@ -116,7 +116,7 @@
{
"a": "item",
"t": "10000005",
"n": 1
"n": 7
}
],
"cityexlock": [
@ -140,10 +140,10 @@
"citytype": 1,
"citytypenum": 4,
"special": [
"21000001",
"21000002",
"21000003",
"21000004"
"21000010",
"21000011",
"21000012",
"21000013"
],
"specialnum": 500,
"exspecial": [
@ -170,7 +170,7 @@
{
"a": "item",
"t": "10000005",
"n": 1
"n": 3
}
],
"cityexlock": [
@ -194,10 +194,10 @@
"citytype": 1,
"citytypenum": 3,
"special": [
"21000001",
"21000002",
"21000003",
"21000004"
"21000014",
"21000015",
"21000016",
"21000017"
],
"specialnum": 500,
"exspecial": [
@ -223,7 +223,7 @@
{
"a": "item",
"t": "10000005",
"n": 1
"n": 6
}
],
"cityexlock": [
@ -247,10 +247,10 @@
"citytype": 1,
"citytypenum": 4,
"special": [
"21000001",
"21000002",
"21000003",
"21000009"
"21000018",
"21000019",
"21000020",
"21000021"
],
"specialnum": 500,
"exspecial": [

6
bin/json/game_caravanevent.json
View File

@ -8,7 +8,7 @@
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 500,
"worldtask": 520,
"traintips": {
"key": "caravan_caravan_event_traintips_1",
"text": "列车上来了外人，这个人看上去有很急切的事情，我们必须先解决这个再离开这里。"
@ -38,7 +38,7 @@
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 510,
"worldtask": 540,
"traintips": {
"key": "caravan_caravan_event_traintips_2",
"text": "这个事情看上去有回旋的余地，但我建议先处理掉这个事情。"
@ -68,7 +68,7 @@
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
"worldtask": 520,
"worldtask": 510,
"traintips": {
"key": "caravan_caravan_event_traintips_3",
"text": "最好先解决这个麻烦，再前往其他地方。"

52
bin/json/game_caravanlv.json
View File

@ -3,11 +3,11 @@
"lv": 0,
"newmoneyexp": 0,
"bagtop": 20,
"bagtagnum": 100,
"bagtagnum": 5,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 40
"n": 50
},
"moneynumtop": {
"a": "attr",
@ -22,11 +22,11 @@
"lv": 1,
"newmoneyexp": 100000,
"bagtop": 24,
"bagtagnum": 100,
"bagtagnum": 10,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 41
"n": 60
},
"moneynumtop": {
"a": "attr",
@ -47,11 +47,11 @@
"lv": 2,
"newmoneyexp": 200000,
"bagtop": 28,
"bagtagnum": 100,
"bagtagnum": 15,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 42
"n": 70
},
"moneynumtop": {
"a": "attr",
@ -72,11 +72,11 @@
"lv": 3,
"newmoneyexp": 300000,
"bagtop": 32,
"bagtagnum": 100,
"bagtagnum": 20,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 43
"n": 80
},
"moneynumtop": {
"a": "attr",
@ -97,11 +97,11 @@
"lv": 4,
"newmoneyexp": 400000,
"bagtop": 36,
"bagtagnum": 100,
"bagtagnum": 22,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 44
"n": 90
},
"moneynumtop": {
"a": "attr",
@ -122,11 +122,11 @@
"lv": 5,
"newmoneyexp": 500000,
"bagtop": 40,
"bagtagnum": 100,
"bagtagnum": 24,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 45
"n": 100
},
"moneynumtop": {
"a": "attr",
@ -147,11 +147,11 @@
"lv": 6,
"newmoneyexp": 600000,
"bagtop": 44,
"bagtagnum": 100,
"bagtagnum": 25,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 46
"n": 110
},
"moneynumtop": {
"a": "attr",
@ -172,11 +172,11 @@
"lv": 7,
"newmoneyexp": 700000,
"bagtop": 48,
"bagtagnum": 100,
"bagtagnum": 27,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 47
"n": 120
},
"moneynumtop": {
"a": "attr",
@ -197,11 +197,11 @@
"lv": 8,
"newmoneyexp": 800000,
"bagtop": 52,
"bagtagnum": 100,
"bagtagnum": 29,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 48
"n": 130
},
"moneynumtop": {
"a": "attr",
@ -222,11 +222,11 @@
"lv": 9,
"newmoneyexp": 900000,
"bagtop": 56,
"bagtagnum": 100,
"bagtagnum": 30,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 49
"n": 140
},
"moneynumtop": {
"a": "attr",
@ -247,11 +247,11 @@
"lv": 10,
"newmoneyexp": 1000000,
"bagtop": 60,
"bagtagnum": 100,
"bagtagnum": 31,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 50
"n": 150
},
"moneynumtop": {
"a": "attr",
@ -272,11 +272,11 @@
"lv": 11,
"newmoneyexp": 1100000,
"bagtop": 64,
"bagtagnum": 100,
"bagtagnum": 31,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 51
"n": 160
},
"moneynumtop": {
"a": "attr",
@ -297,11 +297,11 @@
"lv": 12,
"newmoneyexp": 1200000,
"bagtop": 68,
"bagtagnum": 100,
"bagtagnum": 32,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 52
"n": 170
},
"moneynumtop": {
"a": "attr",

347
bin/json/game_caravanthing.json
View File

@ -1,36 +1,7 @@
[
{
"itemid": "21000001",
"goodsprice": 1000,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000002",
"goodsprice": 900,
"goodsprice": 1000,
"changeperiod": [
5,
15
@ -59,7 +30,7 @@
},
{
"itemid": "21000003",
"goodsprice": 500,
"goodsprice": 900,
"changeperiod": [
5,
15
@ -88,7 +59,7 @@
},
{
"itemid": "21000004",
"goodsprice": 1500,
"goodsprice": 500,
"changeperiod": [
5,
15
@ -117,7 +88,7 @@
},
{
"itemid": "21000005",
"goodsprice": 2300,
"goodsprice": 1500,
"changeperiod": [
5,
15
@ -146,7 +117,7 @@
},
{
"itemid": "21000006",
"goodsprice": 1130,
"goodsprice": 2300,
"changeperiod": [
5,
15
@ -175,7 +146,7 @@
},
{
"itemid": "21000007",
"goodsprice": 1000,
"goodsprice": 1130,
"changeperiod": [
5,
15
@ -204,7 +175,7 @@
},
{
"itemid": "21000008",
"goodsprice": 900,
"goodsprice": 1000,
"changeperiod": [
5,
15
@ -233,7 +204,7 @@
},
{
"itemid": "21000009",
"goodsprice": 500,
"goodsprice": 900,
"changeperiod": [
5,
15
@ -262,7 +233,7 @@
},
{
"itemid": "21000010",
"goodsprice": 1500,
"goodsprice": 500,
"changeperiod": [
5,
15
@ -291,151 +262,6 @@
},
{
"itemid": "21000011",
"goodsprice": 2300,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000012",
"goodsprice": 1130,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000013",
"goodsprice": 1000,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000014",
"goodsprice": 900,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000015",
"goodsprice": 500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000016",
"goodsprice": 1500,
"changeperiod": [
5,
@ -464,7 +290,7 @@
"goodsnum": 80
},
{
"itemid": "21000017",
"itemid": "21000012",
"goodsprice": 2300,
"changeperiod": [
5,
@ -493,7 +319,7 @@
"goodsnum": 80
},
{
"itemid": "21000018",
"itemid": "21000013",
"goodsprice": 1130,
"changeperiod": [
5,
@ -522,7 +348,7 @@
"goodsnum": 80
},
{
"itemid": "21000019",
"itemid": "21000014",
"goodsprice": 1000,
"changeperiod": [
5,
@ -551,7 +377,7 @@
"goodsnum": 80
},
{
"itemid": "21000020",
"itemid": "21000015",
"goodsprice": 900,
"changeperiod": [
5,
@ -580,7 +406,7 @@
"goodsnum": 80
},
{
"itemid": "21000021",
"itemid": "21000016",
"goodsprice": 500,
"changeperiod": [
5,
@ -607,5 +433,150 @@
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000017",
"goodsprice": 1500,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000018",
"goodsprice": 2300,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000019",
"goodsprice": 1130,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000020",
"goodsprice": 1000,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
},
{
"itemid": "21000021",
"goodsprice": 900,
"changeperiod": [
5,
15
],
"PriceChangeWeight": [
40,
20,
40
],
"PriceChangeWeight_one": [
80,
20
],
"PriceChangeWeight_two": [
50,
50
],
"PriceChangeWeight_three": [
20,
80
],
"FluctuationRange": 500,
"pricemin": 200,
"pricemax": 3000,
"goodsnum": 80
}
]

272
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

2
modules/viking/api_challengeover.go
View File

@ -109,6 +109,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
mapData["bossTime"] = viking.BossTime // 更新时间
this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, req.Report)
}
//this.module.CheckSeasonRank(session.GetUserId(), req.BossId, req.Difficulty, 1, nil, 11, true)
user := this.module.ModuleUser.GetUser(session.GetUserId())
reward = this.module.ModuleTools.GetGroupDataByLottery(vikingCfg.Drop, user.Vip, user.Lv)
//reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励

25
modules/viking/module.go
View File

@ -430,6 +430,7 @@ func (this *Viking) CheckSeasonRank(uid string, boosID int32, difficulty int32,
conn_ *db.DBConn
err error
)
bcross = this.CheckCurSeasonData()
if bcross {
conn_, err = db.Cross() // 获取跨服数据库对象
if err != nil {
@ -509,4 +510,28 @@ func (this *Viking) CheckSeasonRank(uid string, boosID int32, difficulty int32,
this.Errorln(err)
return
}
// 以下是测试
var (
szRank []*pb.DBVSeasonRank
rd *redis.StringSliceCmd
conn *db.DBConn
)
dbModel := db.NewDBModel(comm.TableVikingRank, 0, conn)
pipe = conn.Redis.RedisPipe(context.TODO())
rd = pipe.ZRevRange("vSeasonRank"+strconv.Itoa(int(1)), 0, comm.MaxRankList)
if _, err := pipe.Exec(); err != nil {
this.Errorln(err)
return
}
_dataList := rd.Val()
for _, v := range _dataList {
result := &pb.DBVSeasonRank{}
if err := dbModel.Redis.HGetAll(v, result); err == nil {
szRank = append(szRank, result)
}
}
}