Merge branch 'master' into feature/backend

# Conflicts:
#	game-server/app/servers/connector/filter/global.ts

shared/domain/activityField/signInField.ts

@@ -97,7 +97,7 @@ export class SignInData extends ActivityBase {
             if (this.type === ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) {
                 this.roundIndex = 1;
             }
-            this.todayIndex = Math.ceil((moment(date).valueOf() - this.beginTime) / (24 * 60 * 60 * 1000));
+            this.todayIndex = Math.ceil((moment().valueOf() - this.beginTime) / (24 * 60 * 60 * 1000));
 
         }
 

shared/domain/roleField/calCe.ts

@@ -114,10 +114,8 @@ export class CalHeroCe {
         
             const isWake = colorStar > 0; // 是否觉醒，只要激活了觉醒，彩星就会 > 1
             // console.log('*isUpstar', isUpStar, originStar, star, originColorStar, colorStar)
-            if(starStage < stage) star--;
-            if(colorStarStage < stage) colorStar--;
         
-            const dicStar = isWake ? getHeroWakeByQuality(dicHero.jobClass, dicHero.quality, colorStar) : getHeroStarByQuality(dicHero.jobClass, quality, star); // 星级表
+            const dicStar = isWake ? getHeroWakeByQuality(dicHero.jobClass, dicHero.quality, colorStarStage < stage? colorStar - 1: colorStar) : getHeroStarByQuality(dicHero.jobClass, quality, starStage < stage? star - 1: star); // 星级表
         
             let heroAttr = dicHero.baseAbilityArr.get(attrId); // 武将表hp等
             let heroUpAttr = dicHero.baseAbilityUpArr.get(attrId); // 武将表hp_up等
@@ -125,7 +123,7 @@ export class CalHeroCe {
             if (!!dicStar && !!dicStar.ceAttr) {
                 starUp = dicStar.ceAttr.get(stage);
             }
-            let base = heroAttr + (lv - 1) * (heroUpAttr + starUp);
+            let base = heroAttr + lv * (heroUpAttr + starUp);
             this.getSingleAttrObj(attrId).updateAttr({ set: { base } });
         };
     }