4 Commity 1e31515856 ... e7f892de14

Autor SHA1 Wiadomość Data
  hwt e7f892de14 Merge branch '0.6' of http://svn.ouj.com:3000/DWG/allstar into 0.6 6 lat temu
  hwt 5023058f37 修改分享图片 6 lat temu
  hwt de5e0d28d8 Merge branch '0.6' of http://svn.ouj.com:3000/DWG/allstar into 0.6 6 lat temu
  hwt 940a2b1b28 初始化位置 6 lat temu

+ 1 - 0
assets/scripts/friendlist/FriendList.js

@@ -66,6 +66,7 @@ cc.Class({
         this.hasNext = 0;
         this.getNetworkData(false);
         this.canLoad = true;
+        this.scrollView.scrollToTop(0);
     },
 
     getNetworkData(ignoneRequestDuration) {

+ 2 - 2
assets/scripts/friendlist/FriendSystem.js

@@ -101,8 +101,8 @@ cc.Class({
     closeFriendSystem: function () {
         this.friendNode.getComponent('FriendList').friendLastRequestTime = -1;
         this.currentIndex = -1;
-        // this.node.active = false;
-        this.node.destroy();
+        this.node.active = false;
+        // this.node.destroy();
         this._wechatFriendNode.active = false;
     },
 

+ 2 - 1
assets/scripts/net/WeChat.js

@@ -176,7 +176,8 @@ class WeChat {
     }
 
     inviteFriendPromise() {
-        return this._invite(ShareAction.ADD_FRIEND, '确认过眼神,你就是我要的C位', 'share1.jpg');
+        let content = artistInvite[Math.floor(Math.random() * 5)];
+        return this._invite(ShareAction.ADD_FRIEND, '确认过眼神,你就是我要的C位', content.image);
     }
 
     inviteArtistPromise() {

+ 2 - 2
assets/scripts/utils/Global.js

@@ -1,7 +1,7 @@
 const BuildingManager = require("../utils/BuildingManager");
 const ShareAction = require('./ShareAction');
 const Notikey = require('../utils/GameEnum').GameNotificationKey;
-const DWTool = require('./utils/DWTool');
+const DWTool = require('../utils/DWTool');
 
 var Global = Global || {}
 Global = {
@@ -9,7 +9,7 @@ Global = {
     // 建筑管理
     BuildingManager: BuildingManager.instance,
 
-    debug: false,
+    debug: true,
 
     /**
      * 点击别人分享的链接需要进行的操作 加好友