Merge branch 'feature/playerhead' into dev
# Conflicts: # src/json/playerHead.json # src/json/tuisonglibao.json
This commit is contained in:
dy
commit
f52e3ca55c
@ -6,7 +6,7 @@ import {PublicShared} from '../../shared/public/public';
|
||||
import {TanXianShared} from '../../shared/public/tanxian';
|
||||
import {event_dldh_addPrize} from '../event/diaoluoduihuan/ApiOpen';
|
||||
import {getEventPrize} from '../tanxian/ApiEvent';
|
||||
import { getItemByItemId } from "../../public/item";
|
||||
import {getItemByItemId} from "../../public/item";
|
||||
|
||||
const iType = {
|
||||
3: 'hero',
|
||||
@ -15,10 +15,10 @@ const iType = {
|
||||
};
|
||||
|
||||
export default async function (call: ApiCall<ReqUse, ResUse>) {
|
||||
|
||||
//ȥ<><C8A5>item Redis<69><73><EFBFBD>
|
||||
let itemInfo = await getItemByItemId(call.uid,call.req.itemId); //call.conn.item[call.req.itemId];
|
||||
if(!itemInfo[call.req.itemId]) return call.error(globalThis.lng.item_1);
|
||||
|
||||
//ȥ<><C8A5>item Redis<69><73><EFBFBD>
|
||||
let itemInfo = await getItemByItemId(call.uid, call.req.itemId); //call.conn.item[call.req.itemId];
|
||||
if (!itemInfo[call.req.itemId]) return call.error(globalThis.lng.item_1);
|
||||
let item = itemInfo[call.req.itemId];
|
||||
|
||||
let useNum = call.req.useNum;
|
||||
@ -105,8 +105,9 @@ export default async function (call: ApiCall<ReqUse, ResUse>) {
|
||||
n: useNum
|
||||
}
|
||||
];
|
||||
} else if ([7, 8].includes(itemConf.type)) {
|
||||
} else if ([6, 7, 8].includes(itemConf.type)) {
|
||||
if (useNum > item.num) return call.error(globalThis.lng.item_3);
|
||||
if (itemConf.type == 6) UserFun.activeModel(call.uid, itemConf.diaoluo.toString(), useNum);
|
||||
if (itemConf.type == 7) UserFun.activeHeadFrame(call.uid, itemConf.diaoluo.toString(), useNum);
|
||||
if (itemConf.type == 8) UserFun.activeChatFrame(call.uid, itemConf.diaoluo.toString(), useNum);
|
||||
|
||||
|
||||
@ -3860,6 +3860,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_019",
|
||||
"sicon": "txk_019",
|
||||
"describe": "intr_item_describe_50001",
|
||||
"diaoluo": 3,
|
||||
"useNeed": [],
|
||||
@ -3878,6 +3879,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_016",
|
||||
"sicon": "txk_016",
|
||||
"describe": "intr_item_describe_50002",
|
||||
"diaoluo": 4,
|
||||
"useNeed": [],
|
||||
@ -3896,6 +3898,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_023",
|
||||
"sicon": "txk_023",
|
||||
"describe": "intr_item_describe_50003",
|
||||
"diaoluo": 6,
|
||||
"useNeed": [],
|
||||
@ -3914,6 +3917,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_009",
|
||||
"sicon": "txk_009",
|
||||
"describe": "intr_item_describe_50004",
|
||||
"diaoluo": 7,
|
||||
"useNeed": [],
|
||||
@ -3932,6 +3936,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_026",
|
||||
"sicon": "txk_026",
|
||||
"describe": "intr_item_describe_50005",
|
||||
"diaoluo": 8,
|
||||
"useNeed": [],
|
||||
@ -3950,6 +3955,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_018",
|
||||
"sicon": "txk_018",
|
||||
"describe": "intr_item_describe_50006",
|
||||
"diaoluo": 9,
|
||||
"useNeed": [],
|
||||
@ -3968,6 +3974,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_014",
|
||||
"sicon": "txk_014",
|
||||
"describe": "intr_item_describe_50007",
|
||||
"diaoluo": 10,
|
||||
"useNeed": [],
|
||||
@ -3986,6 +3993,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_022",
|
||||
"sicon": "txk_022",
|
||||
"describe": "intr_item_describe_50008",
|
||||
"diaoluo": 11,
|
||||
"useNeed": [],
|
||||
@ -4004,6 +4012,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_028",
|
||||
"sicon": "txk_028",
|
||||
"describe": "intr_item_describe_50009",
|
||||
"diaoluo": 23,
|
||||
"useNeed": [],
|
||||
@ -4012,6 +4021,24 @@
|
||||
"payId": "",
|
||||
"advancedEffects": ""
|
||||
},
|
||||
"50010": {
|
||||
"id": 50010,
|
||||
"name": "playerheadFrame_name_24",
|
||||
"type": 7,
|
||||
"sort": 1,
|
||||
"colour": 4,
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_025",
|
||||
"sicon": "txk_025",
|
||||
"describe": "intr_item_describe_50010",
|
||||
"diaoluo": 24,
|
||||
"useNeed": [],
|
||||
"usePrize": [],
|
||||
"selecPrize": [],
|
||||
"payId": "",
|
||||
"advancedEffects": ""
|
||||
},
|
||||
"50101": {
|
||||
"id": 50101,
|
||||
"name": "playerChatFrame_name_6",
|
||||
@ -4022,6 +4049,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "lt_dhk11",
|
||||
"sicon": "lt_dhk11",
|
||||
"describe": "intr_item_describe_50101",
|
||||
"diaoluo": 6,
|
||||
"useNeed": [],
|
||||
@ -4040,6 +4068,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "lt_dhk10",
|
||||
"sicon": "lt_dhk10",
|
||||
"describe": "intr_item_describe_50102",
|
||||
"diaoluo": 7,
|
||||
"useNeed": [],
|
||||
@ -4058,6 +4087,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_020",
|
||||
"sicon": "txk_020",
|
||||
"describe": "intr_item_describe_50103",
|
||||
"diaoluo": 15,
|
||||
"useNeed": [],
|
||||
@ -4076,6 +4106,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "lt_dhk14",
|
||||
"sicon": "lt_dhk14",
|
||||
"describe": "intr_item_describe_50104",
|
||||
"diaoluo": 8,
|
||||
"useNeed": [],
|
||||
@ -4094,6 +4125,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_017",
|
||||
"sicon": "txk_017",
|
||||
"describe": "intr_item_describe_50201",
|
||||
"diaoluo": 16,
|
||||
"useNeed": [],
|
||||
@ -4112,6 +4144,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_011",
|
||||
"sicon": "txk_011",
|
||||
"describe": "intr_item_describe_50202",
|
||||
"diaoluo": 17,
|
||||
"useNeed": [],
|
||||
@ -4130,6 +4163,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_005",
|
||||
"sicon": "txk_005",
|
||||
"describe": "intr_item_describe_50203",
|
||||
"diaoluo": 18,
|
||||
"useNeed": [],
|
||||
@ -4148,6 +4182,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_004",
|
||||
"sicon": "txk_004",
|
||||
"describe": "intr_item_describe_50204",
|
||||
"diaoluo": 19,
|
||||
"useNeed": [],
|
||||
@ -4166,6 +4201,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_024",
|
||||
"sicon": "txk_024",
|
||||
"describe": "intr_item_describe_50205",
|
||||
"diaoluo": 20,
|
||||
"useNeed": [],
|
||||
@ -4184,6 +4220,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_013",
|
||||
"sicon": "txk_013",
|
||||
"describe": "intr_item_describe_50206",
|
||||
"diaoluo": 21,
|
||||
"useNeed": [],
|
||||
@ -4202,6 +4239,7 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": "txk_021",
|
||||
"sicon": "txk_021",
|
||||
"describe": "intr_item_describe_50207",
|
||||
"diaoluo": 22,
|
||||
"useNeed": [],
|
||||
@ -4220,7 +4258,8 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": 100011,
|
||||
"describe": "intr_item_describe_50208",
|
||||
"sicon": 100011,
|
||||
"describe": "intr_item_describe_50301",
|
||||
"diaoluo": 3,
|
||||
"useNeed": [],
|
||||
"usePrize": [],
|
||||
@ -4238,7 +4277,8 @@
|
||||
"way": [],
|
||||
"go": "",
|
||||
"icon": 100021,
|
||||
"describe": "intr_item_describe_50209",
|
||||
"sicon": 100021,
|
||||
"describe": "intr_item_describe_50302",
|
||||
"diaoluo": 4,
|
||||
"useNeed": [],
|
||||
"usePrize": [],
|
||||
|
||||
@ -33,13 +33,13 @@
|
||||
"id": 3,
|
||||
"name": "intr_playerinfo_name_3",
|
||||
"undefined": "获得圣诞活动皮肤【圣诞庆典：男】后解锁",
|
||||
"img": 10001,
|
||||
"img": 100011,
|
||||
"cond": [
|
||||
"time",
|
||||
-1
|
||||
"model",
|
||||
3
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3",
|
||||
"sort": 42,
|
||||
"sort": 3,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -48,13 +48,13 @@
|
||||
"id": 4,
|
||||
"name": "intr_playerinfo_name_4",
|
||||
"undefined": "获得圣诞活动皮肤【圣诞庆典：女】后解锁",
|
||||
"img": 10002,
|
||||
"img": 100021,
|
||||
"cond": [
|
||||
"time",
|
||||
-1
|
||||
"model",
|
||||
4
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4",
|
||||
"sort": 43,
|
||||
"sort": 4,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -69,7 +69,7 @@
|
||||
1001
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_1001",
|
||||
"sort": 40,
|
||||
"sort": 42,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -84,7 +84,7 @@
|
||||
1002
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_1002",
|
||||
"sort": 41,
|
||||
"sort": 43,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -99,7 +99,7 @@
|
||||
2001
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_2001",
|
||||
"sort": 38,
|
||||
"sort": 40,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -114,7 +114,7 @@
|
||||
2002
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_2002",
|
||||
"sort": 39,
|
||||
"sort": 41,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -129,7 +129,7 @@
|
||||
3001
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3001",
|
||||
"sort": 23,
|
||||
"sort": 25,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -144,7 +144,7 @@
|
||||
3002
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3002",
|
||||
"sort": 24,
|
||||
"sort": 26,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -159,7 +159,7 @@
|
||||
3003
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3003",
|
||||
"sort": 25,
|
||||
"sort": 27,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -174,7 +174,7 @@
|
||||
3004
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3004",
|
||||
"sort": 26,
|
||||
"sort": 28,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -189,7 +189,7 @@
|
||||
3005
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3005",
|
||||
"sort": 27,
|
||||
"sort": 29,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -204,7 +204,7 @@
|
||||
3006
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3006",
|
||||
"sort": 28,
|
||||
"sort": 30,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -219,7 +219,7 @@
|
||||
3007
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3007",
|
||||
"sort": 29,
|
||||
"sort": 31,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -234,7 +234,7 @@
|
||||
3008
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3008",
|
||||
"sort": 30,
|
||||
"sort": 32,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -249,7 +249,7 @@
|
||||
3009
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3009",
|
||||
"sort": 31,
|
||||
"sort": 33,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -264,7 +264,7 @@
|
||||
3010
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3010",
|
||||
"sort": 32,
|
||||
"sort": 34,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -279,7 +279,7 @@
|
||||
3011
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3011",
|
||||
"sort": 33,
|
||||
"sort": 35,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -294,7 +294,7 @@
|
||||
3012
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3012",
|
||||
"sort": 34,
|
||||
"sort": 36,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -309,7 +309,7 @@
|
||||
3013
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3013",
|
||||
"sort": 35,
|
||||
"sort": 37,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -324,7 +324,7 @@
|
||||
3014
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3014",
|
||||
"sort": 36,
|
||||
"sort": 38,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -339,7 +339,7 @@
|
||||
3015
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_3015",
|
||||
"sort": 37,
|
||||
"sort": 39,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -354,7 +354,7 @@
|
||||
4001
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4001",
|
||||
"sort": 8,
|
||||
"sort": 10,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -369,7 +369,7 @@
|
||||
4002
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4002",
|
||||
"sort": 9,
|
||||
"sort": 11,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -384,7 +384,7 @@
|
||||
4003
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4003",
|
||||
"sort": 10,
|
||||
"sort": 12,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -399,7 +399,7 @@
|
||||
4004
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4004",
|
||||
"sort": 11,
|
||||
"sort": 13,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -414,7 +414,7 @@
|
||||
4005
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4005",
|
||||
"sort": 12,
|
||||
"sort": 14,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -429,7 +429,7 @@
|
||||
4006
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4006",
|
||||
"sort": 13,
|
||||
"sort": 15,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -444,7 +444,7 @@
|
||||
4007
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4007",
|
||||
"sort": 14,
|
||||
"sort": 16,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -459,7 +459,7 @@
|
||||
4008
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4008",
|
||||
"sort": 15,
|
||||
"sort": 17,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -474,7 +474,7 @@
|
||||
4009
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4009",
|
||||
"sort": 16,
|
||||
"sort": 18,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -489,7 +489,7 @@
|
||||
4010
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4010",
|
||||
"sort": 17,
|
||||
"sort": 19,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -504,7 +504,7 @@
|
||||
4011
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4011",
|
||||
"sort": 18,
|
||||
"sort": 20,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -519,7 +519,7 @@
|
||||
4012
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4012",
|
||||
"sort": 19,
|
||||
"sort": 21,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -534,7 +534,7 @@
|
||||
4013
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4013",
|
||||
"sort": 20,
|
||||
"sort": 22,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -549,7 +549,7 @@
|
||||
4014
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4014",
|
||||
"sort": 21,
|
||||
"sort": 23,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -564,7 +564,7 @@
|
||||
4015
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_4015",
|
||||
"sort": 22,
|
||||
"sort": 24,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -579,7 +579,7 @@
|
||||
5001
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_5001",
|
||||
"sort": 3,
|
||||
"sort": 5,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -594,7 +594,7 @@
|
||||
5002
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_5002",
|
||||
"sort": 4,
|
||||
"sort": 6,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -609,7 +609,7 @@
|
||||
5003
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_5003",
|
||||
"sort": 5,
|
||||
"sort": 7,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -624,7 +624,7 @@
|
||||
5004
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_5004",
|
||||
"sort": 6,
|
||||
"sort": 8,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
@ -639,7 +639,7 @@
|
||||
5005
|
||||
],
|
||||
"intr": "intr_playerinfo_intr_5005",
|
||||
"sort": 7,
|
||||
"sort": 9,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"ani": ""
|
||||
|
||||
@ -391,5 +391,22 @@
|
||||
},
|
||||
"colour": 4,
|
||||
"ani": ""
|
||||
},
|
||||
"24": {
|
||||
"id": 24,
|
||||
"name": "playerheadFrame_name_24",
|
||||
"undefined": "消费竞赛活动前三名获得，解锁后伤害加成+1%（限时7天）",
|
||||
"img": "txk_025",
|
||||
"cond": [
|
||||
"time",
|
||||
604800
|
||||
],
|
||||
"intr": "playerheadFrame_des_24",
|
||||
"sort": 24,
|
||||
"buff": {
|
||||
"dpspro": 0.01
|
||||
},
|
||||
"colour": 5,
|
||||
"ani": ""
|
||||
}
|
||||
}
|
||||
@ -1,76 +1,74 @@
|
||||
{
|
||||
"1": {
|
||||
"1": {
|
||||
"type": 1,
|
||||
"id": 1,
|
||||
"name": "playerModel_name_1",
|
||||
"head": 10001,
|
||||
"img": "zhu_10001",
|
||||
"cond": [
|
||||
"lv",
|
||||
1
|
||||
],
|
||||
"intr": "playerModel_des_1",
|
||||
"sort": 1,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"mwSpine": "ani_mingwangnan",
|
||||
"fireHead": "img_lih2"
|
||||
"id": 1,
|
||||
"type": 1,
|
||||
"name": "playerModel_name_1",
|
||||
"head": 10001,
|
||||
"img": "zhu_10001",
|
||||
"cond": [
|
||||
"lv",
|
||||
1
|
||||
],
|
||||
"intr": "playerModel_des_1",
|
||||
"sort": 1,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"mwSpine": "ani_mingwangnan",
|
||||
"fireHead": "img_lih2"
|
||||
},
|
||||
"2": {
|
||||
"id": 2,
|
||||
"type": 1,
|
||||
"name": "playerModel_name_2",
|
||||
"head": 10002,
|
||||
"img": "zhu_10002",
|
||||
"cond": [
|
||||
"lv",
|
||||
1
|
||||
],
|
||||
"intr": "playerModel_des_2",
|
||||
"sort": 2,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"mwSpine": "ani_mingwangnv",
|
||||
"fireHead": "img_lih1"
|
||||
},
|
||||
"3": {
|
||||
"id": 3,
|
||||
"type": 1,
|
||||
"name": "playerModel_name_3",
|
||||
"head": 100011,
|
||||
"img": 100011,
|
||||
"cond": [
|
||||
"time",
|
||||
-1
|
||||
],
|
||||
"intr": "playerModel_des_3",
|
||||
"sort": 3,
|
||||
"buff": {
|
||||
"defpro": 0.02
|
||||
},
|
||||
"2": {
|
||||
"type": 1,
|
||||
"id": 2,
|
||||
"name": "playerModel_name_2",
|
||||
"head": 10002,
|
||||
"img": "zhu_10002",
|
||||
"cond": [
|
||||
"lv",
|
||||
1
|
||||
],
|
||||
"intr": "playerModel_des_2",
|
||||
"sort": 2,
|
||||
"buff": {},
|
||||
"colour": 1,
|
||||
"mwSpine": "ani_mingwangnv",
|
||||
"fireHead": "img_lih1"
|
||||
"colour": 5,
|
||||
"mwSpine": "ani_mingwangnan",
|
||||
"fireHead": "img_lih21"
|
||||
},
|
||||
"4": {
|
||||
"id": 4,
|
||||
"type": 1,
|
||||
"name": "playerModel_name_4",
|
||||
"head": 100021,
|
||||
"img": 100021,
|
||||
"cond": [
|
||||
"time",
|
||||
-1
|
||||
],
|
||||
"intr": "playerModel_des_4",
|
||||
"sort": 4,
|
||||
"buff": {
|
||||
"atkpro": 0.02
|
||||
},
|
||||
"3": {
|
||||
"type": 1,
|
||||
"id": 3,
|
||||
"name": "playerModel_name_3",
|
||||
"head": 100011,
|
||||
"img": 100011,
|
||||
"cond": [
|
||||
"time",
|
||||
-1
|
||||
],
|
||||
"intr": "playerModel_des_3",
|
||||
"sort": 3,
|
||||
"buff": {
|
||||
"defpro": 0.02
|
||||
},
|
||||
"colour": 5,
|
||||
"mwSpine": "ani_mingwangnan",
|
||||
"fireHead": "img_lih21"
|
||||
},
|
||||
"4": {
|
||||
"type": 1,
|
||||
"id": 4,
|
||||
"name": "playerModel_name_4",
|
||||
"head": 100021,
|
||||
"img": 100021,
|
||||
"cond": [
|
||||
"time",
|
||||
-1
|
||||
],
|
||||
"intr": "playerModel_des_4",
|
||||
"sort": 4,
|
||||
"buff": {
|
||||
"atkpro": 0.02
|
||||
},
|
||||
"colour": 5,
|
||||
"mwSpine": "ani_mingwangnv",
|
||||
"fireHead": "img_lih11"
|
||||
}
|
||||
"colour": 5,
|
||||
"mwSpine": "ani_mingwangnv",
|
||||
"fireHead": "img_lih11"
|
||||
}
|
||||
}
|
||||
@ -2,259 +2,266 @@
|
||||
"1": {
|
||||
"id": 1,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
100
|
||||
5
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 500
|
||||
},
|
||||
"2": {
|
||||
"id": 2,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
140
|
||||
10
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_3"
|
||||
"guanqialibao_2"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 501
|
||||
},
|
||||
"3": {
|
||||
"id": 3,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
180
|
||||
20
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 502
|
||||
},
|
||||
"4": {
|
||||
"id": 4,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
240
|
||||
{
|
||||
"a": "item",
|
||||
"t": "1"
|
||||
}
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"daojulibao_1",
|
||||
"daojulibao_2"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 503
|
||||
},
|
||||
"5": {
|
||||
"id": 5,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
300
|
||||
{
|
||||
"a": "item",
|
||||
"t": "2"
|
||||
}
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"daojulibao_1",
|
||||
"daojulibao_3"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 504
|
||||
},
|
||||
"6": {
|
||||
"id": 6,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
360
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "jinbi"
|
||||
}
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"daojulibao_1",
|
||||
"daojulibao_2",
|
||||
"daojulibao_3"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 505
|
||||
},
|
||||
"7": {
|
||||
"id": 7,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
400
|
||||
1
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"zhanbailibao_1",
|
||||
"zhanbailibao_2",
|
||||
"zhanbailibao_3"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 506
|
||||
},
|
||||
"8": {
|
||||
"id": 8,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
460
|
||||
3
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"choukalibao_1",
|
||||
"choukalibao_2",
|
||||
"choukalibao_3"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"displayCD": 7200,
|
||||
"scale": 507
|
||||
},
|
||||
"9": {
|
||||
"id": 9,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
490
|
||||
31
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"lv30"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 3300
|
||||
},
|
||||
"10": {
|
||||
"id": 10,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
520
|
||||
45
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"lv40"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 3300
|
||||
},
|
||||
"11": {
|
||||
"id": 11,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
550
|
||||
50
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_3"
|
||||
"lv55"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 2000
|
||||
},
|
||||
"12": {
|
||||
"id": 12,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
580
|
||||
53
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_4"
|
||||
"lv58"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 2000
|
||||
},
|
||||
"13": {
|
||||
"id": 13,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
610
|
||||
56
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_4"
|
||||
"lv60"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 2000
|
||||
},
|
||||
"14": {
|
||||
"id": 14,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
640
|
||||
60
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_4"
|
||||
"lv63"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 2000
|
||||
},
|
||||
"15": {
|
||||
"id": 15,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
670
|
||||
63
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_4"
|
||||
"lv66"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 2000
|
||||
},
|
||||
"16": {
|
||||
"id": 16,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
700
|
||||
66
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_4"
|
||||
"lv69"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 1800
|
||||
},
|
||||
"17": {
|
||||
"id": 17,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
730
|
||||
68
|
||||
],
|
||||
"payId": [
|
||||
"guanqialibao_1",
|
||||
"guanqialibao_2",
|
||||
"guanqialibao_4"
|
||||
"lv72"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
"scale": 3000
|
||||
"scale": 1800
|
||||
},
|
||||
"18": {
|
||||
"id": 18,
|
||||
"type": 1,
|
||||
"typeName": "tuisonglibao_name_2",
|
||||
"num": [
|
||||
760
|
||||
],
|
||||
@ -270,6 +277,7 @@
|
||||
"101": {
|
||||
"id": 101,
|
||||
"type": 2,
|
||||
"typeName": "tuisonglibao_name_3",
|
||||
"num": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -288,6 +296,7 @@
|
||||
"102": {
|
||||
"id": 102,
|
||||
"type": 2,
|
||||
"typeName": "tuisonglibao_name_3",
|
||||
"num": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -306,6 +315,7 @@
|
||||
"103": {
|
||||
"id": 103,
|
||||
"type": 2,
|
||||
"typeName": "tuisonglibao_name_3",
|
||||
"num": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -324,6 +334,7 @@
|
||||
"104": {
|
||||
"id": 104,
|
||||
"type": 2,
|
||||
"typeName": "tuisonglibao_name_3",
|
||||
"num": [
|
||||
{
|
||||
"a": "item",
|
||||
@ -342,6 +353,7 @@
|
||||
"401": {
|
||||
"id": 401,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
15
|
||||
],
|
||||
@ -355,6 +367,7 @@
|
||||
"402": {
|
||||
"id": 402,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
25
|
||||
],
|
||||
@ -368,6 +381,7 @@
|
||||
"403": {
|
||||
"id": 403,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
40
|
||||
],
|
||||
@ -382,6 +396,7 @@
|
||||
"404": {
|
||||
"id": 404,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
50
|
||||
],
|
||||
@ -396,6 +411,7 @@
|
||||
"405": {
|
||||
"id": 405,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
55
|
||||
],
|
||||
@ -410,6 +426,7 @@
|
||||
"406": {
|
||||
"id": 406,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
60
|
||||
],
|
||||
@ -424,6 +441,7 @@
|
||||
"407": {
|
||||
"id": 407,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
63
|
||||
],
|
||||
@ -438,6 +456,7 @@
|
||||
"408": {
|
||||
"id": 408,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
66
|
||||
],
|
||||
@ -452,6 +471,7 @@
|
||||
"409": {
|
||||
"id": 409,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
69
|
||||
],
|
||||
@ -466,12 +486,12 @@
|
||||
"410": {
|
||||
"id": 410,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
73
|
||||
70
|
||||
],
|
||||
"payId": [
|
||||
"lv73_1",
|
||||
"lv73_2"
|
||||
"lv75"
|
||||
],
|
||||
"time": 3600,
|
||||
"displayCD": 3600,
|
||||
@ -480,6 +500,7 @@
|
||||
"411": {
|
||||
"id": 411,
|
||||
"type": 5,
|
||||
"typeName": "tuisonglibao_name_1",
|
||||
"num": [
|
||||
82
|
||||
],
|
||||
|
||||
@ -1032,7 +1032,7 @@ type gc_playerLv = k_v<{
|
||||
'tujianlv': number
|
||||
}>;
|
||||
|
||||
type gc_playerModel = k_v<k_v<{
|
||||
type gc_playerModel = k_v<{
|
||||
/** 类型 */
|
||||
'type': number
|
||||
/** id */
|
||||
@ -1057,7 +1057,7 @@ type gc_playerModel = k_v<k_v<{
|
||||
'mwSpine': string
|
||||
/** 战斗半身像 */
|
||||
'fireHead': string
|
||||
}>>;
|
||||
}>;
|
||||
|
||||
type gc_pmd = { "get_hero_star5_pmd": string, "glkb_pmd": string, "jinjie_peijian": string, "guild_pmd": string, "tlsd_pmd": string, "hbzb_pmd1": string, "hbzb_pmd2": string, "hbzb_pmd3": string, [x: string]: any }
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
import CryptoJS from 'crypto-js';
|
||||
import { ObjectId, OptionalId, WithId } from 'mongodb';
|
||||
import { BaseConnection } from 'tsrpc';
|
||||
import { Wjjl } from '../module/collection_wjjl';
|
||||
import { ServiceType } from '../shared/protocols/serviceProto';
|
||||
import { ReqLogin, ResLogin, playerAppend, playerAttr, playerInfo } from '../shared/protocols/user/PtlLogin';
|
||||
import { player } from '../shared/protocols/user/type';
|
||||
import { PublicShared } from '../shared/public/public';
|
||||
import { PlayerFun } from './player';
|
||||
import { ZhanLingTasks } from './zhanling';
|
||||
import { getGud, setGud } from './gud';
|
||||
import {ObjectId, OptionalId, WithId} from 'mongodb';
|
||||
import {BaseConnection} from 'tsrpc';
|
||||
import {Wjjl} from '../module/collection_wjjl';
|
||||
import {ServiceType} from '../shared/protocols/serviceProto';
|
||||
import {ReqLogin, ResLogin, playerAppend, playerAttr, playerInfo} from '../shared/protocols/user/PtlLogin';
|
||||
import {player} from '../shared/protocols/user/type';
|
||||
import {PublicShared} from '../shared/public/public';
|
||||
import {PlayerFun} from './player';
|
||||
import {ZhanLingTasks} from './zhanling';
|
||||
import {getGud, setGud} from './gud';
|
||||
|
||||
export const defaultUserInfo: playerInfo = {
|
||||
lv: 1,
|
||||
@ -30,14 +30,12 @@ export const defaultUserAttr: playerAttr = {
|
||||
export const defaultUserAppend: playerAppend = {
|
||||
name: '',
|
||||
tujianLv: 0,
|
||||
head: { id: "1", time: -1 },
|
||||
headFrame: { id: "1", time: -1 },
|
||||
chatFrame: { id: "1", time: -1 },
|
||||
head: {id: "1", time: -1},
|
||||
headFrame: {id: "1", time: -1},
|
||||
chatFrame: {id: "1", time: -1},
|
||||
model: {
|
||||
1: { id: "1", time: -1 },
|
||||
2: { id: "1", time: -1 },
|
||||
3: { id: "1", time: -1 },
|
||||
4: { id: "1", time: -1 },
|
||||
1: {id: "1", time: -1},
|
||||
2: {id: "2", time: -1}
|
||||
},
|
||||
renown: 0,
|
||||
wxcLv: {
|
||||
@ -60,12 +58,12 @@ export const defaultUserAppend: playerAppend = {
|
||||
ghId: '',
|
||||
ghName: '',
|
||||
ghLevel: 0,
|
||||
ghwz: { 1: 0, 2: 0, 3: 0, 4: 0 }
|
||||
ghwz: {1: 0, 2: 0, 3: 0, 4: 0}
|
||||
};
|
||||
|
||||
export class UserFun {
|
||||
static create(bUid: string) {
|
||||
let { bindUid, ...userInfo } = defaultUserInfo;
|
||||
let {bindUid, ...userInfo} = defaultUserInfo;
|
||||
|
||||
return {
|
||||
bindUid: bUid,
|
||||
@ -73,6 +71,7 @@ export class UserFun {
|
||||
...defaultUserAttr
|
||||
};
|
||||
}
|
||||
|
||||
static async check(gud: ResLogin['gud'], req: ReqLogin) {
|
||||
let obj: k_v<any> = {};
|
||||
let add: k_v<any> = {};
|
||||
@ -126,14 +125,14 @@ export class UserFun {
|
||||
if (h_ids.length < 1) {
|
||||
gud.fightHeros = [];
|
||||
} else {
|
||||
let dHeros = await G.mongodb.collection('hero').find({ _id: { $in: h_ids.map(id => G.mongodb.conversionId(id)) } }).toArray();
|
||||
let dHeros = await G.mongodb.collection('hero').find({_id: {$in: h_ids.map(id => G.mongodb.conversionId(id))}}).toArray();
|
||||
gud.fightHeros = dHeros.map(h => h.heroId.toString());
|
||||
}
|
||||
add.fightHeros = gud.fightHeros;
|
||||
}
|
||||
|
||||
if (!gud.matrixPos) {
|
||||
gud.matrixPos = Object.fromEntries(Object.keys(G.gc.fightPlan).map(pos => [pos, { ...gud.heroPos }]));
|
||||
gud.matrixPos = Object.fromEntries(Object.keys(G.gc.fightPlan).map(pos => [pos, {...gud.heroPos}]));
|
||||
add.matrixPos = gud.matrixPos;
|
||||
}
|
||||
|
||||
@ -197,7 +196,7 @@ export class UserFun {
|
||||
add.loginTime = G.time;
|
||||
|
||||
if (Object.keys(add).length > 0) {
|
||||
G.mongodb.collection('user').updateOne({ bindUid: gud.bindUid,sid:gud.sid }, {
|
||||
G.mongodb.collection('user').updateOne({bindUid: gud.bindUid, sid: gud.sid}, {
|
||||
$set: {
|
||||
...add
|
||||
}
|
||||
@ -211,24 +210,25 @@ export class UserFun {
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
|
||||
// 检查空数据并修复
|
||||
static async checkUidOrName() {
|
||||
let users = await G.mongodb.collection('user').findOne({$or: [{uid: {$in:['', null]}},{name: {$in: ['', null]}}]})
|
||||
if(users) {
|
||||
let users = await G.mongodb.collection('user').findOne({$or: [{uid: {$in: ['', null]}}, {name: {$in: ['', null]}}]})
|
||||
if (users) {
|
||||
let {bindUid, sid, _id} = users
|
||||
let uid = users.uid || (sid + '_' + _id)
|
||||
// 随机创建name
|
||||
let b64 = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(bindUid + sid));
|
||||
let name = users.name || `temp_${b64}`.toLocaleLowerCase();
|
||||
await G.mongodb.collection('user').updateOne({ bindUid, sid }, {
|
||||
await G.mongodb.collection('user').updateOne({bindUid, sid}, {
|
||||
$set: {
|
||||
uid, name
|
||||
}
|
||||
});
|
||||
}
|
||||
return
|
||||
return
|
||||
}
|
||||
|
||||
/**创建账号数据 */
|
||||
static async createUser(client: BaseConnection<ServiceType>, bindUid: string, sid: number): Promise<WithId<OptionalId<ResLogin['gud']>>> {
|
||||
// 开启事务
|
||||
@ -258,14 +258,17 @@ export class UserFun {
|
||||
// session.endSession() // 结束事务
|
||||
return gud as WithId<OptionalId<ResLogin['gud']>>;
|
||||
}
|
||||
|
||||
/**获取玩家附带的buff加成 */
|
||||
static getOtherBuff(gud: ResLogin['gud']) {
|
||||
return gud;
|
||||
}
|
||||
|
||||
static async getGud(uid: string) {
|
||||
//return await G.redis.get('user', uid);
|
||||
return await getGud(uid);
|
||||
}
|
||||
|
||||
/**激活头像框 */
|
||||
static async activeHeadFrame(uid: string, k: string, v: number) {
|
||||
let gud: player;
|
||||
@ -312,11 +315,12 @@ export class UserFun {
|
||||
}
|
||||
|
||||
if (change) {
|
||||
PlayerFun.changeAttr(uid, { headFrames: gud.headFrames });
|
||||
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', { headFrames: gud.headFrames });
|
||||
PlayerFun.changeAttr(uid, {headFrames: gud.headFrames});
|
||||
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {headFrames: gud.headFrames});
|
||||
G.server.uid_connections[uid]?.refreshPower();
|
||||
}
|
||||
}
|
||||
|
||||
/**激活聊天框 */
|
||||
static async activeChatFrame(uid: string, k: string, v: number) {
|
||||
let gud: player;
|
||||
@ -363,8 +367,60 @@ export class UserFun {
|
||||
}
|
||||
|
||||
if (change) {
|
||||
PlayerFun.changeAttr(uid, { chatFrames: gud.chatFrames });
|
||||
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', { chatFrames: gud.chatFrames });
|
||||
PlayerFun.changeAttr(uid, {chatFrames: gud.chatFrames});
|
||||
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {chatFrames: gud.chatFrames});
|
||||
G.server.uid_connections[uid]?.refreshPower();
|
||||
}
|
||||
}
|
||||
|
||||
/**激活造型 */
|
||||
static async activeModel(uid: string, k: string, v: number) {
|
||||
let gud: player;
|
||||
// if (G.server.uid_connections[uid]) {
|
||||
// gud = G.server.uid_connections[uid].gud;
|
||||
// } else {
|
||||
// gud = await G.redis.get('user', uid);
|
||||
// }
|
||||
gud = await getGud(uid);
|
||||
|
||||
let change = false;
|
||||
let model = G.gc.playerModel;
|
||||
let checks = Object.values(model).filter(v => v.cond[0] == k);
|
||||
if (checks.length > 0) {
|
||||
checks.forEach(conf => {
|
||||
let val = v;
|
||||
if (k == 'wxcLv') val = gud.wxcLv.lv;
|
||||
else if (gud[k] != undefined) val = gud[k];
|
||||
|
||||
if (k == 'jjc_rank' && !gud.model[conf.id] && val <= conf.cond[1]) {
|
||||
gud.model[conf.id] = {id: conf.id + '', time: -1};
|
||||
change = true;
|
||||
} else if (!gud.model[conf.id] && val >= conf.cond[1]) {
|
||||
gud.model[conf.id] = {id: conf.id + '', time: -1};
|
||||
change = true;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
let conf = model[k];
|
||||
if (conf?.cond?.[0] == 'time') {
|
||||
let val = conf.cond[1];
|
||||
|
||||
if (val == -1 && gud.model[conf.id]) {
|
||||
change = true;
|
||||
gud.model[conf.id] = {id: conf.id + '', time: -1};
|
||||
} else if (!gud.model[conf.id] || gud.model[conf.id].time < G.time) {
|
||||
change = true;
|
||||
gud.model[conf.id] = {id: conf.id + '', time: G.time + val * v};
|
||||
} else {
|
||||
change = true;
|
||||
gud.model[conf.id] = {id: conf.id + '', time: gud.model[conf.id].time += val * v}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (change) {
|
||||
PlayerFun.changeAttr(uid, {model: gud.model});
|
||||
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {model: gud.model});
|
||||
G.server.uid_connections[uid]?.refreshPower();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user