装备：随机属性

game-server/app/services/role/rewardService.ts

@@ -420,14 +420,14 @@ export function getJewelRandSe(id: number, seid: number) {
     let dicRandom = gameData.randomEffectPool.get(seid)
     // console.log('#### dicRandom', dicRandom)
     let rand = 0;
-    if (dicRandom.id > 0) {
-        let randRange = getRandEelmWithWeight(dicRandom.rate);
-        // console.log('#### randRange', randRange)
-        let randResult = getRandValueByMinMax(randRange.dic.min, randRange.dic.max, getDecimalCnt(dicRandom.gap));
-        // console.log('#### randResult', randResult)
+    let planPool = gameData.randomEffectPoolPlan.get(dicRandom.planId);
+    if(planPool && planPool.length > 0) {
+        let result = getRandEelmWithWeight(planPool);
+        if(result) rand = result.dic.num;
+    } else {
+        let randResult = getRandValueByMinMax(dicRandom.Min, dicRandom.Max, getDecimalCnt(dicRandom.gap));
         let n = Math.floor((randResult - dicRandom.Min)/dicRandom.gap);
         rand = dicRandom.Min + n * dicRandom.gap;
-        // console.log('#### n', n, rand)
     }
     return new RandSe(id, dicRandom.id, rand);
 }

shared/consts/constModules/sysConst.ts

@@ -446,6 +446,7 @@ export const FILENAME = {
     DIC_XUNBAO: 'dic_zyz_xunbao',
     DIC_QUESTION: 'Questions',
     DIC_RANDOM_EFFECT_POOL: 'dic_zyz_randomEffectPool',
+    DIC_RANDOM_EFFECT_POOL_PLAN: 'dic_zyz_randomEffectPoolPlan',
     DIC_STRENGTHEN_COST: 'dic_zyz_enhancementCost',
     DIC_REFINE: 'dic_zyz_jinglian',
     DIC_HERO_EQUIP: 'dic_zyz_heroEquip',

shared/pubUtils/data.ts

@@ -107,6 +107,7 @@ import { dicEquipStrengthAttr, loadEquipStrengthAttr } from './dictionary/DicEqu
 import { dicTowerGift, loadTowerGift } from './dictionary/DicTowerGift';
 import { dicTowerPvpSubAttr, loadTowerPvpSubAttr } from './dictionary/DicTowerPvpSubAttr';
 import { dicSystemOpenTime, loadSystemOpenTime } from "./dictionary/DicSystemOpenTime";
+import { dicRandomEffectPoolPlan, loadRandomEffectPoolPlan } from './dictionary/DicRandomEffectPoolPlan';
 
 export const gameData = {
     daily: dicDaily,
@@ -265,6 +266,7 @@ export const gameData = {
     equipStrengthAttr: dicEquipStrengthAttr,
     towerPvpSubAttr: dicTowerPvpSubAttr,
     sysOpenTime: dicSystemOpenTime,
+    randomEffectPoolPlan: dicRandomEffectPoolPlan,
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -1066,6 +1068,7 @@ function loadDatas() {
     loadEquipStrengthAttr();
     loadTowerPvpSubAttr();
     loadSystemOpenTime();
+    loadRandomEffectPoolPlan();
 }
 
 // 重载dicParam

shared/pubUtils/dictionary/DicRandomEffectPool.ts

@@ -1,5 +1,5 @@
 // 武将特技表
-import { readFileAndParse, decodeArrayListStr, parseNumberList } from '../util'
+import { readFileAndParse, parseNumberList } from '../util'
 import { FILENAME } from '../../consts'
 
 export interface DicRandomEffectPool {
@@ -19,7 +19,7 @@ export interface DicRandomEffectPool {
     // 分割
     readonly gap: number;
     // 分割
-    readonly rate: {min: number, max: number, weight: number}[];
+    readonly planId: number;
     // 组别
     readonly group: number;
     // 等级
@@ -35,24 +35,10 @@ export function loadRandomEffectPool() {
     let arr = readFileAndParse(FILENAME.DIC_RANDOM_EFFECT_POOL);
 
     arr.forEach(o => {
-        o.rate = parseRate(o.count);
+        if(o.planId == '&') o.planId = 0;
         o.gainValueArr = parseNumberList(o.gainValue);
         dicRandomEffectPool.set(o.id, o);
         dicRandomEffectPoolByGroupAndLv.set(`${o.group}_${o.level}`, o.id);
     });
     arr = undefined;
 }
-
-function parseRate(str: string) {
-
-    let result: {min: number, max: number, weight: number}[] = [];
-    if(!str) return result;
-    let decodeArr = decodeArrayListStr(str);
-    for(let [min, max, weight] of decodeArr) {
-        if(isNaN(parseFloat(min)) || isNaN(parseFloat(max)) || isNaN(parseFloat(weight))) {
-            throw new Error('data table format wrong');
-        }
-        result.push({min: parseFloat(min), max: parseFloat(max), weight: parseFloat(weight) });
-    }
-    return result
-}

shared/pubUtils/dictionary/DicRandomEffectPoolPlan.ts

@@ -0,0 +1,27 @@
+// 武将特技表
+import { readFileAndParse } from '../util'
+import { FILENAME } from '../../consts'
+
+export interface DicRandomEffectPoolPlan {
+    // 方案id
+    readonly planId: number;
+    // 值
+    readonly num: number;
+    // 权重
+    readonly weight: number;
+}
+
+export const dicRandomEffectPoolPlan = new Map<number, DicRandomEffectPoolPlan[]>(); // planId => [{num,weight}]
+export function loadRandomEffectPoolPlan() {
+    dicRandomEffectPoolPlan.clear();
+    
+    let arr = readFileAndParse(FILENAME.DIC_RANDOM_EFFECT_POOL_PLAN);
+
+    arr.forEach(o => {
+        if(!dicRandomEffectPoolPlan.has(o.planId)) {
+            dicRandomEffectPoolPlan.set(o.planId, []);
+        }
+        dicRandomEffectPoolPlan.get(o.planId).push(o);
+    });
+    arr = undefined;
+}