幸运物应属于收藏品分类;添加了幸运物发放到库存的功能;图片上传失败也不影响回复运势

This commit is contained in:
milimoe 2025-11-19 00:08:20 +08:00
parent 78e2cb095a
commit aac5d35aa2
Signed by: milimoe
GPG Key ID: 9554D37E4B8991D0
6 changed files with 247 additions and 177 deletions

View File

@ -3,345 +3,345 @@ using Milimoe.FunGame.Core.Library.Constant;
namespace Oshima.FunGame.OshimaModules.Items
{
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "青松即使在风雪中也保持着生命的坚韧,象征着永不放弃的精神。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "据说,捕捉到流星的人,能实现一个愿望。不妨许下心愿,心诚则灵。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "向日葵永远追随太阳,就像你的好运追随着你的每一步。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "金铃花象征着辉煌与幸运,提醒你要抓住每一个闪光的时刻。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "琉璃珠晶莹剔透,代表着纯净与希望,预示着你的好运将如彩虹般绚丽。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "向往着雷神大人的青睐,只在稻妻列岛上生长。摘下鸣草时酥酥麻麻的触感,据说和幸福的滋味很像。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "马尾随大片荻草生长,但却更为挺拔。与傲然挺立于此世的你一定很是相配。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "鬼兜虫是爱好和平、不愿意争斗的小生物。这份追求平和的心一定能为你带来幸福吧。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "烈焰花的炙热来自于火辣辣的花心。万事顺利是因为心中自有一条明路。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "人们常说表里如一是美德,但堇瓜明艳的外貌下隐藏着的是谦卑而甘甜的内在。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "水晶象征着纯净与洞察力,帮助你看清未来的路。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "薰衣草的香气能安抚心灵,象征着宁静与放松,提醒你要在忙碌中找到内心的平和。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "青石虽不起眼,却象征着坚韧与持久,寓意着你脚踏实地的每一步都会累积成未来的成功。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "莲花在泥中绽放,象征着净化与重生,愿你心中平和坚定。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "陶罐虽不起眼,却有着悠久的历史和稳定的实用性,寓意安稳平和。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "弱小的海灵芝虫经历多年的风风雨雨,才能结成海灵芝。为目标而努力前行的人们,最终也必将拥有胜利的果实。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "四叶草的每一片叶子都代表着好运、健康、爱情和财富。带上一片四叶草,收获一整天的幸运吧。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "露珠是清晨的祝福,虽然短暂,但每一滴都晶莹剔透。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "茉莉花的香气淡雅而持久,给人宁静与舒适的感觉。";
public override QualityType QualityType => QualityType.White;
}
public class 绿() : Item(ItemType.SpecialItem)
public class 绿() : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.绿;
public override long Id => (long)CollectibleID.绿;
public override string Name => nameof(绿);
public override string Description => "绿萝坚韧耐阴,象征着生命的顽强与希望,提醒你在平静中也能找到力量。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "檀木扇散发着淡雅的香气,象征着沉稳与内敛,让你在宁静中感受力量。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "鸟蛋孕育着无限的可能性,是未来之种。反过来,这个世界对鸟蛋中的生命而言,也充满了令其兴奋的未知事物吧。要温柔对待鸟蛋喔。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "竹笋拥有着无限的潜力,没有人知道一颗竹笋,到底能长成多高的竹子。看着竹笋,会让人不由自主期待起未来吧。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "晶蝶是凝聚天地间的元素,而长成的细小生物。而元素是这个世界许以天地当中的人们的祝福。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "手工围巾的每一针每一线都饱含着爱意,提醒你要珍惜眼前的人。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "柳条篮细密结实,寓意着人与人之间的深厚情感,提醒你珍惜生活中的点滴温情。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "风筝在天空中自由翱翔,提醒你即使在平凡的日子里,也要心怀梦想,勇敢飞翔。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "羽毛虽轻,但象征着自由与轻盈,提醒你在轻松中前行。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "发光髓努力地发出微弱的光芒。虽然比不过其他光源,但看清前路也够用了。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "紫罗兰象征着谦逊和内在的力量,即使在逆境中也能默默绽放。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "并不是所有的松果都能长成高大的松树,成长需要适宜的环境,更需要一点运气。所以不用给自己过多压力,耐心等待彩虹吧。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "电气水晶蕴含着无限的能量。如果能够好好导引这股能量,说不定就能成就什么事业。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "只要有草木生长的空间,就一定有薄荷。这么看来,薄荷是世界上最强韧的生灵。据说连蒙德的雪山上也长着薄荷呢。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "竹节虽然看似脆弱,但却有着极强的韧性,提醒你在困难面前要保持坚毅的心态。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "铁砧坚固无比,象征着在困境中保持坚强的信念,提醒你在风雨中不动摇。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "冰雾花散发着「生人勿进」的寒气。但有时冰冷的气质,也能让人的心情与头脑冷静下来。据此采取正确的判断,明智地行动。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "海草是相当温柔而坚强的植物,即使在苦涩的海水中,也不愿改变自己。即使在逆境中,也不要放弃温柔的心灵。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "磐石虽沉重,但象征着稳定与耐心,今天你需要的正是这份定力。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "砂砾虽微小,却是坚固大地的一部分,提醒你在困难中也要保持坚韧。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "坚硬的外壳保护着脆弱的内心。有时适当的防护,能让你更加安全。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "蜥蜴遇到潜在的危险时,大多数会断尾求生。若是遇到无法整理的情绪,那么该断则断吧。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "尽管钟摆已停,但时间仍在前行。即使眼下步履维艰,也终会走出黑暗。";
public override QualityType QualityType => QualityType.White;
}
public class () : Item(ItemType.SpecialItem)
public class () : Item(ItemType.Collectible)
{
public override long Id => (long)SpecialItemID.;
public override long Id => (long)CollectibleID.;
public override string Name => nameof();
public override string Description => "枯藤虽已失去生机,但春天的复苏指日可待,提醒你在低谷中也要坚守希望。";
public override QualityType QualityType => QualityType.White;

View File

@ -31,6 +31,53 @@
= 15016
}
public enum CollectibleID
{
= 17001,
= 17002,
= 17003,
= 17004,
= 17005,
= 17006,
= 17007,
= 17008,
= 17009,
= 17010,
= 17011,
= 17012,
= 17013,
= 17014,
= 17015,
= 17016,
= 17017,
= 17018,
= 17019,
绿 = 17020,
= 17021,
= 17022,
= 17023,
= 17024,
= 17025,
= 17026,
= 17027,
= 17028,
= 17029,
= 17030,
= 17031,
= 17032,
= 17033,
= 17034,
= 17035,
= 17036,
= 17037,
= 17038,
= 17039,
= 17040,
= 17041,
= 17042,
= 17043
}
public enum SpecialItemID : long
{
= 18001,
@ -48,50 +95,7 @@
= 18013,
= 18014,
= 18998,
= 18999,
= 18921,
= 18922,
= 18923,
= 18924,
= 18925,
= 18926,
= 18927,
= 18928,
= 18929,
= 18930,
= 18931,
= 18932,
= 18933,
= 18934,
= 18935,
= 18936,
= 18937,
= 18938,
= 18939,
绿 = 18940,
= 18941,
= 18942,
= 18943,
= 18944,
= 18945,
= 18946,
= 18947,
= 18948,
= 18949,
= 18950,
= 18951,
= 18952,
= 18953,
= 18954,
= 18955,
= 18956,
= 18957,
= 18958,
= 18959,
= 18960,
= 18961,
= 18962,
= 18963
= 18999
}
public enum GiftBoxID : long

View File

@ -45,6 +45,49 @@ namespace Oshima.FunGame.OshimaModules
(long)ConsumableID. => new (),
(long)ConsumableID. => new (),
(long)ConsumableID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID.绿 => new 绿(),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)CollectibleID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
@ -59,49 +102,6 @@ namespace Oshima.FunGame.OshimaModules
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID.绿 => new 绿(),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)SpecialItemID. => new (),
(long)ConsumableID. => new (),

View File

@ -3571,6 +3571,7 @@ namespace Oshima.FunGame.OshimaServers.Service
newItem.User = user;
if (hasLock && (newItem.QualityType >= QualityType.Orange ||
FunGameConstant.ExploreItems.Values.SelectMany(i => i).Any(c => c.Id == item.Id) ||
FunGameConstant.UserDailyItems.Any(c => c.Id == item.Id) ||
FunGameConstant.CharacterLevelBreakItems.Any(c => c.Id == item.Id) ||
FunGameConstant.SkillLevelUpItems.Any(c => c.Id == item.Id))) newItem.IsLock = true;
if (hasSellAndTradeTime) SetSellAndTradeTime(newItem);

View File

@ -9006,6 +9006,54 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
}
[HttpPost("getuserdailyitem")]
public string GetUserDailyItem([FromQuery] long uid = -1, [FromQuery] string daily = "")
{
try
{
PluginConfig pc = FunGameService.GetUserConfig(uid, out bool isTimeout);
if (isTimeout)
{
return busy;
}
string msg = "";
if (pc.Count > 0)
{
User user = FunGameService.GetUser(pc);
string pattern = @"今天的幸运物是:.*?「(.*?)」";
Regex regex = new(pattern, RegexOptions.IgnoreCase);
Match match = regex.Match(daily);
if (match.Success)
{
string itemName = match.Groups[1].Value;
if (FunGameConstant.UserDailyItems.FirstOrDefault(i => i.Name == itemName) is Item item)
{
msg = $"恭喜你获得了幸运物【{itemName}】,已发放至库存~";
FunGameService.AddItemToUserInventory(user, item);
}
}
FunGameService.SetUserConfigButNotRelease(uid, pc, user);
return msg;
}
else
{
return $"温馨提醒:【创建存档】后可领取同款幸运物的收藏品,全部收集可兑换强大装备哦~";
}
}
catch (Exception e)
{
if (Logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Error)) Logger.LogError(e, "Error: {e}", e);
return busy;
}
finally
{
FunGameService.ReleaseUserSemaphoreSlim(uid);
}
}
[HttpPost("template")]
public string Template([FromQuery] long uid = -1)
{

View File

@ -182,14 +182,31 @@ namespace Oshima.FunGame.WebAPI.Services
_ => ""
};
var (fileUuid, fileInfo, ttl, error) = e.IsGroup && e is GroupAtMessage ge ? await Service.UploadGroupMediaAsync(ge.GroupOpenId, 1, img) : await Service.UploadC2CMediaAsync(e.OpenId, 1, img);
if (string.IsNullOrEmpty(error))
string? fi = "";
string? err = "";
try
{
await SendAsync(e, "每日运势", daily.daily, 7, new { file_info = fileInfo });
var (fileUuid, fileInfo, ttl, error) = e.IsGroup ? await Service.UploadGroupMediaAsync(e.OpenId, 1, img) : await Service.UploadC2CMediaAsync(e.OpenId, 1, img);
fi = fileInfo;
err = error;
}
catch (Exception ex)
{
err = ex.ToString();
}
if (string.IsNullOrEmpty(err))
{
await SendAsync(e, "每日运势", daily.daily, 7, new { file_info = fi });
}
else
{
if (Logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Error)) Logger.LogError("上传图片失败:{error}", error);
if (Logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Error)) Logger.LogError("上传图片失败:{error}", err);
await SendAsync(e, "每日运势", daily.daily);
}
string msg = Controller.GetUserDailyItem(uid, daily.daily);
if (msg != "")
{
await SendAsync(e, "运势幸运物发放", msg, msgSeq: 3);
}
}
else