From 6565526983beca5e651399ad148ff1f8bdeb23d5 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Wed, 9 Aug 2023 17:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=95=85=E4=BA=8B=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_global.json | 2 +- bin/json/game_heroupstory.json | 2 +- bin/json/game_heroupstorychapter.json | 102 ++++- bin/json/game_item.json | 10 +- bin/json/game_lottery.json | 552 ++++++++++++++++++++++++++ modules/activity/module.go | 19 +- modules/addrecharge/modelRecharge.go | 5 + modules/addrecharge/module.go | 2 +- modules/storyline/api_turnon.go | 2 +- modules/storyline/module_test.go | 26 ++ modules/warorder/api_info.go | 17 +- 11 files changed, 702 insertions(+), 37 deletions(-) create mode 100644 modules/storyline/module_test.go diff --git a/bin/json/game_global.json b/bin/json/game_global.json index b616b0165..1857f07fb 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -311,7 +311,7 @@ "horoscope_reset_cost": { "a": "attr", "t": "diamond", - "n": 500 + "n": 30 }, "horoscope_reset_cd": 86400, "hero_reset": [ diff --git a/bin/json/game_heroupstory.json b/bin/json/game_heroupstory.json index 6d5e06ebf..d1ba662d9 100644 --- a/bin/json/game_heroupstory.json +++ b/bin/json/game_heroupstory.json @@ -1,7 +1,7 @@ [ { "heroid": 25001, - "opentime": "2023/8/8 0:00:00", + "opentime": "2023-08-08", "newheroday": 4, "reward": [ { diff --git a/bin/json/game_heroupstorychapter.json b/bin/json/game_heroupstorychapter.json index 8f963983c..09a746020 100644 --- a/bin/json/game_heroupstorychapter.json +++ b/bin/json/game_heroupstorychapter.json @@ -2,6 +2,10 @@ { "key": 1, "hero": 25001, + "chaptername": { + "key": "heroupstory_heroupstory_chapter_chaptername_01", + "text": "第一章：武斗大会" + }, "chapter": 1001, "onlevel": 0, "onlevelstory": [], @@ -25,7 +29,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_01", + "key": "heroupstory_heroupstory_chapter_txt_01", "text": "测试文本1" }, "circle": "", @@ -36,6 +40,10 @@ { "key": 2, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1001, "onlevel": 1, "onlevelstory": [], @@ -56,7 +64,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_02", + "key": "heroupstory_heroupstory_chapter_txt_02", "text": "测试文本2" }, "circle": "", @@ -67,6 +75,10 @@ { "key": 3, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1001, "onlevel": 1, "onlevelstory": [], @@ -89,7 +101,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_03", + "key": "heroupstory_heroupstory_chapter_txt_03", "text": "测试文本3" }, "circle": "", @@ -100,6 +112,10 @@ { "key": 4, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1001, "onlevel": 3, "onlevelstory": [], @@ -116,7 +132,7 @@ "battle": 0, "reward": [], "txt": { - "key": "heroupstory_heroupstory_chapter_04", + "key": "heroupstory_heroupstory_chapter_txt_04", "text": "测试文本4" }, "circle": "", @@ -127,6 +143,10 @@ { "key": 5, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1001, "onlevel": 4, "onlevelstory": [], @@ -147,7 +167,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_05", + "key": "heroupstory_heroupstory_chapter_txt_05", "text": "测试文本5" }, "circle": "", @@ -158,6 +178,10 @@ { "key": 6, "hero": 25001, + "chaptername": { + "key": "heroupstory_heroupstory_chapter_chaptername_06", + "text": "第二章：武侠汇聚" + }, "chapter": 1002, "onlevel": 5, "onlevelstory": [], @@ -181,7 +205,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_06", + "key": "heroupstory_heroupstory_chapter_txt_06", "text": "测试文本6" }, "circle": "", @@ -192,6 +216,10 @@ { "key": 7, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1002, "onlevel": 6, "onlevelstory": [], @@ -212,7 +240,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_07", + "key": "heroupstory_heroupstory_chapter_txt_07", "text": "测试文本7" }, "circle": "", @@ -223,6 +251,10 @@ { "key": 8, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1002, "onlevel": 7, "onlevelstory": [], @@ -245,7 +277,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_08", + "key": "heroupstory_heroupstory_chapter_txt_08", "text": "测试文本8" }, "circle": "", @@ -256,6 +288,10 @@ { "key": 9, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1002, "onlevel": 8, "onlevelstory": [], @@ -272,7 +308,7 @@ "battle": 0, "reward": [], "txt": { - "key": "heroupstory_heroupstory_chapter_09", + "key": "heroupstory_heroupstory_chapter_txt_09", "text": "测试文本9" }, "circle": "", @@ -283,6 +319,10 @@ { "key": 10, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1002, "onlevel": 9, "onlevelstory": [], @@ -303,7 +343,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_10", + "key": "heroupstory_heroupstory_chapter_txt_10", "text": "测试文本10" }, "circle": "", @@ -314,6 +354,10 @@ { "key": 11, "hero": 25001, + "chaptername": { + "key": "heroupstory_heroupstory_chapter_chaptername_11", + "text": "第三章：大龙归来" + }, "chapter": 1003, "onlevel": 10, "onlevelstory": [], @@ -337,7 +381,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_11", + "key": "heroupstory_heroupstory_chapter_txt_11", "text": "测试文本11" }, "circle": "", @@ -348,6 +392,10 @@ { "key": 12, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1003, "onlevel": 11, "onlevelstory": [], @@ -368,7 +416,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_12", + "key": "heroupstory_heroupstory_chapter_txt_12", "text": "测试文本12" }, "circle": "", @@ -379,6 +427,10 @@ { "key": 13, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1003, "onlevel": 12, "onlevelstory": [], @@ -401,7 +453,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_13", + "key": "heroupstory_heroupstory_chapter_txt_13", "text": "测试文本13" }, "circle": "", @@ -412,6 +464,10 @@ { "key": 14, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1003, "onlevel": 13, "onlevelstory": [], @@ -434,7 +490,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_14", + "key": "heroupstory_heroupstory_chapter_txt_14", "text": "测试文本14" }, "circle": "", @@ -445,6 +501,10 @@ { "key": 15, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1003, "onlevel": 14, "onlevelstory": [], @@ -465,7 +525,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_15", + "key": "heroupstory_heroupstory_chapter_txt_15", "text": "测试文本15" }, "circle": "", @@ -476,6 +536,10 @@ { "key": 16, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1004, "onlevel": 15, "onlevelstory": [], @@ -498,7 +562,7 @@ } ], "txt": { - "key": "heroupstory_heroupstory_chapter_16", + "key": "heroupstory_heroupstory_chapter_txt_16", "text": "测试文本16" }, "circle": "", @@ -509,6 +573,10 @@ { "key": 17, "hero": 25001, + "chaptername": { + "key": "", + "text": "" + }, "chapter": 1004, "onlevel": 16, "onlevelstory": [], @@ -523,7 +591,7 @@ "battle": 0, "reward": [], "txt": { - "key": "heroupstory_heroupstory_chapter_17", + "key": "heroupstory_heroupstory_chapter_txt_17", "text": "测试文本17" }, "circle": "", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 1a52dca57..02d3e6c5f 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -13679,7 +13679,7 @@ "reddottype": 0, "effects": "", "modelName": "", - "box_id": 0, + "box_id": 22000002, "synthetize_num": 0, "synthetize_deplete": [], "synthetize_get": [], @@ -13720,7 +13720,7 @@ "reddottype": 0, "effects": "", "modelName": "", - "box_id": 0, + "box_id": 22000003, "synthetize_num": 0, "synthetize_deplete": [], "synthetize_get": [], @@ -13802,7 +13802,7 @@ "reddottype": 0, "effects": "", "modelName": "", - "box_id": 0, + "box_id": 22000004, "synthetize_num": 0, "synthetize_deplete": [], "synthetize_get": [], @@ -13843,7 +13843,7 @@ "reddottype": 0, "effects": "", "modelName": "", - "box_id": 0, + "box_id": 22000005, "synthetize_num": 0, "synthetize_deplete": [], "synthetize_get": [], @@ -13884,7 +13884,7 @@ "reddottype": 0, "effects": "", "modelName": "", - "box_id": 0, + "box_id": 22000006, "synthetize_num": 0, "synthetize_deplete": [], "synthetize_get": [], diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index 5d259256d..14b4c79af 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -45742,5 +45742,557 @@ "playerlvmin": 0, "playerlvmax": 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 } ] \ No newline at end of file diff --git a/modules/activity/module.go b/modules/activity/module.go index 005d1b0ab..39fe901ee 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -22,10 +22,11 @@ type Activity struct { modelhdList *modelHdList modelhdData *modelhdData - mail comm.Imail - warorder comm.IWarorder // 战令 - pay comm.IPay // 支付 - shopcenter comm.IShopcenter // 活动中心 + mail comm.Imail + warorder comm.IWarorder // 战令 + pay comm.IPay // 支付 + shopcenter comm.IShopcenter // 活动中心 + addrecharge comm.IAddrecharge // 活动中心 } func NewModule() core.IModule { @@ -71,12 +72,17 @@ func (this *Activity) Start() (err error) { return } 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) if !db.IsCross() { this.modelhdList.LoadActivityData() for k, v := range this.modelhdList.activity { switch k { - case pb.HdType_HdTypeWarorder: + case pb.HdType_HdTypeWarorder, pb.HdType_SupplyWarOrder, pb.HdType_MoondreamWarOrder: this.warorder.ActivityOpenNotice(v) break 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: this.pay.ActivityOpenNotice(v) break + case pb.HdType_AddUpRecharge: + this.addrecharge.ActivityOpenNotice(v) + break } } } diff --git a/modules/addrecharge/modelRecharge.go b/modules/addrecharge/modelRecharge.go index eaa849ba1..0576099eb 100644 --- a/modules/addrecharge/modelRecharge.go +++ b/modules/addrecharge/modelRecharge.go @@ -47,6 +47,11 @@ func (this *ModelRecharge) getUserDTasks(uid string) (results *pb.DBAddRecharge, } return } +func (this *ModelRecharge) setopen() { + this.lock.Lock() + defer this.lock.Unlock() + this.open = true +} func (this *ModelRecharge) getopen() bool { this.lock.RLock() diff --git a/modules/addrecharge/module.go b/modules/addrecharge/module.go index 7ce8bf7a4..a2a412680 100644 --- a/modules/addrecharge/module.go +++ b/modules/addrecharge/module.go @@ -49,7 +49,7 @@ func (this *AddRecharge) OnInstallComp() { func (this *AddRecharge) ActivityOpenNotice(hdlist *pb.DBHuodong) { switch hdlist.Itype { case pb.HdType_AddUpRecharge: - + this.modelRecharge.setopen() break } } diff --git a/modules/storyline/api_turnon.go b/modules/storyline/api_turnon.go index e584e0dd0..eeb4373db 100644 --- a/modules/storyline/api_turnon.go +++ b/modules/storyline/api_turnon.go @@ -36,7 +36,7 @@ func (this *apiComp) Turnon(session comm.IUserSession, req *pb.StorylineTurnonRe return } 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{ Code: pb.ErrorCode_ConfigurationException, Title: pb.ErrorCode_ConfigurationException.ToString(), diff --git a/modules/storyline/module_test.go b/modules/storyline/module_test.go new file mode 100644 index 000000000..6cab90e16 --- /dev/null +++ b/modules/storyline/module_test.go @@ -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) +} diff --git a/modules/warorder/api_info.go b/modules/warorder/api_info.go index 0ea0be8c2..cb51657d7 100644 --- a/modules/warorder/api_info.go +++ b/modules/warorder/api_info.go @@ -78,15 +78,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e if dwarorder.Opentime != activity.Stime { dwarorder.Opentime = activity.Stime 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 this.module.model.refreshDayTask(dwarorder, confs, daynum) } - if utils.IsSameWeek(dwarorder.Weektime) { + if !utils.IsSameWeek(dwarorder.Weektime) { weeknum := this.module.ModuleTools.GetGlobalConf().Passcheck4WeekNum 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 { - return - } + // if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { + // 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 { errdata = &pb.ErrorData{