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

#31765 子任务 【梦工场系统】 <-后端-> 【巨怪商队】- 排行数据优化

Browse Source
This commit is contained in:
meixiongfeng 2023-08-18 11:05:25 +08:00
parent 7cc1b6af45
commit 95a255be5d
13 changed files with 377 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bin/json/game_buriedtype.json
View File

@ -1260,7 +1260,7 @@
}, },
{ {
"id": 219, "id": 219,
"insert": 2, "insert": 1,
"filter": [] "filter": []
}, },
{ {
@ -1270,7 +1270,7 @@
}, },
{ {
"id": 221, "id": 221,
"insert": 2, "insert": 1,
"filter": [ "filter": [
"eq" "eq"
] ]
@ -1321,5 +1321,38 @@
"filter": [ "filter": [
"eq" "eq"
] ]
},
{
"id": 228,
"insert": 1,
"filter": [
"eq"
]
},
{
"id": 229,
"insert": 1,
"filter": [
"eq"
]
},
{
"id": 230,
"insert": 1,
"filter": [
"eq"
]
},
{
"id": 231,
"insert": 1,
"filter": []
},
{
"id": 232,
"insert": 1,
"filter": [
"eq"
]
} }
] ]

4
bin/json/game_dispatch_battle.json
View File

@ -15,7 +15,7 @@
"key": "pandamas_pandamas_npcbattle_battletxt_1", "key": "pandamas_pandamas_npcbattle_battletxt_1",
"text": "有人前来闹事，快去解决掉他" "text": "有人前来闹事，快去解决掉他"
}, },
"BattleReadyID": 100, "BattleReadyID": 103,
"monsterformat_id": 101011, "monsterformat_id": 101011,
"EventList": [], "EventList": [],
"award": [ "award": [
@ -59,7 +59,7 @@
"key": "pandamas_pandamas_npcbattle_battletxt_2", "key": "pandamas_pandamas_npcbattle_battletxt_2",
"text": "有人前来闹事，快去解决掉他" "text": "有人前来闹事，快去解决掉他"
}, },
"BattleReadyID": 100, "BattleReadyID": 103,
"monsterformat_id": 101051, "monsterformat_id": 101051,
"EventList": [], "EventList": [],
"award": [ "award": [

1
bin/json/game_global.json
View File

@ -670,6 +670,7 @@
"t": "merchantmoney", "t": "merchantmoney",
"n": 1 "n": 1
}, },
"business_rankmoney": 1000,
"business_moneynum": 10000, "business_moneynum": 10000,
"business_minint_reward": { "business_minint_reward": {
"a": "attr", "a": "attr",

2
bin/json/game_guildbossscore.json
View File

@ -6,7 +6,7 @@
"text": "e" "text": "e"
}, },
"score": 1, "score": 1,
"rank_low": 1, "rank_low": 0,
"rank_up": 19999, "rank_up": 19999,
"hp": 30, "hp": 30,
"drop": 19100001, "drop": 19100001,

370
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

54
bin/json/game_mainstage.json
View File

@ -2260,7 +2260,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100116, "previoustage": 1100125,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -2371,7 +2371,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100117, "previoustage": 1100126,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -2482,7 +2482,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100118, "previoustage": 1100127,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -2593,7 +2593,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100119, "previoustage": 1100128,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -2704,7 +2704,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100120, "previoustage": 1100129,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -2815,7 +2815,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100121, "previoustage": 1100130,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -2926,7 +2926,7 @@
"previous_group_id": [ "previous_group_id": [
100120 100120
], ],
"previoustage": 1100122, "previoustage": 1100131,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3148,7 +3148,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100124, "previoustage": 1100133,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3259,7 +3259,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100125, "previoustage": 1100134,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3370,7 +3370,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100126, "previoustage": 1100135,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3481,7 +3481,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100127, "previoustage": 1100136,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3592,7 +3592,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100128, "previoustage": 1100137,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3703,7 +3703,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100129, "previoustage": 1100138,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -3814,7 +3814,7 @@
"previous_group_id": [ "previous_group_id": [
100121 100121
], ],
"previoustage": 1100130, "previoustage": 1100139,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4036,7 +4036,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100132, "previoustage": 1100141,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4147,7 +4147,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100133, "previoustage": 1100142,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4258,7 +4258,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100134, "previoustage": 1100143,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4369,7 +4369,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100135, "previoustage": 1100144,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4480,7 +4480,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100136, "previoustage": 1100145,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4591,7 +4591,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100137, "previoustage": 1100146,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -4702,7 +4702,7 @@
"previous_group_id": [ "previous_group_id": [
100122 100122
], ],
"previoustage": 1100138, "previoustage": 1100147,
"Episodetype": 8, "Episodetype": 8,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -5645,7 +5645,7 @@
"previous_group_id": [ "previous_group_id": [
100129 100129
], ],
"previoustage": 1100150, "previoustage": 1100159,
"Episodetype": 4, "Episodetype": 4,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -5756,7 +5756,7 @@
"previous_group_id": [ "previous_group_id": [
100129 100129
], ],
"previoustage": 1100151, "previoustage": 1100160,
"Episodetype": 4, "Episodetype": 4,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -5867,7 +5867,7 @@
"previous_group_id": [ "previous_group_id": [
100129 100129
], ],
"previoustage": 1100152, "previoustage": 1100161,
"Episodetype": 4, "Episodetype": 4,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -5978,7 +5978,7 @@
"previous_group_id": [ "previous_group_id": [
100129 100129
], ],
"previoustage": 1100153, "previoustage": 1100162,
"Episodetype": 4, "Episodetype": 4,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -6089,7 +6089,7 @@
"previous_group_id": [ "previous_group_id": [
100129 100129
], ],
"previoustage": 1100154, "previoustage": 1100163,
"Episodetype": 4, "Episodetype": 4,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,
@ -6200,7 +6200,7 @@
"previous_group_id": [ "previous_group_id": [
100129 100129
], ],
"previoustage": 1100155, "previoustage": 1100164,
"Episodetype": 4, "Episodetype": 4,
"openlevel": 1, "openlevel": 1,
"EditorStage": 0, "EditorStage": 0,

2
bin/json/game_playerlv.json
View File

@ -970,7 +970,7 @@
}, },
{ {
"lv": 50, "lv": 50,
"exp": 4300, "exp": 0,
"reward": [ "reward": [
{ {
"a": "attr", "a": "attr",

168
bin/json/game_recharge.json
View File

@ -1,6 +1,7 @@
[ [
{ {
"id": "gold6", "id": 1,
"bpoint": "gold6",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -26,7 +27,8 @@
"integral": 500 "integral": 500
}, },
{ {
"id": "gold30", "id": 2,
"bpoint": "gold30",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -52,7 +54,8 @@
"integral": 600 "integral": 600
}, },
{ {
"id": "gold68", "id": 3,
"bpoint": "gold68",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -78,7 +81,8 @@
"integral": 700 "integral": 700
}, },
{ {
"id": "gold128", "id": 4,
"bpoint": "gold128",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -104,7 +108,8 @@
"integral": 800 "integral": 800
}, },
{ {
"id": "gold198", "id": 5,
"bpoint": "gold198",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -130,7 +135,8 @@
"integral": 900 "integral": 900
}, },
{ {
"id": "gold328", "id": 6,
"bpoint": "gold328",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -156,7 +162,8 @@
"integral": 1000 "integral": 1000
}, },
{ {
"id": "gold448", "id": 7,
"bpoint": "gold448",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -182,7 +189,8 @@
"integral": 1100 "integral": 1100
}, },
{ {
"id": "gold648", "id": 8,
"bpoint": "gold648",
"editionid": "debug", "editionid": "debug",
"recharge_type": 1, "recharge_type": 1,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -208,7 +216,8 @@
"integral": 1200 "integral": 1200
}, },
{ {
"id": "lb6_1", "id": 9,
"bpoint": "lb6_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -222,7 +231,8 @@
"integral": 1300 "integral": 1300
}, },
{ {
"id": "day_1", "id": 10,
"bpoint": "day_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -236,7 +246,8 @@
"integral": 1400 "integral": 1400
}, },
{ {
"id": "day_2", "id": 11,
"bpoint": "day_2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -250,7 +261,8 @@
"integral": 1500 "integral": 1500
}, },
{ {
"id": "day_3", "id": 12,
"bpoint": "day_3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -264,7 +276,8 @@
"integral": 1600 "integral": 1600
}, },
{ {
"id": "day_4", "id": 13,
"bpoint": "day_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -278,7 +291,8 @@
"integral": 1700 "integral": 1700
}, },
{ {
"id": "week_1", "id": 14,
"bpoint": "week_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -292,7 +306,8 @@
"integral": 1800 "integral": 1800
}, },
{ {
"id": "week_2", "id": 15,
"bpoint": "week_2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -306,7 +321,8 @@
"integral": 1900 "integral": 1900
}, },
{ {
"id": "week_3", "id": 16,
"bpoint": "week_3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -320,7 +336,8 @@
"integral": 2000 "integral": 2000
}, },
{ {
"id": "week_4", "id": 17,
"bpoint": "week_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -334,7 +351,8 @@
"integral": 2100 "integral": 2100
}, },
{ {
"id": "week_5", "id": 18,
"bpoint": "week_5",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -348,7 +366,8 @@
"integral": 2200 "integral": 2200
}, },
{ {
"id": "week_6", "id": 19,
"bpoint": "week_6",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -362,7 +381,8 @@
"integral": 2300 "integral": 2300
}, },
{ {
"id": "month_1", "id": 20,
"bpoint": "month_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -376,7 +396,8 @@
"integral": 2400 "integral": 2400
}, },
{ {
"id": "month_2", "id": 21,
"bpoint": "month_2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -390,7 +411,8 @@
"integral": 2500 "integral": 2500
}, },
{ {
"id": "month_3", "id": 22,
"bpoint": "month_3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 2, "recharge_type": 2,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -404,7 +426,8 @@
"integral": 2600 "integral": 2600
}, },
{ {
"id": "yueka_lv1", "id": 23,
"bpoint": "yueka_lv1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 3, "recharge_type": 3,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -424,7 +447,8 @@
"integral": 2700 "integral": 2700
}, },
{ {
"id": "yueka_lv2", "id": 24,
"bpoint": "yueka_lv2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 3, "recharge_type": 3,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -444,7 +468,8 @@
"integral": 2800 "integral": 2800
}, },
{ {
"id": "passcheck_1", "id": 25,
"bpoint": "passcheck_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 4, "recharge_type": 4,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -458,7 +483,8 @@
"integral": 2900 "integral": 2900
}, },
{ {
"id": "passcheck_2", "id": 26,
"bpoint": "passcheck_2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 4, "recharge_type": 4,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -472,7 +498,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "drawcard_pack1", "id": 27,
"bpoint": "drawcard_pack1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 5, "recharge_type": 5,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -486,7 +513,8 @@
"integral": 3100 "integral": 3100
}, },
{ {
"id": "passcheck_3", "id": 28,
"bpoint": "passcheck_3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 4, "recharge_type": 4,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -500,7 +528,8 @@
"integral": 3200 "integral": 3200
}, },
{ {
"id": "passcheck_4", "id": 29,
"bpoint": "passcheck_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 4, "recharge_type": 4,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -514,7 +543,8 @@
"integral": 3300 "integral": 3300
}, },
{ {
"id": "fund_1", "id": 30,
"bpoint": "fund_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -528,7 +558,8 @@
"integral": 3400 "integral": 3400
}, },
{ {
"id": "fund_2", "id": 31,
"bpoint": "fund_2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -542,7 +573,8 @@
"integral": 0 "integral": 0
}, },
{ {
"id": "fund_3", "id": 32,
"bpoint": "fund_3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -556,7 +588,8 @@
"integral": 0 "integral": 0
}, },
{ {
"id": "fund_4", "id": 33,
"bpoint": "fund_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -570,7 +603,8 @@
"integral": 3500 "integral": 3500
}, },
{ {
"id": "fund_5", "id": 34,
"bpoint": "fund_5",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -584,7 +618,8 @@
"integral": 3600 "integral": 3600
}, },
{ {
"id": "fund_6", "id": 35,
"bpoint": "fund_6",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -598,7 +633,8 @@
"integral": 3700 "integral": 3700
}, },
{ {
"id": "fund_7", "id": 36,
"bpoint": "fund_7",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -612,7 +648,8 @@
"integral": 3800 "integral": 3800
}, },
{ {
"id": "fund_8", "id": 37,
"bpoint": "fund_8",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -626,7 +663,8 @@
"integral": 3600 "integral": 3600
}, },
{ {
"id": "fund_9", "id": 38,
"bpoint": "fund_9",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -640,7 +678,8 @@
"integral": 3700 "integral": 3700
}, },
{ {
"id": "fund_10", "id": 39,
"bpoint": "fund_10",
"editionid": "debug", "editionid": "debug",
"recharge_type": 6, "recharge_type": 6,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -654,7 +693,8 @@
"integral": 3800 "integral": 3800
}, },
{ {
"id": "drawcard_pack2", "id": 40,
"bpoint": "drawcard_pack2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 5, "recharge_type": 5,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -668,7 +708,8 @@
"integral": 3100 "integral": 3100
}, },
{ {
"id": "drawcard_pack3", "id": 41,
"bpoint": "drawcard_pack3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 5, "recharge_type": 5,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -682,7 +723,8 @@
"integral": 3100 "integral": 3100
}, },
{ {
"id": "drawcard_pack4", "id": 42,
"bpoint": "drawcard_pack4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 5, "recharge_type": 5,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -696,7 +738,8 @@
"integral": 3100 "integral": 3100
}, },
{ {
"id": "passcheckPro_4", "id": 43,
"bpoint": "passcheckPro_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 4, "recharge_type": 4,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -722,7 +765,8 @@
"integral": 9800 "integral": 9800
}, },
{ {
"id": "passcheckMid_4", "id": 44,
"bpoint": "passcheckMid_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 4, "recharge_type": 4,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -748,7 +792,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_1", "id": 45,
"bpoint": "push_gift_1",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -762,7 +807,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_2", "id": 46,
"bpoint": "push_gift_2",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -776,7 +822,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_3", "id": 47,
"bpoint": "push_gift_3",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -790,7 +837,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_4", "id": 48,
"bpoint": "push_gift_4",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -804,7 +852,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_5", "id": 49,
"bpoint": "push_gift_5",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -818,7 +867,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_6", "id": 50,
"bpoint": "push_gift_6",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -832,7 +882,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_7", "id": 51,
"bpoint": "push_gift_7",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -846,7 +897,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_8", "id": 52,
"bpoint": "push_gift_8",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -860,7 +912,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_9", "id": 53,
"bpoint": "push_gift_9",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -874,7 +927,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_10", "id": 54,
"bpoint": "push_gift_10",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -888,7 +942,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_11", "id": 55,
"bpoint": "push_gift_11",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",
@ -902,7 +957,8 @@
"integral": 3000 "integral": 3000
}, },
{ {
"id": "push_gift_12", "id": 56,
"bpoint": "push_gift_12",
"editionid": "debug", "editionid": "debug",
"recharge_type": 7, "recharge_type": 7,
"monetaryunit": "￥", "monetaryunit": "￥",

3
modules/caravan/model_caravan.go
View File

@ -72,7 +72,8 @@ func (this *modelCaravan) modifyCaravanDataByObjId(uid string, data map[string]i
func (this *modelCaravan) GetRankListData(rankNum int32, uid string) (list []*pb.CaravanRankInfo, rankid int32) { func (this *modelCaravan) GetRankListData(rankNum int32, uid string) (list []*pb.CaravanRankInfo, rankid int32) {
var ipos int32 var ipos int32
if _data, err := this.DBModel.DB.Find(comm.TableUser, bson.M{}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(int64(rankNum))); err == nil { min := this.module.ModuleTools.GetGlobalConf().BusinessRankmoney
if _data, err := this.DBModel.DB.Find(comm.TableUser, bson.M{"merchantmoney": bson.M{"$gt": min}}, options.Find().SetSort(bson.M{"merchantmoney": -1}).SetLimit(int64(rankNum))); err == nil {
for _data.Next(context.TODO()) { for _data.Next(context.TODO()) {
temp := &pb.DBUser{} temp := &pb.DBUser{}
if err = _data.Decode(temp); err == nil { if err = _data.Decode(temp); err == nil {

1
modules/timer/caravanrank.go
View File

@ -79,6 +79,7 @@ func (this *CaravanRank) Start() (err error) {
// 0 0 0 ? * MON // 每周一零点 // 0 0 0 ? * MON // 每周一零点
cron.AddFunc("0 0 0 ? * MON", this.TimerSeason) cron.AddFunc("0 0 0 ? * MON", this.TimerSeason)
//this.TimerSeason() //this.TimerSeason()
return return
} }

8
sys/configure/structs/Game.Recharge.go
View File

@ -9,13 +9,13 @@
package cfg package cfg
type GameRecharge struct { type GameRecharge struct {
_dataMap map[string]*GameRechargeData _dataMap map[int32]*GameRechargeData
_dataList []*GameRechargeData _dataList []*GameRechargeData
} }
func NewGameRecharge(_buf []map[string]interface{}) (*GameRecharge, error) { func NewGameRecharge(_buf []map[string]interface{}) (*GameRecharge, error) {
_dataList := make([]*GameRechargeData, 0, len(_buf)) _dataList := make([]*GameRechargeData, 0, len(_buf))
dataMap := make(map[string]*GameRechargeData) dataMap := make(map[int32]*GameRechargeData)
for _, _ele_ := range _buf { for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameRechargeData(_ele_); err2 != nil { if _v, err2 := DeserializeGameRechargeData(_ele_); err2 != nil {
return nil, err2 return nil, err2
@ -27,7 +27,7 @@ func NewGameRecharge(_buf []map[string]interface{}) (*GameRecharge, error) {
return &GameRecharge{_dataList:_dataList, _dataMap:dataMap}, nil return &GameRecharge{_dataList:_dataList, _dataMap:dataMap}, nil
} }
func (table *GameRecharge) GetDataMap() map[string]*GameRechargeData { func (table *GameRecharge) GetDataMap() map[int32]*GameRechargeData {
return table._dataMap return table._dataMap
} }
@ -35,7 +35,7 @@ func (table *GameRecharge) GetDataList() []*GameRechargeData {
return table._dataList return table._dataList
} }
func (table *GameRecharge) Get(key string) *GameRechargeData { func (table *GameRecharge) Get(key int32) *GameRechargeData {
return table._dataMap[key] return table._dataMap[key]
} }

6
sys/configure/structs/Game.RechargeData.go
View File

@ -11,7 +11,8 @@ package cfg
import "errors" import "errors"
type GameRechargeData struct { type GameRechargeData struct {
Id string Id int32
Bpoint string
Editionid string Editionid string
RechargeType int32 RechargeType int32
Monetaryunit string Monetaryunit string
@ -32,7 +33,8 @@ func (*GameRechargeData) GetTypeId() int32 {
} }
func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Bpoint, _ok_ = _buf["bpoint"].(string); !_ok_ { err = errors.New("bpoint error"); return } }
{ var _ok_ bool; if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ { err = errors.New("editionid error"); return } } { var _ok_ bool; if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ { err = errors.New("editionid error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ { err = errors.New("recharge_type error"); return }; _v.RechargeType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ { err = errors.New("recharge_type error"); return }; _v.RechargeType = int32(_tempNum_) }
{ var _ok_ bool; if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ { err = errors.New("monetaryunit error"); return } } { var _ok_ bool; if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ { err = errors.New("monetaryunit error"); return } }

2
sys/configure/structs/game.globalData.go
View File

@ -211,6 +211,7 @@ type GameGlobalData struct {
FitnessModelId string FitnessModelId string
BusinessTicket int32 BusinessTicket int32
BusinessMoney *Gameatn BusinessMoney *Gameatn
BusinessRankmoney int32
BusinessMoneynum int32 BusinessMoneynum int32
BusinessMinintReward *Gameatn BusinessMinintReward *Gameatn
BusinessMaxintReward *Gameatn BusinessMaxintReward *Gameatn
@ -886,6 +887,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } } { var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_ticket"].(float64); !_ok_ { err = errors.New("business_ticket error"); return }; _v.BusinessTicket = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_ticket"].(float64); !_ok_ { err = errors.New("business_ticket error"); return }; _v.BusinessTicket = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_money"].(map[string]interface{}); !_ok_ { err = errors.New("business_money error"); return }; if _v.BusinessMoney, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_money"].(map[string]interface{}); !_ok_ { err = errors.New("business_money error"); return }; if _v.BusinessMoney, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rankmoney"].(float64); !_ok_ { err = errors.New("business_rankmoney error"); return }; _v.BusinessRankmoney = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_moneynum"].(float64); !_ok_ { err = errors.New("business_moneynum error"); return }; _v.BusinessMoneynum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_moneynum"].(float64); !_ok_ { err = errors.New("business_moneynum error"); return }; _v.BusinessMoneynum = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_minint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_minint_reward error"); return }; if _v.BusinessMinintReward, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_minint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_minint_reward error"); return }; if _v.BusinessMinintReward, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_maxint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_maxint_reward error"); return }; if _v.BusinessMaxintReward, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["business_maxint_reward"].(map[string]interface{}); !_ok_ { err = errors.New("business_maxint_reward error"); return }; if _v.BusinessMaxintReward, err = DeserializeGameatn(_x_); err != nil { return } }