2.6.0 rebuild

layabox · Apr 11, 2020 · dba0424 · dba0424
1 parent 05f03a9
commit dba0424
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/build/as/jslibs/laya.core.js b/build/as/jslibs/laya.core.js
@@ -7705,9 +7705,6 @@ window.Laya= (function (exports) {
                 if (this.hasFreedText(sameTexData)) {
                     sameTexData = wt.pageChars = [];
                 }
-                if (isWT && (this.fontScaleX != wt.scalex || this.fontScaleY != wt.scaley)) {
-                    sameTexData = wt.pageChars = [];
-                }
             }
             var ri = null;
             var splitTex = this.renderPerChar = (!isWT) || TextRender.forceSplitRender || isHtmlChar || (isWT && wt.splitRender);

diff --git a/build/js/libs/laya.core.js b/build/js/libs/laya.core.js
@@ -7705,9 +7705,6 @@ window.Laya= (function (exports) {
                 if (this.hasFreedText(sameTexData)) {
                     sameTexData = wt.pageChars = [];
                 }
-                if (isWT && (this.fontScaleX != wt.scalex || this.fontScaleY != wt.scaley)) {
-                    sameTexData = wt.pageChars = [];
-                }
             }
             var ri = null;
             var splitTex = this.renderPerChar = (!isWT) || TextRender.forceSplitRender || isHtmlChar || (isWT && wt.splitRender);

diff --git a/build/ts/libs/laya.core.js b/build/ts/libs/laya.core.js
@@ -7705,9 +7705,6 @@ window.Laya= (function (exports) {
                 if (this.hasFreedText(sameTexData)) {
                     sameTexData = wt.pageChars = [];
                 }
-                if (isWT && (this.fontScaleX != wt.scalex || this.fontScaleY != wt.scaley)) {
-                    sameTexData = wt.pageChars = [];
-                }
             }
             var ri = null;
             var splitTex = this.renderPerChar = (!isWT) || TextRender.forceSplitRender || isHtmlChar || (isWT && wt.splitRender);

diff --git a/build/ts_new/libs/laya/webgl/text/TextRender.ts b/build/ts_new/libs/laya/webgl/text/TextRender.ts
@@ -251,10 +251,10 @@ export class TextRender {
             if (this.hasFreedText(sameTexData)) {
                 sameTexData = wt.pageChars = [];
 			}
-			if(isWT && (this.fontScaleX!=wt.scalex || this.fontScaleY!=wt.scaley)) {
-				// 文字缩放要清理缓存
-				sameTexData = wt.pageChars = [];
-			}
+			// if(isWT && (this.fontScaleX!=wt.scalex || this.fontScaleY!=wt.scaley)) {
+			// 	// 文字缩放要清理缓存
+			// 	sameTexData = wt.pageChars = [];
+			// }
         }
         var ri: CharRenderInfo = null;
         //var oneTex: boolean = isWT || TextRender.forceWholeRender;	// 如果能缓存的话，就用一张贴图