This commit is contained in:
liwei 2023-08-03 21:02:55 +08:00
commit 411b6cdd6a
20 changed files with 32668 additions and 2777 deletions

View File

@ -0,0 +1,39 @@
[
{
"ID": 1,
"systemtype": 1,
"bosstype": [
0
],
"num": [
6
],
"days": 2
},
{
"ID": 2,
"systemtype": 2,
"bosstype": [
31
],
"num": [
6
],
"days": 2
},
{
"ID": 3,
"systemtype": 2,
"bosstype": [
1,
2,
3
],
"num": [
2,
2,
2
],
"days": 2
}
]

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,11 @@
"x": -2000, "x": -2000,
"y": 2100 "y": 2100
}, },
"scale": 0.8 "scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_1",
"text": "探险!这是永远不会停歇的主题!"
}
}, },
{ {
"tabId": 2, "tabId": 2,
@ -23,7 +27,11 @@
"x": -2363, "x": -2363,
"y": 1272 "y": 1272
}, },
"scale": 0.8 "scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_2",
"text": "从这里开始你的冒险之旅吧!"
}
}, },
{ {
"tabId": 3, "tabId": 3,
@ -36,7 +44,11 @@
"x": -1500, "x": -1500,
"y": 243 "y": 243
}, },
"scale": 0.85 "scale": 0.85,
"usetext": {
"key": "gamesummary_fathernode_usetext_3",
"text": "挑战泰坦?胜利后别忘了把材料拿给铁匠铺的戈伯,它能帮你打造装备!"
}
}, },
{ {
"tabId": 4, "tabId": 4,
@ -49,7 +61,11 @@
"x": -603, "x": -603,
"y": 142 "y": 142
}, },
"scale": 0.32 "scale": 0.32,
"usetext": {
"key": "gamesummary_fathernode_usetext_4",
"text": "现在是狩猎的时间!胜利获得的材料可以给守护者回响强化!"
}
}, },
{ {
"tabId": 5, "tabId": 5,
@ -62,7 +78,11 @@
"x": -1324, "x": -1324,
"y": 0 "y": 0
}, },
"scale": 0.8 "scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_5",
"text": "那传说中用梦锻炼自我的地方。获胜后的护身符记得给守护者等级强化!"
}
}, },
{ {
"tabId": 6, "tabId": 6,
@ -75,7 +95,11 @@
"x": -3065, "x": -3065,
"y": 754 "y": 754
}, },
"scale": 0.65 "scale": 0.65,
"usetext": {
"key": "gamesummary_fathernode_usetext_6",
"text": "功夫熊猫世界的人真是喜欢塔啊······但挑战胜利也没有坏处,他们的奖励也很大方~"
}
}, },
{ {
"tabId": 10, "tabId": 10,
@ -88,7 +112,11 @@
"x": -3055, "x": -3055,
"y": 967 "y": 967
}, },
"scale": 0.8 "scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_7",
"text": "有人的地方就存在着纷争······但靴子猫是不是太喜欢纷争了?去战胜他人获得竞技币,在竞技商店兑换奖励吧!"
}
}, },
{ {
"tabId": 11, "tabId": 11,
@ -101,7 +129,11 @@
"x": -1037, "x": -1037,
"y": 1864 "y": 1864
}, },
"scale": 0.8 "scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_8",
"text": "原始人的世界永远这么凶险吗?你要去那地方磨练自己?我都不知道胜利有什么奖励······"
}
}, },
{ {
"tabId": 12, "tabId": 12,
@ -114,6 +146,10 @@
"x": -3897, "x": -3897,
"y": 603 "y": 603
}, },
"scale": 0.8 "scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_9",
"text": "巨怪商人们的脚步永不停歇······听说在他们那赚了足够多的钱财后可以有神秘大奖!"
}
} }
] ]

View File

@ -800,6 +800,6 @@
30, 30,
50 50
], ],
"venturegifts_draw": 23000001 "venturegifts_draw": "23000001"
} }
] ]

View File

@ -3999,6 +3999,756 @@
"n": 0 "n": 0
} }
}, },
{
"BuffId": 782000111,
"Type": 6,
"SkillId": 782000111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_181",
"text": "洞顶坍塌,砸中众人。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782001111,
"Type": 6,
"SkillId": 782001111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_182",
"text": "瓜哥的发明之三。把瓜哥的腰缠成了细腰。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782002111,
"Type": 6,
"SkillId": 782002111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_183",
"text": "瓜哥发明之一。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782003111,
"Type": 6,
"SkillId": 782003111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_184",
"text": "瓜哥发明之二。模特坦克,一脸被拍晕的智慧样子。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782004111,
"Type": 6,
"SkillId": 782004111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_185",
"text": "巫嘎妈妈面对食人花。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782005111,
"Type": 6,
"SkillId": 782005111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_186",
"text": "地下涌出的冰泉。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782006111,
"Type": 6,
"SkillId": 782006111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_187",
"text": "一家对黑暗的恐惧。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782007111,
"Type": 6,
"SkillId": 782007111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_188",
"text": "饥饿的坦克。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782008111,
"Type": 6,
"SkillId": 782008111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_189",
"text": "拳猴向菲尔学来了竹盾,得意的笑着。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 782009111,
"Type": 6,
"SkillId": 782009111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_190",
"text": "鹦鹉虎刀枪不入。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791000111,
"Type": 5,
"SkillId": 791000111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_191",
"text": "他们坐的鳄龟船。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791001111,
"Type": 5,
"SkillId": 791001111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_192",
"text": "小伊和盖面对太阳定情时紧握的双手。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791002111,
"Type": 5,
"SkillId": 791002111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_193",
"text": "众人追逐太阳,阳光从狭窄的两侧山峰中透出。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791003111,
"Type": 5,
"SkillId": 791003111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_194",
"text": "瓜哥的轱辘撞倒了树,一颗粗木枝打中瓜哥。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791004111,
"Type": 5,
"SkillId": 791004111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_195",
"text": "盖的捕鸟圈,一只鸟腿即将踩入。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791005111,
"Type": 5,
"SkillId": 791005111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_196",
"text": "众人疯狂逃脱从天而降的冰锥石块。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791006111,
"Type": 5,
"SkillId": 791006111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_197",
"text": "一只脚踩上珊瑚刺丛。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791007111,
"Type": 5,
"SkillId": 791007111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_198",
"text": "屁股冒烟的大玉米,玉米最前头是瓜哥。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791008111,
"Type": 5,
"SkillId": 791008111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_199",
"text": "盖给小伊打伞。背后电闪雷鸣。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791009111,
"Type": 5,
"SkillId": 791009111,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_200",
"text": "众人无精打采地跟着坦克身后。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791000211,
"Type": 5,
"SkillId": 791000211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_201",
"text": "他们坐的鳄龟船。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791001211,
"Type": 5,
"SkillId": 791001211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_202",
"text": "小伊和盖面对太阳定情时紧握的双手。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791002211,
"Type": 5,
"SkillId": 791002211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_203",
"text": "众人追逐太阳,阳光从狭窄的两侧山峰中透出。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791003211,
"Type": 5,
"SkillId": 791003211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_204",
"text": "瓜哥的轱辘撞倒了树,一颗粗木枝打中瓜哥。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791004211,
"Type": 5,
"SkillId": 791004211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_205",
"text": "盖的捕鸟圈,一只鸟腿即将踩入。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791005211,
"Type": 5,
"SkillId": 791005211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_206",
"text": "众人疯狂逃脱从天而降的冰锥石块。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791006211,
"Type": 5,
"SkillId": 791006211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_207",
"text": "一只脚踩上珊瑚刺丛。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791007211,
"Type": 5,
"SkillId": 791007211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_208",
"text": "屁股冒烟的大玉米,玉米最前头是瓜哥。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791008211,
"Type": 5,
"SkillId": 791008211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_209",
"text": "盖给小伊打伞。背后电闪雷鸣。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{
"BuffId": 791009211,
"Type": 5,
"SkillId": 791009211,
"BuffLevel": 1,
"Quality": 2,
"BuffIcon": "",
"TargetType": 1,
"CampType": 0,
"TakeDataType": 0,
"BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_210",
"text": "众人无精打采地跟着坦克身后。"
},
"BuffUpgradeCost": {
"a": "item",
"t": "10000036",
"n": 0
},
"BuffSell": {
"a": "item",
"t": "10000036",
"n": 0
}
},
{ {
"BuffId": 770076113, "BuffId": 770076113,
"Type": 5, "Type": 5,
@ -4010,7 +4760,7 @@
"CampType": 0, "CampType": 0,
"TakeDataType": 0, "TakeDataType": 0,
"BuffStory": { "BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_181", "key": "stonehenge_buffconfig_BuffStory_211",
"text": "快睡吧快睡吧,外婆不战而胜的秘诀,可以让敌人至少三天不醒。" "text": "快睡吧快睡吧,外婆不战而胜的秘诀,可以让敌人至少三天不醒。"
}, },
"BuffUpgradeCost": { "BuffUpgradeCost": {
@ -4035,7 +4785,7 @@
"CampType": 0, "CampType": 0,
"TakeDataType": 0, "TakeDataType": 0,
"BuffStory": { "BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_182", "key": "stonehenge_buffconfig_BuffStory_212",
"text": "快睡吧快睡吧,外婆不战而胜的秘诀,可以让敌人至少三天不醒。" "text": "快睡吧快睡吧,外婆不战而胜的秘诀,可以让敌人至少三天不醒。"
}, },
"BuffUpgradeCost": { "BuffUpgradeCost": {
@ -4060,7 +4810,7 @@
"CampType": 0, "CampType": 0,
"TakeDataType": 0, "TakeDataType": 0,
"BuffStory": { "BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_183", "key": "stonehenge_buffconfig_BuffStory_213",
"text": "沼泽之水的觉醒!霍普挡在众人身前,挡住了铺天盖地的火焰攻击。" "text": "沼泽之水的觉醒!霍普挡在众人身前,挡住了铺天盖地的火焰攻击。"
}, },
"BuffUpgradeCost": { "BuffUpgradeCost": {
@ -4085,7 +4835,7 @@
"CampType": 0, "CampType": 0,
"TakeDataType": 0, "TakeDataType": 0,
"BuffStory": { "BuffStory": {
"key": "stonehenge_buffconfig_BuffStory_184", "key": "stonehenge_buffconfig_BuffStory_214",
"text": "沼泽之水的觉醒!霍普挡在众人身前,挡住了铺天盖地的火焰攻击。" "text": "沼泽之水的觉醒!霍普挡在众人身前,挡住了铺天盖地的火焰攻击。"
}, },
"BuffUpgradeCost": { "BuffUpgradeCost": {

View File

@ -0,0 +1,52 @@
[
{
"Id": 1,
"EventId": 0,
"EventDesc": {
"key": "",
"text": ""
},
"LimitTime": 0,
"PrivilegeId": 0
},
{
"Id": 2,
"EventId": 0,
"EventDesc": {
"key": "",
"text": ""
},
"LimitTime": 0,
"PrivilegeId": 0
},
{
"Id": 3,
"EventId": 0,
"EventDesc": {
"key": "",
"text": ""
},
"LimitTime": 0,
"PrivilegeId": 0
},
{
"Id": 4,
"EventId": 0,
"EventDesc": {
"key": "",
"text": ""
},
"LimitTime": 0,
"PrivilegeId": 0
},
{
"Id": 5,
"EventId": 0,
"EventDesc": {
"key": "",
"text": ""
},
"LimitTime": 0,
"PrivilegeId": 0
}
]

View File

@ -901,6 +901,7 @@ const (
Yueka_2 string = "Activity_PrivilegeCardDailyReward_lv2" // 月卡2 Yueka_2 string = "Activity_PrivilegeCardDailyReward_lv2" // 月卡2
VipDaily string = "VipLvReward" // vip每日奖励 VipDaily string = "VipLvReward" // vip每日奖励
Welcomemail string = "Welcomemail" // 欢迎邮件 Welcomemail string = "Welcomemail" // 欢迎邮件
Venturegifts string = "Venturegifts" // 转盘活动
) )
// open funcName // open funcName

View File

@ -591,8 +591,8 @@ type (
IActivity interface { IActivity interface {
GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息 GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息
GetAllHdInfo() (result []*pb.DBHuodong, err error) // 获取所有活动信息 GetAllHdInfo() (hdList map[int32][]*pb.DBHuodong) // 获取所有活动信息
GetHdInfoByItype(itype int32) (result []*pb.DBHuodong, err error) //
UpdateActivitySlider(session IUserSession) // 修改活动进度 UpdateActivitySlider(session IUserSession) // 修改活动进度
} }
//每日任务 //每日任务

View File

@ -13,18 +13,18 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ActivityGet
// 获取所有活动信息 // 获取所有活动信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListReq) (errdata *pb.ErrorData) { func (this *apiComp) GetList(session comm.IUserSession, req *pb.ActivityGetListReq) (errdata *pb.ErrorData) {
var (
data []*pb.DBHuodong
)
list := this.module.modelhdList.getHdInfo()
list, err := this.module.modelhdList.getHdInfo() for _, szhd := range list {
if err != nil { for _, v := range szhd {
errdata = &pb.ErrorData{ data = append(data, v)
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
} }
return
} }
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ActivityGetListResp{ session.SendMsg(string(this.module.GetType()), "getlist", &pb.ActivityGetListResp{
Data: list, Data: data,
}) })
return return
} }

View File

@ -6,6 +6,7 @@ import (
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"sync"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
@ -15,6 +16,9 @@ import (
type modelHdList struct { type modelHdList struct {
modules.MCompModel modules.MCompModel
module *Activity module *Activity
hlock sync.RWMutex
activity map[int32][]*pb.DBHuodong
} }
func (this *modelHdList) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { func (this *modelHdList) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
@ -30,20 +34,9 @@ func (this *modelHdList) Init(service core.IService, module core.IModule, comp c
return return
} }
func (this *modelHdList) getHdInfo() (result []*pb.DBHuodong, err error) { func (this *modelHdList) getHdInfo() (activity map[int32][]*pb.DBHuodong) {
if _data, err := this.DBModel.DB.Find(comm.TableHdInfo, bson.M{}); err == nil { return this.activity
for _data.Next(context.TODO()) {
temp := &pb.DBHuodong{}
if err = _data.Decode(temp); err != nil {
this.module.Errorln(err)
} else {
result = append(result, temp)
}
}
}
return
} }
// 通过活动ID查找 // 通过活动ID查找
@ -77,8 +70,26 @@ func (this *modelHdList) getHdInfoByHdType(iType int32) (result *pb.DBHuodong, e
result = &pb.DBHuodong{} result = &pb.DBHuodong{}
if err = _data.Decode(result); err != nil { if err = _data.Decode(result); err != nil {
this.module.Errorln(err) this.module.Errorln("活动配置没找到:活动类型:%d,错误信息:%v", iType, err.Error())
} }
return return
} }
func (this *modelHdList) LoadActivityData() {
if c, err := this.DB.Find(core.SqlTable(this.TableName), bson.M{}); err != nil {
return
} else {
this.hlock.Lock()
defer this.hlock.Unlock()
this.activity = make(map[int32][]*pb.DBHuodong)
for c.Next(context.Background()) {
hd := &pb.DBHuodong{}
if err = c.Decode(hd); err != nil {
this.module.Errorf("err:%v", err)
continue
}
this.activity[hd.Itype] = append(this.activity[hd.Itype], hd)
}
}
}

View File

@ -1,6 +1,7 @@
package activity package activity
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
@ -76,6 +77,7 @@ func (this *Activity) Start() (err error) {
// Val: 1, // Val: 1,
// } // }
// this.modelhdData.InsertHddata("", ac) // this.modelhdData.InsertHddata("", ac)
this.modelhdList.LoadActivityData()
} }
return return
@ -136,9 +138,18 @@ func (this *Activity) CreateHdData() (err error) {
this.modelhdList.getHdInfo() this.modelhdList.getHdInfo()
return return
} }
func (this *Activity) GetAllHdInfo() (result []*pb.DBHuodong, err error) {
result, err = this.modelhdList.getHdInfo() func (this *Activity) GetAllHdInfo() (activity map[int32][]*pb.DBHuodong) {
return this.modelhdList.getHdInfo()
}
func (this *Activity) GetHdInfoByItype(itype int32) (result []*pb.DBHuodong, err error) {
if c := this.modelhdList.getHdInfo(); c != nil {
if _, ok := c[itype]; ok {
result = c[itype]
return
}
}
err = fmt.Errorf("Not found :%d type activity", itype)
return return
} }

View File

@ -43,6 +43,7 @@ type ModuleBase struct {
ModuleTools comm.ITools //工具类 获取一些通用配置 ModuleTools comm.ITools //工具类 获取一些通用配置
ModuleBuried comm.IBuried //触发埋点中心 ModuleBuried comm.IBuried //触发埋点中心
ModuleMail comm.Imail //邮件 ModuleMail comm.Imail //邮件
ModuleActivity comm.IActivity //活动模块
} }
// 重构模块配置对象 // 重构模块配置对象
@ -145,6 +146,11 @@ func (this *ModuleBase) Start() (err error) {
return return
} }
this.ModuleMail = module.(comm.Imail) this.ModuleMail = module.(comm.Imail)
if module, err = this.service.GetModule(comm.ModuleActivity); err != nil {
return
}
this.ModuleActivity = module.(comm.IActivity)
return return
} }

View File

@ -165,6 +165,39 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
this.module.modelSign.UserSign(session) this.module.modelSign.UserSign(session)
go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1)) go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1))
} }
// 转盘活动
if a, err := this.module.ModuleActivity.GetHdInfoByItype(comm.HdTypeTurntable); err != nil { //
bEnd := false
for _, v := range a {
if configure.Now().Unix() > v.Etime {
bEnd = true
break
}
}
if bEnd { // 活动结束 活动道具转换
t := this.module.ModuleTools.GetGlobalConf().VenturegiftsDraw
var reward []*pb.UserAssets
if item, err := this.module.configure.GetItemConfigureData(t); err != nil {
amount := this.module.ModuleItems.QueryItemAmount(session.GetUserId(), t)
if amount > 0 {
this.module.ModuleItems.AddItem(session, t, -int32(amount), true)
for _, v := range item.Sale {
reward = append(reward, &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N * int32(amount),
})
}
// 发邮件
this.mail.SendMailByCid(session, comm.Venturegifts, reward)
// if err := this.module.DispenseRes(session, item.Sale, true); err != nil {
// return
// }
}
}
}
}
this.module.ModuleHero.CheckPeachReward(session, user.Ctime) this.module.ModuleHero.CheckPeachReward(session, user.Ctime)
this.module.RecoverUserPsStart(user.Uid) this.module.RecoverUserPsStart(user.Uid)
// 日常登录任务 // 日常登录任务

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameCelebration struct {
_dataMap map[int32]*GameCelebrationData
_dataList []*GameCelebrationData
}
func NewGameCelebration(_buf []map[string]interface{}) (*GameCelebration, error) {
_dataList := make([]*GameCelebrationData, 0, len(_buf))
dataMap := make(map[int32]*GameCelebrationData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameCelebrationData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.ID] = _v
}
}
return &GameCelebration{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameCelebration) GetDataMap() map[int32]*GameCelebrationData {
return table._dataMap
}
func (table *GameCelebration) GetDataList() []*GameCelebrationData {
return table._dataList
}
func (table *GameCelebration) Get(key int32) *GameCelebrationData {
return table._dataMap[key]
}

View File

@ -0,0 +1,69 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameCelebrationData struct {
ID int32
Systemtype int32
Bosstype []int32
Num []int32
Days int32
}
const TypeId_GameCelebrationData = 5340088
func (*GameCelebrationData) GetTypeId() int32 {
return 5340088
}
func (_v *GameCelebrationData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ID"].(float64); !_ok_ { err = errors.New("ID error"); return }; _v.ID = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["systemtype"].(float64); !_ok_ { err = errors.New("systemtype error"); return }; _v.Systemtype = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["bosstype"].([]interface{}); !_ok_ { err = errors.New("bosstype error"); return }
_v.Bosstype = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Bosstype = append(_v.Bosstype, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["num"].([]interface{}); !_ok_ { err = errors.New("num error"); return }
_v.Num = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Num = append(_v.Num, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["days"].(float64); !_ok_ { err = errors.New("days error"); return }; _v.Days = int32(_tempNum_) }
return
}
func DeserializeGameCelebrationData(_buf map[string]interface{}) (*GameCelebrationData, error) {
v := &GameCelebrationData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -17,6 +17,7 @@ type GameGameSummaryTabData struct {
Name string Name string
MapPos serialization.Vector2 MapPos serialization.Vector2
Scale float32 Scale float32
Usetext string
} }
const TypeId_GameGameSummaryTabData = 1940152935 const TypeId_GameGameSummaryTabData = 1940152935
@ -37,6 +38,7 @@ func (_v *GameGameSummaryTabData)Deserialize(_buf map[string]interface{}) (err e
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["scale"].(float64); !_ok_ { err = errors.New("scale error"); return }; _v.Scale = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["scale"].(float64); !_ok_ { err = errors.New("scale error"); return }; _v.Scale = float32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["usetext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Usetext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Usetext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return return
} }

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameStoneStore struct {
_dataMap map[int32]*GameStoneStoreData
_dataList []*GameStoneStoreData
}
func NewGameStoneStore(_buf []map[string]interface{}) (*GameStoneStore, error) {
_dataList := make([]*GameStoneStoreData, 0, len(_buf))
dataMap := make(map[int32]*GameStoneStoreData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameStoneStoreData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameStoneStore{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameStoneStore) GetDataMap() map[int32]*GameStoneStoreData {
return table._dataMap
}
func (table *GameStoneStore) GetDataList() []*GameStoneStoreData {
return table._dataList
}
func (table *GameStoneStore) Get(key int32) *GameStoneStoreData {
return table._dataMap[key]
}

View File

@ -0,0 +1,43 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameStoneStoreData struct {
Id int32
EventId int32
EventDesc string
LimitTime int32
PrivilegeId int32
}
const TypeId_GameStoneStoreData = -576353598
func (*GameStoneStoreData) GetTypeId() int32 {
return -576353598
}
func (_v *GameStoneStoreData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventId"].(float64); !_ok_ { err = errors.New("EventId error"); return }; _v.EventId = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["EventDesc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.EventDesc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.EventDesc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LimitTime"].(float64); !_ok_ { err = errors.New("LimitTime error"); return }; _v.LimitTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PrivilegeId"].(float64); !_ok_ { err = errors.New("PrivilegeId error"); return }; _v.PrivilegeId = int32(_tempNum_) }
return
}
func DeserializeGameStoneStoreData(_buf map[string]interface{}) (*GameStoneStoreData, error) {
v := &GameStoneStoreData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -212,6 +212,7 @@ type Tables struct {
StoneStage *GameStoneStage StoneStage *GameStoneStage
StoneEvent *GameStoneEvent StoneEvent *GameStoneEvent
StoneBattle *GameStoneBattle StoneBattle *GameStoneBattle
StoneStore *GameStoneStore
GameSummaryTab *GameGameSummaryTab GameSummaryTab *GameGameSummaryTab
GameSummary *GameGameSummary GameSummary *GameGameSummary
CompositeAll *GameCompositeAll CompositeAll *GameCompositeAll
@ -227,6 +228,7 @@ type Tables struct {
ShopCenterSubmeter *GameShopCenterSubmeter ShopCenterSubmeter *GameShopCenterSubmeter
ShopCenterFund *GameShopCenterFund ShopCenterFund *GameShopCenterFund
Accumulate *GameAccumulate Accumulate *GameAccumulate
Celebration *GameCelebration
} }
func NewTables(loader JsonLoader) (*Tables, error) { func NewTables(loader JsonLoader) (*Tables, error) {
@ -1440,6 +1442,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.StoneBattle, err = NewGameStoneBattle(buf) ; err != nil { if tables.StoneBattle, err = NewGameStoneBattle(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_stonestore") ; err != nil {
return nil, err
}
if tables.StoneStore, err = NewGameStoneStore(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_gamesummarytab") ; err != nil { if buf, err = loader("game_gamesummarytab") ; err != nil {
return nil, err return nil, err
} }
@ -1530,5 +1538,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Accumulate, err = NewGameAccumulate(buf) ; err != nil { if tables.Accumulate, err = NewGameAccumulate(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_celebration") ; err != nil {
return nil, err
}
if tables.Celebration, err = NewGameCelebration(buf) ; err != nil {
return nil, err
}
return tables, nil return tables, nil
} }

View File

@ -253,7 +253,7 @@ type GameGlobalData struct {
GuildbossChallengePreview []*Gameatn GuildbossChallengePreview []*Gameatn
CompassDistansces []int32 CompassDistansces []int32
CompassAngleOffsets []int32 CompassAngleOffsets []int32
VenturegiftsDraw int32 VenturegiftsDraw string
} }
const TypeId_GameGlobalData = 477542761 const TypeId_GameGlobalData = 477542761
@ -1064,7 +1064,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturegifts_draw"].(float64); !_ok_ { err = errors.New("venturegifts_draw error"); return }; _v.VenturegiftsDraw = int32(_tempNum_) } { var _ok_ bool; if _v.VenturegiftsDraw, _ok_ = _buf["venturegifts_draw"].(string); !_ok_ { err = errors.New("venturegifts_draw error"); return } }
return return
} }