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:
liwei 2023-08-07 09:52:23 +08:00
commit efc62cab6e
35 changed files with 3605 additions and 853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
bin/json/game_battleready.json
View File

@ -446,7 +446,7 @@
"disableAiCamera": 0, "disableAiCamera": 0,
"ChoseCamp": [], "ChoseCamp": [],
"DisableCamp": [], "DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 720015,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
"LockSlots": [], "LockSlots": [],
@ -870,5 +870,84 @@
"AssistTeam": 0, "AssistTeam": 0,
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 50 "Numrounds": 50
},
{
"id": 136,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 1,
"ShowBuff": 0,
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720015,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [
"13002"
],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 137,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 1,
"ShowBuff": 0,
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [
"44005",
"34004"
],
"LockSlots": [],
"HeroCheck": [
"13002"
],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 138,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_03",
"battleScenes": [
"scenesfight_05_01"
],
"HideAlienSpace": 1,
"ShowBuff": 0,
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
} }
] ]

1062
bin/json/game_caravancity.json
View File

File diff suppressed because it is too large Load Diff

176
bin/json/game_caravanlv.json
View File

@ -2,17 +2,17 @@
{ {
"lv": 0, "lv": 0,
"newmoneyexp": 0, "newmoneyexp": 0,
"bagtop": 50, "bagtop": 3000,
"bagtagnum": 10, "bagtagnum": 10,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 50 "n": 20
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10000 "n": 100000
}, },
"bargainpro": 10000, "bargainpro": 10000,
"bargainnum": 1, "bargainnum": 1,
@ -20,301 +20,251 @@
}, },
{ {
"lv": 1, "lv": 1,
"newmoneyexp": 100000, "newmoneyexp": 500000,
"bagtop": 60, "bagtop": 3500,
"bagtagnum": 12, "bagtagnum": 12,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 60 "n": 21
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10001 "n": 110000
}, },
"bargainpro": 12000, "bargainpro": 12000,
"bargainnum": 1, "bargainnum": 1,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 1000 "n": 200
} }
] ]
}, },
{ {
"lv": 2, "lv": 2,
"newmoneyexp": 200000, "newmoneyexp": 1000000,
"bagtop": 70, "bagtop": 4000,
"bagtagnum": 14, "bagtagnum": 14,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 70 "n": 22
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10002 "n": 120000
}, },
"bargainpro": 14000, "bargainpro": 14000,
"bargainnum": 1, "bargainnum": 1,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 2000 "n": 200
} }
] ]
}, },
{ {
"lv": 3, "lv": 3,
"newmoneyexp": 300000, "newmoneyexp": 3000000,
"bagtop": 80, "bagtop": 4500,
"bagtagnum": 16, "bagtagnum": 16,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 80 "n": 23
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10003 "n": 130000
}, },
"bargainpro": 16000, "bargainpro": 16000,
"bargainnum": 2, "bargainnum": 2,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 3000 "n": 200
} }
] ]
}, },
{ {
"lv": 4, "lv": 4,
"newmoneyexp": 400000, "newmoneyexp": 5000000,
"bagtop": 90, "bagtop": 5000,
"bagtagnum": 18, "bagtagnum": 18,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 90 "n": 24
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10004 "n": 140000
}, },
"bargainpro": 20000, "bargainpro": 20000,
"bargainnum": 2, "bargainnum": 2,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 4000 "n": 200
} }
] ]
}, },
{ {
"lv": 5, "lv": 5,
"newmoneyexp": 500000, "newmoneyexp": 10000000,
"bagtop": 100, "bagtop": 5500,
"bagtagnum": 20, "bagtagnum": 20,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 100 "n": 25
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10005 "n": 150000
}, },
"bargainpro": 25000, "bargainpro": 25000,
"bargainnum": 2, "bargainnum": 2,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 5000 "n": 200
} }
] ]
}, },
{ {
"lv": 6, "lv": 6,
"newmoneyexp": 600000, "newmoneyexp": 15000000,
"bagtop": 110, "bagtop": 6000,
"bagtagnum": 22, "bagtagnum": 22,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 110 "n": 26
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10006 "n": 160000
}, },
"bargainpro": 30000, "bargainpro": 30000,
"bargainnum": 3, "bargainnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 6000 "n": 200
} }
] ]
}, },
{ {
"lv": 7, "lv": 7,
"newmoneyexp": 700000, "newmoneyexp": 20000000,
"bagtop": 120, "bagtop": 6500,
"bagtagnum": 24, "bagtagnum": 24,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 120 "n": 27
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10007 "n": 170000
}, },
"bargainpro": 35000, "bargainpro": 35000,
"bargainnum": 3, "bargainnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 7000 "n": 200
} }
] ]
}, },
{ {
"lv": 8, "lv": 8,
"newmoneyexp": 800000, "newmoneyexp": 30000000,
"bagtop": 130, "bagtop": 7000,
"bagtagnum": 26, "bagtagnum": 26,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 130 "n": 28
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10008 "n": 180000
}, },
"bargainpro": 40000, "bargainpro": 40000,
"bargainnum": 3, "bargainnum": 3,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 8000 "n": 200
} }
] ]
}, },
{ {
"lv": 9, "lv": 9,
"newmoneyexp": 900000, "newmoneyexp": 40000000,
"bagtop": 140, "bagtop": 7500,
"bagtagnum": 28, "bagtagnum": 28,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 140 "n": 29
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10009 "n": 190000
}, },
"bargainpro": 45000, "bargainpro": 45000,
"bargainnum": 4, "bargainnum": 4,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 9000 "n": 200
} }
] ]
}, },
{ {
"lv": 10, "lv": 10,
"newmoneyexp": 1000000, "newmoneyexp": 50000000,
"bagtop": 150, "bagtop": 8000,
"bagtagnum": 30, "bagtagnum": 30,
"tickettop": { "tickettop": {
"a": "item", "a": "item",
"t": "21000001", "t": "21000001",
"n": 150 "n": 30
}, },
"moneynumtop": { "moneynumtop": {
"a": "attr", "a": "attr",
"t": "merchantmoney", "t": "merchantmoney",
"n": 10010 "n": 200000
}, },
"bargainpro": 50000, "bargainpro": 50000,
"bargainnum": 4, "bargainnum": 4,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "diamond",
"n": 10000 "n": 200
}
]
},
{
"lv": 11,
"newmoneyexp": 1100000,
"bagtop": 160,
"bagtagnum": 30,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 160
},
"moneynumtop": {
"a": "attr",
"t": "merchantmoney",
"n": 10011
},
"bargainpro": 55000,
"bargainnum": 4,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 11000
}
]
},
{
"lv": 12,
"newmoneyexp": 1200000,
"bagtop": 200,
"bagtagnum": 35,
"tickettop": {
"a": "item",
"t": "21000001",
"n": 170
},
"moneynumtop": {
"a": "attr",
"t": "merchantmoney",
"n": 10012
},
"bargainpro": 60000,
"bargainnum": 5,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 12000
} }
] ]
} }

603
bin/json/game_caravanrank.json
View File

@ -6,7 +6,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 3000 "n": 1000000
},
{
"a": "attr",
"t": "diamond",
"n": 300
} }
] ]
}, },
@ -17,18 +22,28 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 2000 "n": 800000
},
{
"a": "attr",
"t": "diamond",
"n": 250
} }
] ]
}, },
{ {
"id": 3, "id": 3,
"group": 3, "group": 2,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 1000 "n": 800000
},
{
"a": "attr",
"t": "diamond",
"n": 250
} }
] ]
}, },
@ -39,7 +54,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -50,7 +70,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -61,7 +86,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -72,7 +102,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -83,7 +118,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -94,7 +134,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -105,7 +150,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 500 "n": 600000
},
{
"a": "attr",
"t": "diamond",
"n": 200
} }
] ]
}, },
@ -116,7 +166,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -127,7 +182,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -138,7 +198,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -149,7 +214,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -160,7 +230,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -171,7 +246,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -182,7 +262,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -193,7 +278,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -204,7 +294,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -215,7 +310,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 300 "n": 500000
},
{
"a": "attr",
"t": "diamond",
"n": 180
} }
] ]
}, },
@ -226,7 +326,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -237,7 +342,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -248,7 +358,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -259,7 +374,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -270,7 +390,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -281,7 +406,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -292,7 +422,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -303,7 +438,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -314,7 +454,12 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
@ -325,18 +470,412 @@
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 200 "n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
} }
] ]
}, },
{ {
"id": 31, "id": 31,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 32,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 33,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 34,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 35,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 36,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 37,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 38,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 39,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 40,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 41,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 42,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 43,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 44,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 45,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 46,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 47,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 48,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 49,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 50,
"group": 21,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 400000
},
{
"a": "attr",
"t": "diamond",
"n": 160
}
]
},
{
"id": 51,
"group": 31,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 300000
},
{
"a": "attr",
"t": "diamond",
"n": 140
}
]
},
{
"id": 200,
"group": 31,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 300000
},
{
"a": "attr",
"t": "diamond",
"n": 140
}
]
},
{
"id": 201,
"group": 41,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 200000
},
{
"a": "attr",
"t": "diamond",
"n": 120
}
]
},
{
"id": 500,
"group": 41,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 200000
},
{
"a": "attr",
"t": "diamond",
"n": 120
}
]
},
{
"id": 501,
"group": 0, "group": 0,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 10 "n": 100000
},
{
"a": "attr",
"t": "diamond",
"n": 100
} }
] ]
} }

44
bin/json/game_caravanreward.json
View File

@ -1,67 +1,89 @@
[ [
{ {
"id": 1, "id": 1,
"key": 3000, "key": 50000,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 100 "n": 300000
} }
] ]
}, },
{ {
"id": 2, "id": 2,
"key": 4000, "key": 100000,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 1000 "n": 350000
} }
] ]
}, },
{ {
"id": 3, "id": 3,
"key": 5000, "key": 200000,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 2000 "n": 400000
} }
] ]
}, },
{ {
"id": 4, "id": 4,
"key": 6000, "key": 300000,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 3000 "n": 450000
} }
] ]
}, },
{ {
"id": 5, "id": 5,
"key": 7000, "key": 500000,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 9999 "n": 500000
} }
] ]
}, },
{ {
"id": 6, "id": 6,
"key": 1000000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 550000
}
]
},
{
"id": 7,
"key": 2000000,
"reward": [
{
"a": "attr",
"t": "gold",
"n": 600000
}
]
},
{
"id": 8,
"key": -10, "key": -10,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",
"t": "gold", "t": "gold",
"n": 10 "n": 1
} }
] ]
} }

966
bin/json/game_caravanthing.json
View File

File diff suppressed because it is too large Load Diff

43
bin/json/game_item.json
View File

@ -16474,5 +16474,48 @@
"n": 1000 "n": 1000
} }
] ]
},
{
"id": "17040001",
"name": {
"key": "item_item_name_375",
"text": "4星无极套装宝箱"
},
"usetype": 5,
"color": 4,
"bagtype": 1,
"index": 18,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "effect_ui_bagwindow_2",
"modelName": "",
"box_id": 17111040,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [
122
],
"use_skip": 0,
"upper_limit": 99,
"img": "item_17030001",
"intr": {
"key": "item_item_intr_384",
"text": "开启后，可以获得一套4星装备。"
},
"describe": {
"key": "item_item_describe_384",
"text": "此处是包装描述"
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
} }
] ]

432
bin/json/game_lottery.json
View File

@ -24190,5 +24190,437 @@
"playerlvmin": 0, "playerlvmin": 0,
"playerlvmax": 0, "playerlvmax": 0,
"notice": 0 "notice": 0
},
{
"id": 1009,
"lotteryid": 22003001,
"description": "首充礼包第一档第一天",
"type": 1,
"groupwt": 1000,
"groupid": 220023,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "hero",
"t": "14003",
"n": 1
},
"itemdes": "首充礼包第一档第一天",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1010,
"lotteryid": 22003001,
"description": "首充礼包第一档第一天",
"type": 1,
"groupwt": 1000,
"groupid": 220023,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第一档第一天",
"itemwt": 1000,
"min": 15,
"max": 15,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1011,
"lotteryid": 22003002,
"description": "首充礼包第一档第二天",
"type": 1,
"groupwt": 1000,
"groupid": 220024,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000001",
"n": 1
},
"itemdes": "首充礼包第一档第二天",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1012,
"lotteryid": 22003002,
"description": "首充礼包第一档第二天",
"type": 1,
"groupwt": 1000,
"groupid": 220024,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第一档第二天",
"itemwt": 1000,
"min": 15,
"max": 15,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1013,
"lotteryid": 22003003,
"description": "首充礼包第一档第三天",
"type": 1,
"groupwt": 1000,
"groupid": 220025,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000001",
"n": 1
},
"itemdes": "首充礼包第一档第三天",
"itemwt": 1000,
"min": 2,
"max": 2,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1014,
"lotteryid": 22003003,
"description": "首充礼包第一档第三天",
"type": 1,
"groupwt": 1000,
"groupid": 220025,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第一档第三天",
"itemwt": 1000,
"min": 15,
"max": 15,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1015,
"lotteryid": 22004001,
"description": "首充礼包第二档第一天",
"type": 1,
"groupwt": 1000,
"groupid": 220026,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000001",
"n": 1
},
"itemdes": "首充礼包第二档第一天",
"itemwt": 1000,
"min": 10,
"max": 10,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1016,
"lotteryid": 22004001,
"description": "首充礼包第二档第一天",
"type": 1,
"groupwt": 1000,
"groupid": 220026,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第二档第一天",
"itemwt": 1000,
"min": 40,
"max": 40,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1017,
"lotteryid": 22004002,
"description": "首充礼包第二档第二天",
"type": 1,
"groupwt": 1000,
"groupid": 220027,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "17060007",
"n": 1
},
"itemdes": "首充礼包第二档第二天",
"itemwt": 1000,
"min": 20,
"max": 20,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1018,
"lotteryid": 22004002,
"description": "首充礼包第二档第二天",
"type": 1,
"groupwt": 1000,
"groupid": 220027,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第二档第二天",
"itemwt": 1000,
"min": 30,
"max": 30,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1019,
"lotteryid": 22004003,
"description": "首充礼包第二档第三天",
"type": 1,
"groupwt": 1000,
"groupid": 220028,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "17060007",
"n": 1
},
"itemdes": "首充礼包第二档第三天",
"itemwt": 1000,
"min": 30,
"max": 30,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1020,
"lotteryid": 22004003,
"description": "首充礼包第二档第三天",
"type": 1,
"groupwt": 1000,
"groupid": 220028,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第二档第三天",
"itemwt": 1000,
"min": 30,
"max": 30,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1021,
"lotteryid": 22005001,
"description": "首充礼包第三档第一天",
"type": 1,
"groupwt": 1000,
"groupid": 220029,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "17040001",
"n": 1
},
"itemdes": "首充礼包第三档第一天",
"itemwt": 1000,
"min": 1,
"max": 1,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1022,
"lotteryid": 22005001,
"description": "首充礼包第三档第一天",
"type": 1,
"groupwt": 1000,
"groupid": 220029,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第三档第一天",
"itemwt": 1000,
"min": 80,
"max": 80,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1023,
"lotteryid": 22005002,
"description": "首充礼包第三档第二天",
"type": 1,
"groupwt": 1000,
"groupid": 220030,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000001",
"n": 1
},
"itemdes": "首充礼包第三档第二天",
"itemwt": 1000,
"min": 4,
"max": 4,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1024,
"lotteryid": 22005002,
"description": "首充礼包第三档第二天",
"type": 1,
"groupwt": 1000,
"groupid": 220030,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第三档第二天",
"itemwt": 1000,
"min": 60,
"max": 60,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1025,
"lotteryid": 22005003,
"description": "首充礼包第三档第三天",
"type": 1,
"groupwt": 1000,
"groupid": 220031,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000001",
"n": 1
},
"itemdes": "首充礼包第三档第三天",
"itemwt": 1000,
"min": 6,
"max": 6,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
},
{
"id": 1026,
"lotteryid": 22005003,
"description": "首充礼包第三档第三天",
"type": 1,
"groupwt": 1000,
"groupid": 220031,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
"t": "10000009",
"n": 1
},
"itemdes": "首充礼包第三档第三天",
"itemwt": 1000,
"min": 60,
"max": 60,
"VIPmin": 0,
"VIPmax": 15,
"playerlvmin": 0,
"playerlvmax": 0,
"notice": 0
} }
] ]

390
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

20
bin/json/game_monsterformat.json
View File

@ -238239,6 +238239,26 @@
"speed": 80, "speed": 80,
"modelsize": 1 "modelsize": 1
}, },
{
"Id": 720015,
"pos": 3,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 44005,
"star": 4,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"modelsize": 1
},
{ {
"Id": 800001, "Id": 800001,
"pos": 1, "pos": 1,

2
bin/json/game_namelibrary.json
View File

@ -487,7 +487,7 @@
}, },
"name": { "name": {
"key": "name_name_name_41", "key": "name_name_name_41",
"text": "巴雷特" "text": "吉吉亚"
}, },
"sex": 2 "sex": 2
}, },

42
bin/json/game_recharge.json
View File

@ -582,5 +582,47 @@
"show": "30元", "show": "30元",
"image": "", "image": "",
"integral": 3800 "integral": 3800
},
{
"id": "passcheck_10",
"editionid": "debug",
"recharge_type": 6,
"monetaryunit": "￥",
"amount": 6000,
"vipexp": [],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "6元",
"image": "",
"integral": 3600
},
{
"id": "passcheck_11",
"editionid": "debug",
"recharge_type": 30,
"monetaryunit": "￥",
"amount": 3000,
"vipexp": [],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "30元",
"image": "",
"integral": 3700
},
{
"id": "passcheck_12",
"editionid": "debug",
"recharge_type": 68,
"monetaryunit": "￥",
"amount": 6800,
"vipexp": [],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "68元",
"image": "",
"integral": 3800
} }
] ]

160
bin/json/game_reddot.json
View File

@ -4,7 +4,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Task", "path": "Root|Task",
"header": "" "header": ""
}, },
@ -13,7 +13,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "task", "opencond_id": "",
"path": "Root|Task|Daily", "path": "Root|Task|Daily",
"header": "赵长远" "header": "赵长远"
}, },
@ -22,7 +22,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "task", "opencond_id": "",
"path": "Root|Task|Week", "path": "Root|Task|Week",
"header": "赵长远" "header": "赵长远"
}, },
@ -31,7 +31,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "task", "opencond_id": "",
"path": "Root|Task|Achievement", "path": "Root|Task|Achievement",
"header": "赵长远" "header": "赵长远"
}, },
@ -40,7 +40,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Task|Daily", "path": "Root|Task|Daily",
"header": "" "header": ""
}, },
@ -49,7 +49,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "task", "opencond_id": "",
"path": "Root|Task|Daily|Active", "path": "Root|Task|Daily|Active",
"header": "" "header": ""
}, },
@ -58,7 +58,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Task|Week", "path": "Root|Task|Week",
"header": "" "header": ""
}, },
@ -67,7 +67,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "task", "opencond_id": "",
"path": "Root|Task|Week|Active", "path": "Root|Task|Week|Active",
"header": "" "header": ""
}, },
@ -76,7 +76,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "mail",
"path": "Root|Email", "path": "Root|Email",
"header": "" "header": ""
}, },
@ -85,7 +85,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "mail",
"path": "Root|Email|Btn", "path": "Root|Email|Btn",
"header": "" "header": ""
}, },
@ -94,7 +94,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "mail",
"path": "Root|Email|UnreadBtn", "path": "Root|Email|UnreadBtn",
"header": "" "header": ""
}, },
@ -103,7 +103,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|ViKingExpedition", "path": "Root|ViKingExpedition",
"header": "" "header": ""
}, },
@ -112,7 +112,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|ViKingExpedition|MainPage", "path": "Root|ViKingExpedition|MainPage",
"header": "" "header": ""
}, },
@ -121,7 +121,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|ViKingExpedition|MainPage|Btn", "path": "Root|ViKingExpedition|MainPage|Btn",
"header": "" "header": ""
}, },
@ -130,7 +130,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hunting", "path": "Root|Hunting",
"header": "" "header": ""
}, },
@ -139,7 +139,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hunting|MainPage", "path": "Root|Hunting|MainPage",
"header": "" "header": ""
}, },
@ -148,7 +148,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hunting|MainPage|Btn", "path": "Root|Hunting|MainPage|Btn",
"header": "" "header": ""
}, },
@ -157,7 +157,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hero1", "path": "Root|Hero1",
"header": "" "header": ""
}, },
@ -166,7 +166,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hero1|Heroup", "path": "Root|Hero1|Heroup",
"header": "" "header": ""
}, },
@ -175,7 +175,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hero1|Awake", "path": "Root|Hero1|Awake",
"header": "" "header": ""
}, },
@ -184,7 +184,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hero1|Resonance", "path": "Root|Hero1|Resonance",
"header": "" "header": ""
}, },
@ -193,7 +193,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 2, "show_type": 2,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "",
"path": "Root|Hero", "path": "Root|Hero",
"header": "" "header": ""
}, },
@ -202,7 +202,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 2, "show_type": 2,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "",
"path": "Root|Hero|NewHero", "path": "Root|Hero|NewHero",
"header": "" "header": ""
}, },
@ -211,7 +211,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hero1|Equip", "path": "Root|Hero1|Equip",
"header": "" "header": ""
}, },
@ -220,7 +220,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Hero1|Equip|Wear", "path": "Root|Hero1|Equip|Wear",
"header": "" "header": ""
}, },
@ -229,7 +229,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "opencond_id": "guild",
"path": "Root|Guild", "path": "Root|Guild",
"header": "赵长远" "header": "赵长远"
}, },
@ -238,7 +238,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "opencond_id": "guild",
"path": "Root|Guild|Main", "path": "Root|Guild|Main",
"header": "赵长远" "header": "赵长远"
}, },
@ -247,7 +247,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "opencond_id": "guild",
"path": "Root|Guild|Main|Btn", "path": "Root|Guild|Main|Btn",
"header": "赵长远" "header": "赵长远"
}, },
@ -256,7 +256,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "opencond_id": "guild",
"path": "Root|Guild|Main|Apply", "path": "Root|Guild|Main|Apply",
"header": "" "header": ""
}, },
@ -265,7 +265,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "sociaty", "opencond_id": "guild",
"path": "Root|Guild|Main|Apply|Btn", "path": "Root|Guild|Main|Apply|Btn",
"header": "" "header": ""
}, },
@ -274,7 +274,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "guild",
"path": "Root|Guild|Main|Task", "path": "Root|Guild|Main|Task",
"header": "" "header": ""
}, },
@ -283,7 +283,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Bag", "path": "Root|Bag",
"header": "赵长远" "header": "赵长远"
}, },
@ -292,7 +292,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Bag|Item", "path": "Root|Bag|Item",
"header": "赵长远" "header": "赵长远"
}, },
@ -301,7 +301,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Bag|Equip", "path": "Root|Bag|Equip",
"header": "赵长远" "header": "赵长远"
}, },
@ -310,7 +310,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Bag|Shard", "path": "Root|Bag|Shard",
"header": "赵长远" "header": "赵长远"
}, },
@ -319,7 +319,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy", "path": "Root|Smithy",
"header": "" "header": ""
}, },
@ -328,7 +328,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy|IllustratedBubble", "path": "Root|Smithy|IllustratedBubble",
"header": "" "header": ""
}, },
@ -337,7 +337,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy|IllustratedBubble|Page1", "path": "Root|Smithy|IllustratedBubble|Page1",
"header": "" "header": ""
}, },
@ -346,7 +346,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy|IllustratedBubble|Page2", "path": "Root|Smithy|IllustratedBubble|Page2",
"header": "" "header": ""
}, },
@ -355,7 +355,7 @@
"msg_type": 1, "msg_type": 1,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy|IllustratedBubble|Page3", "path": "Root|Smithy|IllustratedBubble|Page3",
"header": "" "header": ""
}, },
@ -364,7 +364,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy|IllustratedBubble|Page4", "path": "Root|Smithy|IllustratedBubble|Page4",
"header": "" "header": ""
}, },
@ -373,7 +373,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy|IllustratedBubble|Reward", "path": "Root|Smithy|IllustratedBubble|Reward",
"header": "" "header": ""
}, },
@ -382,7 +382,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "goberblacksmithshop",
"path": "Root|Smithy", "path": "Root|Smithy",
"header": "" "header": ""
}, },
@ -391,7 +391,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu", "path": "Root|KungFu",
"header": "" "header": ""
}, },
@ -400,7 +400,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|Pillar", "path": "Root|KungFu|Pillar",
"header": "" "header": ""
}, },
@ -409,7 +409,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "", "path": "",
"header": "" "header": ""
}, },
@ -418,7 +418,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "", "path": "",
"header": "" "header": ""
}, },
@ -427,7 +427,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|Dispatch", "path": "Root|KungFu|Dispatch",
"header": "" "header": ""
}, },
@ -436,7 +436,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|Dispatch|Reward", "path": "Root|KungFu|Dispatch|Reward",
"header": "" "header": ""
}, },
@ -445,7 +445,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|DailyFitness", "path": "Root|KungFu|DailyFitness",
"header": "" "header": ""
}, },
@ -454,7 +454,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|IllustratedBubble", "path": "Root|KungFu|IllustratedBubble",
"header": "" "header": ""
}, },
@ -463,7 +463,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|IllustratedBubble|Page1", "path": "Root|KungFu|IllustratedBubble|Page1",
"header": "" "header": ""
}, },
@ -472,7 +472,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|IllustratedBubble|Page2", "path": "Root|KungFu|IllustratedBubble|Page2",
"header": "" "header": ""
}, },
@ -481,7 +481,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "kungfu",
"path": "Root|KungFu|IllustratedBubble|Page3", "path": "Root|KungFu|IllustratedBubble|Page3",
"header": "" "header": ""
}, },
@ -490,7 +490,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability", "path": "Root|Favorability",
"header": "" "header": ""
}, },
@ -499,7 +499,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble", "path": "Root|Favorability|Bubble",
"header": "" "header": ""
}, },
@ -508,7 +508,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|List", "path": "Root|Favorability|Bubble|List",
"header": "" "header": ""
}, },
@ -517,7 +517,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|List|Reward", "path": "Root|Favorability|Bubble|List|Reward",
"header": "" "header": ""
}, },
@ -526,7 +526,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|List|Biography", "path": "Root|Favorability|Bubble|List|Biography",
"header": "" "header": ""
}, },
@ -535,7 +535,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|List|Biography|Reward", "path": "Root|Favorability|Bubble|List|Biography|Reward",
"header": "" "header": ""
}, },
@ -544,7 +544,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|Fetters", "path": "Root|Favorability|Bubble|Fetters",
"header": "" "header": ""
}, },
@ -553,7 +553,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|Fetters|ListPage", "path": "Root|Favorability|Bubble|Fetters|ListPage",
"header": "" "header": ""
}, },
@ -562,7 +562,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|Fetters|ListPage|Activation", "path": "Root|Favorability|Bubble|Fetters|ListPage|Activation",
"header": "" "header": ""
}, },
@ -571,7 +571,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "",
"path": "Root|Favorability|Bubble|Fetters|ListPage|UpLv", "path": "Root|Favorability|Bubble|Fetters|ListPage|UpLv",
"header": "" "header": ""
}, },
@ -580,7 +580,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "cooking",
"path": "Root|Gourmet", "path": "Root|Gourmet",
"header": "" "header": ""
}, },
@ -589,7 +589,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "cooking",
"path": "Root|Gourmet|Atlas", "path": "Root|Gourmet|Atlas",
"header": "" "header": ""
}, },
@ -598,7 +598,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "friend",
"path": "Root|Friend", "path": "Root|Friend",
"header": "" "header": ""
}, },
@ -607,7 +607,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 1, "show_type": 1,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "friend",
"path": "Root|Friend|Apply", "path": "Root|Friend|Apply",
"header": "" "header": ""
}, },
@ -616,16 +616,16 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "arena",
"path": "Root|Arena", "path": "Root|Arena",
"header": "" "header": ""
}, },
{ {
"id": 22101, "id": 22101,
"msg_type": 0, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "arena",
"path": "Root|Arena|Num", "path": "Root|Arena|Num",
"header": "" "header": ""
}, },
@ -634,7 +634,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "arena",
"path": "", "path": "",
"header": "" "header": ""
}, },
@ -643,7 +643,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "arena",
"path": "Root|Arena|ChallengeNpc", "path": "Root|Arena|ChallengeNpc",
"header": "" "header": ""
}, },
@ -652,7 +652,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "arena",
"path": "Root|Arena|ChallengeNpc|Page", "path": "Root|Arena|ChallengeNpc|Page",
"header": "" "header": ""
}, },
@ -661,7 +661,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "trials1",
"path": "Root|MLine", "path": "Root|MLine",
"header": "" "header": ""
}, },
@ -670,7 +670,7 @@
"msg_type": 2, "msg_type": 2,
"show_type": 0, "show_type": 0,
"count_type": 0, "count_type": 0,
"group": "", "opencond_id": "trials1",
"path": "Root|MLine|Reward", "path": "Root|MLine|Reward",
"header": "" "header": ""
}, },
@ -679,7 +679,7 @@
"msg_type": 0, "msg_type": 0,
"show_type": 1, "show_type": 1,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "",
"path": "", "path": "",
"header": "" "header": ""
}, },
@ -688,16 +688,16 @@
"msg_type": 0, "msg_type": 0,
"show_type": 1, "show_type": 1,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "",
"path": "", "path": "",
"header": "红点出现：当聊天系统中公会，私聊，跨服，系统存在玩家未接受消息时，触发聊天红点。" "header": ""
}, },
{ {
"id": 29101, "id": 29101,
"msg_type": 2, "msg_type": 2,
"show_type": 1, "show_type": 1,
"count_type": 1, "count_type": 1,
"group": "", "opencond_id": "RacePagoda",
"path": "", "path": "",
"header": "" "header": ""
} }

5
bin/json/game_shop.json
View File

@ -143,10 +143,7 @@
13001, 13001,
13002, 13002,
13003, 13003,
13004, 13004
13005,
13006,
13007
] ]
}, },
{ {

91
bin/json/game_shopcentercontrol.json
View File

@ -12,6 +12,7 @@
"text": "购买礼包并通关所有简单模式主线，总计可获得超值1200%奖励！" "text": "购买礼包并通关所有简单模式主线，总计可获得超值1200%奖励！"
}, },
"point": "passcheck_3", "point": "passcheck_3",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 0, "on": 0,
@ -33,6 +34,7 @@
"text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！" "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！"
}, },
"point": "passcheck_4", "point": "passcheck_4",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 0, "on": 0,
@ -54,6 +56,7 @@
"text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！" "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！"
}, },
"point": "passcheck_5", "point": "passcheck_5",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 0, "on": 0,
@ -75,6 +78,7 @@
"text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！" "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！"
}, },
"point": "passcheck_6", "point": "passcheck_6",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 0, "on": 0,
@ -96,6 +100,7 @@
"text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
}, },
"point": "passcheck_7", "point": "passcheck_7",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 1, "on": 1,
@ -117,6 +122,7 @@
"text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
}, },
"point": "passcheck_8", "point": "passcheck_8",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 2, "on": 2,
@ -138,6 +144,7 @@
"text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！" "text": "购买礼包累计登录游戏，总计可获得超值3000%奖励！"
}, },
"point": "passcheck_9", "point": "passcheck_9",
"props": [],
"restriction": 1, "restriction": 1,
"lv": 1, "lv": 1,
"on": 1, "on": 1,
@ -145,5 +152,89 @@
"times": 0, "times": 0,
"duration": 10, "duration": 10,
"loop": 1 "loop": 1
},
{
"id": 10008,
"text": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3007% bonus!",
"text": "首充礼包1"
},
"type": 6,
"index": 1,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3007% bonus!",
"text": "购买首充礼包，累计返利4888%"
},
"point": "passcheck_10",
"props": [
{
"a": "hero",
"t": "14003",
"n": 1
}
],
"restriction": 1,
"lv": 1,
"on": 0,
"time": 0,
"times": 0,
"duration": 0,
"loop": 0
},
{
"id": 10009,
"text": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!",
"text": "首充礼包2"
},
"type": 6,
"index": 2,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3008% bonus!",
"text": "购买首充礼包，累计返利1688%"
},
"point": "passcheck_11",
"props": [
{
"a": "item",
"t": "17060007",
"n": 1
}
],
"restriction": 1,
"lv": 1,
"on": 0,
"time": 0,
"times": 0,
"duration": 0,
"loop": 0
},
{
"id": 10010,
"text": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!",
"text": "首充礼包3"
},
"type": 6,
"index": 3,
"slogan": {
"key": "Purchase the pack and complete all Easy Mode mainlines to earn a total of 3009% bonus!",
"text": "购买首充礼包，累计返利1088%"
},
"point": "passcheck_12",
"props": [
{
"a": "item",
"t": "17040001",
"n": 1
}
],
"restriction": 1,
"lv": 1,
"on": 0,
"time": 0,
"times": 0,
"duration": 0,
"loop": 0
} }
] ]

63
bin/json/game_shopcenterfund.json
View File

@ -334,5 +334,68 @@
"unlock": 12, "unlock": 12,
"group": 1015, "group": 1015,
"position": 12 "position": 12
},
{
"id": 300001,
"type": 6,
"unlock": 1,
"group": 22003001,
"position": 1
},
{
"id": 300002,
"type": 6,
"unlock": 2,
"group": 22003002,
"position": 1
},
{
"id": 300003,
"type": 6,
"unlock": 3,
"group": 22003003,
"position": 1
},
{
"id": 300004,
"type": 6,
"unlock": 1,
"group": 22004001,
"position": 2
},
{
"id": 300005,
"type": 6,
"unlock": 2,
"group": 22004002,
"position": 2
},
{
"id": 300006,
"type": 6,
"unlock": 3,
"group": 22004003,
"position": 2
},
{
"id": 300007,
"type": 6,
"unlock": 1,
"group": 22005001,
"position": 3
},
{
"id": 300008,
"type": 6,
"unlock": 2,
"group": 22005002,
"position": 3
},
{
"id": 300009,
"type": 6,
"unlock": 3,
"group": 22005003,
"position": 3
} }
] ]

110
bin/json/game_shopitem.json
View File

@ -25019,117 +25019,9 @@
"mapidmin": 101, "mapidmin": 101,
"mapidmax": 9999 "mapidmax": 9999
}, },
{
"key": 712,
"id": 13004,
"iteminfo": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"preview": false,
"probability": 1000,
"need": [
{
"a": "attr",
"t": "arenacoin",
"n": 250
}
],
"sale": 1000,
"salelist": [
1000,
1000,
1000,
1000,
1000,
1000
],
"buyminnum": 3,
"buymaxnum": 3,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 713,
"id": 13005,
"iteminfo": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"preview": false,
"probability": 1000,
"need": [
{
"a": "attr",
"t": "arenacoin",
"n": 250
}
],
"sale": 1000,
"salelist": [
1000,
1000,
1000,
1000,
1000,
1000
],
"buyminnum": 3,
"buymaxnum": 3,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{
"key": 714,
"id": 13006,
"iteminfo": [
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"preview": false,
"probability": 1000,
"need": [
{
"a": "attr",
"t": "arenacoin",
"n": 250
}
],
"sale": 1000,
"salelist": [
1000,
1000,
1000,
1000,
1000,
1000
],
"buyminnum": 3,
"buymaxnum": 3,
"vip": 0,
"lvmin": 1,
"lvmax": 60,
"mapidmin": 101,
"mapidmax": 9999
},
{ {
"key": 715, "key": 715,
"id": 13007, "id": 13004,
"iteminfo": [ "iteminfo": [
{ {
"a": "item", "a": "item",

2
comm/const.go
View File

@ -1000,7 +1000,7 @@ const (
AddUpRecharge = 10 //累计充值 AddUpRecharge = 10 //累计充值
// 特殊类型活动 只受活动开启限制 // 特殊类型活动 只受活动开启限制 具体玩法 走excel 配置
HdTypeTurntable = 1001 //大转盘 HdTypeTurntable = 1001 //大转盘
HdCelebration = 1002 // 庆典活动 HdCelebration = 1002 // 庆典活动
) )

11
modules/caravan/api_getlist.go
View File

@ -2,9 +2,8 @@ package caravan
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/utils"
) )
//参数校验 //参数校验
@ -21,9 +20,9 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe
if errdata = this.GetListCheck(session, req); errdata != nil { if errdata = this.GetListCheck(session, req); errdata != nil {
return // 参数校验失败直接返回 return // 参数校验失败直接返回
} }
list, err := this.module.modelCaravan.getCaravanList(session.GetUserId()) list, _ := this.module.modelCaravan.getCaravanList(session.GetUserId())
endtime := utils.WeekIntervalTime()
if configure.Now().Unix() >= list.Resettime || err == mgo.MongodbNil { // 初始化门票和虚拟币 if list.Resettime != endtime { // 初始化门票和虚拟币
if conf, err := this.module.configure.GetCaravanLv(list.Lv); err == nil { if conf, err := this.module.configure.GetCaravanLv(list.Lv); err == nil {
this.module.ModuleItems.CleanItemById(session, conf.Tickettop.T) // 清理之前的门票数据 this.module.ModuleItems.CleanItemById(session, conf.Tickettop.T) // 清理之前的门票数据
} else { } else {
@ -45,6 +44,8 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.CaravanGetListRe
list.Profit = 0 list.Profit = 0
update["reward"] = list.Reward // 初始化利润奖励 update["reward"] = list.Reward // 初始化利润奖励
update["profit"] = list.Profit // 初始化商品利润 update["profit"] = list.Profit // 初始化商品利润
list.Resettime = endtime
update["resettime"] = list.Resettime
this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update) this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update)
} }
} }

6
modules/caravan/api_gotocity.go
View File

@ -76,6 +76,8 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
} }
if bNewTask { // 到该城市随机一个新的任务 if bNewTask { // 到该城市随机一个新的任务
if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil { if newCity, e := this.module.configure.GetCaravanCity(req.City); e == nil {
//newCity.Cityeventpro
if newCity.Cityeventpro > comm.GetRandNum(0, 1000) {
if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil { if elist, err := this.module.configure.GetCaravanEventByGroup(newCity.Cityevent); err == nil {
var sz []*cfg.GameCaravanEventData var sz []*cfg.GameCaravanEventData
for _, v := range elist { for _, v := range elist {
@ -91,6 +93,9 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
list.Eventid = sz[comm.GetRandW(randW)].Id list.Eventid = sz[comm.GetRandW(randW)].Id
} }
} }
} else {
bNewTask = false
}
} else { } else {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -98,6 +103,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
Title: pb.ErrorCode_ConfigNoFound.ToString(), Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: e.Error(), Message: e.Error(),
} }
return
} }
} }
if list.Curcity == req.City { if list.Curcity == req.City {

10
modules/caravan/model_caravan.go
View File

@ -47,11 +47,8 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
// 创建一条数据 // 创建一条数据
result.Id = primitive.NewObjectID().Hex() result.Id = primitive.NewObjectID().Hex()
// 活动持续时间 // 活动持续时间
sTime := int64(this.module.ModuleTools.GetGlobalConf().BusinessRewardday * 24 * 3600) // 单位s
openTime := this.module.service.GetOpentime().Unix() // 获取开服时间 //result.Resettime = utils.WeekIntervalTime()
subTime := configure.Now().Unix() - openTime
result.Resettime = configure.Now().Unix() - (subTime % sTime) + sTime
//result.Resettime = +int64(this.module.ModuleTools.GetGlobalConf().BusinessRewardday * 24 * 3600)
result.Citystime = configure.Now().Unix() result.Citystime = configure.Now().Unix()
result.Rtime = configure.Now().Unix() result.Rtime = configure.Now().Unix()
@ -63,9 +60,10 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
this.module.InitCaravanCityData(uid, result) // 初始1级 this.module.InitCaravanCityData(uid, result) // 初始1级
this.module.InitCaravanItemData(uid, result) this.module.InitCaravanItemData(uid, result)
this.Add(uid, result) this.Add(uid, result)
err = nil
return return
} }
err = nil
return result, err return result, err
} }
func (this *modelCaravan) modifyCaravanDataByObjId(uid string, data map[string]interface{}) error { func (this *modelCaravan) modifyCaravanDataByObjId(uid string, data map[string]interface{}) error {

13
modules/caravan/module.go
View File

@ -122,6 +122,7 @@ func (this *Caravan) InitCaravanCityData(uid string, data *pb.DBCaravan) {
city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重 city.NextexspecialPCT = v.Exspecialnum[int(comm.GetRandW(v.ExspecialnumWeight))] // 获取权重
data.City[v.Id] = city data.City[v.Id] = city
} }
data.Citystime = utils.GetZeroTime(configure.Now().Unix())
data.Rtime = configure.Now().Unix() // 修改时间 data.Rtime = configure.Now().Unix() // 修改时间
} }
@ -167,7 +168,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
changeTime = this.configure.GetCityRefreshTime() // 3分钟 changeTime = this.configure.GetCityRefreshTime() // 3分钟
// 刷新城市货物信息 // 刷新城市货物信息
if !utils.IsToday(caravan.Citystime) { if !utils.IsNextToday(caravan.Citystime) {
list := this.configure.GetAllCaravanCity() list := this.configure.GetAllCaravanCity()
for _, conf := range list { for _, conf := range list {
if v, ok := caravan.City[conf.Id]; ok { if v, ok := caravan.City[conf.Id]; ok {
@ -182,7 +183,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
v.Special = append(v.Special, conf.Special...) v.Special = append(v.Special, conf.Special...)
} }
if utils.IsToday(caravan.Citystime - 24*3600) { if utils.IsToday(caravan.Citystime) {
v.Exspecial = make([]string, 0) v.Exspecial = make([]string, 0)
v.Exspecial = append(v.Exspecial, v.Nextexspecial...) v.Exspecial = append(v.Exspecial, v.Nextexspecial...)
v.ExspecialPCT = v.NextexspecialPCT v.ExspecialPCT = v.NextexspecialPCT
@ -215,9 +216,13 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
} }
} }
caravan.Citystime = configure.Now().Unix() // 设置今天的时间 caravan.Citystime = utils.GetZeroTime(configure.Now().Unix()) // 设置第二天0点的时间
update["city"] = caravan.City update["city"] = caravan.City
update["citystime"] = caravan.Citystime update["citystime"] = caravan.Citystime
bChange = true
}
if caravan.Itemtime == 0 {
caravan.Itemtime = configure.Now().Unix()
} }
subTime := int32(curTime - caravan.Itemtime) subTime := int32(curTime - caravan.Itemtime)
if subTime >= changeTime { if subTime >= changeTime {
@ -225,7 +230,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
icount := int32(subTime / changeTime) // 循环周期 icount := int32(subTime / changeTime) // 循环周期
caravan.Itemtime += int64(changeTime * icount) caravan.Itemtime += int64(changeTime * icount)
update["citystime"] = caravan.Itemtime update["itemtime"] = caravan.Itemtime
for k, v := range caravan.Goods { for k, v := range caravan.Goods {
if c, err := this.configure.GetCaravanGoods(k); err == nil { if c, err := this.configure.GetCaravanGoods(k); err == nil {
caravan.Oldprice[k] = v.Price caravan.Oldprice[k] = v.Price

2
modules/guildgve/modelrank.go
View File

@ -62,7 +62,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), 0) endtime := time.Unix(utils.WeekIntervalTime(), 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

@ -115,7 +115,7 @@ type sumy struct {
func Test_Main(t *testing.T) { func Test_Main(t *testing.T) {
value, err := strconv.Atoi("944005411") value, err := strconv.Atoi("944005411")
fmt.Printf("%v,%v", value, err) fmt.Printf("%v,%v,%d", value, err, utils.WeekIntervalTime())
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/stonehenge/api_getlist.go
View File

@ -40,7 +40,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(0) stone.Etime = utils.WeekIntervalTime()
update["etime"] = stone.Etime update["etime"] = stone.Etime
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update) this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
} }

6
modules/stonehenge/modelStonehenge.go
View File

@ -59,7 +59,7 @@ func (this *MStonehenge) GetStonehengeData(uid string) *pb.DBStonehenge {
stone.Userbuff = make(map[int32]int32, 0) stone.Userbuff = make(map[int32]int32, 0)
stone.Reward = make(map[int32]bool, 0) stone.Reward = make(map[int32]bool, 0)
stone.Addweight = make(map[int32]int32, 0) stone.Addweight = make(map[int32]int32, 0)
stone.Etime = utils.WeekIntervalTime(0) stone.Etime = utils.WeekIntervalTime()
stone.Hero = make(map[string]*pb.BattleRole) stone.Hero = make(map[string]*pb.BattleRole)
this.Add(uid, stone) this.Add(uid, stone)
@ -78,13 +78,13 @@ func (this *MStonehenge) reLoadStoneBoos() (err error) {
s := &pb.DBStoneBoss{} s := &pb.DBStoneBoss{}
this.module.ModuleTools.GetGlobalData(StoneBossKey, s) this.module.ModuleTools.GetGlobalData(StoneBossKey, s)
if len(s.Bossstage) == 0 || utils.WeekIntervalTime(0) != s.Rtime { if len(s.Bossstage) == 0 || utils.WeekIntervalTime() != s.Rtime {
this.lock.Lock() this.lock.Lock()
this.bossStage = this.module.configure.CheckStage() this.bossStage = this.module.configure.CheckStage()
this.lock.Unlock() this.lock.Unlock()
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(0), "rtime": utils.WeekIntervalTime(),
}) })
} else { } else {
this.lock.Lock() this.lock.Lock()

2
modules/stonehenge/modelworldbuff.go
View File

@ -40,7 +40,7 @@ func (this *MWorldBuff) GetStonehengeData(uid string) *pb.DBStonehenge {
stone.Userbuff = make(map[int32]int32, 0) stone.Userbuff = make(map[int32]int32, 0)
stone.Reward = make(map[int32]bool, 0) stone.Reward = make(map[int32]bool, 0)
stone.Addweight = make(map[int32]int32, 0) stone.Addweight = make(map[int32]int32, 0)
stone.Etime = utils.WeekIntervalTime(0) stone.Etime = utils.WeekIntervalTime()
this.Add(uid, stone) this.Add(uid, stone)
return nil return nil
} }

9
modules/sys/model_sys.go
View File

@ -68,13 +68,12 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
} }
} }
case 5: case 5:
module, err := this.service.GetModule(comm.ModulePagoda) if !this.moduleSys.pagoda.CheckCompletePagoda(uid) {
if err != nil {
this.moduleSys.Debugln(err)
return "" return ""
} }
if v, ok := module.(comm.IPagoda); ok { case 6: // 查询工会等级
if !v.CheckCompletePagoda(uid) { if s := this.moduleSys.sociaty.GetSociaty(uid); s != nil {
if s.Lv < conf.Param {
return "" return ""
} }
} }

16
modules/sys/module.go
View File

@ -20,6 +20,10 @@ type ModuleSys struct {
service base.IRPCXService service base.IRPCXService
modelSys *ModelSys modelSys *ModelSys
mainline comm.IMainline mainline comm.IMainline
pagoda comm.IPagoda
sociaty comm.ISociaty
} }
func NewModule() core.IModule { func NewModule() core.IModule {
@ -54,6 +58,18 @@ func (this *ModuleSys) Start() (err error) {
return return
} }
this.mainline = module.(comm.IMainline) this.mainline = module.(comm.IMainline)
if module, err = this.service.GetModule(comm.ModulePagoda); err != nil {
return
}
this.pagoda = module.(comm.IPagoda)
if module, err = this.service.GetModule(comm.ModuleSociaty); err != nil {
return
}
this.sociaty = module.(comm.ISociaty)
return return
} }

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(0) endTime := utils.WeekIntervalTime()
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(

30
sys/configure/structs/Game.MainStageData.go
View File

@ -44,6 +44,8 @@ type GameMainStageData struct {
Commonaward []*Gameatn Commonaward []*Gameatn
BattleReadyID int32 BattleReadyID int32
FormatList []int32 FormatList []int32
Helphero []string
Banhero []string
Star []int32 Star []int32
StarType []int32 StarType []int32
StarValue []int32 StarValue []int32
@ -194,6 +196,34 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
} }
} }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["helphero"].([]interface{}); !_ok_ { err = errors.New("helphero error"); return }
_v.Helphero = 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.Helphero = append(_v.Helphero, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["banhero"].([]interface{}); !_ok_ { err = errors.New("banhero error"); return }
_v.Banhero = 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.Banhero = append(_v.Banhero, _list_v_)
}
}
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

4
sys/configure/structs/Game.RedDotData.go
View File

@ -15,7 +15,7 @@ type GameRedDotData struct {
MsgType int32 MsgType int32
ShowType int32 ShowType int32
CountType int32 CountType int32
Group string OpencondId string
Path string Path string
Header string Header string
} }
@ -31,7 +31,7 @@ func (_v *GameRedDotData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["msg_type"].(float64); !_ok_ { err = errors.New("msg_type error"); return }; _v.MsgType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["msg_type"].(float64); !_ok_ { err = errors.New("msg_type error"); return }; _v.MsgType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show_type"].(float64); !_ok_ { err = errors.New("show_type error"); return }; _v.ShowType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show_type"].(float64); !_ok_ { err = errors.New("show_type error"); return }; _v.ShowType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count_type"].(float64); !_ok_ { err = errors.New("count_type error"); return }; _v.CountType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count_type"].(float64); !_ok_ { err = errors.New("count_type error"); return }; _v.CountType = int32(_tempNum_) }
{ var _ok_ bool; if _v.Group, _ok_ = _buf["group"].(string); !_ok_ { err = errors.New("group error"); return } } { var _ok_ bool; if _v.OpencondId, _ok_ = _buf["opencond_id"].(string); !_ok_ { err = errors.New("opencond_id error"); return } }
{ var _ok_ bool; if _v.Path, _ok_ = _buf["path"].(string); !_ok_ { err = errors.New("path error"); return } } { var _ok_ bool; if _v.Path, _ok_ = _buf["path"].(string); !_ok_ { err = errors.New("path error"); return } }
{ var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } } { var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } }
return return

15
sys/configure/structs/Game.ShopCenterControlData.go
View File

@ -17,6 +17,7 @@ type GameShopCenterControlData struct {
Index int32 Index int32
Slogan string Slogan string
Point string Point string
Props []*Gameatn
Restriction int32 Restriction int32
Lv int32 Lv int32
On int32 On int32
@ -39,6 +40,20 @@ func (_v *GameShopCenterControlData)Deserialize(_buf map[string]interface{}) (er
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["slogan"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Slogan error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Slogan, _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["slogan"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Slogan error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Slogan, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } } { var _ok_ bool; if _v.Point, _ok_ = _buf["point"].(string); !_ok_ { err = errors.New("point error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["props"].([]interface{}); !_ok_ { err = errors.New("props error"); return }
_v.Props = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Props = append(_v.Props, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["restriction"].(float64); !_ok_ { err = errors.New("restriction error"); return }; _v.Restriction = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["restriction"].(float64); !_ok_ { err = errors.New("restriction error"); return }; _v.Restriction = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["on"].(float64); !_ok_ { err = errors.New("on error"); return }; _v.On = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["on"].(float64); !_ok_ { err = errors.New("on error"); return }; _v.On = int32(_tempNum_) }

10
utils/time.go
View File

@ -15,6 +15,12 @@ func IsToday(d int64) bool {
now := configure.Now() now := configure.Now()
return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day() return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day()
} }
func IsNextToday(d int64) bool {
d += 24 * 3600
tt := time.Unix(d, 0)
now := configure.Now()
return tt.Year() == now.Year() && tt.Month() == now.Month() && tt.Day() == now.Day()
}
// 判断是否是出于同一周 // 判断是否是出于同一周
func IsSameWeek(d int64) bool { func IsSameWeek(d int64) bool {
@ -170,7 +176,7 @@ func DiffDays(t1, t2 int64) int {
return diffDays return diffDays
} }
func WeekIntervalTime(week int) (endTime int64) { func WeekIntervalTime() (endTime int64) {
now := time.Now() now := time.Now()
offset := int(time.Monday - now.Weekday()) offset := int(time.Monday - now.Weekday())
//周日做特殊判断 因为time.Monday = 0 //周日做特殊判断 因为time.Monday = 0
@ -181,7 +187,7 @@ func WeekIntervalTime(week int) (endTime int64) {
year, month, day := now.Date() year, month, day := now.Date()
thisWeek := time.Date(year, month, day, 0, 0, 0, 0, time.Local) thisWeek := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
//startTime = thisWeek.AddDate(0, 0, offset+7*week).Unix() //startTime = thisWeek.AddDate(0, 0, offset+7*week).Unix()
endTime = thisWeek.AddDate(0, 0, offset+6+7*week).Unix() endTime = thisWeek.AddDate(0, 0, offset+7).Unix()
return endTime return endTime
} }

2
utils/utils_test.go
View File

@ -119,7 +119,7 @@ func TestIsSameWeek(t *testing.T) {
} }
func TestWeekIntervalTime(t *testing.T) { func TestWeekIntervalTime(t *testing.T) {
ti := utils.WeekIntervalTime(0) ti := utils.WeekIntervalTime()
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)