Browse Source

update interface

zy_1995 6 months ago
parent
commit
e30ff560a3

+ 1 - 1
assets/Game/GamePublic_3/Script/PokerNode.js

@@ -32,7 +32,7 @@ cc.Class({
 
     start () {
         // var self = this;
-        // cc.loader.loadRes('p_front1', cc.Texture2D, function (err, texture) {
+        // cc.resources.loadRes('p_front1', cc.Texture2D, function (err, texture) {
         //     if (err) {
         //         console.log('-----pc777----')
         //         cc.error(err.message || err);

+ 2 - 2
assets/Module/Login/Script/Login.js

@@ -450,7 +450,7 @@ cc.Class({
             console.log("access_token error");
             return;
         }
-        var xhr = cc.loader.getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         xhr.onreadystatechange = function () {
             if (xhr.readyState === 4 && (xhr.status >= 200 && xhr.status < 400)) {
                 var respone = decodeURI(xhr.responseText);
@@ -790,7 +790,7 @@ cc.Class({
     },
 
     httpPost: function (code, CallBack) {
-        var xhr = cc.loader.getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         xhr.onreadystatechange = function () {
             if (xhr.readyState === 4 && (xhr.status >= 200 && xhr.status < 400)) {
                 var respone = xhr.responseText;

+ 4 - 4
assets/Module/UpdateManager_7/Script/UpdateManager.js

@@ -228,8 +228,8 @@ cc.Class({
         if (this._am.getState() === jsb.AssetsManager.State.UNINITED) {
             var url = this.m_Manifest.nativeUrl;
             if (window.LOG_NET_DATA) console.log(` !@~ CheckUpdate url1 ${url}`);
-            if (cc.loader.md5Pipe) {
-                url = cc.loader.md5Pipe.transformURL(url);
+            if (cc.assetManager.transformPipeline) {
+                url = cc.assetManager.transformPipeline.transformURL(url);
             }
             if (window.LOG_NET_DATA) console.log(` !@~ CheckUpdate url2 ${url}`);
             this._am.loadLocalManifest(url);
@@ -401,8 +401,8 @@ cc.Class({
 
             if (this._am.getState() === jsb.AssetsManager.State.UNINITED) {
                 var url = this.m_Manifest.nativeUrl;
-                if (cc.loader.md5Pipe) {
-                    url = cc.loader.md5Pipe.transformURL(url);
+                if (cc.assetManager.transformPipeline) {
+                    url = cc.assetManager.transformPipeline.transformURL(url);
                 }
                 this._am.loadLocalManifest(url);
             }

+ 1 - 1
assets/Scene/Script/Launch.js

@@ -209,7 +209,7 @@ cc.Class({
     //获取服务器最新IP
     _getServerIP() {
         this.updateIP = true;
-        var xhr = cc.loader.getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         xhr.onreadystatechange = function () {
             if (xhr.readyState === 4 && (xhr.status >= 200 && xhr.status < 400)) {
                console.log("a1.king-mahjong.tw 返回",xhr.responseText);

+ 1 - 1
assets/Script/CustomClass/CustomImage.js

@@ -61,7 +61,7 @@ cc.Class({
     _onLoadImg:function(Url){
         var imgUrl = Url;
         if(cc.sys.localStorage.getItem(AndroidBUG)) imgUrl = imgUrl.replace('https','http');
-        cc.loader.load({'url':imgUrl, type: 'png'}, function(err, texture){//
+        cc.assetManager.loadRemote({'url':imgUrl, type: 'png'}, function(err, texture){//
             if(err) return this._onLoadError(err, Url);
             g_GlobalUserInfo.m_NetImageMap[Url] = new cc.SpriteFrame(texture);
             if(Url == this.m_szUrl) this._onLoadFinish();

+ 1 - 1
assets/Script/CustomClass/HeadPrefab.js

@@ -76,7 +76,7 @@ cc.Class
         // if(bNoSkip) szUrl = this.m_url;
         // if(cc.sys.localStorage.getItem(AndroidBUG)) this.m_url = this.m_url.replace('https','http');
         if(this.m_url.indexOf('https') >= 0) szUrl = this.m_url;
-        cc.loader.load({'url':szUrl, type: 'jpg'}, function(err, texture){
+        cc.assetManager.loadRemote({'url':szUrl, type: 'jpg'}, function(err, texture){
             if(err) return this.OnLoadErr(err, UserID);
             g_GlobalUserInfo.m_UserHeadMap[UserID] = new cc.SpriteFrame(texture);
             if(UserID == this.m_CheckUserID) this.HeadLoadFinish();

+ 2 - 2
assets/Script/CustomClass/WebDataCenter.js

@@ -49,7 +49,7 @@ WebDataCenter = cc.Class({
 
     httpGets:function (Url, CallBack) {
         this.m_LinkCount++;
-        var xhr = cc.loader.getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         xhr.onreadystatechange = function () {
             if (xhr.readyState === 4 && (xhr.status >= 200 && xhr.status < 400)) {
                 this.m_LinkCount--;
@@ -78,7 +78,7 @@ WebDataCenter = cc.Class({
     },
     httpPosts:function (Url, CallBack) {
         this.m_LinkCount++;
-        var xhr = cc.loader.getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         xhr.onreadystatechange = function () {
             if (xhr.readyState === 4 && (xhr.status >= 200 && xhr.status < 400)) {
                 this.m_LinkCount--;