Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
37521c3256
@ -311,7 +311,7 @@
|
|||||||
"horoscope_reset_cost": {
|
"horoscope_reset_cost": {
|
||||||
"a": "attr",
|
"a": "attr",
|
||||||
"t": "diamond",
|
"t": "diamond",
|
||||||
"n": 500
|
"n": 30
|
||||||
},
|
},
|
||||||
"horoscope_reset_cd": 86400,
|
"horoscope_reset_cd": 86400,
|
||||||
"hero_reset": [
|
"hero_reset": [
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"heroid": 25001,
|
"heroid": 25001,
|
||||||
"opentime": "2023/8/8 0:00:00",
|
"opentime": "2023-08-08",
|
||||||
"newheroday": 4,
|
"newheroday": 4,
|
||||||
"reward": [
|
"reward": [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2,6 +2,10 @@
|
|||||||
{
|
{
|
||||||
"key": 1,
|
"key": 1,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "heroupstory_heroupstory_chapter_chaptername_01",
|
||||||
|
"text": "第一章：武斗大会"
|
||||||
|
},
|
||||||
"chapter": 1001,
|
"chapter": 1001,
|
||||||
"onlevel": 0,
|
"onlevel": 0,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -25,7 +29,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_01",
|
"key": "heroupstory_heroupstory_chapter_txt_01",
|
||||||
"text": "测试文本1"
|
"text": "测试文本1"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -36,6 +40,10 @@
|
|||||||
{
|
{
|
||||||
"key": 2,
|
"key": 2,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1001,
|
"chapter": 1001,
|
||||||
"onlevel": 1,
|
"onlevel": 1,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -56,7 +64,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_02",
|
"key": "heroupstory_heroupstory_chapter_txt_02",
|
||||||
"text": "测试文本2"
|
"text": "测试文本2"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -67,6 +75,10 @@
|
|||||||
{
|
{
|
||||||
"key": 3,
|
"key": 3,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1001,
|
"chapter": 1001,
|
||||||
"onlevel": 1,
|
"onlevel": 1,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -89,7 +101,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_03",
|
"key": "heroupstory_heroupstory_chapter_txt_03",
|
||||||
"text": "测试文本3"
|
"text": "测试文本3"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -100,6 +112,10 @@
|
|||||||
{
|
{
|
||||||
"key": 4,
|
"key": 4,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1001,
|
"chapter": 1001,
|
||||||
"onlevel": 3,
|
"onlevel": 3,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -116,7 +132,7 @@
|
|||||||
"battle": 0,
|
"battle": 0,
|
||||||
"reward": [],
|
"reward": [],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_04",
|
"key": "heroupstory_heroupstory_chapter_txt_04",
|
||||||
"text": "测试文本4"
|
"text": "测试文本4"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -127,6 +143,10 @@
|
|||||||
{
|
{
|
||||||
"key": 5,
|
"key": 5,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1001,
|
"chapter": 1001,
|
||||||
"onlevel": 4,
|
"onlevel": 4,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -147,7 +167,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_05",
|
"key": "heroupstory_heroupstory_chapter_txt_05",
|
||||||
"text": "测试文本5"
|
"text": "测试文本5"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -158,6 +178,10 @@
|
|||||||
{
|
{
|
||||||
"key": 6,
|
"key": 6,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "heroupstory_heroupstory_chapter_chaptername_06",
|
||||||
|
"text": "第二章：武侠汇聚"
|
||||||
|
},
|
||||||
"chapter": 1002,
|
"chapter": 1002,
|
||||||
"onlevel": 5,
|
"onlevel": 5,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -181,7 +205,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_06",
|
"key": "heroupstory_heroupstory_chapter_txt_06",
|
||||||
"text": "测试文本6"
|
"text": "测试文本6"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -192,6 +216,10 @@
|
|||||||
{
|
{
|
||||||
"key": 7,
|
"key": 7,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1002,
|
"chapter": 1002,
|
||||||
"onlevel": 6,
|
"onlevel": 6,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -212,7 +240,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_07",
|
"key": "heroupstory_heroupstory_chapter_txt_07",
|
||||||
"text": "测试文本7"
|
"text": "测试文本7"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -223,6 +251,10 @@
|
|||||||
{
|
{
|
||||||
"key": 8,
|
"key": 8,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1002,
|
"chapter": 1002,
|
||||||
"onlevel": 7,
|
"onlevel": 7,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -245,7 +277,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_08",
|
"key": "heroupstory_heroupstory_chapter_txt_08",
|
||||||
"text": "测试文本8"
|
"text": "测试文本8"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -256,6 +288,10 @@
|
|||||||
{
|
{
|
||||||
"key": 9,
|
"key": 9,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1002,
|
"chapter": 1002,
|
||||||
"onlevel": 8,
|
"onlevel": 8,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -272,7 +308,7 @@
|
|||||||
"battle": 0,
|
"battle": 0,
|
||||||
"reward": [],
|
"reward": [],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_09",
|
"key": "heroupstory_heroupstory_chapter_txt_09",
|
||||||
"text": "测试文本9"
|
"text": "测试文本9"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -283,6 +319,10 @@
|
|||||||
{
|
{
|
||||||
"key": 10,
|
"key": 10,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1002,
|
"chapter": 1002,
|
||||||
"onlevel": 9,
|
"onlevel": 9,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -303,7 +343,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_10",
|
"key": "heroupstory_heroupstory_chapter_txt_10",
|
||||||
"text": "测试文本10"
|
"text": "测试文本10"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -314,6 +354,10 @@
|
|||||||
{
|
{
|
||||||
"key": 11,
|
"key": 11,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "heroupstory_heroupstory_chapter_chaptername_11",
|
||||||
|
"text": "第三章：大龙归来"
|
||||||
|
},
|
||||||
"chapter": 1003,
|
"chapter": 1003,
|
||||||
"onlevel": 10,
|
"onlevel": 10,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -337,7 +381,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_11",
|
"key": "heroupstory_heroupstory_chapter_txt_11",
|
||||||
"text": "测试文本11"
|
"text": "测试文本11"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -348,6 +392,10 @@
|
|||||||
{
|
{
|
||||||
"key": 12,
|
"key": 12,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1003,
|
"chapter": 1003,
|
||||||
"onlevel": 11,
|
"onlevel": 11,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -368,7 +416,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_12",
|
"key": "heroupstory_heroupstory_chapter_txt_12",
|
||||||
"text": "测试文本12"
|
"text": "测试文本12"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -379,6 +427,10 @@
|
|||||||
{
|
{
|
||||||
"key": 13,
|
"key": 13,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1003,
|
"chapter": 1003,
|
||||||
"onlevel": 12,
|
"onlevel": 12,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -401,7 +453,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_13",
|
"key": "heroupstory_heroupstory_chapter_txt_13",
|
||||||
"text": "测试文本13"
|
"text": "测试文本13"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -412,6 +464,10 @@
|
|||||||
{
|
{
|
||||||
"key": 14,
|
"key": 14,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1003,
|
"chapter": 1003,
|
||||||
"onlevel": 13,
|
"onlevel": 13,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -434,7 +490,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_14",
|
"key": "heroupstory_heroupstory_chapter_txt_14",
|
||||||
"text": "测试文本14"
|
"text": "测试文本14"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -445,6 +501,10 @@
|
|||||||
{
|
{
|
||||||
"key": 15,
|
"key": 15,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1003,
|
"chapter": 1003,
|
||||||
"onlevel": 14,
|
"onlevel": 14,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -465,7 +525,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_15",
|
"key": "heroupstory_heroupstory_chapter_txt_15",
|
||||||
"text": "测试文本15"
|
"text": "测试文本15"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -476,6 +536,10 @@
|
|||||||
{
|
{
|
||||||
"key": 16,
|
"key": 16,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1004,
|
"chapter": 1004,
|
||||||
"onlevel": 15,
|
"onlevel": 15,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -498,7 +562,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_16",
|
"key": "heroupstory_heroupstory_chapter_txt_16",
|
||||||
"text": "测试文本16"
|
"text": "测试文本16"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
@ -509,6 +573,10 @@
|
|||||||
{
|
{
|
||||||
"key": 17,
|
"key": 17,
|
||||||
"hero": 25001,
|
"hero": 25001,
|
||||||
|
"chaptername": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
"chapter": 1004,
|
"chapter": 1004,
|
||||||
"onlevel": 16,
|
"onlevel": 16,
|
||||||
"onlevelstory": [],
|
"onlevelstory": [],
|
||||||
@ -523,7 +591,7 @@
|
|||||||
"battle": 0,
|
"battle": 0,
|
||||||
"reward": [],
|
"reward": [],
|
||||||
"txt": {
|
"txt": {
|
||||||
"key": "heroupstory_heroupstory_chapter_17",
|
"key": "heroupstory_heroupstory_chapter_txt_17",
|
||||||
"text": "测试文本17"
|
"text": "测试文本17"
|
||||||
},
|
},
|
||||||
"circle": "",
|
"circle": "",
|
||||||
|
|||||||
@ -13679,7 +13679,7 @@
|
|||||||
"reddottype": 0,
|
"reddottype": 0,
|
||||||
"effects": "",
|
"effects": "",
|
||||||
"modelName": "",
|
"modelName": "",
|
||||||
"box_id": 0,
|
"box_id": 22000002,
|
||||||
"synthetize_num": 0,
|
"synthetize_num": 0,
|
||||||
"synthetize_deplete": [],
|
"synthetize_deplete": [],
|
||||||
"synthetize_get": [],
|
"synthetize_get": [],
|
||||||
@ -13720,7 +13720,7 @@
|
|||||||
"reddottype": 0,
|
"reddottype": 0,
|
||||||
"effects": "",
|
"effects": "",
|
||||||
"modelName": "",
|
"modelName": "",
|
||||||
"box_id": 0,
|
"box_id": 22000003,
|
||||||
"synthetize_num": 0,
|
"synthetize_num": 0,
|
||||||
"synthetize_deplete": [],
|
"synthetize_deplete": [],
|
||||||
"synthetize_get": [],
|
"synthetize_get": [],
|
||||||
@ -13802,7 +13802,7 @@
|
|||||||
"reddottype": 0,
|
"reddottype": 0,
|
||||||
"effects": "",
|
"effects": "",
|
||||||
"modelName": "",
|
"modelName": "",
|
||||||
"box_id": 0,
|
"box_id": 22000004,
|
||||||
"synthetize_num": 0,
|
"synthetize_num": 0,
|
||||||
"synthetize_deplete": [],
|
"synthetize_deplete": [],
|
||||||
"synthetize_get": [],
|
"synthetize_get": [],
|
||||||
@ -13843,7 +13843,7 @@
|
|||||||
"reddottype": 0,
|
"reddottype": 0,
|
||||||
"effects": "",
|
"effects": "",
|
||||||
"modelName": "",
|
"modelName": "",
|
||||||
"box_id": 0,
|
"box_id": 22000005,
|
||||||
"synthetize_num": 0,
|
"synthetize_num": 0,
|
||||||
"synthetize_deplete": [],
|
"synthetize_deplete": [],
|
||||||
"synthetize_get": [],
|
"synthetize_get": [],
|
||||||
@ -13884,7 +13884,7 @@
|
|||||||
"reddottype": 0,
|
"reddottype": 0,
|
||||||
"effects": "",
|
"effects": "",
|
||||||
"modelName": "",
|
"modelName": "",
|
||||||
"box_id": 0,
|
"box_id": 22000006,
|
||||||
"synthetize_num": 0,
|
"synthetize_num": 0,
|
||||||
"synthetize_deplete": [],
|
"synthetize_deplete": [],
|
||||||
"synthetize_get": [],
|
"synthetize_get": [],
|
||||||
|
|||||||
@ -45742,5 +45742,557 @@
|
|||||||
"playerlvmin": 0,
|
"playerlvmin": 0,
|
||||||
"playerlvmax": 0,
|
"playerlvmax": 0,
|
||||||
"notice": 0
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1907,
|
||||||
|
"lotteryid": 22000002,
|
||||||
|
"description": "中级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000201",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000201",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1908,
|
||||||
|
"lotteryid": 22000002,
|
||||||
|
"description": "中级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000202",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000202",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1909,
|
||||||
|
"lotteryid": 22000002,
|
||||||
|
"description": "中级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000203",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000203",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1910,
|
||||||
|
"lotteryid": 22000002,
|
||||||
|
"description": "中级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000204",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000204",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1911,
|
||||||
|
"lotteryid": 22000003,
|
||||||
|
"description": "高级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000301",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000301",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1912,
|
||||||
|
"lotteryid": 22000003,
|
||||||
|
"description": "高级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000302",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000302",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1913,
|
||||||
|
"lotteryid": 22000003,
|
||||||
|
"description": "高级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000303",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000303",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1914,
|
||||||
|
"lotteryid": 22000003,
|
||||||
|
"description": "高级回响自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "item",
|
||||||
|
"t": "15000304",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "15000304",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1915,
|
||||||
|
"lotteryid": 22000004,
|
||||||
|
"description": "4星直觉守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "24003",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "24003",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1916,
|
||||||
|
"lotteryid": 22000004,
|
||||||
|
"description": "4星直觉守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "24004",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "24004",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1917,
|
||||||
|
"lotteryid": 22000004,
|
||||||
|
"description": "4星直觉守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "24005",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "24005",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1918,
|
||||||
|
"lotteryid": 22000004,
|
||||||
|
"description": "4星直觉守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "24008",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "24008",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1919,
|
||||||
|
"lotteryid": 22000004,
|
||||||
|
"description": "4星直觉守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "24009",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "24009",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1920,
|
||||||
|
"lotteryid": 22000005,
|
||||||
|
"description": "4星真诚守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "14001",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "14001",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1921,
|
||||||
|
"lotteryid": 22000005,
|
||||||
|
"description": "4星真诚守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "14003",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "14003",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1922,
|
||||||
|
"lotteryid": 22000005,
|
||||||
|
"description": "4星真诚守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "14005",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "14005",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1923,
|
||||||
|
"lotteryid": 22000005,
|
||||||
|
"description": "4星真诚守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "14007",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "14007",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1924,
|
||||||
|
"lotteryid": 22000006,
|
||||||
|
"description": "4星共情守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "34002",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "34002",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1925,
|
||||||
|
"lotteryid": 22000006,
|
||||||
|
"description": "4星共情守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "34003",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "34003",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1926,
|
||||||
|
"lotteryid": 22000006,
|
||||||
|
"description": "4星共情守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "34005",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "34005",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1927,
|
||||||
|
"lotteryid": 22000006,
|
||||||
|
"description": "4星共情守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "34006",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "34006",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1928,
|
||||||
|
"lotteryid": 22000006,
|
||||||
|
"description": "4星共情守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "34007",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "34007",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 1929,
|
||||||
|
"lotteryid": 22000006,
|
||||||
|
"description": "4星共情守护者自选箱",
|
||||||
|
"type": 3,
|
||||||
|
"groupwt": 1,
|
||||||
|
"groupid": 1,
|
||||||
|
"subtype": 1,
|
||||||
|
"groupnum": 1,
|
||||||
|
"itemid": {
|
||||||
|
"a": "hero",
|
||||||
|
"t": "34008",
|
||||||
|
"n": 1
|
||||||
|
},
|
||||||
|
"itemdes": "34008",
|
||||||
|
"itemwt": 1000,
|
||||||
|
"min": 1,
|
||||||
|
"max": 1,
|
||||||
|
"VIPmin": 0,
|
||||||
|
"VIPmax": 15,
|
||||||
|
"playerlvmin": 0,
|
||||||
|
"playerlvmax": 0,
|
||||||
|
"notice": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -26,6 +26,7 @@ type Activity struct {
|
|||||||
warorder comm.IWarorder // 战令
|
warorder comm.IWarorder // 战令
|
||||||
pay comm.IPay // 支付
|
pay comm.IPay // 支付
|
||||||
shopcenter comm.IShopcenter // 活动中心
|
shopcenter comm.IShopcenter // 活动中心
|
||||||
|
addrecharge comm.IAddrecharge // 活动中心
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewModule() core.IModule {
|
func NewModule() core.IModule {
|
||||||
@ -71,12 +72,17 @@ func (this *Activity) Start() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.shopcenter = module.(comm.IShopcenter)
|
this.shopcenter = module.(comm.IShopcenter)
|
||||||
|
|
||||||
|
if module, err = this.service.GetModule(comm.ModuleAddrecharge); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.addrecharge = module.(comm.IAddrecharge)
|
||||||
event.RegisterGO(comm.EventUserLogin, this.EventUserLogin)
|
event.RegisterGO(comm.EventUserLogin, this.EventUserLogin)
|
||||||
if !db.IsCross() {
|
if !db.IsCross() {
|
||||||
this.modelhdList.LoadActivityData()
|
this.modelhdList.LoadActivityData()
|
||||||
for k, v := range this.modelhdList.activity {
|
for k, v := range this.modelhdList.activity {
|
||||||
switch k {
|
switch k {
|
||||||
case pb.HdType_HdTypeWarorder:
|
case pb.HdType_HdTypeWarorder, pb.HdType_SupplyWarOrder, pb.HdType_MoondreamWarOrder:
|
||||||
this.warorder.ActivityOpenNotice(v)
|
this.warorder.ActivityOpenNotice(v)
|
||||||
break
|
break
|
||||||
case pb.HdType_HdTypePay, pb.HdType_ShopCenterPayPakcge:
|
case pb.HdType_HdTypePay, pb.HdType_ShopCenterPayPakcge:
|
||||||
@ -85,6 +91,9 @@ func (this *Activity) Start() (err error) {
|
|||||||
case pb.HdType_XSFundPhysical, pb.HdType_XSFundRecruit, pb.HdType_XSFundExp:
|
case pb.HdType_XSFundPhysical, pb.HdType_XSFundRecruit, pb.HdType_XSFundExp:
|
||||||
this.pay.ActivityOpenNotice(v)
|
this.pay.ActivityOpenNotice(v)
|
||||||
break
|
break
|
||||||
|
case pb.HdType_AddUpRecharge:
|
||||||
|
this.addrecharge.ActivityOpenNotice(v)
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,6 +77,6 @@ func (this *apiComp) ReceiveAll(session comm.IUserSession, req *pb.AddRechargeRe
|
|||||||
this.module.modelRecharge.Change(session.GetUserId(), map[string]interface{}{
|
this.module.modelRecharge.Change(session.GetUserId(), map[string]interface{}{
|
||||||
"record": info.Record,
|
"record": info.Record,
|
||||||
})
|
})
|
||||||
session.SendMsg(string(this.module.GetType()), "receiveall", &pb.AddRechargeReceiveAllResp{Award: award})
|
session.SendMsg(string(this.module.GetType()), "receiveall", &pb.AddRechargeReceiveAllResp{Record: info.Record, Award: award})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,6 +47,11 @@ func (this *ModelRecharge) getUserDTasks(uid string) (results *pb.DBAddRecharge,
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
func (this *ModelRecharge) setopen() {
|
||||||
|
this.lock.Lock()
|
||||||
|
defer this.lock.Unlock()
|
||||||
|
this.open = true
|
||||||
|
}
|
||||||
|
|
||||||
func (this *ModelRecharge) getopen() bool {
|
func (this *ModelRecharge) getopen() bool {
|
||||||
this.lock.RLock()
|
this.lock.RLock()
|
||||||
|
|||||||
@ -49,7 +49,7 @@ func (this *AddRecharge) OnInstallComp() {
|
|||||||
func (this *AddRecharge) ActivityOpenNotice(hdlist *pb.DBHuodong) {
|
func (this *AddRecharge) ActivityOpenNotice(hdlist *pb.DBHuodong) {
|
||||||
switch hdlist.Itype {
|
switch hdlist.Itype {
|
||||||
case pb.HdType_AddUpRecharge:
|
case pb.HdType_AddUpRecharge:
|
||||||
|
this.modelRecharge.setopen()
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -221,6 +221,7 @@ func (this *Pay) ModulePayDelivery(session comm.IUserSession, Productid string,
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
this.addrecharge.RechargeIntegral(session, conf.Integral) //记录累充积分
|
||||||
if info.Record[Productid] > 0 {
|
if info.Record[Productid] > 0 {
|
||||||
res = conf.Vipexp
|
res = conf.Vipexp
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -36,7 +36,7 @@ func (this *apiComp) Turnon(session comm.IUserSession, req *pb.StorylineTurnonRe
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
loc, _ := time.LoadLocation("Local")
|
loc, _ := time.LoadLocation("Local")
|
||||||
if opentime, err = time.ParseInLocation("2006-01-02 15:04:05", conf.Opentime, loc); err != nil {
|
if opentime, err = time.ParseInLocation("2006-01-02", conf.Opentime, loc); err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_ConfigurationException,
|
Code: pb.ErrorCode_ConfigurationException,
|
||||||
Title: pb.ErrorCode_ConfigurationException.ToString(),
|
Title: pb.ErrorCode_ConfigurationException.ToString(),
|
||||||
@ -79,6 +79,6 @@ func (this *apiComp) Turnon(session comm.IUserSession, req *pb.StorylineTurnonRe
|
|||||||
"cd": info.Cd,
|
"cd": info.Cd,
|
||||||
"item": info.Item,
|
"item": info.Item,
|
||||||
})
|
})
|
||||||
session.SendMsg(string(this.module.GetType()), "info", &pb.StorylineTurnonResp{Heroid: req.Heroid, Info: info})
|
session.SendMsg(string(this.module.GetType()), "turnon", &pb.StorylineTurnonResp{Heroid: req.Heroid, Info: info})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
26
modules/storyline/module_test.go
Normal file
26
modules/storyline/module_test.go
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
package storyline_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCreateEmail(t *testing.T) {
|
||||||
|
loc, _ := time.LoadLocation("Local")
|
||||||
|
if opentime, err := time.ParseInLocation("2006-01-02", "2023-08-08", loc); err != nil {
|
||||||
|
fmt.Printf("%v", err)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
fmt.Printf("%v", opentime)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadEmail(t *testing.T) {
|
||||||
|
// data, err := db.Mail_ReadOneMail("62a078c0726ea54890c34937")
|
||||||
|
// if err != nil {
|
||||||
|
// log.Printf("%v", data.Reward)
|
||||||
|
// }
|
||||||
|
// require.Nil(t, err, data)
|
||||||
|
}
|
||||||
@ -78,15 +78,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e
|
|||||||
if dwarorder.Opentime != activity.Stime {
|
if dwarorder.Opentime != activity.Stime {
|
||||||
dwarorder.Opentime = activity.Stime
|
dwarorder.Opentime = activity.Stime
|
||||||
dwarorder.Endtime = activity.Etime
|
dwarorder.Endtime = activity.Etime
|
||||||
warorder.Payprogress = 0
|
dwarorder.Payprogress = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
if utils.IsToday(dwarorder.Daytime) {
|
if !utils.IsToday(dwarorder.Daytime) {
|
||||||
daynum := this.module.ModuleTools.GetGlobalConf().Passcheck4DayNum
|
daynum := this.module.ModuleTools.GetGlobalConf().Passcheck4DayNum
|
||||||
this.module.model.refreshDayTask(dwarorder, confs, daynum)
|
this.module.model.refreshDayTask(dwarorder, confs, daynum)
|
||||||
|
|
||||||
}
|
}
|
||||||
if utils.IsSameWeek(dwarorder.Weektime) {
|
if !utils.IsSameWeek(dwarorder.Weektime) {
|
||||||
weeknum := this.module.ModuleTools.GetGlobalConf().Passcheck4WeekNum
|
weeknum := this.module.ModuleTools.GetGlobalConf().Passcheck4WeekNum
|
||||||
this.module.model.refreshDayTask(dwarorder, confs, weeknum)
|
this.module.model.refreshDayTask(dwarorder, confs, weeknum)
|
||||||
}
|
}
|
||||||
@ -105,9 +105,14 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
|
// if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil {
|
||||||
return
|
// errdata = &pb.ErrorData{
|
||||||
}
|
// Code: pb.ErrorCode_ExternalModule,
|
||||||
|
// Title: pb.ErrorCode_ExternalModule.ToString(),
|
||||||
|
// Message: err.Error(),
|
||||||
|
// }
|
||||||
|
// return
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
if err = this.module.model.updateUserWarorders(session.GetUserId(), info); err != nil {
|
if err = this.module.model.updateUserWarorders(session.GetUserId(), info); err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
|
|||||||
@ -264,6 +264,7 @@ type AddRechargeReceiveAllResp struct {
|
|||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
unknownFields protoimpl.UnknownFields
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
Record map[int32]bool `protobuf:"bytes,1,rep,name=record,proto3" json:"record" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
|
||||||
Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
|
Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -299,6 +300,13 @@ func (*AddRechargeReceiveAllResp) Descriptor() ([]byte, []int) {
|
|||||||
return file_addrecharge_addrecharge_msg_proto_rawDescGZIP(), []int{5}
|
return file_addrecharge_addrecharge_msg_proto_rawDescGZIP(), []int{5}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *AddRechargeReceiveAllResp) GetRecord() map[int32]bool {
|
||||||
|
if x != nil {
|
||||||
|
return x.Record
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (x *AddRechargeReceiveAllResp) GetAward() []*UserAssets {
|
func (x *AddRechargeReceiveAllResp) GetAward() []*UserAssets {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.Award
|
return x.Award
|
||||||
@ -333,11 +341,19 @@ var file_addrecharge_addrecharge_msg_proto_rawDesc = []byte{
|
|||||||
0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61,
|
0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61,
|
||||||
0x77, 0x61, 0x72, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68, 0x61,
|
0x77, 0x61, 0x72, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68, 0x61,
|
||||||
0x72, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71,
|
0x72, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71,
|
||||||
0x22, 0x3e, 0x0a, 0x19, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52,
|
0x22, 0xb9, 0x01, 0x0a, 0x19, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65,
|
||||||
0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a,
|
0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e,
|
||||||
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55,
|
0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26,
|
||||||
0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
|
0x2e, 0x41, 0x64, 0x64, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65,
|
||||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x69, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72,
|
||||||
|
0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x21,
|
||||||
|
0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
|
||||||
|
0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72,
|
||||||
|
0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||||
|
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
|
||||||
|
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
|
0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04,
|
||||||
|
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -352,7 +368,7 @@ func file_addrecharge_addrecharge_msg_proto_rawDescGZIP() []byte {
|
|||||||
return file_addrecharge_addrecharge_msg_proto_rawDescData
|
return file_addrecharge_addrecharge_msg_proto_rawDescData
|
||||||
}
|
}
|
||||||
|
|
||||||
var file_addrecharge_addrecharge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
|
var file_addrecharge_addrecharge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
|
||||||
var file_addrecharge_addrecharge_msg_proto_goTypes = []interface{}{
|
var file_addrecharge_addrecharge_msg_proto_goTypes = []interface{}{
|
||||||
(*AddRechargeInfoReq)(nil), // 0: AddRechargeInfoReq
|
(*AddRechargeInfoReq)(nil), // 0: AddRechargeInfoReq
|
||||||
(*AddRechargeInfoResp)(nil), // 1: AddRechargeInfoResp
|
(*AddRechargeInfoResp)(nil), // 1: AddRechargeInfoResp
|
||||||
@ -361,17 +377,19 @@ var file_addrecharge_addrecharge_msg_proto_goTypes = []interface{}{
|
|||||||
(*AddRechargeReceiveAllReq)(nil), // 4: AddRechargeReceiveAllReq
|
(*AddRechargeReceiveAllReq)(nil), // 4: AddRechargeReceiveAllReq
|
||||||
(*AddRechargeReceiveAllResp)(nil), // 5: AddRechargeReceiveAllResp
|
(*AddRechargeReceiveAllResp)(nil), // 5: AddRechargeReceiveAllResp
|
||||||
nil, // 6: AddRechargeInfoResp.RecordEntry
|
nil, // 6: AddRechargeInfoResp.RecordEntry
|
||||||
(*UserAssets)(nil), // 7: UserAssets
|
nil, // 7: AddRechargeReceiveAllResp.RecordEntry
|
||||||
|
(*UserAssets)(nil), // 8: UserAssets
|
||||||
}
|
}
|
||||||
var file_addrecharge_addrecharge_msg_proto_depIdxs = []int32{
|
var file_addrecharge_addrecharge_msg_proto_depIdxs = []int32{
|
||||||
6, // 0: AddRechargeInfoResp.record:type_name -> AddRechargeInfoResp.RecordEntry
|
6, // 0: AddRechargeInfoResp.record:type_name -> AddRechargeInfoResp.RecordEntry
|
||||||
7, // 1: AddRechargeReceiveResp.award:type_name -> UserAssets
|
8, // 1: AddRechargeReceiveResp.award:type_name -> UserAssets
|
||||||
7, // 2: AddRechargeReceiveAllResp.award:type_name -> UserAssets
|
7, // 2: AddRechargeReceiveAllResp.record:type_name -> AddRechargeReceiveAllResp.RecordEntry
|
||||||
3, // [3:3] is the sub-list for method output_type
|
8, // 3: AddRechargeReceiveAllResp.award:type_name -> UserAssets
|
||||||
3, // [3:3] is the sub-list for method input_type
|
4, // [4:4] is the sub-list for method output_type
|
||||||
3, // [3:3] is the sub-list for extension type_name
|
4, // [4:4] is the sub-list for method input_type
|
||||||
3, // [3:3] is the sub-list for extension extendee
|
4, // [4:4] is the sub-list for extension type_name
|
||||||
0, // [0:3] is the sub-list for field type_name
|
4, // [4:4] is the sub-list for extension extendee
|
||||||
|
0, // [0:4] is the sub-list for field type_name
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() { file_addrecharge_addrecharge_msg_proto_init() }
|
func init() { file_addrecharge_addrecharge_msg_proto_init() }
|
||||||
@ -460,7 +478,7 @@ func file_addrecharge_addrecharge_msg_proto_init() {
|
|||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
RawDescriptor: file_addrecharge_addrecharge_msg_proto_rawDesc,
|
RawDescriptor: file_addrecharge_addrecharge_msg_proto_rawDesc,
|
||||||
NumEnums: 0,
|
NumEnums: 0,
|
||||||
NumMessages: 7,
|
NumMessages: 8,
|
||||||
NumExtensions: 0,
|
NumExtensions: 0,
|
||||||
NumServices: 0,
|
NumServices: 0,
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user