diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 08d15f933..77b53212d 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -26009,7 +26009,9 @@
"id": 60000004,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_925",
@@ -26031,7 +26033,9 @@
"id": 60000005,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_926",
@@ -26053,7 +26057,9 @@
"id": 60000006,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_927",
@@ -26077,7 +26083,9 @@
"id": 60000007,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_928",
@@ -26099,7 +26107,9 @@
"id": 60000008,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_929",
@@ -26121,7 +26131,9 @@
"id": 60000009,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_930",
@@ -26143,7 +26155,9 @@
"id": 70000001,
"rtype": 1,
"ctype": 1,
- "notify": [],
+ "notify": [
+ "pushgiftbag"
+ ],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_931",
diff --git a/bin/json/game_pushgift.json b/bin/json/game_pushgift.json
index c09e709ae..1168ea860 100644
--- a/bin/json/game_pushgift.json
+++ b/bin/json/game_pushgift.json
@@ -11,9 +11,9 @@
},
"resource": "",
"integral": [
- 600
+ 3000
],
- "condition": 80000001,
+ "condition": 60000004,
"lbid": [
{
"a": "attr",
@@ -25,7 +25,7 @@
"rebate": 1500,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold6"
+ "recharge": "push_gift_1"
},
{
"id": 2,
@@ -41,7 +41,7 @@
"integral": [
3000
],
- "condition": 90043001,
+ "condition": 60000005,
"lbid": [
{
"a": "attr",
@@ -53,7 +53,7 @@
"rebate": 1000,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold30"
+ "recharge": "push_gift_2"
},
{
"id": 3,
@@ -67,9 +67,9 @@
},
"resource": "",
"integral": [
- 6800
+ 3000
],
- "condition": 90043002,
+ "condition": 60000006,
"lbid": [
{
"a": "attr",
@@ -81,7 +81,7 @@
"rebate": 1000,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold68"
+ "recharge": "push_gift_3"
},
{
"id": 4,
@@ -95,9 +95,9 @@
},
"resource": "",
"integral": [
- 9800
+ 3000
],
- "condition": 90043003,
+ "condition": 60000007,
"lbid": [
{
"a": "attr",
@@ -109,7 +109,7 @@
"rebate": 900,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold128"
+ "recharge": "push_gift_4"
},
{
"id": 5,
@@ -123,9 +123,9 @@
},
"resource": "",
"integral": [
- 12800
+ 3000
],
- "condition": 90043004,
+ "condition": 60000008,
"lbid": [
{
"a": "attr",
@@ -137,7 +137,7 @@
"rebate": 900,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold198"
+ "recharge": "push_gift_5"
},
{
"id": 6,
@@ -151,9 +151,9 @@
},
"resource": "",
"integral": [
- 19800
+ 3000
],
- "condition": 90043005,
+ "condition": 60000009,
"lbid": [
{
"a": "attr",
@@ -165,7 +165,7 @@
"rebate": 600,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold328"
+ "recharge": "push_gift_6"
},
{
"id": 7,
@@ -178,178 +178,10 @@
"text": "月末狂欢，冰点特价"
},
"resource": "",
- "integral": [
- 32800
- ],
- "condition": 90043006,
- "lbid": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- }
- ],
- "time": 240,
- "rebate": 600,
- "isdayrepeat": 0,
- "force": 0,
- "recharge": "gold448"
- },
- {
- "id": 8,
- "name": {
- "key": "guild_guild_boss_score_name_8",
- "text": "升星礼包"
- },
- "title": {
- "key": "push_push_8",
- "text": "月末狂欢，冰点特价"
- },
- "resource": "",
- "integral": [
- 64800
- ],
- "condition": 90043007,
- "lbid": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- }
- ],
- "time": 240,
- "rebate": 1500,
- "isdayrepeat": 0,
- "force": 0,
- "recharge": "gold648"
- },
- {
- "id": 9,
- "name": {
- "key": "guild_guild_boss_score_name_9",
- "text": "升星礼包"
- },
- "title": {
- "key": "push_push_9",
- "text": "月末狂欢，冰点特价"
- },
- "resource": "",
- "integral": [
- 600
- ],
- "condition": 90044001,
- "lbid": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- }
- ],
- "time": 240,
- "rebate": 1000,
- "isdayrepeat": 0,
- "force": 0,
- "recharge": "gold6"
- },
- {
- "id": 10,
- "name": {
- "key": "guild_guild_boss_score_name_11",
- "text": "升星礼包"
- },
- "title": {
- "key": "push_push_10",
- "text": "月末狂欢，冰点特价"
- },
- "resource": "",
"integral": [
3000
],
- "condition": 90044002,
- "lbid": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- }
- ],
- "time": 240,
- "rebate": 1000,
- "isdayrepeat": 0,
- "force": 0,
- "recharge": "gold30"
- },
- {
- "id": 11,
- "name": {
- "key": "guild_guild_boss_score_name_12",
- "text": "升星礼包"
- },
- "title": {
- "key": "push_push_11",
- "text": "月末狂欢，冰点特价"
- },
- "resource": "",
- "integral": [
- 6800
- ],
- "condition": 90044003,
- "lbid": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- }
- ],
- "time": 240,
- "rebate": 900,
- "isdayrepeat": 0,
- "force": 0,
- "recharge": "gold68"
- },
- {
- "id": 12,
- "name": {
- "key": "guild_guild_boss_score_name_14",
- "text": "升星礼包"
- },
- "title": {
- "key": "push_push_12",
- "text": "月末狂欢，冰点特价"
- },
- "resource": "",
- "integral": [
- 9800
- ],
- "condition": 90044004,
- "lbid": [
- {
- "a": "attr",
- "t": "gold",
- "n": 1
- }
- ],
- "time": 240,
- "rebate": 900,
- "isdayrepeat": 0,
- "force": 0,
- "recharge": "gold128"
- },
- {
- "id": 13,
- "name": {
- "key": "guild_guild_boss_score_name_15",
- "text": "升星礼包"
- },
- "title": {
- "key": "push_push_13",
- "text": "月末狂欢，冰点特价"
- },
- "resource": "",
- "integral": [
- 12800
- ],
- "condition": 90044005,
+ "condition": 70000001,
"lbid": [
{
"a": "attr",
@@ -361,6 +193,6 @@
"rebate": 600,
"isdayrepeat": 0,
"force": 0,
- "recharge": "gold198"
+ "recharge": "push_gift_7"
}
]
\ No newline at end of file
diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json
index b16deee08..b3e9504f8 100644
--- a/bin/json/game_recharge.json
+++ b/bin/json/game_recharge.json
@@ -734,5 +734,173 @@
"show": "30元",
"image": "",
"integral": 3000
+ },
+ {
+ "id": "push_gift_1",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_2",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_3",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_4",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_5",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_6",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_7",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_8",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_9",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_10",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_11",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
+ },
+ {
+ "id": "push_gift_12",
+ "editionid": "debug",
+ "recharge_type": 7,
+ "monetaryunit": "￥",
+ "amount": 3000,
+ "vipexp": [],
+ "diamond_num_double": [],
+ "channel": "0",
+ "text": "0",
+ "show": "30元",
+ "image": "",
+ "integral": 3000
}
]
\ No newline at end of file
diff --git a/bin/json/game_shopcentercontrol.json b/bin/json/game_shopcentercontrol.json
index 01d84a373..a636333a8 100644
--- a/bin/json/game_shopcentercontrol.json
+++ b/bin/json/game_shopcentercontrol.json
@@ -43,7 +43,7 @@
"bg": "hd_gwzx_bg",
"slogan": {
"key": "supermarket_overall_slogan_2",
- "text": "购买礼包并通关所有困难模式主线，总计可获得超值1200%奖励！"
+ "text": "[color=#ffffff]购买礼包并通关所有困难模式主线[/color]
总计可获得超值[color=#2bb496][size=62]1200%[/size][/color]奖励！"
},
"point": "fund_2",
"props": [],
@@ -71,7 +71,7 @@
"bg": "hd_gwzx_bg",
"slogan": {
"key": "supermarket_overall_slogan_3",
- "text": "购买礼包并通关所有地狱模式主线，总计可获得超值1200%奖励！"
+ "text": "[color=#ffffff]购买礼包并通关所有地狱模式主线[/color]
总计可获得超值[color=#2bb496][size=62]1200%[/size][/color]奖励！"
},
"point": "fund_3",
"props": [],
@@ -99,7 +99,7 @@
"bg": "hd_gwzx_bg",
"slogan": {
"key": "supermarket_overall_slogan_4",
- "text": "购买礼包并达到相应的守护者等级，总计可获得超值1800%奖励！"
+ "text": "[color=#ffffff]购买礼包并达到相应的守护者等级[/color]
总计可获得超值[color=#2bb496][size=62]1800%[/size][/color]奖励！"
},
"point": "fund_4",
"props": [],
diff --git a/comm/const.go b/comm/const.go
index bea127fcf..51303339f 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -837,6 +837,11 @@ const (
Rtype206 TaskType = 206 //完成X次复合事件
Rtype207 TaskType = 207 //完成X组事件
Rtype208 TaskType = 208 // 拥有X名回响达到满级的X阵容守护者
+ Rtype209 TaskType = 209 // 玩家购买指定商店货物X个
+ Rtype210 TaskType = 210 // 向指定X城市贩卖货物，贩卖货物价值需要X虚拟币以上
+ Rtype211 TaskType = 211 // 向指定X城市，贩卖价值X虚拟币以上的对应城市急需货物
+ Rtype212 TaskType = 212 // 接取任务后，商队抵达指定城市
+ Rtype213 TaskType = 213 // 消耗X体力
)
const (
MailLineEasy int32 = 1 // 简单
diff --git a/modules/pushgiftbag/module.go b/modules/pushgiftbag/module.go
index ee71f13f6..0f8c83d47 100644
--- a/modules/pushgiftbag/module.go
+++ b/modules/pushgiftbag/module.go
@@ -104,6 +104,7 @@ func (this *PushGiftbag) BuriedsNotify(session comm.IUserSession, condis []*pb.C
ok bool
err error
)
+ this.Debug("收到子任务进度变化推送", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "condis", Value: condis})
if confs, err = this.configure.getGamePushGift(); err != nil {
this.Errorln(err)
return