部署：37服务器

game-server/app/servers/role/handler/roleHandler.ts

@@ -349,7 +349,7 @@ export class RoleHandler {
         update.scrollId = dicHeroScroll ? dicHeroScroll.id : 0;
 
         let hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.SCROLL, sid, roleId, curHero, update); // 更新单个武将战力
-        calAllHeroCe(HERO_SYSTEM_TYPE.SCROLL, sid, roleId, {}, [hid]); // 全局增加战力
+        await calAllHeroCe(HERO_SYSTEM_TYPE.SCROLL, sid, roleId, {}, [hid]); // 全局增加战力
 
         // 任务
         if (favourLv != hero.favourLv) await checkTaskWithHero(roleId, sid, TASK_TYPE.HERO_FAVOUR_LV, hero);

game-server/config/servers.ts

@@ -239,9 +239,9 @@ module.exports = {
     },
     'sq1': {
         'connector': [
-            { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true },
+            { 'id': 'connector-server-1', 'port': 4050, 'clientHost': '8.142.77.11', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true },
-            { 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true },
+            { 'id': 'connector-server-2', 'port': 4051, 'clientHost': '8.142.77.11', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true },
-            { 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true },
+            { 'id': 'connector-server-3', 'port': 4052, 'clientHost': '8.142.77.11', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true },
         ],
         'chat': [
             { 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 },
@@ -255,8 +255,8 @@ module.exports = {
             { 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 }
         ],
         'gate': [
-            { 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': 'zyz_monitor.trgame.cn', 'clientPort': 3014, 'frontend': true },
+            { 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': '8.142.77.11', 'clientPort': 3014, 'frontend': true },
-            { 'id': 'gate-server-2', 'host': '127.0.0.1', 'clientHost': 'zyz_monitor.trgame.cn', 'clientPort': 3015, 'frontend': true }
+            { 'id': 'gate-server-2', 'host': '127.0.0.1', 'clientHost': '8.142.77.11', 'clientPort': 3015, 'frontend': true }
         ],
         'gm': [
             { 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 }

pushdocker.sh

@@ -11,6 +11,7 @@ if [ $# != 1  ] ; then
 fi
 
 port=22
+env=${1}
 
 if [ ${1} == 'stable' ] ; then
   destUrl="root@zyz:/root/zyz/"
@@ -30,6 +31,7 @@ elif [ ${1} == 'sq1' ] ; then
 elif [ ${1} == 'sq2' ] ; then
   destUrl="root@sq2:/root/zyz/"
   port=3737
+  env='sq1'
 elif [ ${1} == 'sq3' ] ; then
   destUrl="root@sq3:/root/zyz/"
   port=3737
@@ -38,7 +40,7 @@ else
   exit 1;
 fi
 
-node ./config.js ${1}
+node ./config.js ${env}
 
 rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude-from='exclude-file.txt' --progress --inplace --no-owner --no-group --rsh='ssh -p'${port} . ${destUrl}
 git checkout ./game-server/config.json

shared/pubUtils/dictionary/DicHeroScroll.ts

@@ -30,6 +30,7 @@ export function loadHeroScroll() {
     arr.forEach(o => {
         o.ceAttr = parseCeAttr(o);
         dicHeroScroll.set(`${o.quality}_${o.stars}_${o.qualityUp}_${o.colorstars}`, o);
+        if(pre && pre.quality != o.quality) pre = null;
         if(pre && pre.quality == o.quality) preHeroScroll.set(o.id, pre);
         pre = o;
     });