This commit is contained in:
meixiongfeng 2023-11-17 16:11:32 +08:00
parent 0da094b77c
commit e2f4c3cc04
40 changed files with 1752 additions and 598 deletions

View File

@ -3,7 +3,7 @@
"key": 0,
"type": 0,
"storyText": {
"key": "(乌龟大师):我在预兆中见过你的身影。",
"key": "drawcard_asked_storyText_1",
"text": "(乌龟大师):我在预兆中见过你的身影。"
},
"optionText1": {
@ -19,15 +19,15 @@
"key": 1,
"type": 1,
"storyText": {
"key": "(乌龟大师):孩子,你是追逐名誉至此的勇士。",
"text": "(乌龟大师):孩子,你是追逐名誉至此的勇士。"
"key": "drawcard_asked_storyText_2",
"text": "(乌龟大师):孩子,你是追逐命运至此的勇士,还是身沐月光的传承之人?"
},
"optionText1": {
"key": "1.是主角没错",
"key": "drawcard_asked_optionText1_2",
"text": "1.是主角没错"
},
"optionText2": {
"key": "2.只是普通肥宅",
"key": "drawcard_asked_optionText3",
"text": "2.只是普通肥宅"
}
},
@ -35,8 +35,8 @@
"key": 2,
"type": 0,
"storyText": {
"key": "(乌龟大师):我在预兆中见过你的身影。",
"text": "(乌龟大师):我在预兆中见过你的身影。"
"key": "drawcard_asked_storyText_3",
"text": "(乌龟大师):他决意召你前来"
},
"optionText1": {
"key": "",
@ -49,27 +49,91 @@
},
{
"key": 3,
"type": 1,
"type": 0,
"storyText": {
"key": "(乌龟大师):孩子,你是追逐名誉至此的勇士。",
"text": "(乌龟大师):孩子,你是追逐名誉至此的勇士。"
"key": "drawcard_asked_storyText_4",
"text": "(乌龟大师):却无法束缚你的言行。"
},
"optionText1": {
"key": "1.是主角没错",
"text": "1.是主角没错"
"key": "",
"text": ""
},
"optionText2": {
"key": "2.只是普通肥宅",
"text": "2.只是普通肥宅"
"key": "",
"text": ""
}
},
{
"key": 4,
"type": 1,
"storyText": {
"key": "drawcard_asked_storyText_5",
"text": "(乌龟大师):你如今身在阴影下,还是藏在月光中?"
},
"optionText1": {
"key": "drawcard_asked_optionText1_5",
"text": "1.在你眼前啊"
},
"optionText2": {
"key": "drawcard_asked_optionText6",
"text": "2.在家打游戏呢"
}
},
{
"key": 5,
"type": 0,
"storyText": {
"key": "有趣",
"key": "drawcard_asked_storyText_6",
"text": "(乌龟大师):黑暗终将吞没一切"
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
},
{
"key": 6,
"type": 0,
"storyText": {
"key": "drawcard_asked_storyText_7",
"text": "(乌龟大师):只留一线生机……"
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
},
{
"key": 7,
"type": 1,
"storyText": {
"key": "drawcard_asked_storyText_8",
"text": "(乌龟大师):你来见证终局,还是来博取这一线生机?"
},
"optionText1": {
"key": "drawcard_asked_optionText1_8",
"text": "1.只能二选一吗?"
},
"optionText2": {
"key": "drawcard_asked_optionText9",
"text": "2.我来过新手教程"
}
},
{
"key": 8,
"type": 0,
"storyText": {
"key": "drawcard_asked_storyText_9",
"text": "(乌龟大师):有趣!"
},
"optionText1": {
"key": "",
"text": ""

View File

@ -957,7 +957,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
@ -1449,7 +1449,7 @@
},
{
"id": 201,
"PlayType": 0,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
@ -1458,7 +1458,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
@ -1486,7 +1486,7 @@
},
{
"id": 202,
"PlayType": 0,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_04",
"battleScenes": [
@ -1495,7 +1495,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""
@ -1523,7 +1523,7 @@
},
{
"id": 203,
"PlayType": 0,
"PlayType": 1,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"battleScenes": [
@ -2045,7 +2045,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"HideFightUI": 1,
"RuleTips": {
"key": "",
"text": ""

View File

@ -2567,38 +2567,6 @@
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 322,
"GroupId": 100009,
"buffID": 770076113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 323,
"GroupId": 100009,
"buffID": 770077113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 324,
"GroupId": 100009,
"buffID": 770070113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 325,
"GroupId": 100009,
"buffID": 770071113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 326,
"GroupId": 100010,
@ -4231,38 +4199,6 @@
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 530,
"GroupId": 100023,
"buffID": 770076113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 531,
"GroupId": 100023,
"buffID": 770077113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 532,
"GroupId": 100023,
"buffID": 770070113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 533,
"GroupId": 100023,
"buffID": 770071113,
"GroupNum": 3,
"BuffWt": 50,
"TypeWt": 75
},
{
"Id": 534,
"GroupId": 100024,

View File

@ -11,7 +11,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -39,7 +40,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -67,7 +69,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -95,7 +98,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -123,7 +127,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -151,7 +156,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -179,7 +185,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -207,7 +214,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -235,7 +243,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -263,7 +272,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -291,7 +301,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -319,7 +330,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -347,7 +359,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -375,7 +388,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -403,7 +417,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,
@ -431,7 +446,8 @@
20,
30,
40,
50
50,
60
],
"HpBumpWeight": 100,
"HpBumpCD": 35,

View File

@ -24146,8 +24146,8 @@
"Npc_event_type": 0,
"NPC": 10014,
"tipstxt": {
"key": "",
"text": ""
"key": "提示话语",
"text": "tipstxt_01"
},
"value": 1,
"filter": [
@ -24168,7 +24168,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_723",
"text": "和邦尼兔聊聊"
"text": "和梅林聊聊"
},
"type": 20001,
"valid": 1,
@ -24180,8 +24180,8 @@
"Npc_event_type": 0,
"NPC": 10015,
"tipstxt": {
"key": "",
"text": ""
"key": "提示话语",
"text": "tipstxt_02"
},
"value": 1,
"filter": [
@ -24260,7 +24260,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_727",
"text": "性别选择成功"
"text": "见证传承者诞生"
},
"type": 72,
"valid": 0,
@ -24366,7 +24366,9 @@
"text": ""
},
"value": 1,
"filter": [],
"filter": [
10021
],
"filter2": []
},
{
@ -24377,7 +24379,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_731",
"text": "找乌龟创招募"
"text": "迎接新的伙伴吧"
},
"type": 14,
"valid": 0,
@ -24404,7 +24406,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_732",
"text": "吃面战斗2场+起名"
"text": "平息这场纷争"
},
"type": 70,
"valid": 0,

View File

@ -1,7 +1,7 @@
[
{
"id": 100001,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 1,
"endPos": 2,
@ -9,7 +9,7 @@
},
{
"id": 100002,
"track": "Track",
"track": 1,
"type": 1,
"startPos": 2,
"endPos": 3,
@ -17,7 +17,7 @@
},
{
"id": 100003,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 3,
"endPos": 4,
@ -25,7 +25,7 @@
},
{
"id": 100004,
"track": "Track",
"track": 1,
"type": 1,
"startPos": 4,
"endPos": 5,
@ -33,7 +33,7 @@
},
{
"id": 100005,
"track": "Track",
"track": 1,
"type": 1,
"startPos": 8,
"endPos": 9,
@ -41,7 +41,7 @@
},
{
"id": 100006,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 8,
"endPos": 9,
@ -49,7 +49,7 @@
},
{
"id": 100007,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 10,
"endPos": 11,
@ -57,7 +57,7 @@
},
{
"id": 100008,
"track": "Track",
"track": 1,
"type": 1,
"startPos": 10,
"endPos": 11,
@ -65,7 +65,7 @@
},
{
"id": 100009,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 14,
"endPos": 15,
@ -73,7 +73,7 @@
},
{
"id": 100010,
"track": "Track",
"track": 1,
"type": 1,
"startPos": 14,
"endPos": 15,
@ -81,7 +81,7 @@
},
{
"id": 100011,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 15,
"endPos": 16,
@ -89,7 +89,7 @@
},
{
"id": 100012,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 19,
"endPos": 20,
@ -97,7 +97,7 @@
},
{
"id": 100013,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 20,
"endPos": 21,
@ -105,7 +105,7 @@
},
{
"id": 100014,
"track": "Track",
"track": 1,
"type": 0,
"startPos": 22,
"endPos": 23,
@ -113,10 +113,106 @@
},
{
"id": 100015,
"track": "Track",
"track": 1,
"type": 1,
"startPos": 22,
"endPos": 23,
"local": 0
},
{
"id": 100016,
"track": 2,
"type": 0,
"startPos": 5,
"endPos": 7,
"local": 0
},
{
"id": 100017,
"track": 2,
"type": 0,
"startPos": 5,
"endPos": 7,
"local": 1
},
{
"id": 100018,
"track": 2,
"type": 0,
"startPos": 5,
"endPos": 7,
"local": 2
},
{
"id": 100019,
"track": 2,
"type": 1,
"startPos": 11,
"endPos": 12,
"local": 0
},
{
"id": 100020,
"track": 2,
"type": 1,
"startPos": 11,
"endPos": 12,
"local": 2
},
{
"id": 100021,
"track": 2,
"type": 1,
"startPos": 11,
"endPos": 12,
"local": 1
},
{
"id": 100022,
"track": 2,
"type": 1,
"startPos": 16,
"endPos": 17,
"local": 0
},
{
"id": 100023,
"track": 2,
"type": 0,
"startPos": 17,
"endPos": 18,
"local": 1
},
{
"id": 100024,
"track": 2,
"type": 1,
"startPos": 17,
"endPos": 18,
"local": 2
},
{
"id": 100025,
"track": 2,
"type": 0,
"startPos": 18,
"endPos": 20,
"local": 1
},
{
"id": 100026,
"track": 2,
"type": 0,
"startPos": 18,
"endPos": 20,
"local": 0
},
{
"id": 100027,
"track": 2,
"type": 0,
"startPos": 18,
"endPos": 20,
"local": 2
}
]

View File

@ -22,5 +22,13 @@
{
"key": "character_move_brakeOnRunning",
"path": "Effect/Character/effect_character_move_brakeOnRunning.prefab"
},
{
"key": "loading_loop",
"path": "Effect/Scenario/effect_openshow_fly_tunnel_01.prefab"
},
{
"key": "loading_blackScreen",
"path": "Effect/Scene/Loading/effect_scene_load_blackScreen.prefab"
}
]

View File

@ -452,7 +452,7 @@
"t": "ps",
"n": 50
},
"Inletopening": 1,
"Inletopening": 0,
"gold": {
"a": "attr",
"t": "gold",

View File

@ -32,7 +32,7 @@
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 1000,
"skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
@ -102,33 +102,114 @@
"x": 0,
"y": 0
},
"txt": "1000201",
"txt": "1000103",
"speakerface": 0,
"sound": "",
"mask": 1,
"lock": 1,
"uishow": 0,
"skiptime": 5000,
"skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000501,
"group": 5,
"id": 1000201,
"group": 2,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "funcopen_mail",
"followtj": "",
"followguide": 0,
"finger": [],
"condition": "funcopen_hero",
"followtj": "OpenHeroCard",
"followguide": 1000202,
"finger": [
"maininterface",
"btn_card$"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0,
"fingerTime": 0.5,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000104",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000202,
"group": 2,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000203,
"finger": [
"herocard",
"upbtn$"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.5,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000105",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000203,
"group": 2,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000204,
"finger": [
"herocard",
"roleinformation$.upgrade materials$.list_select",
"0",
"ItemMaterial$"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.1,
"objSize": {
"x": 0,
"y": 0
@ -143,7 +224,394 @@
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 0,
"skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000204,
"group": 2,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 0,
"finger": [
"herocard",
"upbtn$"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.1,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 10000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000301,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "worldtaskexit_accept_20034",
"followtj": "",
"followguide": 1000302,
"finger": [
"taskDedailsPopup",
"btn_star$"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000302,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "OpenBattleready",
"followguide": 1000303,
"finger": [
"maininterface",
"mainCom$.optionList$",
"0"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000303,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000304,
"finger": [
"battleready",
"rolelist$",
"0"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000106",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000304,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000305,
"finger": [
"battleready",
"herolist$",
"0"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000107",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000305,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000306,
"finger": [
"battleready",
"rolelist$",
"0"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000306,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "OpenFight",
"followguide": 1000307,
"finger": [
"battleready",
"btn_start$",
"0"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000108",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000307,
"group": 3,
"type": 1,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000308,
"finger": [
"zhandou",
"battleactionaxis.herolist$.n2"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000109",
"speakerface": 0,
"sound": "",
"mask": 1,
"lock": 0,
"uishow": 0,
"skiptime": 5001,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000308,
"group": 3,
"type": 1,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 1000309,
"finger": [
"GRoot",
"FloatRoot.InfoRoot.roleinfo_2100.campicon"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000110",
"speakerface": 0,
"sound": "",
"mask": 1,
"lock": 0,
"uishow": 0,
"skiptime": 5002,
"skip": 0,
"skipgroup": 0,
"reward": []
},
{
"id": 1000309,
"group": 3,
"type": 3,
"startPar": "",
"parameter": "",
"interface": "",
"condition": "",
"followtj": "",
"followguide": 0,
"finger": [
"zhandou",
"skilllist$",
"2",
"skillbtn"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "1000111",
"speakerface": 0,
"sound": "",
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 5000,
"skip": 0,
"skipgroup": 0,
"reward": []

View File

@ -99,7 +99,7 @@
},
"venturetype": 1,
"ventureavatar": [
"Person/24004/24004_q.prefab"
"Person/24004/24005_q.prefab"
],
"scene_effect": [
"miwu"
@ -216,7 +216,7 @@
},
"venturetype": 1,
"ventureavatar": [
"Person/24004/24004_q.prefab"
"Person/24004/24006_q.prefab"
],
"scene_effect": [
"miwu"
@ -295,7 +295,7 @@
},
"venturetype": 1,
"ventureavatar": [
"Person/24004/24004_q.prefab"
"Person/24004/24007_q.prefab"
],
"scene_effect": [
"miwu"
@ -8382,7 +8382,7 @@
"chapterid": 11001,
"group_id": 1001591,
"previous_group_id": [
100117
100118
],
"previoustage": 0,
"buried_type": 0,

View File

@ -239367,12 +239367,12 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 44004,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.2,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,

File diff suppressed because it is too large Load Diff

View File

@ -10,191 +10,113 @@
],
"unlock": {
"key": "guild_guild_boss_boss_name_1",
"text": "{0}可航行至伯克岛"
"text": "{0}天后可航行至伯克岛"
},
"introduce": {
"key": "guild_guild_boss_boss_name_1",
"text": "航行抵达伯克岛"
}
},
"scene": "",
"png": []
},
{
"node_id": 2,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_2",
"text": "伯克岛"
"text": "战栗海岸"
},
"time": [
0
2
],
"unlock": {
"key": "guild_guild_boss_boss_name_2",
"text": "{0}可航行至伯克岛"
"text": "{0}天后可航行至战栗海岸"
},
"introduce": {
"key": "guild_guild_boss_boss_name_2",
"text": "航行抵达伯克岛"
}
"text": "航行抵达战栗海岸"
},
"scene": "",
"png": []
},
{
"node_id": 3,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_3",
"text": "伯克岛"
"text": "西西伯利亚"
},
"time": [
0
4
],
"unlock": {
"key": "guild_guild_boss_boss_name_3",
"text": "{0}可航行至伯克岛"
"text": "{0}天后可航行至西西伯利亚"
},
"introduce": {
"key": "guild_guild_boss_boss_name_3",
"text": "航行抵达伯克岛"
}
"text": "航行抵达西西伯利亚"
},
"scene": "",
"png": []
},
{
"node_id": 4,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_4",
"text": "伯克岛"
"text": "巴尔干半岛"
},
"time": [
0
6
],
"unlock": {
"key": "guild_guild_boss_boss_name_4",
"text": "{0}可航行至伯克岛"
"text": "{0}天后可航行至巴尔干半岛"
},
"introduce": {
"key": "guild_guild_boss_boss_name_4",
"text": "航行抵达伯克岛"
}
"text": "航行抵达巴尔干半岛"
},
"scene": "",
"png": []
},
{
"node_id": 5,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_5",
"text": "伯克岛"
"text": "新加坡海峡"
},
"time": [
0
8
],
"unlock": {
"key": "guild_guild_boss_boss_name_5",
"text": "{0}可航行至伯克岛"
"text": "{0}天后可航行至新加坡海峡"
},
"introduce": {
"key": "guild_guild_boss_boss_name_5",
"text": "航行抵达伯克岛"
}
"text": "航行抵达新加坡海峡"
},
"scene": "",
"png": []
},
{
"node_id": 6,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_6",
"text": "战栗海岸"
"text": "马奇洛"
},
"time": [
3
10
],
"unlock": {
"key": "guild_guild_boss_boss_name_6",
"text": "{0}可航行至战栗海岸"
"text": "{0}天后可航行至马奇洛"
},
"introduce": {
"key": "guild_guild_boss_boss_name_6",
"text": "航行抵达战栗海岸"
}
"text": "航行抵达马奇洛"
},
{
"node_id": 7,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_7",
"text": "战栗海岸"
},
"time": [
3
],
"unlock": {
"key": "guild_guild_boss_boss_name_7",
"text": "{0}可航行至战栗海岸"
},
"introduce": {
"key": "guild_guild_boss_boss_name_7",
"text": "航行抵达战栗海岸"
}
},
{
"node_id": 8,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_8",
"text": "战栗海岸"
},
"time": [
3
],
"unlock": {
"key": "guild_guild_boss_boss_name_8",
"text": "{0}可航行至战栗海岸"
},
"introduce": {
"key": "guild_guild_boss_boss_name_8",
"text": "航行抵达战栗海岸"
}
},
{
"node_id": 9,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_9",
"text": "维京海峡"
},
"time": [
6
],
"unlock": {
"key": "guild_guild_boss_boss_name_9",
"text": "{0}可航行至维京海峡"
},
"introduce": {
"key": "guild_guild_boss_boss_name_9",
"text": "航行抵达维京海峡"
}
},
{
"node_id": 10,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_10",
"text": "维京海峡"
},
"time": [
6
],
"unlock": {
"key": "guild_guild_boss_boss_name_10",
"text": "{0}可航行至维京海峡"
},
"introduce": {
"key": "guild_guild_boss_boss_name_10",
"text": "航行抵达维京海峡"
}
},
{
"node_id": 11,
"puggsy_name": {
"key": "guild_guild_boss_boss_name_11",
"text": "维京海峡"
},
"time": [
6
],
"unlock": {
"key": "guild_guild_boss_boss_name_11",
"text": "{0}可航行至维京海峡"
},
"introduce": {
"key": "guild_guild_boss_boss_name_11",
"text": "航行抵达维京海峡"
}
"scene": "",
"png": []
}
]

View File

@ -0,0 +1,86 @@
[
{
"id": 1,
"make_id": 10,
"position": 1,
"make_text": {
"key": "guild_guild_boss_boss_name_1",
"text": "拉胚"
},
"subitem": 1,
"png": "",
"value": 0
},
{
"id": 2,
"make_id": 10,
"position": 1,
"make_text": {
"key": "guild_guild_boss_boss_name_2",
"text": "拉胚"
},
"subitem": 2,
"png": "",
"value": 0
},
{
"id": 3,
"make_id": 10,
"position": 1,
"make_text": {
"key": "guild_guild_boss_boss_name_3",
"text": "拉胚"
},
"subitem": 3,
"png": "",
"value": 0
},
{
"id": 4,
"make_id": 10,
"position": 1,
"make_text": {
"key": "guild_guild_boss_boss_name_4",
"text": "拉胚"
},
"subitem": 4,
"png": "",
"value": 500
},
{
"id": 5,
"make_id": 10,
"position": 1,
"make_text": {
"key": "guild_guild_boss_boss_name_5",
"text": "拉胚"
},
"subitem": 5,
"png": "",
"value": 500
},
{
"id": 6,
"make_id": 10,
"position": 1,
"make_text": {
"key": "guild_guild_boss_boss_name_6",
"text": "拉胚"
},
"subitem": 6,
"png": "",
"value": 1000
},
{
"id": 7,
"make_id": 10,
"position": 2,
"make_text": {
"key": "guild_guild_boss_boss_name_7",
"text": "器刃"
},
"subitem": 1,
"png": "",
"value": 0
}
]

View File

@ -0,0 +1,164 @@
[
{
"make_id": 1,
"make_title": {
"key": "puggsy_puggsy_star_make_title_1",
"text": "蛋糕工坊"
},
"make_text": {
"key": "puggsy_puggsy_star_make_text_1",
"text": "走过路过不要错过,买不了吃亏买不了上当"
},
"condition_text": {
"key": "puggsy_puggsy_star_condition_text_1",
"text": "奖励条件:制作出{0}星以上的遗器"
},
"png": "",
"star": 4,
"score": 4000,
"fire": 1,
"value": 1000,
"drop": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
},
{
"make_id": 2,
"make_title": {
"key": "puggsy_puggsy_star_make_title_2",
"text": "玉米工坊"
},
"make_text": {
"key": "puggsy_puggsy_star_make_text_2",
"text": "走过路过不要错过,买不了吃亏买不了上当"
},
"condition_text": {
"key": "puggsy_puggsy_star_condition_text_2",
"text": "奖励条件:制作出{0}星以上的遗器"
},
"png": "",
"star": 4,
"score": 4000,
"fire": 2,
"value": 1000,
"drop": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
},
{
"make_id": 3,
"make_title": {
"key": "puggsy_puggsy_star_make_title_3",
"text": "香蕉工坊"
},
"make_text": {
"key": "puggsy_puggsy_star_make_text_3",
"text": "走过路过不要错过,买不了吃亏买不了上当"
},
"condition_text": {
"key": "puggsy_puggsy_star_condition_text_3",
"text": "奖励条件:制作出{0}星以上的遗器"
},
"png": "",
"star": 4,
"score": 4000,
"fire": 3,
"value": 1000,
"drop": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
},
{
"make_id": 4,
"make_title": {
"key": "puggsy_puggsy_star_make_title_4",
"text": "西瓜工坊"
},
"make_text": {
"key": "puggsy_puggsy_star_make_text_4",
"text": "走过路过不要错过,买不了吃亏买不了上当"
},
"condition_text": {
"key": "puggsy_puggsy_star_condition_text_4",
"text": "奖励条件:制作出{0}星以上的遗器"
},
"png": "",
"star": 4,
"score": 4000,
"fire": 1,
"value": 1000,
"drop": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
},
{
"make_id": 5,
"make_title": {
"key": "puggsy_puggsy_star_make_title_5",
"text": "冰淇淋工坊"
},
"make_text": {
"key": "puggsy_puggsy_star_make_text_5",
"text": "走过路过不要错过,买不了吃亏买不了上当"
},
"condition_text": {
"key": "puggsy_puggsy_star_condition_text_5",
"text": "奖励条件:制作出{0}星以上的遗器"
},
"png": "",
"star": 5,
"score": 5000,
"fire": 2,
"value": 1000,
"drop": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
},
{
"make_id": 6,
"make_title": {
"key": "puggsy_puggsy_star_make_title_6",
"text": "番茄工坊"
},
"make_text": {
"key": "puggsy_puggsy_star_make_text_6",
"text": "走过路过不要错过,买不了吃亏买不了上当"
},
"condition_text": {
"key": "puggsy_puggsy_star_condition_text_6",
"text": "奖励条件:制作出{0}星以上的遗器"
},
"png": "",
"star": 5,
"score": 5000,
"fire": 3,
"value": 1000,
"drop": [
{
"a": "attr",
"t": "starcoin",
"n": 1
}
]
}
]

View File

@ -2,16 +2,16 @@
{
"key": 1,
"optionName": {
"key": "111",
"key": "achieve_achieve_all_achieve_group_id_02",
"text": "清扫场地"
},
"model": "组件名称",
"actionType": 5,
"actionParam": "5#timeline_target",
"num": 2,
"model": "20030_扫地点1号",
"actionType": 1,
"actionParam": "3#camerapose_2",
"num": 1,
"triggerWeight": [
90,
10
100,
0
],
"triggerOne": [
7000050
@ -23,6 +23,7 @@
"n": 5
}
],
"triggerThree": 0,
"cdText": {
"key": "repeat_repeat_all_cdtxt_01",
"text": "地面干净了不少。"

View File

@ -10,6 +10,7 @@
"key": "",
"text": ""
},
"opencond": "shop1",
"rtype": 1,
"rtime": 8,
"rnum": 8,
@ -42,6 +43,7 @@
"key": "",
"text": ""
},
"opencond": "shop2",
"rtype": 2,
"rtime": 1,
"rnum": -1,
@ -67,6 +69,7 @@
"key": "shop_shop_upper_shop_3",
"text": "奇趣商店"
},
"opencond": "shop3",
"rtype": 2,
"rtime": 1,
"rnum": -1,
@ -91,6 +94,7 @@
"key": "shop_shop_upper_shop_4",
"text": "奇趣商店"
},
"opencond": "shop4",
"rtype": 2,
"rtime": 7,
"rnum": -1,
@ -117,6 +121,7 @@
"key": "shop_shop_upper_shop_5",
"text": "奇趣商店"
},
"opencond": "shop5",
"rtype": 2,
"rtime": 7,
"rnum": -1,
@ -143,6 +148,7 @@
"key": "shop_shop_upper_shop_6",
"text": "奇趣商店"
},
"opencond": "shop6",
"rtype": 2,
"rtime": 21,
"rnum": -1,
@ -170,6 +176,7 @@
"key": "shop_shop_upper_shop_7",
"text": "主线商店"
},
"opencond": "shop7",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -197,6 +204,7 @@
"key": "shop_shop_upper_shop_8",
"text": "主线商店"
},
"opencond": "shop8",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -227,6 +235,7 @@
"key": "shop_shop_upper_shop_9",
"text": "主线商店"
},
"opencond": "shop9",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -257,6 +266,7 @@
"key": "shop_shop_upper_shop_10",
"text": "主线商店"
},
"opencond": "shop10",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -287,6 +297,7 @@
"key": "shop_shop_upper_shop_11",
"text": "主线商店"
},
"opencond": "shop11",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -314,6 +325,7 @@
"key": "shop_shop_upper_shop_12",
"text": "主线商店"
},
"opencond": "shop12",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -344,6 +356,7 @@
"key": "shop_shop_upper_shop_13",
"text": "主线商店"
},
"opencond": "shop13",
"rtype": -1,
"rtime": 0,
"rnum": -1,
@ -374,6 +387,7 @@
"key": "shop_shop_upper_shop_14",
"text": "主线商店"
},
"opencond": "shop14",
"rtype": -1,
"rtime": 0,
"rnum": -1,

View File

@ -16525,7 +16525,7 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Type": 1,
"Argu": [
2,
2,

View File

@ -9164,8 +9164,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 4,
"Type": 2,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@ -9200,8 +9200,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 4,
"Type": 2,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@ -9236,8 +9236,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 4,
"Type": 2,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@ -9272,8 +9272,8 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 4,
"Type": 2,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@ -9308,7 +9308,7 @@
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"Type": 2,
"CD": 4,
"Where": [],
"Target": 2,

View File

@ -12019,7 +12019,9 @@
"text": "减少40%受到的暴击伤害和会心伤害。"
},
"BuffType": 135,
"EffectArgu": [],
"EffectArgu": [
400
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@ -12247,7 +12249,10 @@
"text": "受到治疗效果降低50%造成伤害降低30%。"
},
"BuffType": 137,
"EffectArgu": [],
"EffectArgu": [
500,
300
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
@ -12277,8 +12282,13 @@
"key": "skill_skill_buff_Desc_391000107",
"text": "【攻击提升】、【防御提升】、【速度提升】效果提升35%。"
},
"BuffType": 0,
"EffectArgu": [],
"BuffType": 141,
"EffectArgu": [
350,
390001001,
390001002,
390001003
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],

View File

@ -4938,109 +4938,5 @@
"n": 0
},
"DeleteWt": 40
},
{
"BuffId": 770076113,
"Type": 999,
"SkillId": 770076111,
"BuffLevel": 1,
"Quality": 5,
"BuffIcon": "stonehengebuff_770076111",
"TargetType": 2,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_191",
"text": "快睡吧快睡吧,外婆不战而胜的秘诀,可以让敌人至少三天不醒。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
},
"DeleteWt": 60
},
{
"BuffId": 770077113,
"Type": 999,
"SkillId": 770077111,
"BuffLevel": 1,
"Quality": 5,
"BuffIcon": "stonehengebuff_770077111",
"TargetType": 2,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_192",
"text": "快睡吧快睡吧,外婆不战而胜的秘诀,可以让敌人至少三天不醒。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
},
"DeleteWt": 60
},
{
"BuffId": 770070113,
"Type": 999,
"SkillId": 770070111,
"BuffLevel": 1,
"Quality": 5,
"BuffIcon": "stonehengebuff_770070111",
"TargetType": 2,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_193",
"text": "沼泽之水的觉醒!霍普挡在众人身前,挡住了铺天盖地的火焰攻击。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
},
"DeleteWt": 60
},
{
"BuffId": 770071113,
"Type": 999,
"SkillId": 770071111,
"BuffLevel": 1,
"Quality": 5,
"BuffIcon": "stonehengebuff_770071111",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_194",
"text": "沼泽之水的觉醒!霍普挡在众人身前,挡住了铺天盖地的火焰攻击。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
},
"DeleteWt": 60
}
]

View File

@ -271,7 +271,7 @@
"EventId": 16010101,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_14",
"text": "打开"
"text": "拾取"
},
"EventType": 16,
"EventResource": "event_rewardbox_1",
@ -287,7 +287,7 @@
"EventId": 17002003,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_15",
"text": "打开"
"text": "拾取"
},
"EventType": 17,
"EventResource": "event_rewardbox_2",
@ -369,7 +369,7 @@
"EventId": 14110101,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_19",
"text": "战斗"
"text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51004",
@ -385,7 +385,7 @@
"EventId": 14110102,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_20",
"text": "战斗"
"text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51002",
@ -401,7 +401,7 @@
"EventId": 14110103,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_21",
"text": "战斗"
"text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51003",
@ -417,7 +417,7 @@
"EventId": 14110104,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_22",
"text": "战斗"
"text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51005",
@ -433,7 +433,7 @@
"EventId": 14110105,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_23",
"text": "战斗"
"text": "进入战斗"
},
"EventType": 14,
"EventResource": "event_battle_51002",
@ -465,7 +465,7 @@
"EventId": 28110501,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_25",
"text": "首领"
"text": "首领战斗"
},
"EventType": 28,
"EventResource": "event_boss_1",
@ -481,7 +481,7 @@
"EventId": 12100001,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_26",
"text": "剧情(首领战必出)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -497,7 +497,7 @@
"EventId": 12100002,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_27",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -513,7 +513,7 @@
"EventId": 12100003,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_28",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -529,7 +529,7 @@
"EventId": 12100004,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_29",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -545,7 +545,7 @@
"EventId": 12100005,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_30",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -561,7 +561,7 @@
"EventId": 12100006,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_31",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -577,7 +577,7 @@
"EventId": 12100007,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_32",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -593,7 +593,7 @@
"EventId": 12100008,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_33",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -609,7 +609,7 @@
"EventId": 12100009,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_34",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -625,7 +625,7 @@
"EventId": 12100010,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_35",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",
@ -641,7 +641,7 @@
"EventId": 12100011,
"EventTitle": {
"key": "stonehenge_eventconfig_EventTitle_36",
"text": "剧情(常规)"
"text": "触摸岩画"
},
"EventType": 12,
"EventResource": "event_story",

View File

@ -0,0 +1,18 @@
[
{
"id": 20020,
"topname": {
"key": "topname_01",
"text": "第一章"
},
"name": {
"key": "name_01",
"text": "驯龙高手"
},
"txt": {
"key": "txt_01",
"text": "这就是驯龙高手"
},
"map": ""
}
]

View File

@ -0,0 +1,10 @@
[
{
"id": 1,
"topname": "GameMain",
"name": {
"key": "tipstxt_tipstxt_sence_name_01",
"text": "中轴城"
}
}
]

View File

@ -306,6 +306,94 @@
}
]
},
{
"id": "store",
"subId": "7",
"currencyField": [
{
"a": "item",
"t": "24011001",
"n": 1
}
]
},
{
"id": "store",
"subId": "8",
"currencyField": [
{
"a": "item",
"t": "24021001",
"n": 1
}
]
},
{
"id": "store",
"subId": "9",
"currencyField": [
{
"a": "item",
"t": "24031001",
"n": 1
}
]
},
{
"id": "store",
"subId": "10",
"currencyField": [
{
"a": "item",
"t": "24041001",
"n": 1
}
]
},
{
"id": "store",
"subId": "11",
"currencyField": [
{
"a": "item",
"t": "24041001",
"n": 1
}
]
},
{
"id": "store",
"subId": "12",
"currencyField": [
{
"a": "item",
"t": "24041001",
"n": 1
}
]
},
{
"id": "store",
"subId": "13",
"currencyField": [
{
"a": "item",
"t": "24041001",
"n": 1
}
]
},
{
"id": "store",
"subId": "14",
"currencyField": [
{
"a": "item",
"t": "24041001",
"n": 1
}
]
},
{
"id": "storebuypopup",
"subId": "",

View File

@ -0,0 +1,12 @@
[
{
"Id": 1,
"TrackType": 1,
"TrackName": "track_1"
},
{
"Id": 2,
"TrackType": 2,
"TrackName": "track_story"
}
]

File diff suppressed because it is too large Load Diff

View File

@ -41,6 +41,7 @@ func (this *Caravan) Init(service core.IService, module core.IModule, options co
if err = this.ModuleBase.Init(service, module, options); err != nil {
return
}
this.service = service.(base.IRPCXService)
return
}

View File

@ -57,7 +57,7 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err
result.Id = primitive.NewObjectID().Hex()
result.Uid = uid
result.Reward = make(map[int32]int32)
result.Card = make(map[string]int32, 0)
result.Card = make(map[string]int32)
}
// 初始化默认获得类型为1的卡片
for _, v := range this.module.configure.GetInitGameConsumeHero() {

View File

@ -538,6 +538,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
case "offline":
req := msg.(*pb.RPCGeneralReqA2)
fmt.Printf("useroffline: %v\n", req)
if this.RoomType == 2 { // AI 对战直接结束
this.Status = 2 // 解散
this.ModifyUserRoomInfoData()

View File

@ -1,6 +1,7 @@
package entertainment_test
import (
"context"
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego"
@ -67,7 +68,33 @@ func NewService(ops ...rpcx.Option) core.IService {
s.Configure(ops...)
return s
}
func t() {
ch := make(chan struct{})
//ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
ctx, cancel := context.WithCancel(context.Background())
go func(ctx context.Context) {
for {
select {
case <-ctx.Done():
ch <- struct{}{}
return
default:
fmt.Println("x...")
}
time.Sleep(500 * time.Millisecond)
}
}(ctx)
go func() {
time.Sleep(3 * time.Second)
cancel()
}()
<-ch
fmt.Println("结束")
}
func Test_Main(t *testing.T) {
flag.Parse()

View File

@ -24,7 +24,6 @@ func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq)
if errdata = this.RewardCheck(session, req); errdata != nil {
return
}
// TODO 等策划配置来再做数据校验
list, err = this.module.modelJielong.getUserJielongData(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{

View File

@ -13,7 +13,6 @@ type ActivityNotifyReq struct {
Id string `json:"_id"` // oid
}
//创建邮件
func (this *Api_Comp) ActivityNotify(c *engine.Context) {
req := &ActivityNotifyReq{}

View File

@ -12,7 +12,7 @@ import "errors"
type GameBuzkashiTrackData struct {
Id int32
Track string
Track int32
Type int32
StartPos int32
EndPos int32
@ -27,7 +27,7 @@ func (*GameBuzkashiTrackData) GetTypeId() int32 {
func (_v *GameBuzkashiTrackData)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; if _v.Track, _ok_ = _buf["track"].(string); !_ok_ { err = errors.New("track error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["track"].(float64); !_ok_ { err = errors.New("track error"); return }; _v.Track = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["startPos"].(float64); !_ok_ { err = errors.New("startPos error"); return }; _v.StartPos = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endPos"].(float64); !_ok_ { err = errors.New("endPos error"); return }; _v.EndPos = int32(_tempNum_) }

View File

@ -14,4 +14,5 @@ const (
GameOpencondType_Maxmapid = 2
GameOpencondType_Worldtaskid = 3
GameOpencondType_Friend = 4
GameOpencondType_MoonLevel = 5
)

View File

@ -16,6 +16,8 @@ type GamePuggsyIsLandData struct {
Time []int32
Unlock string
Introduce string
Scene string
Png []string
}
const TypeId_GamePuggsyIsLandData = 36699942
@ -43,6 +45,21 @@ func (_v *GamePuggsyIsLandData)Deserialize(_buf map[string]interface{}) (err err
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Unlock error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Unlock, _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["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["png"].([]interface{}); !_ok_ { err = errors.New("png error"); return }
_v.Png = 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.Png = append(_v.Png, _list_v_)
}
}
return
}

View File

@ -20,6 +20,7 @@ type GameRepeatAllData struct {
TriggerWeight []int32
TriggerOne []int32
TriggerTwo []*Gameatn
TriggerThree int32
CdText string
Cdtime int32
}
@ -79,6 +80,7 @@ func (_v *GameRepeatAllData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["triggerThree"].(float64); !_ok_ { err = errors.New("triggerThree error"); return }; _v.TriggerThree = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["cdText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.CdText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.CdText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cdtime"].(float64); !_ok_ { err = errors.New("cdtime error"); return }; _v.Cdtime = int32(_tempNum_) }
return

View File

@ -32,6 +32,7 @@ type GameWorldTaskData struct {
TaskendRemoveitem []*Gameatn
AutoAccept int32
Tasktips int32
DeliverTask int32
LockAdd int32
Finish []int32
Finishparameter string
@ -107,6 +108,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task"].(float64); !_ok_ { err = errors.New("deliver_task error"); return }; _v.DeliverTask = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) }
{
var _arr_ []interface{}

View File

@ -21,6 +21,7 @@ type GameOpencondData struct {
ActivateType int32
Notify []string
Kqbx int32
KqbxUi string
KqbxText string
}
@ -67,6 +68,7 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error)
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kqbx"].(float64); !_ok_ { err = errors.New("kqbx error"); return }; _v.Kqbx = int32(_tempNum_) }
{ var _ok_ bool; if _v.KqbxUi, _ok_ = _buf["kqbx_ui"].(string); !_ok_ { err = errors.New("kqbx_ui error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["kqbx_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.KqbxText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.KqbxText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}

View File

@ -15,6 +15,7 @@ type GameShopData struct {
Tab int32
Shopname string
UpperShop string
Opencond string
Rtype int32
Rtime int32
Rnum int32
@ -33,6 +34,7 @@ func (_v *GameShopData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["shopname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Shopname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Shopname, _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["upper_shop"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UpperShop error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UpperShop, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Opencond, _ok_ = _buf["opencond"].(string); !_ok_ { err = errors.New("opencond error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtype"].(float64); !_ok_ { err = errors.New("rtype error"); return }; _v.Rtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtime"].(float64); !_ok_ { err = errors.New("rtime error"); return }; _v.Rtime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rnum"].(float64); !_ok_ { err = errors.New("rnum error"); return }; _v.Rnum = int32(_tempNum_) }