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

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

Browse Source
This commit is contained in:
meixiongfeng 2023-11-15 10:11:45 +08:00
commit 9f486c4528
11 changed files with 3676 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
bin/json/game_askedrecruit.json Normal file
View File

@ -0,0 +1,82 @@
[
{
"key": 0,
"type": 0,
"storyText": {
"key": "（乌龟大师）：我在预兆中见过你的身影。",
"text": "（乌龟大师）：我在预兆中见过你的身影。"
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
},
{
"key": 1,
"type": 1,
"storyText": {
"key": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。",
"text": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。"
},
"optionText1": {
"key": "1.是主角没错",
"text": "1.是主角没错"
},
"optionText2": {
"key": "2.只是普通肥宅",
"text": "2.只是普通肥宅"
}
},
{
"key": 2,
"type": 0,
"storyText": {
"key": "（乌龟大师）：我在预兆中见过你的身影。",
"text": "（乌龟大师）：我在预兆中见过你的身影。"
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
},
{
"key": 3,
"type": 1,
"storyText": {
"key": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。",
"text": "（乌龟大师）：孩子，你是追逐名誉至此的勇士。"
},
"optionText1": {
"key": "1.是主角没错",
"text": "1.是主角没错"
},
"optionText2": {
"key": "2.只是普通肥宅",
"text": "2.只是普通肥宅"
}
},
{
"key": 4,
"type": 0,
"storyText": {
"key": "有趣",
"text": ""
},
"optionText1": {
"key": "",
"text": ""
},
"optionText2": {
"key": "",
"text": ""
}
}
]

84
bin/json/game_battleready.json
View File

@ -10,6 +10,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -44,6 +45,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -78,6 +80,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -112,6 +115,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -146,6 +150,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -180,6 +185,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -214,6 +220,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -248,6 +255,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -282,6 +290,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -316,6 +325,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -350,6 +360,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -384,6 +395,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -418,6 +430,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -452,6 +465,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -486,6 +500,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -520,6 +535,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -554,6 +570,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -590,6 +607,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -624,6 +642,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -658,6 +677,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -692,6 +712,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -726,6 +747,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -760,6 +782,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -794,6 +817,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -828,6 +852,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -862,6 +887,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -896,6 +922,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -930,6 +957,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -964,6 +992,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -998,6 +1027,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1032,6 +1062,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "battleready_battleready_RuleTips_1",
"text": "只能上阵热情之火属性的守护者"
@ -1068,6 +1099,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "battleready_battleready_RuleTips_2",
"text": "只能上阵感观之林属性的守护者"
@ -1104,6 +1136,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "battleready_battleready_RuleTips_3",
"text": "只能上阵包容之水属性的守护者"
@ -1140,6 +1173,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1174,6 +1208,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1208,6 +1243,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1244,6 +1280,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 1,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1278,6 +1315,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 1,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1315,6 +1353,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 1,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1349,6 +1388,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1383,6 +1423,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1417,6 +1458,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1453,6 +1495,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1489,6 +1532,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1529,6 +1573,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1565,6 +1610,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1599,6 +1645,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1633,6 +1680,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1667,6 +1715,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1703,6 +1752,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1737,6 +1787,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1771,6 +1822,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1807,6 +1859,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1841,6 +1894,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1875,6 +1929,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1910,6 +1965,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1954,6 +2010,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -1988,6 +2045,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2024,6 +2082,7 @@
"BGMusic": "",
"LoadingId": 1019,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2058,6 +2117,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2092,6 +2152,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2126,6 +2187,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "battleready_battleready_RuleTips_1",
"text": "只能上阵热情之火属性的守护者"
@ -2162,6 +2224,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "battleready_battleready_RuleTips_2",
"text": "只能上阵感观之林属性的守护者"
@ -2198,6 +2261,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "battleready_battleready_RuleTips_3",
"text": "只能上阵包容之水属性的守护者"
@ -2234,6 +2298,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2268,6 +2333,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2302,6 +2368,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2336,6 +2403,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2370,6 +2438,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2404,6 +2473,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2438,6 +2508,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2472,6 +2543,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2506,6 +2578,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2540,6 +2613,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2574,6 +2648,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2608,6 +2683,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2642,6 +2718,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2676,6 +2753,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2710,6 +2788,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2744,6 +2823,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2778,6 +2858,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2812,6 +2893,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2846,6 +2928,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
@ -2880,6 +2963,7 @@
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""

2
bin/json/game_buriedcondi.json
View File

@ -24232,7 +24232,7 @@
"key": "buried_buried_condi_tasktxt_727",
"text": "性别选择成功"
},
"type": 238,
"type": 72,
"valid": 0,
"head": {
"a": "attr",

8
bin/json/game_guide.json
View File

@ -45,7 +45,7 @@
"parameter": "",
"interface": "",
"condition": "",
"followtj": "JpystickMove",
"followtj": "JoystickMove",
"followguide": 1000103,
"finger": [
"joystick"
@ -63,7 +63,7 @@
"x": 0,
"y": 0
},
"txt": "",
"txt": "1000102",
"speakerface": 0,
"sound": "",
"mask": 1,
@ -86,7 +86,7 @@
"followguide": 0,
"finger": [
"command",
"mainCom$.taskpanel$.mainTaskList.tasklist$",
"tasklist$",
"0"
],
"offset": {
@ -102,7 +102,7 @@
"x": 0,
"y": 0
},
"txt": "",
"txt": "1000201",
"speakerface": 0,
"sound": "",
"mask": 1,

26
bin/json/game_monsterformat.json
View File

@ -233707,13 +233707,13 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 24004,
"heroid": 51052,
"star": 3,
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"atkpro": 2,
"hppro": 1.2,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
"skill2": 1,
@ -233727,7 +233727,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@ -233747,7 +233747,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@ -233767,13 +233767,13 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"atkpro": 2,
"hppro": 0.8,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
"skill2": 1,
@ -233787,7 +233787,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": -1,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
@ -233827,7 +233827,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -233847,7 +233847,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -233867,7 +233867,7 @@
"captainId": 1,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51052,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
@ -233887,7 +233887,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51052,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],

4
bin/json/game_opencond.json
View File

@ -848,7 +848,7 @@
"param": 20050
}
],
"wkqbx": 0,
"wkqbx": 2,
"img": "zc_icon_01",
"prompt": {
"key": "opencond_opencond_prompt_31",
@ -1172,7 +1172,7 @@
"param": 20050
}
],
"wkqbx": 1,
"wkqbx": 2,
"img": "zc_icon_01",
"prompt": {
"key": "opencond_opencond_prompt_43",

234
bin/json/game_shop.json
View File

@ -158,5 +158,239 @@
15008,
15009
]
},
{
"shopid": 7,
"tab": 7,
"shopname": {
"key": "shop_shop_shopname_7",
"text": "第一章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_7",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
21001,
21002,
21003,
21004,
21005,
21006,
21007,
21008,
21009
]
},
{
"shopid": 8,
"tab": 8,
"shopname": {
"key": "shop_shop_shopname_8",
"text": "第二章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_8",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
22001,
22002,
22003,
22004,
22005,
22006,
22007,
22008,
22009,
22010,
22011,
22012
]
},
{
"shopid": 9,
"tab": 9,
"shopname": {
"key": "shop_shop_shopname_9",
"text": "第三章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_9",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
23001,
23002,
23003,
23004,
23005,
23006,
23007,
23008,
23009,
23010,
23011,
23012
]
},
{
"shopid": 10,
"tab": 10,
"shopname": {
"key": "shop_shop_shopname_10",
"text": "第四章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_10",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
24001,
24002,
24003,
24004,
24005,
24006,
24007,
24008,
24009,
24010,
24011,
24012
]
},
{
"shopid": 11,
"tab": 11,
"shopname": {
"key": "shop_shop_shopname_11",
"text": "第五章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_11",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
25001,
25002,
25003,
25004,
25005,
25006,
25007,
25008,
25009
]
},
{
"shopid": 12,
"tab": 12,
"shopname": {
"key": "shop_shop_shopname_12",
"text": "第六章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_12",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
26001,
26002,
26003,
26004,
26005,
26006,
26007,
26008,
26009,
26010,
26011,
26012
]
},
{
"shopid": 13,
"tab": 13,
"shopname": {
"key": "shop_shop_shopname_13",
"text": "第七章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_13",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
27001,
27002,
27003,
27004,
27005,
27006,
27007,
27008,
27009,
27010,
27011,
27012
]
},
{
"shopid": 14,
"tab": 14,
"shopname": {
"key": "shop_shop_shopname_14",
"text": "第八章商店"
},
"upper_shop": {
"key": "shop_shop_upper_shop_14",
"text": "主线商店"
},
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
28001,
28002,
28003,
28004,
28005,
28006,
28007,
28008,
28009,
28010,
28011,
28012
]
}
]

3240
bin/json/game_shopitem.json
View File

File diff suppressed because it is too large Load Diff

18
bin/json/game_worldtask.json
View File

@ -33,7 +33,7 @@
"taskend_removeitem": [],
"auto_accept": 1,
"tasktips": 0,
"lock_add": 0,
"lock_add": 1,
"finish": [
3,
101
@ -44,7 +44,13 @@
"出生点-指挥部",
"901"
],
"reword": [],
"reword": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"module": []
},
{
@ -198,13 +204,7 @@
"key": "worldtask_world_task_npctxt_5",
"text": "打扫完获得阿宝"
},
"get_item": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"get_item": [],
"trigger": 0,
"npc": 100411,
"completetask": [],

7
modules/shop/api_getlist.go
View File

@ -24,7 +24,6 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.ShopGetList
func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) (errdata *pb.ErrorData) {
var (
err error
filed string
refresh int32
shopconf *cfg.GameShopData
shopData *pb.DBShop
@ -84,6 +83,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
tdata = configure.Now().Sub((time.Unix(sdata.LastRefreshTime, 0)))
switch shopconf.Rtype {
case -1: //一百年不刷新
ltime = 365 * 100 * 24 * time.Hour * time.Duration(shopconf.Rtime)
case 1:
ltime = time.Hour * time.Duration(shopconf.Rtime)
break
@ -189,7 +190,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
goods = transGoods(items, sdata)
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype105, 1)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype105, 1))
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, filed: sdata})
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, "shops": shopData.Shops})
} else if !req.IsManualRefresh {
// refresh := int(this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2))
isrefresh := false
@ -266,7 +267,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
}
goods = transGoods(items, sdata)
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: sdata})
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"shops": shopData.Shops})
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype105, 1))
} else { //返回以前的商品列表
keys := make([]int32, len(sdata.Items))

5
modules/shop/model_shop.go
View File

@ -39,8 +39,9 @@ func (this *modelShopComp) QueryUserShopData(uid string) (data *pb.DBShop, err e
if err == mgo.MongodbNil { //没有数据初始化数据
data = &pb.DBShop{
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Shops: make(map[int32]*pb.UserShopData),
}
err = this.Add(uid, data)
}