修复：名将谱战力、活动铜币数量、引导抽卡new问题、未初始推送

shared/db/UserGacha.ts

@@ -41,6 +41,8 @@ class SimpleResult {
   contentId: number;
   @prop({ required: true })
   hid: number;
+  @prop({ required: true })
+  isTransfer: boolean;
 }
 
 /**

shared/pubUtils/dictionary/DicHeroScroll.ts

@@ -1,6 +1,6 @@
 // 武将技能表
 import { readFileAndParse } from '../util'
-import { FILENAME, ABI_STAGE } from '../../consts'
+import { FILENAME, ABI_TYPE } from '../../consts'
 
 export interface DicHeroScroll {
 
@@ -39,9 +39,9 @@ export function loadHeroScroll() {
 
 function parseCeAttr(elem) {
     let ceAttr = new Map<number, number>();
-    ceAttr.set(ABI_STAGE.HP, elem.hp);
-    ceAttr.set(ABI_STAGE.ATK, elem.atk);
-    ceAttr.set(ABI_STAGE.DEF, elem.def);
-    ceAttr.set(ABI_STAGE.MDEF, elem.mdef);
+    ceAttr.set(ABI_TYPE.ABI_HP, elem.hp);
+    ceAttr.set(ABI_TYPE.ABI_ATK, elem.atk);
+    ceAttr.set(ABI_TYPE.ABI_DEF, elem.def);
+    ceAttr.set(ABI_TYPE.ABI_MDEF, elem.mdef);
     return ceAttr;
 }

shared/pubUtils/logUtil.ts

@@ -8,8 +8,8 @@ import { gameData } from "./data";
 
 function getParamBySession(session: any) {
     let uid = session.get('userid');
-    let roleId = session.get('roleId');
-    let roleName = session.get('roleName');
+    let roleId = session.get('roleId')||'';
+    let roleName = session.get('roleName')||'';
     let ip = session.get('ip');
     let serverId = session.get('serverId');
     return { uid, roleId, roleName, ip, serverId };

shared/pubUtils/playerCe.ts

@@ -960,20 +960,28 @@ async function calSchoolStarIncAttr(role: RoleType, heros: HeroType[], type: num
  */
 function calScrollAddAttr(role: RoleType,heros: HeroType[], hid: number) {
     let { attr: roleAttrs } = role;
+    console.log('**********  calScrollAddAttr', hid)
 
     let curHero = heros.find(cur => cur.hid == hid);
     let dicHero = gameData.hero.get(hid);
     if (!curHero || !dicHero) return roleAttrs;
     let { quality } = dicHero;
     let { star, quality: curQuality, colorStar } = curHero;
+    console.log('**********  calScrollAddAttr curHero', star, curQuality, colorStar);
     let heroScroll = getScollByStar(quality, star, curQuality, colorStar);
     if (!heroScroll) return roleAttrs;
+    console.log('**********  heroScroll', heroScroll);
+
+    let isInit = star == dicHero.initialStars && curQuality == dicHero.quality && colorStar == 0;
+    let preScroll = isInit? null: gameData.preHeroScroll.get(heroScroll.id);
+    console.log('**********  preScroll', preScroll);
+
 
-    let preScroll = gameData.preHeroScroll.get(heroScroll.id);
     heroScroll.ceAttr.forEach((add, attrId) => {
 
         let preAdd = preScroll ? preScroll.ceAttr.get(attrId) : 0;
         let fixUp = (add - preAdd) * HERO_CE_RATIO;
+        console.log('**********  preAdd', attrId, preAdd, fixUp);
         updateRoleAttr(roleAttrs, attrId, { inc: { fixUp } });
     });
     return roleAttrs;