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-12-28 15:29:59 +08:00
commit f00e8d6d80
33 changed files with 2279 additions and 2284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_askedrecruit.json
View File

@ -111,11 +111,11 @@
}, },
"optionText1": { "optionText1": {
"key": "drawcard_asked_optionText1_8", "key": "drawcard_asked_optionText1_8",
"text": "有点强人所难。" "text": "有点强人所难"
}, },
"optionText2": { "optionText2": {
"key": "drawcard_asked_optionText9", "key": "drawcard_asked_optionText9",
"text": "我要全图鉴！" "text": "我要全图鉴"
} }
}, },
{ {

4
bin/json/game_battleready.json
View File

@ -2332,7 +2332,9 @@
"ChoseCamp": [], "ChoseCamp": [],
"DisableCamp": [], "DisableCamp": [],
"DefaultHero": 720021, "DefaultHero": 720021,
"ChoseHero": [], "ChoseHero": [
"24004"
],
"DisableHero": [], "DisableHero": [],
"LockSlots": [ "LockSlots": [
5 5

2
bin/json/game_buriedcondi.json
View File

@ -5931,7 +5931,7 @@
}, },
"value": 1, "value": 1,
"filter": [ "filter": [
1103013 1104031
], ],
"filter2": [ "filter2": [
"剧情ID", "剧情ID",

32
bin/json/game_cardpool.json
View File

@ -211,37 +211,37 @@
}, },
{ {
"key": 36, "key": 36,
"card_pool_type": "pro_pool20005", "card_pool_type": "pro_pool20004",
"id": "44001", "id": "44001",
"weight": 1 "weight": 1
}, },
{ {
"key": 37, "key": 37,
"card_pool_type": "pro_pool20005", "card_pool_type": "pro_pool20004",
"id": "44003", "id": "44003",
"weight": 1 "weight": 1
}, },
{ {
"key": 38, "key": 38,
"card_pool_type": "pro_pool20005", "card_pool_type": "pro_pool20004",
"id": "44004", "id": "44004",
"weight": 1 "weight": 1
}, },
{ {
"key": 39, "key": 39,
"card_pool_type": "pro_pool20005", "card_pool_type": "pro_pool20004",
"id": "44006", "id": "44006",
"weight": 1 "weight": 1
}, },
{ {
"key": 40, "key": 40,
"card_pool_type": "pro_pool20005", "card_pool_type": "pro_pool20004",
"id": "43002", "id": "43002",
"weight": 1 "weight": 1
}, },
{ {
"key": 41, "key": 41,
"card_pool_type": "pro_pool20005", "card_pool_type": "pro_pool20004",
"id": "43007", "id": "43007",
"weight": 1 "weight": 1
}, },
@ -475,61 +475,61 @@
}, },
{ {
"key": 80, "key": 80,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "34005", "id": "34005",
"weight": 1 "weight": 1
}, },
{ {
"key": 81, "key": 81,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "34008", "id": "34008",
"weight": 1 "weight": 1
}, },
{ {
"key": 82, "key": 82,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "13004", "id": "13004",
"weight": 1 "weight": 1
}, },
{ {
"key": 83, "key": 83,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "35006", "id": "35006",
"weight": 1 "weight": 1
}, },
{ {
"key": 84, "key": 84,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "44001", "id": "44001",
"weight": 1 "weight": 1
}, },
{ {
"key": 85, "key": 85,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "44003", "id": "44003",
"weight": 1 "weight": 1
}, },
{ {
"key": 86, "key": 86,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "44004", "id": "44004",
"weight": 1 "weight": 1
}, },
{ {
"key": 87, "key": 87,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "44006", "id": "44006",
"weight": 1 "weight": 1
}, },
{ {
"key": 88, "key": 88,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "43002", "id": "43002",
"weight": 1 "weight": 1
}, },
{ {
"key": 89, "key": 89,
"card_pool_type": "base_pool10005", "card_pool_type": "base_pool10004",
"id": "43007", "id": "43007",
"weight": 1 "weight": 1
}, },

2
bin/json/game_combatlevel.json
View File

@ -305,7 +305,7 @@
}, },
{ {
"id": 10009, "id": 10009,
"scene": "leveldemo_fcamer_Camelot", "scene": "leveldemo_chapter_2",
"levelname": "Save the holy tree", "levelname": "Save the holy tree",
"maintask": [ "maintask": [
11187003 11187003

2
bin/json/game_drawpool.json
View File

@ -12,7 +12,7 @@
"n3pool": "base_pool10003", "n3pool": "base_pool10003",
"n4pool": "base_pool10004", "n4pool": "base_pool10004",
"n5pool": "base_pool10005", "n5pool": "base_pool10005",
"baodi4": 0, "baodi4": 10,
"baidi5": 10, "baidi5": 10,
"etime": -1, "etime": -1,
"permission": -1, "permission": -1,

29
bin/json/game_drawreplace.json
View File

@ -16,7 +16,7 @@
"id": 2, "id": 2,
"pool": 1, "pool": 1,
"hero_initial": "14003", "hero_initial": "14003",
"hero_replace": "35004", "hero_replace": "35005",
"replace_cd": 0, "replace_cd": 0,
"replace_num": 0, "replace_num": 0,
"buy_cos": { "buy_cos": {
@ -55,19 +55,6 @@
"id": 5, "id": 5,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "15003",
"replace_cd": 5184000,
"replace_num": 0,
"buy_cos": {
"a": "item",
"t": "10000101",
"n": 100
}
},
{
"id": 6,
"pool": 2,
"hero_initial": "15002",
"hero_replace": "15004", "hero_replace": "15004",
"replace_cd": 5184000, "replace_cd": 5184000,
"replace_num": 200, "replace_num": 200,
@ -78,7 +65,7 @@
} }
}, },
{ {
"id": 7, "id": 6,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "15005", "hero_replace": "15005",
@ -91,7 +78,7 @@
} }
}, },
{ {
"id": 8, "id": 7,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "25002", "hero_replace": "25002",
@ -104,7 +91,7 @@
} }
}, },
{ {
"id": 9, "id": 8,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "15002", "hero_replace": "15002",
@ -117,7 +104,7 @@
} }
}, },
{ {
"id": 10, "id": 9,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "35002", "hero_replace": "35002",
@ -130,7 +117,7 @@
} }
}, },
{ {
"id": 11, "id": 10,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "35005", "hero_replace": "35005",
@ -143,7 +130,7 @@
} }
}, },
{ {
"id": 12, "id": 11,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "44005", "hero_replace": "44005",
@ -156,7 +143,7 @@
} }
}, },
{ {
"id": 13, "id": 12,
"pool": 2, "pool": 2,
"hero_initial": "15002", "hero_initial": "15002",
"hero_replace": "44002", "hero_replace": "44002",

77
bin/json/game_guide.json
View File

@ -127,17 +127,17 @@
"reward": [] "reward": []
}, },
{ {
"id": 1001901, "id": 1000201,
"group": 19, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",
"parameter": "", "parameter": "",
"interface": "", "interface": "",
"condition": "worldtaskexit_submit_20034", "condition": "worldtaskexit_submit_20034",
"followtj": "OpenNpcOption_支线-烹饪处的阿宝", "followtj": "",
"followguide": 0, "followguide": 1000202,
"finger": [ "finger": [
"maininterface", "taskDedailsPopup",
"btn_star$" "btn_star$"
], ],
"offset": { "offset": {
@ -169,15 +169,58 @@
"reward": [] "reward": []
}, },
{ {
"id": 1000201, "id": 1000202,
"group": 2, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",
"parameter": "", "parameter": "",
"interface": "", "interface": "",
"condition": "funcopen_hero", "condition": "",
"followtj": "OpenNpcOption_支线-烹饪处的阿宝",
"followguide": 1000203,
"finger": [
"maininterface",
"tasklist$",
"0"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0.5,
"objSize": {
"x": 0,
"y": 0
},
"objOffset": {
"x": 0,
"y": 0
},
"txt": "",
"txtoffset": {
"x": 0,
"y": 0
},
"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": "", "followtj": "",
"followguide": 1000202, "followguide": 1000204,
"finger": [ "finger": [
"maininterface", "maininterface",
"mainCom$.optionList$", "mainCom$.optionList$",
@ -212,7 +255,7 @@
"reward": [] "reward": []
}, },
{ {
"id": 1000202, "id": 1000204,
"group": 2, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",
@ -220,7 +263,7 @@
"interface": "", "interface": "",
"condition": "", "condition": "",
"followtj": "", "followtj": "",
"followguide": 1000203, "followguide": 1000205,
"finger": [ "finger": [
"taskDedailsPopup", "taskDedailsPopup",
"btn_star$" "btn_star$"
@ -254,7 +297,7 @@
"reward": [] "reward": []
}, },
{ {
"id": 1000203, "id": 1000205,
"group": 2, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",
@ -262,7 +305,7 @@
"interface": "", "interface": "",
"condition": "", "condition": "",
"followtj": "OpenHeroCard", "followtj": "OpenHeroCard",
"followguide": 1000204, "followguide": 1000206,
"finger": [ "finger": [
"maininterface", "maininterface",
"btn_card$" "btn_card$"
@ -296,7 +339,7 @@
"reward": [] "reward": []
}, },
{ {
"id": 1000204, "id": 1000206,
"group": 2, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",
@ -304,7 +347,7 @@
"interface": "", "interface": "",
"condition": "", "condition": "",
"followtj": "", "followtj": "",
"followguide": 1000205, "followguide": 1000207,
"finger": [ "finger": [
"herocard", "herocard",
"upbtn$" "upbtn$"
@ -338,7 +381,7 @@
"reward": [] "reward": []
}, },
{ {
"id": 1000205, "id": 1000207,
"group": 2, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",
@ -346,7 +389,7 @@
"interface": "", "interface": "",
"condition": "", "condition": "",
"followtj": "", "followtj": "",
"followguide": 1000206, "followguide": 1000208,
"finger": [ "finger": [
"herocard", "herocard",
"roleinformation$.upgrade materials$.list_select", "roleinformation$.upgrade materials$.list_select",
@ -382,7 +425,7 @@
"reward": [] "reward": []
}, },
{ {
"id": 1000206, "id": 1000208,
"group": 2, "group": 2,
"type": 3, "type": 3,
"startPar": "", "startPar": "",

57
bin/json/game_linestorymaintask.json
View File

@ -169,5 +169,62 @@
"mainstoryid": "9010", "mainstoryid": "9010",
"substoryid": "9010", "substoryid": "9010",
"img": "jsg_zj_pt01" "img": "jsg_zj_pt01"
},
{
"Id": 10,
"subTask": 9,
"group": 10001,
"nodeIndex": 0,
"order": "1",
"stageid": 20001,
"name": {
"key": "linestory_maintask_name_1",
"text": "让阿宝变强1"
},
"describe": {
"key": "linestory_maintask_describe_1",
"text": "让阿宝变强1"
},
"mainstoryid": "9010",
"substoryid": "9010",
"img": "jsg_zj_pt01"
},
{
"Id": 11,
"subTask": 10,
"group": 10001,
"nodeIndex": 1,
"order": "2",
"stageid": 20002,
"name": {
"key": "linestory_maintask_name_3",
"text": "让阿宝变强3"
},
"describe": {
"key": "linestory_maintask_describe_3",
"text": "让阿宝变强3"
},
"mainstoryid": "9010",
"substoryid": "9010",
"img": "jsg_zj_pt01"
},
{
"Id": 12,
"subTask": 11,
"group": 10001,
"nodeIndex": 2,
"order": "3",
"stageid": 20003,
"name": {
"key": "linestory_maintask_name_3",
"text": "让阿宝变强3"
},
"describe": {
"key": "linestory_maintask_describe_3",
"text": "让阿宝变强3"
},
"mainstoryid": "9010",
"substoryid": "9010",
"img": "jsg_zj_pt01"
} }
] ]

30
bin/json/game_monsterformat.json
View File

@ -237414,7 +237414,7 @@
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 2, "lv": 1,
"hppro": 0.6, "hppro": 0.6,
"atkpro": 0.5, "atkpro": 0.5,
"defpro": 1, "defpro": 1,
@ -237434,7 +237434,7 @@
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 2, "lv": 1,
"hppro": 0.5, "hppro": 0.5,
"atkpro": 0.5, "atkpro": 0.5,
"defpro": 1, "defpro": 1,
@ -237454,7 +237454,7 @@
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 2, "lv": 1,
"hppro": 0.5, "hppro": 0.5,
"atkpro": 0.5, "atkpro": 0.5,
"defpro": 1, "defpro": 1,
@ -237474,7 +237474,7 @@
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 2, "lv": 1,
"hppro": 0.6, "hppro": 0.6,
"atkpro": 0.5, "atkpro": 0.5,
"defpro": 0.1, "defpro": 0.1,
@ -237494,7 +237494,7 @@
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
"lv": 2, "lv": 1,
"hppro": 0.6, "hppro": 0.6,
"atkpro": 0.5, "atkpro": 0.5,
"defpro": 0.1, "defpro": 0.1,
@ -243212,26 +243212,6 @@
"speed": 140, "speed": 140,
"modelsize": 1 "modelsize": 1
}, },
{
"Id": 720021,
"pos": 2,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 24004,
"star": 4,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1.2,
"atkpro": 1.5,
"defpro": 0.5,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{ {
"Id": 720022, "Id": 720022,
"pos": 1, "pos": 1,

2
bin/json/game_opencond.json
View File

@ -20,7 +20,7 @@
"uiid": 0, "uiid": 0,
"activateType": 0, "activateType": 0,
"notify": [], "notify": [],
"kqbx": 1, "kqbx": 0,
"kqbx_ui": "btn_card", "kqbx_ui": "btn_card",
"kqbx_text": { "kqbx_text": {
"key": "opencond_opencond_kqbx_text_1", "key": "opencond_opencond_kqbx_text_1",

3430
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

36
bin/json/game_taskround.json
View File

@ -11,7 +11,7 @@
"text": "本周竞技场挑战10次" "text": "本周竞技场挑战10次"
}, },
"type_id": 13000001, "type_id": 13000001,
"active": 10, "active": 40,
"jump_interface": 156, "jump_interface": 156,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -39,7 +39,7 @@
"text": "本周竞技场挑战30次" "text": "本周竞技场挑战30次"
}, },
"type_id": 13000002, "type_id": 13000002,
"active": 10, "active": 40,
"jump_interface": 156, "jump_interface": 156,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -67,7 +67,7 @@
"text": "本周竞技场挑战50次" "text": "本周竞技场挑战50次"
}, },
"type_id": 13000003, "type_id": 13000003,
"active": 10, "active": 40,
"jump_interface": 156, "jump_interface": 156,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -100,7 +100,7 @@
"text": "本周竞技场胜利10次" "text": "本周竞技场胜利10次"
}, },
"type_id": 13000004, "type_id": 13000004,
"active": 10, "active": 40,
"jump_interface": 156, "jump_interface": 156,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -128,7 +128,7 @@
"text": "本周竞技场胜利20次" "text": "本周竞技场胜利20次"
}, },
"type_id": 13000005, "type_id": 13000005,
"active": 10, "active": 40,
"jump_interface": 156, "jump_interface": 156,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -156,7 +156,7 @@
"text": "本周竞技场胜利30次" "text": "本周竞技场胜利30次"
}, },
"type_id": 13000006, "type_id": 13000006,
"active": 10, "active": 40,
"jump_interface": 156, "jump_interface": 156,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -189,7 +189,7 @@
"text": "本周累计梦境回廊消耗300体力" "text": "本周累计梦境回廊消耗300体力"
}, },
"type_id": 13000007, "type_id": 13000007,
"active": 10, "active": 40,
"jump_interface": 10013, "jump_interface": 10013,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -217,7 +217,7 @@
"text": "本周累计梦境回廊消耗600体力" "text": "本周累计梦境回廊消耗600体力"
}, },
"type_id": 13000008, "type_id": 13000008,
"active": 10, "active": 40,
"jump_interface": 10013, "jump_interface": 10013,
"icon": "wp_icon_0001", "icon": "wp_icon_0001",
"reword": [ "reword": [
@ -245,7 +245,7 @@
"text": "本周累计梦境回廊消耗1000体力" "text": "本周累计梦境回廊消耗1000体力"
}, },
"type_id": 13000009, "type_id": 13000009,
"active": 10, "active": 40,
"jump_interface": 10013, "jump_interface": 10013,
"icon": "wp_icon_0002", "icon": "wp_icon_0002",
"reword": [ "reword": [
@ -278,7 +278,7 @@
"text": "本周累计消耗3000000点金币" "text": "本周累计消耗3000000点金币"
}, },
"type_id": 13000010, "type_id": 13000010,
"active": 10, "active": 40,
"jump_interface": 122, "jump_interface": 122,
"icon": "wp_icon_0003", "icon": "wp_icon_0003",
"reword": [ "reword": [
@ -306,7 +306,7 @@
"text": "本周累计消耗6000000点金币" "text": "本周累计消耗6000000点金币"
}, },
"type_id": 13000011, "type_id": 13000011,
"active": 10, "active": 40,
"jump_interface": 122, "jump_interface": 122,
"icon": "wp_icon_0004", "icon": "wp_icon_0004",
"reword": [ "reword": [
@ -334,7 +334,7 @@
"text": "本周累计消耗10000000点金币" "text": "本周累计消耗10000000点金币"
}, },
"type_id": 13000012, "type_id": 13000012,
"active": 10, "active": 40,
"jump_interface": 122, "jump_interface": 122,
"icon": "wp_icon_0005", "icon": "wp_icon_0005",
"reword": [ "reword": [
@ -367,7 +367,7 @@
"text": "本周累计维京远征消耗300体力" "text": "本周累计维京远征消耗300体力"
}, },
"type_id": 13000013, "type_id": 13000013,
"active": 10, "active": 40,
"jump_interface": 11012, "jump_interface": 11012,
"icon": "wp_icon_0006", "icon": "wp_icon_0006",
"reword": [ "reword": [
@ -395,7 +395,7 @@
"text": "本周累计维京远征消耗600体力" "text": "本周累计维京远征消耗600体力"
}, },
"type_id": 13000014, "type_id": 13000014,
"active": 10, "active": 40,
"jump_interface": 11012, "jump_interface": 11012,
"icon": "wp_icon_0007", "icon": "wp_icon_0007",
"reword": [ "reword": [
@ -423,7 +423,7 @@
"text": "本周累计维京远征消耗1000体力" "text": "本周累计维京远征消耗1000体力"
}, },
"type_id": 13000015, "type_id": 13000015,
"active": 10, "active": 40,
"jump_interface": 11012, "jump_interface": 11012,
"icon": "wp_icon_0008", "icon": "wp_icon_0008",
"reword": [ "reword": [
@ -456,7 +456,7 @@
"text": "本周累计猎魂挑战消耗300体力" "text": "本周累计猎魂挑战消耗300体力"
}, },
"type_id": 13000016, "type_id": 13000016,
"active": 10, "active": 40,
"jump_interface": 168, "jump_interface": 168,
"icon": "wp_icon_0009", "icon": "wp_icon_0009",
"reword": [ "reword": [
@ -484,7 +484,7 @@
"text": "本周累计猎魂挑战消耗600体力" "text": "本周累计猎魂挑战消耗600体力"
}, },
"type_id": 13000017, "type_id": 13000017,
"active": 10, "active": 40,
"jump_interface": 168, "jump_interface": 168,
"icon": "wp_icon_0010", "icon": "wp_icon_0010",
"reword": [ "reword": [
@ -512,7 +512,7 @@
"text": "本周累计猎魂挑战消耗1000体力" "text": "本周累计猎魂挑战消耗1000体力"
}, },
"type_id": 13000018, "type_id": 13000018,
"active": 10, "active": 40,
"jump_interface": 168, "jump_interface": 168,
"icon": "wp_icon_0011", "icon": "wp_icon_0011",
"reword": [ "reword": [

540
bin/json/game_tdherogrowup.json
View File

File diff suppressed because it is too large Load Diff

82
bin/json/game_tipstxtmain.json
View File

@ -64,17 +64,33 @@
"map": "" "map": ""
}, },
{ {
"id": 20230, "id": 20128,
"topname": { "topname": {
"key": "tipstxt_tipstxt_main_topname_05", "key": "tipstxt_tipstxt_main_topname_05",
"text": "原始人篇--第一幕" "text": "驯龙篇--终幕"
}, },
"name": { "name": {
"key": "tipstxt_tipstxt_main_name_05", "key": "tipstxt_tipstxt_main_name_05",
"text": "月光原石在哪里？" "text": "尾声"
}, },
"txt": { "txt": {
"key": "tipstxt_tipstxt_main_txt_05", "key": "tipstxt_tipstxt_main_txt_05",
"text": "在欢呼声与龙鸣的交错中，博客岛的冒险暂时告一段落。"
},
"map": ""
},
{
"id": 20230,
"topname": {
"key": "tipstxt_tipstxt_main_topname_06",
"text": "原始人篇--第一幕"
},
"name": {
"key": "tipstxt_tipstxt_main_name_06",
"text": "月光原石在哪里？"
},
"txt": {
"key": "tipstxt_tipstxt_main_txt_06",
"text": "目标！原石沙丘！（希望能和原始人友好相处。）" "text": "目标！原石沙丘！（希望能和原始人友好相处。）"
}, },
"map": "" "map": ""
@ -82,15 +98,15 @@
{ {
"id": 20256, "id": 20256,
"topname": { "topname": {
"key": "tipstxt_tipstxt_main_topname_06", "key": "tipstxt_tipstxt_main_topname_07",
"text": "原始人篇--第二幕" "text": "原始人篇--第二幕"
}, },
"name": { "name": {
"key": "tipstxt_tipstxt_main_name_06", "key": "tipstxt_tipstxt_main_name_07",
"text": "一家人要整整齐齐！" "text": "一家人要整整齐齐！"
}, },
"txt": { "txt": {
"key": "tipstxt_tipstxt_main_txt_06", "key": "tipstxt_tipstxt_main_txt_07",
"text": "小伊去哪了？（瓜哥！你在干什么啊瓜哥！）" "text": "小伊去哪了？（瓜哥！你在干什么啊瓜哥！）"
}, },
"map": "" "map": ""
@ -98,17 +114,65 @@
{ {
"id": 20258, "id": 20258,
"topname": { "topname": {
"key": "tipstxt_tipstxt_main_topname_07", "key": "tipstxt_tipstxt_main_topname_08",
"text": "原始人篇--第三幕" "text": "原始人篇--第三幕"
}, },
"name": { "name": {
"key": "tipstxt_tipstxt_main_name_07", "key": "tipstxt_tipstxt_main_name_08",
"text": "决战！冒牌神明！" "text": "决战！冒牌神明！"
}, },
"txt": { "txt": {
"key": "tipstxt_tipstxt_main_txt_07", "key": "tipstxt_tipstxt_main_txt_08",
"text": "没想到你是这样的瓜哥！（怎么反派都长这样？）" "text": "没想到你是这样的瓜哥！（怎么反派都长这样？）"
}, },
"map": "" "map": ""
},
{
"id": 20261,
"topname": {
"key": "tipstxt_tipstxt_main_topname_09",
"text": "原始人篇--终幕"
},
"name": {
"key": "tipstxt_tipstxt_main_name_09",
"text": "尾声"
},
"txt": {
"key": "tipstxt_tipstxt_main_txt_09",
"text": "瓜哥一家人再次团圆，该回中轴城了。"
},
"map": ""
},
{
"id": 20364,
"topname": {
"key": "tipstxt_tipstxt_main_topname_10",
"text": "坏蛋联盟篇--终幕"
},
"name": {
"key": "tipstxt_tipstxt_main_name_10",
"text": "尾声"
},
"txt": {
"key": "tipstxt_tipstxt_main_txt_10",
"text": "可喜可贺，可喜可贺。"
},
"map": ""
},
{
"id": 20370,
"topname": {
"key": "tipstxt_tipstxt_main_topname_11",
"text": "童话王国篇--终幕"
},
"name": {
"key": "tipstxt_tipstxt_main_name_11",
"text": "尾声"
},
"txt": {
"key": "tipstxt_tipstxt_main_txt_11",
"text": "冒险告一段落，我们该回去了。"
},
"map": ""
} }
] ]

120
bin/json/game_vikingboss.json
View File

@ -13,7 +13,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -77,7 +78,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -136,7 +138,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -200,7 +203,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -259,7 +263,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -323,7 +328,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -387,7 +393,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -456,7 +463,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -520,7 +528,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -589,7 +598,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -658,7 +668,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -727,7 +738,8 @@
25001, 25001,
25004, 25004,
35005, 35005,
25003 25003,
15003
], ],
"firstprize": [ "firstprize": [
{ {
@ -791,7 +803,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -855,7 +868,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -914,7 +928,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -978,7 +993,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1037,7 +1053,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1101,7 +1118,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1165,7 +1183,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1234,7 +1253,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1298,7 +1318,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1367,7 +1388,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1436,7 +1458,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1505,7 +1528,8 @@
14007, 14007,
25003, 25003,
34006, 34006,
15003 15003,
14003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1568,7 +1592,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1631,7 +1657,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1689,7 +1717,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1752,7 +1782,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1810,7 +1842,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1873,7 +1907,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -1936,7 +1972,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -2004,7 +2042,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -2067,7 +2107,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -2135,7 +2177,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -2203,7 +2247,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {
@ -2271,7 +2317,9 @@
"captionrecommend": [ "captionrecommend": [
25003, 25003,
34006, 34006,
15003 14001,
44006,
45003
], ],
"firstprize": [ "firstprize": [
{ {

2
modules/caravan/api_getlist.go
View File

@ -24,7 +24,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe
return // 参数校验失败直接返回 return // 参数校验失败直接返回
} }
list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId()) list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId())
endtime := utils.WeekIntervalTime() endtime := utils.WeekIntervalTime(configure.Now().Unix())
if list.Resettime != endtime { // 初始化门票和虚拟币 if list.Resettime != endtime { // 初始化门票和虚拟币
this.module.ModuleUser.CleanUserMerchantmoney(session) this.module.ModuleUser.CleanUserMerchantmoney(session)
if conf, err := this.module.configure.GetCaravanLv(list.Lv); err == nil { if conf, err := this.module.configure.GetCaravanLv(list.Lv); err == nil {

2
modules/entertainment/api_getlist.go
View File

@ -38,7 +38,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.EntertainGetList
update["touxiang"] = list.Touxiang // 每天投降次数清0 update["touxiang"] = list.Touxiang // 每天投降次数清0
update["rtime"] = list.Rtime update["rtime"] = list.Rtime
update["playtype"] = list.Playtype update["playtype"] = list.Playtype
_, endSeasonTime := utils.GetMonthStartEnd() endSeasonTime := utils.GetMonthEnd(configure.Now().Unix())
if list.Etime > endSeasonTime { if list.Etime > endSeasonTime {
list.Etime = endSeasonTime list.Etime = endSeasonTime
update["etime"] = list.Etime update["etime"] = list.Etime

3
modules/entertainment/model.go
View File

@ -6,6 +6,7 @@ import (
"go_dreamfactory/lego/sys/mgo" "go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils" "go_dreamfactory/utils"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
@ -53,7 +54,7 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err
result.Uid = uid result.Uid = uid
result.Reward = make(map[int32]int32) result.Reward = make(map[int32]int32)
result.Card = make(map[string]int32) result.Card = make(map[string]int32)
_, endSeasonTime := utils.GetMonthStartEnd() endSeasonTime := utils.GetMonthEnd(configure.Now().Unix())
result.Etime = endSeasonTime result.Etime = endSeasonTime
// 初始化默认获得类型为1的卡片 // 初始化默认获得类型为1的卡片

3
modules/guildgve/modelrank.go
View File

@ -8,6 +8,7 @@ import (
"go_dreamfactory/lego/sys/redis/pipe" "go_dreamfactory/lego/sys/redis/pipe"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils" "go_dreamfactory/utils"
"sync" "sync"
@ -62,7 +63,7 @@ func (this *modelRank) updateRank(guilds ...*pb.DBGuildGve) (err error) {
) )
menbers = make([]*redis.Z, len(guilds)) menbers = make([]*redis.Z, len(guilds))
for i, v := range guilds { for i, v := range guilds {
endtime := time.Unix(utils.WeekIntervalTime(), 0) endtime := time.Unix(utils.WeekIntervalTime(configure.Now().Unix()), 0)
start := time.Unix(v.Lastkilltime, 0) start := time.Unix(v.Lastkilltime, 0)
seconds := endtime.Sub(start).Seconds() seconds := endtime.Sub(start).Seconds()
Integral := float64(v.Kills)*float64(10000000000) + seconds Integral := float64(v.Kills)*float64(10000000000) + seconds

2
modules/hero/hero_test.go
View File

@ -188,7 +188,7 @@ func Test_Main(t *testing.T) {
hero := &pb.DBHero{} hero := &pb.DBHero{}
value, err := strconv.Atoi("944005411") value, err := strconv.Atoi("944005411")
fmt.Printf("%v,%v,%d,%v,%v", value, err, utils.WeekIntervalTime(), sz, hero) fmt.Printf("%v,%v,%d,%v,%v", value, err, utils.WeekIntervalTime(configure.Now().Unix()), sz, hero)
ids := utils.RandomNumbers(0, 10, 5) ids := utils.RandomNumbers(0, 10, 5)
for _, v := range ids { for _, v := range ids {
fmt.Printf("%d", v) fmt.Printf("%d", v)

2
modules/jielong/api_lvlist.go
View File

@ -34,7 +34,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.JielongGetListRe
} }
if list.Lasttime < configure.Now().Unix() { if list.Lasttime < configure.Now().Unix() {
update := make(map[string]interface{}, 0) update := make(map[string]interface{}, 0)
list.Lasttime = utils.WeekIntervalTime() list.Lasttime = utils.WeekIntervalTime(configure.Now().Unix())
list.Curwin = 0 // 本周连胜 list.Curwin = 0 // 本周连胜
list.Weekmax = 0 // 本周最大连胜 list.Weekmax = 0 // 本周最大连胜
list.Reward = map[int32]int32{} list.Reward = map[int32]int32{}

3
modules/jielong/mode_jielong.go
View File

@ -6,6 +6,7 @@ import (
"go_dreamfactory/lego/sys/mgo" "go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils" "go_dreamfactory/utils"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
@ -40,7 +41,7 @@ func (this *ModelJielong) getUserJielongData(uid string) (results *pb.DBJielongD
Uid: uid, Uid: uid,
Reward: map[int32]int32{}, Reward: map[int32]int32{},
Gotarr: map[int32]int32{}, Gotarr: map[int32]int32{},
Lasttime: utils.WeekIntervalTime(), Lasttime: utils.WeekIntervalTime(configure.Now().Unix()),
} }
err = this.Add(uid, results) err = this.Add(uid, results)
} }

2
modules/pagoda/module.go
View File

@ -235,7 +235,7 @@ func (this *Pagoda) Rpc_ModuleSeasonPagodaReward(ctx context.Context, args *pb.E
func (this *Pagoda) GetSeasonData() (endSeasonTime int64) { func (this *Pagoda) GetSeasonData() (endSeasonTime int64) {
_, endSeasonTime = utils.GetMonthStartEnd() //+ int64((6-d)*3600*24) endSeasonTime = utils.GetMonthEnd(configure.Now().Unix()) //+ int64((6-d)*3600*24)
return endSeasonTime return endSeasonTime
} }

55
modules/shop/api_getlist.go
View File

@ -6,6 +6,7 @@ import (
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils"
"time" "time"
) )
@ -31,8 +32,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
sdata *pb.UserShopData sdata *pb.UserShopData
items []*cfg.GameShopitemData items []*cfg.GameShopitemData
goods []*pb.ShopItem goods []*pb.ShopItem
tdata time.Duration
ltime time.Duration
equiconf *cfg.GameEquipData equiconf *cfg.GameEquipData
equibuyconf *cfg.GameShopBuyequiCosData equibuyconf *cfg.GameShopBuyequiCosData
leftrefnum int32 leftrefnum int32
@ -81,23 +80,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
leftrefnum = shopconf.Rnum leftrefnum = shopconf.Rnum
} }
tdata = configure.Now().Sub((time.Unix(sdata.LastRefreshTime, 0)))
switch shopconf.Rtype {
case -1: //一百年不刷新
ltime = 365 * 20 * 24 * time.Hour
case 1:
ltime = time.Hour * time.Duration(shopconf.Rtime)
break
case 2:
ltime = 24 * time.Hour * time.Duration(shopconf.Rtime)
break
case 3:
ltime = 7 * 24 * time.Hour * time.Duration(shopconf.Rtime)
break
case 4:
ltime = 30 * 7 * 24 * time.Hour * time.Duration(shopconf.Rtime)
break
}
if req.IsManualRefresh && shopconf.Rnum > 0 { //可以手动刷新 if req.IsManualRefresh && shopconf.Rnum > 0 { //可以手动刷新
isrefresh := false isrefresh := false
if refresh > 0 { // if refresh > 0 { //
@ -192,22 +174,26 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
tasks = append(tasks, comm.GetBuriedParam(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, "shops": shopData.Shops}) this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, "shops": shopData.Shops})
} else if !req.IsManualRefresh { } else if !req.IsManualRefresh {
// refresh := int(this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2)) isrefresh := configure.Now().After((time.Unix(sdata.LastRefreshTime, 0)))
isrefresh := false
// if refresh > 0 { //
// if time.Unix(shopData.RefreshtimegoldShop, 0).Day() < configure.Now().Day() {
// shopData.RefreshtimegoldShop = configure.Now().Unix()
// shopData.RefreshnumgoldShop = 0
// }
// if int(shopData.RefreshnumgoldShop) < refresh {
// isrefresh = true
// }
// } else {
if tdata > ltime { //达到刷新时间 可以刷新商品列表
isrefresh = true
}
// }
if isrefresh { if isrefresh {
//重新计算刷新时间点
switch shopconf.Rtype {
case -1: //一百年不刷新
sdata.LastRefreshTime = 0
case 1:
sdata.LastRefreshTime = configure.Now().Add(time.Hour * time.Duration(shopconf.Rtime)).Unix()
break
case 2:
sdata.LastRefreshTime = utils.GetZeroTime(configure.Now().Unix())
break
case 3:
sdata.LastRefreshTime = utils.WeekIntervalTime(configure.Now().Unix())
break
case 4:
sdata.LastRefreshTime = utils.GetMonthEnd(configure.Now().Unix())
break
}
var _items []*cfg.GameShopitemData var _items []*cfg.GameShopitemData
for _, v := range shopconf.Shopitem { for _, v := range shopconf.Shopitem {
if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 { if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {
@ -221,7 +207,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
} }
items = append(items, randomGoods(_items)) items = append(items, randomGoods(_items))
} }
sdata.LastRefreshTime = configure.Now().Unix()
sdata.Items = make([]*pb.UserShopGood, len(items)) sdata.Items = make([]*pb.UserShopGood, len(items))
sdata.Preview = make(map[int32]*pb.UserShopDataEx) sdata.Preview = make(map[int32]*pb.UserShopDataEx)
for i, v := range items { for i, v := range items {

2
modules/stonehenge/api_getlist.go
View File

@ -50,7 +50,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.StonehengeGetLis
update["hero"] = stone.Hero update["hero"] = stone.Hero
stone.Addweight = make(map[int32]int32, 0) stone.Addweight = make(map[int32]int32, 0)
update["addweight"] = stone.Addweight update["addweight"] = stone.Addweight
stone.Etime = utils.WeekIntervalTime() stone.Etime = utils.WeekIntervalTime(configure.Now().Unix())
update["etime"] = stone.Etime update["etime"] = stone.Etime
stone.Integral = 0 stone.Integral = 0
update["integral"] = stone.Integral update["integral"] = stone.Integral

7
modules/stonehenge/modelStonehenge.go
View File

@ -7,6 +7,7 @@ import (
"go_dreamfactory/lego/sys/mgo" "go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils" "go_dreamfactory/utils"
"sync" "sync"
@ -63,7 +64,7 @@ func (this *MStonehenge) GetStonehengeData(uid string) (info *pb.DBStonehenge, e
Userbuff: make(map[int32]int32), Userbuff: make(map[int32]int32),
Reward: make(map[int32]bool), Reward: make(map[int32]bool),
Addweight: make(map[int32]int32), Addweight: make(map[int32]int32),
Etime: utils.WeekIntervalTime(), Etime: utils.WeekIntervalTime(configure.Now().Unix()),
Hero: make(map[string]*pb.BattleRole), Hero: make(map[string]*pb.BattleRole),
Talent: make(map[int32]bool), Talent: make(map[int32]bool),
Talentproperty: make(map[string]int32), Talentproperty: make(map[string]int32),
@ -92,10 +93,10 @@ func (this *MStonehenge) reLoadStoneBoos() (err error) {
this.lock.Lock() this.lock.Lock()
this.bossStage = this.module.configure.CheckStage() this.bossStage = this.module.configure.CheckStage()
this.lock.Unlock() this.lock.Unlock()
if len(s.Bossstage) != len(this.bossStage) || utils.WeekIntervalTime() != s.Rtime { if len(s.Bossstage) != len(this.bossStage) || utils.WeekIntervalTime(configure.Now().Unix()) != s.Rtime {
this.module.ModuleTools.UpdateGlobalData(StoneBossKey, map[string]interface{}{ this.module.ModuleTools.UpdateGlobalData(StoneBossKey, map[string]interface{}{
"BossStage": this.bossStage, "BossStage": this.bossStage,
"rtime": utils.WeekIntervalTime(), "rtime": utils.WeekIntervalTime(configure.Now().Unix()),
}) })
} else { } else {
this.lock.Lock() this.lock.Lock()

2
modules/timer/caravanrank.go
View File

@ -83,7 +83,7 @@ func (this *CaravanRank) Start() (err error) {
} }
func (this *CaravanRank) TimerSeason() { func (this *CaravanRank) TimerSeason() {
endTime := utils.WeekIntervalTime() endTime := utils.WeekIntervalTime(configure.Now().Unix())
this.module.Debugf("TimerSeason end: %d,cur time:%d", endTime, configure.Now().Unix()) this.module.Debugf("TimerSeason end: %d,cur time:%d", endTime, configure.Now().Unix())
if err := this.service.RpcCall( if err := this.service.RpcCall(

2
modules/user/model_sign.go
View File

@ -89,7 +89,7 @@ func (this *ModelSign) UserSign(session comm.IUserSession) {
lastSignTime = sign.SignTime lastSignTime = sign.SignTime
sign.SignTime = configure.Now().Unix() sign.SignTime = configure.Now().Unix()
start, _ := utils.GetMonthStartEnd() start := utils.GetMonthStart()
iDay := (configure.Now().Unix() - start) / (24 * 3600) iDay := (configure.Now().Unix() - start) / (24 * 3600)
if sign.SignTime < start { // 重置 if sign.SignTime < start { // 重置
sign.SignCount = 1 sign.SignCount = 1

1
sys/configure/structs/Game.FightEventType.go
View File

@ -43,4 +43,5 @@ const (
GameFightEventType_OnShiftBuffEnd = 31 GameFightEventType_OnShiftBuffEnd = 31
GameFightEventType_OnAddShieldEnd = 32 GameFightEventType_OnAddShieldEnd = 32
GameFightEventType_OnBuffEnd = 33 GameFightEventType_OnBuffEnd = 33
GameFightEventType_OnDrawActValue = 34
) )

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

@ -17,7 +17,6 @@ type GameTDHeroGrowupData struct {
Hp int32 Hp int32
Atk int32 Atk int32
Need []*Gameatn Need []*Gameatn
Skillunlock int32
} }
const TypeId_GameTDHeroGrowupData = -1790183618 const TypeId_GameTDHeroGrowupData = -1790183618
@ -46,7 +45,6 @@ func (_v *GameTDHeroGrowupData)Deserialize(_buf map[string]interface{}) (err err
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillunlock"].(float64); !_ok_ { err = errors.New("skillunlock error"); return }; _v.Skillunlock = int32(_tempNum_) }
return return
} }

14
utils/time.go
View File

@ -138,17 +138,15 @@ func GetMonthStart() int64 {
return _d1 return _d1
} }
// 获取本月的开始和结束的时间戳 // 获取本月的结束的时间戳
func GetMonthStartEnd() (int64, int64) { func GetMonthEnd(curTime int64) int64 {
t := configure.Now() t := time.Unix(curTime, 0)
monthStartDay := t.AddDate(0, 0, -t.Day()+1) monthStartDay := t.AddDate(0, 0, -t.Day()+1)
monthStartTime := time.Date(monthStartDay.Year(), monthStartDay.Month(), monthStartDay.Day(), 0, 0, 0, 0, t.Location()) monthStartTime := time.Date(monthStartDay.Year(), monthStartDay.Month(), monthStartDay.Day(), 0, 0, 0, 0, t.Location())
monthEndDay := monthStartTime.AddDate(0, 1, -1) monthEndDay := monthStartTime.AddDate(0, 1, -1)
monthEndTime := time.Date(monthEndDay.Year(), monthEndDay.Month(), monthEndDay.Day(), 23, 59, 59, 0, t.Location()) monthEndTime := time.Date(monthEndDay.Year(), monthEndDay.Month(), monthEndDay.Day(), 23, 59, 59, 0, t.Location())
_d1 := monthStartTime.Unix()
_d2 := monthEndTime.Unix() _d2 := monthEndTime.Unix()
fmt.Printf("%d,%d", _d1, _d2) return _d2
return _d1, _d2
} }
// 获取今天零点时间戳 // 获取今天零点时间戳
@ -186,8 +184,8 @@ func DiffDays(t1, t2 int64) int {
return diffDays return diffDays
} }
func WeekIntervalTime() (endTime int64) { func WeekIntervalTime(curTime int64) (endTime int64) {
now := time.Now() now := time.Unix(curTime, 0)
offset := int(time.Monday - now.Weekday()) offset := int(time.Monday - now.Weekday())
//周日做特殊判断 因为time.Monday = 0 //周日做特殊判断 因为time.Monday = 0
if offset > 0 { if offset > 0 {

10
utils/utils_test.go
View File

@ -119,9 +119,17 @@ func TestIsSameWeek(t *testing.T) {
} }
func TestWeekIntervalTime(t *testing.T) { func TestWeekIntervalTime(t *testing.T) {
ti := utils.WeekIntervalTime() ti := utils.WeekIntervalTime(time.Now().Unix())
format := "2006-01-02 15:04:05" format := "2006-01-02 15:04:05"
formattedTime := time.Unix(ti, 0).Format(format) formattedTime := time.Unix(ti, 0).Format(format)
fmt.Println(formattedTime) fmt.Println(formattedTime)
} }
func TestGetZeroTime(t *testing.T) {
ti := utils.GetZeroTime(time.Now().Unix())
fmt.Println(ti)
format := "2006-01-02 15:04:05"
formattedTime := time.Unix(ti, 0).Format(format)
fmt.Println(formattedTime)
}