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

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

Browse Source
This commit is contained in:
wh_zcy 2023-04-04 17:53:36 +08:00
commit 83093f2dc0
14 changed files with 329 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/json/game_battleready.json
View File

@ -298,5 +298,35 @@
"AssistTeam": 0, "AssistTeam": 0,
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
},
{
"id": 120,
"PlayType": "test",
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"DefaultHero": 0,
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 121,
"PlayType": "test",
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_naturetitan_01"
],
"DefaultHero": 0,
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
} }
] ]

261
bin/json/game_opencond.json
View File

@ -20,7 +20,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "backpack", "id": "backpack",
@ -43,7 +44,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "shop", "id": "shop",
@ -66,7 +68,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 1, "uiid": 1,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "friend", "id": "friend",
@ -89,7 +92,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "mall", "id": "mall",
@ -112,7 +116,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "rdtask", "id": "rdtask",
@ -135,7 +140,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "currency", "id": "currency",
@ -158,7 +164,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 1 "activateType": 1,
"notify": []
}, },
{ {
"id": "alliance", "id": "alliance",
@ -181,7 +188,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "task", "id": "task",
@ -204,7 +212,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "trials", "id": "trials",
@ -227,7 +236,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "moon", "id": "moon",
@ -250,7 +260,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "story", "id": "story",
@ -273,7 +284,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "kungfu", "id": "kungfu",
@ -296,7 +308,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "event", "id": "event",
@ -319,7 +332,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "mistyIsland", "id": "mistyIsland",
@ -342,7 +356,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "vikingexpedition", "id": "vikingexpedition",
@ -365,7 +380,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "vikingexpedition2", "id": "vikingexpedition2",
@ -388,7 +404,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "vikingexpedition3", "id": "vikingexpedition3",
@ -411,7 +428,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "hjeart demon tower", "id": "hjeart demon tower",
@ -434,7 +452,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "catchsheep", "id": "catchsheep",
@ -457,7 +476,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "darkcuisine", "id": "darkcuisine",
@ -480,7 +500,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "underground Arena", "id": "underground Arena",
@ -503,7 +524,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "crazycompetition", "id": "crazycompetition",
@ -526,7 +548,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "fiveheroeschallenge", "id": "fiveheroeschallenge",
@ -549,7 +572,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "library", "id": "library",
@ -572,7 +596,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "bonfiredance", "id": "bonfiredance",
@ -595,7 +620,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "caravan", "id": "caravan",
@ -618,7 +644,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "gourmetrestaurant", "id": "gourmetrestaurant",
@ -641,7 +668,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "goberblacksmithshop", "id": "goberblacksmithshop",
@ -664,7 +692,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "hunting", "id": "hunting",
@ -687,7 +716,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "channel_lock_icon", "id": "channel_lock_icon",
@ -710,7 +740,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "channel_lock_world", "id": "channel_lock_world",
@ -733,7 +764,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "channel_lock_guild", "id": "channel_lock_guild",
@ -756,7 +788,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "channel_lock_private", "id": "channel_lock_private",
@ -779,7 +812,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "channel_lock_public", "id": "channel_lock_public",
@ -802,7 +836,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "channel_lock_system", "id": "channel_lock_system",
@ -825,7 +860,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "guild", "id": "guild",
@ -848,7 +884,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "arena", "id": "arena",
@ -871,7 +908,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "sign", "id": "sign",
@ -894,7 +932,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "reddot", "id": "reddot",
@ -917,7 +956,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Monthly_card", "id": "Monthly_card",
@ -940,7 +980,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Gift_Bag", "id": "Gift_Bag",
@ -963,7 +1004,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "role", "id": "role",
@ -986,7 +1028,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Mystery", "id": "Mystery",
@ -1009,7 +1052,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Income", "id": "Income",
@ -1032,7 +1076,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "fuse", "id": "fuse",
@ -1055,7 +1100,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "activitytask", "id": "activitytask",
@ -1078,7 +1124,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Fight_MidwayExit", "id": "Fight_MidwayExit",
@ -1101,7 +1148,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Fight_Speed", "id": "Fight_Speed",
@ -1124,7 +1172,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Fight_Auto", "id": "Fight_Auto",
@ -1147,7 +1196,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "equip_compose", "id": "equip_compose",
@ -1170,7 +1220,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "equip_compose_middle", "id": "equip_compose_middle",
@ -1193,7 +1244,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "equip_compose_high", "id": "equip_compose_high",
@ -1216,7 +1268,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "mainline_elite", "id": "mainline_elite",
@ -1239,7 +1292,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "mail", "id": "mail",
@ -1262,7 +1316,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "teacher", "id": "teacher",
@ -1285,7 +1340,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "world_task", "id": "world_task",
@ -1308,7 +1364,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "battle_pass", "id": "battle_pass",
@ -1331,7 +1388,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "enchant_boss", "id": "enchant_boss",
@ -1354,7 +1412,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "vikingexpedition_entrance", "id": "vikingexpedition_entrance",
@ -1377,7 +1436,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "GuildBoss", "id": "GuildBoss",
@ -1400,7 +1460,8 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "slidescreen_up", "id": "slidescreen_up",
@ -1423,7 +1484,8 @@
"text": "请先完成主线剧情" "text": "请先完成主线剧情"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "slidescreen_left", "id": "slidescreen_left",
@ -1446,7 +1508,8 @@
"text": "请先完成主线剧情" "text": "请先完成主线剧情"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "slidescreen_right", "id": "slidescreen_right",
@ -1469,7 +1532,8 @@
"text": "请先完成主线剧情" "text": "请先完成主线剧情"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": "Master_challenges_the_tower", "id": "Master_challenges_the_tower",
@ -1492,15 +1556,21 @@
"text": "功能暂未开启" "text": "功能暂未开启"
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 0,
"notify": []
}, },
{ {
"id": " ", "id": "practice_ pillar1",
"name": { "name": {
"key": "", "key": "",
"text": "" "text": ""
}, },
"main": [], "main": [
{
"key": 1,
"param": 1
}
],
"optional": "", "optional": "",
"wkqbx": 0, "wkqbx": 0,
"kqbx": 0, "kqbx": 0,
@ -1510,6 +1580,61 @@
"text": "" "text": ""
}, },
"uiid": 0, "uiid": 0,
"activateType": 0 "activateType": 1,
"notify": [
"practice"
]
},
{
"id": "practice_ pillar2",
"name": {
"key": "",
"text": ""
},
"main": [
{
"key": 3,
"param": 20010
}
],
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
},
"uiid": 0,
"activateType": 1,
"notify": [
"practice"
]
},
{
"id": "practice_ pillar3",
"name": {
"key": "",
"text": ""
},
"main": [
{
"key": 3,
"param": 20020
}
],
"optional": "",
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
},
"uiid": 0,
"activateType": 1,
"notify": [
"practice"
]
} }
] ]

36
bin/json/game_signextra.json
View File

@ -1,6 +1,10 @@
[ [
{ {
"id": 1, "id": 1,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 7, "day": 7,
"groups": 1, "groups": 1,
"extra": [ "extra": [
@ -13,6 +17,10 @@
}, },
{ {
"id": 2, "id": 2,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 14, "day": 14,
"groups": 1, "groups": 1,
"extra": [ "extra": [
@ -25,6 +33,10 @@
}, },
{ {
"id": 3, "id": 3,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 21, "day": 21,
"groups": 1, "groups": 1,
"extra": [ "extra": [
@ -37,6 +49,10 @@
}, },
{ {
"id": 4, "id": 4,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 7, "day": 7,
"groups": 2, "groups": 2,
"extra": [ "extra": [
@ -49,6 +65,10 @@
}, },
{ {
"id": 5, "id": 5,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 14, "day": 14,
"groups": 2, "groups": 2,
"extra": [ "extra": [
@ -61,6 +81,10 @@
}, },
{ {
"id": 6, "id": 6,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 21, "day": 21,
"groups": 2, "groups": 2,
"extra": [ "extra": [
@ -73,6 +97,10 @@
}, },
{ {
"id": 7, "id": 7,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 7, "day": 7,
"groups": 3, "groups": 3,
"extra": [ "extra": [
@ -85,6 +113,10 @@
}, },
{ {
"id": 8, "id": 8,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 14, "day": 14,
"groups": 3, "groups": 3,
"extra": [ "extra": [
@ -97,6 +129,10 @@
}, },
{ {
"id": 9, "id": 9,
"txt": {
"key": "sign_reward",
"text": "累计签到{0}天领取"
},
"day": 21, "day": 21,
"groups": 3, "groups": 3,
"extra": [ "extra": [

7
bin/json/game_skillafteratk.json
View File

@ -12030,7 +12030,8 @@
"Type": 31, "Type": 31,
"Argu": [ "Argu": [
0, 0,
1 2,
8
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -21918,7 +21919,7 @@
{ {
"Id": 255007316, "Id": 255007316,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 15,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -21944,7 +21945,7 @@
{ {
"Id": 255007317, "Id": 255007317,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 15,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,

1
bin/json/game_skillatk.json
View File

@ -11992,7 +11992,6 @@
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
255006311, 255006311,
255006312,
255006313, 255006313,
255006314 255006314
] ]

2
bin/json/game_skillbuff.json
View File

@ -1328,7 +1328,7 @@
"BufParNum": 1, "BufParNum": 1,
"RelyCheckArgu": [], "RelyCheckArgu": [],
"CoexistCheckArgu": [], "CoexistCheckArgu": [],
"Effect": 0, "Effect": 3,
"AddEffect": false, "AddEffect": false,
"RemoveType": false, "RemoveType": false,
"OverlayTimes": 50, "OverlayTimes": 50,

22
bin/json/game_skillpassive.json
View File

@ -582,32 +582,32 @@
"Id": 435003211, "Id": 435003211,
"When": 5, "When": 5,
"FromCheck": "", "FromCheck": "",
"TargetCheck": "Target=3,HasBuff=0", "TargetCheck": "Target=3",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "Effect=0",
"AddCon": [], "AddCon": [],
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 99, "MaxEmitTimes": 99,
"Callback": [ "Callback": [
235003211 235003215
] ]
}, },
{ {
"Id": 435003212, "Id": 435003212,
"When": 5, "When": 5,
"FromCheck": "", "FromCheck": "",
"TargetCheck": "Target=3,HasBuff=1", "TargetCheck": "Target=3",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "Effect=1",
"AddCon": [], "AddCon": [],
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 99, "MaxEmitTimes": 99,
"Callback": [ "Callback": [
235003212 235003215
] ]
}, },
{ {
@ -922,7 +922,7 @@
"Id": 413004111, "Id": 413004111,
"When": 16, "When": 16,
"FromCheck": "Target=3,Hpproless=500", "FromCheck": "Target=3,Hpproless=500",
"TargetCheck": "424006211", "TargetCheck": "",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "", "BuffCheck": "",
@ -1123,7 +1123,9 @@
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 1, "MaxEmitTimes": 1,
"Callback": [] "Callback": [
215002212
]
}, },
{ {
"Id": 415002212, "Id": 415002212,
@ -1137,7 +1139,9 @@
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 99, "MaxEmitTimes": 99,
"Callback": [] "Callback": [
235003215
]
}, },
{ {
"Id": 415002311, "Id": 415002311,

18
bin/json/game_worldall.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"id": 20010, "id": 210,
"name": { "name": {
"key": "mainline_name_10001", "key": "mainline_name_10001",
"text": "章节1全部任务" "text": "章节1全部任务"
@ -24,7 +24,7 @@
] ]
}, },
{ {
"id": 30010, "id": 310,
"name": { "name": {
"key": "Side_Quest", "key": "Side_Quest",
"text": "武馆支线1" "text": "武馆支线1"
@ -48,7 +48,7 @@
] ]
}, },
{ {
"id": 30020, "id": 320,
"name": { "name": {
"key": "Side_Quest", "key": "Side_Quest",
"text": "铁匠铺支线1" "text": "铁匠铺支线1"
@ -72,7 +72,7 @@
] ]
}, },
{ {
"id": 30030, "id": 330,
"name": { "name": {
"key": "Side_Quest", "key": "Side_Quest",
"text": "铁匠铺支线2" "text": "铁匠铺支线2"
@ -96,7 +96,7 @@
] ]
}, },
{ {
"id": 30040, "id": 340,
"name": { "name": {
"key": "Side_Quest", "key": "Side_Quest",
"text": "武馆支线2" "text": "武馆支线2"
@ -120,7 +120,7 @@
] ]
}, },
{ {
"id": 30050, "id": 350,
"name": { "name": {
"key": "Side_Quest", "key": "Side_Quest",
"text": "武馆支线3" "text": "武馆支线3"
@ -144,7 +144,7 @@
] ]
}, },
{ {
"id": 30060, "id": 360,
"name": { "name": {
"key": "Side_Quest", "key": "Side_Quest",
"text": "铁匠铺支线3" "text": "铁匠铺支线3"
@ -168,7 +168,7 @@
] ]
}, },
{ {
"id": 10010, "id": 110,
"name": { "name": {
"key": "story_80", "key": "story_80",
"text": "日常测试任务" "text": "日常测试任务"
@ -192,7 +192,7 @@
] ]
}, },
{ {
"id": 40010, "id": 410,
"name": { "name": {
"key": "story_80", "key": "story_80",
"text": "周常测试任务" "text": "周常测试任务"

5
comm/imodule.go
View File

@ -14,6 +14,10 @@ type (
ITaskComplete interface { ITaskComplete interface {
TaskComplete(session IUserSession, taskid int32) TaskComplete(session IUserSession, taskid int32)
} }
//功能开启通知
IOpenCmdNotice interface {
OpenCmdNotice(session IUserSession, key string)
}
) )
/* /*
@ -439,6 +443,7 @@ type (
//练功房 //练功房
IPractice interface { IPractice interface {
ITaskComplete ITaskComplete
IOpenCmdNotice
//添加武馆资源 //添加武馆资源
AddItems(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) AddItems(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode)
//pvp切磋结果通知 //pvp切磋结果通知

5
modules/practice/module.go
View File

@ -55,6 +55,7 @@ func (this *Practice) Init(service core.IService, module core.IModule, options c
this.service = service.(base.IRPCXService) this.service = service.(base.IRPCXService)
return return
} }
func (this *Practice) Start() (err error) { func (this *Practice) Start() (err error) {
err = this.ModuleBase.Start() err = this.ModuleBase.Start()
var module core.IModule var module core.IModule
@ -189,6 +190,10 @@ func (this *Practice) TaskComplete(session comm.IUserSession, taskid int32) {
} }
} }
func (this *Practice) OpenCmdNotice(session comm.IUserSession, key string) {
}
func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) { func (this *Practice) ChallengeResults(bid, red, bule string, winSide int32) {
this.Debug("ChallengeResults", this.Debug("ChallengeResults",
log.Field{Key: "bid", Value: bid}, log.Field{Key: "bid", Value: bid},

24
modules/sys/api_activate.go
View File

@ -2,6 +2,7 @@ package sys
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/core"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
@ -15,14 +16,8 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.SysFuncActivate
rsp := &pb.SysFuncActivateResp{} rsp := &pb.SysFuncActivateResp{}
iuser := this.module.ModuleUser opencfg := this.module.configure.getOpencondCfgByCid(req.Cid)
user := iuser.GetUser(session.GetUserId()) if opencfg != nil {
if user == nil {
code = pb.ErrorCode_UserSessionNobeing
return
}
if opencfg := this.module.configure.getOpencondCfgByCid(req.Cid); opencfg != nil {
if id := this.module.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 if id := this.module.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足
code = pb.ErrorCode_OpenCondErr code = pb.ErrorCode_OpenCondErr
return return
@ -43,5 +38,18 @@ func (this *apiComp) Activate(session comm.IUserSession, req *pb.SysFuncActivate
if err := session.SendMsg(string(this.module.GetType()), SysSubTypeFunc, rsp); err != nil { if err := session.SendMsg(string(this.module.GetType()), SysSubTypeFunc, rsp); err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
} }
//手动激活通知模块
for _, m := range opencfg.Notify {
i, err := this.service.GetModule(core.M_Modules(m))
if err != nil {
this.module.Errorln(err)
continue
}
if ic, ok := i.(comm.IOpenCmdNotice); ok {
ic.OpenCmdNotice(session, req.Cid)
}
}
return return
} }

6
modules/sys/api_getlist.go
View File

@ -15,12 +15,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi
rsp := &pb.SysFuncGetListResp{} rsp := &pb.SysFuncGetListResp{}
rsp.Cond = make(map[string]int32, 0) rsp.Cond = make(map[string]int32, 0)
iuser := this.module.ModuleUser
user := iuser.GetUser(session.GetUserId())
if user == nil {
code = pb.ErrorCode_UserSessionNobeing
return
}
if len(req.Keys) == 0 { if len(req.Keys) == 0 {
confList := this.module.configure.getOpencondList() confList := this.module.configure.getOpencondList()

2
sys/configure/structs/Game.SignExtraData.go
View File

@ -12,6 +12,7 @@ import "errors"
type GameSignExtraData struct { type GameSignExtraData struct {
Id int32 Id int32
Txt string
Day int32 Day int32
Groups int32 Groups int32
Extra []*Gameatn Extra []*Gameatn
@ -25,6 +26,7 @@ func (*GameSignExtraData) GetTypeId() int32 {
func (_v *GameSignExtraData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameSignExtraData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["groups"].(float64); !_ok_ { err = errors.New("groups error"); return }; _v.Groups = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["groups"].(float64); !_ok_ { err = errors.New("groups error"); return }; _v.Groups = int32(_tempNum_) }
{ {

15
sys/configure/structs/game.opencondData.go
View File

@ -21,6 +21,7 @@ type GameOpencondData struct {
Prompt string Prompt string
Uiid int32 Uiid int32
ActivateType int32 ActivateType int32
Notify []string
} }
const TypeId_GameOpencondData = -1990600014 const TypeId_GameOpencondData = -1990600014
@ -53,6 +54,20 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error)
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uiid"].(float64); !_ok_ { err = errors.New("uiid error"); return }; _v.Uiid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uiid"].(float64); !_ok_ { err = errors.New("uiid error"); return }; _v.Uiid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["activateType"].(float64); !_ok_ { err = errors.New("activateType error"); return }; _v.ActivateType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["activateType"].(float64); !_ok_ { err = errors.New("activateType error"); return }; _v.ActivateType = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["notify"].([]interface{}); !_ok_ { err = errors.New("notify error"); return }
_v.Notify = make([]string, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ string
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.Notify = append(_v.Notify, _list_v_)
}
}
return return
} }