This commit is contained in:
liwei1dao 2023-10-16 14:57:39 +08:00
commit 866ee2cf9f
14 changed files with 2511 additions and 6081 deletions

File diff suppressed because it is too large Load Diff

View File

@ -21785,7 +21785,7 @@
"NPC": 101044,
"value": 1,
"filter": [
1100111
1100112
],
"filter2": []
},
@ -21810,7 +21810,7 @@
"NPC": 101054,
"value": 1,
"filter": [
1100115
1100116
],
"filter2": []
},
@ -21835,7 +21835,7 @@
"NPC": 101064,
"value": 1,
"filter": [
1100116
1100117
],
"filter2": []
},
@ -21860,7 +21860,7 @@
"NPC": 101074,
"value": 1,
"filter": [
1100118
1100119
],
"filter2": []
},
@ -21885,7 +21885,7 @@
"NPC": 101084,
"value": 1,
"filter": [
1100119
1100120
],
"filter2": []
},
@ -21910,7 +21910,7 @@
"NPC": 101094,
"value": 1,
"filter": [
1100123
1100124
],
"filter2": []
},
@ -21935,7 +21935,7 @@
"NPC": 101104,
"value": 1,
"filter": [
1100126
1100127
],
"filter2": []
},
@ -21960,7 +21960,7 @@
"NPC": 101114,
"value": 1,
"filter": [
1100128
1100129
],
"filter2": []
},
@ -21985,7 +21985,7 @@
"NPC": 101124,
"value": 1,
"filter": [
1100130
1100131
],
"filter2": []
},
@ -22010,7 +22010,7 @@
"NPC": 101134,
"value": 1,
"filter": [
1100131
1100132
],
"filter2": []
},
@ -22035,7 +22035,7 @@
"NPC": 101144,
"value": 1,
"filter": [
1100132
1100133
],
"filter2": []
},

View File

@ -410,7 +410,7 @@
"x": 0,
"y": 0
},
"txt": "",
"txt": "1000102",
"speakerface": 0,
"sound": "",
"mask": 0,
@ -434,13 +434,14 @@
"finger": [
"zhandou",
"skilllist$",
"3"
"2",
"skillbtn"
],
"offset": {
"x": 0,
"y": 0
},
"fingerTime": 0,
"fingerTime": 0.3,
"objSize": {
"x": 0,
"y": 0
@ -449,10 +450,10 @@
"x": 0,
"y": 0
},
"txt": "",
"txt": "1000201",
"speakerface": 0,
"sound": "",
"mask": 1,
"mask": 0,
"lock": 0,
"uishow": 0,
"skiptime": 0,
@ -566,7 +567,7 @@
"x": 0,
"y": 0
},
"txt": "",
"txt": "1000202",
"speakerface": 0,
"sound": "",
"mask": 0,

View File

@ -6,7 +6,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_1",
"text": "中轴城是终极之战后重建的世界首都,靠先进技术串联幸存世界。"
"text": "废墟中重建的奇迹,尖端科技和多元文化并存的世界之都,文明与希望的火种,人类的新家园中轴城。"
}
},
{
@ -16,7 +16,7 @@
"icon": "loading_icon_zhb",
"prompt": {
"key": "loading_Sheet1_prompt_2",
"text": "指挥部里储存着很多月光原石,看起来有大用处。"
"text": "能源研发,守护者强化……屏幕上充斥着密密麻麻的新消息。指挥部是战略重地,也是中轴城最繁忙的地方。"
}
},
{
@ -26,7 +26,7 @@
"icon": "loading_icon_gfxm",
"prompt": {
"key": "loading_Sheet1_prompt_3",
"text": "快跟着浣熊师父学功夫吧,争取像阿宝一样成为让世人尊敬的大侠。"
"text": "武学的第一奥义,便是要心如止水。师傅常以这句话告诫求道者,为其指点迷津。"
}
},
{
@ -36,7 +36,7 @@
"icon": "loading_icon_xlgs",
"prompt": {
"key": "loading_Sheet1_prompt_4",
"text": "艺术家戈伯随时等你带着好酒好菜去找他打造装备哦。"
"text": "你以为这是把斧子,其实这是把刮胡刀……你永远不知道戈伯的新武器要用来做什么。"
}
},
{
@ -46,7 +46,7 @@
"icon": "loading_icon_gfxm",
"prompt": {
"key": "loading_Sheet1_prompt_5",
"text": "想知道用速度与激情捕羊的乐趣吗?"
"text": "穿过海峡和山岭,将猎物牢牢锁定。冲上云霄,尽情感受速度与激情。"
}
},
{
@ -56,7 +56,7 @@
"icon": "loading_icon_gh",
"prompt": {
"key": "loading_Sheet1_prompt_6",
"text": "俱乐部是一处和其他守护者拉近距离的好地方呢。"
"text": "轻轻摇晃鸡尾酒,靠近小吧台,听听坏蛋们的往事。还能结交到不少狐朋狼友哦。"
}
},
{
@ -66,7 +66,7 @@
"icon": "loading_icon_gfxm",
"prompt": {
"key": "loading_Sheet1_prompt_7",
"text": "想体会友好切磋的魅力吗?竞技场是不二的选择。"
"text": "想在靴猫侠客的陪伴下,来上一场友好的切磋吗?"
}
},
{
@ -76,7 +76,7 @@
"icon": "loading_icon_jgsd",
"prompt": {
"key": "loading_Sheet1_prompt_8",
"text": "商人们经常乘着巨怪列车外出,回来时总会带些新奇的小玩意。"
"text": "星辰之下,飞驰的列车在各区间自由穿梭着,除了奇珍异宝,它还能带回不少逸闻趣事。"
}
},
{
@ -106,7 +106,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_11",
"text": "在这个融合首都里,似乎隐藏着什么危机......"
"text": "永远向着太阳的方向奔跑,拥有爱和信念,就会有希望的明天。————疯狂原始人"
}
},
{
@ -146,7 +146,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_15",
"text": "森林深处的巨型猩猩身上似乎藏着很多觉醒材料。"
"text": "困兽在狂风中嘶吼,黑暗中的咆哮令人战栗,罪恶的灵魂浑然不知末日即将来临。"
}
},
{
@ -156,7 +156,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_16",
"text": "打败森林泰坦就能获得打造辅助套装的材料。"
"text": "漫长的远征到了尽头,抬头仰望这高不可攀的身躯,巨大的阴影笼罩在众人的心头上。"
}
},
{
@ -166,7 +166,7 @@
"icon": "loading_icon_gfxm",
"prompt": {
"key": "loading_Sheet1_prompt_17",
"text": "打败森林泰坦就能获得打造辅助套装的材料。"
"text": "伟大守护者的第一次成就,往往是一场看似平平无奇的战斗。"
}
},
{
@ -186,7 +186,7 @@
"icon": "loading_icon_gfxm",
"prompt": {
"key": "loading_Sheet1_prompt_19",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "伟大守护者的第一次成就,往往是一场看似平平无奇的战斗。"
}
},
{
@ -196,7 +196,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_20",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "想学会功夫,必须要先相信。相信自我,相信爱,相信它们一直都在。————功夫熊猫"
}
},
{
@ -206,7 +206,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_21",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "当尾巴开始不由自主地摆动,便代表一颗善心开始苏醒。————坏蛋联盟"
}
},
{
@ -216,7 +216,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_22",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "许多人爱慕美丽的容颜,而我独爱虔诚善良的心。————怪物史莱克"
}
},
{
@ -226,7 +226,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_23",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "山有猛龙,狂嗅薄荷。何意万龙王,化为绕指柔。————驯龙高手"
}
},
{
@ -236,7 +236,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_24",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "天性是不可被束缚的,再幼小的身躯也能爆发出惊人的力量。————野性精神"
}
},
{
@ -246,7 +246,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_25",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "我们是魔发精灵,会唱歌,会跳舞,散播欢乐和爱。—————魔发精灵"
}
},
{
@ -256,7 +256,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_26",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "很多人并不是我们想象中的那副样子,重要的是,试着多了解对方。————疯狂外星人"
}
},
{
@ -266,7 +266,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_27",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "尽管我们互看不顺眼,总是吵吵闹闹,我还是愿意把所有的爱给你。————宝贝老板"
}
},
{
@ -276,7 +276,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_28",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "即使有95%的几率会完蛋也不能放弃5%的奇遇和辉煌。————马达加斯加"
}
},
{
@ -286,7 +286,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_29",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "我们已经拯救过世界无数次,这次也是。————巨怪猎人"
}
},
{
@ -296,7 +296,7 @@
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_30",
"text": "波比的花园需要记得每周浇灌哦。"
"text": "守护与被守护,永远是相互的。——守护者联盟"
}
}
]

View File

@ -7368,7 +7368,7 @@
"progress": 0,
"stroyshow": 0,
"frontstoryid": 200600,
"afterstoryid": 0,
"afterstoryid": 200610,
"maingroupName": {
"key": "",
"text": ""
@ -17736,7 +17736,13 @@
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"firstaward": [
{
"a": "attr",
"t": "gold",
"n": 7201
}
],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
@ -17809,7 +17815,13 @@
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"firstaward": [
{
"a": "attr",
"t": "gold",
"n": 7202
}
],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
@ -18124,7 +18136,13 @@
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"firstaward": [
{
"a": "attr",
"t": "gold",
"n": 8000
}
],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
@ -18439,7 +18457,13 @@
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"firstaward": [
{
"a": "attr",
"t": "gold",
"n": 8000
}
],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,

View File

@ -238343,7 +238343,7 @@
},
{
"Id": 720019,
"pos": 4,
"pos": 5,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,

View File

@ -106,11 +106,6 @@
"a": "attr",
"t": "diamond",
"n": 20
},
{
"a": "item",
"t": "10000001",
"n": 1
}
],
"module": []
@ -434,7 +429,7 @@
],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"auto_accept": 1,
"tasktips": 0,
"lock_add": 0,
"reword": [],
@ -7218,7 +7213,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_147",
"text": "贫嘴驴的烦恼"
"text": "贫嘴驴喋喋不休几小时了,赶快做道菜让他闭嘴,让世界清净一会。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_147",
@ -7276,7 +7271,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_148",
"text": "亚丝翠的烦恼"
"text": "亚丝翠似乎想给风里飞做吃的……考虑到亚丝翠的厨艺,你决定伸出援手。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_148",
@ -7334,7 +7329,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_149",
"text": "姜饼人的烦恼"
"text": "姜饼人看起来非常忧伤,也许他需要一位守护者的帮助。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_149",
@ -7392,7 +7387,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_150",
"text": "平先生的烦恼"
"text": "翡翠宫突发大批订单!平先生一个鹅忙得喘不上气,他需要帮手!"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_150",
@ -7450,7 +7445,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_151",
"text": "匹诺曹的烦恼"
"text": "匹诺曹吹牛自己厨艺高超,不料惹上了麻烦,身为守护者的你自然不能坐视不管。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_151",
@ -7508,7 +7503,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_152",
"text": "波比的失物找回"
"text": "波比又一次把琴给丢了,又一次求助你,你又一次要帮她找琴。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_152",
@ -7566,7 +7561,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_153",
"text": "希卡普的失物找回"
"text": "希卡普很焦急的向你求助,他刚丢失了一件很重要的东西。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_153",
@ -7624,7 +7619,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_154",
"text": "菲欧娜的失物找回"
"text": "菲奥娜搞丢了一本魔药书,她思来想去只能求助你,这是本什么书呢?"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_154",
@ -7682,7 +7677,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_155",
"text": "戈伯的失物找回"
"text": "戈伯丢了东西,但他看起来十分开心,这是怎么回事?"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_155",
@ -7798,7 +7793,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_157",
"text": "骇客蛛感受到了异样的气息,她需要你的帮助"
"text": "骇客蛛感受到了异样的气息,她需要你的帮助"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_157",
@ -8030,7 +8025,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_161",
"text": "雷特的手下近日行为有些异常,或许是该敲打一番了。"
"text": "雷特的手下近日行为有些异常,或许是该敲打一番了。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_161",
@ -8146,7 +8141,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_163",
"text": "邦尼兔的请求"
"text": "最近城中出现了一些陌生面孔,鬼鬼祟祟,邦尼兔要你前去调查。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_163",
@ -8206,7 +8201,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_164",
"text": "菲欧娜的请求"
"text": "菲欧娜的一些药材不翼而飞了,她请求你帮助查清真相。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_164",
@ -8266,7 +8261,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_165",
"text": "戈伯的请求"
"text": "戈伯正在借酒浇愁,他的铁块不见了。他寻求你的帮助。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_165",
@ -8326,7 +8321,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_166",
"text": "平先生的请求"
"text": "平先生想要研发一道新的配方,为此需要找到传说中的一种蘑菇。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_166",
@ -8386,7 +8381,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_167",
"text": "骇客蛛的请求"
"text": "骇客蛛发现城内突然出现了一些怪异的光芒,遂派你前去调查。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_167",
@ -8442,11 +8437,11 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_168",
"text": "阿宝的心事"
"text": "慰问的包子"
},
"task_details": {
"key": "worldtask_world_task_task_details_168",
"text": "阿宝的心事"
"text": "阿宝委托平先生做了一批包子慰问警卫人员,但阿宝临时有事无法送去。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_168",
@ -8502,7 +8497,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_169",
"text": "寻找平先生"
"text": "平先生已经把包子做好了,就等人来送了。好香啊!"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_169",
@ -8556,11 +8551,11 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_170",
"text": "阿宝的想法"
"text": "特殊的卷轴"
},
"task_details": {
"key": "worldtask_world_task_task_details_170",
"text": "阿宝的想法"
"text": "悍娇虎委托金猴去找一份卷轴,但金猴却突然失踪了。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_170",
@ -8616,7 +8611,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_171",
"text": "寻找金猴"
"text": "金猴似乎就在不远处,但他看起来很生气。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_171",
@ -8670,11 +8665,11 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_172",
"text": "菲欧娜的心事"
"text": "特别的生日蛋糕"
},
"task_details": {
"key": "worldtask_world_task_task_details_172",
"text": "菲欧娜的心事"
"text": "菲欧娜委托姜饼人给匹诺曹做了个特别的蛋糕,需要你帮忙拿一下。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_172",
@ -8730,7 +8725,7 @@
},
"task_details": {
"key": "worldtask_world_task_task_details_173",
"text": "寻找姜饼人"
"text": "姜饼人正在疯狂擀着面团,不知道为啥那些面团里有些裙子珠串之类的东西。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_173",
@ -8784,11 +8779,11 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_174",
"text": "黛安狐的心事"
"text": "狐狸,狼,警长"
},
"task_details": {
"key": "worldtask_world_task_task_details_174",
"text": "黛安狐的心事"
"text": "沃尔夫想要你给戴安狐送信……尽管他俩近在咫尺。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_174",
@ -8842,11 +8837,11 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_175",
"text": "菲欧娜有事相求"
"text": "神秘药剂配方"
},
"task_details": {
"key": "worldtask_world_task_task_details_175",
"text": "菲欧娜有事相求"
"text": "菲欧娜正在研发一种新型的神秘药剂,但现在还缺少一种药材:猫的胡子。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_175",
@ -8898,11 +8893,11 @@
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_176",
"text": "去看看靴子"
"text": "猫的胡子"
},
"task_details": {
"key": "worldtask_world_task_task_details_176",
"text": "去看看靴子猫"
"text": "去找靴子猫,他会给出什么样的胡子呢?"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_176",

View File

@ -13,11 +13,25 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.JielongGetL
// /获取自己的排行榜信息
func (this *apiComp) GetList(session comm.IUserSession, req *pb.JielongGetListReq) (errdata *pb.ErrorData) {
var (
list *pb.DBJielongData
err error
)
if errdata = this.GetListCheck(session, req); errdata != nil {
return
}
session.SendMsg(string(this.module.GetType()), "getlist", &pb.JielongGetListResp{})
list, err = this.module.modelJielong.getUserJielongData(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "getlist", &pb.JielongGetListResp{
Data: list,
})
return
}

View File

@ -1,22 +0,0 @@
package jielong
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
// 参数校验
func (this *apiComp) ResultCheck(session comm.IUserSession, req *pb.JielongResultReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Result(session comm.IUserSession, req *pb.JielongResultReq) (errdata *pb.ErrorData) {
if errdata = this.ResultCheck(session, req); errdata != nil {
return
}
session.SendMsg(string(this.module.GetType()), "result", &pb.JielongResultResp{})
return
}

View File

@ -0,0 +1,46 @@
package jielong
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
// 参数校验
func (this *apiComp) ResultCheck(session comm.IUserSession, req *pb.JielongResultReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) Result(session comm.IUserSession, req *pb.JielongResultReq) (errdata *pb.ErrorData) {
var (
list *pb.DBJielongData
err error
update map[string]interface{}
)
update = make(map[string]interface{}, 0)
if errdata = this.ResultCheck(session, req); errdata != nil {
return
}
list, err = this.module.modelJielong.getUserJielongData(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
}
if req.Bwin {
list.Wincount += 1 // 连胜+1
} else {
list.Wincount = 0 // 连胜清零
}
update["wincount"] = list.Wincount
this.module.modelJielong.changeJielongData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "result", &pb.JielongResultResp{
Data: list,
})
return
}

View File

@ -0,0 +1,63 @@
package jielong
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
// 参数校验
func (this *apiComp) RewardCheck(session comm.IUserSession, req *pb.JielongRewardReq) (errdata *pb.ErrorData) {
if req.Rewardkey == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
}
return
}
func (this *apiComp) Reward(session comm.IUserSession, req *pb.JielongRewardReq) (errdata *pb.ErrorData) {
var (
list *pb.DBJielongData
err error
update map[string]interface{}
)
update = make(map[string]interface{}, 0)
if errdata = this.RewardCheck(session, req); errdata != nil {
return
}
// TODO 等策划配置来再做数据校验
list, err = this.module.modelJielong.getUserJielongData(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
if req.Cur {
if _, ok := list.Reward[req.Rewardkey]; ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserRepeadReward,
Title: pb.ErrorCode_UserRepeadReward.ToString(),
}
return
}
list.Reward[req.Rewardkey] = 1
update["reward"] = list.Reward
} else {
if _, ok := list.Gotarr[req.Rewardkey]; ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserRepeadReward,
Title: pb.ErrorCode_UserRepeadReward.ToString(),
}
return
}
list.Gotarr[req.Rewardkey] = 1
update["gotarr"] = list.Gotarr
}
this.module.modelJielong.changeJielongData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "reward", &pb.JielongRewardResp{})
return
}

View File

@ -171,7 +171,8 @@ func (this *MCompConfigure) LoadGroupData() {
// 实际掉落逻辑 (传入 掉落组ID vip等级 玩家等级 返回获得的道具)
func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32, lv int32) (items []*cfg.Gameatn) {
this.hlock.RLock()
defer this.hlock.RUnlock()
if _, ok := this._lotteryType1[lotteryId]; !ok {
if _, ok := this._lotteryType2[lotteryId]; !ok {
this.module.Errorf("not found config lotterId:%d", lotteryId)
@ -469,6 +470,8 @@ func (this *MCompConfigure) RandRobotConfig(num int32) (confs []*cfg.GameRobotDa
// 获取签到信息
func (this *MCompConfigure) GetSignConf(day, group int32) *cfg.GameSignData {
this.hlock.RLock()
defer this.hlock.RUnlock()
if v, ok := this._sign[day<<8+group]; ok {
return v
}
@ -606,10 +609,14 @@ func (this *MCompConfigure) LoadPriceGroup() {
// 获取
func (this *MCompConfigure) GetPriceGroup(pricegroupId int32) (sz []*cfg.GamePricegroupData) {
this.hlock.RLock()
defer this.hlock.RUnlock()
return this._price[pricegroupId]
}
func (this *MCompConfigure) GetPriceGroupCost(pricegroupId int32, purchase int32) (res []*cfg.Gameatn, err error) {
this.hlock.RLock()
defer this.hlock.RUnlock()
if _, ok := this._price[pricegroupId]; !ok {
err = comm.NewNotFoundConfErr("tools", game_price, pricegroupId)
return
@ -624,6 +631,8 @@ func (this *MCompConfigure) GetPriceGroupCost(pricegroupId int32, purchase int32
}
func (this *MCompConfigure) GetPriceGroupLen(pricegroupId int32) (count int32, err error) {
this.hlock.RLock()
defer this.hlock.RUnlock()
if _, ok := this._price[pricegroupId]; !ok {
err = comm.NewNotFoundConfErr("tools", game_price, pricegroupId)
}

File diff suppressed because it is too large Load Diff

View File

@ -205,7 +205,8 @@ type JielongRewardReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Cur bool `protobuf:"varint,1,opt,name=cur,proto3" json:"cur"`
Cur bool `protobuf:"varint,1,opt,name=cur,proto3" json:"cur"` // 0 本周奖励 1 历史奖励
Rewardkey int32 `protobuf:"varint,2,opt,name=rewardkey,proto3" json:"rewardkey"` // 奖励key
}
func (x *JielongRewardReq) Reset() {
@ -247,12 +248,20 @@ func (x *JielongRewardReq) GetCur() bool {
return false
}
func (x *JielongRewardReq) GetRewardkey() int32 {
if x != nil {
return x.Rewardkey
}
return 0
}
type JielongRewardResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Data *DBJielongData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
Res *UserAtno `protobuf:"bytes,2,opt,name=res,proto3" json:"res"`
}
func (x *JielongRewardResp) Reset() {
@ -294,31 +303,42 @@ func (x *JielongRewardResp) GetData() *DBJielongData {
return nil
}
func (x *JielongRewardResp) GetRes() *UserAtno {
if x != nil {
return x.Res
}
return nil
}
var File_jielong_jielong_msg_proto protoreflect.FileDescriptor
var file_jielong_jielong_msg_proto_rawDesc = []byte{
0x0a, 0x19, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x2f, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e,
0x67, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x6a, 0x69, 0x65,
0x6c, 0x6f, 0x6e, 0x67, 0x2f, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x64, 0x62, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67,
0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x38, 0x0a, 0x12, 0x4a, 0x69,
0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04,
0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x10, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x52,
0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x77, 0x69, 0x6e,
0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x62, 0x77, 0x69, 0x6e, 0x22, 0x37, 0x0a, 0x11,
0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x73,
0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0e, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52,
0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x24, 0x0a, 0x10, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x75, 0x72,
0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x63, 0x75, 0x72, 0x22, 0x37, 0x0a, 0x11, 0x4a,
0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04,
0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x22, 0x13, 0x0a, 0x11, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c,
0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x38, 0x0a, 0x12, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e,
0x67, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04,
0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4a,
0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
0x22, 0x26, 0x0a, 0x10, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x77, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01,
0x28, 0x08, 0x52, 0x04, 0x62, 0x77, 0x69, 0x6e, 0x22, 0x37, 0x0a, 0x11, 0x4a, 0x69, 0x65, 0x6c,
0x6f, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a,
0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42,
0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74,
0x61, 0x22, 0x42, 0x0a, 0x10, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61,
0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x75, 0x72, 0x18, 0x01, 0x20, 0x01,
0x28, 0x08, 0x52, 0x03, 0x63, 0x75, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x77, 0x61, 0x72,
0x64, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x77, 0x61,
0x72, 0x64, 0x6b, 0x65, 0x79, 0x22, 0x54, 0x0a, 0x11, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61,
0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65,
0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b,
0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -342,16 +362,18 @@ var file_jielong_jielong_msg_proto_goTypes = []interface{}{
(*JielongRewardReq)(nil), // 4: JielongRewardReq
(*JielongRewardResp)(nil), // 5: JielongRewardResp
(*DBJielongData)(nil), // 6: DBJielongData
(*UserAtno)(nil), // 7: UserAtno
}
var file_jielong_jielong_msg_proto_depIdxs = []int32{
6, // 0: JielongGetListResp.data:type_name -> DBJielongData
6, // 1: JielongResultResp.data:type_name -> DBJielongData
6, // 2: JielongRewardResp.data:type_name -> DBJielongData
3, // [3:3] is the sub-list for method output_type
3, // [3:3] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name
3, // [3:3] is the sub-list for extension extendee
0, // [0:3] is the sub-list for field type_name
7, // 3: JielongRewardResp.res:type_name -> UserAtno
4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension 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_jielong_jielong_msg_proto_init() }
@ -360,6 +382,7 @@ func file_jielong_jielong_msg_proto_init() {
return
}
file_jielong_jielong_db_proto_init()
file_comm_proto_init()
if !protoimpl.UnsafeEnabled {
file_jielong_jielong_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*JielongGetListReq); i {