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

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

Browse Source
This commit is contained in:
meixiongfeng 2023-08-18 20:35:23 +08:00
commit c2f157bb75
16 changed files with 5952 additions and 2001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bin/json/game_battleready.json
View File

@ -1312,9 +1312,7 @@
"key": "", "key": "",
"text": "" "text": ""
}, },
"battleEvents": [ "battleEvents": [],
113
],
"ScoreGroupID": 0, "ScoreGroupID": 0,
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [], "ChoseCamp": [],
@ -1357,5 +1355,36 @@
"BlueAssistTeam": 0, "BlueAssistTeam": 0,
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
},
{
"id": 208,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 0,
"ShowBuff": 0,
"RuleTips": {
"key": "",
"text": ""
},
"battleEvents": [
113
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720017,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
} }
] ]

2032
bin/json/game_bufflottery.json
View File

File diff suppressed because it is too large Load Diff

56
bin/json/game_buriedcondi.json
View File

@ -26047,9 +26047,7 @@
"id": 60000004, "id": 60000004,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_925", "key": "buried_buried_condi_tasktxt_925",
@ -26071,9 +26069,7 @@
"id": 60000005, "id": 60000005,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_926", "key": "buried_buried_condi_tasktxt_926",
@ -26095,9 +26091,7 @@
"id": 60000006, "id": 60000006,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_927", "key": "buried_buried_condi_tasktxt_927",
@ -26121,9 +26115,7 @@
"id": 60000007, "id": 60000007,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_928", "key": "buried_buried_condi_tasktxt_928",
@ -26145,9 +26137,7 @@
"id": 60000008, "id": 60000008,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_929", "key": "buried_buried_condi_tasktxt_929",
@ -26169,9 +26159,7 @@
"id": 60000009, "id": 60000009,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_930", "key": "buried_buried_condi_tasktxt_930",
@ -26193,9 +26181,7 @@
"id": 70000001, "id": 70000001,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [ "notify": [],
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_931", "key": "buried_buried_condi_tasktxt_931",
@ -27433,7 +27419,9 @@
"id": 90000001, "id": 90000001,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_988", "key": "buried_buried_condi_tasktxt_988",
@ -27457,7 +27445,9 @@
"id": 90000002, "id": 90000002,
"rtype": 1, "rtype": 1,
"ctype": 3, "ctype": 3,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_989", "key": "buried_buried_condi_tasktxt_989",
@ -27479,7 +27469,9 @@
"id": 90000003, "id": 90000003,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_990", "key": "buried_buried_condi_tasktxt_990",
@ -27503,7 +27495,9 @@
"id": 90000004, "id": 90000004,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_991", "key": "buried_buried_condi_tasktxt_991",
@ -27525,7 +27519,9 @@
"id": 90000005, "id": 90000005,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_992", "key": "buried_buried_condi_tasktxt_992",
@ -27549,7 +27545,9 @@
"id": 90000006, "id": 90000006,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_993", "key": "buried_buried_condi_tasktxt_993",
@ -27571,7 +27569,9 @@
"id": 90000007, "id": 90000007,
"rtype": 1, "rtype": 1,
"ctype": 1, "ctype": 1,
"notify": [], "notify": [
"pushgiftbag"
],
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_994", "key": "buried_buried_condi_tasktxt_994",

4
bin/json/game_fightglobalevent.json
View File

@ -680,9 +680,9 @@
"key": "", "key": "",
"text": "" "text": ""
}, },
"When": 15, "When": 25,
"FromCheck": "", "FromCheck": "",
"TargetCheck": "Side=2,HeroID=13002", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",

74
bin/json/game_hero.json
View File

@ -6585,6 +6585,80 @@
], ],
"expitemnum": 7 "expitemnum": 7
}, },
{
"hid": "54003",
"name": {
"key": "hero_main_name_54003",
"text": "黑猫"
},
"star": 3,
"color": 2,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "54003",
"rotation": "0|0|0",
"revolve": 0,
"icon": "54003",
"vocal": "54003",
"tujing": [
107
],
"detailwindow": "effect_effect_shilaike_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "hero_54003",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": 0,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
"skill3": 0,
"txt": {
"key": "atlas_54003",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000011",
"n": 1
}
],
"expitemnum": 7
},
{ {
"hid": "53005", "hid": "53005",
"name": { "name": {

142
bin/json/game_item.json
View File

@ -1081,7 +1081,7 @@
"key": "item_item_name_23", "key": "item_item_name_23",
"text": "闪闪碎片" "text": "闪闪碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 4, "color": 4,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1132,7 +1132,7 @@
"key": "item_item_name_24", "key": "item_item_name_24",
"text": "食人鱼先生碎片" "text": "食人鱼先生碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1183,7 +1183,7 @@
"key": "item_item_name_25", "key": "item_item_name_25",
"text": "啊啊碎片" "text": "啊啊碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1234,7 +1234,7 @@
"key": "item_item_name_26", "key": "item_item_name_26",
"text": "法夸德勋爵碎片" "text": "法夸德勋爵碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1285,7 +1285,7 @@
"key": "item_item_name_27", "key": "item_item_name_27",
"text": "大大碎片" "text": "大大碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1336,7 +1336,7 @@
"key": "item_item_name_28", "key": "item_item_name_28",
"text": "史图依克碎片" "text": "史图依克碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1387,7 +1387,7 @@
"key": "item_item_name_29", "key": "item_item_name_29",
"text": "大龙碎片" "text": "大龙碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1438,7 +1438,7 @@
"key": "item_item_name_30", "key": "item_item_name_30",
"text": "亚丝翠碎片" "text": "亚丝翠碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1489,7 +1489,7 @@
"key": "item_item_name_31", "key": "item_item_name_31",
"text": "克莱尔·努涅斯碎片" "text": "克莱尔·努涅斯碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1540,7 +1540,7 @@
"key": "item_item_name_32", "key": "item_item_name_32",
"text": "鹤大师碎片" "text": "鹤大师碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1591,7 +1591,7 @@
"key": "item_item_name_33", "key": "item_item_name_33",
"text": "布兰奇碎片" "text": "布兰奇碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1642,7 +1642,7 @@
"key": "item_item_name_34", "key": "item_item_name_34",
"text": "格里斯特王子碎片" "text": "格里斯特王子碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1693,7 +1693,7 @@
"key": "item_item_name_35", "key": "item_item_name_35",
"text": "吉姆·莱克碎片" "text": "吉姆·莱克碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1744,7 +1744,7 @@
"key": "item_item_name_36", "key": "item_item_name_36",
"text": "船长碎片" "text": "船长碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1795,7 +1795,7 @@
"key": "item_item_name_37", "key": "item_item_name_37",
"text": "希沙窦斯碎片" "text": "希沙窦斯碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1846,7 +1846,7 @@
"key": "item_item_name_38", "key": "item_item_name_38",
"text": "小欧碎片" "text": "小欧碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1897,7 +1897,7 @@
"key": "item_item_name_39", "key": "item_item_name_39",
"text": "亚力克斯碎片" "text": "亚力克斯碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1948,7 +1948,7 @@
"key": "item_item_name_40", "key": "item_item_name_40",
"text": "斯梅克船长碎片" "text": "斯梅克船长碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -1999,7 +1999,7 @@
"key": "item_item_name_41", "key": "item_item_name_41",
"text": "警卫队长碎片" "text": "警卫队长碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2050,7 +2050,7 @@
"key": "item_item_name_42", "key": "item_item_name_42",
"text": "黛塔黛恩碎片" "text": "黛塔黛恩碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2101,7 +2101,7 @@
"key": "item_item_name_43", "key": "item_item_name_43",
"text": "吉姆·普雷斯科特碎片" "text": "吉姆·普雷斯科特碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2152,7 +2152,7 @@
"key": "item_item_name_44", "key": "item_item_name_44",
"text": "警长碎片" "text": "警长碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2203,7 +2203,7 @@
"key": "item_item_name_45", "key": "item_item_name_45",
"text": "牙仙碎片" "text": "牙仙碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2254,7 +2254,7 @@
"key": "item_item_name_46", "key": "item_item_name_46",
"text": "睡神沙人碎片" "text": "睡神沙人碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2305,7 +2305,7 @@
"key": "item_item_name_47", "key": "item_item_name_47",
"text": "邦尼兔碎片" "text": "邦尼兔碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2356,7 +2356,7 @@
"key": "item_item_name_48", "key": "item_item_name_48",
"text": "金猴碎片" "text": "金猴碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2407,7 +2407,7 @@
"key": "item_item_name_49", "key": "item_item_name_49",
"text": "凯尔碎片" "text": "凯尔碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2458,7 +2458,7 @@
"key": "item_item_name_50", "key": "item_item_name_50",
"text": "小钱碎片" "text": "小钱碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2509,7 +2509,7 @@
"key": "item_item_name_51", "key": "item_item_name_51",
"text": "暴芙那特碎片" "text": "暴芙那特碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2560,7 +2560,7 @@
"key": "item_item_name_52", "key": "item_item_name_52",
"text": "云朵先生碎片" "text": "云朵先生碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2611,7 +2611,7 @@
"key": "item_item_name_53", "key": "item_item_name_53",
"text": "阿宝碎片" "text": "阿宝碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2662,7 +2662,7 @@
"key": "item_item_name_54", "key": "item_item_name_54",
"text": "沃尔夫先生碎片" "text": "沃尔夫先生碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2713,7 +2713,7 @@
"key": "item_item_name_55", "key": "item_item_name_55",
"text": "羊仙姑碎片" "text": "羊仙姑碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2764,7 +2764,7 @@
"key": "item_item_name_56", "key": "item_item_name_56",
"text": "波比碎片" "text": "波比碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2815,7 +2815,7 @@
"key": "item_item_name_57", "key": "item_item_name_57",
"text": "巫嘎碎片" "text": "巫嘎碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2866,7 +2866,7 @@
"key": "item_item_name_58", "key": "item_item_name_58",
"text": "坦克碎片" "text": "坦克碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2917,7 +2917,7 @@
"key": "item_item_name_59", "key": "item_item_name_59",
"text": "胡德先生碎片" "text": "胡德先生碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -2968,7 +2968,7 @@
"key": "item_item_name_60", "key": "item_item_name_60",
"text": "普鲁格兰杰碎片" "text": "普鲁格兰杰碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3019,7 +3019,7 @@
"key": "item_item_name_61", "key": "item_item_name_61",
"text": "鼻涕粗碎片" "text": "鼻涕粗碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3070,7 +3070,7 @@
"key": "item_item_name_62", "key": "item_item_name_62",
"text": "珍妮丝·邓普顿碎片" "text": "珍妮丝·邓普顿碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3121,7 +3121,7 @@
"key": "item_item_name_63", "key": "item_item_name_63",
"text": "贫嘴驴碎片" "text": "贫嘴驴碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3172,7 +3172,7 @@
"key": "item_item_name_64", "key": "item_item_name_64",
"text": "蒂姆·邓普顿碎片" "text": "蒂姆·邓普顿碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3223,7 +3223,7 @@
"key": "item_item_name_65", "key": "item_item_name_65",
"text": "圣诞老人碎片" "text": "圣诞老人碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3274,7 +3274,7 @@
"key": "item_item_name_66", "key": "item_item_name_66",
"text": "瓜哥碎片" "text": "瓜哥碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3325,7 +3325,7 @@
"key": "item_item_name_67", "key": "item_item_name_67",
"text": "沃尔特·史翠克勒碎片" "text": "沃尔特·史翠克勒碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3376,7 +3376,7 @@
"key": "item_item_name_68", "key": "item_item_name_68",
"text": "冰霜杰克碎片" "text": "冰霜杰克碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3427,7 +3427,7 @@
"key": "item_item_name_69", "key": "item_item_name_69",
"text": "菲奥娜碎片" "text": "菲奥娜碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3478,7 +3478,7 @@
"key": "item_item_name_70", "key": "item_item_name_70",
"text": "悍夫那特碎片" "text": "悍夫那特碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3529,7 +3529,7 @@
"key": "item_item_name_71", "key": "item_item_name_71",
"text": "师父碎片" "text": "师父碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3580,7 +3580,7 @@
"key": "item_item_name_72", "key": "item_item_name_72",
"text": "希卡普碎片" "text": "希卡普碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3631,7 +3631,7 @@
"key": "item_item_name_73", "key": "item_item_name_73",
"text": "漆黑碎片" "text": "漆黑碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3682,7 +3682,7 @@
"key": "item_item_name_74", "key": "item_item_name_74",
"text": "黛安·福克斯顿碎片" "text": "黛安·福克斯顿碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3733,7 +3733,7 @@
"key": "item_item_name_75", "key": "item_item_name_75",
"text": "幸运·普雷斯科特碎片" "text": "幸运·普雷斯科特碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3784,7 +3784,7 @@
"key": "item_item_name_76", "key": "item_item_name_76",
"text": "平先生碎片" "text": "平先生碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3835,7 +3835,7 @@
"key": "item_item_name_77", "key": "item_item_name_77",
"text": "阿比盖尔·斯通碎片" "text": "阿比盖尔·斯通碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3886,7 +3886,7 @@
"key": "item_item_name_78", "key": "item_item_name_78",
"text": "果酱教授碎片" "text": "果酱教授碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3937,7 +3937,7 @@
"key": "item_item_name_79", "key": "item_item_name_79",
"text": "史蒂夫·帕丘克碎片" "text": "史蒂夫·帕丘克碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -3988,7 +3988,7 @@
"key": "item_item_name_80", "key": "item_item_name_80",
"text": "姜饼人碎片" "text": "姜饼人碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4039,7 +4039,7 @@
"key": "item_item_name_81", "key": "item_item_name_81",
"text": "瓦希尔指挥官碎片" "text": "瓦希尔指挥官碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4090,7 +4090,7 @@
"key": "item_item_name_82", "key": "item_item_name_82",
"text": "布里奇特碎片" "text": "布里奇特碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4141,7 +4141,7 @@
"key": "item_item_name_83", "key": "item_item_name_83",
"text": "戈伯碎片" "text": "戈伯碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4192,7 +4192,7 @@
"key": "item_item_name_84", "key": "item_item_name_84",
"text": "美肚鲨碎片" "text": "美肚鲨碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4243,7 +4243,7 @@
"key": "item_item_name_85", "key": "item_item_name_85",
"text": "蛇先生碎片" "text": "蛇先生碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4294,7 +4294,7 @@
"key": "item_item_name_86", "key": "item_item_name_86",
"text": "匹诺曹碎片" "text": "匹诺曹碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4345,7 +4345,7 @@
"key": "item_item_name_87", "key": "item_item_name_87",
"text": "骇客蛛碎片" "text": "骇客蛛碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4396,7 +4396,7 @@
"key": "item_item_name_88", "key": "item_item_name_88",
"text": "小伊碎片" "text": "小伊碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4447,7 +4447,7 @@
"key": "item_item_name_89", "key": "item_item_name_89",
"text": "悍娇虎碎片" "text": "悍娇虎碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4498,7 +4498,7 @@
"key": "item_item_name_90", "key": "item_item_name_90",
"text": "乌龟大师碎片" "text": "乌龟大师碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4549,7 +4549,7 @@
"key": "item_item_name_91", "key": "item_item_name_91",
"text": "梅林碎片" "text": "梅林碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4600,7 +4600,7 @@
"key": "item_item_name_92", "key": "item_item_name_92",
"text": "盖碎片" "text": "盖碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,
@ -4651,7 +4651,7 @@
"key": "item_item_name_93", "key": "item_item_name_93",
"text": "穿靴子的猫碎片" "text": "穿靴子的猫碎片"
}, },
"usetype": 3, "usetype": 7,
"color": 2, "color": 2,
"bagtype": 2, "bagtype": 2,
"index": 2, "index": 2,

2380
bin/json/game_lottery.json
View File

File diff suppressed because it is too large Load Diff

16
bin/json/game_mainstage.json
View File

@ -193,7 +193,7 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"stroyshow": 1, "stroyshow": 0,
"frontstoryid": 10244, "frontstoryid": 10244,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
@ -299,7 +299,7 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"stroyshow": 1, "stroyshow": 0,
"frontstoryid": 10245, "frontstoryid": 10245,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
@ -460,7 +460,7 @@
"n": 6000 "n": 6000
} }
], ],
"BattleReadyID": 206, "BattleReadyID": 208,
"FormatList": [ "FormatList": [
101041 101041
], ],
@ -8490,8 +8490,8 @@
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"stroyshow": 0, "stroyshow": 0,
"frontstoryid": 20218, "frontstoryid": 20118,
"afterstoryid": 20219, "afterstoryid": 20119,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -8602,7 +8602,7 @@
"progress": 1, "progress": 1,
"stroyshow": 0, "stroyshow": 0,
"frontstoryid": 0, "frontstoryid": 0,
"afterstoryid": 20222, "afterstoryid": 20122,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -8712,8 +8712,8 @@
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"stroyshow": 0, "stroyshow": 0,
"frontstoryid": 20225, "frontstoryid": 20125,
"afterstoryid": 20226, "afterstoryid": 20126,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""

14
bin/json/game_pushgift.json
View File

@ -11,7 +11,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
60000004 90000001
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [
@ -39,7 +39,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
60000005 90000002
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [
@ -67,7 +67,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
60000006 90000003
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [
@ -95,7 +95,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
60000007 90000004
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [
@ -123,7 +123,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
60000008 90000005
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [
@ -151,7 +151,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
60000009 90000006
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [
@ -179,7 +179,7 @@
}, },
"resource": "", "resource": "",
"condition": [ "condition": [
70000001 90000007
], ],
"condition_or": [], "condition_or": [],
"lbid": [ "lbid": [

45
bin/json/game_skillatk.json
View File

@ -52,7 +52,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_125004111_1", "key": "skill_skill_atk_Desc_125004111_1",
"text": "对敌方1个目标造成次攻击力150%的伤害，有40%概率为自身附加2回合的[color=#37d8a9]免疫[/color]状态。" "text": "对敌方1个目标造成2次攻击力150%的伤害，有40%概率为自身附加2回合的[color=#37d8a9]免疫[/color]状态。"
}, },
"buffid": [ "buffid": [
390001111 390001111
@ -114,7 +114,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_125004111_3", "key": "skill_skill_atk_Desc_125004111_3",
"text": "概率触发概率提升至50%。" "text": "触发概率提升至50%。"
}, },
"buffid": [ "buffid": [
390001111 390001111
@ -176,7 +176,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_125004111_5", "key": "skill_skill_atk_Desc_125004111_5",
"text": "概率触发概率提升至60%。" "text": "触发概率提升至60%。"
}, },
"buffid": [ "buffid": [
390001111 390001111
@ -2065,6 +2065,7 @@
"text": "回合结束时，获得1回合[color=#37d8a9]玄御[/color]状态，效果期间的回合开始时会攻击敌方，伤害为自身防御力200%。" "text": "回合结束时，获得1回合[color=#37d8a9]玄御[/color]状态，效果期间的回合开始时会攻击敌方，伤害为自身防御力200%。"
}, },
"buffid": [ "buffid": [
390001209,
390001210 390001210
], ],
"map": "" "map": ""
@ -2097,7 +2098,8 @@
"text": "防御伤害比例提升至230%。" "text": "防御伤害比例提升至230%。"
}, },
"buffid": [ "buffid": [
390001211 390001209,
390001210
], ],
"map": "" "map": ""
}, },
@ -2129,7 +2131,8 @@
"text": "防御伤害比例提升至260%。" "text": "防御伤害比例提升至260%。"
}, },
"buffid": [ "buffid": [
390001212 390001209,
390001210
], ],
"map": "" "map": ""
}, },
@ -2161,7 +2164,8 @@
"text": "防御伤害比例提升至290%。" "text": "防御伤害比例提升至290%。"
}, },
"buffid": [ "buffid": [
390001213 390001209,
390001210
], ],
"map": "" "map": ""
}, },
@ -2193,7 +2197,8 @@
"text": "冷却时间减少1回合。" "text": "冷却时间减少1回合。"
}, },
"buffid": [ "buffid": [
390001214 390001209,
390001210
], ],
"map": "" "map": ""
}, },
@ -2211,7 +2216,7 @@
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
"Type": 0, "Type": 0,
"CD": 0, "CD": 4,
"Where": [], "Where": [],
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
@ -2240,7 +2245,7 @@
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
"Type": 0, "Type": 0,
"CD": 0, "CD": 4,
"Where": [], "Where": [],
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
@ -2269,7 +2274,7 @@
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
"Type": 0, "Type": 0,
"CD": 0, "CD": 4,
"Where": [], "Where": [],
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
@ -2298,7 +2303,7 @@
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
"Type": 0, "Type": 0,
"CD": 0, "CD": 4,
"Where": [], "Where": [],
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
@ -2327,7 +2332,7 @@
"IsMelee": 1, "IsMelee": 1,
"act": "Skill_2", "act": "Skill_2",
"Type": 0, "Type": 0,
"CD": 0, "CD": 3,
"Where": [], "Where": [],
"Target": 2, "Target": 2,
"ChildSkill": { "ChildSkill": {
@ -10735,7 +10740,7 @@
{ {
"id": 124004211, "id": 124004211,
"level": 1, "level": 1,
"MaxLV": 5, "MaxLV": 3,
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004211", "key": "skill_skill_atk_Name_124004211",
@ -10766,7 +10771,7 @@
{ {
"id": 124004211, "id": 124004211,
"level": 2, "level": 2,
"MaxLV": 5, "MaxLV": 3,
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004211", "key": "skill_skill_atk_Name_124004211",
@ -10797,7 +10802,7 @@
{ {
"id": 124004211, "id": 124004211,
"level": 3, "level": 3,
"MaxLV": 5, "MaxLV": 3,
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004211", "key": "skill_skill_atk_Name_124004211",
@ -17982,7 +17987,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 2, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
215002311, 215002311,
@ -18014,7 +18019,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 2, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
215002311, 215002311,
@ -18046,7 +18051,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 2, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
215002311, 215002311,
@ -18078,7 +18083,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 2, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
215002311, 215002311,
@ -18110,7 +18115,7 @@
"Type": 1, "Type": 1,
"CD": 3, "CD": 3,
"Where": [], "Where": [],
"Target": 2, "Target": 0,
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
215002311, 215002311,

6
bin/json/game_skillbuff.json
View File

@ -703,7 +703,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001111", "key": "skill_skill_buff_Desc_390001111",
"text": "无法获得减益效果。" "text": "效果持续期间，无法获得减益效果。"
}, },
"BuffType": 30, "BuffType": 30,
"EffectArgu": [], "EffectArgu": [],
@ -1431,7 +1431,7 @@
"CoexistCheckArgu": [], "CoexistCheckArgu": [],
"Effect": [ "Effect": [
0, 0,
3 0
], ],
"AddEffect": false, "AddEffect": false,
"RemoveType": false, "RemoveType": false,
@ -1545,7 +1545,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001209", "key": "skill_skill_buff_Desc_390001209",
"text": "每次受到攻击提升20%的防御，最多叠加5层。" "text": "回合开始前对敌方全体造成伤害，每次收到攻击时为自身添加一层【玄御之佑】"
}, },
"BuffType": 42, "BuffType": 42,
"EffectArgu": [], "EffectArgu": [],

326
bin/json/game_stoneevent.json
View File

@ -21,10 +21,26 @@
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
{
"EventId": 30000000,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_2",
"text": "boss扣血"
},
"EventType": 30,
"EventResource": "",
"Value1": 200,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{ {
"EventId": 10000001, "EventId": 10000001,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_1", "key": "stonehenge_eventconfig_EventTitle_3",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -46,7 +62,7 @@
{ {
"EventId": 10000002, "EventId": 10000002,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_2", "key": "stonehenge_eventconfig_EventTitle_4",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -68,7 +84,7 @@
{ {
"EventId": 10000003, "EventId": 10000003,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_3", "key": "stonehenge_eventconfig_EventTitle_5",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -90,7 +106,7 @@
{ {
"EventId": 10000004, "EventId": 10000004,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_4", "key": "stonehenge_eventconfig_EventTitle_6",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -112,7 +128,7 @@
{ {
"EventId": 10000005, "EventId": 10000005,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_5", "key": "stonehenge_eventconfig_EventTitle_7",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -134,7 +150,7 @@
{ {
"EventId": 10000006, "EventId": 10000006,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_6", "key": "stonehenge_eventconfig_EventTitle_8",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -156,7 +172,7 @@
{ {
"EventId": 10000007, "EventId": 10000007,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_7", "key": "stonehenge_eventconfig_EventTitle_9",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -178,7 +194,7 @@
{ {
"EventId": 10000008, "EventId": 10000008,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_8", "key": "stonehenge_eventconfig_EventTitle_10",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -200,7 +216,7 @@
{ {
"EventId": 10000009, "EventId": 10000009,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_9", "key": "stonehenge_eventconfig_EventTitle_11",
"text": "开启宝箱" "text": "开启宝箱"
}, },
"EventType": 10, "EventType": 10,
@ -222,7 +238,7 @@
{ {
"EventId": 11000000, "EventId": 11000000,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_10", "key": "stonehenge_eventconfig_EventTitle_12",
"text": "商店" "text": "商店"
}, },
"EventType": 11, "EventType": 11,
@ -238,7 +254,7 @@
{ {
"EventId": 16010101, "EventId": 16010101,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_11", "key": "stonehenge_eventconfig_EventTitle_13",
"text": "打开" "text": "打开"
}, },
"EventType": 16, "EventType": 16,
@ -254,7 +270,7 @@
{ {
"EventId": 17002003, "EventId": 17002003,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_12", "key": "stonehenge_eventconfig_EventTitle_14",
"text": "打开" "text": "打开"
}, },
"EventType": 17, "EventType": 17,
@ -270,7 +286,7 @@
{ {
"EventId": 20000000, "EventId": 20000000,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_13", "key": "stonehenge_eventconfig_EventTitle_15",
"text": "支援" "text": "支援"
}, },
"EventType": 20, "EventType": 20,
@ -292,7 +308,7 @@
{ {
"EventId": 21000000, "EventId": 21000000,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_14", "key": "stonehenge_eventconfig_EventTitle_16",
"text": "复活" "text": "复活"
}, },
"EventType": 21, "EventType": 21,
@ -314,7 +330,7 @@
{ {
"EventId": 18000001, "EventId": 18000001,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_15", "key": "stonehenge_eventconfig_EventTitle_17",
"text": "恢复血量" "text": "恢复血量"
}, },
"EventType": 18, "EventType": 18,
@ -336,7 +352,7 @@
{ {
"EventId": 14110101, "EventId": 14110101,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_17", "key": "stonehenge_eventconfig_EventTitle_18",
"text": "战斗" "text": "战斗"
}, },
"EventType": 14, "EventType": 14,
@ -352,7 +368,7 @@
{ {
"EventId": 14110102, "EventId": 14110102,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_18", "key": "stonehenge_eventconfig_EventTitle_19",
"text": "战斗" "text": "战斗"
}, },
"EventType": 14, "EventType": 14,
@ -368,7 +384,7 @@
{ {
"EventId": 14110103, "EventId": 14110103,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_19", "key": "stonehenge_eventconfig_EventTitle_20",
"text": "战斗" "text": "战斗"
}, },
"EventType": 14, "EventType": 14,
@ -384,7 +400,7 @@
{ {
"EventId": 14110104, "EventId": 14110104,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_20", "key": "stonehenge_eventconfig_EventTitle_21",
"text": "战斗" "text": "战斗"
}, },
"EventType": 14, "EventType": 14,
@ -400,7 +416,7 @@
{ {
"EventId": 14110105, "EventId": 14110105,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_21", "key": "stonehenge_eventconfig_EventTitle_22",
"text": "战斗" "text": "战斗"
}, },
"EventType": 14, "EventType": 14,
@ -416,7 +432,7 @@
{ {
"EventId": 25100001, "EventId": 25100001,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_22", "key": "stonehenge_eventconfig_EventTitle_23",
"text": "随机符文" "text": "随机符文"
}, },
"EventType": 25, "EventType": 25,
@ -432,7 +448,7 @@
{ {
"EventId": 28110501, "EventId": 28110501,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_23", "key": "stonehenge_eventconfig_EventTitle_24",
"text": "首领" "text": "首领"
}, },
"EventType": 28, "EventType": 28,
@ -448,7 +464,7 @@
{ {
"EventId": 12100001, "EventId": 12100001,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_24", "key": "stonehenge_eventconfig_EventTitle_25",
"text": "剧情（首领战必出）" "text": "剧情（首领战必出）"
}, },
"EventType": 12, "EventType": 12,
@ -464,7 +480,7 @@
{ {
"EventId": 12100002, "EventId": 12100002,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_25", "key": "stonehenge_eventconfig_EventTitle_26",
"text": "剧情（常规）" "text": "剧情（常规）"
}, },
"EventType": 12, "EventType": 12,
@ -480,7 +496,7 @@
{ {
"EventId": 12100003, "EventId": 12100003,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_26", "key": "stonehenge_eventconfig_EventTitle_27",
"text": "剧情（常规）" "text": "剧情（常规）"
}, },
"EventType": 12, "EventType": 12,
@ -496,7 +512,7 @@
{ {
"EventId": 12100004, "EventId": 12100004,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_27", "key": "stonehenge_eventconfig_EventTitle_28",
"text": "剧情（常规）" "text": "剧情（常规）"
}, },
"EventType": 12, "EventType": 12,
@ -512,7 +528,7 @@
{ {
"EventId": 12100005, "EventId": 12100005,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_28", "key": "stonehenge_eventconfig_EventTitle_29",
"text": "剧情（常规）" "text": "剧情（常规）"
}, },
"EventType": 12, "EventType": 12,
@ -528,7 +544,7 @@
{ {
"EventId": 12100006, "EventId": 12100006,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_29", "key": "stonehenge_eventconfig_EventTitle_30",
"text": "剧情（常规）" "text": "剧情（常规）"
}, },
"EventType": 12, "EventType": 12,
@ -544,7 +560,7 @@
{ {
"EventId": 23000000, "EventId": 23000000,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_38", "key": "stonehenge_eventconfig_EventTitle_31",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -560,7 +576,7 @@
{ {
"EventId": 23000101, "EventId": 23000101,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_39", "key": "stonehenge_eventconfig_EventTitle_32",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -576,7 +592,7 @@
{ {
"EventId": 23000102, "EventId": 23000102,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_40", "key": "stonehenge_eventconfig_EventTitle_33",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -592,7 +608,7 @@
{ {
"EventId": 23000103, "EventId": 23000103,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_41", "key": "stonehenge_eventconfig_EventTitle_34",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -608,7 +624,7 @@
{ {
"EventId": 23000104, "EventId": 23000104,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_42", "key": "stonehenge_eventconfig_EventTitle_35",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -624,7 +640,7 @@
{ {
"EventId": 23000201, "EventId": 23000201,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_43", "key": "stonehenge_eventconfig_EventTitle_36",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -640,7 +656,7 @@
{ {
"EventId": 23000202, "EventId": 23000202,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_44", "key": "stonehenge_eventconfig_EventTitle_37",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -656,7 +672,7 @@
{ {
"EventId": 23000203, "EventId": 23000203,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_45", "key": "stonehenge_eventconfig_EventTitle_38",
"text": "强化buff" "text": "强化buff"
}, },
"EventType": 23, "EventType": 23,
@ -672,7 +688,7 @@
{ {
"EventId": 22012101, "EventId": 22012101,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_46", "key": "stonehenge_eventconfig_EventTitle_39",
"text": "删除buff（商店用）" "text": "删除buff（商店用）"
}, },
"EventType": 22, "EventType": 22,
@ -688,7 +704,7 @@
{ {
"EventId": 25100007, "EventId": 25100007,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_47", "key": "stonehenge_eventconfig_EventTitle_40",
"text": "随机buff（商店用）" "text": "随机buff（商店用）"
}, },
"EventType": 25, "EventType": 25,
@ -704,7 +720,7 @@
{ {
"EventId": 22012201, "EventId": 22012201,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_48", "key": "stonehenge_eventconfig_EventTitle_41",
"text": "删除buff（商店用）" "text": "删除buff（商店用）"
}, },
"EventType": 22, "EventType": 22,
@ -720,7 +736,7 @@
{ {
"EventId": 25100008, "EventId": 25100008,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_49", "key": "stonehenge_eventconfig_EventTitle_42",
"text": "随机buff（商店用）" "text": "随机buff（商店用）"
}, },
"EventType": 25, "EventType": 25,
@ -736,7 +752,7 @@
{ {
"EventId": 22012301, "EventId": 22012301,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_50", "key": "stonehenge_eventconfig_EventTitle_43",
"text": "删除buff（商店用）" "text": "删除buff（商店用）"
}, },
"EventType": 22, "EventType": 22,
@ -752,7 +768,7 @@
{ {
"EventId": 25100009, "EventId": 25100009,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_51", "key": "stonehenge_eventconfig_EventTitle_44",
"text": "随机buff（商店用）" "text": "随机buff（商店用）"
}, },
"EventType": 25, "EventType": 25,
@ -768,7 +784,7 @@
{ {
"EventId": 19000002, "EventId": 19000002,
"EventTitle": { "EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_52", "key": "stonehenge_eventconfig_EventTitle_45",
"text": "扣血抽buff" "text": "扣血抽buff"
}, },
"EventType": 19, "EventType": 19,
@ -780,5 +796,229 @@
"CostItem": [], "CostItem": [],
"PostEvent": 25100001, "PostEvent": 25100001,
"probability": 1000 "probability": 1000
},
{
"EventId": 23010001,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_46",
"text": "随机强化buff2张（剧情）"
},
"EventType": 23,
"EventResource": "",
"Value1": 2,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 25100010,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_47",
"text": "剧情100002"
},
"EventType": 25,
"EventResource": "",
"Value1": 100010,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 25100010,
"probability": 200
},
{
"EventId": 25100011,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_48",
"text": "剧情100002"
},
"EventType": 25,
"EventResource": "",
"Value1": 100011,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 25100011,
"probability": 200
},
{
"EventId": 25100012,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_49",
"text": "剧情100003"
},
"EventType": 25,
"EventResource": "",
"Value1": 100012,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 25100012,
"probability": 200
},
{
"EventId": 25100013,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_50",
"text": "剧情100003"
},
"EventType": 25,
"EventResource": "",
"Value1": 100013,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 25100013,
"probability": 200
},
{
"EventId": 23021101,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_51",
"text": "剧情100004选项1"
},
"EventType": 23,
"EventResource": "",
"Value1": 2,
"Value2": 1,
"Value3": 1,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 25100004,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_52",
"text": "剧情100004选项2"
},
"EventType": 25,
"EventResource": "",
"Value1": 100014,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 23021201,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_53",
"text": "剧情100005选项1"
},
"EventType": 23,
"EventResource": "",
"Value1": 2,
"Value2": 1,
"Value3": 2,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 25100015,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_54",
"text": "剧情100005选项2"
},
"EventType": 25,
"EventResource": "",
"Value1": 100015,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 25100018,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_55",
"text": "剧情100006选项1"
},
"EventType": 25,
"EventResource": "",
"Value1": 100018,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 16100062,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_56",
"text": "剧情100006选项2"
},
"EventType": 16,
"EventResource": "",
"Value1": 21100062,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 16100071,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_57",
"text": "剧情100007选项1"
},
"EventType": 16,
"EventResource": "",
"Value1": 21100071,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
},
{
"EventId": 16100072,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_58",
"text": "剧情100007选项2"
},
"EventType": 16,
"EventResource": "",
"Value1": 21100072,
"Value2": 0,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 25100007,
"probability": 1000
},
{
"EventId": 17001005,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_59",
"text": "剧情100007选项3"
},
"EventType": 17,
"EventResource": "",
"Value1": 1000,
"Value2": 5,
"Value3": 0,
"Value4": 0,
"CostItem": [],
"PostEvent": 0,
"probability": 0
} }
] ]

2757
bin/json/game_stonestory.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_topuiconfig.json
View File

@ -1926,12 +1926,12 @@
{ {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 1 "n": 0
}, },
{ {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 1 "n": 0
} }
] ]
}, },

15
modules/battle/core.go
View File

@ -1,6 +1,10 @@
package battle package battle
import "go_dreamfactory/pb" import (
"go_dreamfactory/pb"
"github.com/smallnest/rpcx/log"
)
type ( type (
IClientMgr interface { IClientMgr interface {
@ -66,6 +70,8 @@ func AttributesTransBase(attr string) int32 {
break break
case "speedpro": case "speedpro":
break break
default:
log.Errorf("no fund hero attr:%s", attr)
} }
return basearrt return basearrt
} }
@ -119,6 +125,9 @@ func AttributesFromBase(attr int32) string {
case 102: case 102:
basearrt = "suckblood" basearrt = "suckblood"
break break
default:
log.Errorf("no fund hero attr:%d", basearrt)
} }
return basearrt return basearrt
} }
@ -179,6 +188,8 @@ func AttributesTransExt(attr string) int32 {
break break
case "speedpro": case "speedpro":
break break
default:
log.Errorf("no fund hero attr:%s", attr)
} }
return basearrt return basearrt
} }
@ -231,6 +242,8 @@ func AttributesFromExt(attr int32) string {
case 102: case 102:
basearrt = "suckblood" basearrt = "suckblood"
break break
default:
log.Errorf("no fund hero attr:%d", basearrt)
} }
return basearrt return basearrt
} }

47
modules/battle/modelBattle.go
View File

@ -10,6 +10,7 @@ import (
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db" "go_dreamfactory/sys/db"
"math"
"time" "time"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
@ -735,31 +736,53 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, vlv int32, tid, p
for k, v := range hero.Property { for k, v := range hero.Property {
arrt := AttributesTransBase(k) arrt := AttributesTransBase(k)
role.Property[arrt] += v if arrt != 0 {
if k == comm.Hp { role.Property[arrt] += v
role.Currhp += v if k == comm.Hp {
role.Currhp += v
}
} }
} }
for k, v := range hero.AddProperty {
switch k {
case comm.HpPro:
hero.AddProperty[comm.Hp] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Hp])))
case comm.AtkPro:
hero.AddProperty[comm.Atk] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Atk])))
case comm.DefPro:
hero.AddProperty[comm.Def] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Def])))
case comm.SpeedPro:
hero.AddProperty[comm.Speed] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Speed])))
}
}
for k, v := range hero.AddProperty { for k, v := range hero.AddProperty {
arrt := AttributesTransExt(k) arrt := AttributesTransExt(k)
role.Property[arrt] += v if arrt != 0 {
if k == comm.Hp { role.Property[arrt] += v
role.Currhp += v if k == comm.Hp {
role.Currhp += v
}
} }
} }
for k, v := range hero.JuexProperty { for k, v := range hero.JuexProperty {
arrt := AttributesTransExt(k) arrt := AttributesTransExt(k)
role.Property[arrt] += v if arrt != 0 {
if k == comm.Hp { role.Property[arrt] += v
role.Currhp += v if k == comm.Hp {
role.Currhp += v
}
} }
} }
for k, v := range hero.HoroscopeProperty { for k, v := range hero.HoroscopeProperty {
arrt := AttributesTransExt(k) arrt := AttributesTransExt(k)
role.Property[arrt] += v if arrt != 0 {
if k == comm.Hp { role.Property[arrt] += v
role.Currhp += v if k == comm.Hp {
role.Currhp += v
}
} }
} }