This commit is contained in:
meixiongfeng 2023-09-14 14:23:46 +08:00
commit 63c615ef43
15 changed files with 524 additions and 152 deletions

View File

@ -21385,7 +21385,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_728",
"text": "查看坠落区域"
"text": "再次挑战邦尼兔"
},
"type": 70,
"valid": 0,

View File

@ -15,6 +15,7 @@
"access": [
10041
],
"showmodel": "",
"model": "",
"controller": "",
"point": "",
@ -47,6 +48,7 @@
"access": [
10041
],
"showmodel": "",
"model": "",
"controller": "",
"point": "",
@ -79,6 +81,7 @@
"access": [
10041
],
"showmodel": "54101_3_exhibition",
"model": "54101_3",
"controller": "Person/mount/10000M_54101.controller",
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
@ -111,6 +114,7 @@
"access": [
10041
],
"showmodel": "",
"model": "",
"controller": "",
"point": "",
@ -143,6 +147,7 @@
"access": [
10041
],
"showmodel": "",
"model": "",
"controller": "",
"point": "",
@ -175,6 +180,7 @@
"access": [
10041
],
"showmodel": "54102_3_exhibition",
"model": "54102_3",
"controller": "Person/mount/10000M_54101.controller",
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
@ -207,6 +213,7 @@
"access": [
10041
],
"showmodel": "54103_1_exhibition",
"model": "54103_1",
"controller": "Person/mount/10000M_54101.controller",
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
@ -239,6 +246,7 @@
"access": [
10041
],
"showmodel": "54103_2_exhibition",
"model": "54103_2",
"controller": "Person/mount/10000M_54101.controller",
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
@ -271,6 +279,7 @@
"access": [
10041
],
"showmodel": "54103_3_exhibition",
"model": "54103_3",
"controller": "Person/mount/10000M_54101.controller",
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",

View File

@ -31,7 +31,13 @@
"exp": 200,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012001",
"n": 1
}
],
"bubble": 2003000322,
"group": 0
},
@ -79,7 +85,13 @@
"exp": 300,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012002",
"n": 1
}
],
"bubble": 2003000332,
"group": 0
},
@ -115,7 +127,13 @@
"exp": 200,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012001",
"n": 1
}
],
"bubble": 2003000122,
"group": 0
},
@ -163,7 +181,13 @@
"exp": 300,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012002",
"n": 1
}
],
"bubble": 2003000132,
"group": 0
},
@ -211,7 +235,13 @@
"exp": 300,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012002",
"n": 1
}
],
"bubble": 2003000232,
"group": 0
}

View File

@ -8581,6 +8581,84 @@
"text": "传说中的守护者“黑化珍妮丝·邓普顿”,拥有不俗的战斗能力"
}
},
{
"hid": "83007",
"name": {
"key": "hero_main_name_83007",
"text": "埃雷特"
},
"star": 3,
"color": 2,
"race": 3,
"job": 3,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "83007",
"rotation": "0|0|0",
"revolve": 0,
"icon": "83006",
"vocal": "83006",
"tujing": [
107
],
"detailwindow": "effect_huaidanlianmeng_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": 0,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
"skill3": 0,
"txt": {
"key": "atlas_83007",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_110",
"text": "传说中的守护者“埃雷特”,拥有不俗的战斗能力"
}
},
{
"hid": "84002",
"name": {

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,60 @@
[
{
"chapterid": 11001,
"pos": 0,
"venturetext": {
"key": "章节成就",
"text": "章节成就"
},
"jumpidList": [
10044
]
},
{
"chapterid": 11001,
"pos": 1,
"venturetext": {
"key": "捕羊大赛",
"text": "捕羊大赛"
},
"jumpidList": [
10042
]
},
{
"chapterid": 11001,
"pos": 2,
"venturetext": {
"key": "精英关卡",
"text": "精英关卡"
},
"jumpidList": []
},
{
"chapterid": 11001,
"pos": 3,
"venturetext": {
"key": "待定关卡",
"text": "待定关卡"
},
"jumpidList": []
},
{
"chapterid": 11001,
"pos": 4,
"venturetext": {
"key": "待定关卡",
"text": "待定关卡"
},
"jumpidList": []
},
{
"chapterid": 11001,
"pos": 5,
"venturetext": {
"key": "待定关卡",
"text": "待定关卡"
},
"jumpidList": []
}
]

View File

@ -395,7 +395,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_熊猫_船甲板",
"熊猫_圣桃树_常驻",
"901"
],
"event": [
@ -470,7 +470,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_邦尼兔_常驻",
"邦尼兔_圣桃树_常驻",
"901"
],
"event": [
@ -485,7 +485,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_邦尼兔_常驻",
"邦尼兔_圣桃树_常驻",
"901"
],
"event": [
@ -513,7 +513,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_熊猫_船甲板",
"熊猫_圣桃树_常驻",
"901"
],
"event": [
@ -528,7 +528,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_邦尼兔_常驻",
"邦尼兔_圣桃树_常驻",
"901"
],
"event": [
@ -601,7 +601,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_熊猫_船甲板",
"功能入口-招募",
"901"
],
"event": [
@ -616,12 +616,12 @@
"Levelid": 0,
"datas": [
"GameMain",
"恐惧灵聚集体",
"成群恐惧灵",
"901"
],
"event": [
1,
103
104
],
"goto": 0
},
@ -631,7 +631,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_熊猫_船甲板",
"熊猫_圣桃树_面对无牙仔",
"901"
],
"event": [
@ -674,7 +674,7 @@
],
"event": [
2,
10201
10202
],
"goto": 0
},
@ -888,7 +888,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20060_熊猫",
"20380-菲奥娜",
"901"
],
"event": [

View File

@ -15133,9 +15133,7 @@
-1
],
"FollowSK": [],
"SucFollowSK": [
224004113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,

View File

@ -5,7 +5,7 @@
"type": 1,
"lv": 1,
"exp": 100,
"etime": 0,
"etime": 50,
"reward": []
},
{
@ -14,7 +14,7 @@
"type": 2,
"lv": 2,
"exp": 200,
"etime": 0,
"etime": 51,
"reward": []
},
{
@ -23,7 +23,7 @@
"type": 3,
"lv": 3,
"exp": 300,
"etime": 0,
"etime": 52,
"reward": []
},
{
@ -32,7 +32,7 @@
"type": 3,
"lv": 4,
"exp": 400,
"etime": 0,
"etime": 53,
"reward": []
},
{
@ -41,7 +41,7 @@
"type": 3,
"lv": 5,
"exp": 500,
"etime": 0,
"etime": 54,
"reward": []
},
{
@ -50,7 +50,7 @@
"type": 3,
"lv": 6,
"exp": 600,
"etime": 0,
"etime": 55,
"reward": []
},
{
@ -59,7 +59,7 @@
"type": 3,
"lv": 7,
"exp": 700,
"etime": 0,
"etime": 56,
"reward": []
},
{
@ -68,7 +68,7 @@
"type": 3,
"lv": 8,
"exp": 0,
"etime": 0,
"etime": 57,
"reward": []
},
{
@ -77,7 +77,7 @@
"type": 1,
"lv": 1,
"exp": 100,
"etime": 0,
"etime": 50,
"reward": []
},
{
@ -86,7 +86,7 @@
"type": 2,
"lv": 2,
"exp": 200,
"etime": 0,
"etime": 51,
"reward": []
},
{
@ -95,7 +95,7 @@
"type": 3,
"lv": 3,
"exp": 300,
"etime": 0,
"etime": 52,
"reward": []
},
{
@ -104,7 +104,7 @@
"type": 3,
"lv": 4,
"exp": 400,
"etime": 0,
"etime": 53,
"reward": []
},
{
@ -113,7 +113,7 @@
"type": 3,
"lv": 5,
"exp": 500,
"etime": 0,
"etime": 54,
"reward": []
},
{
@ -122,7 +122,7 @@
"type": 3,
"lv": 6,
"exp": 600,
"etime": 0,
"etime": 55,
"reward": []
},
{
@ -131,7 +131,7 @@
"type": 3,
"lv": 7,
"exp": 700,
"etime": 0,
"etime": 56,
"reward": []
},
{
@ -140,7 +140,7 @@
"type": 3,
"lv": 8,
"exp": 0,
"etime": 0,
"etime": 57,
"reward": []
},
{
@ -149,7 +149,7 @@
"type": 1,
"lv": 1,
"exp": 100,
"etime": 0,
"etime": 50,
"reward": []
},
{
@ -158,7 +158,7 @@
"type": 2,
"lv": 2,
"exp": 200,
"etime": 0,
"etime": 51,
"reward": []
},
{
@ -167,7 +167,7 @@
"type": 3,
"lv": 3,
"exp": 300,
"etime": 0,
"etime": 52,
"reward": []
},
{
@ -176,7 +176,7 @@
"type": 3,
"lv": 4,
"exp": 400,
"etime": 0,
"etime": 53,
"reward": []
},
{
@ -185,7 +185,7 @@
"type": 3,
"lv": 5,
"exp": 500,
"etime": 0,
"etime": 54,
"reward": []
},
{
@ -194,7 +194,7 @@
"type": 3,
"lv": 6,
"exp": 600,
"etime": 0,
"etime": 55,
"reward": []
},
{
@ -203,7 +203,7 @@
"type": 3,
"lv": 7,
"exp": 700,
"etime": 0,
"etime": 56,
"reward": []
},
{
@ -212,7 +212,7 @@
"type": 3,
"lv": 8,
"exp": 0,
"etime": 0,
"etime": 57,
"reward": []
}
]

View File

@ -32,9 +32,9 @@
{
"id": 103,
"FormatList": [
700013
700012
],
"BattleReadyID": 126,
"BattleReadyID": 202,
"EventList": [],
"playexp": {
"a": "attr",

View File

@ -136,7 +136,7 @@
"lock": 1,
"lockend": 999,
"ontxe": 20020,
"id_after": 20032,
"id_after": 20040,
"group": 10,
"exgroup": 210,
"des": 2,
@ -179,7 +179,7 @@
"lock": 1,
"lockend": 999,
"ontxe": 20030,
"id_after": 20032,
"id_after": 20041,
"group": 10,
"exgroup": 210,
"des": 2,
@ -221,8 +221,8 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20031,
"id_after": 20033,
"ontxe": 20040,
"id_after": 20042,
"group": 10,
"exgroup": 210,
"des": 2,
@ -239,7 +239,13 @@
"key": "worldtask_world_task_npctxt_7",
"text": "新的伙伴"
},
"get_item": [],
"get_item": [
{
"a": "attr",
"t": "diamond",
"n": 200
}
],
"trigger": 0,
"npc": 100411,
"completetask": [
@ -247,7 +253,7 @@
],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"auto_accept": 1,
"tasktips": 0,
"lock_add": 0,
"reword": [
@ -264,8 +270,8 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20032,
"id_after": 20040,
"ontxe": 20041,
"id_after": 20050,
"group": 10,
"exgroup": 210,
"des": 2,
@ -307,7 +313,7 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20040,
"ontxe": 20042,
"id_after": 20100,
"group": 10,
"exgroup": 210,
@ -331,7 +337,7 @@
"completetask": [
12070050
],
"deliver_npc": 10058,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,

View File

@ -1,40 +1,5 @@
机器人总数: 3000
成功数量: 3000
机器人总数: 1
成功数量: 0
失败数量: 0
消息总吞吐量: 453410
消息总吞吐量: 0
---消息压测详情----------------------------------------------------------------------------------------------------
消息名:horoscope.info 请求次数:2534 耗时最小:13 ms 耗时最大:1517 ms 平均耗时:23.89ms 中位耗时:18.00ms
消息名:wtask.battlestart 请求次数:4562 耗时最小:14 ms 耗时最大:1602 ms 平均耗时:22.89ms 中位耗时:19.00ms
消息名:viking.getlist 请求次数:24440 耗时最小:12 ms 耗时最大:1677 ms 平均耗时:27.79ms 中位耗时:18.00ms
消息名:caravan.getstory 请求次数:4804 耗时最小:14 ms 耗时最大:1502 ms 平均耗时:22.80ms 中位耗时:19.00ms
消息名:user.login 请求次数:3000 耗时最小:18 ms 耗时最大:2077 ms 平均耗时:617.76ms 中位耗时:669.00ms
消息名:user.create 请求次数:2929 耗时最小:13 ms 耗时最大:1663 ms 平均耗时:23.82ms 中位耗时:23.00ms
消息名:hero.talentlist 请求次数:2856 耗时最小:13 ms 耗时最大:1673 ms 平均耗时:21.26ms 中位耗时:18.00ms
消息名:arena.info 请求次数:2624 耗时最小:14 ms 耗时最大:1608 ms 平均耗时:24.16ms 中位耗时:18.00ms
消息名:shop.buy 请求次数:10 耗时最小:19 ms 耗时最大:20 ms 平均耗时:19.90ms 中位耗时:20.00ms
消息名:pagoda.challenge 请求次数:24440 耗时最小:14 ms 耗时最大:1695 ms 平均耗时:29.91ms 中位耗时:19.00ms
消息名:wtask.completecondi 请求次数:4558 耗时最小:14 ms 耗时最大:1634 ms 平均耗时:21.51ms 中位耗时:19.00ms
消息名:wtask.finish 请求次数:9084 耗时最小:14 ms 耗时最大:1597 ms 平均耗时:33.65ms 中位耗时:20.00ms
消息名:chat.send 请求次数:24440 耗时最小:12 ms 耗时最大:260 ms 平均耗时:17.75ms 中位耗时:17.00ms
消息名:viking.challenge 请求次数:23997 耗时最小:15 ms 耗时最大:1696 ms 平均耗时:24.35ms 中位耗时:21.00ms
消息名:items.getlist 请求次数:2789 耗时最小:13 ms 耗时最大:1672 ms 平均耗时:24.68ms 中位耗时:18.00ms
消息名:arena.challengereward 请求次数:23669 耗时最小:16 ms 耗时最大:1832 ms 平均耗时:27.43ms 中位耗时:23.00ms
消息名:viking.challengeover 请求次数:23931 耗时最小:21 ms 耗时最大:1660 ms 平均耗时:32.46ms 中位耗时:28.00ms
消息名:caravan.buyorsell 请求次数:23990 耗时最小:15 ms 耗时最大:1676 ms 平均耗时:22.97ms 中位耗时:20.00ms
消息名:wtask.info 请求次数:2644 耗时最小:15 ms 耗时最大:1591 ms 平均耗时:25.65ms 中位耗时:19.00ms
消息名:pagoda.getlist 请求次数:2560 耗时最小:14 ms 耗时最大:1600 ms 平均耗时:25.20ms 中位耗时:18.00ms
消息名:sys.funcgetlist 请求次数:2488 耗时最小:14 ms 耗时最大:1585 ms 平均耗时:29.65ms 中位耗时:18.00ms
消息名:wtask.accept 请求次数:11291 耗时最小:13 ms 耗时最大:1687 ms 平均耗时:23.51ms 中位耗时:19.00ms
消息名:equipment.getlist 请求次数:2814 耗时最小:13 ms 耗时最大:1654 ms 平均耗时:25.51ms 中位耗时:18.00ms
消息名:arena.matche 请求次数:24440 耗时最小:17 ms 耗时最大:1667 ms 平均耗时:35.70ms 中位耗时:23.00ms
消息名:arena.challenge 请求次数:23730 耗时最小:16 ms 耗时最大:1671 ms 平均耗时:25.51ms 中位耗时:22.00ms
消息名:wtask.battlefinish 请求次数:4548 耗时最小:20 ms 耗时最大:1534 ms 平均耗时:30.21ms 中位耗时:27.00ms
消息名:caravan.getlist 请求次数:2514 耗时最小:17 ms 耗时最大:1820 ms 平均耗时:35.19ms 中位耗时:22.00ms
消息名:hero.drawcard 请求次数:24440 耗时最小:39 ms 耗时最大:3471 ms 平均耗时:75.41ms 中位耗时:65.00ms
消息名:equipment.upgrade 请求次数:24440 耗时最小:15 ms 耗时最大:1692 ms 平均耗时:29.80ms 中位耗时:20.00ms
消息名:horoscope.upgrade 请求次数:24440 耗时最小:19 ms 耗时最大:1709 ms 平均耗时:40.10ms 中位耗时:29.00ms
消息名:caravan.gotocity 请求次数:24440 耗时最小:15 ms 耗时最大:1744 ms 平均耗时:30.51ms 中位耗时:21.00ms
消息名:hero.list 请求次数:2856 耗时最小:13 ms 耗时最大:1739 ms 平均耗时:30.70ms 中位耗时:19.00ms
消息名:gm.cmd 请求次数:40555 耗时最小:13 ms 耗时最大:1892 ms 平均耗时:22.10ms 中位耗时:19.00ms
消息名:shop.getlist 请求次数:2605 耗时最小:14 ms 耗时最大:1563 ms 平均耗时:30.70ms 中位耗时:19.00ms
消息名:pagoda.challengeover 请求次数:23948 耗时最小:19 ms 耗时最大:1810 ms 平均耗时:31.71ms 中位耗时:28.00ms

View File

@ -41,6 +41,9 @@ func (this *ModuleRobot_MainLine) Receive(robot IRobot, stype string, message pr
case "info":
resp := message.(*pb.MainlineInfoResp)
this.info = resp.Info
if this.info.Level == nil {
this.info.Level = make(map[int32]int32)
}
break
case "create":
// resp := message.(*pb.UserCreateResp)
@ -71,6 +74,9 @@ func (this *ModuleRobot_MainLine) DoPipeline(robot IRobot) (err error) {
if conf, err = this.findcanpasslevel(); err != nil { //找到目标管卡
return
}
switch conf.Episodetype {
case 1, 4, 8:
heromodule = robot.GetModule(comm.ModuleHero).(*ModuleRobot_Hero)
heros = heromodule.getbattlehero()
if resp, errdata = robot.SendMessage("mainline", "challenge",
@ -87,6 +93,15 @@ func (this *ModuleRobot_MainLine) DoPipeline(robot IRobot) (err error) {
err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
return
}
break
case 0, 3, 7:
if _, errdata = robot.SendMessage("mainline", "levelpass", &pb.MainlineLevelPassReq{Level: conf.Id}); errdata != nil {
err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
return
}
default:
err = fmt.Errorf("no fund mainline id:%d type:%d", conf.Id, conf.Episodetype)
}
this.info.Level[conf.Id] = 32
return
}

View File

@ -55,6 +55,12 @@ func (this *ModuleRobot_WTask) Receive(robot IRobot, stype string, message proto
break
}
}
for _, v := range this.progress {
if v.Tid == resp.Progress.Tid {
v.Conlds = resp.Progress.Conlds
return
}
}
this.progress = append(this.progress, resp.Progress)
break
case "finish":

View File

@ -288,8 +288,8 @@ type DBShop struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id
RefreshnumgoldShop int32 `protobuf:"varint,3,opt,name=refreshnumgoldShop,proto3" json:"refreshnumgoldShop" bson:"refresholdShop"` //刷新金币商店次数
RefreshtimegoldShop int64 `protobuf:"varint,4,opt,name=refreshtimegoldShop,proto3" json:"refreshtimegoldShop" bson:"refresholdShop"` //刷新金币商店的时间
RefreshnumgoldShop int32 `protobuf:"varint,3,opt,name=refreshnumgoldShop,proto3" json:"refreshnumgoldShop" bson:"refreshnumgoldShop"` //刷新金币商店次数
RefreshtimegoldShop int64 `protobuf:"varint,4,opt,name=refreshtimegoldShop,proto3" json:"refreshtimegoldShop" bson:"refreshtimegoldShop"` //刷新金币商店的时间
GoldShop *UserShopData `protobuf:"bytes,5,opt,name=goldShop,proto3" json:"goldShop" bson:"goldShop"` //金币商店数据
DiamondShop *UserShopData `protobuf:"bytes,6,opt,name=diamondShop,proto3" json:"diamondShop" bson:"diamondShop"` //金币商店数据
PvpShop *UserShopData `protobuf:"bytes,7,opt,name=pvpShop,proto3" json:"pvpShop" bson:"pvpShop"` //金币商店数据