qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

release #1

Merged
qixin merged 36 commits from release into master 2024-01-05 08:30:26 +00:00
Conversation 0 Commits 36 Files Changed 47 +13415 -2801
47 changed files with 13415 additions and 2801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js_docker_dev.js
View File

@ -35,7 +35,7 @@ function dockerLogin() {
const region = 'ap-northeast-1';
const instanceId = 'cri-fe5eqsg73zl4vd4m';
const version = '2018-12-01';
const command = `aliyun cr GetAuthorizationToken --profile dev --region ${region} --InstanceId ${instanceId} --version ${version} --force`;
const command = `aliyun cr GetAuthorizationToken --profile heijiao-dev --region ${region} --InstanceId ${instanceId} --version ${version} --force`;
const output = execSync(command, { encoding: 'utf8' });
const result = JSON.parse(output);
const password = result.AuthorizationToken.replace(/"/g, '');

2
js_docker_prod.js
View File

@ -35,7 +35,7 @@ function dockerLogin() {
const region = 'ap-northeast-1';
const instanceId = 'cri-azy285s79zw3ti5v';
const version = '2018-12-01';
const command = `aliyun cr GetAuthorizationToken --profile prod --region ${region} --InstanceId ${instanceId} --version ${version} --force`;
const command = `aliyun cr GetAuthorizationToken --profile heijiao-prod --region ${region} --InstanceId ${instanceId} --version ${version} --force`;
const output = execSync(command, { encoding: 'utf8' });
const result = JSON.parse(output);
const password = result.AuthorizationToken.replace(/"/g, '');

3
src/api_cross/hbzb/jfs/ApiGetEnemy.ts
View File

@ -47,7 +47,8 @@ export default async function (call: ApiCall<ReqGetEnemy, ResGetEnemy>) {
$and: [
{"data.player.power": {$gte: r[0]}},
{"data.player.power": {$lte: r[1]}},
{uid: {$nin: blackUids}}
{uid: {$nin: blackUids}},
{"data.player.sid":user.data.player.sid}
]
}
},

4
src/api_s2c/chat/ApiSend.ts
View File

@ -1,6 +1,6 @@
import { ApiCall, WsClientStatus } from "tsrpc";
import { ActionLog } from '../../public/actionLog/actionLog';
import { ChatFun } from '../../public/chat';
import { ChatFun, getCrossChatGroupByOpenDay } from '../../public/chat';
import { ReqSend, ResSend } from "../../shared/protocols/chat/PtlSend";
import { chatMsgLog } from "../../shared/protocols/type"
import { getGud } from "../../public/gud";
@ -40,6 +40,8 @@ export default async function (call: ApiCall<ReqSend, ResSend>) {
if (sendData.type == 'cross' && G.clientCross?.status == WsClientStatus.Opened) {
//如果是跨服的话，调用跨服API的这条协议
sendData.otherData.group = getCrossChatGroupByOpenDay();
G.clientCross.sendMsg('msg_cross/CrossChat', sendData);
call.succ({});
return;

41
src/api_s2c/conglinshoulie/ApiRec.ts
View File

@ -3,19 +3,56 @@ import { PlayerFun } from '../../public/player';
import { ReqRec, ResRec } from "../../shared/protocols/conglinshoulie/PtlRec";
import { HongDianChange } from "../hongdian/fun";
import { addStar, clslDb } from './ApiOpen';
import { EmailFun } from "../../public/email";
export default async function (call: ApiCall<ReqRec, ResRec>) {
let conf = G.gc.clsl_com.fightWinPrize[call.req.index];
if (!conf) return call.errorCode(-1);
let db = await clslDb().findOne({ uid: call.uid, type: 'clsl' });
let curStar = db?.allStar || 0;
let danPrize = db?.danPrize || [];
let curMaxStar = db?.curMaxStar || 0;
if ((db?.fightWinNum || 0) < conf.total || db?.recWinPrize?.includes(call.req.index)) return call.errorCode(-2);
await PlayerFun.sendPrize(call, conf.prize);
addStar(call, conf.star);
let updata = { $push: { recWinPrize: call.req.index } };
clslDb().updateOne({ uid: call.uid, type: 'clsl' }, { $push: { recWinPrize: call.req.index } });
// 首次达到某个段位
if (curStar + conf.star > curMaxStar) {
curMaxStar += conf.star;
updata["$inc"] = { "curMaxStar": conf.star };
}
// 段位奖励邮件
let title = G.gc.clsl_com.email_dan.title;
let content = G.gc.clsl_com.email_dan.content;
G.gc.clsl_com.danPrize.forEach(conf => {
// 段位未达到 或者 奖励已经发放
if (conf.star > curMaxStar || danPrize.includes(conf.star)) {
return
}
// 发放邮件
EmailFun.addEmail({
uid: call.uid,
type: 'system',
title: title,
content: content,
prize: conf.prize,
contentInsertArr:[conf.title]
})
danPrize.push(conf.star);
updata["$set"] = { danPrize: danPrize };
})
addStar(call, conf.star, undefined, updata);
// clslDb().updateOne({ uid: call.uid, type: 'clsl' }, { $push: { recWinPrize: call.req.index } });
HongDianChange.sendChangeKey(call.uid, ['clslhd'])

5
src/api_s2c/event/pobinglibao/ApiOpen.ts
View File

@ -6,7 +6,6 @@ import {PublicShared} from "../../../shared/public/public";
export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'})
let _hd = (await HuoDongFun.gethdList(call, 10))[0]
if (!_hd) return call.errorCode(-1)
@ -16,9 +15,11 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let payLog: any = await PayFun.getPayLogs(call.uid, payIds)
for (let key in payLog) {
payLog[key]?.filter(i => i.time > _hd.stime && i.time < _hd.etime)
payLog[key] = payLog[key]?.filter(i => i.time > _hd.stime && i.time < _hd.etime)
}
let data = await G.mongodb.cEvent(`pobinglibao${_hd.hdid}`).findOne({uid: call.uid, type: `pobinglibao${_hd.hdid}`})
call.succ({
record: data?.record || {},
buyLog: payLog

94
src/api_s2c/event/pobinglibao/ApiReceive.ts
View File

@ -1,33 +1,89 @@
import {ApiCall} from "tsrpc";
import {ReqReceive, ResReceive} from "../../../shared/protocols/event/pobinglibao/PtlReceive";
import {HuoDongFun} from "../../../public/huodongfun";
import {PlayerFun} from "../../../public/player";
import {HongDianChange} from "../../hongdian/fun";
import {PayFun} from "../../../public/pay";
import { ApiCall } from "tsrpc";
import { ReqReceive, ResReceive } from "../../../shared/protocols/event/pobinglibao/PtlReceive";
import { HuoDongFun } from "../../../public/huodongfun";
import { PlayerFun } from "../../../public/player";
import { HongDianChange } from "../../hongdian/fun";
import { PayFun } from "../../../public/pay";
import { PublicShared } from "../../../shared/public/public";
export default async function (call: ApiCall<ReqReceive, ResReceive>) {
// 查询活动是否有当前领奖的免费选项
let _hd = (await HuoDongFun.gethdList(call, 10))[0]
let gift = _hd?.data?.gift?.find(i => i.id == call.req.id)
if (!gift) return call.errorCode(-1)
// 查询活动是否是可领取状态
let _hd = (await HuoDongFun.gethdList(call, 10))[0]
let prize = [];
let update = {};
// 判断活动是否是最后一天
if (PublicShared.chkSameDate(G.time, _hd.etime)) {
let data = await G.mongodb.cEvent(`pobinglibao${_hd.hdid}`).findOne(
{ uid: call.uid, type: `pobinglibao${_hd.hdid}` }
);
for (let gift of _hd.data.gift) {
// 查询购买状态
let push = [];
let payLog = await PayFun.getPayLog(call.uid, gift.payId)
payLog = payLog?.filter(i => i.time >= _hd.stime && i.time <= _hd.etime) || []
if (!payLog || !payLog.length) return call.errorCode(-2)
if (!payLog || !payLog.length) continue;
for (let key of ["prize", "recPrize1", "recPrize2"]) {
if (!data || !data?.record[gift.id] || !data.record[gift.id].includes(key)) {
push.push(key);
prize.push(...gift[key]);
}
}
if (push.length > 0) {
if (update["$push"]) {
update["$push"]["record." + gift.id] = { $each: push }
} else {
update["$push"] = { ["record." + gift.id]: { $each: push } }
}
}
}
if (!prize.length) {
return call.errorCode(-3)
}
} else {
let gift = _hd?.data?.gift?.find(i => i.id == call.req.id);
if (!gift || !call.req.recId) return call.errorCode(-1);
// 查询购买状态
let payLog = await PayFun.getPayLog(call.uid, gift.payId)
payLog = payLog?.filter(i => i.time >= _hd.stime && i.time <= _hd.etime) || []
if (!payLog || !payLog.length) return call.errorCode(-2);
/**
* 取奖励列表，判断是否有可领取奖励
* 购买日起，每种礼包每天可领一次礼包，每种类型独立
* 活动结束前的最后一天，可领取所有奖励
*/
let data = await G.mongodb.cEvent(`pobinglibao${_hd.hdid}`).findOne(
{ uid: call.uid, type: `pobinglibao${_hd.hdid}` }
)
// 取奖励列表，判断是否有可领取奖励
let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'})
let rec = data?.record?.[call.req.id]?.length
if (rec && (rec >= 3 || data?.record?.[gift.id] == call.req.recId)) return call.errorCode(-3)
await PlayerFun.sendPrize(call, gift[call.req.recId]);
let _payDiff = PublicShared.getDiff(payLog[0].time)
_payDiff = _payDiff > 3 ? 3 : _payDiff
await G.mongodb.cEvent('pobinglibao').updateOne({uid: call.uid, type: 'pobinglibao'}, {
$push: {[`record.${gift.id}`]: call.req.recId},
}, {upsert: true})
if (rec >= _payDiff || data?.record?.[gift.id] == call.req.recId) return call.errorCode(-3)
call.succ({})
prize.push(...gift[call.req.recId]);
update = {
$push: { [`record.${gift.id}`]: call.req.recId },
}
}
await PlayerFun.sendPrize(call, prize);
await G.mongodb.cEvent(`pobinglibao${_hd.hdid}`).updateOne(
{ uid: call.uid, type: `pobinglibao${_hd.hdid}` }, update, { upsert: true }
);
call.succ({ prize: prize });
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

46
src/api_s2c/hongdian/fun.ts
View File

@ -366,22 +366,37 @@ export class HuoDongHongDianFun {
/**破冰礼包红点 */
static async pobinglibao(call: ApiCall, _hd: ReqAddHuoDong): Promise<hongdianVal> {
let gift = _hd?.data?.gift?.find(i => i.free == true && !i.payId)
if (gift) return {show: true}
let payIds = _hd?.data?.gift?.filter(i=>i.payId).map(i=>i.payId)
let payIds = _hd?.data?.gift?.filter(i => i.payId).map(i => i.payId)
let payLogs = await PayFun.getPayLogs(call.uid, payIds)
// 取奖励列表，判断是否有可领取奖励
let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'})
for (let item of _hd?.data?.gift){
let rec = data?.record?.[item.id]?.length
if (item.free== true && !item.payId) return {show: true}
if (payLogs[item.payId]?.length && (!rec || rec < PublicShared.getDiff(payLogs[item.payId][0].time))) return {show: true}
for (let key in payLogs) {
payLogs[key] = payLogs[key]?.filter(i => i.time > _hd.stime && i.time < _hd.etime) || []
}
return {show:false}
// 取奖励列表，判断是否有可领取奖励
let data = await G.mongodb.cEvent(`pobinglibao${_hd.hdid}`).findOne({
uid: call.uid,
type: `pobinglibao${_hd.hdid}`
})
for (let item of _hd?.data?.gift) {
if (item.free == true && !item.payId) return {show: true}
let payLog = payLogs[item.payId]
if (!payLog.length) continue
let rec = data?.record?.[item.id]?.length
let _payDiff = PublicShared.getDiff(payLog[0].time)
_payDiff = _payDiff > 3 ? 3 : _payDiff
let _endDiff = PublicShared.getDiff(_hd.etime)
if ((rec < _payDiff)) return {show: true}
if ((rec < 3 && _endDiff > 0)) return {show: true}
}
return {show: false}
}
/**元旦活动红点 */
@ -641,6 +656,14 @@ export class HuoDongHongDianFun {
if (_mydata?.rec.includes(index)) continue; // 已领取
if (element.gudKey && call.conn.gud[element.gudKey] < element.total) continue; // 未达成
if (!element.gudKey && (_mydata?.rec?.length || 0) < _con.length - 1) continue; // 大奖资格不够
if (element.gudKey == "zhizunyueka") {
let logs = await PayFun.getPayLog(call.uid, "zhizunyueka");
if (logs.length <= 0 || logs.slice(-1)[0].eTime < G.time) {
continue
}
}
_res.show = true;
break;
}
@ -656,7 +679,8 @@ export class HuoDongHongDianFun {
let _con = hdCon.data.tasks;
let db = await G.mongodb.cEvent(_dbType).findOne({uid: call.uid, type: _dbType});
let _mydata = db || {sTime: PublicShared.getToDayZeroTime(G.time), recIndex: []};
let payNum = await PayFun.getPayDaysAllPayNum(call.uid, hdCon.stime, hdCon.etime);
let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, hdCon.stime, hdCon.rtime)) * 10
payNum = payNum - (db?.round || 0) * R.sort((a, b) => b.total - a.total)(hdCon.data.tasks)[0].total
for (let index = 0; index < _con.length; index++) {
const element = _con[index];
if (_mydata.recIndex.includes(index)) continue;

17
src/api_s2c/weiwang/ApiOpen.ts Normal file
View File

@ -0,0 +1,17 @@
import { ApiCall } from "tsrpc";
import { ReqOpen, ResOpen } from "../../shared/protocols/weiwang/PtlOpen";
export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let data = await G.mongodb.collection("weiwang").findOne({ uid: call.uid });
if (!data) {
// 初始化威望数据
data = (await G.mongodb.collection("weiwang").findOneAndUpdate(
{ uid: call.uid },
{ $set: { hp: 0, atk: 0, def: 0 } },
{ upsert: true, returnDocument: "after" }
)).value;
}
call.succ({ lv: { hp: data.hp, atk: data.atk, def: data.def } });
}

94
src/api_s2c/weiwang/ApiUpLv.ts Normal file
View File

@ -0,0 +1,94 @@
import { ApiCall } from "tsrpc";
import { ReqUpLv, ResUpLv } from "../../shared/protocols/weiwang/PtlUpLv";
import { PlayerFun } from "../../public/player";
export default async function (call: ApiCall<ReqUpLv, ResUpLv>) {
let data = await G.mongodb.collection("weiwang").findOne({ uid: call.uid });
if (!data) {
// 初始化威望数据
data = (await G.mongodb.collection("weiwang").findOneAndUpdate(
{ uid: call.uid },
{ $set: { hp: 0, atk: 0, def: 0 } },
{ upsert: true, returnDocument: "after" }
)).value;
}
let cur_lv = data[call.req.type];
let min_lv = Math.min(data.atk, data.def, data.hp);
let ids = Object.keys(G.gc.renown_level).sort(
(a, b) => Number(a) - Number(b)
);
let config;
for (let id of ids) {
config = G.gc.renown_level[id];
if (min_lv < config.maxlevel) {
break;
}
}
// 超过档期威望的最大等级
if (cur_lv + call.req.lv > config.maxlevel) {
return call.error("", { code: -1, message: lng.weiwang_12 });
}
let need = [{ a: config.cost[0].a, t: config.cost[0].t, n: config.cost[0].n * call.req.lv }];
// 检测消耗是否足够
await PlayerFun.checkNeedIsMeet(call, need);
// 扣除消耗
await PlayerFun.cutNeed(call, need);
data[call.req.type] += call.req.lv;
// 重新计算buff
let buff = calc_weiwang_buff(data.atk, data.def, data.hp);
G.mongodb.collection("weiwang").updateOne({ uid: call.uid }, {
$set: { buff: buff },
$inc: { [call.req.type]: call.req.lv },
});
call.succ({ lv: { hp: data.hp, atk: data.atk, def: data.def } });
}
/**
* 计算当前威望buff
*/
function calc_weiwang_buff(atk: number, def: number, hp: number) {
let buff: k_v<number> = {
"hp": 0, "def": 0, "atk": 0
};
let ids = Object.keys(G.gc.renown_level).sort(
(a, b) => Number(a) - Number(b)
);
for (let i = 0; i < ids.length; i++) {
let curr = G.gc.renown_level[ids[i]];
if (i == 0) {
buff["hp"] += curr.hp * Math.min(curr.maxlevel, hp);
buff["atk"] += curr.atk * Math.min(curr.maxlevel, atk);
buff["def"] += curr.def * Math.min(curr.maxlevel, def);
} else {
let prev = G.gc.renown_level[ids[i - 1]];
if (hp > prev.maxlevel) {
buff["hp"] += curr.hp * Math.min(hp - prev.maxlevel, curr.maxlevel - prev.maxlevel);
}
if (atk > prev.maxlevel) {
buff["atk"] += curr.atk * Math.min(atk - prev.maxlevel, curr.maxlevel - prev.maxlevel);
}
if (def > prev.maxlevel) {
buff["def"] += curr.def * Math.min(def - prev.maxlevel, curr.maxlevel - prev.maxlevel);
}
}
}
return buff;
}

14
src/cross/protocols/serviceProto.ts
View File

@ -1316,6 +1316,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwangbuff",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},

42
src/extends.ts
View File

@ -13,7 +13,7 @@ import { ResLogin } from './shared/protocols/user/PtlLogin';
import { HeroShared, otherBuff } from './shared/public/hero';
import { PlayerShared } from './shared/public/player';
import { PublicShared } from './shared/public/public';
import {RankKfjs} from "./public/rank/rank_kfjs";
import { RankKfjs } from "./public/rank/rank_kfjs";
import { setGud } from './public/gud';
export function extendType() {
@ -51,7 +51,7 @@ declare module 'tsrpc' {
/**API 锁 */
apiLock: k_v<number>;
/**获取默认上阵战斗数据 */
getDefaultFightData(def?: k_v<string>): Promise<joinFightData>;
getDefaultFightData(def?: k_v<string>, ext_buff?: { [type: string]: k_v<number> }): Promise<joinFightData>;
/**刷新上阵英雄战力 */
refreshPower(): Promise<any>;
/**玩家计算在线时长时间戳 */
@ -124,7 +124,7 @@ Object.defineProperties(BaseConnection.prototype, {
},
});
BaseConnection.prototype.getDefaultFightData = async function (this: BaseConnection, def?: k_v<string>) {
BaseConnection.prototype.getDefaultFightData = async function (this: BaseConnection, def?: k_v<string>, ext_buff?: { [type: string]: k_v<number> }) {
let posObj = def || this.heroPos;
let roles: k_v<roleDataType> = {};
@ -143,7 +143,11 @@ BaseConnection.prototype.getDefaultFightData = async function (this: BaseConnect
roles[pos] = {
...hero,
attr: {
...HeroShared.getHeroBasicAttr(hero, { ...this.otherBuff, allBuff: HeroShared.getAllBuff(heros) }, Number(pos))
...HeroShared.getHeroBasicAttr(hero, {
...ext_buff,
...this.otherBuff,
allBuff: HeroShared.getAllBuff(heros)
}, Number(pos))
}
};
}
@ -194,34 +198,34 @@ BaseConnection.prototype.refreshPower = async function (this: BaseConnection<Ser
zjBuff.zj_liliang += PublicShared.eval(G.gc.com.zjcz_liliang.value as any as string, { lv: this.gud.lv })
zjBuff.zj_zhishi += PublicShared.eval(G.gc.com.zjcz_zhishi.value as any as string, { lv: this.gud.lv })
// 图鉴属性获取
for(let i = 1; i <= this.gud.tujianLv; i++) {
for (let i = 1; i <= this.gud.tujianLv; i++) {
let item = G.gc.tujian_jc[i]
if(item) {
if (item) {
// 各等级累加
for(let k in item.buff) {
for (let k in item.buff) {
zjBuff[k] += item.buff[k]
}
}
}
// 名望属性加成
if(this.gud.renown > 0) {
if (this.gud.renown > 0) {
let mwConf = G.gc.mw_dj
// 各等级累加
for(let i = 1; i <= this.gud.renown; i++) {
for (let i = 1; i <= this.gud.renown; i++) {
let mwData = mwConf[i]
for(let k in mwData.buff) {
for (let k in mwData.buff) {
zjBuff[k] += mwData.buff[k]
}
}
}
// 训练计划加成
let skillConf = G.gc.xunlianjihua
if(this.gud.skills) {
for(let i in this.gud.skills) {
if (this.gud.skills) {
for (let i in this.gud.skills) {
let item = skillConf[i]
for(let j in zjBuff) {
if((j + 'pro') == item.skill) {
zjBuff[j] += Math.floor(zjBuff[j] * PublicShared.eval(item.v, { slv: this.gud.skills[i]}))
for (let j in zjBuff) {
if ((j + 'pro') == item.skill) {
zjBuff[j] += Math.floor(zjBuff[j] * PublicShared.eval(item.v, { slv: this.gud.skills[i] }))
}
}
}
@ -238,14 +242,14 @@ BaseConnection.prototype.refreshPower = async function (this: BaseConnection<Ser
// console.log(zjBuff)
if (power != this.gud.power) {
let dbUpdate = { power: power };
if(power > this.gud?.maxpower){
if (power > this.gud?.maxpower) {
//记录历史最大战力
//this.gud.maxpower = power;
dbUpdate['maxpower'] = power;
}
//this.gud.power = power;
setGud(this.uid,dbUpdate);
setGud(this.uid, dbUpdate);
G.mongodb.collection('user').updateOne({ uid: this.uid }, { $set: dbUpdate });
this.sendMsg('msg_s2c/PlayerChange', dbUpdate);
@ -310,9 +314,9 @@ ApiCall.prototype.addEventMsg = function (this: ApiCall) {
if (!this.eventMsg[msgName][msgKey]) this.eventMsg[msgName][msgKey] = {};
PublicShared.mergeProperty(this.eventMsg[msgName][msgKey], msg);
} else {
if(doubleApi.includes(this.service?.name) && this.service?.type=='api'&& Object.keys(this.eventMsg[msgName])[0]==Object.keys(msgKey)[0]){
if (doubleApi.includes(this.service?.name) && this.service?.type == 'api' && Object.keys(this.eventMsg[msgName])[0] == Object.keys(msgKey)[0]) {
this.eventMsg[msgName] = msgKey
}else {
} else {
PublicShared.mergeProperty(this.eventMsg[msgName], msgKey);
}
}

679
src/fix_patch/patch_2024.1.4.ts Normal file
View File

@ -0,0 +1,679 @@
import {patchInit} from "../patch";
// import {addGameLog, connGameLogDB} from "../gameLog";
import {MongoClient} from "mongodb";
class Path {
async fun1(a: any) {
hdlist.map(i => {
// @ts-ignore
G.mongodb.collection('hdinfo').updateOne({hdid: i.hdid}, {$set: i}, {upsert: true})
})
}
async run() {
await this.fun1(1);
}
}
async function main() {
await patchInit()
let patch = new Path();
await patch.run();
console.log("逻辑执行完成，等待退出");
setTimeout(function () {
console.log('结束程序');
process.exit();
}, 3000);
}
main();
let hdlist = [
{
"hdid": 102, // 唯一活动id 人才计划
"htype": 1, // 后端唯一识别标识（1：养成目标）
"stype": 101, // 前端唯一识别标识（看前端需要是否修改）
"ttype": 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
"stime": 28, // 活动开始天数
"rtime": 35, // 活动显示结束天数
"etime": 35, // 活动实际结束
"name": "intr_ychd_title_3",
"icon": "dfry_rcjh",
"showtime": "仅供参考，会复写正确值",
"data": {
//轮数抽卡 mfmid 168318
//活动文本描述 0-每日登录 1-每日任务 2-活动任务 3-一次性任务 4-活动商店
intr2: 'intr_yczm_tips_3',
intr4: 'intr_yczm_tips_4',
//活动名称
name: 'intr_ychd_title_3',
//活动icon
icon: 'icon_ydlb',
//页签名称 0-每日登录 1-每日任务 2-活动任务 3-一次性任务 4-活动商店
tab2: 'intr_ychd_tab_name_4',
tab4: 'intr_ychd_tab_name_5',
//界面跳转 0-每日登录 1-每日任务 2-活动任务 3-一次性任务 4-活动商店
'2': '9',
//礼包
gift: [
{
index: 0,
need: [{'a': 'attr', t: 'rmbmoney', 'n': 0}],
free: true,
payId: '',
buyNum: 1,
prize: [{'a': 'item', 't': '4', 'n': 5}]
},
{
index: 1,
need: [],
free: false,
payId: 'ycmb_2_1',
buyNum: 1,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 300}, {
'a': 'attr',
't': 'rmbmoney',
'n': 300
}, {'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '4', 'n': 5}]
},
{
index: 2,
need: [],
free: false,
payId: 'ycmb_2_2',
buyNum: 1,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 680}, {
'a': 'attr',
't': 'rmbmoney',
'n': 680
}, {'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '4', 'n': 10}]
},
{
index: 3,
need: [],
free: false,
payId: 'ycmb_2_3',
buyNum: 1,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 1280}, {
'a': 'attr',
't': 'rmbmoney',
'n': 1280
}, {'a': 'item', 't': '4', 'n': 25}, {'a': 'item', 't': '4', 'n': 25}]
},
{
index: 4,
need: [],
free: false,
payId: 'ycmb_2_4',
buyNum: 3,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 3280}, {
'a': 'attr',
't': 'rmbmoney',
'n': 3280
}, {'a': 'item', 't': '4', 'n': 50}, {'a': 'item', 't': '4', 'n': 50}]
},
{
index: 4,
need: [],
free: false,
payId: 'ycmb_2_5',
buyNum: 10,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 6480}, {
'a': 'attr',
't': 'rmbmoney',
'n': 6480
}, {'a': 'item', 't': '4', 'n': 100}, {'a': 'item', 't': '4', 'n': 100}]
}
],
//任务相关 type 1 每日任务（每天刷新） 2 活动任务（轮数） 3 每日登录 4-一次性任务 任务hdid一定要唯一
maxlun: [[2], 5],
tasklist: {
'2': {
'2001': {
'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 50,
'cond': [],
'stype': 118
},
'2002': {
'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 100,
'cond': [],
'stype': 118
},
'2003': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 200,
'cond': [],
'stype': 118
},
'2004': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 250,
'cond': [],
'stype': 118
},
'2005': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 300,
'cond': [],
'stype': 118
},
'2006': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 400,
'cond': [],
'stype': 118
},
'2007': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 500,
'cond': [],
'stype': 118
}
}
}
}
},
{
"hdid": 103, // 唯一活动id 人才计划
"htype": 1, // 后端唯一识别标识（1：养成目标）
"stype": 101, // 前端唯一识别标识（看前端需要是否修改）
"ttype": 0, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
"stime": 42, // 活动开始天数
"rtime": 49, // 活动显示结束天数
"etime": 49, // 活动实际结束
"name": "intr_ychd_title_3",
"icon": "dfry_rcjh",
"showtime": "仅供参考，会复写正确值",
"data": {
//轮数抽卡 mfmid 168318
//活动文本描述 0-每日登录 1-每日任务 2-活动任务 3-一次性任务 4-活动商店
intr2: 'intr_yczm_tips_3',
intr4: 'intr_yczm_tips_4',
//活动名称
name: 'intr_ychd_title_3',
//活动icon
icon: 'icon_ydlb',
//页签名称 0-每日登录 1-每日任务 2-活动任务 3-一次性任务 4-活动商店
tab2: 'intr_ychd_tab_name_4',
tab4: 'intr_ychd_tab_name_5',
//界面跳转 0-每日登录 1-每日任务 2-活动任务 3-一次性任务 4-活动商店
'2': '9',
//礼包
gift: [
{
index: 0,
need: [{'a': 'attr', t: 'rmbmoney', 'n': 0}],
free: true,
payId: '',
buyNum: 1,
prize: [{'a': 'item', 't': '4', 'n': 5}]
},
{
index: 1,
need: [],
free: false,
payId: 'ycmb_2_1',
buyNum: 1,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 300}, {
'a': 'attr',
't': 'rmbmoney',
'n': 300
}, {'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '4', 'n': 5}]
},
{
index: 2,
need: [],
free: false,
payId: 'ycmb_2_2',
buyNum: 1,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 680}, {
'a': 'attr',
't': 'rmbmoney',
'n': 680
}, {'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '4', 'n': 10}]
},
{
index: 3,
need: [],
free: false,
payId: 'ycmb_2_3',
buyNum: 1,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 1280}, {
'a': 'attr',
't': 'rmbmoney',
'n': 1280
}, {'a': 'item', 't': '4', 'n': 25}, {'a': 'item', 't': '4', 'n': 25}]
},
{
index: 4,
need: [],
free: false,
payId: 'ycmb_2_4',
buyNum: 3,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 3280}, {
'a': 'attr',
't': 'rmbmoney',
'n': 3280
}, {'a': 'item', 't': '4', 'n': 50}, {'a': 'item', 't': '4', 'n': 50}]
},
{
index: 4,
need: [],
free: false,
payId: 'ycmb_2_5',
buyNum: 10,
prize: [{'a': 'attr', 't': 'rmbmoney', 'n': 6480}, {
'a': 'attr',
't': 'rmbmoney',
'n': 6480
}, {'a': 'item', 't': '4', 'n': 100}, {'a': 'item', 't': '4', 'n': 100}]
}
],
//任务相关 type 1 每日任务（每天刷新） 2 活动任务（轮数） 3 每日登录 4-一次性任务 任务hdid一定要唯一
maxlun: [[2], 5],
tasklist: {
'2': {
'2001': {
'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 50,
'cond': [],
'stype': 118
},
'2002': {
'prize': [{'a': 'item', 't': '4', 'n': 5}, {'a': 'item', 't': '626', 'n': 10}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 100,
'cond': [],
'stype': 118
},
'2003': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 200,
'cond': [],
'stype': 118
},
'2004': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 250,
'cond': [],
'stype': 118
},
'2005': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 20}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 300,
'cond': [],
'stype': 118
},
'2006': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 400,
'cond': [],
'stype': 118
},
'2007': {
'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
'tujing': '',
'title': 'intr_yczm_day_des_2',
'type': 2,
'pval': 500,
'cond': [],
'stype': 118
}
}
}
}
},
{
"hdid": 2002, // 唯一活动id 掉落兑换活动
"htype": 2, // 后端唯一识别标识
"stype": 200, // 前端唯一识别标识（看前端需要是否修改）
"ttype": 1, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
"stime": 35, // 活动开始天数
"rtime": 42, // 活动显示结束天数
"etime": 42, // 活动实际结束
"name": "diaoluoduihuan",
"icon": "icon_ywtx",
"showtime": "仅供参考，会复写正确值",
"data": {
//对应mfm 14701
diaoluo: [
//掉落的物品
{
a: 'item',
t: '50',
n: 4,
p: 10,
s: 3600
}
],
tiaozhuan: 3,
event: {
itemId: '50',
duihuan: [
{need: [{a: 'item', t: '50', n: 6000}], prize: [{a: 'item', t: '610', n: 1}], num: 2},
{
need: [{a: 'item', t: '50', n: 3500}],
prize: [{a: 'item', t: '600', n: 80}, {a: 'item', t: '12', n: 20000}],
num: 4
},
{
need: [{a: 'item', t: '50', n: 1200}],
prize: [{a: 'item', t: '600', n: 20}, {a: 'item', t: '609', n: 1}, {a: 'item', t: '4', n: 20}],
num: 1
},
{
need: [{a: 'item', t: '50', n: 1500}],
prize: [{a: 'item', t: '611', n: 1}, {a: 'item', t: '624', n: 50}],
num: 1
},
{need: [{a: 'item', t: '50', n: 350}], prize: [{a: 'item', t: '607', n: 20}], num: 1},
{need: [{a: 'item', t: '50', n: 350}], prize: [{a: 'item', t: '600', n: 5}], num: 1},
{need: [{a: 'item', t: '50', n: 100}], prize: [{a: 'item', t: '4', n: 1}], num: 99},
{need: [{a: 'item', t: '50', n: 10}], prize: [{a: 'item', t: '12', n: 25}], num: 99},
{need: [{a: 'item', t: '50', n: 2}], prize: [{a: 'item', t: '2', n: 10}], num: 99},
],
shop: [
{
need: [{a: 'attr', t: 'rmbmoney', n: 0}],
prize: [{a: 'attr', t: 'rmbmoney', n: 500}],
num: 1,
free: true
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 800}],
prize: [{a: 'item', t: '4', n: 5}, {a: 'item', t: '2', n: 1000}],
num: 1,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 2250}],
prize: [{a: 'item', t: '4', n: 10}, {a: 'item', t: '12', n: 2000}],
num: 1,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '12', n: 6000}],
num: 1,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '2', n: 12000}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '9', n: 6000}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '10', n: 300}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '612', n: 20}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 20000}],
prize: [{a: 'item', t: '607', n: 40}, {a: 'item', t: '600', n: 40}],
num: 4,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '624', n: 20}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '629', n: 20}],
num: 3,
free: false
},
],
gift: [
{
payId: '',
num: 1,
prize: [{a: 'item', t: '50', n: 20}, {a: 'attr', t: 'rmbmoney', n: 200}],
free: true
},
{
payId: 'duihuan_1_1',
prize: [{a: 'item', t: '50', n: 50}, {a: 'attr', t: 'rmbmoney', n: 600}],
free: false
},
{
payId: 'duihuan_1_2',
prize: [{a: 'item', t: '50', n: 100}, {a: 'attr', t: 'rmbmoney', n: 1360}],
free: false
},
{
payId: 'duihuan_1_3',
prize: [{a: 'item', t: '50', n: 200}, {a: 'attr', t: 'rmbmoney', n: 2560}],
free: false
},
{
payId: 'duihuan_1_4',
prize: [{a: 'item', t: '50', n: 600}, {a: 'attr', t: 'rmbmoney', n: 6560}],
free: false
},
{
payId: 'duihuan_1_5',
prize: [{a: 'item', t: '50', n: 1200}, {a: 'attr', t: 'rmbmoney', n: 12960}],
free: false
},
]
}
}
},
{
"hdid": 2003, // 唯一活动id 掉落兑换活动
"htype": 2, // 后端唯一识别标识
"stype": 200, // 前端唯一识别标识（看前端需要是否修改）
"ttype": 1, // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
"stime": 49, // 活动开始天数
"rtime": 56, // 活动显示结束天数
"etime": 56, // 活动实际结束
"name": "diaoluoduihuan",
"icon": "icon_ywtx",
"showtime": "仅供参考，会复写正确值",
"data": {
//对应mfm 14701
diaoluo: [
//掉落的物品
{
a: 'item',
t: '50',
n: 4,
p: 10,
s: 3600
}
],
tiaozhuan: 3,
event: {
itemId: '50',
duihuan: [
{need: [{a: 'item', t: '50', n: 6000}], prize: [{a: 'item', t: '610', n: 1}], num: 2},
{
need: [{a: 'item', t: '50', n: 3500}],
prize: [{a: 'item', t: '600', n: 80}, {a: 'item', t: '12', n: 20000}],
num: 4
},
{
need: [{a: 'item', t: '50', n: 1200}],
prize: [{a: 'item', t: '600', n: 20}, {a: 'item', t: '609', n: 1}, {a: 'item', t: '4', n: 20}],
num: 1
},
{
need: [{a: 'item', t: '50', n: 1500}],
prize: [{a: 'item', t: '611', n: 1}, {a: 'item', t: '624', n: 50}],
num: 1
},
{need: [{a: 'item', t: '50', n: 350}], prize: [{a: 'item', t: '607', n: 20}], num: 1},
{need: [{a: 'item', t: '50', n: 350}], prize: [{a: 'item', t: '600', n: 5}], num: 1},
{need: [{a: 'item', t: '50', n: 100}], prize: [{a: 'item', t: '4', n: 1}], num: 99},
{need: [{a: 'item', t: '50', n: 10}], prize: [{a: 'item', t: '12', n: 25}], num: 99},
{need: [{a: 'item', t: '50', n: 2}], prize: [{a: 'item', t: '2', n: 10}], num: 99},
],
shop: [
{
need: [{a: 'attr', t: 'rmbmoney', n: 0}],
prize: [{a: 'attr', t: 'rmbmoney', n: 500}],
num: 1,
free: true
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 800}],
prize: [{a: 'item', t: '4', n: 5}, {a: 'item', t: '2', n: 1000}],
num: 1,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 2250}],
prize: [{a: 'item', t: '4', n: 10}, {a: 'item', t: '12', n: 2000}],
num: 1,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '12', n: 6000}],
num: 1,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '2', n: 12000}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '9', n: 6000}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '10', n: 300}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '612', n: 20}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 20000}],
prize: [{a: 'item', t: '607', n: 40}, {a: 'item', t: '600', n: 40}],
num: 4,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '624', n: 20}],
num: 3,
free: false
},
{
need: [{a: 'attr', t: 'rmbmoney', n: 3000}],
prize: [{a: 'item', t: '629', n: 20}],
num: 3,
free: false
},
],
gift: [
{
payId: '',
num: 1,
prize: [{a: 'item', t: '50', n: 20}, {a: 'attr', t: 'rmbmoney', n: 200}],
free: true
},
{
payId: 'duihuan_1_1',
prize: [{a: 'item', t: '50', n: 50}, {a: 'attr', t: 'rmbmoney', n: 600}],
free: false
},
{
payId: 'duihuan_1_2',
prize: [{a: 'item', t: '50', n: 100}, {a: 'attr', t: 'rmbmoney', n: 1360}],
free: false
},
{
payId: 'duihuan_1_3',
prize: [{a: 'item', t: '50', n: 200}, {a: 'attr', t: 'rmbmoney', n: 2560}],
free: false
},
{
payId: 'duihuan_1_4',
prize: [{a: 'item', t: '50', n: 600}, {a: 'attr', t: 'rmbmoney', n: 6560}],
free: false
},
{
payId: 'duihuan_1_5',
prize: [{a: 'item', t: '50', n: 1200}, {a: 'attr', t: 'rmbmoney', n: 12960}],
free: false
},
]
}
}
},
]

2
src/globalListener.ts
View File

@ -19,6 +19,7 @@ import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen";
import {Christmasfun} from "./api_s2c/event/christmas/fun";
import {PushGiftFun} from "./public/pushgift";
import {LeiChongLiBaoBuyGift} from "./api_s2c/event/leichonglibao/ApiReceive";
import { HongDianChange } from './api_s2c/hongdian/fun';
export type gEventType = {
/**玩家断开连接 */
@ -203,6 +204,7 @@ export function addListener() {
);
await PushGiftFun.buy(player.uid, payId) // 推送礼包
await LeiChongLiBaoBuyGift(call, payId) // 累充礼包
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
});
G.on("FIRST_LOGIN_EVERY_DAY", (gud, lastTime, curTime) => {

52
src/json/attr.json
View File

@ -2,7 +2,7 @@
"jinbi": {
"id": "jinbi",
"name": "intr_attr_name_1",
"undefined": "美金",
"undefined": "通用货币，能购买大多数商品",
"colour": 3,
"icon": "icon_jinbi",
"sicon": "icon_jinbi",
@ -12,7 +12,7 @@
"rmbmoney": {
"id": "rmbmoney",
"name": "intr_attr_name_2",
"undefined": "钻石",
"undefined": "稀有货币，没有人可以抗拒它",
"colour": 5,
"icon": "icon_zuanshi",
"sicon": "icon_zuanshi",
@ -22,7 +22,7 @@
"nexp": {
"id": "nexp",
"name": "intr_attr_name_3",
"undefined": "主角经验",
"undefined": "用于提升主角等级",
"colour": 4,
"icon": "icon_zjjy",
"sicon": "icon_zjjy",
@ -32,7 +32,7 @@
"rongyu": {
"id": "rongyu",
"name": "intr_attr_name_4",
"undefined": "荣誉勋章",
"undefined": "荣誉的象征，可以在荣誉商店兑换道具",
"colour": 4,
"icon": "icon_rongyu",
"sicon": "icon_rongyu",
@ -42,7 +42,7 @@
"payExp": {
"id": "payExp",
"name": "intr_attr_name_5",
"undefined": "VIP经验",
"undefined": "稀有货币，没有人可以抗拒它",
"colour": 5,
"icon": "icon_gzjy",
"sicon": "icon_gzjy",
@ -52,7 +52,7 @@
"guijinshu": {
"id": "guijinshu",
"name": "intr_attr_name_6",
"undefined": "贵金属",
"undefined": "通过精炼饰品获得的稀有贵金属，可以在饰品商店兑换饰品",
"colour": 3,
"icon": "icon_xyjsh",
"sicon": "icon_xyjsh",
@ -62,7 +62,7 @@
"shilifrd": {
"id": "shilifrd",
"name": "intr_attr_name_11",
"undefined": "势力繁荣度",
"undefined": "势力的繁荣度越高，势力等级越高",
"colour": 4,
"icon": "icon_slfrd",
"sicon": "icon_slfrd",
@ -72,7 +72,7 @@
"clsl_sd": {
"id": "clsl_sd",
"name": "intr_attr_name_12",
"undefined": "丛林狩猎胜点",
"undefined": "丛林狩猎的段位胜点，胜点数量足够后可进阶",
"colour": 5,
"icon": "icon_clsl_xx",
"sicon": "icon_clsl_xx",
@ -82,7 +82,7 @@
"nahanzhuwei": {
"id": "nahanzhuwei",
"name": "tlsd_guess_name_1",
"undefined": "呐喊助威",
"undefined": "参与竞猜后获得莱微碎片*1和美金*500000",
"colour": 5,
"icon": "icon_heroBox_11",
"sicon": "icon_heroBox_11",
@ -92,7 +92,7 @@
"aidebaobao": {
"id": "aidebaobao",
"name": "tlsd_guess_name_2",
"undefined": "爱的抱抱",
"undefined": "参与竞猜后获得莱微碎片*1,配件蓝图*1和美金*800000",
"colour": 5,
"icon": "icon_heroBox_11",
"sicon": "icon_heroBox_11",
@ -102,7 +102,7 @@
"woweishenkuang": {
"id": "woweishenkuang",
"name": "tlsd_guess_name_3",
"undefined": "我为神狂",
"undefined": "参与竞猜后获得莱微碎片*1,配件蓝图*3和美金*1000000",
"colour": 5,
"icon": "icon_heroBox_11",
"sicon": "icon_heroBox_11",
@ -112,7 +112,7 @@
"shengdanExp": {
"id": "shengdanExp",
"name": "intr_attr_name_13",
"undefined": "圣诞战令经验",
"undefined": "一年一度的圣诞庆典获得的圣诞欢乐值，可以提升庆典圣诞树奖励进度",
"colour": 5,
"icon": "icon_sdhd_item_1",
"sicon": "icon_sdhd_item_1",
@ -122,7 +122,7 @@
"shengdanBullet": {
"id": "shengdanBullet",
"name": "intr_attr_name_14",
"undefined": "圣诞打靶币",
"undefined": "圣诞活动获得的庆典喷漆，可以在“百发百中”兑换射击次数",
"colour": 5,
"icon": "icon_chegaipq",
"sicon": "icon_chegaipq",
@ -132,7 +132,7 @@
"jingxuanbi": {
"id": "jingxuanbi",
"name": "intr_attr_name_15",
"undefined": "每日精选兑换币",
"undefined": "只能在黑市使用的票券，可以在黑市里的每日精选兑换商店购买稀有道具",
"colour": 4,
"icon": "icon_hspj",
"sicon": "icon_hspj",
@ -142,7 +142,7 @@
"weiwang": {
"id": "weiwang",
"name": "intr_attr_name_16",
"undefined": "影响力",
"undefined": "影响力提升了周围同伴的信任，可以在影响力系统中提升属性值",
"colour": 4,
"icon": "icon_weiwang",
"sicon": "icon_weiwang",
@ -152,11 +152,31 @@
"yuandanyouxi": {
"id": "yuandanyouxi",
"name": "intr_attr_name_17",
"undefined": "元旦游戏币",
"undefined": "在新年活动中获得的庆典币，可以在机遇礼盒兑换游玩次数",
"colour": 5,
"icon": "icon_xnjb",
"sicon": "icon_xnjb",
"describe": "intr_attr_describe_17",
"advancedEffects": "ani_xiangzikuang"
},
"huangqijinbi": {
"id": "huangqijinbi",
"name": "intr_attr_name_18",
"undefined": "在黄旗酒馆活动中获得的庆典币，可以在黄旗招募中兑换招募次数",
"colour": 5,
"icon": "icon_hqjb",
"sicon": "icon_hqjb",
"describe": "intr_attr_describe_18",
"advancedEffects": "ani_xiangzikuang"
},
"huangqiduihuan": {
"id": "huangqiduihuan",
"name": "intr_attr_name_19",
"undefined": "在黄旗酒馆活动中获得的兑换票券，可以在神秘兑换中购买商品",
"colour": 5,
"icon": "icon_hqdhq",
"sicon": "icon_hqdhq",
"describe": "intr_attr_describe_19",
"advancedEffects": "ani_xiangzikuang"
}
}

88
src/json/diaoluo.json
View File

@ -2774,7 +2774,7 @@
"id": 4003,
"a": "item",
"t": 28,
"n": 1,
"n": 100,
"p": 6
},
{
@ -4505,82 +4505,12 @@
}
],
"10021": [
{
"id": 10021,
"a": "hero",
"t": 4001,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4002,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4003,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4004,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4005,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4007,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4009,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4011,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4012,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4014,
"n": 1,
"p": 20
},
{
"id": 10021,
"a": "hero",
"t": 4015,
"n": 1,
"p": 20
}
],
"20001": [
@ -8568,6 +8498,22 @@
"p": 1
}
],
"50062": [
{
"id": 50062,
"a": "item",
"t": 5002,
"n": 10,
"p": 1
},
{
"id": 50062,
"a": "item",
"t": 5004,
"n": 10,
"p": 1
}
],
"60001": [
{
"id": 60001,

31
src/json/guideConfig.json
View File

@ -1925,6 +1925,37 @@
"initiative": 1,
"location": 1
},
"186": {
"id": 186,
"triggerType": "openCond",
"typeId": "weiwang",
"Type": "finger",
"path": "Canvas/draw/uiRoot/uiView_mainMenu/mainMenu/btnLayout/zd",
"undefined": "点探险",
"initiative": 1,
"location": 2
},
"187": {
"id": 187,
"triggerType": "openCond",
"typeId": "weiwang",
"Type": "finger",
"path": "Canvas/draw/uiRoot/uiView_tanxian/tanxian/tx_map1/btn_ww",
"undefined": "点影响力按钮",
"initiative": 1,
"location": 1
},
"188": {
"id": 188,
"triggerType": "openCond",
"typeId": "weiwang",
"Type": "finger",
"path": "Canvas/draw/uiRoot/uiView_weiwang/weiwang/xia/shengji/btn_sj",
"undefined": "点升级按钮",
"initiative": 1,
"location": 1,
"filter": "loop_openConfGuideEnd"
},
"20001": {
"id": 20001,
"triggerType": "lose",

2
src/json/hbzb.json5
View File

@ -12,7 +12,7 @@
//积分赛vip等级对应的可购买挑战次数
jfsBuyFightNum: [3, 5, 7, 9, 12, 15, 18, 21, 24, 27, 30, 33, 35, 36, 38, 40, 42, 50],
//积分赛每日免费刷新次数
jfsRefreshNum: 0,
jfsRefreshNum: 15,
//积分赛每日免费刷新次数使用完后的刷新消耗
jfsRefreshNeed: [{a: 'attr', t: 'rmbmoney', n: 20}],
//积分赛购买挑战次数对应的消耗

138
src/json/heroSkin.json Normal file
View File

@ -0,0 +1,138 @@
{
"40021": {
"id": 40021,
"heroId": 4002,
"name": "heroSkin_name_6",
"undefined": "龙行天下",
"model": 40021,
"card": 40021,
"head": 40021,
"colour": 4,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_cheng",
"n": 10
}
]
},
"40061": {
"id": 40061,
"heroId": 4006,
"name": "heroSkin_name_7",
"undefined": "假面魅姬",
"model": 40061,
"card": 40061,
"head": 40061,
"colour": 4,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_cheng",
"n": 10
}
]
},
"40071": {
"id": 40071,
"heroId": 4007,
"name": "heroSkin_name_8",
"undefined": "樱花之舞",
"model": 40071,
"card": 40071,
"head": 40071,
"colour": 4,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_cheng",
"n": 10
}
]
},
"50011": {
"id": 50011,
"heroId": 5001,
"name": "heroSkin_name_1",
"undefined": "兔女郎",
"model": 50011,
"card": 50011,
"head": 50011,
"colour": 5,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_hong",
"n": 10
}
]
},
"50021": {
"id": 50021,
"heroId": 5002,
"name": "heroSkin_name_2",
"undefined": "大尉之风",
"model": 50021,
"card": 50021,
"head": 50021,
"colour": 5,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_hong",
"n": 10
}
]
},
"50031": {
"id": 50031,
"heroId": 5003,
"name": "heroSkin_name_3",
"undefined": "西装暴徒",
"model": 50031,
"card": 50031,
"head": 50031,
"colour": 5,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_hong",
"n": 10
}
]
},
"50041": {
"id": 50041,
"heroId": 5004,
"name": "heroSkin_name_4",
"undefined": "浪客剑心",
"model": 50041,
"card": 50041,
"head": 50041,
"colour": 5,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_hong",
"n": 10
}
]
},
"50051": {
"id": 50051,
"heroId": 5005,
"name": "heroSkin_name_5",
"undefined": "猎犬出动",
"model": 50051,
"card": 50051,
"head": 50051,
"colour": 5,
"zhuanhuan": [
{
"a": "item",
"t": "icon_pifucailiao_hong",
"n": 10
}
]
}
}

784
src/json/heroSkinLv.json Normal file
View File

@ -0,0 +1,784 @@
{
"4": {
"1": {
"colour": 4,
"lv": 1,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8000
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.008
}
},
"2": {
"colour": 4,
"lv": 2,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8001
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.009
}
},
"3": {
"colour": 4,
"lv": 3,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8002
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.01
}
},
"4": {
"colour": 4,
"lv": 4,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8003
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.011
}
},
"5": {
"colour": 4,
"lv": 5,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8004
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.012
}
},
"6": {
"colour": 4,
"lv": 6,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8005
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.013
}
},
"7": {
"colour": 4,
"lv": 7,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8006
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.014
}
},
"8": {
"colour": 4,
"lv": 8,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8007
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.015
}
},
"9": {
"colour": 4,
"lv": 9,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8008
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.016
}
},
"10": {
"colour": 4,
"lv": 10,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8009
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.017
}
},
"11": {
"colour": 4,
"lv": 11,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8010
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.018
}
},
"12": {
"colour": 4,
"lv": 12,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8011
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.019
}
},
"13": {
"colour": 4,
"lv": 13,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8012
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.02
}
},
"14": {
"colour": 4,
"lv": 14,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8013
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.021
}
},
"15": {
"colour": 4,
"lv": 15,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8014
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.022
}
},
"16": {
"colour": 4,
"lv": 16,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8015
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.023
}
},
"17": {
"colour": 4,
"lv": 17,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8016
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.024
}
},
"18": {
"colour": 4,
"lv": 18,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8017
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.025
}
},
"19": {
"colour": 4,
"lv": 19,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8018
}
],
"buff": {
"atk": 30,
"baoshangpro": 0.026
}
},
"20": {
"colour": 4,
"lv": 20,
"need": [],
"buff": {
"atk": 30,
"baoshangpro": 0.027
}
}
},
"5": {
"1": {
"colour": 5,
"lv": 1,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8000
}
],
"buff": {
"def": 30,
"maxdps": 20
}
},
"2": {
"colour": 5,
"lv": 2,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8001
}
],
"buff": {
"def": 30,
"maxdps": 21
}
},
"3": {
"colour": 5,
"lv": 3,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8002
}
],
"buff": {
"def": 30,
"maxdps": 22
}
},
"4": {
"colour": 5,
"lv": 4,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8003
}
],
"buff": {
"def": 30,
"maxdps": 23
}
},
"5": {
"colour": 5,
"lv": 5,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8004
}
],
"buff": {
"def": 30,
"maxdps": 24
}
},
"6": {
"colour": 5,
"lv": 6,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8005
}
],
"buff": {
"def": 30,
"maxdps": 25
}
},
"7": {
"colour": 5,
"lv": 7,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8006
}
],
"buff": {
"def": 30,
"maxdps": 26
}
},
"8": {
"colour": 5,
"lv": 8,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8007
}
],
"buff": {
"def": 30,
"maxdps": 27
}
},
"9": {
"colour": 5,
"lv": 9,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8008
}
],
"buff": {
"def": 30,
"maxdps": 28
}
},
"10": {
"colour": 5,
"lv": 10,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8009
}
],
"buff": {
"def": 30,
"maxdps": 29
}
},
"11": {
"colour": 5,
"lv": 11,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8010
}
],
"buff": {
"def": 30,
"maxdps": 30
}
},
"12": {
"colour": 5,
"lv": 12,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8011
}
],
"buff": {
"def": 30,
"maxdps": 31
}
},
"13": {
"colour": 5,
"lv": 13,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8012
}
],
"buff": {
"def": 30,
"maxdps": 32
}
},
"14": {
"colour": 5,
"lv": 14,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8013
}
],
"buff": {
"def": 30,
"maxdps": 33
}
},
"15": {
"colour": 5,
"lv": 15,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8014
}
],
"buff": {
"def": 30,
"maxdps": 34
}
},
"16": {
"colour": 5,
"lv": 16,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8015
}
],
"buff": {
"def": 30,
"maxdps": 35
}
},
"17": {
"colour": 5,
"lv": 17,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8016
}
],
"buff": {
"def": 30,
"maxdps": 36
}
},
"18": {
"colour": 5,
"lv": 18,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8017
}
],
"buff": {
"def": 30,
"maxdps": 37
}
},
"19": {
"colour": 5,
"lv": 19,
"need": [
{
"a": "attr",
"t": "rmbmoney",
"n": 10
},
{
"a": "attr",
"t": "jinbi",
"n": 8018
}
],
"buff": {
"def": 30,
"maxdps": 38
}
},
"20": {
"colour": 5,
"lv": 20,
"need": [],
"buff": {
"def": 30,
"maxdps": 39
}
}
}
}

2524
src/json/huodong.json5
View File

File diff suppressed because it is too large Load Diff

123
src/json/item.json
View File

@ -2111,6 +2111,25 @@
"payId": "",
"advancedEffects": "ani_xiangzihong"
},
"638": {
"id": 638,
"name": "intr_item_name_638",
"undefined": "使用后可以随机获得巴拉莱卡、罗贝尔特中的10个碎片",
"type": 2,
"sort": 1,
"colour": 5,
"way": [],
"go": "",
"icon": "icon_equipBox_8",
"sicon": "icon_equipBox_8",
"describe": "intr_item_describe_638",
"diaoluo": 50062,
"useNeed": [],
"usePrize": [],
"selecPrize": [],
"payId": "",
"advancedEffects": "ani_xiangzikuang"
},
"1001": {
"id": 1001,
"name": "intr_item_name_1001",
@ -3842,7 +3861,7 @@
"50001": {
"id": 50001,
"name": "playerheadFrame_name_3",
"undefined": "使用后解锁头像框“火力覆盖”",
"undefined": "使用后解锁头像框“火力覆盖”，解锁后防御加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -3861,7 +3880,7 @@
"50002": {
"id": 50002,
"name": "playerheadFrame_name_4",
"undefined": "使用后解锁头像框“双枪”",
"undefined": "使用后解锁头像框“双枪”，解锁后攻击加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -3880,7 +3899,7 @@
"50003": {
"id": 50003,
"name": "playerheadFrame_name_6",
"undefined": "使用后解锁头像框“武装炫耀”",
"undefined": "使用后解锁头像框“武装炫耀”，解锁后攻击加成+1%、生命加成+1%（限时7天）",
"type": 7,
"sort": 1,
"colour": 4,
@ -3899,7 +3918,7 @@
"50004": {
"id": 50004,
"name": "playerheadFrame_name_7",
"undefined": "使用后解锁头像框“血海”",
"undefined": "使用后解锁头像框“血海”，解锁后攻击加成+1%、生命加成+1%（限时7天）",
"type": 7,
"sort": 1,
"colour": 4,
@ -3918,7 +3937,7 @@
"50005": {
"id": 50005,
"name": "playerheadFrame_name_8",
"undefined": "使用后解锁头像框“边界感”",
"undefined": "使用后解锁头像框“破笼而出”，解锁后伤害加成+2%（限时7天）",
"type": 7,
"sort": 1,
"colour": 4,
@ -3937,7 +3956,7 @@
"50006": {
"id": 50006,
"name": "playerheadFrame_name_9",
"undefined": "使用后解锁头像框“破笼而出”",
"undefined": "使用后解锁头像框“擂台”，解锁后防御加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -3956,7 +3975,7 @@
"50007": {
"id": 50007,
"name": "playerheadFrame_name_10",
"undefined": "使用后解锁头像框“破土而出”",
"undefined": "使用后解锁头像框“破土而出”，解锁后攻击加成+1%、生命加成+1%（限时7天）",
"type": 7,
"sort": 1,
"colour": 4,
@ -3975,7 +3994,7 @@
"50008": {
"id": 50008,
"name": "playerheadFrame_name_11",
"undefined": "使用后解锁头像框“赠礼”",
"undefined": "使用后解锁头像框“赠礼”，解锁后攻击加成+1%、生命加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -3994,7 +4013,7 @@
"50009": {
"id": 50009,
"name": "playerheadFrame_name_23",
"undefined": "使用后解锁头像框“圣诞氛围”",
"undefined": "使用后解锁头像框“圣诞氛围”，解锁后防御加成+1%，解锁后生命加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4013,7 +4032,7 @@
"50010": {
"id": 50010,
"name": "playerheadFrame_name_24",
"undefined": "使用后解锁头像框“披星戴月”",
"undefined": "使用后解锁头像框“披星戴月”，解锁后伤害加成+1%（限时7天）",
"type": 7,
"sort": 1,
"colour": 4,
@ -4032,7 +4051,7 @@
"50011": {
"id": 50011,
"name": "playerheadFrame_name_25",
"undefined": "使用后解锁头像框“新春安宁”",
"undefined": "使用后解锁头像框“新春安宁”，解锁后生命加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4051,7 +4070,7 @@
"50101": {
"id": 50101,
"name": "playerChatFrame_name_6",
"undefined": "使用后解锁聊天框“冰天雪地”",
"undefined": "使用后解锁聊天框“冰天雪地”，解锁后攻击加成+1%、生命加成+1%（限时7天）",
"type": 8,
"sort": 1,
"colour": 4,
@ -4070,7 +4089,7 @@
"50102": {
"id": 50102,
"name": "playerChatFrame_name_7",
"undefined": "使用后解锁聊天框“海浪奔涌”",
"undefined": "使用后解锁聊天框“海浪奔涌”，解锁后防御加成+1%",
"type": 8,
"sort": 1,
"colour": 4,
@ -4089,7 +4108,7 @@
"50103": {
"id": 50103,
"name": "playerheadFrame_name_15",
"undefined": "使用后解锁头像框“名扬四海”",
"undefined": "使用后解锁头像框“名扬四海”，解锁后伤害加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4108,7 +4127,7 @@
"50104": {
"id": 50104,
"name": "playerChatFrame_name_8",
"undefined": "使用后解锁聊天框“圣诞快乐”",
"undefined": "使用后解锁聊天框“圣诞快乐”，解锁后防御加成+1%",
"type": 8,
"sort": 1,
"colour": 4,
@ -4127,7 +4146,7 @@
"50105": {
"id": 50105,
"name": "playerChatFrame_name_9",
"undefined": "使用后解锁聊天框“新年快乐”",
"undefined": "使用后解锁聊天框“新年快乐”，解锁后防御加成+1%",
"type": 8,
"sort": 1,
"colour": 4,
@ -4146,7 +4165,7 @@
"50201": {
"id": 50201,
"name": "playerheadFrame_name_16",
"undefined": "使用后解锁头像框“招贤纳士”",
"undefined": "使用后解锁头像框“招贤纳士”，解锁后攻击加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4165,7 +4184,7 @@
"50202": {
"id": 50202,
"name": "playerheadFrame_name_17",
"undefined": "使用后解锁头像框“势如破竹”",
"undefined": "使用后解锁头像框“势如破竹”，解锁后防御加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4184,7 +4203,7 @@
"50203": {
"id": 50203,
"name": "playerheadFrame_name_18",
"undefined": "使用后解锁头像框“被甲执兵”",
"undefined": "使用后解锁头像框“被甲执兵”，解锁后生命加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4203,7 +4222,7 @@
"50204": {
"id": 50204,
"name": "playerheadFrame_name_19",
"undefined": "使用后解锁头像框“锋芒毕露”",
"undefined": "使用后解锁头像框“锋芒毕露”，解锁后攻击加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4222,7 +4241,7 @@
"50205": {
"id": 50205,
"name": "playerheadFrame_name_20",
"undefined": "使用后解锁头像框“所向披靡”",
"undefined": "使用后解锁头像框“所向披靡”，解锁后防御加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4241,7 +4260,7 @@
"50206": {
"id": 50206,
"name": "playerheadFrame_name_21",
"undefined": "使用后解锁头像框“传世藏品”",
"undefined": "使用后解锁头像框“传世藏品”，解锁后生命加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4260,7 +4279,7 @@
"50207": {
"id": 50207,
"name": "playerheadFrame_name_22",
"undefined": "使用后解锁头像框“金戈铁马”",
"undefined": "使用后解锁头像框“金戈铁马”，解锁后伤害加成+1%",
"type": 7,
"sort": 1,
"colour": 4,
@ -4279,7 +4298,7 @@
"50301": {
"id": 50301,
"name": "playerModel_name_3",
"undefined": "使用后解锁主角造型“圣诞庆典：男”",
"undefined": "使用后解锁主角造型“圣诞庆典：男”，解锁后防御加成+1%",
"type": 6,
"sort": 1,
"colour": 5,
@ -4298,7 +4317,7 @@
"50302": {
"id": 50302,
"name": "playerModel_name_4",
"undefined": "使用后解锁主角造型“圣诞庆典：女”",
"undefined": "使用后解锁主角造型“圣诞庆典：女”，解锁后防御加成+1%",
"type": 6,
"sort": 1,
"colour": 5,
@ -7721,5 +7740,59 @@
"selecPrize": [],
"payId": "",
"advancedEffects": ""
},
"80001": {
"id": 80001,
"name": "intr_item_name_80001",
"undefined": "味道清淡、简单纯净的的白色朗姆酒，可以在干部外观递交给裁缝提升外观等级。",
"type": 1,
"sort": 1,
"colour": 4,
"way": [],
"go": "",
"icon": "icon_pifucailiao_zi",
"sicon": "icon_pifucailiao_zi",
"describe": "intr_item_describe_80001",
"useNeed": [],
"usePrize": [],
"selecPrize": [],
"payId": "",
"advancedEffects": ""
},
"80002": {
"id": 80002,
"name": "intr_item_name_80002",
"undefined": "至少陈酿3年且更甜、更丰富的风味的金色朗姆酒，可以在干部外观递交给裁缝提升外观等级。",
"type": 1,
"sort": 1,
"colour": 5,
"way": [],
"go": "",
"icon": "icon_pifucailiao_cheng",
"sicon": "icon_pifucailiao_cheng",
"describe": "intr_item_describe_80002",
"useNeed": [],
"usePrize": [],
"selecPrize": [],
"payId": "",
"advancedEffects": "ani_xiangzikuang"
},
"80003": {
"id": 80003,
"name": "intr_item_name_80003",
"undefined": "酒味芳醇，味道复杂的陈年黑色朗姆酒，可以在干部外观递交给裁缝提升外观等级。",
"type": 1,
"sort": 1,
"colour": 6,
"way": [],
"go": "",
"icon": "icon_pifucailiao_hong",
"sicon": "icon_pifucailiao_hong",
"describe": "intr_item_describe_80003",
"useNeed": [],
"usePrize": [],
"selecPrize": [],
"payId": "",
"advancedEffects": "ani_xiangzihong"
}
}

5
src/json/niudanji.json5
View File

@ -14,6 +14,11 @@
p: 2,
pmd: true,
prize: [{a: 'item', t: '5001', n: 20}, {a: 'item', t: '5003', n: 20}, {a: 'item', t: '5005', n: 20}]
},
{
p: 1,
pmd: false,
prize: [{a: 'item', t: '638', n: 1}]
},
{
p: 5,

152
src/json/openCond.json
View File

@ -835,13 +835,13 @@
"name": "zc_btn_hs",
"undefined": "黑市",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 7
}
},
"zc_btn_jg": {
@ -887,78 +887,78 @@
"name": "shouchong",
"undefined": "首充",
"and": {
"mapId": 8
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 8
"lv": 7
}
},
"kaifukuanghuan": {
"name": "kaifukuanghuan",
"undefined": "开服狂欢",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"cz_jijin": {
"name": "cz_jijin",
"undefined": "基金入口",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin": {
"name": "jijin",
"undefined": "基金",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin_gkjj": {
"name": "jijin_gkjj",
"undefined": "关卡基金",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin_tbtxz": {
"name": "jijin_tbtxz",
"undefined": "特别通行证",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"jijin_tszl": {
@ -980,13 +980,13 @@
"name": "yuedujijin",
"undefined": "月度基金",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_71",
"display": {
"lv": 15
"lv": 7
}
},
"zhanling": {
@ -1006,130 +1006,130 @@
"name": "dengludali",
"undefined": "登录大礼（7日）",
"and": {
"lv": 13
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_73",
"display": {
"lv": 13
"lv": 10
}
},
"yibaichou": {
"name": "yibaichou",
"undefined": "百抽活动",
"and": {
"lv": 7
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_74",
"display": {
"lv": 7
"lv": 10
}
},
"xinfupeiyang": {
"name": "xinfupeiyang",
"undefined": "心腹培养",
"and": {
"mapId": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_75",
"display": {
"mapId": 20
"lv": 10
}
},
"huobanzhaomu": {
"name": "huobanzhaomu",
"undefined": "伙伴招募",
"and": {
"mapId": 50
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_76",
"display": {
"mapId": 50
"lv": 10
}
},
"xinshoulibao": {
"name": "xinshoulibao",
"undefined": "冲刺礼包",
"and": {
"lv": 21
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_77",
"display": {
"lv": 21
"lv": 7
}
},
"leijichongzhi": {
"name": "leijichongzhi",
"undefined": "累计充值",
"and": {
"mapId": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_78",
"tips": "openCond_tips_96",
"display": {
"mapId": 20
"lv": 10
}
},
"diaoluoduihuan": {
"name": "diaoluoduihuan",
"undefined": "掉落兑换",
"and": {
"openTime": 8
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_79",
"display": {
"openTime": 8
"lv": 10
}
},
"rencaijihua": {
"name": "rencaijihua",
"undefined": "人才计划",
"and": {
"lv": 13
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_80",
"tips": "openCond_tips_96",
"display": {
"lv": 13
"lv": 10
}
},
"zc_img6": {
"name": "zc_img6",
"undefined": "每日签到",
"and": {
"lv": 13
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_81",
"display": {
"lv": 13
"lv": 7
}
},
"dianfengrongyao": {
"name": "dianfengrongyao",
"undefined": "巅峰荣耀",
"and": {
"lv": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_82",
"display": {
"lv": 20
"lv": 10
}
},
"tuisonglibao": {
@ -1149,130 +1149,130 @@
"name": "hs_btn_tqlb",
"undefined": "特权礼包",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_84",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_ndj": {
"name": "hs_btn_ndj",
"undefined": "扭蛋机",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_85",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_yk": {
"name": "hs_btn_yk",
"undefined": "月卡",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_86",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_zsk": {
"name": "hs_btn_zsk",
"undefined": "终身卡",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_87",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_mrjx": {
"name": "hs_btn_mrjx",
"undefined": "每日精选",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_88",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_jthl": {
"name": "hs_btn_jthl",
"undefined": "积天豪礼",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_89",
"display": {
"lv": 15
"lv": 7
}
},
"hs_btn_zlb": {
"name": "hs_btn_zlb",
"undefined": "周礼包",
"and": {
"lv": 15
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_90",
"display": {
"lv": 15
"lv": 7
}
},
"shangcheng": {
"name": "shangcheng",
"undefined": "商城",
"and": {
"mapId": 20
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_64",
"display": {
"mapId": 20
"lv": 7
}
},
"fuli": {
"name": "fuli",
"undefined": "福利",
"and": {
"lv": 13
"lv": 7
},
"or": {},
"time": 0,
"tips": "openCond_tips_92",
"display": {
"lv": 13
"lv": 7
}
},
"xianshihuodong": {
"name": "xianshihuodong",
"undefined": "限时活动",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_93",
"display": {
"lv": 15
"lv": 10
}
},
"hb_btn_yjtz": {
@ -1285,111 +1285,111 @@
"time": 0,
"tips": "openCond_tips_94",
"display": {
"lv": 7
"lv": 30
}
},
"kaifujingsai": {
"name": "kaifujingsai",
"undefined": "开服竞赛",
"and": {
"lv": 20
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_95",
"tips": "openCond_tips_96",
"display": {
"lv": 20
"lv": 10
}
},
"zhoumolibao": {
"name": "zhoumolibao",
"undefined": "周末礼包",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"shengdanhuodong": {
"name": "shengdanhuodong",
"undefined": "圣诞活动",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"yuandanhuodong": {
"name": "yuandanhuodong",
"undefined": "元旦活动",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"czlibao": {
"name": "czlibao",
"undefined": "超值礼包破冰",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"xiaofeijingsai": {
"name": "xiaofeijingsai",
"undefined": "钻石消费竞赛",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"leigoulibao": {
"name": "leigoulibao",
"undefined": "累购礼包",
"and": {
"lv": 15
"lv": 10
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 10
}
},
"weiwang": {
"name": "weiwang",
"undefined": "威望",
"and": {
"lv": 15
"lv": 12
},
"or": {},
"time": 0,
"tips": "openCond_tips_96",
"display": {
"lv": 15
"lv": 12
}
}
}

231
src/json/pay.json
View File

@ -915,6 +915,37 @@
"front": {},
"currency": "CNY"
},
"lv10": {
"id": "lv10",
"money": 0.5,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 5
}
],
"prize": [
{
"a": "attr",
"t": "rmbmoney",
"n": 100
},
{
"a": "hero",
"t": "4012",
"n": 1
}
],
"firstPayPrize": [],
"name": "pay_name_lv10",
"undefined": "等级豪礼（等级10）",
"time": -1,
"buys": 1,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"lv15": {
"id": "lv15",
"money": 0.5,
@ -6673,5 +6704,205 @@
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_1": {
"id": "hqjg_libao_1",
"money": 0.5,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 5
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_1",
"undefined": "黄旗酒馆_1",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_2": {
"id": "hqjg_libao_2",
"money": 1,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 10
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_2",
"undefined": "黄旗酒馆_2",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_3": {
"id": "hqjg_libao_3",
"money": 6,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 60
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_3",
"undefined": "黄旗酒馆_3",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_4": {
"id": "hqjg_libao_4",
"money": 18,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 180
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_4",
"undefined": "黄旗酒馆_4",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_5": {
"id": "hqjg_libao_5",
"money": 30,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 300
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_5",
"undefined": "黄旗酒馆_5",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_6": {
"id": "hqjg_libao_6",
"money": 68,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 680
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_6",
"undefined": "黄旗酒馆_6",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_7": {
"id": "hqjg_libao_7",
"money": 128,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 1280
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_7",
"undefined": "黄旗酒馆_7",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_8": {
"id": "hqjg_libao_8",
"money": 198,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 1980
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_8",
"undefined": "黄旗酒馆_8",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_9": {
"id": "hqjg_libao_9",
"money": 328,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 3280
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_9",
"undefined": "黄旗酒馆_9",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
},
"hqjg_libao_10": {
"id": "hqjg_libao_10",
"money": 648,
"payExp": [
{
"a": "attr",
"t": "payExp",
"n": 6480
}
],
"prize": [],
"firstPayPrize": [],
"name": "pay_name_hqjg_libao_10",
"undefined": "黄旗酒馆_10",
"time": -1,
"buys": 0,
"needVip": 0,
"front": {},
"currency": "CNY"
}
}

18
src/json/playerChatFrame.json
View File

@ -2,12 +2,12 @@
"1": {
"id": 1,
"name": "playerChatFrame_name_1",
"undefined": "玩家初始默认聊天框",
"img": "lt_dhk1",
"cond": [
"lv",
1
],
"undefined": "进入游戏默认获得",
"intr": "playerChatFrame_des_1",
"sort": 1,
"buff": {
@ -19,12 +19,12 @@
"2": {
"id": 2,
"name": "playerChatFrame_name_2",
"undefined": "主角等级达到30级获得，解锁后防御加成+1%",
"img": "lt_dhk3",
"cond": [
"lv",
30
],
"undefined": "角色等级达到30级获得",
"intr": "playerChatFrame_des_2",
"sort": 2,
"buff": {
@ -36,12 +36,12 @@
"3": {
"id": 3,
"name": "playerChatFrame_name_3",
"undefined": "主角等级达到50级获得，解锁后防御加成+1%",
"img": "lt_dhk4",
"cond": [
"lv",
50
],
"undefined": "角色等级达到50级获得",
"intr": "playerChatFrame_des_3",
"sort": 3,
"buff": {
@ -53,12 +53,12 @@
"4": {
"id": 4,
"name": "playerChatFrame_name_4",
"undefined": "图鉴数量达到30个获得，解锁后防御加成+1%",
"img": "lt_dhk5",
"cond": [
"tujianLv",
7
],
"undefined": "图鉴数量达到30个获得",
"intr": "playerChatFrame_des_4",
"sort": 5,
"buff": {
@ -70,12 +70,12 @@
"5": {
"id": 5,
"name": "playerChatFrame_name_5",
"undefined": "VIP5获得，解锁后攻击加成+1%",
"img": "lt_dhk7",
"cond": [
"vip",
5
],
"undefined": "VIP5获得",
"intr": "playerChatFrame_des_5",
"sort": 4,
"buff": {
@ -87,12 +87,12 @@
"6": {
"id": 6,
"name": "playerChatFrame_name_6",
"undefined": "跨服势力战最高品质据点第一势力成员，解锁后攻击加成+1%、生命加成+1%（限时7天）",
"img": "lt_dhk11",
"cond": [
"time",
604800
],
"undefined": "跨服势力战最高品质据点第一势力成员",
"intr": "playerChatFrame_des_6",
"sort": 6,
"buff": {
@ -105,12 +105,12 @@
"7": {
"id": 7,
"name": "playerChatFrame_name_7",
"undefined": "名望等级达到七阶获得，解锁后防御加成+1%",
"img": "lt_dhk13",
"cond": [
"renown",
61
],
"undefined": "名望等级达到七阶获得",
"intr": "playerChatFrame_des_7",
"sort": 7,
"buff": {
@ -122,12 +122,12 @@
"8": {
"id": 8,
"name": "playerChatFrame_name_8",
"undefined": "圣诞庆典活动获得，解锁后防御加成+1%",
"img": "lt_dhk14",
"cond": [
"time",
-1
],
"undefined": "圣诞庆典获得",
"intr": "playerChatFrame_des_8",
"sort": 8,
"buff": {
@ -139,12 +139,12 @@
"9": {
"id": 9,
"name": "playerChatFrame_name_9",
"undefined": "新年庆典活动获得，解锁后防御加成+1%",
"img": "lt_dhk15",
"cond": [
"time",
-1
],
"undefined": "新年庆典获得",
"intr": "playerChatFrame_des_9",
"sort": 9,
"buff": {

4
src/json/playerModel.json
View File

@ -3,6 +3,7 @@
"id": 1,
"type": 1,
"name": "playerModel_name_1",
"undefined": "主角初始默认的男形象",
"head": 10001,
"img": "zhu_10001",
"cond": [
@ -20,6 +21,7 @@
"id": 2,
"type": 1,
"name": "playerModel_name_2",
"undefined": "主角初始默认的女形象",
"head": 10002,
"img": "zhu_10002",
"cond": [
@ -37,6 +39,7 @@
"id": 3,
"type": 1,
"name": "playerModel_name_3",
"undefined": "圣诞庆典活动获得，解锁后防御加成+2%",
"head": 100011,
"img": 100011,
"cond": [
@ -56,6 +59,7 @@
"id": 4,
"type": 1,
"name": "playerModel_name_4",
"undefined": "圣诞庆典活动获得，解锁后攻击加成+2%",
"head": 100021,
"img": 100021,
"cond": [

632
src/json/renown_level.json
View File

@ -3,360 +3,600 @@
"id": 1,
"renownlevel": 1,
"maxlevel": 250,
"cost": 5,
"atk": 2,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 8
"hp": 4
},
"2": {
"id": 2,
"renownlevel": 2,
"maxlevel": 500,
"cost": 6,
"atk": 2,
"maxlevel": 750,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 9
"hp": 4
},
"3": {
"id": 3,
"renownlevel": 3,
"maxlevel": 750,
"cost": 7,
"atk": 2,
"maxlevel": 1500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 10
"hp": 4
},
"4": {
"id": 4,
"renownlevel": 4,
"maxlevel": 1000,
"cost": 9,
"atk": 4,
"def": 2,
"hp": 11
"maxlevel": 2500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"5": {
"id": 5,
"renownlevel": 5,
"maxlevel": 1250,
"cost": 11,
"atk": 4,
"def": 2,
"hp": 12
"maxlevel": 3750,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"6": {
"id": 6,
"renownlevel": 6,
"maxlevel": 1500,
"cost": 13,
"atk": 4,
"def": 2,
"hp": 13
"maxlevel": 5250,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"7": {
"id": 7,
"renownlevel": 7,
"maxlevel": 1750,
"cost": 15,
"atk": 6,
"def": 3,
"hp": 14
"maxlevel": 7000,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"8": {
"id": 8,
"renownlevel": 8,
"maxlevel": 2000,
"cost": 17,
"atk": 6,
"def": 3,
"hp": 15
"maxlevel": 9000,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"9": {
"id": 9,
"renownlevel": 9,
"maxlevel": 2500,
"cost": 19,
"atk": 6,
"def": 3,
"hp": 16
"maxlevel": 11250,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"10": {
"id": 10,
"renownlevel": 10,
"maxlevel": 3000,
"cost": 21,
"atk": 8,
"def": 4,
"hp": 17
"maxlevel": 13750,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 4
},
"11": {
"id": 11,
"renownlevel": 11,
"maxlevel": 3500,
"cost": 23,
"atk": 8,
"def": 4,
"hp": 18
"maxlevel": 16500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 5
},
"12": {
"id": 12,
"renownlevel": 12,
"maxlevel": 4000,
"cost": 25,
"atk": 8,
"def": 4,
"hp": 19
"maxlevel": 19500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 5
},
"13": {
"id": 13,
"renownlevel": 13,
"maxlevel": 4500,
"cost": 27,
"atk": 10,
"def": 5,
"hp": 20
"maxlevel": 22750,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 5
},
"14": {
"id": 14,
"renownlevel": 14,
"maxlevel": 5000,
"cost": 30,
"atk": 10,
"def": 5,
"hp": 21
"maxlevel": 26250,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 5
},
"15": {
"id": 15,
"renownlevel": 15,
"maxlevel": 5000,
"cost": 33,
"atk": 10,
"def": 5,
"hp": 21
"maxlevel": 30000,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 2
}
],
"atk": 1.2,
"def": 1,
"hp": 5
},
"16": {
"id": 16,
"renownlevel": 16,
"maxlevel": 5000,
"cost": 36,
"atk": 12,
"def": 6,
"hp": 22
"maxlevel": 34000,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 5
}
],
"atk": 1.4,
"def": 1.2,
"hp": 6
},
"17": {
"id": 17,
"renownlevel": 17,
"maxlevel": 5000,
"cost": 39,
"atk": 12,
"def": 6,
"hp": 22
"maxlevel": 38250,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 9
}
],
"atk": 1.4,
"def": 1.2,
"hp": 6
},
"18": {
"id": 18,
"renownlevel": 18,
"maxlevel": 5000,
"cost": 42,
"atk": 12,
"def": 6,
"hp": 22
"maxlevel": 42750,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 13
}
],
"atk": 1.4,
"def": 1.2,
"hp": 6
},
"19": {
"id": 19,
"renownlevel": 19,
"maxlevel": 5000,
"cost": 45,
"atk": 14,
"def": 7,
"hp": 23
"maxlevel": 47500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 17
}
],
"atk": 1.4,
"def": 1.2,
"hp": 6
},
"20": {
"id": 20,
"renownlevel": 20,
"maxlevel": 5000,
"cost": 48,
"atk": 14,
"def": 7,
"hp": 23
"maxlevel": 52500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 21
}
],
"atk": 1.4,
"def": 1.2,
"hp": 6
},
"21": {
"id": 21,
"renownlevel": 21,
"maxlevel": 5000,
"cost": 51,
"atk": 14,
"def": 7,
"hp": 23
"maxlevel": 57500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 23
}
],
"atk": 1.4,
"def": 1.2,
"hp": 7
},
"22": {
"id": 22,
"renownlevel": 22,
"maxlevel": 5000,
"cost": 54,
"atk": 14,
"def": 7,
"hp": 23
"maxlevel": 62500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 25
}
],
"atk": 1.4,
"def": 1.2,
"hp": 7
},
"23": {
"id": 23,
"renownlevel": 23,
"maxlevel": 5000,
"cost": 57,
"atk": 16,
"def": 8,
"hp": 24
"maxlevel": 67500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 30
}
],
"atk": 1.4,
"def": 1.2,
"hp": 7
},
"24": {
"id": 24,
"renownlevel": 24,
"maxlevel": 5000,
"cost": 60,
"atk": 16,
"def": 8,
"hp": 24
"maxlevel": 72500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 35
}
],
"atk": 1.4,
"def": 1.2,
"hp": 7
},
"25": {
"id": 25,
"renownlevel": 25,
"maxlevel": 5000,
"cost": 63,
"atk": 16,
"def": 8,
"hp": 24
"maxlevel": 77500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 40
}
],
"atk": 1.4,
"def": 1.2,
"hp": 7
},
"26": {
"id": 26,
"renownlevel": 26,
"maxlevel": 5000,
"cost": 66,
"atk": 16,
"def": 8,
"hp": 24
"maxlevel": 82500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 45
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"27": {
"id": 27,
"renownlevel": 27,
"maxlevel": 5000,
"cost": 69,
"atk": 16,
"def": 8,
"hp": 24
"maxlevel": 87500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 50
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"28": {
"id": 28,
"renownlevel": 28,
"maxlevel": 5000,
"cost": 72,
"atk": 18,
"def": 9,
"hp": 25
"maxlevel": 92500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 60
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"29": {
"id": 29,
"renownlevel": 29,
"maxlevel": 5000,
"cost": 75,
"atk": 18,
"def": 9,
"hp": 25
"maxlevel": 97500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 80
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"30": {
"id": 30,
"renownlevel": 30,
"maxlevel": 5000,
"cost": 78,
"atk": 18,
"def": 9,
"hp": 25
"maxlevel": 102500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 100
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"31": {
"id": 31,
"renownlevel": 31,
"maxlevel": 5000,
"cost": 81,
"atk": 18,
"def": 9,
"hp": 25
"maxlevel": 107500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 120
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"32": {
"id": 32,
"renownlevel": 32,
"maxlevel": 5000,
"cost": 84,
"atk": 18,
"def": 9,
"hp": 25
"maxlevel": 112500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 140
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"33": {
"id": 33,
"renownlevel": 33,
"maxlevel": 5000,
"cost": 87,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 117500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 180
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"34": {
"id": 34,
"renownlevel": 34,
"maxlevel": 5000,
"cost": 90,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 122500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 220
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"35": {
"id": 35,
"renownlevel": 35,
"maxlevel": 5000,
"cost": 93,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 127500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 260
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"36": {
"id": 36,
"renownlevel": 36,
"maxlevel": 5000,
"cost": 97,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 132500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 300
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"37": {
"id": 37,
"renownlevel": 37,
"maxlevel": 5000,
"cost": 101,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 137500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 350
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"38": {
"id": 38,
"renownlevel": 38,
"maxlevel": 5000,
"cost": 105,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 142500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 400
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"39": {
"id": 39,
"renownlevel": 39,
"maxlevel": 5000,
"cost": 109,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 147500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 450
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
},
"40": {
"id": 40,
"renownlevel": 40,
"maxlevel": 5000,
"cost": 113,
"atk": 18,
"def": 10,
"hp": 25
"maxlevel": 152500,
"cost": [
{
"a": "attr",
"t": "weiwang",
"n": 500
}
],
"atk": 1.4,
"def": 1.2,
"hp": 8
}
}

2
src/json/slzd.json5
View File

@ -4,7 +4,7 @@
//开放时间
openTime: [0, 514800],
//结算定时器时间
schedulerPrize: 597600,
schedulerPrize: 511500,
//分组定时器时间
schedulerGroup: 0,
//据点

9720
src/json/tanxian.json
View File

File diff suppressed because it is too large Load Diff

4
src/json/tuisonglibao.json
View File

@ -388,10 +388,10 @@
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
15
10
],
"payId": [
"lv15"
"lv10"
],
"time": 10800,
"displayCD": 10800,

148
src/json/xstask.json
View File

@ -14,9 +14,10 @@
"n": 10000
}
],
"p": 3,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_1",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"2": {
"id": 2,
@ -33,9 +34,10 @@
"n": 80
}
],
"p": 4,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_2",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"3": {
"id": 3,
@ -54,7 +56,8 @@
],
"p": 5,
"intr": "intr_xuanshangrenwu_intr_3",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"4": {
"id": 4,
@ -71,9 +74,10 @@
"n": 30
}
],
"p": 6,
"p": 1,
"intr": "intr_xuanshangrenwu_intr_4",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 3
},
"5": {
"id": 5,
@ -90,9 +94,10 @@
"n": 20000
}
],
"p": 7,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_5",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"6": {
"id": 6,
@ -109,9 +114,10 @@
"n": 60
}
],
"p": 8,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_4",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 3
},
"7": {
"id": 7,
@ -128,9 +134,10 @@
"n": 20000
}
],
"p": 9,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_5",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"8": {
"id": 8,
@ -147,9 +154,10 @@
"n": 40000
}
],
"p": 10,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_6",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"9": {
"id": 9,
@ -166,9 +174,10 @@
"n": 110
}
],
"p": 11,
"p": 1,
"intr": "intr_xuanshangrenwu_intr_7",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"10": {
"id": 10,
@ -185,9 +194,10 @@
"n": 30000
}
],
"p": 12,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_8",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"11": {
"id": 11,
@ -204,9 +214,10 @@
"n": 30000
}
],
"p": 13,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_6",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"12": {
"id": 12,
@ -223,9 +234,10 @@
"n": 140
}
],
"p": 14,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_7",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"13": {
"id": 13,
@ -242,9 +254,10 @@
"n": 60000
}
],
"p": 15,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_8",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"14": {
"id": 14,
@ -261,9 +274,10 @@
"n": 40000
}
],
"p": 16,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_9",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"15": {
"id": 15,
@ -280,9 +294,10 @@
"n": 90
}
],
"p": 17,
"p": 2,
"intr": "intr_xuanshangrenwu_intr_10",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 3
},
"16": {
"id": 16,
@ -299,9 +314,10 @@
"n": 40000
}
],
"p": 18,
"p": 4,
"intr": "intr_xuanshangrenwu_intr_8",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"17": {
"id": 17,
@ -318,9 +334,10 @@
"n": 50000
}
],
"p": 19,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_9",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"18": {
"id": 18,
@ -337,9 +354,10 @@
"n": 120
}
],
"p": 20,
"p": 1,
"intr": "intr_xuanshangrenwu_intr_10",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 3
},
"19": {
"id": 19,
@ -356,9 +374,10 @@
"n": 80000
}
],
"p": 21,
"p": 4,
"intr": "intr_xuanshangrenwu_intr_11",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"20": {
"id": 20,
@ -375,9 +394,10 @@
"n": 170
}
],
"p": 22,
"p": 4,
"intr": "intr_xuanshangrenwu_intr_12",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"21": {
"id": 21,
@ -394,9 +414,10 @@
"n": 100000
}
],
"p": 23,
"p": 3,
"intr": "intr_xuanshangrenwu_intr_11",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"22": {
"id": 22,
@ -413,9 +434,10 @@
"n": 200
}
],
"p": 24,
"p": 2,
"intr": "intr_xuanshangrenwu_intr_12",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"23": {
"id": 23,
@ -432,9 +454,10 @@
"n": 150
}
],
"p": 25,
"p": 1,
"intr": "intr_xuanshangrenwu_intr_13",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 3
},
"24": {
"id": 24,
@ -451,9 +474,10 @@
"n": 50000
}
],
"p": 26,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_14",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"25": {
"id": 25,
@ -470,9 +494,10 @@
"n": 60000
}
],
"p": 27,
"p": 2,
"intr": "intr_xuanshangrenwu_intr_15",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"26": {
"id": 26,
@ -489,9 +514,10 @@
"n": 60000
}
],
"p": 28,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_14",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"27": {
"id": 27,
@ -508,9 +534,10 @@
"n": 75000
}
],
"p": 29,
"p": 5,
"intr": "intr_xuanshangrenwu_intr_15",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"28": {
"id": 28,
@ -527,9 +554,10 @@
"n": 180
}
],
"p": 30,
"p": 1,
"intr": "intr_xuanshangrenwu_intr_16",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 3
},
"29": {
"id": 29,
@ -546,9 +574,10 @@
"n": 230
}
],
"p": 31,
"p": 2,
"intr": "intr_xuanshangrenwu_intr_17",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
},
"30": {
"id": 30,
@ -565,8 +594,9 @@
"n": 120000
}
],
"p": 32,
"p": 4,
"intr": "intr_xuanshangrenwu_intr_18",
"img": "icon_jinbi"
"img": "icon_jinbi",
"jiequNum": 0
}
}

15
src/jsonType.ts
View File

@ -106,6 +106,18 @@ type gc_clsl_com = {
"divide": { "day": [number, number], "group": number, [x: string]: any }[], "divideTime": number, "fightTime": [number, number], "prizeTime": number, "fightWinPrize": { "total": number, "prize": { "a": string, "t": string, "n": number, [x: string]: any }[], "star": number, [x: string]: any }[], "fightNum": number, "vipBuyFightNum": [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number], "buyFightNumNeed": { "a": string, "t": string, "n": number, [x: string]: any }[], "rankPrize": { "rank": [number, number], "prize": { "a": string, "t": string, "n": number, [x: string]: any }[], "title": string, [x: string]: any }[], "danPrize": { "star": number, "prize": { "a": string, "t": string, "n": number, [x: string]: any }[], [x: string]: any }[], "email_rank": { "title": string, "content": string, [x: string]: any }, "email_dan": { "title": string, "content": string, [x: string]: any }, [x: string]: any
}
type gc_renown_level = {
[id: string]: {
id: number,
renownlevel: number,
maxlevel: number,
cost: { "a": string, "t": string, "n": number, [x: string]: any }[],
atk: number,
def: number,
hp: number,
}
}
type gc_clsl_dan = k_v<{
/** 总星级 */
'allStar': number
@ -1946,7 +1958,7 @@ type gcType = {
kfcb_prize: gc_kfcb_prize
yuyuemail: gc_yuyuemail
tuisonglibao: gc_push_gift
renown_level: gc_renown_level
}
@ -1957,4 +1969,3 @@ declare global {
export function initGcType() {
}

4
src/lng.ts
View File

@ -352,7 +352,9 @@ class Lng {
huoqupaihang: "huoqupaihang";
wucigonghui: "wucigonghui";
nameyicunzai: "nameyicunzai";
ljlibaotips_8:"ljlibaotips_8";
ljlibaotips_8: "ljlibaotips_8";
weiwang_12: "weiwang_12";
"11111" = "globalThis.lng.chat_1"
// return call.error('', { code: -3, message: globalThis.lng.chat_2 });

2
src/module/collection_event.ts
View File

@ -54,7 +54,6 @@ export type eventType = {
jierihuodong: Omit<ResOpenJierihuodong, 'taskFinish'> & { refreshTime: number; };
kaifujingsai: ResOpenKaifujingsai;
zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; };
pobinglibao: ResOpenPobinglibao
payForDiamond: {
[time: number]: number
}
@ -74,6 +73,7 @@ export type eventType = {
[k: `qiridenglu${number}`]: Pick<ResOpenQiridenglu, 'recPrize'>;
[k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number };
[k: `yuandan${number}`]: ResOpenYuandan;
[k: `pobinglibao${number}`]: ResOpenPobinglibao;
};
export type CollectionEvent<T extends keyof eventType> = {

9
src/module/collection_weiwang.ts Normal file
View File

@ -0,0 +1,9 @@
export type CollectionWeiwang = {
uid: string;
hp: number;
atk: number;
def: number;
buff: k_v<number>;
}

2
src/module/mongodb.ts
View File

@ -60,6 +60,7 @@ import {CollectionRmbuse} from "./collection_rmbuse";
import {CollectionFightLog} from "./collection_fightLog";
import {CollectionShop} from "./collection_shop";
import {CollectionPushGift} from "./collection_pushgift";
import { CollectionWeiwang } from './collection_weiwang';
export type MongodbCollections = {
user: CollectionUser;
@ -136,4 +137,5 @@ export type MongodbCollections = {
pushgift:CollectionPushGift
huodong_user: CollectionUser;
weiwang: CollectionWeiwang;
};

14
src/monopoly/protocols/serviceProto.ts
View File

@ -2637,6 +2637,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwangbuff",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},

8
src/oss/watchdog.json
View File

@ -46,13 +46,13 @@
},
{
"key":"pata/SaoDang",
"limit":5,
"tips":"黑暗塔扫荡次数超过5次"
"limit":6,
"tips":"黑暗塔扫荡次数超过6次"
},
{
"key":"lingzhulaixi/PkBoss",
"limit":15,
"tips":"讨伐海盗挑战次数超过15次"
"limit":16,
"tips":"讨伐海盗挑战次数超过16次"
},
{
"key":"gonghui/FbFight",

19
src/public/chat.ts
View File

@ -3,6 +3,7 @@ import { ApiCall } from 'tsrpc';
import { MsgChat } from '../shared/protocols/msg_s2c/MsgChat';
import { player } from '../shared/protocols/user/type';
import { chatLog, chatMsgLog } from '../shared/protocols/type'
import { PublicShared } from '../shared/public/public';
const msgListLen = {
'cross': 30,
@ -10,6 +11,20 @@ const msgListLen = {
'guild': 20
};
/**
* 通过开服天数，获取跨服聊天分组
*/
export function getCrossChatGroupByOpenDay(){
let openday = PublicShared.getOpenServerDay();
if(openday<=7){
return 1;
}else if(openday <= 30){
return 2;
}else{
return 3;
}
}
export class ChatFun {
/**新增消息 */
static async newMsg(sendData: MsgChat) {
@ -23,7 +38,11 @@ export class ChatFun {
G.server.broadcastClusterMsg('msg_s2c/Chat', sendData,{ghId:(sendData.sender as player)?.ghId});
}else if(sendData.type == 'cross'){
//所有的子进程都会收到，不需要集群内分别广播
if(sendData?.otherData?.group == getCrossChatGroupByOpenDay()){
//如果时候同一个分组的
delete sendData?.otherData?.group;
G.server.broadcastMsg('msg_s2c/Chat', sendData);
}
}else{
G.server.broadcastClusterMsg('msg_s2c/Chat', sendData);
}

59
src/public/fight.ts
View File

@ -1,43 +1,43 @@
import {ApiCall, TsrpcError} from 'tsrpc';
import {FightControl} from '../shared/fightControl/fightCntrol';
import {formatNpcData} from '../shared/fightControl/fightFun';
import {fightResult, joinFightData, roleDataType} from '../shared/fightControl/fightType';
import {rankInfo} from '../shared/protocols/type';
import {HeroShared} from '../shared/public/hero';
import {PlayerShared} from '../shared/public/player';
import {HeroFun} from './hero';
import {UserFun} from './user';
import {re, string} from "mathjs";
import {getGud} from './gud';
import {PushGiftFun} from "./pushgift";
import { ApiCall, TsrpcError } from 'tsrpc';
import { FightControl } from '../shared/fightControl/fightCntrol';
import { formatNpcData } from '../shared/fightControl/fightFun';
import { fightResult, joinFightData, roleDataType } from '../shared/fightControl/fightType';
import { rankInfo } from '../shared/protocols/type';
import { HeroShared } from '../shared/public/hero';
import { PlayerShared } from '../shared/public/player';
import { HeroFun } from './hero';
import { UserFun } from './user';
import { re, string } from "mathjs";
import { getGud } from './gud';
import { PushGiftFun } from "./pushgift";
type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross';
let fights:{[key:string]:FightControl} = {
let fights: { [key: string]: FightControl } = {
};
function clearFights (){
function clearFights() {
//定时清理战斗
setInterval(()=>{
setInterval(() => {
let now = Date.now();
for (let key in fights){
if (now - fights[key].startTime > 30000){
console.log("清理战斗",key);
try{
for (let key in fights) {
if (now - fights[key].startTime > 30000) {
console.log("清理战斗", key);
try {
fights[key].release();
}catch(e){
} catch (e) {
console.error(e);
}
delete fights[key];
}
}
},5000);
}, 5000);
}
clearFights();
export class FightFun {
static fightIndex:number = 0;
static fightIndex: number = 0;
static fight(data: joinFightData[], maxRoundNums = 30, fightType: "pvp" | "pve" = 'pvp') {
this.fightIndex++;
@ -80,7 +80,7 @@ export class FightFun {
});
return {
player: {...player, buff: PlayerShared.getBuff(player)},
player: { ...player, buff: PlayerShared.getBuff(player) },
roles: roles
};
}
@ -101,8 +101,15 @@ export class FightFun {
/**挑战npc */
static async fightNpc(call: ApiCall, npcId: string | number, type: fightType, data?: joinFightData) {
let ext_buff = {};
let my = data || await call.conn.getDefaultFightData();
if (["tanxian"].indexOf(type) != -1) {
// 威望buff
let weiwang = await G.mongodb.collection("weiwang").findOne({ uid: call.uid });
ext_buff["weiwangbuff"] = weiwang?.buff ? weiwang.buff : { "atk": 0, "def": 0, "hp": 0 };
}
let my = data || await call.conn.getDefaultFightData(undefined, ext_buff);
if (Object.keys(my.roles).length < 1) {
throw new TsrpcError('至少需要上阵一个英雄');
@ -133,11 +140,11 @@ export class FightFun {
let writeList = ['ganhai', 'jjc', 'hbzbJfs', 'hbzbZbs', 'slzd', 'clsl']
if (uid.indexOf('npc') != -1 || !writeList.includes(type)) return;
G.mongodb.collection('fightLog').insertOne({uid, type, ...result})
G.mongodb.collection('fightLog').insertOne({ uid, type, ...result })
}
static async readLog(uid: string, type: string, len = 20) {
return await G.mongodb.collection('fightLog').find({uid, type}).limit(len).toArray() || []
return await G.mongodb.collection('fightLog').find({ uid, type }).limit(len).toArray() || []
}
}

10
src/shared/protocols/event/pobinglibao/PtlReceive.ts
View File

@ -1,11 +1,13 @@
import {prizeType} from "../../type";
/**
* 破冰礼包领奖
*/
export interface ReqReceive {
export type ReqReceive = {
id: string
recId: string
recId: 'prize' | 'recPrize1' | 'recPrize2'
}
export interface ResReceive {
export type ResReceive = {
prize: prizeType[]
}

295
src/shared/protocols/serviceProto.ts
View File

@ -330,10 +330,12 @@ import { ReqRenownBuy, ResRenownBuy } from './user/PtlRenownBuy';
import { ReqRenownGetPrize, ResRenownGetPrize } from './user/PtlRenownGetPrize';
import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen';
import { ReqTujian, ResTujian } from './user/PtlTujian';
import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './weiwang/PtlOpen';
import { ReqUpLv, ResUpLv } from './weiwang/PtlUpLv';
import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose';
import { ReqExchange as ReqExchange_1, ResExchange as ResExchange_1 } from './weixiuchang/PtlExchange';
import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './weixiuchang/PtlOpen';
import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv';
import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './weixiuchang/PtlOpen';
import { ReqUpLv as ReqUpLv_1, ResUpLv as ResUpLv_1 } from './weixiuchang/PtlUpLv';
import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar';
import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing';
import { ReqBaoMing, ResBaoMing } from './wzry/PtlBaoMing';
@ -343,7 +345,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight';
import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre';
import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai';
import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen';
import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './wzry/PtlOpen';
import { ReqOpen as ReqOpen_63, ResOpen as ResOpen_63 } from './wzry/PtlOpen';
import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight';
import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd';
import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen';
@ -351,7 +353,7 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet';
import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet';
import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp';
import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive';
import { ReqOpen as ReqOpen_63, ResOpen as ResOpen_63 } from './xstask/PtlOpen';
import { ReqOpen as ReqOpen_64, ResOpen as ResOpen_64 } from './xstask/PtlOpen';
import { ReqReceive as ReqReceive_10, ResReceive as ResReceive_10 } from './xstask/PtlReceive';
import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh';
import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle';
@ -1569,6 +1571,14 @@ export interface ServiceType {
req: ReqTujian,
res: ResTujian
},
"weiwang/Open": {
req: ReqOpen_61,
res: ResOpen_61
},
"weiwang/UpLv": {
req: ReqUpLv,
res: ResUpLv
},
"weixiuchang/Decompose": {
req: ReqDecompose,
res: ResDecompose
@ -1578,12 +1588,12 @@ export interface ServiceType {
res: ResExchange_1
},
"weixiuchang/Open": {
req: ReqOpen_61,
res: ResOpen_61
req: ReqOpen_62,
res: ResOpen_62
},
"weixiuchang/UpLv": {
req: ReqUpLv,
res: ResUpLv
req: ReqUpLv_1,
res: ResUpLv_1
},
"weixiuchang/UpStar": {
req: ReqUpStar,
@ -1622,8 +1632,8 @@ export interface ServiceType {
res: ResJingCaiOpen
},
"wzry/Open": {
req: ReqOpen_62,
res: ResOpen_62
req: ReqOpen_63,
res: ResOpen_63
},
"wzry/UpdateFight": {
req: ReqUpdateFight,
@ -1654,8 +1664,8 @@ export interface ServiceType {
res: ResOnekeyReceive
},
"xstask/Open": {
req: ReqOpen_63,
res: ResOpen_63
req: ReqOpen_64,
res: ResOpen_64
},
"xstask/Receive": {
req: ReqReceive_10,
@ -3488,141 +3498,151 @@ export const serviceProto: ServiceProto<ServiceType> = {
},
{
"id": 331,
"name": "weixiuchang/Decompose",
"name": "weiwang/Open",
"type": "api"
},
{
"id": 332,
"name": "weixiuchang/Exchange",
"name": "weiwang/UpLv",
"type": "api"
},
{
"id": 333,
"name": "weixiuchang/Open",
"name": "weixiuchang/Decompose",
"type": "api"
},
{
"id": 334,
"name": "weixiuchang/UpLv",
"name": "weixiuchang/Exchange",
"type": "api"
},
{
"id": 335,
"name": "weixiuchang/UpStar",
"name": "weixiuchang/Open",
"type": "api"
},
{
"id": 336,
"name": "wzry/AutoBaoMing",
"name": "weixiuchang/UpLv",
"type": "api"
},
{
"id": 337,
"name": "wzry/BaoMing",
"name": "weixiuchang/UpStar",
"type": "api"
},
{
"id": 338,
"name": "wzry/catFightLog",
"name": "wzry/AutoBaoMing",
"type": "api"
},
{
"id": 339,
"name": "wzry/CatGroup",
"name": "wzry/BaoMing",
"type": "api"
},
{
"id": 340,
"name": "wzry/DldFight",
"name": "wzry/catFightLog",
"type": "api"
},
{
"id": 341,
"name": "wzry/DldRefre",
"name": "wzry/CatGroup",
"type": "api"
},
{
"id": 342,
"name": "wzry/JingCai",
"name": "wzry/DldFight",
"type": "api"
},
{
"id": 343,
"name": "wzry/JingCaiOpen",
"name": "wzry/DldRefre",
"type": "api"
},
{
"id": 344,
"name": "wzry/Open",
"name": "wzry/JingCai",
"type": "api"
},
{
"id": 345,
"name": "wzry/UpdateFight",
"name": "wzry/JingCaiOpen",
"type": "api"
},
{
"id": 346,
"name": "wzry/Wzzd",
"name": "wzry/Open",
"type": "api"
},
{
"id": 347,
"name": "wzry/ZuanShiOpen",
"name": "wzry/UpdateFight",
"type": "api"
},
{
"id": 348,
"name": "xstask/AllGet",
"name": "wzry/Wzzd",
"type": "api"
},
{
"id": 349,
"name": "xstask/Get",
"name": "wzry/ZuanShiOpen",
"type": "api"
},
{
"id": 350,
"name": "xstask/LvUp",
"name": "xstask/AllGet",
"type": "api"
},
{
"id": 351,
"name": "xstask/OnekeyReceive",
"name": "xstask/Get",
"type": "api"
},
{
"id": 352,
"name": "xstask/Open",
"name": "xstask/LvUp",
"type": "api"
},
{
"id": 353,
"name": "xstask/Receive",
"name": "xstask/OnekeyReceive",
"type": "api"
},
{
"id": 354,
"name": "xstask/Refresh",
"name": "xstask/Open",
"type": "api"
},
{
"id": 355,
"name": "yongbingzhuzhan/Handle",
"name": "xstask/Receive",
"type": "api"
},
{
"id": 356,
"name": "zhanqianbushu/ChangePos",
"name": "xstask/Refresh",
"type": "api"
},
{
"id": 357,
"name": "zhanqianbushu/Select",
"name": "yongbingzhuzhan/Handle",
"type": "api"
},
{
"id": 358,
"name": "zhanqianbushu/ChangePos",
"type": "api"
},
{
"id": 359,
"name": "zhanqianbushu/Select",
"type": "api"
},
{
"id": 360,
"name": "zhanqianbushu/Up",
"type": "api"
}
@ -4565,6 +4585,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwangbuff",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},
@ -5809,6 +5843,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwangbuff",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},
@ -10554,13 +10602,49 @@ export const serviceProto: ServiceProto<ServiceType> = {
"id": 1,
"name": "recId",
"type": {
"type": "String"
"type": "Union",
"members": [
{
"id": 0,
"type": {
"type": "Literal",
"literal": "prize"
}
},
{
"id": 1,
"type": {
"type": "Literal",
"literal": "recPrize1"
}
},
{
"id": 2,
"type": {
"type": "Literal",
"literal": "recPrize2"
}
}
]
}
}
]
},
"event/pobinglibao/PtlReceive/ResReceive": {
"type": "Interface"
"type": "Interface",
"properties": [
{
"id": 0,
"name": "prize",
"type": {
"type": "Array",
"elementType": {
"type": "Reference",
"target": "type/prizeType"
}
}
}
]
},
"event/qirichongzhi/PtlOpen/ReqOpen": {
"type": "Interface"
@ -22052,6 +22136,121 @@ export const serviceProto: ServiceProto<ServiceType> = {
"user/PtlTujian/ResTujian": {
"type": "Interface"
},
"weiwang/PtlOpen/ReqOpen": {
"type": "Interface"
},
"weiwang/PtlOpen/ResOpen": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "lv",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "hp",
"type": {
"type": "Number"
}
},
{
"id": 1,
"name": "atk",
"type": {
"type": "Number"
}
},
{
"id": 2,
"name": "def",
"type": {
"type": "Number"
}
}
]
}
}
]
},
"weiwang/PtlUpLv/ReqUpLv": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "lv",
"type": {
"type": "Number"
}
},
{
"id": 1,
"name": "type",
"type": {
"type": "Union",
"members": [
{
"id": 0,
"type": {
"type": "Literal",
"literal": "hp"
}
},
{
"id": 1,
"type": {
"type": "Literal",
"literal": "atk"
}
},
{
"id": 2,
"type": {
"type": "Literal",
"literal": "def"
}
}
]
}
}
]
},
"weiwang/PtlUpLv/ResUpLv": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "lv",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "hp",
"type": {
"type": "Number"
}
},
{
"id": 1,
"name": "atk",
"type": {
"type": "Number"
}
},
{
"id": 2,
"name": "def",
"type": {
"type": "Number"
}
}
]
}
}
]
},
"weixiuchang/PtlDecompose/ReqDecompose": {
"type": "Interface",
"properties": [
@ -24245,6 +24444,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwangbuff",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},

4
src/shared/protocols/user/PtlLogin.ts
View File

@ -1,4 +1,4 @@
import {gonghuiLevel} from '../gonghui/type';
import { gonghuiLevel } from '../gonghui/type';
/**
* 登录
@ -193,4 +193,6 @@ export type playerAppend = {
chatFrames?: {
[id: string]: number;
};
/**威望额外属性*/
weiwangbuff?: { [k: string]: number };
};

11
src/shared/protocols/weiwang/PtlOpen.ts Normal file
View File

@ -0,0 +1,11 @@
export interface ReqOpen {
}
export interface ResOpen {
lv: {
hp: number
atk: number
def: number
}
}

12
src/shared/protocols/weiwang/PtlUpLv.ts Normal file
View File

@ -0,0 +1,12 @@
export interface ReqUpLv {
lv: number
type: "hp" | "atk" | "def"
}
export interface ResUpLv {
lv: {
hp: number
atk: number
def: number
}
}

31
src/shared/public/hero.ts
View File

@ -1,10 +1,10 @@
import {ResGetList} from '../protocols/hero/PtlGetList';
import {player} from '../protocols/user/type';
import {EquipShared} from './equip';
import {PeijianShared} from './peijian';
import {PlayerShared} from './player';
import {PublicShared} from './public';
import {ShiwuShared} from './shiwu';
import { ResGetList } from '../protocols/hero/PtlGetList';
import { player } from '../protocols/user/type';
import { EquipShared } from './equip';
import { PeijianShared } from './peijian';
import { PlayerShared } from './player';
import { PublicShared } from './public';
import { ShiwuShared } from './shiwu';
export type otherBuff = Partial<player & {
allBuff: k_v<number>;
@ -31,7 +31,7 @@ export class HeroShared {
*/
static getHeroBasicAttr(hero: heroDataType, otherBuff: otherBuff = G.otherBuff, pos = 0) {
let jiban = 0;
let buff: k_v<any> = {skillArr: []};
let buff: k_v<any> = { skillArr: [] };
let heroConf = G.gc.hero[hero.heroId];
let heroLv = G.gc.herolv[heroConf.lvup];
let heroGrow = G.gc.herogrow[heroConf.jjup]?.[hero.jieji];
@ -40,7 +40,7 @@ export class HeroShared {
for (let k in heroLv.buff) {
let val = heroLv.buff[k];
if (typeof val == 'number') buff[k] = val;
else buff[k] = PublicShared.eval(val, {lv: hero.lv});
else buff[k] = PublicShared.eval(val, { lv: hero.lv });
// else buff[k] = Math.floor(new Function(`let lv=${hero.lv}; return ${val}`)());
}
@ -135,7 +135,7 @@ export class HeroShared {
PublicShared.mergeProperty(buff, PeijianShared.getAttr(p));
let conf = G.gc.peijian[p.peijianId];
if (conf.suit) {
if (!suitObj[conf.suit]) suitObj[conf.suit] = {num: 0, minLv: 0};
if (!suitObj[conf.suit]) suitObj[conf.suit] = { num: 0, minLv: 0 };
suitObj[conf.suit].num++;
if (!suitObj[conf.suit].minLv || p.lv < suitObj[conf.suit].minLv) suitObj[conf.suit].minLv = p.lv;
}
@ -273,11 +273,16 @@ export class HeroShared {
if (otherBuff?.skills) {
for (let [id, lv] of Object.entries(otherBuff.skills)) {
if (lv && G.gc.xunlianjihua[id].use == 0) {
PublicShared.mergeProperty(buff, Object.fromEntries([G.gc.xunlianjihua[id].skill].map(k => [k, PublicShared.eval(G.gc.xunlianjihua[id].v[0], {slv: lv})])));
PublicShared.mergeProperty(buff, Object.fromEntries([G.gc.xunlianjihua[id].skill].map(k => [k, PublicShared.eval(G.gc.xunlianjihua[id].v[0], { slv: lv })])));
}
}
}
// 威望加成计算
if (otherBuff?.weiwangbuff) {
PublicShared.mergeProperty(buff, otherBuff?.weiwangbuff || {});
}
//最后进行加成属性计算
for (let k in buff) {
if (k.indexOf('pro') == -1) continue;
@ -368,8 +373,8 @@ export class HeroShared {
static getHeroLvUpNeed(id: string | number, lv = 1): atn[] {
return [
{a: 'item', t: '1', n: G.gc.herolvup[lv].expneed},
{a: 'attr', t: 'jinbi', n: G.gc.herolvup[lv].jinbineed}
{ a: 'item', t: '1', n: G.gc.herolvup[lv].expneed },
{ a: 'attr', t: 'jinbi', n: G.gc.herolvup[lv].jinbineed }
];
}