Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/resources/module/gradeReward/gradeReward.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 105
       },
       {
-        "__id__": 81
+        "__id__": 106
       },
       {
-        "__id__": 82
+        "__id__": 107
       },
       {
-        "__id__": 83
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 79
+      "__id__": 104
     },
     "_opacity": 255,
     "_color": {
@@ -168,26 +168,26 @@
         "__id__": 10
       },
       {
-        "__id__": 58
+        "__id__": 83
       },
       {
-        "__id__": 61
+        "__id__": 86
       },
       {
-        "__id__": 70
+        "__id__": 95
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 101
       },
       {
-        "__id__": 77
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 103
     },
     "_opacity": 255,
     "_color": {
@@ -469,11 +469,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -977,26 +977,26 @@
         "__id__": 30
       },
       {
-        "__id__": 34
+        "__id__": 39
       },
       {
-        "__id__": 38
+        "__id__": 48
       },
       {
-        "__id__": 42
+        "__id__": 57
       },
       {
-        "__id__": 46
+        "__id__": 66
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -1274,10 +1274,13 @@
       },
       {
         "__id__": 32
+      },
+      {
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1378,6 +1381,76 @@
     "_id": ""
   },
   {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 30
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 34
+    },
+    "targetData": [
+      {
+        "__id__": 35
+      }
+    ],
+    "target": {
+      "__id__": 30
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 37
+    },
+    "playOnLoad": true,
+    "isSetSuitStartPos": false,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": 296.949
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": false
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 36
+    },
+    "duration": 0.3,
+    "delay": 0.5,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": 296.949
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1399,14 +1472,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 40
       },
       {
-        "__id__": 36
+        "__id__": 41
+      },
+      {
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1460,7 +1536,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 39
     },
     "_enabled": true,
     "_materials": [
@@ -1493,7 +1569,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 39
     },
     "_enabled": true,
     "_color": {
@@ -1507,6 +1583,76 @@
     "_id": ""
   },
   {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 39
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 43
+    },
+    "targetData": [
+      {
+        "__id__": 44
+      }
+    ],
+    "target": {
+      "__id__": 39
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 46
+    },
+    "playOnLoad": true,
+    "isSetSuitStartPos": false,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": 149.956
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": false
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 45
+    },
+    "duration": 0.3,
+    "delay": 0.6,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": 149.956
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1528,14 +1674,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 49
       },
       {
-        "__id__": 40
+        "__id__": 50
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -1589,7 +1738,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1622,7 +1771,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 48
     },
     "_enabled": true,
     "_color": {
@@ -1636,6 +1785,76 @@
     "_id": ""
   },
   {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 52
+    },
+    "targetData": [
+      {
+        "__id__": 53
+      }
+    ],
+    "target": {
+      "__id__": 48
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 55
+    },
+    "playOnLoad": true,
+    "isSetSuitStartPos": false,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": 0
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": false
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 54
+    },
+    "duration": 0.3,
+    "delay": 0.7,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": 0
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1657,14 +1876,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 58
       },
       {
-        "__id__": 44
+        "__id__": 59
+      },
+      {
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -1718,7 +1940,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 57
     },
     "_enabled": true,
     "_materials": [
@@ -1751,7 +1973,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 57
     },
     "_enabled": true,
     "_color": {
@@ -1765,6 +1987,76 @@
     "_id": ""
   },
   {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 57
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 61
+    },
+    "targetData": [
+      {
+        "__id__": 62
+      }
+    ],
+    "target": {
+      "__id__": 57
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 64
+    },
+    "playOnLoad": true,
+    "isSetSuitStartPos": false,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": -147.045
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": false
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 63
+    },
+    "duration": 0.3,
+    "delay": 0.8,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": -147.045
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1786,14 +2078,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 67
       },
       {
-        "__id__": 48
+        "__id__": 68
+      },
+      {
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
@@ -1847,7 +2142,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 66
     },
     "_enabled": true,
     "_materials": [
@@ -1880,7 +2175,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 66
     },
     "_enabled": true,
     "_color": {
@@ -1894,6 +2189,76 @@
     "_id": ""
   },
   {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 66
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 70
+    },
+    "targetData": [
+      {
+        "__id__": 71
+      }
+    ],
+    "target": {
+      "__id__": 66
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 73
+    },
+    "playOnLoad": true,
+    "isSetSuitStartPos": false,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": -293.746
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": false
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 72
+    },
+    "duration": 0.3,
+    "delay": 0.9,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 1.669,
+      "y": -293.746
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1956,11 +2321,11 @@
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 53
+      "__id__": 78
     },
     "targetData": [
       {
-        "__id__": 54
+        "__id__": 79
       }
     ],
     "target": {
@@ -1969,9 +2334,10 @@
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 56
+      "__id__": 81
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -1988,7 +2354,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 55
+      "__id__": 80
     },
     "duration": 0.2,
     "delay": 0.3,
@@ -2038,11 +2404,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 85
     },
     "_opacity": 255,
     "_color": {
@@ -2096,7 +2462,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 83
     },
     "_enabled": true,
     "_layoutSize": {
@@ -2145,17 +2511,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 87
       },
       {
-        "__id__": 63
+        "__id__": 88
       },
       {
-        "__id__": 64
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -2209,7 +2575,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 86
     },
     "_enabled": true,
     "_materials": [
@@ -2241,7 +2607,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 86
     },
     "_enabled": true,
     "node_panel": {
@@ -2256,26 +2622,27 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 86
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 65
+      "__id__": 90
     },
     "targetData": [
       {
-        "__id__": 66
+        "__id__": 91
       }
     ],
     "target": {
-      "__id__": 61
+      "__id__": 86
     },
     "tweenEasing": 21,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 68
+      "__id__": 93
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -2286,16 +2653,16 @@
       "y": 706.424
     },
     "angle": 0,
-    "scale": 1,
+    "scale": 0,
     "active": false
   },
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 67
+      "__id__": 92
     },
     "duration": 0.3,
-    "delay": 0.8,
+    "delay": 1,
     "isOffset": false,
     "onComplete": [],
     "onStart": [],
@@ -2340,17 +2707,17 @@
     },
     "_children": [
       {
-        "__id__": 71
+        "__id__": 96
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 100
     },
     "_opacity": 255,
     "_color": {
@@ -2404,17 +2771,17 @@
     "_name": "title",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 70
+      "__id__": 95
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 98
     },
     "_opacity": 255,
     "_color": {
@@ -2468,7 +2835,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 71
+      "__id__": 96
     },
     "_enabled": true,
     "_materials": [
@@ -2511,7 +2878,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 95
     },
     "_enabled": true,
     "_materials": [
@@ -2691,23 +3058,23 @@
       "__id__": 25
     },
     "node_content": {
-      "__id__": 58
+      "__id__": 83
     },
     "node_child": {
       "__uuid__": "c1aed361-0f66-4292-8257-cd81d5de25af"
     },
     "lbl_progress": [
       {
-        "__id__": 47
+        "__id__": 67
       },
       {
-        "__id__": 43
+        "__id__": 58
       },
       {
-        "__id__": 39
+        "__id__": 49
       },
       {
-        "__id__": 35
+        "__id__": 40
       },
       {
         "__id__": 31

assets/resources/module/setting/setting.prefab

@@ -536,6 +536,7 @@
       "__id__": 19
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -1820,6 +1821,7 @@
       "__id__": 56
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -4020,6 +4022,7 @@
       "__id__": 119
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -4814,6 +4817,7 @@
       "__id__": 143
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -5101,6 +5105,7 @@
       "__id__": 155
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {
@@ -5111,7 +5116,7 @@
       "y": 577.643
     },
     "angle": 0,
-    "scale": 1,
+    "scale": 0,
     "active": false
   },
   {
@@ -5530,6 +5535,7 @@
       "__id__": 172
     },
     "playOnLoad": true,
+    "isSetSuitStartPos": false,
     "_id": ""
   },
   {

assets/script/game/component/TableView.ts

@@ -580,6 +580,22 @@ export default class TableView extends cc.Component {
         }
     }
 
+    public getItemByIndexAndCount(index: number, count: number)
+    {
+        const itemArray: Array<cc.Node> = [];
+        for(let i = 0; i != count; ++i){
+            for(let j = 0; j != this.itemArr.length; ++j)
+            {
+                if(this.itemArr[j].index == (index +i))
+                {
+                    itemArray.push(this.itemArr[j]);
+                    break;
+                }
+            }
+        }
+        return itemArray;
+    }
+
     /**
      * 得到相关位置的排序index
      * 方法待验证，可能有问题

assets/script/game/component/tween/UITween.ts

@@ -60,6 +60,9 @@ export class UITween extends cc.Component {
     @property({ displayName: "自动播放" }) 
     public playOnLoad: boolean = true;
 
+    @property({displayName:'是否设置起始位置为屏幕旁边按屏幕加节点尺寸的一半'})
+    public isSetSuitStartPos: boolean = false;
+
     private _edit_play: boolean = false;
     @property({ displayName: "编辑器预览" })
     get edit_play(): boolean {
@@ -144,7 +147,16 @@ export class UITween extends cc.Component {
     public readyPlay() {
         let self = this;
         if (this.fromData) {
-            this.node.setPosition(this.fromData.position.clone());
+            if(this.isSetSuitStartPos)
+            {
+                if(this.fromData.position.x >0)
+                {
+                    this.fromData.position.x = cc.winSize.width / 2 + this.target.getContentSize().width/2;
+                }else{
+                    this.fromData.position.x = -cc.winSize.width / 2 - this.target.getContentSize().width/2;
+                }
+            }
+            this.node.setPosition(this.fromData.position.clone());   
             this.node.scale = this.fromData.scale;
             this.node.angle = this.fromData.angle;
             this.node.active = this.fromData.active;
@@ -181,6 +193,7 @@ export class UITween extends cc.Component {
                     {
                         easing: TweenEasing[this.tweenEasing] as any,
                         onComplete: (target: cc.Node) => {
+                            console.log("----------tweenComplete");
                             if(targetData.onComplete && targetData.onComplete.length > 0)
                             {
                                for(let i = 0; i != targetData.onComplete.length; ++i)
@@ -193,6 +206,7 @@ export class UITween extends cc.Component {
                             // this._edit_play = false;
                         },
                         onStart: (target: cc.Node) => { 
+                            console.log("----------tweenStart");
                             //targetData.onStart && targetData.onStart.emit([target]) 
                             if(targetData.onStart && targetData.onStart.length > 0)
                             {

assets/script/game/module/gradeReward/GradeRewardItem.ts

@@ -22,11 +22,12 @@ export class GradeRewardItem extends cc.Component{
     }
 
     async start(){
-        //this.node.active = false;
-        cc.tween(this.node).delay(0.8 - this.id * 0.1).call(()=>{
+         let p = this.node.position;
+        this.node.position = cc.v3(540, p.y, 0);
+        cc.tween(this.node).delay(0.9 - this.id * 0.1).call(()=>{
             this.node.active = true;   
-            let p = this.node.position;
-            this.node.position = cc.v3(540, p.y, 0);
+            //let p = this.node.position;
+            //this.node.position = cc.v3(540, p.y, 0);
         }).to(0.2, {x: 0}).start();
         
         //this.showUI();

assets/script/game/module/sign/Sign.ts

@@ -42,10 +42,22 @@ export default class Sign extends cc.Component {
         this.scroll_view.node.emit('srollview-init', list_data)
         this.tableview = this.scroll_view.node.getComponent('TableView')
 
-        // let index = gData.sign.getItemIndexByCanSign();
-        // if (index > 0)
-        //     index -= 1;
-        // this.tableview.contentMoveByIndex(index, 0.1);
+        let index = gData.sign.getItemIndexByCanSign();
+        if (index > 0)
+            index -= 1;
+        this.tableview.contentMoveByIndex(index, 0.1);
+
+        // cc.tween(this.node).delay(0.16).call(()=>{
+        //     let allItem = this.tableview.getItemByIndexAndCount(index, 3);
+
+        //     for(let i = 0; i != allItem.length; ++i)
+        //     {
+        //         allItem[i].setPosition(allItem[i].position.x, allItem[i].position.y - 500);
+        //         cc.tween(allItem[i]).by(0.2 + 0.1*i, {y: 500});
+        //     }
+        //     console.log("---");
+        // }).start();
+        
     }