This commit is contained in:
liwei 2022-08-04 11:48:14 +08:00
commit f9bc78747b
20 changed files with 2661 additions and 4959 deletions

View File

@ -3055,6 +3055,270 @@
"key": "skill_190011004",
"text_cn": "伤害提升至130%"
},
{
"key": "skill_buff_390001001",
"text_cn": "攻击提升"
},
{
"key": "skill_buff_390001002",
"text_cn": "防御提升"
},
{
"key": "skill_buff_390001003",
"text_cn": "速度提升"
},
{
"key": "skill_buff_390001004",
"text_cn": "暴击提升"
},
{
"key": "skill_buff_390001005",
"text_cn": "暴击抵抗"
},
{
"key": "skill_buff_390001006",
"text_cn": "叹息之力"
},
{
"key": "skill_buff_390001007",
"text_cn": "公牛之怒"
},
{
"key": "skill_buff_390001008",
"text_cn": "雷之庇佑"
},
{
"key": "skill_buff_390002001",
"text_cn": "攻击下降"
},
{
"key": "skill_buff_390002002",
"text_cn": "防御下降"
},
{
"key": "skill_buff_390002003",
"text_cn": "速度下降"
},
{
"key": "skill_buff_390002004",
"text_cn": "暴击下降"
},
{
"key": "skill_buff_390002005",
"text_cn": "烙印"
},
{
"key": "skill_buff_390002006",
"text_cn": "失手率提升"
},
{
"key": "skill_buff_390003001",
"text_cn": "无敌"
},
{
"key": "skill_buff_390003002",
"text_cn": "对峙"
},
{
"key": "skill_buff_390003003",
"text_cn": "免疫控制效果"
},
{
"key": "skill_buff_390003004",
"text_cn": "免除死亡"
},
{
"key": "skill_buff_390004001",
"text_cn": "眩晕"
},
{
"key": "skill_buff_390004002",
"text_cn": "冰冻"
},
{
"key": "skill_buff_390004003",
"text_cn": "禁疗"
},
{
"key": "skill_buff_390004004",
"text_cn": "石化"
},
{
"key": "skill_buff_390004005",
"text_cn": "沉默"
},
{
"key": "skill_buff_390004006",
"text_cn": "吞噬"
},
{
"key": "skill_buff_390004007",
"text_cn": "挑衅"
},
{
"key": "skill_buff_390004008",
"text_cn": "猫猫威慑"
},
{
"key": "skill_buff_390005001",
"text_cn": "炎阳"
},
{
"key": "skill_buff_390005002",
"text_cn": "无法获得减益"
},
{
"key": "skill_buff_390005003",
"text_cn": "不会失手"
},
{
"key": "skill_buff_390006001",
"text_cn": "无法获得增益"
},
{
"key": "skill_buff_300192114",
"text_cn": "猫猫推理"
},
{
"key": "skill_buff_300192115",
"text_cn": "护盾"
},
{
"key": "skill_buffdes_390001001",
"text_cn": "攻击提升40%"
},
{
"key": "skill_buffdes_390001002",
"text_cn": "防御提升60%"
},
{
"key": "skill_buffdes_390001003",
"text_cn": "速度提升30%"
},
{
"key": "skill_buffdes_390001004",
"text_cn": "暴击率提升30%"
},
{
"key": "skill_buffdes_390001005",
"text_cn": "受到暴击概率降低30%"
},
{
"key": "skill_buffdes_390001006",
"text_cn": "无法驱散类状态每层使自身攻击力提升5%每10层使自身受到伤害降低3%。最高可叠加50层"
},
{
"key": "skill_buffdes_390001007",
"text_cn": "每层使自身基础防御提升10%效果抵抗提升5%最多可叠加10层。"
},
{
"key": "skill_buffdes_390001008",
"text_cn": "每次受到攻击提升20%的防御最多叠加5层"
},
{
"key": "skill_buffdes_390002001",
"text_cn": "攻击下降40%"
},
{
"key": "skill_buffdes_390002002",
"text_cn": "防御下降60%"
},
{
"key": "skill_buffdes_390002003",
"text_cn": "速度下降30%"
},
{
"key": "skill_buffdes_390002004",
"text_cn": "暴击率下降30%"
},
{
"key": "skill_buffdes_390002005",
"text_cn": "被攻击时受到的伤害提高25%"
},
{
"key": "skill_buffdes_390002006",
"text_cn": "失手率提升50%"
},
{
"key": "skill_buffdes_390003001",
"text_cn": "不会受到任何伤害"
},
{
"key": "skill_buffdes_390003002",
"text_cn": "生命最低降为1"
},
{
"key": "skill_buffdes_390003003",
"text_cn": "无法被附加任何控制效果"
},
{
"key": "skill_buffdes_390003004",
"text_cn": ""
},
{
"key": "skill_buffdes_390004001",
"text_cn": "无法进行任务行动"
},
{
"key": "skill_buffdes_390004002",
"text_cn": "无法进行任何行动"
},
{
"key": "skill_buffdes_390004003",
"text_cn": "无法恢复生命"
},
{
"key": "skill_buffdes_390004004",
"text_cn": "无法进行任何行动,不会随着回合到来降低技能冷却"
},
{
"key": "skill_buffdes_390004005",
"text_cn": "只能释放基础技能"
},
{
"key": "skill_buffdes_390004006",
"text_cn": "无法进行任何行动,无法被选中,无法被攻击,无法获得任何强化及弱化效果"
},
{
"key": "skill_buffdes_390004007",
"text_cn": "回合开始时,会被迫发起攻击,向附加状态者释放基础技能"
},
{
"key": "skill_buffdes_390004008",
"text_cn": "携带者阵亡时清除此状态并对携带者一方全体造成崔佛释放者攻击力40%的效果附加伤害每层使伤害系数提升40%最多可叠加5层。"
},
{
"key": "skill_buffdes_390005001",
"text_cn": "(无法驱散类状态)可以增强炎阳灼射的威力。"
},
{
"key": "skill_buffdes_390005002",
"text_cn": "无法获得减益效果(不可驱散)(不配置标签)"
},
{
"key": "skill_buffdes_390005003",
"text_cn": "不会失手"
},
{
"key": "skill_buffdes_390006001",
"text_cn": "无法附加增益状态(不可驱散)(不配置标签)"
},
{
"key": "skill_buffdes_300102103",
"text_cn": "受到的所有伤害降低10%"
},
{
"key": "skill_buffdes_300162105",
"text_cn": ""
},
{
"key": "skill_buffdes_300192114",
"text_cn": "每层为崔佛释放者提供15%伤害减免"
},
{
"key": "skill_buffdes_300192115",
"text_cn": "增加护盾"
},
{
"key": "hero_10001",
"text_cn": "基础生命"
@ -3357,7 +3621,7 @@
},
{
"key": "num_1001",
"text_cn": "主线入口"
"text_cn": "迷雾岛屿"
},
{
"key": "num_1002",
@ -3369,15 +3633,15 @@
},
{
"key": "num_1004",
"text_cn": "武馆入口"
"text_cn": "地下角斗场"
},
{
"key": "num_1005",
"text_cn": "主题活动入口"
"text_cn": "商队"
},
{
"key": "num_1006",
"text_cn": "迷雾岛屿"
"text_cn": "藏书馆"
},
{
"key": "num_1007",
@ -3397,7 +3661,7 @@
},
{
"key": "num_1011",
"text_cn": "地下角斗场"
"text_cn": "武馆入口"
},
{
"key": "num_1012",
@ -3409,7 +3673,7 @@
},
{
"key": "num_1014",
"text_cn": "藏书馆"
"text_cn": "主线入口"
},
{
"key": "num_1015",
@ -3417,7 +3681,7 @@
},
{
"key": "num_1016",
"text_cn": "商队"
"text_cn": "主题活动入口"
},
{
"key": "num_1017",
@ -3426,5 +3690,17 @@
{
"key": "num_1018",
"text_cn": "戈伯铁匠铺"
},
{
"key": "num_1019",
"text_cn": "背包"
},
{
"key": "num_1020",
"text_cn": "联盟"
},
{
"key": "num_1021",
"text_cn": "邮件"
}
]

View File

@ -3055,6 +3055,270 @@
"key": "skill_190011004",
"text_en": "Damage increased to 130%"
},
{
"key": "skill_buff_390001001",
"text_en": ""
},
{
"key": "skill_buff_390001002",
"text_en": ""
},
{
"key": "skill_buff_390001003",
"text_en": ""
},
{
"key": "skill_buff_390001004",
"text_en": ""
},
{
"key": "skill_buff_390001005",
"text_en": ""
},
{
"key": "skill_buff_390001006",
"text_en": ""
},
{
"key": "skill_buff_390001007",
"text_en": ""
},
{
"key": "skill_buff_390001008",
"text_en": ""
},
{
"key": "skill_buff_390002001",
"text_en": ""
},
{
"key": "skill_buff_390002002",
"text_en": ""
},
{
"key": "skill_buff_390002003",
"text_en": ""
},
{
"key": "skill_buff_390002004",
"text_en": ""
},
{
"key": "skill_buff_390002005",
"text_en": ""
},
{
"key": "skill_buff_390002006",
"text_en": ""
},
{
"key": "skill_buff_390003001",
"text_en": ""
},
{
"key": "skill_buff_390003002",
"text_en": ""
},
{
"key": "skill_buff_390003003",
"text_en": ""
},
{
"key": "skill_buff_390003004",
"text_en": ""
},
{
"key": "skill_buff_390004001",
"text_en": ""
},
{
"key": "skill_buff_390004002",
"text_en": ""
},
{
"key": "skill_buff_390004003",
"text_en": ""
},
{
"key": "skill_buff_390004004",
"text_en": ""
},
{
"key": "skill_buff_390004005",
"text_en": ""
},
{
"key": "skill_buff_390004006",
"text_en": ""
},
{
"key": "skill_buff_390004007",
"text_en": ""
},
{
"key": "skill_buff_390004008",
"text_en": ""
},
{
"key": "skill_buff_390005001",
"text_en": ""
},
{
"key": "skill_buff_390005002",
"text_en": ""
},
{
"key": "skill_buff_390005003",
"text_en": ""
},
{
"key": "skill_buff_390006001",
"text_en": ""
},
{
"key": "skill_buff_300192114",
"text_en": ""
},
{
"key": "skill_buff_300192115",
"text_en": ""
},
{
"key": "skill_buffdes_390001001",
"text_en": ""
},
{
"key": "skill_buffdes_390001002",
"text_en": ""
},
{
"key": "skill_buffdes_390001003",
"text_en": ""
},
{
"key": "skill_buffdes_390001004",
"text_en": ""
},
{
"key": "skill_buffdes_390001005",
"text_en": ""
},
{
"key": "skill_buffdes_390001006",
"text_en": ""
},
{
"key": "skill_buffdes_390001007",
"text_en": ""
},
{
"key": "skill_buffdes_390001008",
"text_en": ""
},
{
"key": "skill_buffdes_390002001",
"text_en": ""
},
{
"key": "skill_buffdes_390002002",
"text_en": ""
},
{
"key": "skill_buffdes_390002003",
"text_en": ""
},
{
"key": "skill_buffdes_390002004",
"text_en": ""
},
{
"key": "skill_buffdes_390002005",
"text_en": ""
},
{
"key": "skill_buffdes_390002006",
"text_en": ""
},
{
"key": "skill_buffdes_390003001",
"text_en": ""
},
{
"key": "skill_buffdes_390003002",
"text_en": ""
},
{
"key": "skill_buffdes_390003003",
"text_en": ""
},
{
"key": "skill_buffdes_390003004",
"text_en": ""
},
{
"key": "skill_buffdes_390004001",
"text_en": ""
},
{
"key": "skill_buffdes_390004002",
"text_en": ""
},
{
"key": "skill_buffdes_390004003",
"text_en": ""
},
{
"key": "skill_buffdes_390004004",
"text_en": ""
},
{
"key": "skill_buffdes_390004005",
"text_en": ""
},
{
"key": "skill_buffdes_390004006",
"text_en": ""
},
{
"key": "skill_buffdes_390004007",
"text_en": ""
},
{
"key": "skill_buffdes_390004008",
"text_en": ""
},
{
"key": "skill_buffdes_390005001",
"text_en": ""
},
{
"key": "skill_buffdes_390005002",
"text_en": ""
},
{
"key": "skill_buffdes_390005003",
"text_en": ""
},
{
"key": "skill_buffdes_390006001",
"text_en": ""
},
{
"key": "skill_buffdes_300102103",
"text_en": ""
},
{
"key": "skill_buffdes_300162105",
"text_en": ""
},
{
"key": "skill_buffdes_300192114",
"text_en": ""
},
{
"key": "skill_buffdes_300192115",
"text_en": ""
},
{
"key": "hero_10001",
"text_en": "basic life"
@ -3329,15 +3593,15 @@
},
{
"key": "opencond_name_10002",
"text_en": ""
"text_en": "CARD"
},
{
"key": "opencond_name_10003",
"text_en": ""
"text_en": "SHOPS"
},
{
"key": "opencond_name_10004",
"text_en": ""
"text_en": "FRIENDS"
},
{
"key": "opencond_name_10005",
@ -3357,7 +3621,7 @@
},
{
"key": "num_1001",
"text_en": "TRIALS"
"text_en": "Misty Island"
},
{
"key": "num_1002",
@ -3369,47 +3633,47 @@
},
{
"key": "num_1004",
"text_en": "KONG FU"
},
{
"key": "num_1005",
"text_en": "EVENT"
},
{
"key": "num_1006",
"text_en": "Misty Island"
},
{
"key": "num_1007",
"text_en": "Viking expedition"
},
{
"key": "num_1008",
"text_en": "Heart demon tower"
},
{
"key": "num_1009",
"text_en": "Catch sheep"
},
{
"key": "num_1010",
"text_en": "Dark cuisine"
},
{
"key": "num_1011",
"text_en": "Underground Arena"
},
{
"key": "num_1005",
"text_en": "Caravan"
},
{
"key": "num_1006",
"text_en": "Library"
},
{
"key": "num_1007",
"text_en": "EXPEDITION"
},
{
"key": "num_1008",
"text_en": "GUARD"
},
{
"key": "num_1009",
"text_en": "BATTLE"
},
{
"key": "num_1010",
"text_en": "DARK CUISINE"
},
{
"key": "num_1011",
"text_en": "KUNG FU"
},
{
"key": "num_1012",
"text_en": "Crazy competition"
"text_en": "CRAZED"
},
{
"key": "num_1013",
"text_en": "Five heroes challenge"
"text_en": "TRAIN"
},
{
"key": "num_1014",
"text_en": "Library"
"text_en": "TRIALS"
},
{
"key": "num_1015",
@ -3417,7 +3681,7 @@
},
{
"key": "num_1016",
"text_en": "Caravan"
"text_en": "MIRROR"
},
{
"key": "num_1017",
@ -3426,5 +3690,17 @@
{
"key": "num_1018",
"text_en": "Gober blacksmith shop"
},
{
"key": "num_1019",
"text_en": "INVENTORY"
},
{
"key": "num_1020",
"text_en": "UNION"
},
{
"key": "num_1021",
"text_en": "MAIL"
}
]

View File

@ -3055,6 +3055,270 @@
"key": "skill_190011004",
"text_tw": ""
},
{
"key": "skill_buff_390001001",
"text_tw": ""
},
{
"key": "skill_buff_390001002",
"text_tw": ""
},
{
"key": "skill_buff_390001003",
"text_tw": ""
},
{
"key": "skill_buff_390001004",
"text_tw": ""
},
{
"key": "skill_buff_390001005",
"text_tw": ""
},
{
"key": "skill_buff_390001006",
"text_tw": ""
},
{
"key": "skill_buff_390001007",
"text_tw": ""
},
{
"key": "skill_buff_390001008",
"text_tw": ""
},
{
"key": "skill_buff_390002001",
"text_tw": ""
},
{
"key": "skill_buff_390002002",
"text_tw": ""
},
{
"key": "skill_buff_390002003",
"text_tw": ""
},
{
"key": "skill_buff_390002004",
"text_tw": ""
},
{
"key": "skill_buff_390002005",
"text_tw": ""
},
{
"key": "skill_buff_390002006",
"text_tw": ""
},
{
"key": "skill_buff_390003001",
"text_tw": ""
},
{
"key": "skill_buff_390003002",
"text_tw": ""
},
{
"key": "skill_buff_390003003",
"text_tw": ""
},
{
"key": "skill_buff_390003004",
"text_tw": ""
},
{
"key": "skill_buff_390004001",
"text_tw": ""
},
{
"key": "skill_buff_390004002",
"text_tw": ""
},
{
"key": "skill_buff_390004003",
"text_tw": ""
},
{
"key": "skill_buff_390004004",
"text_tw": ""
},
{
"key": "skill_buff_390004005",
"text_tw": ""
},
{
"key": "skill_buff_390004006",
"text_tw": ""
},
{
"key": "skill_buff_390004007",
"text_tw": ""
},
{
"key": "skill_buff_390004008",
"text_tw": ""
},
{
"key": "skill_buff_390005001",
"text_tw": ""
},
{
"key": "skill_buff_390005002",
"text_tw": ""
},
{
"key": "skill_buff_390005003",
"text_tw": ""
},
{
"key": "skill_buff_390006001",
"text_tw": ""
},
{
"key": "skill_buff_300192114",
"text_tw": ""
},
{
"key": "skill_buff_300192115",
"text_tw": ""
},
{
"key": "skill_buffdes_390001001",
"text_tw": ""
},
{
"key": "skill_buffdes_390001002",
"text_tw": ""
},
{
"key": "skill_buffdes_390001003",
"text_tw": ""
},
{
"key": "skill_buffdes_390001004",
"text_tw": ""
},
{
"key": "skill_buffdes_390001005",
"text_tw": ""
},
{
"key": "skill_buffdes_390001006",
"text_tw": ""
},
{
"key": "skill_buffdes_390001007",
"text_tw": ""
},
{
"key": "skill_buffdes_390001008",
"text_tw": ""
},
{
"key": "skill_buffdes_390002001",
"text_tw": ""
},
{
"key": "skill_buffdes_390002002",
"text_tw": ""
},
{
"key": "skill_buffdes_390002003",
"text_tw": ""
},
{
"key": "skill_buffdes_390002004",
"text_tw": ""
},
{
"key": "skill_buffdes_390002005",
"text_tw": ""
},
{
"key": "skill_buffdes_390002006",
"text_tw": ""
},
{
"key": "skill_buffdes_390003001",
"text_tw": ""
},
{
"key": "skill_buffdes_390003002",
"text_tw": ""
},
{
"key": "skill_buffdes_390003003",
"text_tw": ""
},
{
"key": "skill_buffdes_390003004",
"text_tw": ""
},
{
"key": "skill_buffdes_390004001",
"text_tw": ""
},
{
"key": "skill_buffdes_390004002",
"text_tw": ""
},
{
"key": "skill_buffdes_390004003",
"text_tw": ""
},
{
"key": "skill_buffdes_390004004",
"text_tw": ""
},
{
"key": "skill_buffdes_390004005",
"text_tw": ""
},
{
"key": "skill_buffdes_390004006",
"text_tw": ""
},
{
"key": "skill_buffdes_390004007",
"text_tw": ""
},
{
"key": "skill_buffdes_390004008",
"text_tw": ""
},
{
"key": "skill_buffdes_390005001",
"text_tw": ""
},
{
"key": "skill_buffdes_390005002",
"text_tw": ""
},
{
"key": "skill_buffdes_390005003",
"text_tw": ""
},
{
"key": "skill_buffdes_390006001",
"text_tw": ""
},
{
"key": "skill_buffdes_300102103",
"text_tw": ""
},
{
"key": "skill_buffdes_300162105",
"text_tw": ""
},
{
"key": "skill_buffdes_300192114",
"text_tw": ""
},
{
"key": "skill_buffdes_300192115",
"text_tw": ""
},
{
"key": "hero_10001",
"text_tw": ""
@ -3426,5 +3690,17 @@
{
"key": "num_1018",
"text_tw": ""
},
{
"key": "num_1019",
"text_tw": ""
},
{
"key": "num_1020",
"text_tw": ""
},
{
"key": "num_1021",
"text_tw": ""
}
]

View File

@ -768,13 +768,7 @@
},
{
"level": 60,
"heroexp": [
{
"a": "attr",
"t": "heroexp",
"n": 57000
}
],
"heroexp": [],
"hp": 7521,
"atk": 473.3,
"def": 532.3

View File

@ -430,5 +430,77 @@
"key": "num_1018",
"text": "num_1018"
}
},
{
"keycode": {
"key": "skill_190011000",
"text": "skill_190011000"
}
},
{
"keycode": {
"key": "skill_190012000",
"text": "skill_190012000"
}
},
{
"keycode": {
"key": "skill_190013000",
"text": "skill_190013000"
}
},
{
"keycode": {
"key": "skill_190014000",
"text": "skill_190014000"
}
},
{
"keycode": {
"key": "skill_190015000",
"text": "skill_190015000"
}
},
{
"keycode": {
"key": "skill_190016000",
"text": "skill_190016000"
}
},
{
"keycode": {
"key": "skill_190017000",
"text": "skill_190017000"
}
},
{
"keycode": {
"key": "skill_190018000",
"text": "skill_190018000"
}
},
{
"keycode": {
"key": "skill_190011001",
"text": "skill_190011001"
}
},
{
"keycode": {
"key": "skill_190011002",
"text": "skill_190011002"
}
},
{
"keycode": {
"key": "skill_190011003",
"text": "skill_190011003"
}
},
{
"keycode": {
"key": "skill_190011004",
"text": "skill_190011004"
}
}
]

386
bin/json/game_opencond.json Normal file
View File

@ -0,0 +1,386 @@
[
{
"id": "hero",
"name": {
"key": "opencond_name_10002",
"text": "英雄"
},
"main": "{\u0022lv\u0022: 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
}
},
{
"id": "backpack",
"name": {
"key": "opencond_name_10006",
"text": "背包"
},
"main": "{\u0022lv\u0022: 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
}
},
{
"id": "shop",
"name": {
"key": "opencond_name_10003",
"text": "商店"
},
"main": "{\u0022lv\u0022: 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
}
},
{
"id": "friend",
"name": {
"key": "opencond_name_10004",
"text": "好友"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "alliance",
"name": {
"key": "opencond_name_10007",
"text": "活动"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "task",
"name": {
"key": "opencond_name_10005",
"text": "任务"
},
"main": "{\u0022lv\u0022: 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
}
},
{
"id": "trials",
"name": {
"key": "num_1001",
"text": "主线入口"
},
"main": "{\u0022lv\u0022: 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
}
},
{
"id": "moon",
"name": {
"key": "num_1002",
"text": "招募"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "story",
"name": {
"key": "num_1003",
"text": "剧情副本"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "kungfu",
"name": {
"key": "num_1004",
"text": "武馆入口"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "event",
"name": {
"key": "num_1005",
"text": "主题活动入口"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "mistyIsland",
"name": {
"key": "num_1006",
"text": "迷雾岛屿"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "vikingexpedition",
"name": {
"key": "num_1007",
"text": "维京远征"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "hjeart demon tower",
"name": {
"key": "num_1008",
"text": "心魔塔"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "catchsheep",
"name": {
"key": "num_1009",
"text": "捕羊大赛"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "darkcuisine",
"name": {
"key": "num_1010",
"text": "黑暗料理大赛"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "underground Arena",
"name": {
"key": "num_1011",
"text": "地下角斗场"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "crazycompetition",
"name": {
"key": "num_1012",
"text": "疯狂竞技赛"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "fiveheroeschallenge",
"name": {
"key": "num_1013",
"text": "五侠擂台"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "library",
"name": {
"key": "num_1014",
"text": "藏书馆"
},
"main": "{\u0022lv\u0022: 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
}
},
{
"id": "bonfiredance",
"name": {
"key": "num_1015",
"text": "篝火舞会"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "caravan",
"name": {
"key": "num_1016",
"text": "商队"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "gourmetrestaurant",
"name": {
"key": "num_1017",
"text": "美食馆"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
},
{
"id": "goberblacksmithshop",
"name": {
"key": "num_1018",
"text": "戈伯铁匠铺"
},
"main": "{\u0022lv\u0022: 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_prompt_10002",
"text": "暂不开启,敬请期待"
}
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,8 +2,14 @@
{
"Id": 390001001,
"Type": "ProBuff",
"Name": "攻击提升",
"Desc": "攻击提升40%",
"Name": {
"key": "skill_buff_390001001",
"text": "攻击提升"
},
"Desc": {
"key": "skill_buffdes_390001001",
"text": "攻击提升40%"
},
"Tags": [
"201"
],
@ -20,8 +26,14 @@
{
"Id": 390001002,
"Type": "ProBuff",
"Name": "防御提升",
"Desc": "防御提升60%",
"Name": {
"key": "skill_buff_390001002",
"text": "防御提升"
},
"Desc": {
"key": "skill_buffdes_390001002",
"text": "防御提升60%"
},
"Tags": [
"201"
],
@ -38,8 +50,14 @@
{
"Id": 390001003,
"Type": "ProBuff",
"Name": "速度提升",
"Desc": "速度提升30%",
"Name": {
"key": "skill_buff_390001003",
"text": "速度提升"
},
"Desc": {
"key": "skill_buffdes_390001003",
"text": "速度提升30%"
},
"Tags": [
"201"
],
@ -56,8 +74,14 @@
{
"Id": 390001004,
"Type": "ProBuff",
"Name": "暴击提升",
"Desc": "暴击率提升30%",
"Name": {
"key": "skill_buff_390001004",
"text": "暴击提升"
},
"Desc": {
"key": "skill_buffdes_390001004",
"text": "暴击率提升30%"
},
"Tags": [
"201"
],
@ -74,8 +98,14 @@
{
"Id": 390001005,
"Type": "ProBuff",
"Name": "暴击抵抗",
"Desc": "受到暴击概率降低30%",
"Name": {
"key": "skill_buff_390001005",
"text": "暴击抵抗"
},
"Desc": {
"key": "skill_buffdes_390001005",
"text": "受到暴击概率降低30%"
},
"Tags": [
"201"
],
@ -92,8 +122,14 @@
{
"Id": 390001006,
"Type": "ProBuff",
"Name": "叹息之力",
"Desc": "无法驱散类状态每层使自身攻击力提升5%每10层使自身受到伤害降低3%。最高可叠加50层",
"Name": {
"key": "skill_buff_390001006",
"text": "叹息之力"
},
"Desc": {
"key": "skill_buffdes_390001006",
"text": "无法驱散类状态每层使自身攻击力提升5%每10层使自身受到伤害降低3%。最高可叠加50层"
},
"Tags": [
"303"
],
@ -110,8 +146,14 @@
{
"Id": 390001007,
"Type": "ProBuff",
"Name": "公牛之怒",
"Desc": "每层使自身基础防御提升10%效果抵抗提升5%最多可叠加10层。",
"Name": {
"key": "skill_buff_390001007",
"text": "公牛之怒"
},
"Desc": {
"key": "skill_buffdes_390001007",
"text": "每层使自身基础防御提升10%效果抵抗提升5%最多可叠加10层。"
},
"Tags": [
"201"
],
@ -128,8 +170,14 @@
{
"Id": 390001008,
"Type": "ProBuff",
"Name": "雷之庇佑",
"Desc": "每次受到攻击提升20%的防御最多叠加5层",
"Name": {
"key": "skill_buff_390001008",
"text": "雷之庇佑"
},
"Desc": {
"key": "skill_buffdes_390001008",
"text": "每次受到攻击提升20%的防御最多叠加5层"
},
"Tags": [
"201"
],
@ -146,8 +194,14 @@
{
"Id": 390002001,
"Type": "ProBuff",
"Name": "攻击下降",
"Desc": "攻击下降40%",
"Name": {
"key": "skill_buff_390002001",
"text": "攻击下降"
},
"Desc": {
"key": "skill_buffdes_390002001",
"text": "攻击下降40%"
},
"Tags": [
"202"
],
@ -164,8 +218,14 @@
{
"Id": 390002002,
"Type": "ProBuff",
"Name": "防御下降",
"Desc": "防御下降60%",
"Name": {
"key": "skill_buff_390002002",
"text": "防御下降"
},
"Desc": {
"key": "skill_buffdes_390002002",
"text": "防御下降60%"
},
"Tags": [
"202"
],
@ -182,8 +242,14 @@
{
"Id": 390002003,
"Type": "ProBuff",
"Name": "速度下降",
"Desc": "速度下降30%",
"Name": {
"key": "skill_buff_390002003",
"text": "速度下降"
},
"Desc": {
"key": "skill_buffdes_390002003",
"text": "速度下降30%"
},
"Tags": [
"202"
],
@ -200,8 +266,14 @@
{
"Id": 390002004,
"Type": "ProBuff",
"Name": "暴击下降",
"Desc": "暴击率下降30%",
"Name": {
"key": "skill_buff_390002004",
"text": "暴击下降"
},
"Desc": {
"key": "skill_buffdes_390002004",
"text": "暴击率下降30%"
},
"Tags": [
"202"
],
@ -218,8 +290,14 @@
{
"Id": 390002005,
"Type": "ProBuff",
"Name": "烙印",
"Desc": "被攻击时受到的伤害提高25%",
"Name": {
"key": "skill_buff_390002005",
"text": "烙印"
},
"Desc": {
"key": "skill_buffdes_390002005",
"text": "被攻击时受到的伤害提高25%"
},
"Tags": [
"202"
],
@ -236,8 +314,14 @@
{
"Id": 390002006,
"Type": "ProBuff",
"Name": "失手率提升",
"Desc": "失手率提升50%",
"Name": {
"key": "skill_buff_390002006",
"text": "失手率提升"
},
"Desc": {
"key": "skill_buffdes_390002006",
"text": "失手率提升50%"
},
"Tags": [
"202"
],
@ -254,8 +338,14 @@
{
"Id": 390003001,
"Type": "TagBuff",
"Name": "无敌",
"Desc": "不会受到任何伤害",
"Name": {
"key": "skill_buff_390003001",
"text": "无敌"
},
"Desc": {
"key": "skill_buffdes_390003001",
"text": "不会受到任何伤害"
},
"Tags": [
"201",
"301"
@ -273,8 +363,14 @@
{
"Id": 390003002,
"Type": "TagBuff",
"Name": "对峙",
"Desc": "生命最低降为1",
"Name": {
"key": "skill_buff_390003002",
"text": "对峙"
},
"Desc": {
"key": "skill_buffdes_390003002",
"text": "生命最低降为1"
},
"Tags": [
"201",
"501"
@ -292,8 +388,14 @@
{
"Id": 390003003,
"Type": "TagBuff",
"Name": "免疫控制效果",
"Desc": "无法被附加任何控制效果",
"Name": {
"key": "skill_buff_390003003",
"text": "免疫控制效果"
},
"Desc": {
"key": "skill_buffdes_390003003",
"text": "无法被附加任何控制效果"
},
"Tags": [
"304"
],
@ -310,8 +412,14 @@
{
"Id": 390003004,
"Type": "TagBuff",
"Name": "免除死亡",
"Desc": "",
"Name": {
"key": "skill_buff_390003004",
"text": "免除死亡"
},
"Desc": {
"key": "",
"text": ""
},
"Tags": [
"501"
],
@ -326,8 +434,14 @@
{
"Id": 390004001,
"Type": "TagBuff",
"Name": "眩晕",
"Desc": "无法进行任务行动",
"Name": {
"key": "skill_buff_390004001",
"text": "眩晕"
},
"Desc": {
"key": "skill_buffdes_390004001",
"text": "无法进行任务行动"
},
"Tags": [
"202",
"604"
@ -345,8 +459,14 @@
{
"Id": 390004002,
"Type": "TagBuff",
"Name": "冰冻",
"Desc": "无法进行任何行动",
"Name": {
"key": "skill_buff_390004002",
"text": "冰冻"
},
"Desc": {
"key": "skill_buffdes_390004002",
"text": "无法进行任何行动"
},
"Tags": [
"202",
"604"
@ -364,8 +484,14 @@
{
"Id": 390004003,
"Type": "TagBuff",
"Name": "禁疗",
"Desc": "无法恢复生命",
"Name": {
"key": "skill_buff_390004003",
"text": "禁疗"
},
"Desc": {
"key": "skill_buffdes_390004003",
"text": "无法恢复生命"
},
"Tags": [
"202",
"401"
@ -383,8 +509,14 @@
{
"Id": 390004004,
"Type": "TagBuff",
"Name": "石化",
"Desc": "无法进行任何行动,不会随着回合到来降低技能冷却",
"Name": {
"key": "skill_buff_390004004",
"text": "石化"
},
"Desc": {
"key": "skill_buffdes_390004004",
"text": "无法进行任何行动,不会随着回合到来降低技能冷却"
},
"Tags": [
"202",
"604",
@ -405,8 +537,14 @@
{
"Id": 390004005,
"Type": "TagBuff",
"Name": "沉默",
"Desc": "只能释放基础技能",
"Name": {
"key": "skill_buff_390004005",
"text": "沉默"
},
"Desc": {
"key": "skill_buffdes_390004005",
"text": "只能释放基础技能"
},
"Tags": [
"202",
"603",
@ -426,8 +564,14 @@
{
"Id": 390004006,
"Type": "TagBuff",
"Name": "吞噬",
"Desc": "无法进行任何行动,无法被选中,无法被攻击,无法获得任何强化及弱化效果",
"Name": {
"key": "skill_buff_390004006",
"text": "吞噬"
},
"Desc": {
"key": "skill_buffdes_390004006",
"text": "无法进行任何行动,无法被选中,无法被攻击,无法获得任何强化及弱化效果"
},
"Tags": [
"202",
"604",
@ -448,8 +592,14 @@
{
"Id": 390004007,
"Type": "TagBuff",
"Name": "挑衅",
"Desc": "回合开始时,会被迫发起攻击,向附加状态者释放基础技能",
"Name": {
"key": "skill_buff_390004007",
"text": "挑衅"
},
"Desc": {
"key": "skill_buffdes_390004007",
"text": "回合开始时,会被迫发起攻击,向附加状态者释放基础技能"
},
"Tags": [
"202",
"204"
@ -468,8 +618,14 @@
{
"Id": 390004008,
"Type": "TagBuff",
"Name": "猫猫威慑 ",
"Desc": "携带者阵亡时清除此状态并对携带者一方全体造成崔佛释放者攻击力40%的效果附加伤害每层使伤害系数提升40%最多可叠加5层。",
"Name": {
"key": "skill_buff_390004008",
"text": "猫猫威慑 "
},
"Desc": {
"key": "skill_buffdes_390004008",
"text": "携带者阵亡时清除此状态并对携带者一方全体造成崔佛释放者攻击力40%的效果附加伤害每层使伤害系数提升40%最多可叠加5层。"
},
"Tags": [
"202"
],
@ -486,8 +642,14 @@
{
"Id": 390005001,
"Type": "TagBuff",
"Name": "炎阳",
"Desc": "(无法驱散类状态)可以增强炎阳灼射的威力。",
"Name": {
"key": "skill_buff_390005001",
"text": "炎阳"
},
"Desc": {
"key": "skill_buffdes_390005001",
"text": "(无法驱散类状态)可以增强炎阳灼射的威力。"
},
"Tags": [
"201",
"303"
@ -503,8 +665,14 @@
{
"Id": 390005002,
"Type": "TagBuff",
"Name": "无法获得减益",
"Desc": "无法获得减益效果(不可驱散)(不配置标签)",
"Name": {
"key": "skill_buff_390005002",
"text": "无法获得减益"
},
"Desc": {
"key": "skill_buffdes_390005002",
"text": "无法获得减益效果(不可驱散)(不配置标签)"
},
"Tags": [
"302"
],
@ -519,8 +687,14 @@
{
"Id": 390005003,
"Type": "TagBuff",
"Name": "不会失手",
"Desc": "不会失手",
"Name": {
"key": "skill_buff_390005003",
"text": "不会失手"
},
"Desc": {
"key": "skill_buffdes_390005003",
"text": "不会失手"
},
"Tags": [
"502"
],
@ -535,8 +709,14 @@
{
"Id": 390006001,
"Type": "TagBuff",
"Name": "无法获得增益",
"Desc": "无法附加增益状态(不可驱散)(不配置标签)",
"Name": {
"key": "skill_buff_390006001",
"text": "无法获得增益"
},
"Desc": {
"key": "skill_buffdes_390006001",
"text": "无法附加增益状态(不可驱散)(不配置标签)"
},
"Tags": [
"302"
],
@ -551,8 +731,14 @@
{
"Id": 300102103,
"Type": "ProBuff",
"Name": "",
"Desc": "受到的所有伤害降低10%",
"Name": {
"key": "",
"text": ""
},
"Desc": {
"key": "skill_buffdes_300102103",
"text": "受到的所有伤害降低10%"
},
"Tags": [],
"OverlayTimes": 0,
"SameID": false,
@ -565,8 +751,14 @@
{
"Id": 300162105,
"Type": "CallShieldBuff",
"Name": "",
"Desc": "",
"Name": {
"key": "",
"text": ""
},
"Desc": {
"key": "",
"text": ""
},
"Tags": [],
"OverlayTimes": 0,
"SameID": false,
@ -579,8 +771,14 @@
{
"Id": 300192114,
"Type": "ProBuff",
"Name": "猫猫推理",
"Desc": "每层为崔佛释放者提供15%伤害减免",
"Name": {
"key": "skill_buff_300192114",
"text": "猫猫推理"
},
"Desc": {
"key": "skill_buffdes_300192114",
"text": "每层为崔佛释放者提供15%伤害减免"
},
"Tags": [
"201"
],
@ -595,8 +793,14 @@
{
"Id": 300192115,
"Type": "ShieldBuff",
"Name": "护盾",
"Desc": "增加护盾",
"Name": {
"key": "skill_buff_300192115",
"text": "护盾"
},
"Desc": {
"key": "skill_buffdes_300192115",
"text": "增加护盾"
},
"Tags": [
"102"
],

View File

@ -493,7 +493,7 @@
},
{
"id": "rewardTips",
"file": "RewardTipsWindow",
"file": "GeneralRewardPopup",
"unloadpkg": 5,
"loadtype": 1,
"full": 0,

View File

@ -26,68 +26,21 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
szCards []string // 最终抽到的卡牌
totalWeight int64 // 总权重
curWeigth int64 // 临时随机获得的权重
drawTimes int32 // 抽卡次数
curStar4Count int32 // 当前4星没抽到的次数
curStar5Count int32 // 当前5星没抽到的次数
config4Count int32 // 配置表中4星保底次数
config5Count int32 // 配置表中5星保底次数
race int32
upDraw []*cfg.Game_drawUpdrawData // 活动数据 英雄抽卡权重增加
cardW map[string]int32 // 当前卡牌卡池卡牌对应的权重
baodiPool int32 // 保底卡池id
)
cardW = make(map[string]int32, 0)
upDraw = make([]*cfg.Game_drawUpdrawData, 0)
szCards = make([]string, 0)
rsp := &pb.HeroDrawCardResp{}
this.module.Debugf("当前4星抽卡没中次数:%d, 当前5星抽卡没中次数:%d", curStar4Count, curStar5Count)
// ======记录活动数据
cfgData, err := this.module.configure.GetDrawUpDrawConfig()
if err != nil {
// 校验时间
for _, v := range cfgData.GetDataList() {
if time.Now().Unix() > int64(v.TimeOn) && time.Now().Unix() < int64(v.TimeOff) { // 在这个时间范围之内
upDraw = append(upDraw, v) // 记录下在这活动范围之内的数据
for index, v1 := range v.UpHero {
cardW[v1] += v.UpWeight[index]
}
}
}
}
// =======活动数据记录完成
rst, _ := this.module.modelRecord.GetUserRecord(session.GetUserId())
if req.DrawType%2 == 0 { // 转成对应阵营信息 1~5
race = int32((int(req.DrawType)) / 2)
} else {
race = int32(int(req.DrawType+1) / 2)
}
if race == comm.RacePt { // 普通卡池
if rst.Race0 != nil {
curStar4Count = rst.Race0.H4
curStar5Count = rst.Race0.H5
}
} else if race == comm.RaceZr { // 灼热
if rst.Race1 != nil {
curStar4Count = rst.Race1.H4
curStar5Count = rst.Race1.H5
}
} else if race == comm.RaceYd { // 涌动
if rst.Race2 != nil {
curStar4Count = rst.Race2.H4
curStar5Count = rst.Race2.H5
}
} else if race == comm.RaceHx { // 呼啸
if rst.Race3 != nil {
curStar4Count = rst.Race3.H4
curStar5Count = rst.Race3.H5
}
} else if race == comm.RaceSy { // 闪耀
if rst.Race4 != nil {
curStar4Count = rst.Race4.H4
curStar5Count = rst.Race4.H5
}
}
curStar4Count, curStar5Count = this.module.modelHero.GetCurStarCount(session.GetUserId(), req.DrawType) // 获取缓存中4,5星没抽到的次数
// 获取配置文件的权重信息
_conf, err := this.module.configure.GetHeroDrawConfig(race)
if err != nil {
@ -100,6 +53,21 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
totalWeight += int64(cardW[v.Id])
}
// ======记录活动数据
cfgData, err := this.module.configure.GetDrawUpDrawConfig()
if err == nil {
for _, v := range cfgData.GetDataList() {
if time.Now().Unix() >= int64(v.TimeOn) && time.Now().Unix() <= int64(v.TimeOff) { // 在这个时间范围之内
for index, v1 := range v.UpHero {
if _, ok := cardW[v1]; ok { // 判断卡池有没有这张卡
cardW[v1] += v.UpWeight[index]
totalWeight += int64(v.UpWeight[index])
}
}
}
}
}
// =======活动数据记录完成
_costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType) // 抽卡消耗
if err != nil {
code = pb.ErrorCode_ConfigNoFound
@ -107,12 +75,12 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
}
config4Count = _costConf.Floor4 // 4星保底次数
config5Count = _costConf.Floor5 // 5星保底次数
if config4Count == 0 { // 数量为0 设置最大
config5Count = math.MaxInt32
}
if config5Count == 0 {
if config4Count <= 0 { // 小于等于零 表示没有保底
config4Count = math.MaxInt32
}
if config5Count <= 0 { // 小于等于零 表示没有保底
config5Count = math.MaxInt32
}
sz := make([]*cfg.Game_atn, 0)
sz = append(sz, _costConf.Cost)
code = this.module.CheckRes(session, sz) // 消耗校验
@ -120,14 +88,12 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
return
}
drawTimes = _costConf.Count // 抽卡次数
for i := 0; i < int(drawTimes); i++ {
for i := 0; i < int(_costConf.Count); i++ {
n, _ := rand.Int(rand.Reader, big.NewInt(totalWeight)) // [0,totalWeight)
curWeigth = 0
for k, v := range cardW {
curWeigth += int64(v)
if curWeigth < n.Int64() { // 命中
if curWeigth > n.Int64() { // 命中
// 获取当前星级
_getCardCfg := this.module.configure.GetHero(k) //获取的英雄信息
if _getCardCfg == nil {
@ -144,43 +110,17 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
// 达标保底次数
if curStar4Count >= config4Count {
//_costConf.Floor4cards
_bd, err := this.module.configure.GetHeroDrawConfig(_costConf.Floor4cards)
if err != nil && len(_bd) != 0 {
var _totalW int64 // 总权重
var _tmpW int64 // 临时权重
for _, v := range _bd {
_totalW += int64(v.Weight)
}
// 随机权重
n, _ := rand.Int(rand.Reader, big.NewInt(_totalW))
for _, v := range _bd {
_tmpW += int64(v.Weight)
if n.Int64() > _tmpW { // 种族保底卡池命中
szCards = append(szCards, v.Id)
break
}
}
}
baodiPool = _costConf.Floor4cards
} else if curStar5Count >= config5Count {
_bd, err := this.module.configure.GetHeroDrawConfig(_costConf.Floor5cards)
if err != nil && len(_bd) != 0 {
var _totalW int64 // 总权重
var _tmpW int64 // 临时权重
for _, v := range _bd {
_totalW += int64(v.Weight)
baodiPool = _costConf.Floor5cards
}
// 随机权重
n, _ := rand.Int(rand.Reader, big.NewInt(_totalW))
for _, v := range _bd {
_tmpW += int64(v.Weight)
if n.Int64() > _tmpW { // 种族保底卡池命中
szCards = append(szCards, v.Id)
if baodiPool != 0 {
id := this.module.modelHero.FloorDrawCard(baodiPool)
if id != "" {
szCards = append(szCards, id) // 保底卡池里的卡放入数组种
break
}
}
}
}
szCards = append(szCards, k)
break
}

View File

@ -24,10 +24,10 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
totalCostCard int32 //消耗卡总数量
_hero *pb.DBHero
_costHero *pb.DBHero
changeHero []*pb.DBHero // 变化的英雄数据
ChangeList []*pb.DBHero // 变化的英雄数据
_costMaphero map[string]*pb.DBHero
)
changeHero = make([]*pb.DBHero, 0)
ChangeList = make([]*pb.DBHero, 0)
szCostHero = make(map[string]int32, 0)
_costMaphero = make(map[string]*pb.DBHero, 0)
code = this.ResonanceCheck(session, req) // check
@ -85,7 +85,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
code = c
return
}
changeHero = append(changeHero, _costMaphero[k])
ChangeList = append(ChangeList, _costMaphero[k])
}
resonConfig, err1 := this.module.configure.GetHeroResonanceConfig(_hero.HeroID)
@ -98,12 +98,19 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
if code != pb.ErrorCode_Success {
return
}
if _hero.SameCount > 1 {
_hero.SameCount -= 1
newHero := this.module.modelHero.CloneNewHero(_hero)
ChangeList = append(ChangeList, newHero)
}
_hero.SameCount = 1
_hero.ResonateNum += 1
_hero.DistributionResonate += resonConfig.Energy
_heroMap := map[string]interface{}{
"resonateNum": _hero.ResonateNum,
"distributionResonate": _hero.DistributionResonate,
"isOverlying": false,
"sameCount": 1,
}
err1 = this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息
if err1 != nil {
@ -113,7 +120,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
}
// 返还对应初始星级的卡
for _, v := range resonConfig.Prize {
if v.A == "hero" {
if v.A == comm.HeroType {
for i := 0; i < int(v.N); i++ { // 有多少张加多少次
this.module.modelHero.createOneHero(session.GetUserId(), v.T)
}
@ -122,8 +129,8 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化
changeHero = append(changeHero, _hero)
session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: changeHero})
ChangeList = append(ChangeList, _hero)
session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList})
session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero})
return
}

View File

@ -37,7 +37,7 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR
_hero.Energy[req.UseType] += req.UseEnergy
_heroMap := map[string]interface{}{
"DistributionResonate": _hero.ResonateNum - req.UseEnergy, // 减没有分配的能量
"DistributionResonate": _hero.DistributionResonate - req.UseEnergy, // 减没有分配的能量
"Energy": _hero.Energy,
"isOverlying": false,
}

View File

@ -10,7 +10,7 @@ import (
//参数校验
func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode) {
if req.HeroCoinfigID == "" && req.Star <= 6 && req.Lv <= 6*comm.HeroStarLvRatio {
if req.HeroCoinfigID == "" || req.Star > 6 || req.Lv > 6*comm.HeroStarLvRatio {
code = pb.ErrorCode_ReqParameterError
return
}

View File

@ -33,6 +33,8 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
ChangeList []*pb.DBHero // 推送 改变的英雄
mapCostHero map[string]int32 // 消耗的技能卡
mapCostObj map[string]*pb.DBHero // 消耗的技能卡对象
costGold int32 // 金币消耗
lvUpCount int32 // 技能升级的次数
)
mapCostHero = make(map[string]int32, 0)
mapCostObj = make(map[string]*pb.DBHero, 0)
@ -80,10 +82,24 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
code = pb.ErrorCode_HeroTypeErr
return
}
mapCostObj[k] = costHero
expConf := this.module.configure.GetHeroExp(costHero.HeroID) // 消耗多少金币
if expConf != nil {
costGold += expConf.Needgold * v
lvUpCount += expConf.Skilllevelup * v
} else {
lvUpCount += v // 计算技能升级次数
}
for range req.CostCardObj { // 升级技能
mapCostObj[k] = costHero
}
// 检查金币消耗
curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold)
if curGold < costGold { // 金币不足
code = pb.ErrorCode_GoldNoEnough
return
}
for i := 0; i < int(lvUpCount); i++ { // 升级技能
config, err1 := this.module.configure.GetHeroSkillUpConfig()
if err1 != nil {
code = pb.ErrorCode_ConfigNoFound
@ -103,9 +119,10 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
probability = make(map[int32]int32, 0)
// 获取权重
for k, v := range tmpUpSkillID {
for _, v2 := range config.GetDataList() {
for _, v2 := range config.GetDataList() { // 需要优化配置表
if v2.Hid == _hero.HeroID && (k+1) == v2.Skillpos && v.SkillLv == v2.Skilllevel {
probability[k] = v2.Probability // 设置权重
break
}
}
}
@ -115,11 +132,11 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
totalprobability += v
}
if totalprobability == 0 {
code = pb.ErrorCode_HeroSkillUpErr //技能升级失败
code = pb.ErrorCode_HeroMaxLv // 升满了
return
}
n, _ := rand.Int(rand.Reader, big.NewInt(int64(totalprobability)))
tmpValue = 0
for k, v := range probability {
tmpValue += v
if int32(n.Int64()) < tmpValue { // 找到了
@ -133,11 +150,18 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt
break
}
}
}
code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -costGold, true)
if code != pb.ErrorCode_Success { // 金币不足
code = pb.ErrorCode_GoldNoEnough
return
}
for k, v := range mapCostObj {
code = this.module.DelCard(session.GetUserId(), v, mapCostHero[k])
if code != pb.ErrorCode_Success {
code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, costGold, true)
return
}
ChangeList = append(ChangeList, v)

View File

@ -132,14 +132,14 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
}
// 金币消耗判断
curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), "gold")
curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold)
if curGold < target.Gold { // 金币不足
code = pb.ErrorCode_GoldNoEnough
return
}
// 消耗道具
code = this.module.ModuleUser.AddAttributeValue(session, "gold", -target.Gold, true) // 减少金币
code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -target.Gold, true) // 减少金币
if code != pb.ErrorCode_Success {
this.module.Errorf("cost gold failed ,count = %d", target.Gold)
code = pb.ErrorCode_GoldNoEnough
@ -150,6 +150,7 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr
if c != pb.ErrorCode_Success {
code = pb.ErrorCode_DBError
this.module.Errorf("del hero err card:%s,count = %d", k, v)
this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, target.Gold, true) // 回退金币
return
}

View File

@ -3,7 +3,6 @@ package hero
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"google.golang.org/protobuf/proto"
)
@ -92,6 +91,12 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
}
_costExpHero[k] = _expHero
}
// 金币消耗判断
curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold)
if curGold < costGold { // 金币不足
code = pb.ErrorCode_GoldNoEnough
return
}
if addExp == 0 {
code = pb.ErrorCode_HeroExpTypeErr
return
@ -152,21 +157,19 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
return
}
// 消耗金币
_d := &cfg.Game_atn{
A: "attr",
T: "gold",
N: costGold,
}
code = this.module.ConsumeRes(session, []*cfg.Game_atn{_d}, true)
if code != pb.ErrorCode_Success {
code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -costGold, true)
if code != pb.ErrorCode_Success { // 金币不足
code = pb.ErrorCode_GoldNoEnough
return
}
// 删除经验卡
for k, v := range _mapCost {
err1 := this.module.modelHero.consumeHeroCard(session.GetUserId(), _costExpHero[k], v)
if err1 != nil {
code = pb.ErrorCode_HeroNoEnough
this.module.Errorf("delete err failed err:%T!", err1)
this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, costGold, true) // 回退金币
return
}
_changeHero = append(_changeHero, _costExpHero[k])

View File

@ -1,6 +1,7 @@
package hero
import (
"crypto/rand"
"errors"
"fmt"
"go_dreamfactory/comm"
@ -8,6 +9,7 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"math"
"math/big"
mengine "github.com/dengsgo/math-engine/engine"
"go.mongodb.org/mongo-driver/bson/primitive"
@ -100,8 +102,7 @@ func (this *ModelHero) createOneHero(uid string, heroCfgId string) (hero *pb.DBH
// 克隆一个英雄
func (this *ModelHero) CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) {
temp := *hero
newHero = &temp
newHero = &*hero
newHero.Id = primitive.NewObjectID().Hex()
this.AddList(newHero.Uid, newHero.Id, newHero)
return
@ -536,3 +537,65 @@ func (this *ModelHero) RemoveUserHeroInfo(session comm.IUserSession) (err error)
this.moduleHero.modelHero.BatchDelLists(session.GetUserId())
return
}
// 获取抽卡保底相关数据
func (this *ModelHero) GetCurStarCount(uid string, drawType int32) (curStar4Count int32, curStar5Count int32) {
var race int32
rst, _ := this.moduleHero.modelRecord.GetUserRecord(uid)
if drawType%2 == 0 { // 转成对应阵营信息 1~5
race = int32((int(drawType)) / 2)
} else {
race = int32(int(drawType+1) / 2)
}
if race == comm.RacePt { // 普通卡池
if rst.Race0 != nil {
curStar4Count = rst.Race0.H4
curStar5Count = rst.Race0.H5
}
} else if race == comm.RaceZr { // 灼热
if rst.Race1 != nil {
curStar4Count = rst.Race1.H4
curStar5Count = rst.Race1.H5
}
} else if race == comm.RaceYd { // 涌动
if rst.Race2 != nil {
curStar4Count = rst.Race2.H4
curStar5Count = rst.Race2.H5
}
} else if race == comm.RaceHx { // 呼啸
if rst.Race3 != nil {
curStar4Count = rst.Race3.H4
curStar5Count = rst.Race3.H5
}
} else if race == comm.RaceSy { // 闪耀
if rst.Race4 != nil {
curStar4Count = rst.Race4.H4
curStar5Count = rst.Race4.H5
}
}
return
}
// 保底抽卡 (参数 卡池id, 返回抽到卡配置id)
func (this *ModelHero) FloorDrawCard(Cardpool int32) (cardId string) {
_bd, err := this.moduleHero.configure.GetHeroDrawConfig(Cardpool)
if err == nil && len(_bd) != 0 {
var _totalW int64 // 总权重
var _tmpW int64 // 临时权重
for _, v := range _bd {
_totalW += int64(v.Weight)
}
// 随机权重
n, _ := rand.Int(rand.Reader, big.NewInt(_totalW))
for _, v := range _bd {
_tmpW += int64(v.Weight)
if n.Int64() < _tmpW { // 种族保底卡池命中
cardId = v.Id
break
}
}
}
return
}

View File

@ -43,5 +43,4 @@ func (this *ModelRecord) ChangeUserRecord(uid string, value map[string]interface
return nil
}
return this.Change(uid, value)
}

View File

@ -98,7 +98,6 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int32) {
func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add int32, bPush bool) (code pb.ErrorCode) {
if add == 0 {
log.Errorf("attr no changed,uid: %s attr: %s add: %d", session.GetUserId(), attr, add)
code = pb.ErrorCode_ReqParameterError
return
}
user := this.GetUser(session.GetUserId())