This commit is contained in:
meixiongfeng 2023-12-29 16:19:35 +08:00
commit 090baccdd4
23 changed files with 10059 additions and 2754 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1441,5 +1441,17 @@
"filter": [ "filter": [
"eq" "eq"
] ]
},
{
"id": 248,
"insert": 2,
"filter": [
"eq"
]
},
{
"id": 249,
"insert": 1,
"filter": []
} }
] ]

View File

@ -233,5 +233,49 @@
}, },
"bg": "", "bg": "",
"dropshow": [] "dropshow": []
},
{
"id": 8,
"name": {
"key": "gamesummary_node_name_8",
"text": "巅峰之王"
},
"tabId": 11004,
"type": 0,
"jumpId": 10073,
"icon": "ty_icon_dfzw",
"mapPos": {
"x": 5071,
"y": 1270
},
"params": "2",
"introduce": {
"key": "gamesummary_node_introdunce_6",
"text": "巨龙最讨厌一些不速之客擅闯城堡。累累的白骨是她给闯入者们的警示。"
},
"bg": "",
"dropshow": []
},
{
"id": 9,
"name": {
"key": "gamesummary_node_name_9",
"text": "巅峰之王"
},
"tabId": 11004,
"type": 0,
"jumpId": 10073,
"icon": "ty_icon_dfzw",
"mapPos": {
"x": 5071,
"y": 1270
},
"params": "2",
"introduce": {
"key": "gamesummary_node_introdunce_6",
"text": "巨龙最讨厌一些不速之客擅闯城堡。累累的白骨是她给闯入者们的警示。"
},
"bg": "",
"dropshow": []
} }
] ]

View File

@ -62,8 +62,8 @@
}, },
"icon": "hkz_wftj_jjc", "icon": "hkz_wftj_jjc",
"mapPos": { "mapPos": {
"x": -2362, "x": -1027,
"y": 1140 "y": 1878
}, },
"scale": 1, "scale": 1,
"usetext": { "usetext": {

View File

@ -1424,7 +1424,7 @@
"ip": 5, "ip": 5,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": -1,
"prefab": "23002", "prefab": "51010",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
"scale": [ "scale": [
@ -1673,7 +1673,7 @@
"ip": 8, "ip": 8,
"sd": 1, "sd": 1,
"handbook": 1, "handbook": 1,
"prefab": "23004", "prefab": "23011",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
"scale": [ "scale": [
@ -9651,8 +9651,8 @@
1, 1,
1 1
], ],
"icon": "13003", "icon": "99998",
"vocal": "13003", "vocal": "99998",
"tujing": [ "tujing": [
107 107
], ],
@ -9726,7 +9726,7 @@
"ip": 7, "ip": 7,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": -1,
"prefab": "13003", "prefab": "99999",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
"scale": [ "scale": [
@ -9734,8 +9734,8 @@
1, 1,
1 1
], ],
"icon": "13003", "icon": "99999",
"vocal": "13003", "vocal": "99999",
"tujing": [ "tujing": [
107 107
], ],

File diff suppressed because it is too large Load Diff

View File

@ -1119,6 +1119,41 @@
"z": 1 "z": 1
} }
}, },
{
"id": "23011",
"preson": "23011",
"presonshow": "23011_exhibition",
"presonstory": "23011_story",
"presondraw": "23011_gachashow",
"height": 1,
"weight": 0.1,
"ico": "tx_js_23011",
"fight": "tx_js_25001",
"img": "sbkp_js_23011",
"heroimg": "hbkp_js_23011",
"portrait": "zm_img_23011",
"bust": "bust_25001",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{ {
"id": "25002", "id": "25002",
"preson": "25002", "preson": "25002",

View File

@ -7815,9 +7815,9 @@
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 1.27, "hppro": 0.8,
"atkpro": 1.57, "atkpro": 0.5,
"defpro": 0.77, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -7830,14 +7830,14 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": -1, "heroid": 44001,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 1, "hppro": 0.8,
"atkpro": 1, "atkpro": 0.5,
"defpro": 1, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -7850,14 +7850,14 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": -1, "heroid": 44004,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 1, "hppro": 0.8,
"atkpro": 1, "atkpro": 0.5,
"defpro": 1, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -7870,14 +7870,14 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": -1, "heroid": 25002,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 10, "lv": 10,
"hppro": 1, "hppro": 0.8,
"atkpro": 1, "atkpro": 0.5,
"defpro": 1, "defpro": 0.3,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,
"skill3": 1, "skill3": 1,
@ -8410,7 +8410,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51052, "heroid": 43002,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -8430,7 +8430,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51050, "heroid": 51052,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -8470,7 +8470,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51052, "heroid": 51050,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -8490,7 +8490,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": -1, "heroid": 51052,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -9610,7 +9610,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 45004, "heroid": 24004,
"star": 4, "star": 4,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -9910,7 +9910,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 24004, "heroid": 45004,
"star": 4, "star": 4,
"equip": [], "equip": [],
"newskill": [], "newskill": [],

View File

@ -36,6 +36,57 @@
{ {
"Id": 3, "Id": 3,
"Level": 2, "Level": 2,
"TaskGroupId": 1003,
"Reward": [
{
"a": "item",
"t": "10000001",
"n": 5
},
{
"a": "attr",
"t": "starcoin",
"n": 40
}
]
},
{
"Id": 4,
"Level": 3,
"TaskGroupId": 1004,
"Reward": [
{
"a": "item",
"t": "10000001",
"n": 5
},
{
"a": "attr",
"t": "starcoin",
"n": 50
}
]
},
{
"Id": 5,
"Level": 4,
"TaskGroupId": 1005,
"Reward": [
{
"a": "item",
"t": "10000001",
"n": 5
},
{
"a": "attr",
"t": "starcoin",
"n": 60
}
]
},
{
"Id": 6,
"Level": 5,
"TaskGroupId": 0, "TaskGroupId": 0,
"Reward": [] "Reward": []
} }

View File

@ -2,7 +2,97 @@
{ {
"Id": 1, "Id": 1,
"TaskGroup": 1001, "TaskGroup": 1001,
"TaskId": 17001001, "TaskId": 17100101,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 2,
"TaskGroup": 1002,
"TaskId": 17100201,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 3,
"TaskGroup": 1002,
"TaskId": 17100202,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 4,
"TaskGroup": 1002,
"TaskId": 17100203,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 5,
"TaskGroup": 1002,
"TaskId": 17100204,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 6,
"TaskGroup": 1002,
"TaskId": 17100205,
"TaskReward": [ "TaskReward": [
{ {
"a": "attr", "a": "attr",
@ -20,7 +110,7 @@
{ {
"Id": 7, "Id": 7,
"TaskGroup": 1002, "TaskGroup": 1002,
"TaskId": 17002001, "TaskId": 17100206,
"TaskReward": [ "TaskReward": [
{ {
"a": "attr", "a": "attr",
@ -38,7 +128,7 @@
{ {
"Id": 8, "Id": 8,
"TaskGroup": 1002, "TaskGroup": 1002,
"TaskId": 17002002, "TaskId": 17100207,
"TaskReward": [ "TaskReward": [
{ {
"a": "attr", "a": "attr",
@ -56,7 +146,583 @@
{ {
"Id": 9, "Id": 9,
"TaskGroup": 1002, "TaskGroup": 1002,
"TaskId": 17002003, "TaskId": 17100208,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 10,
"TaskGroup": 1002,
"TaskId": 17100209,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 11,
"TaskGroup": 1002,
"TaskId": 17100210,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 12,
"TaskGroup": 1002,
"TaskId": 17100211,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 13,
"TaskGroup": 1002,
"TaskId": 17100212,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 14,
"TaskGroup": 1002,
"TaskId": 17100213,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 15,
"TaskGroup": 1002,
"TaskId": 17100214,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 16,
"TaskGroup": 1002,
"TaskId": 17100215,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 17,
"TaskGroup": 1003,
"TaskId": 17100301,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 18,
"TaskGroup": 1003,
"TaskId": 17100302,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 19,
"TaskGroup": 1003,
"TaskId": 17100303,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 20,
"TaskGroup": 1003,
"TaskId": 17100304,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 21,
"TaskGroup": 1003,
"TaskId": 17100305,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 22,
"TaskGroup": 1003,
"TaskId": 17100306,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 23,
"TaskGroup": 1003,
"TaskId": 17100307,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 24,
"TaskGroup": 1003,
"TaskId": 17100308,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 25,
"TaskGroup": 1003,
"TaskId": 17100309,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 26,
"TaskGroup": 1003,
"TaskId": 17100310,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 27,
"TaskGroup": 1003,
"TaskId": 17100311,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 28,
"TaskGroup": 1003,
"TaskId": 17100312,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 29,
"TaskGroup": 1004,
"TaskId": 17100401,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 30,
"TaskGroup": 1004,
"TaskId": 17100402,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 31,
"TaskGroup": 1004,
"TaskId": 17100403,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 32,
"TaskGroup": 1004,
"TaskId": 17100404,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 33,
"TaskGroup": 1004,
"TaskId": 17100405,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 34,
"TaskGroup": 1004,
"TaskId": 17100406,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 35,
"TaskGroup": 1004,
"TaskId": 17100407,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 36,
"TaskGroup": 1005,
"TaskId": 17100501,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 37,
"TaskGroup": 1005,
"TaskId": 17100502,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 38,
"TaskGroup": 1005,
"TaskId": 17100503,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 39,
"TaskGroup": 1005,
"TaskId": 17100504,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 40,
"TaskGroup": 1005,
"TaskId": 17100505,
"TaskReward": [
{
"a": "attr",
"t": "gold",
"n": 5000
},
{
"a": "item",
"t": "10000001",
"n": 10
}
],
"JumpFunction": 0
},
{
"Id": 41,
"TaskGroup": 1005,
"TaskId": 17100506,
"TaskReward": [ "TaskReward": [
{ {
"a": "attr", "a": "attr",

File diff suppressed because it is too large Load Diff

View File

@ -1022,7 +1022,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1064,7 +1064,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1103,7 +1103,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1142,7 +1142,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1181,7 +1181,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1220,7 +1220,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1259,7 +1259,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1298,7 +1298,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1337,7 +1337,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1376,7 +1376,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1415,7 +1415,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1454,7 +1454,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1493,7 +1493,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1532,7 +1532,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -1571,7 +1571,7 @@
"heroid": 44004, "heroid": 44004,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -2348,11 +2348,161 @@
"goto": 0 "goto": 0
}, },
{ {
"id": 10254, "id": 110250,
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110251,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110252,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110253,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110254,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110255,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110256,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110257,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110258,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110259,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110260,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -2743,7 +2893,7 @@
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -2882,11 +3032,71 @@
"goto": 0 "goto": 0
}, },
{ {
"id": 10364, "id": 110364,
"heroid": 25001, "heroid": 25001,
"Levelid": 0, "Levelid": 0,
"datas": [ "datas": [
"CommandScene", "MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110365,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110366,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110367,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线",
"905"
],
"event": [
10,
166
],
"goto": 0
},
{
"id": 110368,
"heroid": 25001,
"Levelid": 0,
"datas": [
"MainLineScene",
"功能入口_主线", "功能入口_主线",
"905" "905"
], ],
@ -3107,6 +3317,66 @@
], ],
"goto": 0 "goto": 0
}, },
{
"id": 110359,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-工会申请",
"901"
],
"event": [
2,
10600
],
"goto": 0
},
{
"id": 110360,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-工会申请",
"901"
],
"event": [
10,
908
],
"goto": 0
},
{
"id": 110361,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GuildScene",
"管理工会",
"907"
],
"event": [
10,
10061
],
"goto": 0
},
{
"id": 110370,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GuildScene",
"管理工会",
"907"
],
"event": [
2,
10601
],
"goto": 0
},
{ {
"id": 10370, "id": 10370,
"heroid": 25001, "heroid": 25001,

View File

@ -76,5 +76,16 @@
5000, 5000,
5000 5000
] ]
},
{
"taskid": 20100,
"tasktype": 1,
"pointnum": 1,
"point": [
15
],
"pointweight": [
10000
]
} }
] ]

View File

@ -1,6 +1,7 @@
[ [
{ {
"id": 1, "id": 1,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置1" "位置1"
@ -10,6 +11,7 @@
}, },
{ {
"id": 2, "id": 2,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置2" "位置2"
@ -19,6 +21,7 @@
}, },
{ {
"id": 3, "id": 3,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置3" "位置3"
@ -28,6 +31,7 @@
}, },
{ {
"id": 4, "id": 4,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置4" "位置4"
@ -37,6 +41,7 @@
}, },
{ {
"id": 5, "id": 5,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置5" "位置5"
@ -46,6 +51,7 @@
}, },
{ {
"id": 6, "id": 6,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置6" "位置6"
@ -55,6 +61,7 @@
}, },
{ {
"id": 7, "id": 7,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置7" "位置7"
@ -64,6 +71,7 @@
}, },
{ {
"id": 8, "id": 8,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置8" "位置8"
@ -73,6 +81,7 @@
}, },
{ {
"id": 9, "id": 9,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置9" "位置9"
@ -82,6 +91,7 @@
}, },
{ {
"id": 10, "id": 10,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置10" "位置10"
@ -91,6 +101,7 @@
}, },
{ {
"id": 11, "id": 11,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置11" "位置11"
@ -100,6 +111,7 @@
}, },
{ {
"id": 12, "id": 12,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置12" "位置12"
@ -109,6 +121,7 @@
}, },
{ {
"id": 13, "id": 13,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置13" "位置13"
@ -118,11 +131,22 @@
}, },
{ {
"id": 14, "id": 14,
"type": 1,
"name": [ "name": [
"GameMain", "GameMain",
"位置14" "位置14"
], ],
"drown": 14010000, "drown": 14010000,
"pointweight": 1000 "pointweight": 1000
},
{
"id": 15,
"type": 2,
"name": [
"MainLineScene",
"100101111"
],
"drown": 0,
"pointweight": 0
} }
] ]

View File

@ -36505,7 +36505,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
5300 4000
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
@ -36530,7 +36530,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
5400 4100
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
@ -36555,7 +36555,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
5500 4200
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
@ -36580,7 +36580,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
5600 4300
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
@ -36605,7 +36605,7 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
5700 4400
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [

View File

@ -12145,7 +12145,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 3, "SkillFlag": 3,
"EffectFlag": 10, "EffectFlag": 10,
"Priority": 2, "Priority": 3,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004211", "key": "skill_skill_atk_Name_124004211",
"text": "复活节彩蛋" "text": "复活节彩蛋"
@ -12181,7 +12181,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 3, "SkillFlag": 3,
"EffectFlag": 10, "EffectFlag": 10,
"Priority": 2, "Priority": 3,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004211", "key": "skill_skill_atk_Name_124004211",
"text": "复活节彩蛋" "text": "复活节彩蛋"
@ -12217,7 +12217,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 3, "SkillFlag": 3,
"EffectFlag": 10, "EffectFlag": 10,
"Priority": 2, "Priority": 3,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004211", "key": "skill_skill_atk_Name_124004211",
"text": "复活节彩蛋" "text": "复活节彩蛋"
@ -12253,7 +12253,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004311", "key": "skill_skill_atk_Name_124004311",
"text": "致命回旋" "text": "致命回旋"
@ -12289,7 +12289,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004311", "key": "skill_skill_atk_Name_124004311",
"text": "致命回旋" "text": "致命回旋"
@ -12325,7 +12325,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004311", "key": "skill_skill_atk_Name_124004311",
"text": "致命回旋" "text": "致命回旋"
@ -12361,7 +12361,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004311", "key": "skill_skill_atk_Name_124004311",
"text": "致命回旋" "text": "致命回旋"
@ -12397,7 +12397,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004311", "key": "skill_skill_atk_Name_124004311",
"text": "致命回旋" "text": "致命回旋"
@ -12433,7 +12433,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004312", "key": "skill_skill_atk_Name_124004312",
"text": "连续击杀!" "text": "连续击杀!"
@ -12466,7 +12466,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004312", "key": "skill_skill_atk_Name_124004312",
"text": "连续击杀!" "text": "连续击杀!"
@ -12499,7 +12499,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004312", "key": "skill_skill_atk_Name_124004312",
"text": "连续击杀!" "text": "连续击杀!"
@ -12532,7 +12532,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004312", "key": "skill_skill_atk_Name_124004312",
"text": "连续击杀!" "text": "连续击杀!"
@ -12565,7 +12565,7 @@
"UnavailablePlayTypes": [], "UnavailablePlayTypes": [],
"SkillFlag": 4, "SkillFlag": 4,
"EffectFlag": 5, "EffectFlag": 5,
"Priority": 3, "Priority": 2,
"Name": { "Name": {
"key": "skill_skill_atk_Name_124004312", "key": "skill_skill_atk_Name_124004312",
"text": "连续击杀!" "text": "连续击杀!"
@ -30333,7 +30333,7 @@
], ],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_144001211_1", "key": "skill_skill_atk_Desc_144001211_1",
"text": "美肚鲨对敌方1个目标造成攻击力530%的伤害并为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。本次伤害若触发暴击则额外为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。" "text": "美肚鲨对敌方1个目标造成攻击力400%的伤害并为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。本次伤害若触发暴击则额外为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。"
}, },
"buffid": [ "buffid": [
390001404 390001404
@ -30371,7 +30371,7 @@
], ],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_144001211_2", "key": "skill_skill_atk_Desc_144001211_2",
"text": "伤害提升至540%。" "text": "伤害提升至410%。"
}, },
"buffid": [ "buffid": [
390001404 390001404
@ -30409,7 +30409,7 @@
], ],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_144001211_3", "key": "skill_skill_atk_Desc_144001211_3",
"text": "伤害提升至550%。" "text": "伤害提升至420%。"
}, },
"buffid": [ "buffid": [
390001404 390001404
@ -30447,7 +30447,7 @@
], ],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_144001211_4", "key": "skill_skill_atk_Desc_144001211_4",
"text": "伤害提升至560%。" "text": "伤害提升至430%。"
}, },
"buffid": [ "buffid": [
390001404 390001404
@ -30485,7 +30485,7 @@
], ],
"Desc": { "Desc": {
"key": "skill_skill_atk_Desc_144001211_5", "key": "skill_skill_atk_Desc_144001211_5",
"text": "伤害提升至570%。" "text": "伤害提升至440%。"
}, },
"buffid": [ "buffid": [
390001404 390001404

View File

@ -3419,7 +3419,7 @@
"RelyCheckArgu": [], "RelyCheckArgu": [],
"CoexistCheckArgu": [], "CoexistCheckArgu": [],
"Effect": [ "Effect": [
3 0
], ],
"AddEffect": false, "AddEffect": false,
"RemoveType": false, "RemoveType": false,
@ -3890,8 +3890,9 @@
"RelyCheckArgu": [], "RelyCheckArgu": [],
"CoexistCheckArgu": [], "CoexistCheckArgu": [],
"Effect": [ "Effect": [
0, 1,
6 6,
11
], ],
"AddEffect": false, "AddEffect": false,
"RemoveType": true, "RemoveType": true,
@ -4591,7 +4592,8 @@
}, },
"BuffType": 40, "BuffType": 40,
"EffectArgu": [ "EffectArgu": [
5 5,
390001115
], ],
"BufParNum": 1, "BufParNum": 1,
"RelyCheckArgu": [], "RelyCheckArgu": [],

View File

@ -248,6 +248,11 @@
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 1 "n": 1
},
{
"a": "attr",
"t": "diamond",
"n": 1
} }
] ]
}, },
@ -1184,7 +1189,18 @@
{ {
"id": "EquipIntensifyView", "id": "EquipIntensifyView",
"subId": "", "subId": "",
"currencyField": [] "currencyField": [
{
"a": "attr",
"t": "gold",
"n": 0
},
{
"a": "attr",
"t": "diamond",
"n": 1
}
]
}, },
{ {
"id": "EquipConfirmTip", "id": "EquipConfirmTip",
@ -2976,5 +2992,21 @@
"n": 1 "n": 1
} }
] ]
},
{
"id": "heroequip",
"subId": "",
"currencyField": [
{
"a": "attr",
"t": "gold",
"n": 0
},
{
"a": "attr",
"t": "diamond",
"n": 1
}
]
} }
] ]

File diff suppressed because it is too large Load Diff

View File

@ -115,7 +115,7 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackR
target.Beblackids = append(target.Beblackids, session.GetUserId()) target.Beblackids = append(target.Beblackids, session.GetUserId())
//更新 //更新
err = this.module.modelFriend.Change(target.Uid, map[string]interface{}{ err = this.module.modelFriend.Change(target.Uid, map[string]interface{}{
"beblackids": self.Beblackids, "beblackids": target.Beblackids,
}) })
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -130,6 +130,10 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackR
UserId: session.GetUserId(), UserId: session.GetUserId(),
} }
session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, Resp) session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, Resp)
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.SendMsgToUser(string(this.module.GetType()), "beblackchanage", &pb.FriendBeblackChanagePush{
Beblackids: target.Beblackids,
}, target.Uid)
})
return return
} }

View File

@ -79,5 +79,10 @@ func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackR
} }
session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, resp) session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, resp)
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.SendMsgToUser(string(this.module.GetType()), "beblackchanage", &pb.FriendBeblackChanagePush{
Beblackids: target.Beblackids,
}, target.Uid)
})
return return
} }

View File

@ -9,6 +9,7 @@ import (
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
mgooptions "go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/x/bsonx" "go.mongodb.org/mongo-driver/x/bsonx"
) )
@ -23,6 +24,7 @@ func (this *ModelFriend) Init(service core.IService, module core.IModule, comp c
this.moduole = module.(*Friend) this.moduole = module.(*Friend)
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
Options: mgooptions.Index().SetUnique(true),
}) })
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "assistHeroId", Value: bsonx.Int32(1)}}, Keys: bsonx.Doc{{Key: "assistHeroId", Value: bsonx.Int32(1)}},
@ -52,6 +54,7 @@ func (this *ModelFriend) GetFriend(uid string) (info *pb.DBFriend, err error) {
BlackIds: make([]string, 0), BlackIds: make([]string, 0),
GetZandIds: make([]string, 0), GetZandIds: make([]string, 0),
Record: make([]*pb.AssistRecord, 0), Record: make([]*pb.AssistRecord, 0),
Beblackids: make([]string, 0),
} }
err = this.Add(uid, info) err = this.Add(uid, info)
} }
@ -79,6 +82,7 @@ func (this *ModelFriend) GetFriends(uids []string) (friends []*pb.DBFriend, err
BlackIds: make([]string, 0), BlackIds: make([]string, 0),
GetZandIds: make([]string, 0), GetZandIds: make([]string, 0),
Record: make([]*pb.AssistRecord, 0), Record: make([]*pb.AssistRecord, 0),
Beblackids: make([]string, 0),
} }
err = this.Add(v, info) err = this.Add(v, info)
friends = append(friends, info) friends = append(friends, info)

View File

@ -97,10 +97,22 @@ func (this *Pvp) CreateRoom(sessions []comm.IUserSession, rulesStr string) (room
battle *BattleItem battle *BattleItem
red, blue *pb.DBUser red, blue *pb.DBUser
) )
if err = json.Unmarshal([]byte(rulesStr), rules); err != nil { if err = json.Unmarshal([]byte(rulesStr), rules); err != nil {
this.Error("解析规则json", log.Field{Key: "err", Value: err.Error()}) this.Error("解析规则json", log.Field{Key: "err", Value: err.Error()})
return return
} }
//发起者 red
red, err = this.ModuleUser.GetUser(sessions[0].GetUserId())
if err != nil {
this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
return
}
blue, err = this.ModuleUser.GetUser(sessions[1].GetUserId())
if err != nil {
this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[1].GetUserId()})
return
}
roomid = primitive.NewObjectID().Hex() roomid = primitive.NewObjectID().Hex()
battle = &BattleItem{ battle = &BattleItem{
Id: roomid, Id: roomid,