添加循环PageView示例

2026-05-09 23:32:08 +08:00 · 2024-10-28 23:13:41 +08:00
parent 00c8568bb8
commit 38dff3a205
44 changed files with 34615 additions and 58 deletions
--- a/RecyclePageView/.gitignore
+++ b/RecyclePageView/.gitignore
@@ -0,0 +1,51 @@
+#/////////////////////////////////////////////////////////////////////////////
+# Fireball Projects
+#/////////////////////////////////////////////////////////////////////////////
+
+/library/
+/temp/
+/local/
+/build/
+
+#/////////////////////////////////////////////////////////////////////////////
+# npm files
+#/////////////////////////////////////////////////////////////////////////////
+
+npm-debug.log
+node_modules/
+
+#/////////////////////////////////////////////////////////////////////////////
+# Logs and databases
+#/////////////////////////////////////////////////////////////////////////////
+
+*.log
+*.sql
+*.sqlite
+
+#/////////////////////////////////////////////////////////////////////////////
+# files for debugger
+#/////////////////////////////////////////////////////////////////////////////
+
+*.sln
+*.pidb
+*.suo
+
+#/////////////////////////////////////////////////////////////////////////////
+# OS generated files
+#/////////////////////////////////////////////////////////////////////////////
+
+.DS_Store
+ehthumbs.db
+Thumbs.db
+
+#/////////////////////////////////////////////////////////////////////////////
+# WebStorm files
+#/////////////////////////////////////////////////////////////////////////////
+
+.idea/
+
+#//////////////////////////
+# VS Code files
+#//////////////////////////
+
+.vscode/
--- a/RecyclePageView/README.md
+++ b/RecyclePageView/README.md
@@ -0,0 +1,2 @@
+# hello-world
+Hello world new project template.
--- a/RecyclePageView/assets/Prefabs.meta
+++ b/RecyclePageView/assets/Prefabs.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "c5c24aaa-7812-4995-824f-cd41963f6160",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Prefabs/PageItem.prefab
+++ b/RecyclePageView/assets/Prefabs/PageItem.prefab
@@ -0,0 +1,322 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "PageItem",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 400,
+      "height": 290
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Sprite(Splash)",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 101,
+      "g": 145,
+      "b": 136,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 400,
+      "height": 290
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "a5FFeQnnBP6YqaKuVuAG+6",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 97.87,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "Label",
+    "_N$string": "Label",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "9fuH7CB5xGVpthdEDEhYsU",
+    "sync": false
+  },
+  {
+    "__type__": "0dcbcmRiGhFSJBCnuegdupC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "label": {
+      "__id__": 6
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]
--- a/RecyclePageView/assets/Prefabs/PageItem.prefab.meta
+++ b/RecyclePageView/assets/Prefabs/PageItem.prefab.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "b14c159b-d15a-4a28-bcec-bbe0369a34f3",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Scene.meta
+++ b/RecyclePageView/assets/Scene.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "29f52784-2fca-467b-92e7-8fd9ef8c57b7",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Scene/helloworld.fire
+++ b/RecyclePageView/assets/Scene/helloworld.fire
--- a/RecyclePageView/assets/Scene/helloworld.fire.meta
+++ b/RecyclePageView/assets/Scene/helloworld.fire.meta
@@ -0,0 +1,8 @@
+{
+  "ver": "1.3.2",
+  "uuid": "2d2f792f-a40c-49bb-a189-ed176a246e49",
+  "importer": "scene",
+  "asyncLoadAssets": false,
+  "autoReleaseAssets": false,
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Script.meta
+++ b/RecyclePageView/assets/Script.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "4734c20c-0db8-4eb2-92ea-e692f4d70934",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Script/HelloWorld.js
+++ b/RecyclePageView/assets/Script/HelloWorld.js
@@ -0,0 +1,22 @@
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        label: {
+            default: null,
+            type: cc.Label
+        },
+        // defaults, set visually when attaching this script to the Canvas
+        text: 'Hello, World!'
+    },
+
+    // use this for initialization
+    onLoad: function () {
+        this.label.string = this.text;
+    },
+
+    // called every frame
+    update: function (dt) {
+
+    },
+});
--- a/RecyclePageView/assets/Script/HelloWorld.js.meta
+++ b/RecyclePageView/assets/Script/HelloWorld.js.meta
@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "280c3aec-6492-4a9d-9f51-a9b00b570b4a",
+  "importer": "javascript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Script/PageItem.ts
+++ b/RecyclePageView/assets/Script/PageItem.ts
@@ -0,0 +1,19 @@
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class PageItem extends cc.Component {
+
+    @property(cc.Label)
+    label: cc.Label = null;
+
+    // LIFE-CYCLE CALLBACKS:
+
+    // onLoad () {}
+
+    initUI(data) {
+        this.label.string = data;
+    }
+
+    // update (dt) {}
+}
--- a/RecyclePageView/assets/Script/PageItem.ts.meta
+++ b/RecyclePageView/assets/Script/PageItem.ts.meta
@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "0dcbc991-8868-4548-9042-9ee7a076ea42",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Script/RecyclePageView.ts
+++ b/RecyclePageView/assets/Script/RecyclePageView.ts
@@ -0,0 +1,139 @@
+import PageItem from "./PageItem";
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class RecyclePageView extends cc.Component {
+
+    @property(cc.PageView)
+    pageView: cc.PageView = null;
+
+    @property(cc.Prefab)
+    pageItem: cc.Prefab = null;
+
+    pageViewContent: cc.Node = null
+    /**
+     * 只能为奇数，一般为3，优化的话，可以为5
+     */
+    pageViewContainerCount: number = 3;
+    /**
+     * 中心锚点的下标
+     */
+    _centerIndexConst: number = 1;
+
+    /**
+     * 最近显示的index下标
+     */
+    _currenIndex: number = 0;
+
+    /**
+     * 数据
+     */
+    _items: Array<number> = [];
+
+    /**
+     * item实例
+     */
+    _itemInstants: Array<cc.Node> = [];
+
+    _onItemInit: (node, index, data) => void = null;
+    _onItemShow: (node, index, data) => void = null;
+    _onPageChangeEnd: (currentIndex: number) => void = null;
+
+    onLoad() {
+        this.pageView.node.on("scroll-ended", this.onPageEndEvent, this);
+
+        let list = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+        this.init(list, (index) => {
+            console.log('当前item', index)
+        }, (node: cc.Node, index, data) => {
+            let script = node.getComponent(PageItem)
+            script.initUI(data);
+        }, (node, index, data) => {
+            let script = node.getComponent(PageItem)
+            script.initUI(data);
+        })
+    }
+
+    onDestroy(): void {
+        this.pageView.node.off("scroll-ended", this.onPageEndEvent, this);
+    }
+
+    init(list, onPageChangeEnd, onItemInit, onItemShow) {
+        this._onItemInit = onItemInit;
+        this._onItemShow = onItemShow;
+        this._onPageChangeEnd = onPageChangeEnd;
+        if (cc.isValid(this.pageView)) {
+            this.pageViewContent = this.pageView.content;
+            this.pageViewContainerCount = this.pageViewContent.childrenCount;
+            this._centerIndexConst = Math.floor((this.pageViewContainerCount + 0) / 2)
+        }
+        this._items = list;
+        this.resetPageView();
+    }
+
+    /**
+     * 
+     * @param index 0为中心，-1为左，1为右
+     */
+    getContainer(index) {
+        if (index === 0) {
+            return this.pageViewContent[1];
+        } else if (index < 0) {
+            return this.pageViewContent[0];
+        } else {
+            return this.pageViewContent[2];
+        }
+    }
+
+    resetPageView() {
+        //清空,并重新设置
+        for (let i = 0; i < this.pageViewContainerCount; i++) {
+            let container = this.pageViewContent.children[i];
+            container.removeAllChildren();
+            let current = this.getCurrentIndex(i - this._centerIndexConst);
+            let data = this._items[current]
+            let item = this.getPageItem(current, data);
+            item.removeFromParent();
+            container.addChild(item);
+            this._onItemShow && this._onItemShow(item, current, data);
+        }
+
+        this.pageView.scrollToPage(1, 0);
+    }
+
+    getCurrentIndex(containerIndex) {
+        let lenght = this._items.length;
+        let current = (containerIndex + lenght + this._currenIndex) % lenght;
+        return current;
+    }
+
+    setCurrentIndex(dir) {
+        let lenght = this._items.length;
+        let next = (this._currenIndex + dir + lenght) % lenght;
+        console.log("now=", this._currenIndex, "next", next);
+        this._currenIndex = next;
+    }
+
+    getPageItem(index, data,) {
+        if (!this._itemInstants[index]) {
+            let node = cc.instantiate(this.pageItem);
+            this._itemInstants[index] = node;
+            this._onItemInit && this._onItemInit(node, index, data)
+        }
+        return this._itemInstants[index];
+    }
+
+    onPageEndEvent() {
+        let dirrect = this.pageView.getCurrentPageIndex() - 1;
+        console.log("onPageEndEvent", dirrect);
+        if (dirrect == 0) {
+            return;
+        }
+        this.setCurrentIndex(dirrect);
+        this._onPageChangeEnd && this._onPageChangeEnd(this._currenIndex);
+        this.resetPageView();
+    }
+
+    // update (dt) {}
+}
--- a/RecyclePageView/assets/Script/RecyclePageView.ts.meta
+++ b/RecyclePageView/assets/Script/RecyclePageView.ts.meta
@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "5775ecbf-4a26-4521-a56f-69b3cc6798b9",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Texture.meta
+++ b/RecyclePageView/assets/Texture.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "7b81d4e8-ec84-4716-968d-500ac1d78a54",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}
--- a/RecyclePageView/assets/Texture/HelloWorld.png
+++ b/RecyclePageView/assets/Texture/HelloWorld.png
--- a/RecyclePageView/assets/Texture/HelloWorld.png.meta
+++ b/RecyclePageView/assets/Texture/HelloWorld.png.meta
@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "6aa0aa6a-ebee-4155-a088-a687a6aadec4",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 195,
+  "height": 270,
+  "platformSettings": {},
+  "subMetas": {
+    "HelloWorld": {
+      "ver": "1.0.6",
+      "uuid": "31bc895a-c003-4566-a9f3-2e54ae1c17dc",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6aa0aa6a-ebee-4155-a088-a687a6aadec4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 195,
+      "height": 270,
+      "rawWidth": 195,
+      "rawHeight": 270,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}
--- a/RecyclePageView/assets/Texture/singleColor.png
+++ b/RecyclePageView/assets/Texture/singleColor.png
--- a/RecyclePageView/assets/Texture/singleColor.png.meta
+++ b/RecyclePageView/assets/Texture/singleColor.png.meta
@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a8027877-d8d6-4645-97a0-52d4a0123dba",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 2,
+  "height": 2,
+  "platformSettings": {},
+  "subMetas": {
+    "singleColor": {
+      "ver": "1.0.6",
+      "uuid": "410fb916-8721-4663-bab8-34397391ace7",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a8027877-d8d6-4645-97a0-52d4a0123dba",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 2,
+      "height": 2,
+      "rawWidth": 2,
+      "rawHeight": 2,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}
--- a/RecyclePageView/creator.d.ts
+++ b/RecyclePageView/creator.d.ts
--- a/RecyclePageView/jsconfig.json
+++ b/RecyclePageView/jsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "module": "commonjs",
+        "experimentalDecorators": true
+    },
+    "exclude": [
+        "node_modules",
+        ".vscode",
+        "library",
+        "local",
+        "settings",
+        "temp"
+    ]
+}
--- a/RecyclePageView/project.json
+++ b/RecyclePageView/project.json
@@ -0,0 +1,8 @@
+{
+  "engine": "cocos2d-html5",
+  "packages": "packages",
+  "version": "2.4.9",
+  "name": "NewProject_pageView",
+  "id": "6912f677-362c-4214-b5f2-a9ececacc0fa",
+  "isNew": false
+}
--- a/RecyclePageView/settings/builder.json
+++ b/RecyclePageView/settings/builder.json
@@ -0,0 +1,13 @@
+{
+  "excludeScenes": [],
+  "orientation": {
+    "landscapeLeft": true,
+    "landscapeRight": true,
+    "portrait": false,
+    "upsideDown": false
+  },
+  "packageName": "org.cocos2d.helloworld",
+  "startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49",
+  "title": "hello_world",
+  "webOrientation": "auto"
+}
--- a/RecyclePageView/settings/builder.panel.json
+++ b/RecyclePageView/settings/builder.panel.json
@@ -0,0 +1,7 @@
+{
+  "excludeScenes": [],
+  "packageName": "org.cocos2d.helloworld",
+  "platform": "web-mobile",
+  "startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49",
+  "title": "HelloWorld"
+}
--- a/RecyclePageView/settings/project.json
+++ b/RecyclePageView/settings/project.json
@@ -0,0 +1,23 @@
+{
+  "collision-matrix": [
+    [
+      true
+    ]
+  ],
+  "excluded-modules": [],
+  "group-list": [
+    "default"
+  ],
+  "start-scene": "2d2f792f-a40c-49bb-a189-ed176a246e49",
+  "design-resolution-width": 960,
+  "design-resolution-height": 640,
+  "fit-width": false,
+  "fit-height": true,
+  "use-project-simulator-setting": false,
+  "simulator-orientation": false,
+  "use-customize-simulator": false,
+  "simulator-resolution": {
+    "width": 960,
+    "height": 640
+  }
+}
--- a/RecyclePageView/settings/services.json
+++ b/RecyclePageView/settings/services.json
@@ -0,0 +1,6 @@
+{
+	"game": {
+		"name": "未知游戏",
+		"appid": "UNKNOW"
+	}
+}
--- a/RecyclePageView/template-banner.png
+++ b/RecyclePageView/template-banner.png
--- a/RecyclePageView/template.json
+++ b/RecyclePageView/template.json
@@ -0,0 +1,5 @@
+{
+	"name": "TEMPLATES.helloworld.name",
+	"desc": "TEMPLATES.helloworld.desc",
+	"banner": "template-banner.png"
+}
--- a/RecyclePageView/tsconfig.json
+++ b/RecyclePageView/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [ "es2015", "es2017", "dom" ],
+    "target": "es5",
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "outDir": "temp/vscode-dist",
+    "forceConsistentCasingInFileNames": true
+  },
+  "exclude": [
+    "node_modules",
+    "library",
+    "local",
+    "temp",
+    "build",
+    "settings"
+  ]
+}
--- a/TurntableDemoV3/assets/Turntable.meta
+++ b/TurntableDemoV3/assets/Turntable.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
  "importer": "directory",
  "imported": true,
  "uuid": "5998563a-cf40-4879-ad5d-dc4881913dd1",
--- a/TurntableDemoV3/assets/Turntable/scenes.meta
+++ b/TurntableDemoV3/assets/Turntable/scenes.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
  "importer": "directory",
  "imported": true,
  "uuid": "7b9f25bc-52be-4432-979e-14fc809193c9",
--- a/TurntableDemoV3/assets/Turntable/scenes/Turntable.scene
+++ b/TurntableDemoV3/assets/Turntable/scenes/Turntable.scene
@@ -1,7 +1,7 @@
 [
  {
    "__type__": "cc.SceneAsset",
-    "_name": "",
+    "_name": "Turntable",
    "_objFlags": 0,
    "_native": "",
    "scene": {
@@ -100,7 +100,21 @@
    "_illuminanceHDR": 65000,
    "_illuminance": 65000,
    "_illuminanceLDR": 1.6927083333333335,
-    "_id": "597uMYCbhEtJQc0ffJlcgA"
+    "_id": "597uMYCbhEtJQc0ffJlcgA",
+    "_shadowEnabled": false,
+    "_shadowPcf": 0,
+    "_shadowBias": 0.00001,
+    "_shadowNormalBias": 0,
+    "_shadowSaturation": 0.75,
+    "_shadowDistance": 100,
+    "_shadowInvisibleOcclusionRange": 200,
+    "_shadowFixedArea": false,
+    "_shadowNear": 0.1,
+    "_shadowFar": 10,
+    "_shadowOrthoSize": 5,
+    "_csmLevel": 1,
+    "_csmLayerLambda": 0.75,
+    "_csmOptimizationMode": 2
  },
  {
    "__type__": "cc.StaticLightSettings",
@@ -2489,35 +2503,23 @@
      "b": 76,
      "a": 255
    },
-    "_firstSetCSM": false,
-    "_fixedArea": false,
-    "_pcf": 0,
-    "_bias": 0.00001,
-    "_normalBias": 0,
-    "_near": 0.1,
-    "_far": 10,
-    "_shadowDistance": 100,
-    "_invisibleOcclusionRange": 200,
-    "_orthoSize": 5,
    "_maxReceived": 4,
    "_size": {
      "__type__": "cc.Vec2",
      "x": 512,
      "y": 512
-    },
-    "_saturation": 0.75
+    }
  },
  {
    "__type__": "cc.SkyboxInfo",
-    "_applyDiffuseMap": false,
    "_envmapHDR": null,
    "_envmap": null,
    "_envmapLDR": null,
    "_diffuseMapHDR": null,
    "_diffuseMapLDR": null,
    "_enabled": false,
-    "_useIBL": false,
-    "_useHDR": true
+    "_useHDR": true,
+    "_envLightingType": 0
  },
  {
    "__type__": "cc.FogInfo",
--- a/TurntableDemoV3/assets/Turntable/scenes/Turntable.scene.meta
+++ b/TurntableDemoV3/assets/Turntable/scenes/Turntable.scene.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.35",
+  "ver": "1.1.45",
  "importer": "scene",
  "imported": true,
  "uuid": "b9a698e0-c857-4b1b-aca0-41f017641ce6",
--- a/TurntableDemoV3/assets/Turntable/scripts.meta
+++ b/TurntableDemoV3/assets/Turntable/scripts.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
  "importer": "directory",
  "imported": true,
  "uuid": "d2e6545d-07e2-4942-a4e9-df9180546b5a",
--- a/TurntableDemoV3/assets/Turntable/scripts/Turntalbe.ts
+++ b/TurntableDemoV3/assets/Turntable/scripts/Turntalbe.ts
@@ -28,13 +28,13 @@ enum State {
 }
 export class Turntalbe {
    /**设置a */
-    private a = 200;
+    private a = 1000;
    /**没有用到 */
    private b = 0;
    /**开始角度 */
    private c = 0;
    /**运行圈数 */
-    private turnTimer = 5;
+    private turnTimer = 2;
    /**运行的距离 */
    private distanceY: number[] = [0, 0, 0];
    /**需要的时间 */
--- a/TurntableDemoV3/assets/Turntable/scripts/UILuckyBagPage.ts
+++ b/TurntableDemoV3/assets/Turntable/scripts/UILuckyBagPage.ts
@@ -1,5 +1,5 @@

-import { _decorator, Component, Node } from 'cc';
+import { _decorator, Component, Node, tween } from 'cc';
 import { MathTool } from './MathTool';
 import { Turntalbe } from './Turntalbe';
 const { ccclass, property } = _decorator;
@@ -19,12 +19,22 @@ export class UILuckyBagPage extends Component {
        this.turntable.setFinish(this.onFinish.bind(this));
    }

+    onAction(){
+        let angle=3*360;
+        let tw=tween(this.target).to(1.5,{angle:angle}).call(()=>{
+            let index = Math.floor(Math.random() * 360);
+            this.target.angle=index
+        }).to(1.5,{angle:angle});
+        tw.start();
+    }
+
    onFinish() {

    }

    onEventClick(event, custom: string) {
        if (custom == "1") {
+            // this.onAction();
            let index = Math.floor(Math.random() * 8);
            // index=4;
            console.log(index);
--- a/TurntableDemoV3/assets/Turntable/texture.meta
+++ b/TurntableDemoV3/assets/Turntable/texture.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.0",
+  "ver": "1.2.0",
  "importer": "directory",
  "imported": true,
  "uuid": "24751517-4d2d-423f-8e5a-9235c0c939d2",
--- a/TurntableDemoV3/assets/Turntable/texture/GodWheel_beiJing.png.meta
+++ b/TurntableDemoV3/assets/Turntable/texture/GodWheel_beiJing.png.meta
@@ -1,11 +1,11 @@
 {
-  "ver": "1.0.22",
+  "ver": "1.0.26",
  "importer": "image",
  "imported": true,
  "uuid": "e037175e-d2b3-494e-a6b5-a6f08ddfca5f",
  "files": [
-    ".png",
-    ".json"
+    ".json",
+    ".png"
  ],
  "subMetas": {
    "GodWheel_beiJing": {
@@ -50,9 +50,10 @@
        "mipfilter": "none",
        "anisotropy": 0,
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "e037175e-d2b3-494e-a6b5-a6f08ddfca5f"
+        "imageUuidOrDatabaseUri": "e037175e-d2b3-494e-a6b5-a6f08ddfca5f",
+        "visible": false
      },
-      "ver": "1.0.21",
+      "ver": "1.0.22",
      "imported": true,
      "files": [
        ".json"
@@ -84,9 +85,67 @@
        "packable": true,
        "isUuid": true,
        "imageUuidOrDatabaseUri": "e037175e-d2b3-494e-a6b5-a6f08ddfca5f@6c48a",
-        "atlasUuid": ""
+        "atlasUuid": "",
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -258.5,
+            -259,
+            0,
+            258.5,
+            -259,
+            0,
+            -258.5,
+            259,
+            0,
+            258.5,
+            259,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            59,
+            577,
+            576,
+            577,
+            59,
+            59,
+            576,
+            59
+          ],
+          "nuv": [
+            0.09276729559748427,
+            0.09247648902821316,
+            0.9056603773584906,
+            0.09247648902821316,
+            0.09276729559748427,
+            0.9043887147335423,
+            0.9056603773584906,
+            0.9043887147335423
+          ],
+          "minPos": [
+            -258.5,
+            -259,
+            0
+          ],
+          "maxPos": [
+            258.5,
+            259,
+            0
+          ]
+        }
      },
-      "ver": "1.0.9",
+      "ver": "1.0.12",
      "imported": true,
      "files": [
        ".json"
@@ -100,6 +159,7 @@
    "redirect": "e037175e-d2b3-494e-a6b5-a6f08ddfca5f@f9941",
    "compressSettings": {
      "useCompressTexture": false
-    }
+    },
+    "fixAlphaTransparencyArtifacts": false
  }
 }
--- a/TurntableDemoV3/assets/Turntable/texture/GodWheel_deng1.png.meta
+++ b/TurntableDemoV3/assets/Turntable/texture/GodWheel_deng1.png.meta
@@ -1,11 +1,11 @@
 {
-  "ver": "1.0.22",
+  "ver": "1.0.26",
  "importer": "image",
  "imported": true,
  "uuid": "4d1a7f02-d10c-4023-bb31-62e114f9a773",
  "files": [
-    ".png",
-    ".json"
+    ".json",
+    ".png"
  ],
  "subMetas": {
    "GodWheel_deng1": {
@@ -50,9 +50,10 @@
        "mipfilter": "none",
        "anisotropy": 0,
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4d1a7f02-d10c-4023-bb31-62e114f9a773"
+        "imageUuidOrDatabaseUri": "4d1a7f02-d10c-4023-bb31-62e114f9a773",
+        "visible": false
      },
-      "ver": "1.0.21",
+      "ver": "1.0.22",
      "imported": true,
      "files": [
        ".json"
@@ -84,9 +85,67 @@
        "packable": true,
        "isUuid": true,
        "imageUuidOrDatabaseUri": "4d1a7f02-d10c-4023-bb31-62e114f9a773@6c48a",
-        "atlasUuid": ""
+        "atlasUuid": "",
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -304,
+            -311,
+            0,
+            304,
+            -311,
+            0,
+            -304,
+            311,
+            0,
+            304,
+            311,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            8,
+            623,
+            616,
+            623,
+            8,
+            1,
+            616,
+            1
+          ],
+          "nuv": [
+            0.01282051282051282,
+            0.0016025641025641025,
+            0.9871794871794872,
+            0.0016025641025641025,
+            0.01282051282051282,
+            0.9983974358974359,
+            0.9871794871794872,
+            0.9983974358974359
+          ],
+          "minPos": [
+            -304,
+            -311,
+            0
+          ],
+          "maxPos": [
+            304,
+            311,
+            0
+          ]
+        }
      },
-      "ver": "1.0.9",
+      "ver": "1.0.12",
      "imported": true,
      "files": [
        ".json"
@@ -97,6 +156,7 @@
  "userData": {
    "hasAlpha": true,
    "type": "sprite-frame",
-    "redirect": "4d1a7f02-d10c-4023-bb31-62e114f9a773@f9941"
+    "redirect": "4d1a7f02-d10c-4023-bb31-62e114f9a773@f9941",
+    "fixAlphaTransparencyArtifacts": false
  }
 }
--- a/TurntableDemoV3/assets/Turntable/texture/GodWheel_deng2.png.meta
+++ b/TurntableDemoV3/assets/Turntable/texture/GodWheel_deng2.png.meta
@@ -1,11 +1,11 @@
 {
-  "ver": "1.0.22",
+  "ver": "1.0.26",
  "importer": "image",
  "imported": true,
  "uuid": "9ce20cec-5cad-408d-887a-b5a6c6fb586d",
  "files": [
-    ".png",
-    ".json"
+    ".json",
+    ".png"
  ],
  "subMetas": {
    "GodWheel_deng2": {
@@ -50,9 +50,10 @@
        "mipfilter": "none",
        "anisotropy": 0,
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9ce20cec-5cad-408d-887a-b5a6c6fb586d"
+        "imageUuidOrDatabaseUri": "9ce20cec-5cad-408d-887a-b5a6c6fb586d",
+        "visible": false
      },
-      "ver": "1.0.21",
+      "ver": "1.0.22",
      "imported": true,
      "files": [
        ".json"
@@ -84,9 +85,67 @@
        "packable": true,
        "isUuid": true,
        "imageUuidOrDatabaseUri": "9ce20cec-5cad-408d-887a-b5a6c6fb586d@6c48a",
-        "atlasUuid": ""
+        "atlasUuid": "",
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -311,
+            -303,
+            0,
+            311,
+            -303,
+            0,
+            -311,
+            303,
+            0,
+            311,
+            303,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            614,
+            623,
+            614,
+            1,
+            8,
+            623,
+            8
+          ],
+          "nuv": [
+            0.0016025641025641025,
+            0.01282051282051282,
+            0.9983974358974359,
+            0.01282051282051282,
+            0.0016025641025641025,
+            0.9839743589743589,
+            0.9983974358974359,
+            0.9839743589743589
+          ],
+          "minPos": [
+            -311,
+            -303,
+            0
+          ],
+          "maxPos": [
+            311,
+            303,
+            0
+          ]
+        }
      },
-      "ver": "1.0.9",
+      "ver": "1.0.12",
      "imported": true,
      "files": [
        ".json"
@@ -97,6 +156,7 @@
  "userData": {
    "hasAlpha": true,
    "type": "sprite-frame",
-    "redirect": "9ce20cec-5cad-408d-887a-b5a6c6fb586d@f9941"
+    "redirect": "9ce20cec-5cad-408d-887a-b5a6c6fb586d@f9941",
+    "fixAlphaTransparencyArtifacts": false
  }
 }
--- a/TurntableDemoV3/assets/Turntable/texture/GodWheel_zhuanPan.png.meta
+++ b/TurntableDemoV3/assets/Turntable/texture/GodWheel_zhuanPan.png.meta
@@ -1,11 +1,11 @@
 {
-  "ver": "1.0.22",
+  "ver": "1.0.26",
  "importer": "image",
  "imported": true,
  "uuid": "8742f019-1cb4-431f-9a36-46f0e59500ea",
  "files": [
-    ".png",
-    ".json"
+    ".json",
+    ".png"
  ],
  "subMetas": {
    "6c48a": {
@@ -22,9 +22,10 @@
        "mipfilter": "none",
        "anisotropy": 0,
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8742f019-1cb4-431f-9a36-46f0e59500ea"
+        "imageUuidOrDatabaseUri": "8742f019-1cb4-431f-9a36-46f0e59500ea",
+        "visible": false
      },
-      "ver": "1.0.21",
+      "ver": "1.0.22",
      "imported": true,
      "files": [
        ".json"
@@ -56,9 +57,67 @@
        "packable": true,
        "isUuid": true,
        "imageUuidOrDatabaseUri": "8742f019-1cb4-431f-9a36-46f0e59500ea@6c48a",
-        "atlasUuid": ""
+        "atlasUuid": "",
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -300,
+            -300,
+            0,
+            300,
+            -300,
+            0,
+            -300,
+            300,
+            0,
+            300,
+            300,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            600,
+            600,
+            600,
+            0,
+            0,
+            600,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -300,
+            -300,
+            0
+          ],
+          "maxPos": [
+            300,
+            300,
+            0
+          ]
+        }
      },
-      "ver": "1.0.9",
+      "ver": "1.0.12",
      "imported": true,
      "files": [
        ".json"
@@ -69,6 +128,7 @@
  "userData": {
    "hasAlpha": true,
    "type": "sprite-frame",
-    "redirect": "8742f019-1cb4-431f-9a36-46f0e59500ea@f9941"
+    "redirect": "8742f019-1cb4-431f-9a36-46f0e59500ea@f9941",
+    "fixAlphaTransparencyArtifacts": false
  }
 }
--- a/TurntableDemoV3/package.json
+++ b/TurntableDemoV3/package.json
@@ -4,6 +4,6 @@
  "uuid": "a061dcdb-2e0e-4a06-9a72-77273be06df0",
  "version": "3.4.0",
  "creator": {
-    "version": "3.4.0"
+    "version": "3.8.0"
  }
 }
--- a/TurntableDemoV3/settings/v2/packages/project.json
+++ b/TurntableDemoV3/settings/v2/packages/project.json
@@ -4,5 +4,11 @@
      "width": 720,
      "height": 1280
    }
+  },
+  "__version__": "1.0.5",
+  "fbx": {
+    "legacyFbxImporter": {
+      "visible": true
+    }
  }
 }