From cf2e23b8dd9b0707cae0918dadd8e4f861b66c39 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 7 Sep 2023 15:37:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=9B=98=E6=B4=BB=E5=8A=A8=E6=94=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 12 +- bin/json/game_buriedcondi.json | 12 +- bin/json/game_buzkashimount.json | 199 +++++----- bin/json/game_dragonplay.json | 11 + bin/json/game_equipattribute.json | 32 +- bin/json/game_gm.json | 10 + bin/json/game_horoscope.json | 96 ++--- bin/json/game_item.json | 132 +++---- bin/json/game_mainstage.json | 372 ++++-------------- bin/json/game_monsterformat.json | 4 +- bin/json/game_pandamasjx.json | 48 +-- bin/json/game_pandamasyxjx.json | 8 +- bin/json/game_rdtasknpc.json | 4 +- bin/json/game_skillafteratk.json | 141 +++---- bin/json/game_skillatk.json | 99 ++--- bin/json/game_skillbuff.json | 126 +++++- bin/json/game_skillpassive.json | 60 +-- bin/json/game_vikingboss.json | 48 +-- comm/const.go | 3 + modules/activity/api_turntable.go | 116 ------ modules/activity/comp_configure.go | 57 +-- modules/activity/module.go | 86 +--- modules/turntable/api.go | 20 + modules/turntable/api_draw.go | 85 ++++ modules/turntable/api_getlist.go | 36 ++ modules/turntable/configure.go | 141 +++++++ modules/turntable/modelturntable.go | 45 +++ modules/turntable/module.go | 167 ++++++++ pb/turntable_db.pb.go | 176 +++++++++ pb/turntable_msg.pb.go | 342 ++++++++++++++++ sys/configure/structs/Game.BuffType.go | 1 + .../structs/Game.BuzkashiMountData.go | 6 +- sys/configure/structs/Game.DragonPlayData.go | 2 + sys/configure/structs/Tables.go | 7 - 34 files changed, 1659 insertions(+), 1045 deletions(-) delete mode 100644 modules/activity/api_turntable.go create mode 100644 modules/turntable/api.go create mode 100644 modules/turntable/api_draw.go create mode 100644 modules/turntable/api_getlist.go create mode 100644 modules/turntable/configure.go create mode 100644 modules/turntable/modelturntable.go create mode 100644 modules/turntable/module.go create mode 100644 pb/turntable_db.pb.go create mode 100644 pb/turntable_msg.pb.go diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 17c3c7d02..ff5b76dfd 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -970,7 +970,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_1", - "text": "只能上阵真诚属性的守护者" + "text": "只能上阵火的热情属性的守护者" }, "BattleTips": { "key": "", @@ -1004,7 +1004,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_2", - "text": "只能上阵直觉属性的守护者" + "text": "只能上阵林的感观属性的守护者" }, "BattleTips": { "key": "", @@ -1038,7 +1038,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_3", - "text": "只能上阵共情属性的守护者" + "text": "只能上阵水的包容属性的守护者" }, "BattleTips": { "key": "", @@ -1705,7 +1705,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_1", - "text": "只能上阵真诚属性的守护者" + "text": "只能上阵火的热情属性的守护者" }, "BattleTips": { "key": "", @@ -1739,7 +1739,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_2", - "text": "只能上阵直觉属性的守护者" + "text": "只能上阵林的感观属性的守护者" }, "BattleTips": { "key": "", @@ -1773,7 +1773,7 @@ "HideAlienSpace": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_3", - "text": "只能上阵共情属性的守护者" + "text": "只能上阵水的包容属性的守护者" }, "BattleTips": { "key": "", diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 5d24aa13d..8d4e45bac 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -21559,7 +21559,7 @@ "NPC": 10104, "value": 1, "filter": [ - 1100124 + 1100113 ], "filter2": [ "关卡ID", @@ -22094,7 +22094,7 @@ "NPC": 10284, "value": 1, "filter": [ - 1100208 + 1100224 ], "filter2": [ "关卡ID", @@ -22305,7 +22305,7 @@ "NPC": 10334, "value": 1, "filter": [ - 1100304 + 1100305 ], "filter2": [ "关卡ID", @@ -22426,7 +22426,7 @@ "NPC": 10364, "value": 1, "filter": [ - 1100308 + 1100312 ], "filter2": [ "关卡ID", @@ -22635,7 +22635,7 @@ "NPC": 10334, "value": 1, "filter": [ - 1100408 + 1100413 ], "filter2": [ "剧情ID", @@ -28922,7 +28922,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1009", - "text": "种族塔通关真诚阵容2层" + "text": "种族塔通关火的热情阵容2层" }, "type": 232, "valid": 0, diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json index d4d952ac6..a4293f37a 100644 --- a/bin/json/game_buzkashimount.json +++ b/bin/json/game_buzkashimount.json @@ -4,31 +4,32 @@ "type": 1, "name": { "key": "buzkashi_Mount_name_1", - "text": "无牙仔（蛋）" + "text": "夜煞（蛋）" }, "intr": { "key": "buzkashi_Mount_intr_1", - "text": "测试描述1" + "text": "夜煞的蛋，撒点胡椒和盐，味道应该会很很不错！" }, - "Color": 1, + "Color": 5, "Img": "by_img_54101", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030001", @@ -39,27 +40,28 @@ }, "intr": { "key": "buzkashi_Mount_intr_2", - "text": "测试描述2" + "text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\"" }, - "Color": 1, + "Color": 5, "Img": "by_img_54101", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030001", @@ -72,24 +74,25 @@ "key": "buzkashi_Mount_intr_3", "text": "无牙/没牙仔（Toothless）品种为夜煞。夜煞是龙族非常稀有且最危险聪明的龙，与其它龙的造型很不一样，类似蝙蝠，身体附有黑色鳞片。体积娇小，表情动作灵巧可爱，双翼比例在龙的排行中最大。翼面多达三对，因此飞行时间更长，速度更快更灵活。" }, - "Color": 1, + "Color": 5, "Img": "by_img_54101", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, - "etime": 40, - "hp": 7, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", + "etime": 75, + "stime": 15, + "hp": 50, "moderate": 10, - "sprint": 200, - "sprinttime": 3000, + "sprint": 150, + "sprinttime": 5500, "acceleration": 100, "deceleration": 100, "caddtime": 10, "csubtime": 10, - "energyrecover": 100, + "energyrecover": 30, "maxenergy": 100 }, { @@ -97,62 +100,64 @@ "type": 1, "name": { "key": "buzkashi_Mount_name_4", - "text": "风里飞" + "text": "风里飞（蛋）" }, "intr": { "key": "buzkashi_Mount_intr_4", - "text": "测试描述4" + "text": "风里飞的蛋，撒点胡椒和盐，味道应该会很很不错！" }, - "Color": 1, + "Color": 3, "Img": "by_img_54102", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030002", "type": 2, "name": { "key": "buzkashi_Mount_name_5", - "text": "风里飞" + "text": "风里飞（幼）" }, "intr": { "key": "buzkashi_Mount_intr_5", - "text": "测试描述5" + "text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\"" }, - "Color": 1, + "Color": 3, "Img": "by_img_54102", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030002", @@ -165,24 +170,25 @@ "key": "buzkashi_Mount_intr_6", "text": "它是龙族最漂亮、精力最充沛的一员，皮肤色彩斑斓，有鹦鹉一样的习性、鸸鹋的步态和雷克斯暴龙的姿势，是鸟类的祖先。纳得的性格暴躁，经常发脾气。" }, - "Color": 1, + "Color": 3, "Img": "by_img_54102", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, - "etime": 0, - "hp": 7, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", + "etime": 70, + "stime": 15, + "hp": 70, "moderate": 10, - "sprint": 200, - "sprinttime": 3000, + "sprint": 140, + "sprinttime": 6000, "acceleration": 100, "deceleration": 100, "caddtime": 0, "csubtime": 0, - "energyrecover": 0, + "energyrecover": 30, "maxenergy": 100 }, { @@ -190,62 +196,64 @@ "type": 1, "name": { "key": "buzkashi_Mount_name_7", - "text": "葛伦科" + "text": "葛伦科（蛋）" }, "intr": { "key": "buzkashi_Mount_intr_7", - "text": "测试描述7" + "text": "葛伦科的蛋，撒点胡椒和盐，味道应该会很很不错！" }, - "Color": 1, + "Color": 3, "Img": "by_img_54103", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030003", "type": 2, "name": { "key": "buzkashi_Mount_name_8", - "text": "葛伦科" + "text": "葛伦科（幼）" }, "intr": { "key": "buzkashi_Mount_intr_8", - "text": "测试描述8" + "text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\"" }, - "Color": 1, + "Color": 3, "Img": "by_img_54103", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", "etime": 0, - "hp": 7, - "moderate": 10, - "sprint": 200, - "sprinttime": 3000, - "acceleration": 100, - "deceleration": 100, + "stime": 0, + "hp": 0, + "moderate": 0, + "sprint": 0, + "sprinttime": 0, + "acceleration": 0, + "deceleration": 0, "caddtime": 0, "csubtime": 0, "energyrecover": 0, - "maxenergy": 100 + "maxenergy": 0 }, { "id": "20030003", @@ -258,24 +266,25 @@ "key": "buzkashi_Mount_intr_9", "text": "葛伦科是巨石类龙，长约4米，高约1.7米，全身披满装甲，尾巴像一个锤子，体态较胖。鱼脚司是他的好朋友（更像父亲），起名为肉球。" }, - "Color": 1, + "Color": 3, "Img": "by_img_54103", "access": [ 166 ], "model": "54101_3", - "point": "", - "stime": 20, - "etime": 0, - "hp": 7, + "controller": "Person/mount/10000M_54101.controller", + "point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos", + "etime": 65, + "stime": 17, + "hp": 110, "moderate": 10, - "sprint": 200, - "sprinttime": 3000, + "sprint": 130, + "sprinttime": 6500, "acceleration": 100, "deceleration": 100, "caddtime": 0, "csubtime": 0, - "energyrecover": 0, + "energyrecover": 30, "maxenergy": 100 } ] \ No newline at end of file diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index a2a177b86..8e672c939 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -14,6 +14,7 @@ "n": 1 } ], + "bubble": 14005, "group": 0 }, { @@ -31,6 +32,7 @@ "n": 2 } ], + "bubble": 14005, "group": 10001 }, { @@ -48,6 +50,7 @@ "n": 3 } ], + "bubble": 14005, "group": 0 }, { @@ -65,6 +68,7 @@ "n": 4 } ], + "bubble": 14005, "group": 0 }, { @@ -82,6 +86,7 @@ "n": 5 } ], + "bubble": 14005, "group": 0 }, { @@ -99,6 +104,7 @@ "n": 6 } ], + "bubble": 14005, "group": 10002 }, { @@ -116,6 +122,7 @@ "n": 7 } ], + "bubble": 14005, "group": 0 }, { @@ -133,6 +140,7 @@ "n": 8 } ], + "bubble": 14005, "group": 0 }, { @@ -150,6 +158,7 @@ "n": 9 } ], + "bubble": 14005, "group": 0 }, { @@ -167,6 +176,7 @@ "n": 10 } ], + "bubble": 14005, "group": 0 }, { @@ -184,6 +194,7 @@ "n": 11 } ], + "bubble": 14005, "group": 0 } ] \ No newline at end of file diff --git a/bin/json/game_equipattribute.json b/bin/json/game_equipattribute.json index 15f49a48b..56b2064f6 100644 --- a/bin/json/game_equipattribute.json +++ b/bin/json/game_equipattribute.json @@ -4,11 +4,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_1", - "text": "对直觉属性守护者伤害增加" + "text": "对林的感观属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_1", - "text": "对直觉属性守护者伤害增加" + "text": "对林的感观属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -24,11 +24,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_2", - "text": "对真诚属性守护者伤害增加" + "text": "对火的热情属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_2", - "text": "对真诚属性守护者伤害增加" + "text": "对火的热情属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -44,11 +44,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_3", - "text": "对共情属性守护者伤害增加" + "text": "对水的包容属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_3", - "text": "对共情属性守护者伤害增加" + "text": "对水的包容属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -64,11 +64,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_4", - "text": "对责任属性守护者伤害增加" + "text": "对光的荣耀属性守护者伤害增加" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_4", - "text": "对责任属性守护者伤害增加" + "text": "对光的荣耀属性守护者伤害增加" }, "skill_parameter": [ "1%", @@ -84,11 +84,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_5", - "text": "减少受到的直觉属性守护者伤害" + "text": "减少受到的林的感观属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_5", - "text": "减少受到的直觉属性守护者伤害" + "text": "减少受到的林的感观属性守护者伤害" }, "skill_parameter": [ "1%", @@ -104,11 +104,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_6", - "text": "减少受到的真诚属性守护者伤害" + "text": "减少受到的火的热情属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_6", - "text": "减少受到的真诚属性守护者伤害" + "text": "减少受到的火的热情属性守护者伤害" }, "skill_parameter": [ "1%", @@ -124,11 +124,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_7", - "text": "减少受到的共情属性守护者伤害" + "text": "减少受到的水的包容属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_7", - "text": "减少受到的共情属性守护者伤害" + "text": "减少受到的水的包容属性守护者伤害" }, "skill_parameter": [ "1%", @@ -144,11 +144,11 @@ "skill_id": 125004011, "attribute_text": { "key": "equip_equip_attribute_attribute_text_8", - "text": "减少受到的责任属性守护者伤害" + "text": "减少受到的光的荣耀属性守护者伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_8", - "text": "减少受到的责任属性守护者伤害" + "text": "减少受到的光的荣耀属性守护者伤害" }, "skill_parameter": [ "1%", diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index bbbeb1d48..b42cf98cb 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -378,5 +378,15 @@ }, "data": "", "prefix": "bingo:groumet" + }, + { + "id": 41, + "type": 2, + "text": { + "key": "GM_GM_text_41", + "text": "守护者好感度等级全满" + }, + "data": "", + "prefix": "bingo:library" } ] \ No newline at end of file diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json index 80f28648c..f6bf4cfcd 100644 --- a/bin/json/game_horoscope.json +++ b/bin/json/game_horoscope.json @@ -171,7 +171,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_6", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -204,7 +204,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_7", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -237,7 +237,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_8", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -270,7 +270,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_9", - "text": "真诚属性攻击提升" + "text": "火的热情属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -297,7 +297,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_10", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -330,7 +330,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_11", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -363,7 +363,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_12", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -396,7 +396,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_13", - "text": "真诚属性防御提升" + "text": "火的热情属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -423,7 +423,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_14", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 0, @@ -456,7 +456,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_15", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 1, @@ -489,7 +489,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_16", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 2, @@ -522,7 +522,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_17", - "text": "真诚属性生命提升" + "text": "火的热情属性生命提升" }, "comicon": "Life", "lv": 3, @@ -828,7 +828,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_27", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -861,7 +861,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_28", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -894,7 +894,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_29", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -927,7 +927,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_30", - "text": "直觉属性攻击提升" + "text": "林的感观属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -954,7 +954,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_31", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -987,7 +987,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_32", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -1020,7 +1020,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_33", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -1053,7 +1053,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_34", - "text": "直觉属性防御提升" + "text": "林的感观属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -1080,7 +1080,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_35", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 0, @@ -1113,7 +1113,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_36", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 1, @@ -1146,7 +1146,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_37", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 2, @@ -1179,7 +1179,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_38", - "text": "直觉属性生命提升" + "text": "林的感观属性生命提升" }, "comicon": "Life", "lv": 3, @@ -1485,7 +1485,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_48", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -1518,7 +1518,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_49", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -1551,7 +1551,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_50", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -1584,7 +1584,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_51", - "text": "共情属性攻击提升" + "text": "水的包容属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -1611,7 +1611,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_52", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -1644,7 +1644,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_53", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -1677,7 +1677,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_54", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -1710,7 +1710,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_55", - "text": "共情属性防御提升" + "text": "水的包容属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -1737,7 +1737,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_56", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 0, @@ -1770,7 +1770,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_57", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 1, @@ -1803,7 +1803,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_58", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 2, @@ -1836,7 +1836,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_59", - "text": "共情属性生命提升" + "text": "水的包容属性生命提升" }, "comicon": "Life", "lv": 3, @@ -2142,7 +2142,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_69", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 0, @@ -2175,7 +2175,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_70", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 1, @@ -2208,7 +2208,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_71", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 2, @@ -2241,7 +2241,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_72", - "text": "责任属性攻击提升" + "text": "光的荣耀属性攻击提升" }, "comicon": "Attack", "lv": 3, @@ -2268,7 +2268,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_73", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 0, @@ -2301,7 +2301,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_74", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 1, @@ -2334,7 +2334,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_75", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 2, @@ -2367,7 +2367,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_76", - "text": "责任属性防御提升" + "text": "光的荣耀属性防御提升" }, "comicon": "Defense", "lv": 3, @@ -2394,7 +2394,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_77", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 0, @@ -2427,7 +2427,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_78", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 1, @@ -2460,7 +2460,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_79", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 2, @@ -2493,7 +2493,7 @@ "node_long": 120, "name": { "key": "horoscope_horoscope_name_80", - "text": "责任属性生命提升" + "text": "光的荣耀属性生命提升" }, "comicon": "Life", "lv": 3, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 78cd323a6..88fa35182 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -700,11 +700,11 @@ "img": "wp_icon_10020", "intr": { "key": "item_item_intr_14", - "text": "蕴含着真诚力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着火的热情力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_14", - "text": "熊熊燃烧的火焰，热情的红色，就像那些真诚直率的守护者。" + "text": "熊熊燃烧的火焰，热情的红色，就像那些热情直率的守护者。" }, "dialogue": { "key": "item_item_dialogue_14", @@ -748,7 +748,7 @@ "img": "wp_icon_10021", "intr": { "key": "item_item_intr_15", - "text": "蕴含着直觉力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着林的感观力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_15", @@ -796,7 +796,7 @@ "img": "wp_icon_10022", "intr": { "key": "item_item_intr_16", - "text": "蕴含着共情力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着水的包容力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_16", @@ -844,7 +844,7 @@ "img": "wp_icon_10024", "intr": { "key": "item_item_intr_17", - "text": "蕴含着责任力量的圣枝，用于属性招募抽取守护者。" + "text": "蕴含着光的荣耀力量的圣枝，用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_17", @@ -892,7 +892,7 @@ "img": "wp_icon_10020", "intr": { "key": "item_item_intr_18", - "text": "蕴含着真诚力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着火的热情力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_18", @@ -940,7 +940,7 @@ "img": "wp_icon_10021", "intr": { "key": "item_item_intr_19", - "text": "蕴含着直觉力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着林的感观力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_19", @@ -988,7 +988,7 @@ "img": "wp_icon_10022", "intr": { "key": "item_item_intr_20", - "text": "蕴含着共情力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着水的包容力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_20", @@ -1036,7 +1036,7 @@ "img": "wp_icon_10024", "intr": { "key": "item_item_intr_21", - "text": "蕴含着责任力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" + "text": "蕴含着光的荣耀力量的圣枝的碎片，消耗10个可用于属性招募抽取守护者。" }, "describe": { "key": "item_item_describe_21", @@ -12286,11 +12286,11 @@ "img": "item_15000101", "intr": { "key": "item_item_intr_252", - "text": "猎魂头目的初级掉落物，可在守护者界面提升真诚属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升火的热情属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_252", - "text": "小小的火花，发出噼啪之声，会主动向人靠近。猎魂头目的初级掉落物，可用于真诚阵营守护者回响。" + "text": "小小的火花，发出噼啪之声，会主动向人靠近。猎魂头目的初级掉落物，可用于火的热情阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_250", @@ -12346,11 +12346,11 @@ "img": "item_15000102", "intr": { "key": "item_item_intr_253", - "text": "猎魂头目的初级掉落物，可在守护者界面提升直觉属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升林的感观属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_253", - "text": "细密的水滴，发出滴答之声，若抱着友好的态度靠近，它不会抗拒。猎魂头目的初级掉落物，可用于直觉阵营守护者回响。" + "text": "细密的水滴，发出滴答之声，若抱着友好的态度靠近，它不会抗拒。猎魂头目的初级掉落物，可用于林的感观阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_251", @@ -12406,11 +12406,11 @@ "img": "item_15000103", "intr": { "key": "item_item_intr_254", - "text": "猎魂头目的初级掉落物，可在守护者界面提升共情属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升水的包容属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_254", - "text": "古老的朽木，几乎无声无息，只是在一处静止不动。猎魂头目的初级掉落物，可用于共情阵营守护者回响。" + "text": "古老的朽木，几乎无声无息，只是在一处静止不动。猎魂头目的初级掉落物，可用于水的包容阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_252", @@ -12466,11 +12466,11 @@ "img": "item_15000104", "intr": { "key": "item_item_intr_255", - "text": "猎魂头目的初级掉落物，可在守护者界面提升责任属性守护者的回响等级。" + "text": "猎魂头目的初级掉落物，可在守护者界面提升光的荣耀属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_255", - "text": "微弱的光芒，忽明忽暗，四处飘散，照亮漆黑的路。猎魂头目的初级掉落物，可用于责任阵营守护者回响。" + "text": "微弱的光芒，忽明忽暗，四处飘散，照亮漆黑的路。猎魂头目的初级掉落物，可用于光的荣耀阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_253", @@ -12538,11 +12538,11 @@ "img": "item_15000201", "intr": { "key": "item_item_intr_256", - "text": "猎魂头目的中级掉落物，可在守护者界面提升真诚属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升火的热情属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_256", - "text": "燃烧的烈焰，散发着滚烫的热气，会围绕着人转动。猎魂头目的中级掉落物，可用于真诚阵营守护者回响。" + "text": "燃烧的烈焰，散发着滚烫的热气，会围绕着人转动。猎魂头目的中级掉落物，可用于火的热情阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_254", @@ -12610,11 +12610,11 @@ "img": "item_15000202", "intr": { "key": "item_item_intr_257", - "text": "猎魂头目的中级掉落物，可在守护者界面提升直觉属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升林的感观属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_257", - "text": "澎湃的浪花，散发着冰冷的海气，只是静静团成一团。猎魂头目的中级掉落物，可用于直觉阵营守护者回响。" + "text": "澎湃的浪花，散发着冰冷的海气，只是静静团成一团。猎魂头目的中级掉落物，可用于林的感观阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_255", @@ -12682,11 +12682,11 @@ "img": "item_15000203", "intr": { "key": "item_item_intr_258", - "text": "猎魂头目的中级掉落物，可在守护者界面提升共情属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升水的包容属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_258", - "text": "蜿蜒的荆枝，散发着温暖的木香，以肉眼轻微可察觉的状态生长着。猎魂头目的中级掉落物，可用于共情阵营守护者回响。" + "text": "蜿蜒的荆枝，散发着温暖的木香，以肉眼轻微可察觉的状态生长着。猎魂头目的中级掉落物，可用于水的包容阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_256", @@ -12754,11 +12754,11 @@ "img": "item_15000204", "intr": { "key": "item_item_intr_259", - "text": "猎魂头目的中级掉落物，可在守护者界面提升责任属性守护者的回响等级。" + "text": "猎魂头目的中级掉落物，可在守护者界面提升光的荣耀属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_259", - "text": "明亮的阳光，散发着生机的朝气，在岔路口点亮前方的路。猎魂头目的中级掉落物，可用于责任阵营守护者回响。" + "text": "明亮的阳光，散发着生机的朝气，在岔路口点亮前方的路。猎魂头目的中级掉落物，可用于光的荣耀阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_257", @@ -12814,11 +12814,11 @@ "img": "item_15000301", "intr": { "key": "item_item_intr_260", - "text": "猎魂头目的高级掉落物，可在守护者界面提升真诚属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升火的热情属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_260", - "text": "爆裂的火炎球，仿佛下一秒就要将靠近的人炸得粉身碎骨，空气中充满了火药味。猎魂头目的高级掉落物，可用于真诚阵营守护者回响。" + "text": "爆裂的火炎球，仿佛下一秒就要将靠近的人炸得粉身碎骨，空气中充满了火药味。猎魂头目的高级掉落物，可用于火的热情阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_258", @@ -12874,11 +12874,11 @@ "img": "item_15000302", "intr": { "key": "item_item_intr_261", - "text": "猎魂头目的高级掉落物，可在守护者界面提升直觉属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升林的感观属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_261", - "text": "汹涌的滔天巨浪，会将冒犯者囫囵淹没，浓烈的海腥味令人窒息。猎魂头目的高级掉落物，可用于直觉阵营守护者回响。" + "text": "汹涌的滔天巨浪，会将冒犯者囫囵淹没，浓烈的海腥味令人窒息。猎魂头目的高级掉落物，可用于林的感观阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_259", @@ -12934,11 +12934,11 @@ "img": "item_15000303", "intr": { "key": "item_item_intr_262", - "text": "猎魂头目的高级掉落物，可在守护者界面提升共情属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升水的包容属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_262", - "text": "交错环绕的林木，以飞快的速度疯狂生长着。虽是木枝，却弥漫着馥郁的花香。猎魂头目的高级掉落物，可用于共情阵营守护者回响。" + "text": "交错环绕的林木，以飞快的速度疯狂生长着。虽是木枝，却弥漫着馥郁的花香。猎魂头目的高级掉落物，可用于水的包容阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_260", @@ -12994,11 +12994,11 @@ "img": "item_15000304", "intr": { "key": "item_item_intr_263", - "text": "猎魂头目的高级掉落物，可在守护者界面提升责任属性守护者的回响等级。" + "text": "猎魂头目的高级掉落物，可在守护者界面提升光的荣耀属性守护者的回响等级。" }, "describe": { "key": "item_item_describe_263", - "text": "绚丽夺目的天光，辉煌覆盖了肉眼所见的一切。无形无味，却给人纯净之感。猎魂头目的高级掉落物，可用于责任阵营守护者回响。" + "text": "绚丽夺目的天光，辉煌覆盖了肉眼所见的一切。无形无味，却给人纯净之感。猎魂头目的高级掉落物，可用于光的荣耀阵营守护者回响。" }, "dialogue": { "key": "item_item_dialogue_261", @@ -15127,7 +15127,7 @@ "id": "17050002", "name": { "key": "item_item_name_306", - "text": "5星真诚自选宝箱" + "text": "5星火的热情自选宝箱" }, "usetype": 4, "color": 5, @@ -15150,11 +15150,11 @@ "img": "item_17050002", "intr": { "key": "item_item_intr_308", - "text": "开启后，可以从5星真诚属性守护者中自选一名守护者。" + "text": "开启后，可以从5星火的热情属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_308", - "text": "5星真诚自选宝箱。" + "text": "5星火的热情自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_306", @@ -15173,7 +15173,7 @@ "id": "17050003", "name": { "key": "item_item_name_307", - "text": "5星直觉自选宝箱" + "text": "5星林的感观自选宝箱" }, "usetype": 4, "color": 5, @@ -15196,11 +15196,11 @@ "img": "item_17050003", "intr": { "key": "item_item_intr_309", - "text": "开启后，可以从5星直觉属性守护者中自选一名守护者。" + "text": "开启后，可以从5星林的感观属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_309", - "text": "5星直觉自选宝箱。" + "text": "5星林的感观自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_307", @@ -15219,7 +15219,7 @@ "id": "17050004", "name": { "key": "item_item_name_308", - "text": "5星共情自选宝箱" + "text": "5星水的包容自选宝箱" }, "usetype": 4, "color": 5, @@ -15242,11 +15242,11 @@ "img": "item_17050004", "intr": { "key": "item_item_intr_310", - "text": "开启后，可以从5星共情属性守护者中自选一名守护者。" + "text": "开启后，可以从5星水的包容属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_310", - "text": "5星共情自选宝箱。" + "text": "5星水的包容自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_308", @@ -15265,7 +15265,7 @@ "id": "17050005", "name": { "key": "item_item_name_309", - "text": "5星责任自选宝箱" + "text": "5星光的荣耀自选宝箱" }, "usetype": 4, "color": 5, @@ -15288,11 +15288,11 @@ "img": "item_17050005", "intr": { "key": "item_item_intr_311", - "text": "开启后，可以从5星责任属性守护者中自选一名守护者。" + "text": "开启后，可以从5星光的荣耀属性守护者中自选一名守护者。" }, "describe": { "key": "item_item_describe_311", - "text": "5星责任自选宝箱。" + "text": "5星光的荣耀自选宝箱。" }, "dialogue": { "key": "item_item_dialogue_309", @@ -15449,7 +15449,7 @@ "id": "17060002", "name": { "key": "item_item_name_313", - "text": "真诚回响材料宝箱" + "text": "火的热情回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15472,11 +15472,11 @@ "img": "item_17060002", "intr": { "key": "item_item_intr_315", - "text": "开启后，可以获得真诚属性守护者的回响材料。" + "text": "开启后，可以获得火的热情属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_315", - "text": "真诚回响材料宝箱。" + "text": "火的热情回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_313", @@ -15495,7 +15495,7 @@ "id": "17060003", "name": { "key": "item_item_name_314", - "text": "直觉回响材料宝箱" + "text": "林的感观回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15518,11 +15518,11 @@ "img": "item_17060003", "intr": { "key": "item_item_intr_316", - "text": "开启后，可以获得直觉属性守护者的回响材料。" + "text": "开启后，可以获得林的感观属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_316", - "text": "直觉回响材料宝箱。" + "text": "林的感观回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_314", @@ -15541,7 +15541,7 @@ "id": "17060004", "name": { "key": "item_item_name_315", - "text": "共情回响材料宝箱" + "text": "水的包容回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15564,11 +15564,11 @@ "img": "item_17060004", "intr": { "key": "item_item_intr_317", - "text": "开启后，可以获得共情属性守护者的回响材料。" + "text": "开启后，可以获得水的包容属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_317", - "text": "共情回响材料宝箱。" + "text": "水的包容回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_315", @@ -15587,7 +15587,7 @@ "id": "17060005", "name": { "key": "item_item_name_316", - "text": "责任回响材料宝箱" + "text": "光的荣耀回响材料宝箱" }, "usetype": 4, "color": 5, @@ -15610,11 +15610,11 @@ "img": "item_17060005", "intr": { "key": "item_item_intr_318", - "text": "开启后，可以获得责任属性守护者的回响材料。" + "text": "开启后，可以获得光的荣耀属性守护者的回响材料。" }, "describe": { "key": "item_item_describe_318", - "text": "责任回响材料宝箱。" + "text": "光的荣耀回响材料宝箱。" }, "dialogue": { "key": "item_item_dialogue_316", @@ -15817,7 +15817,7 @@ "id": "17060010", "name": { "key": "item_item_name_321", - "text": "4星直觉守护者自选箱" + "text": "4星林的感观守护者自选箱" }, "usetype": 4, "color": 3, @@ -15840,11 +15840,11 @@ "img": "item_17060010", "intr": { "key": "item_item_intr_323", - "text": "开启后，从宝箱中自选一名紫色直觉守护者的碎片" + "text": "开启后，从宝箱中自选一名紫色林的感观守护者的碎片" }, "describe": { "key": "item_item_describe_323", - "text": "紫色直觉守护者自选箱。" + "text": "紫色林的感观守护者自选箱。" }, "dialogue": { "key": "item_item_dialogue_321", @@ -15863,7 +15863,7 @@ "id": "17060011", "name": { "key": "item_item_name_322", - "text": "4星真诚守护者自选箱" + "text": "4星火的热情守护者自选箱" }, "usetype": 4, "color": 3, @@ -15886,11 +15886,11 @@ "img": "item_17060011", "intr": { "key": "item_item_intr_324", - "text": "开启后，从宝箱中自选一名紫色真诚守护者的碎片" + "text": "开启后，从宝箱中自选一名紫色火的热情守护者的碎片" }, "describe": { "key": "item_item_describe_324", - "text": "紫色真诚守护者自选箱。" + "text": "紫色火的热情守护者自选箱。" }, "dialogue": { "key": "item_item_dialogue_322", @@ -15909,7 +15909,7 @@ "id": "17060012", "name": { "key": "item_item_name_323", - "text": "4星共情守护者自选箱" + "text": "4星水的包容守护者自选箱" }, "usetype": 4, "color": 3, @@ -15932,11 +15932,11 @@ "img": "item_17060012", "intr": { "key": "item_item_intr_325", - "text": "开启后，从宝箱中自选一名紫色共情守护者的碎片" + "text": "开启后，从宝箱中自选一名紫色水的包容守护者的碎片" }, "describe": { "key": "item_item_describe_325", - "text": "紫色共情守护者自选箱。" + "text": "紫色水的包容守护者自选箱。" }, "dialogue": { "key": "item_item_dialogue_323", diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index a471ad8eb..b8d71cb72 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -173,7 +173,7 @@ 100101 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -216,57 +216,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -485,7 +447,7 @@ 100104 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -528,57 +490,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -589,7 +513,7 @@ 100105 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -632,57 +556,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -797,7 +683,7 @@ 100107 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -840,57 +726,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -1213,7 +1061,7 @@ 100111 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -1256,57 +1104,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { @@ -1317,7 +1127,7 @@ 100112 ], "previoustage": 0, - "Episodetype": 1, + "Episodetype": 7, "is_near": 0, "openlevel": 1, "EditorStage": 0, @@ -1360,57 +1170,19 @@ "text": "竟被原始人当成抢鸟蛋的人，为了打听月光原石的下落得快些解开误会。" }, "exp": 0, - "hero_exp": 300, - "ps_consume": [ - { - "a": "attr", - "t": "ps", - "n": 9 - } - ], - "ps_mg": [ - { - "a": "attr", - "t": "ps", - "n": 1 - } - ], - "firstaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "lotteryward": 17110110, - "commonaward": [ - { - "a": "attr", - "t": "gold", - "n": 6000 - } - ], - "BattleReadyID": 204, - "FormatList": [ - 101011 - ], + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], "helphero": [], "banhero": [], - "star": [ - 1, - 1, - 1 - ], - "star_type": [ - 1, - 2, - 2 - ], - "star_value": [ - 0, - 2, - 1 - ], + "star": [], + "star_type": [], + "star_value": [], "challengeward": 0 }, { diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 8072dee56..35953a56d 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -238281,7 +238281,7 @@ }, { "Id": 720017, - "pos": 4, + "pos": 1, "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, @@ -238301,7 +238301,7 @@ }, { "Id": 720017, - "pos": 5, + "pos": 2, "captainId": 0, "IsBoss": 0, "bossHpCnt": 0, diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index 483041fc7..531b359bd 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -15,7 +15,7 @@ "img": "sbkp_js_13002", "intr": { "key": "item_pandamas_jx_intr_1", - "text": "训练直觉守护者时，训练时长提升20%" + "text": "训练林的感观守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -25,7 +25,7 @@ ], "description": { "key": "item_pandamas_jx_description_1", - "text": "训练直觉守护者时，训练时长提升20%" + "text": "训练林的感观守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -52,7 +52,7 @@ "img": "sbkp_js_13001", "intr": { "key": "item_pandamas_jx_intr_2", - "text": "训练真诚守护者时，训练时长提升20%" + "text": "训练火的热情守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -62,7 +62,7 @@ ], "description": { "key": "item_pandamas_jx_description_2", - "text": "训练真诚守护者时，训练时长提升20%" + "text": "训练火的热情守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -89,7 +89,7 @@ "img": "sbkp_js_44002", "intr": { "key": "item_pandamas_jx_intr_3", - "text": "训练共情守护者时，训练时长提升20%" + "text": "训练水的包容守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -99,7 +99,7 @@ ], "description": { "key": "item_pandamas_jx_description_3", - "text": "训练共情守护者时，训练时长提升20%" + "text": "训练水的包容守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -126,7 +126,7 @@ "img": "sbkp_js_24005", "intr": { "key": "item_pandamas_jx_intr_4", - "text": "训练责任守护者时，训练时长提升20%" + "text": "训练光的荣耀守护者时，训练时长提升20%" }, "standard_text": 25001, "special_text": 25002, @@ -136,7 +136,7 @@ ], "description": { "key": "item_pandamas_jx_description_4", - "text": "训练责任守护者时，训练时长提升20%" + "text": "训练光的荣耀守护者时，训练时长提升20%" }, "duration": 200, "exp": 0, @@ -163,7 +163,7 @@ "img": "sbkp_js_14005", "intr": { "key": "item_pandamas_jx_intr_5", - "text": "训练直觉守护者时，经验收益提升10%" + "text": "训练林的感观守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -173,7 +173,7 @@ ], "description": { "key": "item_pandamas_jx_description_5", - "text": "训练直觉守护者时，经验收益提升10%" + "text": "训练林的感观守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -200,7 +200,7 @@ "img": "sbkp_js_44006", "intr": { "key": "item_pandamas_jx_intr_6", - "text": "训练真诚守护者时，经验收益提升10%" + "text": "训练火的热情守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -210,7 +210,7 @@ ], "description": { "key": "item_pandamas_jx_description_6", - "text": "训练真诚守护者时，经验收益提升10%" + "text": "训练火的热情守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -237,7 +237,7 @@ "img": "sbkp_js_45003", "intr": { "key": "item_pandamas_jx_intr_7", - "text": "训练共情守护者时，经验收益提升10%" + "text": "训练水的包容守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -247,7 +247,7 @@ ], "description": { "key": "item_pandamas_jx_description_7", - "text": "训练共情守护者时，经验收益提升10%" + "text": "训练水的包容守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -370,7 +370,7 @@ "img": "sbkp_js_35001", "intr": { "key": "item_pandamas_jx_intr_10", - "text": "训练责任守护者时，经验收益提升10%" + "text": "训练光的荣耀守护者时，经验收益提升10%" }, "standard_text": 25001, "special_text": 25002, @@ -380,7 +380,7 @@ ], "description": { "key": "item_pandamas_jx_description_10", - "text": "训练责任守护者时，经验收益提升10%" + "text": "训练光的荣耀守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -513,7 +513,7 @@ ], "description": { "key": "item_pandamas_jx_description_13", - "text": "训练直觉守护者时，经验收益提升10%" + "text": "训练林的感观守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -561,7 +561,7 @@ ], "description": { "key": "item_pandamas_jx_description_14", - "text": "训练真诚守护者时，经验收益提升10%" + "text": "训练火的热情守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -598,7 +598,7 @@ ], "description": { "key": "item_pandamas_jx_description_15", - "text": "训练共情守护者时，经验收益提升10%" + "text": "训练水的包容守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -635,7 +635,7 @@ ], "description": { "key": "item_pandamas_jx_description_16", - "text": "训练责任守护者时，经验收益提升10%" + "text": "训练光的荣耀守护者时，经验收益提升10%" }, "duration": 0, "exp": 10, @@ -672,7 +672,7 @@ ], "description": { "key": "item_pandamas_jx_description_17", - "text": "训练直觉守护者，可得2个初级直觉回响材料" + "text": "训练林的感观守护者，可得2个初级林的感观回响材料" }, "duration": 0, "exp": 0, @@ -720,7 +720,7 @@ ], "description": { "key": "item_pandamas_jx_description_18", - "text": "训练真诚守护者，可得2个初级真诚回响材料" + "text": "训练火的热情守护者，可得2个初级火的热情回响材料" }, "duration": 0, "exp": 0, @@ -768,7 +768,7 @@ ], "description": { "key": "item_pandamas_jx_description_19", - "text": "训练共情守护者，可得2个初级共情回响材料" + "text": "训练水的包容守护者，可得2个初级水的包容回响材料" }, "duration": 0, "exp": 0, @@ -816,7 +816,7 @@ ], "description": { "key": "item_pandamas_jx_description_20", - "text": "训练共情守护者，可得2个初级责任回响材料" + "text": "训练水的包容守护者，可得2个初级光的荣耀回响材料" }, "duration": 0, "exp": 0, diff --git a/bin/json/game_pandamasyxjx.json b/bin/json/game_pandamasyxjx.json index 37563ef84..1c633a452 100644 --- a/bin/json/game_pandamasyxjx.json +++ b/bin/json/game_pandamasyxjx.json @@ -3,7 +3,7 @@ "id": 1, "describe": { "key": "pandamas_pandamas_yxjx_describe_1", - "text": "添加真诚属性的守护者获得额外经验值加成" + "text": "添加火的热情属性的守护者获得额外经验值加成" }, "camp": 1, "occupation": 0, @@ -14,7 +14,7 @@ "id": 2, "describe": { "key": "pandamas_pandamas_yxjx_describe_2", - "text": "添加共情属性的守护者获得额外经验值加成" + "text": "添加水的包容属性的守护者获得额外经验值加成" }, "camp": 2, "occupation": 0, @@ -25,7 +25,7 @@ "id": 3, "describe": { "key": "pandamas_pandamas_yxjx_describe_3", - "text": "添加直觉属性的守护者获得额外经验值加成" + "text": "添加林的感观属性的守护者获得额外经验值加成" }, "camp": 3, "occupation": 0, @@ -36,7 +36,7 @@ "id": 4, "describe": { "key": "pandamas_pandamas_yxjx_describe_4", - "text": "添加责任属性的守护者获得额外经验值加成" + "text": "添加光的荣耀属性的守护者获得额外经验值加成" }, "camp": 4, "occupation": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 8d5e29dc0..ed4a77d51 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -437,7 +437,7 @@ "Levelid": 0, "datas": [ "GameMain", - "20030_邦尼兔", + "20020_邦尼兔_常驻", "901" ], "event": [ @@ -452,7 +452,7 @@ "Levelid": 0, "datas": [ "GameMain", - "20030_邦尼兔", + "20020_邦尼兔_常驻", "901" ], "event": [ diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 528fa902c..15f1395bb 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6750,9 +6750,7 @@ 250 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -6806,7 +6804,7 @@ "MustHit": false, "DpsRevisiType": 300, "DpsCondition": "", - "RevisiCondition": "EnemyNoBuff=1", + "RevisiCondition": "EnemyHasBuff=1", "RevisiParams": [] }, { @@ -6824,9 +6822,7 @@ 280 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -6849,9 +6845,7 @@ 310 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -6874,9 +6868,7 @@ 350 ], "FollowSK": [], - "SucFollowSK": [ - 915005314 - ], + "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23331,9 +23323,9 @@ { "Id": 243003311, "EmitPR": 1000, - "From": 4, + "From": 14, "Where": [], - "Order": "", + "Order": "PropertyUp=3", "Limit": 1, "ExecuteCnt": 1, "Type": 5, @@ -23343,10 +23335,10 @@ 200 ], "FollowSK": [], - "SucFollowSK": [ + "SucFollowSK": [], + "FailFollowSK": [ 243003312 ], - "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, "DpsCondition": "", @@ -23356,8 +23348,10 @@ { "Id": 243003312, "EmitPR": 1000, - "From": 13, - "Where": [], + "From": 1, + "Where": [ + "EnemyHpproless=0" + ], "Order": "", "Limit": 1, "ExecuteCnt": 1, @@ -23366,27 +23360,6 @@ 200 ], "FollowSK": [], - "SucFollowSK": [ - 243003313 - ], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 243003313, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 29, - "Argu": [], - "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -56063,7 +56036,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000037, + 391000054, 1000, 1, -1 @@ -56087,7 +56060,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 425004311, + 492500431, -1, -1 ], @@ -56438,7 +56411,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000037, + 391000054, 1000, 1, -1 @@ -56462,9 +56435,9 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 482500122, + 492500131, -1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -56972,10 +56945,8 @@ { "Id": 915005314, "EmitPR": 1000, - "From": 9, - "Where": [ - "SelfHasBuff=391000072" - ], + "From": 12, + "Where": [], "Order": "", "Limit": 1, "ExecuteCnt": 1, @@ -57004,11 +56975,10 @@ "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 3, + "Type": 2, "Argu": [ - 391000072, - 1000, - 1, + 491500532, + -1, -1 ], "FollowSK": [], @@ -57494,8 +57464,8 @@ }, { "Id": 945003311, - "EmitPR": 0, - "From": 0, + "EmitPR": 1000, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -57518,8 +57488,8 @@ }, { "Id": 945003312, - "EmitPR": 0, - "From": 0, + "EmitPR": 1000, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -57602,7 +57572,9 @@ 40 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 913003314 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -57618,11 +57590,9 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 5, + "Type": 31, "Argu": [ - 2, - 2, - 40 + 1000 ], "FollowSK": [], "SucFollowSK": [], @@ -57765,7 +57735,7 @@ 390001111, 1000, 1, - 2 + 4 ], "FollowSK": [], "SucFollowSK": [], @@ -57809,7 +57779,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001007, + 391000000, 1000, 1, -1 @@ -57833,7 +57803,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001007, + 391000074, 1000, 1, -1 @@ -58108,7 +58078,7 @@ { "Id": 924008314, "EmitPR": 1000, - "From": 3, + "From": 12, "Where": [], "Order": "", "Limit": 10, @@ -58551,7 +58521,7 @@ { "Id": 934002311, "EmitPR": 1000, - "From": 4, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -58605,7 +58575,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -58888,7 +58858,7 @@ "Argu": [ 391000000, 1000, - -1, + 1, -1 ], "FollowSK": [], @@ -59052,7 +59022,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000006, + 391000000, 1000, 1, -1 @@ -59171,7 +59141,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -59313,10 +59283,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000008, + 391000073, 1000, 1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -59337,10 +59307,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000048, + 390001130, 1000, 1, - -1 + 2 ], "FollowSK": [], "SucFollowSK": [], @@ -59361,7 +59331,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -59425,7 +59395,7 @@ { "Id": 943006215, "EmitPR": 1000, - "From": 4, + "From": 3, "Where": [], "Order": "", "Limit": 10, @@ -59736,7 +59706,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001106, + 391000000, 1000, 1, -1 @@ -59787,7 +59757,7 @@ 390001007, 1000, 1, - 2 + 4 ], "FollowSK": [], "SucFollowSK": [], @@ -59855,7 +59825,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000042, + 391000043, 1000, 1, -1 @@ -60807,10 +60777,11 @@ "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 2, + "Type": 3, "Argu": [ - 492300331, - -1, + 391000075, + 1000, + 1, -1 ], "FollowSK": [], @@ -60879,7 +60850,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001004, + 390001001, 1000, 1, 2 @@ -60998,7 +60969,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001004, + 391000000, 1000, 1, -1 diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index ce16dff45..2793ec487 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -31363,7 +31363,7 @@ "MaxLV": 2, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_770000111", + "key": "skill_skill_atk_Name_770001111", "text": "疯狂坦克" }, "ico": "", @@ -31381,7 +31381,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_770000111_1", + "key": "skill_skill_atk_Desc_770001111_1", "text": "攻击提升20%。" }, "buffid": [], @@ -38529,7 +38529,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_814002431", + "key": "skill_skill_atk_Name_814002433", "text": "回响三阶段" }, "ico": "", @@ -38547,7 +38547,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_814002431_1", + "key": "skill_skill_atk_Desc_814002433_1", "text": "3技能每次伤害有10%概率额外为目标附加2回合【速度下降】" }, "buffid": [], @@ -38619,7 +38619,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_914002431", + "key": "skill_skill_atk_Name_914002433", "text": "觉醒三阶段" }, "ico": "", @@ -38637,7 +38637,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_914002431_1", + "key": "skill_skill_atk_Desc_914002433_1", "text": "自身受击时有15%概率使用嚣张气焰反击，并为自身回复最大血量10%的血量。" }, "buffid": [], @@ -39039,7 +39039,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815002411", + "key": "skill_skill_atk_Name_815002412", "text": "回响二阶段" }, "ico": "", @@ -39057,7 +39057,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815002411_1", + "key": "skill_skill_atk_Desc_815002412_1", "text": "1技能每次攻击时额外夺取目标一个增益" }, "buffid": [], @@ -39069,7 +39069,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815002422", + "key": "skill_skill_atk_Name_815002423", "text": "回响三阶段" }, "ico": "", @@ -39087,7 +39087,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815002422_1", + "key": "skill_skill_atk_Desc_815002423_1", "text": "【发号施令】达到8层后为立即获得1回合【无敌】" }, "buffid": [], @@ -39399,7 +39399,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815004411", + "key": "skill_skill_atk_Name_815004412", "text": "回响二阶段" }, "ico": "", @@ -39417,7 +39417,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815004411_1", + "key": "skill_skill_atk_Desc_815004412_1", "text": "1技能攻击时额外偷取目标10%行动值" }, "buffid": [], @@ -39429,7 +39429,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_815004422", + "key": "skill_skill_atk_Name_815004423", "text": "回响三阶段" }, "ico": "", @@ -39447,7 +39447,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_815004422_1", + "key": "skill_skill_atk_Desc_815004423_1", "text": "攻击行动值为0的目标时额外附加1回合【眩晕】" }, "buffid": [], @@ -39898,7 +39898,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_923003433_1", - "text": "3技能为己方目标附加2回合【暴击提升】 状态。" + "text": "3技能为己方目标附加2回合【攻击提升】 状态。" }, "buffid": [], "map": "" @@ -40072,7 +40072,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 923004313 + 923004314 ] }, "passSkill": [], @@ -40149,7 +40149,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_824001411", + "key": "skill_skill_atk_Name_824001413", "text": "回响三阶段" }, "ico": "", @@ -40167,7 +40167,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_824001411_1", + "key": "skill_skill_atk_Desc_824001413_1", "text": "1技能若成功击杀目标，则获得额外回合。" }, "buffid": [], @@ -40599,7 +40599,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_924003432", + "key": "skill_skill_atk_Name_924003433", "text": "觉醒三阶段" }, "ico": "", @@ -40617,7 +40617,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_924003432_1", + "key": "skill_skill_atk_Desc_924003433_1", "text": "3技能额外附加2回合【禁疗】状态。" }, "buffid": [], @@ -40629,7 +40629,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_824004422", + "key": "skill_skill_atk_Name_824004421", "text": "回响一阶段" }, "ico": "", @@ -40647,7 +40647,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_824004422_1", + "key": "skill_skill_atk_Desc_824004421_1", "text": "敌方有目标死亡时自身增加20点速度" }, "buffid": [], @@ -40870,7 +40870,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_824005431", + "key": "skill_skill_atk_Name_824005433", "text": "回响三阶段" }, "ico": "", @@ -40888,7 +40888,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_824005431_1", + "key": "skill_skill_atk_Desc_824005433_1", "text": "3技能新增为随机1个友方附加2回合【不灭金身】" }, "buffid": [], @@ -41950,7 +41950,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_833002411", + "key": "skill_skill_atk_Name_833002413", "text": "回响三阶段" }, "ico": "", @@ -41968,7 +41968,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_833002411_1", + "key": "skill_skill_atk_Desc_833002413_1", "text": "释放1技能时有50%概率额外附加2回合【攻击下降】" }, "buffid": [], @@ -43134,7 +43134,8 @@ "Target": 0, "ChildSkill": { "Id": [ - 934007313 + 934007313, + 934007314 ] }, "passSkill": [], @@ -43903,7 +43904,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_835005421", + "key": "skill_skill_atk_Name_835005422", "text": "回响二阶段" }, "ico": "", @@ -43921,7 +43922,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_835005421_1", + "key": "skill_skill_atk_Desc_835005422_1", "text": "2技能30%概率附带1回合【攻击下降】" }, "buffid": [], @@ -43933,7 +43934,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_835005422", + "key": "skill_skill_atk_Name_835005423", "text": "回响三阶段" }, "ico": "", @@ -43952,7 +43953,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_835005422_1", + "key": "skill_skill_atk_Desc_835005423_1", "text": "攻击时附带消耗自身血量5%，附带消耗血量100%的伤害" }, "buffid": [], @@ -44684,7 +44685,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943003311", + "key": "skill_skill_atk_Name_943003431", "text": "觉醒一阶段" }, "ico": "", @@ -44702,7 +44703,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943003311_1", + "key": "skill_skill_atk_Desc_943003431_1", "text": "3技能最终治疗量增加10%" }, "buffid": [], @@ -44714,7 +44715,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943003312", + "key": "skill_skill_atk_Name_943003432", "text": "觉醒二阶段" }, "ico": "", @@ -44732,7 +44733,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943003312_1", + "key": "skill_skill_atk_Desc_943003432_1", "text": "增加10%最大血量" }, "buffid": [], @@ -44744,7 +44745,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943003313", + "key": "skill_skill_atk_Name_943003433", "text": "觉醒三阶段" }, "ico": "", @@ -44762,7 +44763,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943003313_1", + "key": "skill_skill_atk_Desc_943003433_1", "text": "3技能复活目标后，自身获得额外回合。" }, "buffid": [], @@ -44804,7 +44805,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_843006421", + "key": "skill_skill_atk_Name_843006422", "text": "回响二阶段" }, "ico": "", @@ -44822,7 +44823,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_843006421_1", + "key": "skill_skill_atk_Desc_843006422_1", "text": "自身处于无法行动状态时受到伤害降低16%" }, "buffid": [], @@ -44834,7 +44835,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_843006422", + "key": "skill_skill_atk_Name_843006423", "text": "回响三阶段" }, "ico": "", @@ -44852,7 +44853,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_843006422_1", + "key": "skill_skill_atk_Desc_843006423_1", "text": "附加增益时每个增益回复自身2%最大血量" }, "buffid": [], @@ -44894,7 +44895,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943006431", + "key": "skill_skill_atk_Name_943006432", "text": "觉醒二阶段" }, "ico": "", @@ -44912,7 +44913,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943006431_1", + "key": "skill_skill_atk_Desc_943006432_1", "text": "增加10%最大血量" }, "buffid": [], @@ -44924,7 +44925,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_943006432", + "key": "skill_skill_atk_Name_943006433", "text": "觉醒三阶段" }, "ico": "", @@ -44942,7 +44943,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_943006432_1", + "key": "skill_skill_atk_Desc_943006433_1", "text": "目标血量低于50%时额外附加1回合复苏" }, "buffid": [], @@ -45916,7 +45917,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_845003431", + "key": "skill_skill_atk_Name_845003433", "text": "回响三阶段" }, "ico": "", @@ -45934,7 +45935,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_845003431_1", + "key": "skill_skill_atk_Desc_845003433_1", "text": "3技能有25%概率附加2回合【复苏】" }, "buffid": [], @@ -46006,7 +46007,7 @@ "MaxLV": 1, "UnavailablePlayTypes": [], "Name": { - "key": "skill_skill_atk_Name_945003421", + "key": "skill_skill_atk_Name_945003423", "text": "觉醒三阶段" }, "ico": "", @@ -46024,7 +46025,7 @@ }, "passSkill": [], "Desc": { - "key": "skill_skill_atk_Desc_945003421_1", + "key": "skill_skill_atk_Desc_945003423_1", "text": "2技能给复活的角色额外回复15%最大血量" }, "buffid": [], diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 8c8902ab6..f2c213923 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -8456,7 +8456,7 @@ "BuffType": 78, "EffectArgu": [ 3, - 100 + 1000 ], "BufParNum": 1, "RelyCheckArgu": [], @@ -10014,7 +10014,7 @@ "key": "skill_skill_buff_Desc_391000048", "text": "受到的伤害降低5%。" }, - "BuffType": 119, + "BuffType": 117, "EffectArgu": [ -50, 390001119, @@ -10599,7 +10599,7 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10632,7 +10632,7 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10663,9 +10663,9 @@ "OverlayTimes": 25, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_wjzj", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10702,9 +10702,9 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_wjzh", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10739,9 +10739,9 @@ "OverlayTimes": 1, "SameID": false, "golbalbufficon": "", - "buffIcon": "", + "buffIcon": "ty_icon_buff_bj", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10775,7 +10775,7 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", "forbidFloat": 0 }, { @@ -10785,7 +10785,7 @@ "text": "狮子3技能回血标记" }, "Desc": { - "key": "skill_skill_buff_Desc_391000070", + "key": "skill_skill_buff_Desc_391000072", "text": "" }, "BuffType": 0, @@ -10805,7 +10805,107 @@ "golbalbufficon": "", "buffIcon": "", "buffeffect": "", - "buffpos": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000073, + "Name": { + "key": "skill_skill_buff_Name_391000073", + "text": "暴击时伤害增加30%" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000073", + "text": "暴击时伤害增加30%" + }, + "BuffType": 133, + "EffectArgu": [ + 3, + 300 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000074, + "Name": { + "key": "skill_skill_buff_Name_391000074", + "text": "[color=#37d8a9]攻击提升[/color]" + }, + "Desc": { + "key": "skill_skill_buff_Desc_390001477", + "text": "攻击提升10%。" + }, + "BuffType": 20, + "EffectArgu": [ + 22, + 100 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 8 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 99, + "SameID": true, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "forbidFloat": 0 + }, + { + "Id": 391000075, + "Name": { + "key": "skill_skill_buff_Name_391000001", + "text": "目标血量低于40%时3技能最终治疗量增加" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000001", + "text": "3技能最终治疗量增加10%" + }, + "BuffType": 79, + "EffectArgu": [ + 3, + 100, + 400 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": true, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", "forbidFloat": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 74b65d6fa..236c90fca 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1267,7 +1267,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 1, "Callback": [ - 234007314 + 234007315 ] }, { @@ -2145,7 +2145,7 @@ "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "", - "AfterSkillCheck": "SkillID=255006212", + "AfterSkillCheck": "SkillID=255006213", "BuffCheck": "", "DpsCheck": "", "AddCon": [], @@ -5391,9 +5391,9 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 99, "Callback": [ + 99, 390001401, - 390001404, - 99 + 390001404 ] }, { @@ -7264,7 +7264,7 @@ "Id": 491300311, "When": 2, "FromCheck": "", - "TargetCheck": "Target=2,HasBuff=3390001113", + "TargetCheck": "Target=2,HasBuff=390001113", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -7277,8 +7277,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 0, "Callback": [ - 913003313, - 913003314 + 913003313 ] }, { @@ -7543,7 +7542,7 @@ }, { "Id": 491500532, - "When": 5, + "When": 17, "FromCheck": "Target=3", "TargetCheck": "", "MainSkillCheck": "SkillPos=3", @@ -7561,35 +7560,15 @@ 915005314 ] }, - { - "Id": 492300331, - "When": 7, - "FromCheck": "Target=3", - "TargetCheck": "Target=1,Hpproless=400", - "MainSkillCheck": "", - "AfterSkillCheck": "", - "BuffCheck": "", - "DpsCheck": "", - "AddCon": [], - "PasPr": 1000, - "PasCorrection": 0, - "Type": "CallSkillPas", - "MaxEmitTimesInRoundByRole": 0, - "MaxEmitTimes": 0, - "MaxEmitTimesInRound": 0, - "Callback": [ - 923003313 - ] - }, { "Id": 492400831, - "When": 4, - "FromCheck": "", + "When": 16, + "FromCheck": "Target=3", "TargetCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", - "DpsCheck": "", + "DpsCheck": "DmgType=0", "AddCon": [ "RoleALive=34008,HasFriendRole=34008" ], @@ -7681,15 +7660,15 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 99, "Callback": [ - 390001401, - 99 + 99, + 390001401 ] }, { "Id": 493400331, "When": 4, "FromCheck": "", - "TargetCheck": "Target=2,NoBuff=1", + "TargetCheck": "Target=2,NoBuff=3", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -7811,7 +7790,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "Target=1,Hpproless=500", - "MainSkillCheck": "", + "MainSkillCheck": "SkillPos=3", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -8247,8 +8226,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 0, "Callback": [ - 913003315, - 913003316 + 913003315 ] }, { @@ -8515,8 +8493,8 @@ "Id": 493500231, "When": 16, "FromCheck": "Target=3", - "TargetCheck": "", - "MainSkillCheck": "SkillPos=3", + "TargetCheck": "Target=2", + "MainSkillCheck": "MainSkillID=135002311", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", @@ -8553,10 +8531,10 @@ }, { "Id": 493500631, - "When": 16, + "When": 20, "FromCheck": "Target=3", "TargetCheck": "", - "MainSkillCheck": "SkillPos=3", + "MainSkillCheck": "MainSkillID=135006311", "AfterSkillCheck": "", "BuffCheck": "", "DpsCheck": "", diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index b4f5e61a4..ef3277922 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -726,7 +726,7 @@ "text": "冰霜泰坦" }, "difficulty": 1, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -785,7 +785,7 @@ "text": "冰霜泰坦" }, "difficulty": 2, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -839,7 +839,7 @@ "text": "冰霜泰坦" }, "difficulty": 3, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -898,7 +898,7 @@ "text": "冰霜泰坦" }, "difficulty": 4, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -952,7 +952,7 @@ "text": "冰霜泰坦" }, "difficulty": 5, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1011,7 +1011,7 @@ "text": "冰霜泰坦" }, "difficulty": 6, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1070,7 +1070,7 @@ "text": "冰霜泰坦" }, "difficulty": 7, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1134,7 +1134,7 @@ "text": "冰霜泰坦" }, "difficulty": 8, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1193,7 +1193,7 @@ "text": "冰霜泰坦" }, "difficulty": 9, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1257,7 +1257,7 @@ "text": "冰霜泰坦" }, "difficulty": 10, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1321,7 +1321,7 @@ "text": "冰霜泰坦" }, "difficulty": 11, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1385,7 +1385,7 @@ "text": "冰霜泰坦" }, "difficulty": 12, - "BattleReadyID": 10500002, + "BattleReadyID": 10500003, "captionrecommend": [ 14007, 25003, @@ -1444,7 +1444,7 @@ "text": "森林泰坦" }, "difficulty": 1, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1502,7 +1502,7 @@ "text": "森林泰坦" }, "difficulty": 2, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1555,7 +1555,7 @@ "text": "森林泰坦" }, "difficulty": 3, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1613,7 +1613,7 @@ "text": "森林泰坦" }, "difficulty": 4, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1666,7 +1666,7 @@ "text": "森林泰坦" }, "difficulty": 5, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1724,7 +1724,7 @@ "text": "森林泰坦" }, "difficulty": 6, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1782,7 +1782,7 @@ "text": "森林泰坦" }, "difficulty": 7, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1845,7 +1845,7 @@ "text": "森林泰坦" }, "difficulty": 8, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1903,7 +1903,7 @@ "text": "森林泰坦" }, "difficulty": 9, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -1966,7 +1966,7 @@ "text": "森林泰坦" }, "difficulty": 10, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -2029,7 +2029,7 @@ "text": "森林泰坦" }, "difficulty": 11, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, @@ -2092,7 +2092,7 @@ "text": "森林泰坦" }, "difficulty": 12, - "BattleReadyID": 10500003, + "BattleReadyID": 10500002, "captionrecommend": [ 25003, 34006, diff --git a/comm/const.go b/comm/const.go index 72094ed55..905e7ca3c 100644 --- a/comm/const.go +++ b/comm/const.go @@ -108,6 +108,7 @@ const ( ModuleBattleRecord core.M_Modules = "battlerecord" //战斗记录 ModuleDragon core.M_Modules = "dragon" //坐骑 ModuleCaptureSheep core.M_Modules = "capturesheep" //捕羊大赛 + ModuleTurntable core.M_Modules = "turntable" // ) // 数据表名定义处 @@ -371,6 +372,8 @@ const ( TableCapturesheep = "capturesheep" //捕羊大赛排名 TableCapturesheepRank = "capturesheeprank" //排名 + + TableTurntable = "turntable" ) // RPC服务接口定义处 diff --git a/modules/activity/api_turntable.go b/modules/activity/api_turntable.go deleted file mode 100644 index 25e2d5646..000000000 --- a/modules/activity/api_turntable.go +++ /dev/null @@ -1,116 +0,0 @@ -package activity - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" -) - -//参数校验 -func (this *apiComp) TurntableRewardCheck(session comm.IUserSession, req *pb.ActivityTurntableRewardReq) (errdata *pb.ErrorData) { - if req.Oid == "" { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - } - } - return -} - -// 大转盘抽奖 -func (this *apiComp) TurntableReward(session comm.IUserSession, req *pb.ActivityTurntableRewardReq) (errdata *pb.ErrorData) { - if errdata = this.TurntableRewardCheck(session, req); errdata != nil { - return - } - var ( - activity *pb.DBHuodong // 活动数据 - err error - atno []*pb.UserAtno - reward []int32 - need []*cfg.Gameatn - ) - //key := fmt.Sprintf("%s-%s", session.GetUserId(), req.Oid) - data, err := this.module.modelhdData.getHddataByOid(session.GetUserId(), req.Oid) - if err == nil { - if activity, err = this.module.modelhdList.getHdListByHdId(req.Oid); err == nil { - curTime := configure.Now().Unix() - if activity.Stime > curTime || curTime > activity.Etime { //不在活动时间范围内 - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ActivityNotIntime, - Title: pb.ErrorCode_ActivityNotIntime.ToString(), - } - return - } - } else { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ActivityInvalid, - Title: pb.ErrorCode_ActivityInvalid.ToString(), - } - return - } - - } else { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - } - return - } - // 消耗校验 - pricekey := this.module.ModuleTools.GetGlobalConf().GiftBuy - if res, err := this.module.ModuleTools.GetPriceGroupCost(pricekey, data.Val+1); len(res) > 0 { - need = append(need, res...) - } else { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), - Message: err.Error(), - } - return - } - - if errdata = this.module.CheckRes(session, need); errdata != nil { // 资源不足 - return - } - if data.Val >= this.module.configure.GetMaxTurntableCount() { // 领取校验 - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ActivityRepatReward, - Title: pb.ErrorCode_ActivityRepatReward.ToString(), - } - return - } - for k := range data.Gotarr { - - reward = append(reward, k) - } - // 发奖 - item, drawkey, err := this.module.Turntable(data.Val+1, reward) - if err == nil { - if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{item}, true); errdata != nil { - return - } - // 修改进度 - data.Gotarr[drawkey] = 1 - data.Val += 1 - } else { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ActivityRepatReward, - Title: pb.ErrorCode_ActivityRepatReward.ToString(), - } - return - } - if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { // 资源不足 - return - } - update := make(map[string]interface{}) - update["gotarr"] = data.Gotarr - update["val"] = data.Val - this.module.modelhdData.ModifyActivityList(session.GetUserId(), data.Id, update) - session.SendMsg(string(this.module.GetType()), "turntablereward", &pb.ActivityTurntableRewardResp{ - Data: data, - Atno: atno, - Drawkey: drawkey, - }) - return -} diff --git a/modules/activity/comp_configure.go b/modules/activity/comp_configure.go index 978155706..5affdc9ab 100644 --- a/modules/activity/comp_configure.go +++ b/modules/activity/comp_configure.go @@ -11,8 +11,7 @@ import ( ) const ( - venturegiftsdraw = "game_venturegiftsdraw.json" //大转盘 - hdcelebration = "game_celebration.json" //开服庆典 + hdcelebration = "game_celebration.json" //开服庆典 ) // /配置管理基础组件 @@ -29,34 +28,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Activity) err = this.LoadMultiConfigure(map[string]interface{}{ - venturegiftsdraw: cfg.NewGameVenturegiftsDraw, - hdcelebration: cfg.NewGameCelebration, + hdcelebration: cfg.NewGameCelebration, }) - configure.RegisterConfigure(venturegiftsdraw, cfg.NewGameVenturegiftsDraw, func() { - var pool1 string - if v, err := this.GetConfigure(venturegiftsdraw); err == nil { - this.hlock.Lock() - this.pool1 = make(map[int32]*cfg.GameVenturegiftsDrawData) - this.pool2 = make(map[int32]*cfg.GameVenturegiftsDrawData) - defer this.hlock.Unlock() - if _configure, ok := v.(*cfg.GameVenturegiftsDraw); ok { - for _, v := range _configure.GetDataList() { - if pool1 == "" { - pool1 = v.DrawType - } - if pool1 == v.DrawType { - this.pool1[v.Drawkey] = v - } else { - this.pool2[v.Drawkey] = v - } - } - return - } - } else { - err = fmt.Errorf("%T no is *cfg.GameHeroAwaken", v) - } - }) return } @@ -77,29 +51,6 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error) return configure.GetConfigure(name) } -// 获取抽奖数据 -func (this *configureComp) GetVenturegiftsDraw(id int32) (configure *cfg.GameVenturegiftsDrawData, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(venturegiftsdraw); err == nil { - if configure, ok = v.(*cfg.GameVenturegiftsDraw).GetDataMap()[id]; !ok { - err = fmt.Errorf("%T no is *cfg.GameVenturegiftsDrawData", v) - return - } - } - return -} - -func (this *configureComp) GetPool1() (m map[int32]*cfg.GameVenturegiftsDrawData) { - return this.pool1 -} - -func (this *configureComp) GetPool2() (m map[int32]*cfg.GameVenturegiftsDrawData) { - return this.pool2 -} - // id func (this *configureComp) GetHDCelebration(id int32) (conf *cfg.GameCelebrationData, err error) { var ( @@ -124,7 +75,3 @@ func (this *configureComp) GetHDCelebrationData() (days []int32) { } return } - -func (this *configureComp) GetMaxTurntableCount() (count int32) { - return int32(len(this.pool1) + len(this.pool2)) -} diff --git a/modules/activity/module.go b/modules/activity/module.go index 1304b2eb6..dd2926e9c 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -6,12 +6,11 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" - "go_dreamfactory/lego/sys/event" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" - cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/sys/db" "go_dreamfactory/utils" @@ -89,7 +88,7 @@ func (this *Activity) Start() (err error) { return } this.kftask = module.(comm.IActivityNotice) - event.RegisterGO(comm.EventUserLogin, this.EventUserLogin) + if !db.IsCross() { this.modelhdList.LoadActivityData() for k, v := range this.modelhdList.activity { @@ -194,54 +193,6 @@ func (this *Activity) GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err err return } -// 大转盘奖励 -func (this *Activity) Turntable(drawIndex int32, reward []int32) (item *cfg.Gameatn, drawkey int32, err error) { - var ( - conf *cfg.GameVenturegiftsDrawData - szW []int32 // 权重 - szpool []int32 // drawkey - ) - if conf, err = this.configure.GetVenturegiftsDraw(drawIndex); err != nil { - return - } - - // 过滤已经获得的道具 - for _, v := range this.configure.pool1 { - bFound := false - for _, v1 := range reward { - if v.Drawkey == v1 { - bFound = true - break - } - } - if !bFound { - szW = append(szW, v.Weight) - szpool = append(szpool, v.Drawkey) - } - } - if conf.Type == 2 { - for _, v := range this.configure.pool2 { - bFound := false - for _, v1 := range reward { - if v.Drawkey == v1 { - bFound = true - break - } - } - if !bFound { - szW = append(szW, v.Weight) - szpool = append(szpool, v.Drawkey) - } - } - } - if c, err := this.configure.GetVenturegiftsDraw(szpool[comm.GetRandW(szW)]); err == nil { - item = c.Id // 最终获得的道具 - drawkey = c.Drawkey - } - - return -} - // 统计庆典活动完成情况 func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, bosstype int32) bool { bDouble := false // 是否开启双倍奖励 @@ -251,7 +202,6 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, update := make(map[string]interface{}) bChange := false // 查询玩家活动记录 - //key := fmt.Sprintf("%s-%s", session.GetUserId(), v.Id) if data, err := this.modelhdData.getHddataByOid(session.GetUserId(), activity.Id); err == nil { // 注意 Gotarr:map[int32]int32 key value 已经挑战的次数 if !utils.IsToday(data.Lasttime) { // 不是今天重置 @@ -323,42 +273,10 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32, } } } - // } } return bDouble } -func (this *Activity) EventUserLogin(session comm.IUserSession) { - // 转盘活动 - if a, err := this.GetHdInfoByItype(pb.HdType_HdTypeTurntable); err == nil { // - bEnd := false - // for _, v := range a { - if configure.Now().Unix() > a.Etime { - bEnd = true - } - // } - if bEnd { // 活动结束 活动道具转换 - t := this.ModuleTools.GetGlobalConf().VenturegiftsDraw - var reward []*pb.UserAssets - if item, err := this.configure.GetItemConfigureData(t); err != nil { - amount := this.ModuleItems.QueryItemAmount(session.GetUserId(), t) - if amount > 0 { - this.ModuleItems.AddItem(session, t, -int32(amount), true) - for _, v := range item.Sale { - reward = append(reward, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N * int32(amount), - }) - } - // 发邮件 - this.mail.SendMailByCid(session, comm.Venturegifts, reward) - } - } - } - } -} - func (this *Activity) GetHdData(session comm.IUserSession, oids []string) (result []*pb.DBActivityData) { var ( activity *pb.DBHuodong diff --git a/modules/turntable/api.go b/modules/turntable/api.go new file mode 100644 index 000000000..f830fc440 --- /dev/null +++ b/modules/turntable/api.go @@ -0,0 +1,20 @@ +package turntable + +import ( + "go_dreamfactory/lego/base" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +type apiComp struct { + modules.MCompGate + service base.IRPCXService + module *Turntable +} + +func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + _ = this.MCompGate.Init(service, module, comp, options) + this.service = service.(base.IRPCXService) + this.module = module.(*Turntable) + return +} diff --git a/modules/turntable/api_draw.go b/modules/turntable/api_draw.go new file mode 100644 index 000000000..76e595d3e --- /dev/null +++ b/modules/turntable/api_draw.go @@ -0,0 +1,85 @@ +package turntable + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) DrawCheck(session comm.IUserSession, req *pb.TurntableDrawReq) (errdata *pb.ErrorData) { + + return +} + +func (this *apiComp) Draw(session comm.IUserSession, req *pb.TurntableDrawReq) (errdata *pb.ErrorData) { + var ( + err error + atno []*pb.UserAtno + reward []int32 + need []*cfg.Gameatn + ) + data, err := this.module.modelt.getUserTurntable(session.GetUserId()) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + } + return + } + // 消耗校验 + pricekey := this.module.ModuleTools.GetGlobalConf().GiftBuy + if res, err := this.module.ModuleTools.GetPriceGroupCost(pricekey, int32(len(data.Data))+1); len(res) > 0 { + need = append(need, res...) + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + + if errdata = this.module.CheckRes(session, need); errdata != nil { // 资源不足 + return + } + if int32(len(data.Data)) >= this.module.configure.GetMaxTurntableCount() { // 领取校验 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityRepatReward, + Title: pb.ErrorCode_ActivityRepatReward.ToString(), + } + return + } + for k := range data.Data { + + reward = append(reward, k) + } + // 发奖 + item, drawkey, err := this.module.Turntable(int32(len(data.Data))+1, reward) + if err == nil { + if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{item}, true); errdata != nil { + return + } + // 修改进度 + data.Data[drawkey] = 1 + + } else { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ActivityRepatReward, + Title: pb.ErrorCode_ActivityRepatReward.ToString(), + } + return + } + if errdata = this.module.ConsumeRes(session, need, true); errdata != nil { // 资源不足 + return + } + this.module.modelt.Change(session.GetUserId(), map[string]interface{}{ + "data": data.Data, + }) + session.SendMsg(string(this.module.GetType()), "draw", &pb.TurntableDrawResp{ + Data: data, + Atno: atno, + Drawkey: drawkey, + }) + return +} diff --git a/modules/turntable/api_getlist.go b/modules/turntable/api_getlist.go new file mode 100644 index 000000000..f3ffdd371 --- /dev/null +++ b/modules/turntable/api_getlist.go @@ -0,0 +1,36 @@ +package turntable + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 参数校验 +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.TurntableGetListReq) (errdata *pb.ErrorData) { + + return +} + +func (this *apiComp) GetList(session comm.IUserSession, req *pb.TurntableGetListReq) (errdata *pb.ErrorData) { + + var ( + turntable *pb.DBTurntable + err error + ) + if errdata = this.GetListCheck(session, req); errdata != nil { + return + } + + if turntable, err = this.module.modelt.getUserTurntable(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "getlist", &pb.TurntableGetListResp{ + Data: turntable, + }) + return +} diff --git a/modules/turntable/configure.go b/modules/turntable/configure.go new file mode 100644 index 000000000..34dac778f --- /dev/null +++ b/modules/turntable/configure.go @@ -0,0 +1,141 @@ +package turntable + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" + "sync" +) + +const ( + game_venturegiftstask = "game_venturegiftstask.json" + venturegiftsdraw = "game_venturegiftsdraw.json" //大转盘 +) + +type configureComp struct { + modules.MCompConfigure + module *Turntable + lock sync.RWMutex + tasks map[int32]struct{} + groupTasks map[int32][]*cfg.GameVenturegiftsTaskData //key 条件ID + pool1 map[int32]*cfg.GameVenturegiftsDrawData + pool2 map[int32]*cfg.GameVenturegiftsDrawData +} + +func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompConfigure.Init(service, module, comp, options) + this.module = module.(*Turntable) + configure.RegisterConfigure(game_venturegiftstask, cfg.NewGameVenturegiftsTask, this.updateconfigure) + + configure.RegisterConfigure(venturegiftsdraw, cfg.NewGameVenturegiftsDraw, this.updateconfigureDraw) + return +} + +func (this *configureComp) gettasks() map[int32]struct{} { + this.lock.RLock() + defer this.lock.RUnlock() + return this.tasks +} + +// 更新任务配置表 +func (this *configureComp) updateconfigureDraw() { + var pool1 string + if v, err := this.GetConfigure(venturegiftsdraw); err == nil { + this.lock.Lock() + this.pool1 = make(map[int32]*cfg.GameVenturegiftsDrawData) + this.pool2 = make(map[int32]*cfg.GameVenturegiftsDrawData) + defer this.lock.Unlock() + if _configure, ok := v.(*cfg.GameVenturegiftsDraw); ok { + for _, v := range _configure.GetDataList() { + if pool1 == "" { + pool1 = v.DrawType + } + if pool1 == v.DrawType { + this.pool1[v.Drawkey] = v + } else { + this.pool2[v.Drawkey] = v + } + } + return + } + } else { + err = fmt.Errorf("%T no is *cfg.GameHeroAwaken", v) + } +} +func (this *configureComp) updateconfigure() { + var ( + v interface{} + conf *cfg.GameVenturegiftsTask + ok bool + err error + ) + if v, err = this.GetConfigure(game_venturegiftstask); err != nil { + return + } + if conf, ok = v.(*cfg.GameVenturegiftsTask); !ok { + this.module.Error("日常任务配置异常!") + return + } + tasks := make(map[int32]struct{}) + groupTasksConf := make(map[int32][]*cfg.GameVenturegiftsTaskData) + + for _, v := range conf.GetDataList() { + + if _, ok := groupTasksConf[v.Openday]; !ok { + groupTasksConf[v.Openday] = make([]*cfg.GameVenturegiftsTaskData, 0) + } + groupTasksConf[v.Openday] = append(groupTasksConf[v.Openday], v) + tasks[v.Venturetask] = struct{}{} + } + + this.lock.Lock() + this.groupTasks = groupTasksConf + this.tasks = tasks + this.lock.Unlock() +} + +func (this *configureComp) getGameVenturegiftsTask(id int32) (conf *cfg.GameVenturegiftsTaskData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_venturegiftstask); err != nil { + return + } + if conf, ok = v.(*cfg.GameVenturegiftsTask).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_venturegiftstask, id) + this.module.Errorln(err) + return + } + return +} + +// 获取抽奖数据 +func (this *configureComp) GetVenturegiftsDraw(id int32) (configure *cfg.GameVenturegiftsDrawData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(venturegiftsdraw); err == nil { + if configure, ok = v.(*cfg.GameVenturegiftsDraw).GetDataMap()[id]; !ok { + err = fmt.Errorf("%T no is *cfg.GameVenturegiftsDrawData", v) + return + } + } + return +} + +func (this *configureComp) GetPool1() (m map[int32]*cfg.GameVenturegiftsDrawData) { + return this.pool1 +} + +func (this *configureComp) GetPool2() (m map[int32]*cfg.GameVenturegiftsDrawData) { + return this.pool2 +} + +func (this *configureComp) GetMaxTurntableCount() (count int32) { + return int32(len(this.pool1) + len(this.pool2)) +} diff --git a/modules/turntable/modelturntable.go b/modules/turntable/modelturntable.go new file mode 100644 index 000000000..41cd6fbc9 --- /dev/null +++ b/modules/turntable/modelturntable.go @@ -0,0 +1,45 @@ +package turntable + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type ModelTurntable struct { + modules.MCompModel + module *Turntable +} + +func (this *ModelTurntable) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TableTurntable + this.module = module.(*Turntable) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +func (this *ModelTurntable) getUserTurntable(uid string) (results *pb.DBTurntable, err error) { + results = &pb.DBTurntable{} + if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil { + this.module.Errorln(err) + return + } + if err == mgo.MongodbNil { + results = &pb.DBTurntable{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Data: make(map[int32]int32), + } + err = this.Add(uid, results) + } + return +} diff --git a/modules/turntable/module.go b/modules/turntable/module.go new file mode 100644 index 000000000..9634923e6 --- /dev/null +++ b/modules/turntable/module.go @@ -0,0 +1,167 @@ +package turntable + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/event" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" +) + +type Turntable struct { + modules.ModuleBase + service core.IService + api *apiComp + configure *configureComp + modelt *ModelTurntable + mail comm.Imail + open bool +} + +func NewModule() core.IModule { + return &Turntable{} +} + +func (this *Turntable) GetType() core.M_Modules { + return comm.ModuleTurntable +} + +func (this *Turntable) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { + err = this.ModuleBase.Init(service, module, options) + this.service = service + return +} + +func (this *Turntable) Start() (err error) { + err = this.ModuleBase.Start() + var module core.IModule + if module, err = this.service.GetModule(comm.ModuleMail); err != nil { + return + } + this.mail = module.(comm.Imail) + if module, err = this.service.GetModule(comm.ModuleWarorder); err != nil { + return + } + event.RegisterGO(comm.EventUserLogin, this.EventUserLogin) + return +} + +func (this *Turntable) OnInstallComp() { + this.ModuleBase.OnInstallComp() + this.api = this.RegisterComp(new(apiComp)).(*apiComp) + this.modelt = this.RegisterComp(new(ModelTurntable)).(*ModelTurntable) + this.configure = this.RegisterComp(new(configureComp)).(*configureComp) +} + +// 活动开启 +func (this *Turntable) ActivityOpenNotice(hdlist *pb.DBHuodong) { + switch hdlist.Itype { + case pb.HdType_KFSevenTask: + this.open = true + break + } +} + +// 活动关闭 +func (this *Turntable) ActivityCloseNotice(hdlist *pb.DBHuodong) { + switch hdlist.Itype { + case pb.HdType_KFSevenTask: + this.open = false + break + } +} + +// 大转盘奖励 +func (this *Turntable) Turntable(drawIndex int32, reward []int32) (item *cfg.Gameatn, drawkey int32, err error) { + var ( + conf *cfg.GameVenturegiftsDrawData + szW []int32 // 权重 + szpool []int32 // drawkey + ) + if conf, err = this.configure.GetVenturegiftsDraw(drawIndex); err != nil { + return + } + + // 过滤已经获得的道具 + for _, v := range this.configure.pool1 { + bFound := false + for _, v1 := range reward { + if v.Drawkey == v1 { + bFound = true + break + } + } + if !bFound { + szW = append(szW, v.Weight) + szpool = append(szpool, v.Drawkey) + } + } + if conf.Type == 2 { + for _, v := range this.configure.pool2 { + bFound := false + for _, v1 := range reward { + if v.Drawkey == v1 { + bFound = true + break + } + } + if !bFound { + szW = append(szW, v.Weight) + szpool = append(szpool, v.Drawkey) + } + } + } + if c, err := this.configure.GetVenturegiftsDraw(szpool[comm.GetRandW(szW)]); err == nil { + item = c.Id // 最终获得的道具 + drawkey = c.Drawkey + } + + return +} + +func (this *Turntable) EventUserLogin(session comm.IUserSession) { + // 转盘活动 + var ( + bEnd bool + turntable *pb.DBTurntable + err error + ) + if turntable, err = this.modelt.getUserTurntable(session.GetUserId()); err != nil { + + return + } + if turntable.Reward { + return + } + endTime := 28 // 等配置 + if user := this.ModuleUser.GetUser(session.GetUserId()); user != nil { + if configure.Now().Unix() > user.Ctime+int64(endTime*24*3600) { + bEnd = true + } + } + if bEnd { // 活动结束 活动道具转换 + t := this.ModuleTools.GetGlobalConf().VenturegiftsDraw + var reward []*pb.UserAssets + if item, err := this.configure.GetItemConfigureData(t); err != nil { + amount := this.ModuleItems.QueryItemAmount(session.GetUserId(), t) + if amount > 0 { + this.ModuleItems.AddItem(session, t, -int32(amount), true) + for _, v := range item.Sale { + reward = append(reward, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N * int32(amount), + }) + } + // 发邮件 + this.mail.SendMailByCid(session, comm.Venturegifts, reward) + } + } + } + turntable.Reward = true + this.modelt.Change(session.GetUserId(), map[string]interface{}{ + "reward": turntable.Reward, + }) +} diff --git a/pb/turntable_db.pb.go b/pb/turntable_db.pb.go new file mode 100644 index 000000000..25ad0ad8a --- /dev/null +++ b/pb/turntable_db.pb.go @@ -0,0 +1,176 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: turntable/turntable_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type DBTurntable struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Data map[int32]int32 `protobuf:"bytes,3,rep,name=data,proto3" json:"data" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Reward bool `protobuf:"varint,4,opt,name=reward,proto3" json:"reward"` // 奖励是否补发 +} + +func (x *DBTurntable) Reset() { + *x = DBTurntable{} + if protoimpl.UnsafeEnabled { + mi := &file_turntable_turntable_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBTurntable) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBTurntable) ProtoMessage() {} + +func (x *DBTurntable) ProtoReflect() protoreflect.Message { + mi := &file_turntable_turntable_db_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBTurntable.ProtoReflect.Descriptor instead. +func (*DBTurntable) Descriptor() ([]byte, []int) { + return file_turntable_turntable_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBTurntable) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBTurntable) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBTurntable) GetData() map[int32]int32 { + if x != nil { + return x.Data + } + return nil +} + +func (x *DBTurntable) GetReward() bool { + if x != nil { + return x.Reward + } + return false +} + +var File_turntable_turntable_db_proto protoreflect.FileDescriptor + +var file_turntable_turntable_db_proto_rawDesc = []byte{ + 0x0a, 0x1c, 0x74, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2f, 0x74, 0x75, 0x72, 0x6e, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xac, + 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, + 0x12, 0x2a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x44, 0x42, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x44, 0x61, 0x74, + 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, + 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_turntable_turntable_db_proto_rawDescOnce sync.Once + file_turntable_turntable_db_proto_rawDescData = file_turntable_turntable_db_proto_rawDesc +) + +func file_turntable_turntable_db_proto_rawDescGZIP() []byte { + file_turntable_turntable_db_proto_rawDescOnce.Do(func() { + file_turntable_turntable_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_turntable_turntable_db_proto_rawDescData) + }) + return file_turntable_turntable_db_proto_rawDescData +} + +var file_turntable_turntable_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_turntable_turntable_db_proto_goTypes = []interface{}{ + (*DBTurntable)(nil), // 0: DBTurntable + nil, // 1: DBTurntable.DataEntry +} +var file_turntable_turntable_db_proto_depIdxs = []int32{ + 1, // 0: DBTurntable.data:type_name -> DBTurntable.DataEntry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_turntable_turntable_db_proto_init() } +func file_turntable_turntable_db_proto_init() { + if File_turntable_turntable_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_turntable_turntable_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBTurntable); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_turntable_turntable_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_turntable_turntable_db_proto_goTypes, + DependencyIndexes: file_turntable_turntable_db_proto_depIdxs, + MessageInfos: file_turntable_turntable_db_proto_msgTypes, + }.Build() + File_turntable_turntable_db_proto = out.File + file_turntable_turntable_db_proto_rawDesc = nil + file_turntable_turntable_db_proto_goTypes = nil + file_turntable_turntable_db_proto_depIdxs = nil +} diff --git a/pb/turntable_msg.pb.go b/pb/turntable_msg.pb.go new file mode 100644 index 000000000..d211d861c --- /dev/null +++ b/pb/turntable_msg.pb.go @@ -0,0 +1,342 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: turntable/turntable_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type TurntableGetListReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *TurntableGetListReq) Reset() { + *x = TurntableGetListReq{} + if protoimpl.UnsafeEnabled { + mi := &file_turntable_turntable_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TurntableGetListReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TurntableGetListReq) ProtoMessage() {} + +func (x *TurntableGetListReq) ProtoReflect() protoreflect.Message { + mi := &file_turntable_turntable_msg_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TurntableGetListReq.ProtoReflect.Descriptor instead. +func (*TurntableGetListReq) Descriptor() ([]byte, []int) { + return file_turntable_turntable_msg_proto_rawDescGZIP(), []int{0} +} + +type TurntableGetListResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBTurntable `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *TurntableGetListResp) Reset() { + *x = TurntableGetListResp{} + if protoimpl.UnsafeEnabled { + mi := &file_turntable_turntable_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TurntableGetListResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TurntableGetListResp) ProtoMessage() {} + +func (x *TurntableGetListResp) ProtoReflect() protoreflect.Message { + mi := &file_turntable_turntable_msg_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TurntableGetListResp.ProtoReflect.Descriptor instead. +func (*TurntableGetListResp) Descriptor() ([]byte, []int) { + return file_turntable_turntable_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *TurntableGetListResp) GetData() *DBTurntable { + if x != nil { + return x.Data + } + return nil +} + +// 大转盘活动领奖 +type TurntableDrawReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *TurntableDrawReq) Reset() { + *x = TurntableDrawReq{} + if protoimpl.UnsafeEnabled { + mi := &file_turntable_turntable_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TurntableDrawReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TurntableDrawReq) ProtoMessage() {} + +func (x *TurntableDrawReq) ProtoReflect() protoreflect.Message { + mi := &file_turntable_turntable_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TurntableDrawReq.ProtoReflect.Descriptor instead. +func (*TurntableDrawReq) Descriptor() ([]byte, []int) { + return file_turntable_turntable_msg_proto_rawDescGZIP(), []int{2} +} + +// 领取奖励数据返回 +type TurntableDrawResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBTurntable `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Atno []*UserAtno `protobuf:"bytes,2,rep,name=atno,proto3" json:"atno"` + Drawkey int32 `protobuf:"varint,3,opt,name=drawkey,proto3" json:"drawkey"` +} + +func (x *TurntableDrawResp) Reset() { + *x = TurntableDrawResp{} + if protoimpl.UnsafeEnabled { + mi := &file_turntable_turntable_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TurntableDrawResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TurntableDrawResp) ProtoMessage() {} + +func (x *TurntableDrawResp) ProtoReflect() protoreflect.Message { + mi := &file_turntable_turntable_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TurntableDrawResp.ProtoReflect.Descriptor instead. +func (*TurntableDrawResp) Descriptor() ([]byte, []int) { + return file_turntable_turntable_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *TurntableDrawResp) GetData() *DBTurntable { + if x != nil { + return x.Data + } + return nil +} + +func (x *TurntableDrawResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + +func (x *TurntableDrawResp) GetDrawkey() int32 { + if x != nil { + return x.Drawkey + } + return 0 +} + +var File_turntable_turntable_msg_proto protoreflect.FileDescriptor + +var file_turntable_turntable_msg_proto_rawDesc = []byte{ + 0x0a, 0x1d, 0x74, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2f, 0x74, 0x75, 0x72, 0x6e, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x1c, 0x74, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2f, 0x74, 0x75, 0x72, 0x6e, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, + 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x54, 0x75, 0x72, + 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x22, 0x38, 0x0a, 0x14, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x47, 0x65, 0x74, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x72, 0x6e, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x12, 0x0a, 0x10, 0x54, 0x75, + 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x72, 0x61, 0x77, 0x52, 0x65, 0x71, 0x22, 0x6e, + 0x0a, 0x11, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x72, 0x61, 0x77, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, + 0x61, 0x74, 0x6e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x72, 0x61, 0x77, 0x6b, 0x65, 0x79, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x72, 0x61, 0x77, 0x6b, 0x65, 0x79, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_turntable_turntable_msg_proto_rawDescOnce sync.Once + file_turntable_turntable_msg_proto_rawDescData = file_turntable_turntable_msg_proto_rawDesc +) + +func file_turntable_turntable_msg_proto_rawDescGZIP() []byte { + file_turntable_turntable_msg_proto_rawDescOnce.Do(func() { + file_turntable_turntable_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_turntable_turntable_msg_proto_rawDescData) + }) + return file_turntable_turntable_msg_proto_rawDescData +} + +var file_turntable_turntable_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_turntable_turntable_msg_proto_goTypes = []interface{}{ + (*TurntableGetListReq)(nil), // 0: TurntableGetListReq + (*TurntableGetListResp)(nil), // 1: TurntableGetListResp + (*TurntableDrawReq)(nil), // 2: TurntableDrawReq + (*TurntableDrawResp)(nil), // 3: TurntableDrawResp + (*DBTurntable)(nil), // 4: DBTurntable + (*UserAtno)(nil), // 5: UserAtno +} +var file_turntable_turntable_msg_proto_depIdxs = []int32{ + 4, // 0: TurntableGetListResp.data:type_name -> DBTurntable + 4, // 1: TurntableDrawResp.data:type_name -> DBTurntable + 5, // 2: TurntableDrawResp.atno:type_name -> UserAtno + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_turntable_turntable_msg_proto_init() } +func file_turntable_turntable_msg_proto_init() { + if File_turntable_turntable_msg_proto != nil { + return + } + file_turntable_turntable_db_proto_init() + file_comm_proto_init() + if !protoimpl.UnsafeEnabled { + file_turntable_turntable_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TurntableGetListReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_turntable_turntable_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TurntableGetListResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_turntable_turntable_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TurntableDrawReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_turntable_turntable_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TurntableDrawResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_turntable_turntable_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_turntable_turntable_msg_proto_goTypes, + DependencyIndexes: file_turntable_turntable_msg_proto_depIdxs, + MessageInfos: file_turntable_turntable_msg_proto_msgTypes, + }.Build() + File_turntable_turntable_msg_proto = out.File + file_turntable_turntable_msg_proto_rawDesc = nil + file_turntable_turntable_msg_proto_goTypes = nil + file_turntable_turntable_msg_proto_depIdxs = nil +} diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index 690ad23fd..b679738d3 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -123,4 +123,5 @@ const ( GameBuffType_VIKING_ROAR = 130 GameBuffType_VIKING_FLAG = 131 GameBuffType_MASTER_SHIELD = 132 + GameBuffType_MODIFYHPTYPE_ADD_DMG = 133 ) diff --git a/sys/configure/structs/Game.BuzkashiMountData.go b/sys/configure/structs/Game.BuzkashiMountData.go index b6701d023..3103e5701 100644 --- a/sys/configure/structs/Game.BuzkashiMountData.go +++ b/sys/configure/structs/Game.BuzkashiMountData.go @@ -19,9 +19,10 @@ type GameBuzkashiMountData struct { Img string Access []int32 Model string + Controller string Point string - Stime int32 Etime int32 + Stime int32 Hp int32 Moderate int32 Sprint int32 @@ -62,9 +63,10 @@ func (_v *GameBuzkashiMountData)Deserialize(_buf map[string]interface{}) (err er } { var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } } + { var _ok_ bool; if _v.Controller, _ok_ = _buf["controller"].(string); !_ok_ { err = errors.New("controller error"); return } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stime"].(float64); !_ok_ { err = errors.New("stime error"); return }; _v.Stime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["etime"].(float64); !_ok_ { err = errors.New("etime error"); return }; _v.Etime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stime"].(float64); !_ok_ { err = errors.New("stime error"); return }; _v.Stime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["moderate"].(float64); !_ok_ { err = errors.New("moderate error"); return }; _v.Moderate = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sprint"].(float64); !_ok_ { err = errors.New("sprint error"); return }; _v.Sprint = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.DragonPlayData.go b/sys/configure/structs/Game.DragonPlayData.go index 5571abcae..cff31914e 100644 --- a/sys/configure/structs/Game.DragonPlayData.go +++ b/sys/configure/structs/Game.DragonPlayData.go @@ -19,6 +19,7 @@ type GameDragonPlayData struct { Time int32 Cd int32 Deplete []*Gameatn + Bubble int32 Group int32 } @@ -50,6 +51,7 @@ func (_v *GameDragonPlayData)Deserialize(_buf map[string]interface{}) (err error } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bubble"].(float64); !_ok_ { err = errors.New("bubble error"); return }; _v.Bubble = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index de5f8e068..f273eb76a 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -178,7 +178,6 @@ type Tables struct { BuzkashiLv *GameBuzkashiLv BuzkashiQteLv *GameBuzkashiQteLv BuzkashiGrade *GameBuzkashiGrade - BuzkashiReward *GameBuzkashiReward BuzkashiFm *GameBuzkashiFm BuzkashiOpen *GameBuzkashiOpen BuzkashiTrack *GameBuzkashiTrack @@ -1268,12 +1267,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.BuzkashiGrade, err = NewGameBuzkashiGrade(buf) ; err != nil { return nil, err } - if buf, err = loader("game_buzkashireward") ; err != nil { - return nil, err - } - if tables.BuzkashiReward, err = NewGameBuzkashiReward(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_buzkashifm") ; err != nil { return nil, err }