上传捕羊大赛代码

This commit is contained in:
liwei1dao 2023-04-21 16:54:26 +08:00
parent 27dbb36ee6
commit ec088d4b13
31 changed files with 1419 additions and 4030 deletions

View File

@ -1,110 +1,34 @@
[
{
"key": 1,
"id_tag": 1,
"active": 20,
"id_tag": 2,
"active": 40,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 5
"n": 10
}
]
],
"action": "Skill_2",
"stage": 1
},
{
"key": 2,
"id_tag": 1,
"active": 40,
"id_tag": 2,
"active": 80,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 10000
"t": "diamond",
"n": 10
}
]
],
"action": "Skill_2",
"stage": 2
},
{
"key": 3,
"id_tag": 1,
"active": 60,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 4,
"id_tag": 1,
"active": 80,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"key": 5,
"id_tag": 1,
"active": 100,
"reword": [
{
"a": "item",
"t": "30001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 50000
}
]
},
{
"key": 6,
"id_tag": 2,
"active": 40,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 25000
}
]
},
{
"key": 7,
"id_tag": 2,
"active": 80,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 25000
}
]
},
{
"key": 8,
"id_tag": 2,
"active": 120,
"reword": [
@ -113,10 +37,12 @@
"t": "diamond",
"n": 20
}
]
],
"action": "Skill_2",
"stage": 3
},
{
"key": 9,
"key": 4,
"id_tag": 2,
"active": 160,
"reword": [
@ -124,29 +50,9 @@
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 75000
}
]
},
{
"key": 10,
"id_tag": 2,
"active": 200,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 200000
}
]
}
],
"action": "Skill_2",
"stage": 4
}
]

View File

@ -0,0 +1,122 @@
[
{
"num": 1,
"stime": "1899/12/31 0:30:00",
"etime": "1899/12/31 0:50:00"
},
{
"num": 2,
"stime": "1899/12/31 1:30:00",
"etime": "1899/12/31 1:50:00"
},
{
"num": 3,
"stime": "1899/12/31 2:30:00",
"etime": "1899/12/31 2:50:00"
},
{
"num": 4,
"stime": "1899/12/31 3:30:00",
"etime": "1899/12/31 3:50:00"
},
{
"num": 5,
"stime": "1899/12/31 4:30:00",
"etime": "1899/12/31 4:50:00"
},
{
"num": 6,
"stime": "1899/12/31 5:30:00",
"etime": "1899/12/31 5:50:00"
},
{
"num": 7,
"stime": "1899/12/31 6:30:00",
"etime": "1899/12/31 6:50:00"
},
{
"num": 8,
"stime": "1899/12/31 7:30:00",
"etime": "1899/12/31 7:50:00"
},
{
"num": 9,
"stime": "1899/12/31 8:30:00",
"etime": "1899/12/31 8:50:00"
},
{
"num": 10,
"stime": "1899/12/31 9:30:00",
"etime": "1899/12/31 9:50:00"
},
{
"num": 11,
"stime": "1899/12/31 10:30:00",
"etime": "1899/12/31 10:50:00"
},
{
"num": 12,
"stime": "1899/12/31 11:30:00",
"etime": "1899/12/31 11:50:00"
},
{
"num": 13,
"stime": "1899/12/31 12:30:00",
"etime": "1899/12/31 12:50:00"
},
{
"num": 14,
"stime": "1899/12/31 13:30:00",
"etime": "1899/12/31 13:50:00"
},
{
"num": 15,
"stime": "1899/12/31 14:30:00",
"etime": "1899/12/31 14:50:00"
},
{
"num": 16,
"stime": "1899/12/31 15:30:00",
"etime": "1899/12/31 15:50:00"
},
{
"num": 17,
"stime": "1899/12/31 16:30:00",
"etime": "1899/12/31 16:50:00"
},
{
"num": 18,
"stime": "1899/12/31 17:30:00",
"etime": "1899/12/31 17:50:00"
},
{
"num": 19,
"stime": "1899/12/31 18:30:00",
"etime": "1899/12/31 18:50:00"
},
{
"num": 20,
"stime": "1899/12/31 19:30:00",
"etime": "1899/12/31 19:50:00"
},
{
"num": 21,
"stime": "1899/12/31 20:30:00",
"etime": "1899/12/31 20:50:00"
},
{
"num": 22,
"stime": "1899/12/31 21:30:00",
"etime": "1899/12/31 21:50:00"
},
{
"num": 23,
"stime": "1899/12/31 22:30:00",
"etime": "1899/12/31 22:50:00"
},
{
"num": 24,
"stime": "1899/12/31 23:30:00",
"etime": "1899/12/31 23:50:00"
}
]

View File

@ -684,6 +684,38 @@
"business_rewardday": 1,
"business_renovatething": 180,
"favorability_likes": 1500,
"favorability_dislikes": 500
"favorability_dislikes": 500,
"buzkashi_time": 180,
"buzkashi_schedule": 200,
"buzkashi_stime": 300,
"buzkashi_vreward": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"buzkashi_freward": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"buzkashi_vintegral": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"buzkashi_fintegral": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
],
"buzkashi_resurrection": 10
}
]

View File

@ -7,7 +7,7 @@
"text": "巨型猩猩"
},
"difficulty": 1,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -25,8 +25,6 @@
"drop": 1001,
"bossmodel": 53001,
"boss": [
401001,
401002,
401003
],
"ps_consume": [
@ -52,7 +50,7 @@
"text": "巨型猩猩"
},
"difficulty": 2,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -75,8 +73,6 @@
"drop": 1002,
"bossmodel": 53001,
"boss": [
401004,
401005,
401006
],
"ps_consume": [
@ -102,7 +98,7 @@
"text": "巨型猩猩"
},
"difficulty": 3,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -125,8 +121,6 @@
"drop": 1003,
"bossmodel": 53001,
"boss": [
401007,
401008,
401009
],
"ps_consume": [
@ -152,7 +146,7 @@
"text": "巨型猩猩"
},
"difficulty": 4,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -175,8 +169,6 @@
"drop": 1004,
"bossmodel": 53001,
"boss": [
401010,
401011,
401012
],
"ps_consume": [
@ -202,7 +194,7 @@
"text": "巨型猩猩"
},
"difficulty": 5,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -230,8 +222,6 @@
"drop": 1005,
"bossmodel": 53001,
"boss": [
401013,
401014,
401015
],
"ps_consume": [
@ -257,7 +247,7 @@
"text": "巨型猩猩"
},
"difficulty": 6,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -285,8 +275,6 @@
"drop": 1006,
"bossmodel": 53001,
"boss": [
401016,
401017,
401018
],
"ps_consume": [
@ -312,7 +300,7 @@
"text": "巨型猩猩"
},
"difficulty": 7,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -340,8 +328,6 @@
"drop": 1007,
"bossmodel": 53001,
"boss": [
401019,
401020,
401021
],
"ps_consume": [
@ -367,7 +353,7 @@
"text": "巨型猩猩"
},
"difficulty": 8,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -395,8 +381,6 @@
"drop": 1008,
"bossmodel": 53001,
"boss": [
401022,
401023,
401024
],
"ps_consume": [
@ -422,7 +406,7 @@
"text": "巨型猩猩"
},
"difficulty": 9,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -450,8 +434,6 @@
"drop": 1009,
"bossmodel": 53001,
"boss": [
401025,
401026,
401027
],
"ps_consume": [
@ -477,7 +459,7 @@
"text": "巨型猩猩"
},
"difficulty": 10,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -505,8 +487,6 @@
"drop": 1010,
"bossmodel": 53001,
"boss": [
401028,
401029,
401030
],
"ps_consume": [
@ -532,7 +512,7 @@
"text": "火龙"
},
"difficulty": 1,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -550,8 +530,6 @@
"drop": 1011,
"bossmodel": 51004,
"boss": [
402001,
402002,
402003
],
"ps_consume": [
@ -577,7 +555,7 @@
"text": "火龙"
},
"difficulty": 2,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -600,8 +578,6 @@
"drop": 1012,
"bossmodel": 51004,
"boss": [
402004,
402005,
402006
],
"ps_consume": [
@ -627,7 +603,7 @@
"text": "火龙"
},
"difficulty": 3,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -650,8 +626,6 @@
"drop": 1013,
"bossmodel": 51004,
"boss": [
402007,
402008,
402009
],
"ps_consume": [
@ -677,7 +651,7 @@
"text": "火龙"
},
"difficulty": 4,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -700,8 +674,6 @@
"drop": 1014,
"bossmodel": 51004,
"boss": [
402010,
402011,
402012
],
"ps_consume": [
@ -727,7 +699,7 @@
"text": "火龙"
},
"difficulty": 5,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -755,8 +727,6 @@
"drop": 1015,
"bossmodel": 51004,
"boss": [
402013,
402014,
402015
],
"ps_consume": [
@ -782,7 +752,7 @@
"text": "火龙"
},
"difficulty": 6,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -810,8 +780,6 @@
"drop": 1016,
"bossmodel": 51004,
"boss": [
402016,
402017,
402018
],
"ps_consume": [
@ -837,7 +805,7 @@
"text": "火龙"
},
"difficulty": 7,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -865,8 +833,6 @@
"drop": 1017,
"bossmodel": 51004,
"boss": [
402019,
402020,
402021
],
"ps_consume": [
@ -892,7 +858,7 @@
"text": "火龙"
},
"difficulty": 8,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -920,8 +886,6 @@
"drop": 1018,
"bossmodel": 51004,
"boss": [
402022,
402023,
402024
],
"ps_consume": [
@ -947,7 +911,7 @@
"text": "火龙"
},
"difficulty": 9,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -975,8 +939,6 @@
"drop": 1019,
"bossmodel": 51004,
"boss": [
402025,
402026,
402027
],
"ps_consume": [
@ -1002,7 +964,7 @@
"text": "火龙"
},
"difficulty": 10,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1030,8 +992,6 @@
"drop": 1020,
"bossmodel": 51004,
"boss": [
402028,
402029,
402030
],
"ps_consume": [
@ -1057,7 +1017,7 @@
"text": "大厨"
},
"difficulty": 1,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1075,8 +1035,6 @@
"drop": 1021,
"bossmodel": 51005,
"boss": [
403001,
403002,
403003
],
"ps_consume": [
@ -1102,7 +1060,7 @@
"text": "大厨"
},
"difficulty": 2,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1125,8 +1083,6 @@
"drop": 1022,
"bossmodel": 51005,
"boss": [
403004,
403005,
403006
],
"ps_consume": [
@ -1152,7 +1108,7 @@
"text": "大厨"
},
"difficulty": 3,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1175,8 +1131,6 @@
"drop": 1023,
"bossmodel": 51005,
"boss": [
403007,
403008,
403009
],
"ps_consume": [
@ -1202,7 +1156,7 @@
"text": "大厨"
},
"difficulty": 4,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1225,8 +1179,6 @@
"drop": 1024,
"bossmodel": 51005,
"boss": [
403010,
403011,
403012
],
"ps_consume": [
@ -1252,7 +1204,7 @@
"text": "大厨"
},
"difficulty": 5,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1280,8 +1232,6 @@
"drop": 1025,
"bossmodel": 51005,
"boss": [
403013,
403014,
403015
],
"ps_consume": [
@ -1307,7 +1257,7 @@
"text": "大厨"
},
"difficulty": 6,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1335,8 +1285,6 @@
"drop": 1026,
"bossmodel": 51005,
"boss": [
403016,
403017,
403018
],
"ps_consume": [
@ -1362,7 +1310,7 @@
"text": "大厨"
},
"difficulty": 7,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1390,8 +1338,6 @@
"drop": 1027,
"bossmodel": 51005,
"boss": [
403019,
403020,
403021
],
"ps_consume": [
@ -1417,7 +1363,7 @@
"text": "大厨"
},
"difficulty": 8,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1445,8 +1391,6 @@
"drop": 1028,
"bossmodel": 51005,
"boss": [
403022,
403023,
403024
],
"ps_consume": [
@ -1472,7 +1416,7 @@
"text": "大厨"
},
"difficulty": 9,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1500,8 +1444,6 @@
"drop": 1029,
"bossmodel": 51005,
"boss": [
403025,
403026,
403027
],
"ps_consume": [
@ -1527,7 +1469,7 @@
"text": "大厨"
},
"difficulty": 10,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1555,8 +1497,6 @@
"drop": 1030,
"bossmodel": 51005,
"boss": [
403028,
403029,
403030
],
"ps_consume": [
@ -1582,7 +1522,7 @@
"text": "太空海星"
},
"difficulty": 1,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1600,8 +1540,6 @@
"drop": 1021,
"bossmodel": 51002,
"boss": [
404001,
404002,
404003
],
"ps_consume": [
@ -1627,7 +1565,7 @@
"text": "太空海星"
},
"difficulty": 2,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1650,8 +1588,6 @@
"drop": 1022,
"bossmodel": 51002,
"boss": [
404004,
404005,
404006
],
"ps_consume": [
@ -1677,7 +1613,7 @@
"text": "太空海星"
},
"difficulty": 3,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1700,8 +1636,6 @@
"drop": 1023,
"bossmodel": 51002,
"boss": [
404007,
404008,
404009
],
"ps_consume": [
@ -1727,7 +1661,7 @@
"text": "太空海星"
},
"difficulty": 4,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1750,8 +1684,6 @@
"drop": 1024,
"bossmodel": 51002,
"boss": [
404010,
404011,
404012
],
"ps_consume": [
@ -1777,7 +1709,7 @@
"text": "太空海星"
},
"difficulty": 5,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1805,8 +1737,6 @@
"drop": 1025,
"bossmodel": 51002,
"boss": [
404013,
404014,
404015
],
"ps_consume": [
@ -1832,7 +1762,7 @@
"text": "太空海星"
},
"difficulty": 6,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1860,8 +1790,6 @@
"drop": 1026,
"bossmodel": 51002,
"boss": [
404016,
404017,
404018
],
"ps_consume": [
@ -1887,7 +1815,7 @@
"text": "太空海星"
},
"difficulty": 7,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1915,8 +1843,6 @@
"drop": 1027,
"bossmodel": 51002,
"boss": [
404019,
404020,
404021
],
"ps_consume": [
@ -1942,7 +1868,7 @@
"text": "太空海星"
},
"difficulty": 8,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -1970,8 +1896,6 @@
"drop": 1028,
"bossmodel": 51002,
"boss": [
404022,
404023,
404024
],
"ps_consume": [
@ -1997,7 +1921,7 @@
"text": "太空海星"
},
"difficulty": 9,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -2025,8 +1949,6 @@
"drop": 1029,
"bossmodel": 51002,
"boss": [
404025,
404026,
404027
],
"ps_consume": [
@ -2052,7 +1974,7 @@
"text": "太空海星"
},
"difficulty": 10,
"BattleReadyID": 107,
"BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@ -2080,8 +2002,6 @@
"drop": 1030,
"bossmodel": 51002,
"boss": [
404028,
404029,
404030
],
"ps_consume": [

View File

@ -15122,9 +15122,9 @@
"Id": 301013,
"pos": 4,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"monster": -1,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 550025,
"lv": 35,
"hppro": 0.6,
"atkpro": 1,
@ -15319,7 +15319,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 40,
"hppro": 0.6,
"atkpro": 1,
@ -15514,7 +15514,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 45,
"hppro": 0.6,
"atkpro": 1,
@ -15709,7 +15709,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 50,
"hppro": 0.6,
"atkpro": 1,
@ -15904,7 +15904,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 55,
"hppro": 0.6,
"atkpro": 1,
@ -16099,7 +16099,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@ -16294,7 +16294,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 65,
"hppro": 0.6,
"atkpro": 1,
@ -16489,7 +16489,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 70,
"hppro": 0.6,
"atkpro": 1,
@ -16684,7 +16684,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 75,
"hppro": 0.6,
"atkpro": 1,
@ -16879,7 +16879,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@ -17074,7 +17074,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 35,
"hppro": 0.6,
"atkpro": 1,
@ -17269,7 +17269,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 40,
"hppro": 0.6,
"atkpro": 1,
@ -17464,7 +17464,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 45,
"hppro": 0.6,
"atkpro": 1,
@ -17659,7 +17659,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 50,
"hppro": 0.6,
"atkpro": 1,
@ -17854,7 +17854,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 55,
"hppro": 0.6,
"atkpro": 1,
@ -18049,7 +18049,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@ -18244,7 +18244,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 65,
"hppro": 0.6,
"atkpro": 1,
@ -18439,7 +18439,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 70,
"hppro": 0.6,
"atkpro": 1,
@ -18634,7 +18634,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 75,
"hppro": 0.6,
"atkpro": 1,
@ -18829,7 +18829,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 80,
"hppro": 0.6,
"atkpro": 1,
@ -19024,7 +19024,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 35,
"hppro": 0.6,
"atkpro": 1,
@ -19219,7 +19219,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 40,
"hppro": 0.6,
"atkpro": 1,
@ -19414,7 +19414,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 45,
"hppro": 0.6,
"atkpro": 1,
@ -19609,7 +19609,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 50,
"hppro": 0.6,
"atkpro": 1,
@ -19804,7 +19804,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 55,
"hppro": 0.6,
"atkpro": 1,
@ -19999,7 +19999,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@ -20194,7 +20194,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 65,
"hppro": 0.6,
"atkpro": 1,
@ -20389,7 +20389,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 70,
"hppro": 0.6,
"atkpro": 1,
@ -20584,7 +20584,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 75,
"hppro": 0.6,
"atkpro": 1,
@ -20779,7 +20779,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 80,
"hppro": 0.6,
"atkpro": 1,
@ -89315,7 +89315,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
"monster": 110215,
"monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,

View File

@ -1176,7 +1176,7 @@
},
"type": 70,
"valid": 0,
"NPC": 10031,
"NPC": 10022,
"data1": 1,
"data2": 101,
"data3": 0,
@ -1688,7 +1688,7 @@
},
"type": 73,
"valid": 0,
"NPC": 10071,
"NPC": 70022,
"data1": 1,
"data2": 1,
"data3": 1,
@ -1736,7 +1736,7 @@
},
"type": 70,
"valid": 0,
"NPC": 10101,
"NPC": 10120,
"data1": 1,
"data2": 102,
"data3": 0,
@ -5752,7 +5752,7 @@
},
"type": 20001,
"valid": 1,
"NPC": 10011,
"NPC": 10012,
"data1": 1,
"data2": 602,
"data3": 0,

View File

@ -10819,10 +10819,10 @@
{
"Id": 214003213,
"EmitPR": 1000,
"From": 2,
"From": 4,
"Where": [],
"Order": "",
"Limit": 10,
"Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@ -10844,10 +10844,10 @@
{
"Id": 214003214,
"EmitPR": 1000,
"From": 2,
"From": 4,
"Where": [],
"Order": "",
"Limit": 10,
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [

View File

@ -1153,7 +1153,7 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_zd_buff_ts004",
"buffeffect": "effect_14001_skill_2",
"buffeffect": "effect_14001_qiuzhangzhinu",
"buffpos": "根节点"
},
{

View File

@ -8,7 +8,7 @@
"text": "无极神功套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10110",
"key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装1】的故事。"
},
"atlas_score": 0,
@ -27,7 +27,7 @@
"text": "无极神功套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10111",
"key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装2】的故事。"
},
"atlas_score": 0,
@ -46,7 +46,7 @@
"text": "无极神功套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10112",
"key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装3】的故事。"
},
"atlas_score": 0,
@ -65,7 +65,7 @@
"text": "无极神功套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10113",
"key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装4】的故事。"
},
"atlas_score": 0,
@ -84,7 +84,7 @@
"text": "无极神功套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10114",
"key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装5】的故事。"
},
"atlas_score": 0,
@ -103,7 +103,7 @@
"text": "无极神功套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10115",
"key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装6】的故事。"
},
"atlas_score": 0,
@ -122,7 +122,7 @@
"text": "驯龙套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10210",
"key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装1】的故事。"
},
"atlas_score": 0,
@ -141,7 +141,7 @@
"text": "驯龙套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10211",
"key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装2】的故事。"
},
"atlas_score": 0,
@ -160,7 +160,7 @@
"text": "驯龙套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10212",
"key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装3】的故事。"
},
"atlas_score": 0,
@ -179,7 +179,7 @@
"text": "驯龙套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10213",
"key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装4】的故事。"
},
"atlas_score": 0,
@ -198,7 +198,7 @@
"text": "驯龙套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10214",
"key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装5】的故事。"
},
"atlas_score": 0,
@ -217,7 +217,7 @@
"text": "驯龙套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10215",
"key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装6】的故事。"
},
"atlas_score": 0,
@ -236,7 +236,7 @@
"text": "雪精灵套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10310",
"key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装1】的故事。"
},
"atlas_score": 0,
@ -255,7 +255,7 @@
"text": "雪精灵套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10311",
"key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装2】的故事。"
},
"atlas_score": 0,
@ -274,7 +274,7 @@
"text": "雪精灵套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10312",
"key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装3】的故事。"
},
"atlas_score": 0,
@ -293,7 +293,7 @@
"text": "雪精灵套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10313",
"key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装4】的故事。"
},
"atlas_score": 0,
@ -312,7 +312,7 @@
"text": "雪精灵套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10314",
"key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装5】的故事。"
},
"atlas_score": 0,
@ -331,7 +331,7 @@
"text": "雪精灵套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10315",
"key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装6】的故事。"
},
"atlas_score": 0,
@ -350,7 +350,7 @@
"text": "噩梦漩涡套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10410",
"key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装1】的故事。"
},
"atlas_score": 0,
@ -369,7 +369,7 @@
"text": "噩梦漩涡套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10411",
"key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装2】的故事。"
},
"atlas_score": 0,
@ -388,7 +388,7 @@
"text": "噩梦漩涡套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10412",
"key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装3】的故事。"
},
"atlas_score": 0,
@ -407,7 +407,7 @@
"text": "噩梦漩涡套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10413",
"key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装4】的故事。"
},
"atlas_score": 0,
@ -426,7 +426,7 @@
"text": "噩梦漩涡套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10414",
"key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装5】的故事。"
},
"atlas_score": 0,
@ -445,7 +445,7 @@
"text": "噩梦漩涡套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10415",
"key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装6】的故事。"
},
"atlas_score": 0,
@ -464,7 +464,7 @@
"text": "音乐精灵套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10510",
"key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装1】的故事。"
},
"atlas_score": 0,
@ -483,7 +483,7 @@
"text": "音乐精灵套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10511",
"key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装2】的故事。"
},
"atlas_score": 0,
@ -502,7 +502,7 @@
"text": "音乐精灵套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10512",
"key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装3】的故事。"
},
"atlas_score": 0,
@ -521,7 +521,7 @@
"text": "音乐精灵套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10513",
"key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装4】的故事。"
},
"atlas_score": 0,
@ -540,7 +540,7 @@
"text": "音乐精灵套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10514",
"key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装5】的故事。"
},
"atlas_score": 0,
@ -559,7 +559,7 @@
"text": "音乐精灵套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10515",
"key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装6】的故事。"
},
"atlas_score": 0,
@ -578,7 +578,7 @@
"text": "永恒萌狗套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10610",
"key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装1】的故事。"
},
"atlas_score": 0,
@ -597,7 +597,7 @@
"text": "永恒萌狗套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10611",
"key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装2】的故事。"
},
"atlas_score": 0,
@ -616,7 +616,7 @@
"text": "永恒萌狗套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10612",
"key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装3】的故事。"
},
"atlas_score": 0,
@ -635,7 +635,7 @@
"text": "永恒萌狗套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10613",
"key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装4】的故事。"
},
"atlas_score": 0,
@ -654,7 +654,7 @@
"text": "永恒萌狗套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10614",
"key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装5】的故事。"
},
"atlas_score": 0,
@ -673,7 +673,7 @@
"text": "永恒萌狗套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10615",
"key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装6】的故事。"
},
"atlas_score": 0,
@ -692,7 +692,7 @@
"text": "原始狩猎套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10710",
"key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装1】的故事。"
},
"atlas_score": 0,
@ -711,7 +711,7 @@
"text": "原始狩猎套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10711",
"key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装2】的故事。"
},
"atlas_score": 0,
@ -730,7 +730,7 @@
"text": "原始狩猎套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10712",
"key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装3】的故事。"
},
"atlas_score": 0,
@ -749,7 +749,7 @@
"text": "原始狩猎套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10713",
"key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装4】的故事。"
},
"atlas_score": 0,
@ -768,7 +768,7 @@
"text": "原始狩猎套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10714",
"key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装5】的故事。"
},
"atlas_score": 0,
@ -787,7 +787,7 @@
"text": "原始狩猎套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10715",
"key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装6】的故事。"
},
"atlas_score": 0,
@ -806,7 +806,7 @@
"text": "气功大师套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text10810",
"key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装1】的故事。"
},
"atlas_score": 0,
@ -825,7 +825,7 @@
"text": "气功大师套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text10811",
"key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装2】的故事。"
},
"atlas_score": 0,
@ -844,7 +844,7 @@
"text": "气功大师套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text10812",
"key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装3】的故事。"
},
"atlas_score": 0,
@ -863,7 +863,7 @@
"text": "气功大师套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text10813",
"key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装4】的故事。"
},
"atlas_score": 0,
@ -882,7 +882,7 @@
"text": "气功大师套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text10814",
"key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装5】的故事。"
},
"atlas_score": 0,
@ -901,7 +901,7 @@
"text": "气功大师套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text10815",
"key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装6】的故事。"
},
"atlas_score": 0,
@ -920,7 +920,7 @@
"text": "马术套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11010",
"key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装1】的故事。"
},
"atlas_score": 0,
@ -939,7 +939,7 @@
"text": "马术套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11011",
"key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装2】的故事。"
},
"atlas_score": 0,
@ -958,7 +958,7 @@
"text": "马术套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11012",
"key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装3】的故事。"
},
"atlas_score": 0,
@ -977,7 +977,7 @@
"text": "马术套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11013",
"key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装4】的故事。"
},
"atlas_score": 0,
@ -996,7 +996,7 @@
"text": "马术套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11014",
"key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装5】的故事。"
},
"atlas_score": 0,
@ -1015,7 +1015,7 @@
"text": "马术套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11015",
"key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装6】的故事。"
},
"atlas_score": 0,
@ -1034,7 +1034,7 @@
"text": "波波星套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11110",
"key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装1】的故事。"
},
"atlas_score": 0,
@ -1053,7 +1053,7 @@
"text": "波波星套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11111",
"key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装2】的故事。"
},
"atlas_score": 0,
@ -1072,7 +1072,7 @@
"text": "波波星套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11112",
"key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装3】的故事。"
},
"atlas_score": 0,
@ -1091,7 +1091,7 @@
"text": "波波星套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11113",
"key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装4】的故事。"
},
"atlas_score": 0,
@ -1110,7 +1110,7 @@
"text": "波波星套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11114",
"key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装5】的故事。"
},
"atlas_score": 0,
@ -1129,7 +1129,7 @@
"text": "波波星套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11115",
"key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装6】的故事。"
},
"atlas_score": 0,
@ -1148,7 +1148,7 @@
"text": "穴居人套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11210",
"key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装1】的故事。"
},
"atlas_score": 0,
@ -1167,7 +1167,7 @@
"text": "穴居人套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11211",
"key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装2】的故事。"
},
"atlas_score": 0,
@ -1186,7 +1186,7 @@
"text": "穴居人套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11212",
"key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装3】的故事。"
},
"atlas_score": 0,
@ -1205,7 +1205,7 @@
"text": "穴居人套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11213",
"key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装4】的故事。"
},
"atlas_score": 0,
@ -1224,7 +1224,7 @@
"text": "穴居人套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11214",
"key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装5】的故事。"
},
"atlas_score": 0,
@ -1243,7 +1243,7 @@
"text": "穴居人套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11215",
"key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装6】的故事。"
},
"atlas_score": 0,
@ -1262,7 +1262,7 @@
"text": "文明人套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11310",
"key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装1】的故事。"
},
"atlas_score": 0,
@ -1281,7 +1281,7 @@
"text": "文明人套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11311",
"key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装2】的故事。"
},
"atlas_score": 0,
@ -1300,7 +1300,7 @@
"text": "文明人套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11312",
"key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装3】的故事。"
},
"atlas_score": 0,
@ -1319,7 +1319,7 @@
"text": "文明人套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11313",
"key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装4】的故事。"
},
"atlas_score": 0,
@ -1338,7 +1338,7 @@
"text": "文明人套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11314",
"key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装5】的故事。"
},
"atlas_score": 0,
@ -1357,7 +1357,7 @@
"text": "文明人套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11315",
"key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装6】的故事。"
},
"atlas_score": 0,
@ -1376,7 +1376,7 @@
"text": "马戏团套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11410",
"key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装1】的故事。"
},
"atlas_score": 0,
@ -1395,7 +1395,7 @@
"text": "马戏团套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11411",
"key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装2】的故事。"
},
"atlas_score": 0,
@ -1414,7 +1414,7 @@
"text": "马戏团套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11412",
"key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装3】的故事。"
},
"atlas_score": 0,
@ -1433,7 +1433,7 @@
"text": "马戏团套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11413",
"key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装4】的故事。"
},
"atlas_score": 0,
@ -1452,7 +1452,7 @@
"text": "马戏团套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11414",
"key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装5】的故事。"
},
"atlas_score": 0,
@ -1471,7 +1471,7 @@
"text": "马戏团套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11415",
"key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装6】的故事。"
},
"atlas_score": 0,
@ -1490,7 +1490,7 @@
"text": "泰坦套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11510",
"key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装1】的故事。"
},
"atlas_score": 0,
@ -1509,7 +1509,7 @@
"text": "泰坦套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11511",
"key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装2】的故事。"
},
"atlas_score": 0,
@ -1528,7 +1528,7 @@
"text": "泰坦套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11512",
"key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装3】的故事。"
},
"atlas_score": 0,
@ -1547,7 +1547,7 @@
"text": "泰坦套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11513",
"key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装4】的故事。"
},
"atlas_score": 0,
@ -1566,7 +1566,7 @@
"text": "泰坦套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11514",
"key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装5】的故事。"
},
"atlas_score": 0,
@ -1585,7 +1585,7 @@
"text": "泰坦套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11515",
"key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装6】的故事。"
},
"atlas_score": 0,
@ -1604,7 +1604,7 @@
"text": "巨怪猎人套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11610",
"key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装1】的故事。"
},
"atlas_score": 0,
@ -1623,7 +1623,7 @@
"text": "巨怪猎人套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11611",
"key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装2】的故事。"
},
"atlas_score": 0,
@ -1642,7 +1642,7 @@
"text": "巨怪猎人套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11612",
"key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装3】的故事。"
},
"atlas_score": 0,
@ -1661,7 +1661,7 @@
"text": "巨怪猎人套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11613",
"key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装4】的故事。"
},
"atlas_score": 0,
@ -1680,7 +1680,7 @@
"text": "巨怪猎人套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11614",
"key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装5】的故事。"
},
"atlas_score": 0,
@ -1699,7 +1699,7 @@
"text": "巨怪猎人套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11615",
"key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装6】的故事。"
},
"atlas_score": 0,
@ -1718,7 +1718,7 @@
"text": "天外陨石套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11710",
"key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装1】的故事。"
},
"atlas_score": 0,
@ -1737,7 +1737,7 @@
"text": "天外陨石套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11711",
"key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装2】的故事。"
},
"atlas_score": 0,
@ -1756,7 +1756,7 @@
"text": "天外陨石套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11712",
"key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装3】的故事。"
},
"atlas_score": 0,
@ -1775,7 +1775,7 @@
"text": "天外陨石套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11713",
"key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装4】的故事。"
},
"atlas_score": 0,
@ -1794,7 +1794,7 @@
"text": "天外陨石套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11714",
"key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装5】的故事。"
},
"atlas_score": 0,
@ -1813,7 +1813,7 @@
"text": "天外陨石套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11715",
"key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装6】的故事。"
},
"atlas_score": 0,
@ -1832,7 +1832,7 @@
"text": "沼泽怪物套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11810",
"key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装1】的故事。"
},
"atlas_score": 0,
@ -1851,7 +1851,7 @@
"text": "沼泽怪物套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11811",
"key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装2】的故事。"
},
"atlas_score": 0,
@ -1870,7 +1870,7 @@
"text": "沼泽怪物套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11812",
"key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装3】的故事。"
},
"atlas_score": 0,
@ -1889,7 +1889,7 @@
"text": "沼泽怪物套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11813",
"key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装4】的故事。"
},
"atlas_score": 0,
@ -1908,7 +1908,7 @@
"text": "沼泽怪物套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11814",
"key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装5】的故事。"
},
"atlas_score": 0,
@ -1927,7 +1927,7 @@
"text": "沼泽怪物套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11815",
"key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装6】的故事。"
},
"atlas_score": 0,
@ -1946,7 +1946,7 @@
"text": "守护神套装1"
},
"content_text": {
"key": "newsmithy_tool_content_text11910",
"key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装1】的故事。"
},
"atlas_score": 0,
@ -1965,7 +1965,7 @@
"text": "守护神套装2"
},
"content_text": {
"key": "newsmithy_tool_content_text11911",
"key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装2】的故事。"
},
"atlas_score": 0,
@ -1984,7 +1984,7 @@
"text": "守护神套装3"
},
"content_text": {
"key": "newsmithy_tool_content_text11912",
"key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装3】的故事。"
},
"atlas_score": 0,
@ -2003,7 +2003,7 @@
"text": "守护神套装4"
},
"content_text": {
"key": "newsmithy_tool_content_text11913",
"key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装4】的故事。"
},
"atlas_score": 0,
@ -2022,7 +2022,7 @@
"text": "守护神套装5"
},
"content_text": {
"key": "newsmithy_tool_content_text11914",
"key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装5】的故事。"
},
"atlas_score": 0,
@ -2041,7 +2041,7 @@
"text": "守护神套装6"
},
"content_text": {
"key": "newsmithy_tool_content_text11915",
"key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装6】的故事。"
},
"atlas_score": 0,

View File

@ -1,110 +1,34 @@
[
{
"key": 1,
"id_tag": 1,
"active": 20,
"id_tag": 2,
"active": 40,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 5
"n": 10
}
]
],
"action": "Skill_2",
"stage": 1
},
{
"key": 2,
"id_tag": 1,
"active": 40,
"id_tag": 2,
"active": 80,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 10000
"t": "diamond",
"n": 10
}
]
],
"action": "Skill_2",
"stage": 2
},
{
"key": 3,
"id_tag": 1,
"active": 60,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 4,
"id_tag": 1,
"active": 80,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 20000
}
]
},
{
"key": 5,
"id_tag": 1,
"active": 100,
"reword": [
{
"a": "item",
"t": "30001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 50000
}
]
},
{
"key": 6,
"id_tag": 2,
"active": 40,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 25000
}
]
},
{
"key": 7,
"id_tag": 2,
"active": 80,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 25000
}
]
},
{
"key": 8,
"id_tag": 2,
"active": 120,
"reword": [
@ -113,10 +37,12 @@
"t": "diamond",
"n": 20
}
]
],
"action": "Skill_2",
"stage": 3
},
{
"key": 9,
"key": 4,
"id_tag": 2,
"active": 160,
"reword": [
@ -124,29 +50,9 @@
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 75000
}
]
},
{
"key": 10,
"id_tag": 2,
"active": 200,
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 10
},
{
"a": "attr",
"t": "gold",
"n": 200000
}
]
}
],
"action": "Skill_2",
"stage": 4
}
]

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@
"text": "火焰泰坦"
},
"difficulty": 1,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -45,8 +45,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301011,
301012,
301013
],
"ps_consume": [
@ -73,7 +71,7 @@
"text": "火焰泰坦"
},
"difficulty": 2,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -110,8 +108,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301014,
301015,
301016
],
"ps_consume": [
@ -138,7 +134,7 @@
"text": "火焰泰坦"
},
"difficulty": 3,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -175,8 +171,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301017,
301018,
301019
],
"ps_consume": [
@ -203,7 +197,7 @@
"text": "火焰泰坦"
},
"difficulty": 4,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -240,8 +234,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301020,
301021,
301022
],
"ps_consume": [
@ -268,7 +260,7 @@
"text": "火焰泰坦"
},
"difficulty": 5,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -305,8 +297,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301023,
301024,
301025
],
"ps_consume": [
@ -333,7 +323,7 @@
"text": "火焰泰坦"
},
"difficulty": 6,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -370,8 +360,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301026,
301027,
301028
],
"ps_consume": [
@ -398,7 +386,7 @@
"text": "火焰泰坦"
},
"difficulty": 7,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -435,8 +423,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301029,
301030,
301031
],
"ps_consume": [
@ -463,7 +449,7 @@
"text": "火焰泰坦"
},
"difficulty": 8,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -500,8 +486,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301032,
301033,
301034
],
"ps_consume": [
@ -528,7 +512,7 @@
"text": "火焰泰坦"
},
"difficulty": 9,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -565,8 +549,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301035,
301036,
301037
],
"ps_consume": [
@ -593,7 +575,7 @@
"text": "火焰泰坦"
},
"difficulty": 10,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -630,8 +612,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301038,
301039,
301040
],
"ps_consume": [
@ -658,7 +638,7 @@
"text": "冰之泰坦"
},
"difficulty": 1,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -695,8 +675,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302011,
302012,
302013
],
"ps_consume": [
@ -723,7 +701,7 @@
"text": "冰之泰坦"
},
"difficulty": 2,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -760,8 +738,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302014,
302015,
302016
],
"ps_consume": [
@ -788,7 +764,7 @@
"text": "冰之泰坦"
},
"difficulty": 3,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -825,8 +801,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302017,
302018,
302019
],
"ps_consume": [
@ -853,7 +827,7 @@
"text": "冰之泰坦"
},
"difficulty": 4,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -890,8 +864,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302020,
302021,
302022
],
"ps_consume": [
@ -918,7 +890,7 @@
"text": "冰之泰坦"
},
"difficulty": 5,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -955,8 +927,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302023,
302024,
302025
],
"ps_consume": [
@ -983,7 +953,7 @@
"text": "冰之泰坦"
},
"difficulty": 6,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1020,8 +990,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302026,
302027,
302028
],
"ps_consume": [
@ -1048,7 +1016,7 @@
"text": "冰之泰坦"
},
"difficulty": 7,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1085,8 +1053,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302029,
302030,
302031
],
"ps_consume": [
@ -1113,7 +1079,7 @@
"text": "冰之泰坦"
},
"difficulty": 8,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1150,8 +1116,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302032,
302033,
302034
],
"ps_consume": [
@ -1178,7 +1142,7 @@
"text": "冰之泰坦"
},
"difficulty": 9,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1215,8 +1179,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302035,
302036,
302037
],
"ps_consume": [
@ -1243,7 +1205,7 @@
"text": "冰之泰坦"
},
"difficulty": 10,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1280,8 +1242,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
302038,
302039,
302040
],
"ps_consume": [
@ -1308,7 +1268,7 @@
"text": "森林泰坦"
},
"difficulty": 1,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1345,8 +1305,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303011,
303012,
303013
],
"ps_consume": [
@ -1373,7 +1331,7 @@
"text": "森林泰坦"
},
"difficulty": 2,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1410,8 +1368,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303014,
303015,
303016
],
"ps_consume": [
@ -1438,7 +1394,7 @@
"text": "森林泰坦"
},
"difficulty": 3,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1475,8 +1431,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303017,
303018,
303019
],
"ps_consume": [
@ -1503,7 +1457,7 @@
"text": "森林泰坦"
},
"difficulty": 4,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1540,8 +1494,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303020,
303021,
303022
],
"ps_consume": [
@ -1568,7 +1520,7 @@
"text": "森林泰坦"
},
"difficulty": 5,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1605,8 +1557,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303023,
303024,
303025
],
"ps_consume": [
@ -1633,7 +1583,7 @@
"text": "森林泰坦"
},
"difficulty": 6,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1670,8 +1620,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303026,
303027,
303028
],
"ps_consume": [
@ -1698,7 +1646,7 @@
"text": "森林泰坦"
},
"difficulty": 7,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1735,8 +1683,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303029,
303030,
303031
],
"ps_consume": [
@ -1763,7 +1709,7 @@
"text": "森林泰坦"
},
"difficulty": 8,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1800,8 +1746,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303032,
303033,
303034
],
"ps_consume": [
@ -1828,7 +1772,7 @@
"text": "森林泰坦"
},
"difficulty": 9,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1865,8 +1809,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303035,
303036,
303037
],
"ps_consume": [
@ -1893,7 +1835,7 @@
"text": "森林泰坦"
},
"difficulty": 10,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -1930,8 +1872,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
303038,
303039,
303040
],
"ps_consume": [
@ -1958,7 +1898,7 @@
"text": "武器BOSS"
},
"difficulty": 1,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2000,8 +1940,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301011,
301012,
301013
],
"ps_consume": [
@ -2028,7 +1966,7 @@
"text": "武器BOSS"
},
"difficulty": 2,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2070,8 +2008,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301014,
301015,
301016
],
"ps_consume": [
@ -2098,7 +2034,7 @@
"text": "武器BOSS"
},
"difficulty": 3,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2140,8 +2076,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301017,
301018,
301019
],
"ps_consume": [
@ -2168,7 +2102,7 @@
"text": "武器BOSS"
},
"difficulty": 4,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2210,8 +2144,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301020,
301021,
301022
],
"ps_consume": [
@ -2238,7 +2170,7 @@
"text": "武器BOSS"
},
"difficulty": 5,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2280,8 +2212,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301023,
301024,
301025
],
"ps_consume": [
@ -2308,7 +2238,7 @@
"text": "武器BOSS"
},
"difficulty": 6,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2350,8 +2280,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301026,
301027,
301028
],
"ps_consume": [
@ -2378,7 +2306,7 @@
"text": "武器BOSS"
},
"difficulty": 7,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2420,8 +2348,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301029,
301030,
301031
],
"ps_consume": [
@ -2448,7 +2374,7 @@
"text": "武器BOSS"
},
"difficulty": 8,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2490,8 +2416,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301032,
301033,
301034
],
"ps_consume": [
@ -2518,7 +2442,7 @@
"text": "武器BOSS"
},
"difficulty": 9,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2560,8 +2484,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301035,
301036,
301037
],
"ps_consume": [
@ -2588,7 +2510,7 @@
"text": "武器BOSS"
},
"difficulty": 10,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2630,8 +2552,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301038,
301039,
301040
],
"ps_consume": [
@ -2658,7 +2578,7 @@
"text": "饰品BOSS"
},
"difficulty": 1,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2700,8 +2620,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301011,
301012,
301013
],
"ps_consume": [
@ -2728,7 +2646,7 @@
"text": "饰品BOSS"
},
"difficulty": 2,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2770,8 +2688,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301014,
301015,
301016
],
"ps_consume": [
@ -2798,7 +2714,7 @@
"text": "饰品BOSS"
},
"difficulty": 3,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2840,8 +2756,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301017,
301018,
301019
],
"ps_consume": [
@ -2868,7 +2782,7 @@
"text": "饰品BOSS"
},
"difficulty": 4,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2910,8 +2824,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301020,
301021,
301022
],
"ps_consume": [
@ -2938,7 +2850,7 @@
"text": "饰品BOSS"
},
"difficulty": 5,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -2980,8 +2892,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301023,
301024,
301025
],
"ps_consume": [
@ -3008,7 +2918,7 @@
"text": "饰品BOSS"
},
"difficulty": 6,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3050,8 +2960,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301026,
301027,
301028
],
"ps_consume": [
@ -3078,7 +2986,7 @@
"text": "饰品BOSS"
},
"difficulty": 7,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3120,8 +3028,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301029,
301030,
301031
],
"ps_consume": [
@ -3148,7 +3054,7 @@
"text": "饰品BOSS"
},
"difficulty": 8,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3190,8 +3096,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301032,
301033,
301034
],
"ps_consume": [
@ -3218,7 +3122,7 @@
"text": "饰品BOSS"
},
"difficulty": 9,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3260,8 +3164,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301035,
301036,
301037
],
"ps_consume": [
@ -3288,7 +3190,7 @@
"text": "饰品BOSS"
},
"difficulty": 10,
"BattleReadyID": 104,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3330,8 +3232,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
301038,
301039,
301040
],
"ps_consume": [
@ -3358,7 +3258,7 @@
"text": "火焰泰坦"
},
"difficulty": 1,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3405,8 +3305,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3433,7 +3331,7 @@
"text": "火焰泰坦"
},
"difficulty": 2,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3480,8 +3378,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3508,7 +3404,7 @@
"text": "火焰泰坦"
},
"difficulty": 3,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3555,8 +3451,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3583,7 +3477,7 @@
"text": "火焰泰坦"
},
"difficulty": 4,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3630,8 +3524,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3658,7 +3550,7 @@
"text": "火焰泰坦"
},
"difficulty": 5,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3705,8 +3597,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3733,7 +3623,7 @@
"text": "火焰泰坦"
},
"difficulty": 6,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3780,8 +3670,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3808,7 +3696,7 @@
"text": "火焰泰坦"
},
"difficulty": 7,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3855,8 +3743,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3883,7 +3769,7 @@
"text": "火焰泰坦"
},
"difficulty": 8,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -3930,8 +3816,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -3958,7 +3842,7 @@
"text": "火焰泰坦"
},
"difficulty": 9,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -4005,8 +3889,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -4033,7 +3915,7 @@
"text": "火焰泰坦"
},
"difficulty": 10,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -4080,8 +3962,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -4108,7 +3988,7 @@
"text": "火焰泰坦"
},
"difficulty": 11,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -4155,8 +4035,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [
@ -4183,7 +4061,7 @@
"text": "火焰泰坦"
},
"difficulty": 12,
"BattleReadyID": 112,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@ -4230,8 +4108,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
710001,
710001,
710001
],
"ps_consume": [

View File

@ -2,7 +2,7 @@
{
"id": 210,
"name": {
"key": "mainline_name_10001",
"key": "Mainline_Tasks1",
"text": "章节1全部任务"
},
"task_icon": "",
@ -21,8 +21,8 @@
{
"id": 310,
"name": {
"key": "Side_Quest",
"text": "武馆支线1"
"key": "Side_Quest1",
"text": "武馆内勤奋的身影是?"
},
"task_icon": "",
"task_txt": {
@ -45,8 +45,8 @@
{
"id": 320,
"name": {
"key": "Side_Quest",
"text": "铁匠铺支线1"
"key": "Side_Quest2",
"text": "铁匠铺门口身影是?"
},
"task_icon": "",
"task_txt": {
@ -69,8 +69,8 @@
{
"id": 330,
"name": {
"key": "Side_Quest",
"text": "铁匠铺支线2"
"key": "Side_Quest3",
"text": "戈伯的嘱托"
},
"task_icon": "",
"task_txt": {
@ -93,8 +93,8 @@
{
"id": 340,
"name": {
"key": "Side_Quest",
"text": "武馆支线2"
"key": "Side_Quest4",
"text": "武馆秘闻"
},
"task_icon": "",
"task_txt": {
@ -117,8 +117,8 @@
{
"id": 350,
"name": {
"key": "Side_Quest",
"text": "武馆支线3"
"key": "Side_Quest5",
"text": "好像有人再看我?"
},
"task_icon": "",
"task_txt": {
@ -141,8 +141,8 @@
{
"id": 360,
"name": {
"key": "Side_Quest",
"text": "铁匠铺支线3"
"key": "Side_Quest6",
"text": "戈伯的委托"
},
"task_icon": "",
"task_txt": {

View File

@ -350,7 +350,7 @@
"key": "Mainline_Tasks1_8_Receiving",
"text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙,还有那无与伦比的艺术品……"
},
"deliver_npc": 10082,
"deliver_npc": 10081,
"auto_accept": 0,
"reword": [
{
@ -552,11 +552,11 @@
},
"task_name": {
"key": "Mainline_Tasks1_13",
"text": ""
"text": "消失的阴影"
},
"npctxt": {
"key": "Mainline_Tasks1_13_Receiving",
"text": "消失的阴影"
"text": "梦魇消失了,虽然危险的根源并未被根除,但至少现在我们安全了,暂时的。"
},
"npc": 10130,
"completetasktxt": {
@ -585,7 +585,7 @@
"key": 20140,
"lock": 1,
"lockend": 0,
"ontxe": 20120,
"ontxe": 20130,
"id_after": 0,
"group": 210,
"des": 2,
@ -595,23 +595,23 @@
"text": "第一章:预言之声"
},
"task_name": {
"key": "Mainline_Tasks1_11",
"key": "Mainline_Tasks1_999",
"text": "敬请期待"
},
"npctxt": {
"key": "Mainline_Tasks1_11",
"key": "Mainline_Tasks1_999",
"text": "敬请期待"
},
"npc": 10110,
"completetasktxt": {
"key": "Mainline_Tasks1_11",
"key": "Mainline_Tasks1_999",
"text": "敬请期待!"
},
"completetask": [
193
],
"deliver_npctxt": {
"key": "Mainline_Tasks1_11",
"key": "Mainline_Tasks1_999",
"text": "敬请期待!"
},
"deliver_npc": 0,

View File

@ -13,13 +13,16 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ParkourInfoReq
///匹配请求
func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
isopen bool
info *pb.DBParkour
recommend []*pb.DBParkour
recommend []*pb.DBRaceMember
err error
)
if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success {
return
}
isopen = this.module.configure.isopen()
if isopen {
if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
return
@ -28,6 +31,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (co
code = pb.ErrorCode_DBError
return
}
session.SendMsg(string(this.module.GetType()), "info", &pb.ParkourInfoResp{Info: info, Recommend: recommend})
}
session.SendMsg(string(this.module.GetType()), "info", &pb.ParkourInfoResp{Isopen: isopen, Info: info, Recommend: recommend})
return
}

View File

@ -23,6 +23,8 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
tinfo *pb.DBParkour
tuser *pb.DBUser
mount *cfg.GameBuzkashiMountData
member *pb.DBRaceMember
users []string
ok bool
err error
)
@ -75,7 +77,16 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
//目标是否在线
if !this.module.ModuleUser.IsOnline(req.Uid) {
info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Mount: tinfo.Dfmount, Hp: mount.Hp, Isai: true})
member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Mount: tinfo.Dfmount, Hp: mount.Hp, Isai: true}
info.Member = append(info.Member, member)
users = make([]string, len(info.Member))
for i, v := range info.Member {
users[i] = v.Uid
}
this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice",
&pb.ParkourTeamJoinNoticePush{Member: member}, users...)
this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
&pb.ParkourTeamChanagePush{Team: info}, users...)
} else {
if tinfo.Captainid != "" {
code = pb.ErrorCode_ParkourTargetTeamed

View File

@ -7,6 +7,9 @@ import (
//参数校验
func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode) {
if session.GetUserId() != req.Captainid {
code = pb.ErrorCode_ReqParameterError
}
return
}
@ -14,6 +17,7 @@ func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRa
func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
team *pb.DBParkour
users []string
err error
)
if code = this.RaceMatchCheck(session, req); code != pb.ErrorCode_Success {
@ -23,10 +27,32 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
code = pb.ErrorCode_DBError
return
}
if team.Captainid != session.GetUserId() {
code = pb.ErrorCode_ReqParameterError
return
}
if err = this.module.match(team); err != nil {
code = pb.ErrorCode_DBError
return
}
users = make([]string, len(team.Member))
for i, v := range team.Member {
if !v.Isai {
users[i] = v.Uid
if err = this.module.parkourComp.Change(v.Uid, map[string]interface{}{
"state": pb.RaceTeamState_matching,
}); err != nil {
code = pb.ErrorCode_DBError
return
}
}
}
this.module.SendMsgToUsers(string(this.module.GetType()), "racematchstart",
&pb.ParkourRaceMatchStartPush{Team: team}, users...)
session.SendMsg(string(this.module.GetType()), "racematch", &pb.ParkourRaceMatchResp{})
return
}

View File

@ -0,0 +1,56 @@
package parkour
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) RaceMatchCancelCheck(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (code pb.ErrorCode) {
if session.GetUserId() != req.Captainid {
code = pb.ErrorCode_ReqParameterError
}
return
}
///匹配请求
func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
team *pb.DBParkour
users []string
err error
)
if code = this.RaceMatchCancelCheck(session, req); code != pb.ErrorCode_Success {
return
}
if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
code = pb.ErrorCode_DBError
return
}
if team.Captainid != session.GetUserId() {
code = pb.ErrorCode_ReqParameterError
return
}
if err = this.module.match(team); err != nil {
code = pb.ErrorCode_DBError
return
}
users = make([]string, len(team.Member))
for i, v := range team.Member {
if !v.Isai {
users[i] = v.Uid
if err = this.module.parkourComp.Change(v.Uid, map[string]interface{}{
"state": pb.RaceTeamState_matching,
}); err != nil {
code = pb.ErrorCode_DBError
return
}
}
}
this.module.SendMsgToUsers(string(this.module.GetType()), "racematchstart",
&pb.ParkourRaceMatchCancelPush{Team: team}, users...)
session.SendMsg(string(this.module.GetType()), "racematch", &pb.ParkourRaceMatchResp{})
return
}

View File

@ -4,10 +4,12 @@ import (
"fmt"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
)
const (
game_buzkashiopen = "game_buzkashiopen.json"
game_buzkashigrade = "game_buzkashigrade.json"
game_buzkashilv = "game_buzkashilv.json"
game_buzkashimount = "game_buzkashimount.json"
@ -24,6 +26,7 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Parkour)
this.LoadConfigure(game_buzkashiopen, cfg.NewGamebuzkashiOpen)
this.LoadConfigure(game_buzkashigrade, cfg.NewGameBuzkashiGrade)
this.LoadConfigure(game_buzkashilv, cfg.NewGameBuzkashiLv)
this.LoadConfigure(game_buzkashimount, cfg.NewGameBuzkashiMount)
@ -31,6 +34,34 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
return
}
//查询开启表
func (this *configureComp) isopen() (open bool) {
var (
v interface{}
config *cfg.GamebuzkashiOpen
currtime string = configure.Now().Format("15:04")
err error
ok bool
)
if v, err = this.GetConfigure(game_buzkashiopen); err != nil {
this.module.Errorln(err)
return
} else {
if config, ok = v.(*cfg.GamebuzkashiOpen); !ok {
err = fmt.Errorf("config type err:%T", v)
return
} else {
for _, v := range config.GetDataList() {
if currtime >= v.Stime && currtime < v.Etime {
open = true
return
}
}
}
}
return
}
//查询坐骑表
func (this *configureComp) getGameBuzkashiMount(id string) (configure *cfg.GameBuzkashiMountData, err error) {
var (

View File

@ -8,6 +8,12 @@ import (
"time"
)
type Recommend struct {
parkour *pb.DBParkour
user *pb.DBUser
member *pb.DBRaceMember
}
///捕羊大赛对象
type RaceItem struct {
Id string //战斗id

View File

@ -10,6 +10,7 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"math/rand"
"sync"
@ -28,7 +29,7 @@ type ModelParkourComp struct {
module *Parkour
refresh time.Time //上一次刷新时间
lock sync.RWMutex
users []*pb.DBParkour //推荐用户信息
users []*Recommend //推荐用户信息
}
//组件初始化接口
@ -50,9 +51,10 @@ func (this *ModelParkourComp) Start() (err error) {
}
//获取推荐用户
func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour, err error) {
func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBRaceMember, err error) {
var (
users []*pb.DBParkour
users []*Recommend
mount *cfg.GameBuzkashiMountData
ondata bool
)
this.lock.RLock()
@ -64,9 +66,9 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour,
this.refreshlist()
}
this.lock.RLock()
users = make([]*pb.DBParkour, 0, len(this.users))
users = make([]*Recommend, 0, len(this.users))
for _, v := range this.users {
if v.Uid != uid {
if v.parkour.Uid != uid {
users = append(users, v)
}
}
@ -75,10 +77,26 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour,
if len(users) < 6 {
num = len(users)
}
recommend = make([]*pb.DBParkour, num)
recommend = make([]*pb.DBRaceMember, num)
r := rand.New(rand.NewSource(configure.Now().Unix()))
for i, v := range r.Perm(num) {
recommend[i] = users[v]
if users[v].member == nil {
if users[v].user = this.module.ModuleUser.GetUser(users[v].parkour.Uid); users[v].user == nil {
continue
}
if mount, err = this.module.configure.getGameBuzkashiMount(users[v].parkour.Dfmount); err != nil {
continue
}
users[v].member = &pb.DBRaceMember{
Uid: users[v].user.Uid,
Name: users[v].user.Name,
Avatar: users[v].user.Avatar,
Lv: users[v].user.Lv,
Mount: users[v].parkour.Dfmount,
Hp: mount.Hp,
}
}
recommend[i] = users[v].member
}
return
}
@ -86,6 +104,7 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour,
//刷新推荐列表
func (this *ModelParkourComp) refreshlist() {
var (
users []*Recommend
c *mongo.Cursor
err error
)
@ -103,8 +122,16 @@ func (this *ModelParkourComp) refreshlist() {
result = append(result, tmp)
}
}
users = make([]*Recommend, len(result))
for i, v := range result {
users[i] = &Recommend{
parkour: v,
user: nil,
}
}
this.lock.Lock()
this.users = result
this.users = users
this.lock.Unlock()
}
}

View File

@ -198,7 +198,7 @@ func (this *Parkour) startbattle(id string) {
sessions = append(sessions, v)
}
if err = this.SendMsgToSession(string(comm.ModulePvp), "racestart", &pb.ParkourRaceStartPush{
if err = this.SendMsgToSession(string(this.GetType()), "racestart", &pb.ParkourRaceStartPush{
Countdown: 3,
}, sessions...); err != nil {
this.Errorln(err)
@ -263,6 +263,12 @@ func (this *Parkour) avoid(id string, uid string, dis int32) {
this.Error("躲避障碍物逻辑异常 未找到玩家!", log.Field{Key: "battleid", Value: id}, log.Field{Key: "uid", Value: uid})
return
}
if dis < 0 {
member.Hp--
} else {
}
for _, v := range battle.Session {
sessions = append(sessions, v)
}
@ -463,7 +469,6 @@ func (this *Parkour) useroffline(uid, sessionid string) {
} else if info.State == pb.RaceTeamState_raceing {
var (
lockpath string = fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId())
result []*pb.DBRace
)
if result, err = this.raceComp.queryraces(); err != nil {

View File

@ -0,0 +1,18 @@
package parkour_test
import (
"fmt"
"testing"
"time"
)
func Test_Time(t *testing.T) {
currt := time.Now().Format("15:04")
fmt.Printf(currt)
if currt > "13:10" && currt < "16:30" {
fmt.Printf("true")
} else {
fmt.Printf("false")
}
}

View File

@ -128,12 +128,13 @@ type DBRaceMember struct {
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //用户名称
Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar"` //用户头像
Mount string `protobuf:"bytes,4,opt,name=mount,proto3" json:"mount"` //上阵坐骑
Hp int32 `protobuf:"varint,5,opt,name=hp,proto3" json:"hp"` //初始血量
Innermost int32 `protobuf:"varint,6,opt,name=innermost,proto3" json:"innermost"` //里程数
Ready bool `protobuf:"varint,7,opt,name=ready,proto3" json:"ready"` //是否准备
Isai bool `protobuf:"varint,8,opt,name=isai,proto3" json:"isai"` //是否是ai
Isoff bool `protobuf:"varint,9,opt,name=isoff,proto3" json:"isoff"` //是否离线
Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //等级
Mount string `protobuf:"bytes,5,opt,name=mount,proto3" json:"mount"` //上阵坐骑
Hp int32 `protobuf:"varint,6,opt,name=hp,proto3" json:"hp"` //初始血量
Innermost int32 `protobuf:"varint,7,opt,name=innermost,proto3" json:"innermost"` //里程数
Ready bool `protobuf:"varint,8,opt,name=ready,proto3" json:"ready"` //是否准备
Isai bool `protobuf:"varint,9,opt,name=isai,proto3" json:"isai"` //是否是ai
Isoff bool `protobuf:"varint,10,opt,name=isoff,proto3" json:"isoff"` //是否离线
}
func (x *DBRaceMember) Reset() {
@ -189,6 +190,13 @@ func (x *DBRaceMember) GetAvatar() string {
return ""
}
func (x *DBRaceMember) GetLv() int32 {
if x != nil {
return x.Lv
}
return 0
}
func (x *DBRaceMember) GetMount() string {
if x != nil {
return x.Mount
@ -239,7 +247,8 @@ type DBRaceInvite struct {
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //用户名称
Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar"` //用户头像
Expired int64 `protobuf:"varint,4,opt,name=expired,proto3" json:"expired"` //过期时间
Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //等级
Expired int64 `protobuf:"varint,5,opt,name=expired,proto3" json:"expired"` //过期时间
}
func (x *DBRaceInvite) Reset() {
@ -295,6 +304,13 @@ func (x *DBRaceInvite) GetAvatar() string {
return ""
}
func (x *DBRaceInvite) GetLv() int32 {
if x != nil {
return x.Lv
}
return 0
}
func (x *DBRaceInvite) GetExpired() int64 {
if x != nil {
return x.Expired
@ -522,26 +538,28 @@ var File_parkour_parkour_db_proto protoreflect.FileDescriptor
var file_parkour_parkour_db_proto_rawDesc = []byte{
0x0a, 0x18, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75,
0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd0, 0x01, 0x0a, 0x0c, 0x44,
0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe0, 0x01, 0x0a, 0x0c, 0x44,
0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a,
0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75,
0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12,
0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01,
0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18,
0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75,
0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12,
0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x01,
0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x12, 0x14, 0x0a,
0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65,
0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x08, 0x20, 0x01, 0x28,
0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65,
0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28,
0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66,
0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66, 0x22, 0x66, 0x0a,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66, 0x22, 0x76, 0x0a,
0x0c, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a,
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20,
0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65,
0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78,
0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x65,
0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78,
0x70, 0x69, 0x72, 0x65, 0x64, 0x22, 0x80, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b,
0x6f, 0x75, 0x72, 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,

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamebuzkashiOpen struct {
_dataMap map[int32]*GamebuzkashiOpenData
_dataList []*GamebuzkashiOpenData
}
func NewGamebuzkashiOpen(_buf []map[string]interface{}) (*GamebuzkashiOpen, error) {
_dataList := make([]*GamebuzkashiOpenData, 0, len(_buf))
dataMap := make(map[int32]*GamebuzkashiOpenData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamebuzkashiOpenData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Num] = _v
}
}
return &GamebuzkashiOpen{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamebuzkashiOpen) GetDataMap() map[int32]*GamebuzkashiOpenData {
return table._dataMap
}
func (table *GamebuzkashiOpen) GetDataList() []*GamebuzkashiOpenData {
return table._dataList
}
func (table *GamebuzkashiOpen) Get(key int32) *GamebuzkashiOpenData {
return table._dataMap[key]
}

View File

@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamebuzkashiOpenData struct {
Num int32
Stime string
Etime string
}
const TypeId_GamebuzkashiOpenData = 1621393927
func (*GamebuzkashiOpenData) GetTypeId() int32 {
return 1621393927
}
func (_v *GamebuzkashiOpenData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
{ var _ok_ bool; if _v.Stime, _ok_ = _buf["stime"].(string); !_ok_ { err = errors.New("stime error"); return } }
{ var _ok_ bool; if _v.Etime, _ok_ = _buf["etime"].(string); !_ok_ { err = errors.New("etime error"); return } }
return
}
func DeserializeGamebuzkashiOpenData(_buf map[string]interface{}) (*GamebuzkashiOpenData, error) {
v := &GamebuzkashiOpenData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -194,6 +194,7 @@ type Tables struct {
BuzkashiLv *GameBuzkashiLv
BuzkashiGrade *GameBuzkashiGrade
BuzkashiReward *GameBuzkashiReward
buzkashiOpen *GamebuzkashiOpen
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -1299,5 +1300,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.BuzkashiReward, err = NewGameBuzkashiReward(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_buzkashiopen") ; err != nil {
return nil, err
}
if tables.buzkashiOpen, err = NewGamebuzkashiOpen(buf) ; err != nil {
return nil, err
}
return tables, nil
}

View File

@ -15,6 +15,8 @@ type GameActiveRewardData struct {
IdTag int32
Active int32
Reword []*Gameatn
Action string
Stage int32
}
const TypeId_GameActiveRewardData = 942906779
@ -41,6 +43,8 @@ func (_v *GameActiveRewardData)Deserialize(_buf map[string]interface{}) (err err
}
}
{ var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage"].(float64); !_ok_ { err = errors.New("stage error"); return }; _v.Stage = int32(_tempNum_) }
return
}

View File

@ -214,6 +214,14 @@ type GameGlobalData struct {
BusinessRenovatething int32
FavorabilityLikes int32
FavorabilityDislikes int32
BuzkashiTime int32
BuzkashiSchedule int32
BuzkashiStime int32
BuzkashiVreward []*Gameatn
BuzkashiFreward []*Gameatn
BuzkashiVintegral []*Gameatn
BuzkashiFintegral []*Gameatn
BuzkashiResurrection int32
}
const TypeId_GameGlobalData = 477542761
@ -842,6 +850,66 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_time"].(float64); !_ok_ { err = errors.New("buzkashi_time error"); return }; _v.BuzkashiTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_schedule"].(float64); !_ok_ { err = errors.New("buzkashi_schedule error"); return }; _v.BuzkashiSchedule = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_stime"].(float64); !_ok_ { err = errors.New("buzkashi_stime error"); return }; _v.BuzkashiStime = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["buzkashi_vreward"].([]interface{}); !_ok_ { err = errors.New("buzkashi_vreward error"); return }
_v.BuzkashiVreward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.BuzkashiVreward = append(_v.BuzkashiVreward, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["buzkashi_freward"].([]interface{}); !_ok_ { err = errors.New("buzkashi_freward error"); return }
_v.BuzkashiFreward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.BuzkashiFreward = append(_v.BuzkashiFreward, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["buzkashi_vintegral"].([]interface{}); !_ok_ { err = errors.New("buzkashi_vintegral error"); return }
_v.BuzkashiVintegral = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.BuzkashiVintegral = append(_v.BuzkashiVintegral, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["buzkashi_fintegral"].([]interface{}); !_ok_ { err = errors.New("buzkashi_fintegral error"); return }
_v.BuzkashiFintegral = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.BuzkashiFintegral = append(_v.BuzkashiFintegral, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) }
return
}

View File

@ -15,6 +15,8 @@ type GameTaskActiveRewardData struct {
IdTag int32
Active int32
Reword []*Gameatn
Action string
Stage int32
}
const TypeId_GameTaskActiveRewardData = 1583402816
@ -41,6 +43,8 @@ func (_v *GameTaskActiveRewardData)Deserialize(_buf map[string]interface{}) (err
}
}
{ var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage"].(float64); !_ok_ { err = errors.New("stage error"); return }; _v.Stage = int32(_tempNum_) }
return
}