Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

assets/gameChild/texture/GuideMainUI/btnTip.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "ee914e05-0fc8-4cbb-9cc4-ba0b289680b3",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 84,
-  "height": 82,
-  "platformSettings": {},
-  "subMetas": {
-    "btnTip": {
-      "ver": "1.0.4",
-      "uuid": "55c74975-9a8d-4f9c-82b8-832218bf5ac6",
-      "rawTextureUuid": "ee914e05-0fc8-4cbb-9cc4-ba0b289680b3",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 84,
-      "height": 82,
-      "rawWidth": 84,
-      "rawHeight": 82,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/scene/Editor.fire

@@ -174,7 +174,7 @@
       "array": [
         0,
         0,
-        512.1593048099566,
+        526.0427745643758,
         0,
         0,
         0,

assets/scene/Main.fire

@@ -298,7 +298,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        4,
         0,
         0,
         0,

assets/script/config/UICfg.ts

@@ -38,6 +38,7 @@ uiCfg.set(UI.ClassTipUI, {url: 'child/ClassTipUI'})
 uiCfg.set(UI.TipUI, {url: 'public/TipUI'})
 uiCfg.set(UI.GameUI, {url: 'public/GameUI'})
 uiCfg.set(UI.GuideUI, {url: 'public/GuideUI'})
+uiCfg.set(UI.GuideMainUI, {url: 'child/GuideMainUI'})
 uiCfg.set(UI.GameResultUI, {url: 'child/GameResultUI'})
 uiCfg.set(UI.ClassUI, {url: 'child/ClassUI'})
 uiCfg.set(UI.ClassResultUI, {url: 'child/ClassResultUI'})

assets/script/enums/UI.ts

@@ -26,6 +26,7 @@ export enum UI {
     SemeGirdUI,
     GameUI,
     GuideUI,
+    GuideMainUI,
     FadeInOutUI,
     RoleSetUI,
     FingerSetUI,

assets/script/rule/GuideRule.ts

@@ -166,7 +166,7 @@ export default class GuideRule extends cc.Component {
             )
             animation.addClip(clip)
         }
-        if (data.tex) this.guideUI.loadSemeImg(PathUtils.addGP('guide/' + data.tex, '', 1))
+        if (data.tex) this.guideUI.loadSemeImg(PathUtils.addGP('guide/' + data.tex, '', 1), this.node)
         if (data.jumpPage) this.jumpPage = data.jumpPage
         this.actions = []
         if (data.actions) {
@@ -271,16 +271,20 @@ export default class GuideRule extends cc.Component {
                             .delay(customAction.startDelay)
                             .call(() => {
                                 for (let audio of customAction.audios) {
-                                    this.scheduleOnce(() => {
-                                        if (CC_EDITOR) {
-                                            this.editorPlayAudio(PathUtils.addSGP('guide/' + audio.audioName, '', 2))
-                                        } else {
-                                            Mgr.audio.playSFX(
-                                                PathUtils.addGP('guide/' + audio.audioName, '', 1),
-                                                Data.game.semeBundle,
-                                            )
-                                        }
-                                    }, audio.audioDelay)
+                                    if (audio.audioName) {
+                                        this.scheduleOnce(() => {
+                                            if (CC_EDITOR) {
+                                                this.editorPlayAudio(
+                                                    PathUtils.addSGP('guide/' + audio.audioName, '', 2),
+                                                )
+                                            } else {
+                                                Mgr.audio.playSFX(
+                                                    PathUtils.addGP('guide/' + audio.audioName, '', 1),
+                                                    Data.game.semeBundle,
+                                                )
+                                            }
+                                        }, audio.audioDelay)
+                                    }
                                 }
                             })
                         if (customAction.actionType == ACT_TYPE.fadeTo) {
@@ -406,13 +410,18 @@ export default class GuideRule extends cc.Component {
                         })
                         .start()
                 for (let audio of this.audios) {
-                    this.scheduleOnce(() => {
-                        if (CC_EDITOR) {
-                            this.editorPlayAudio(PathUtils.addSGP('guide/' + audio.audioName, '', 2))
-                        } else {
-                            Mgr.audio.playSFX(PathUtils.addGP('guide/' + audio.audioName, '', 1), Data.game.semeBundle)
-                        }
-                    }, audio.audioDelay)
+                    if (audio.audioName) {
+                        this.scheduleOnce(() => {
+                            if (CC_EDITOR) {
+                                this.editorPlayAudio(PathUtils.addSGP('guide/' + audio.audioName, '', 2))
+                            } else {
+                                Mgr.audio.playSFX(
+                                    PathUtils.addGP('guide/' + audio.audioName, '', 1),
+                                    Data.game.semeBundle,
+                                )
+                            }
+                        }, audio.audioDelay)
+                    }
                 }
             }
         } else if (this.playState == PLAY_STATE.pause) {

assets/script/ui/child/GameOptUI.ts

@@ -13,18 +13,18 @@ import {SemePartCfg} from '../../config/SemePartCfg'
 import {HttpUrl} from '../../config/HttpUrl'
 import {ConstValue} from '../../data/ConstValue'
 import List from '../../uiutils/List'
+import {FiveDrawCell} from '../../cell/FiveDrawCell'
+import {ChoosePartCell} from '../../cell/ChoosePartCell'
 
 const {ccclass, property} = cc._decorator
-let drawColor = ['#f04949', '#2c98f2', '#66bb2f', '#ffaf00', '#9b1fec']
 @ccclass
 @observer
 export default class GameOptUI extends BaseUI {
     previousNode: cc.Node
     nextNode: cc.Node
-    dbCell: DrawBoardCell
+    fiveDraw: FiveDrawCell
     tempStars: cc.Node[]
-    partScrollNode: cc.Node
-    partScrollList: List
+    choosePartCell: ChoosePartCell
     classLock: cc.Node
     fingerTouch: cc.Node
     fingerNode: cc.Node
@@ -35,12 +35,11 @@ export default class GameOptUI extends BaseUI {
     protected onLoad() {
         this.previousNode = cc.find('btn_previous', this.node)
         this.nextNode = cc.find('btn_next', this.node)
-        //初始化画板
-        this.dbCell = cc.find('dbCell', this.node).getComponent(DrawBoardCell)
-        this.dbCell.initDb(1280, 580)
+        //初始化五色画板
+        this.fiveDraw = cc.find('topBtns/allDrawLayout', this.node).getComponent(FiveDrawCell)
+        this.fiveDraw.init(cc.find('dbCell', this.node))
 
-        //默认画板颜色
-        this.showColorChoose(0)
+        this.choosePartCell = cc.find('choosePart', this.node).getComponent(ChoosePartCell)
 
         this.classLock = cc.find('classLock', this.node)
 
@@ -98,14 +97,12 @@ export default class GameOptUI extends BaseUI {
         // 关卡进度星星动画的临时节点
         if (this.tempStars) this.tempStars.forEach(value => value.destroy())
         this.tempStars = []
-        this.partScrollNode = cc.find('choosePart/scrollView', this.node)
-        this.partScrollList = this.partScrollNode.getComponent(List)
-        this.partScrollList._init()
-        this.partScrollList.numItems = allNum
+        this.choosePartCell.initCurPart(Data.game.partID)
+        this.choosePartCell.init(allNum, this, this.partClick, this.canChoosePart)
+
         this.setGameDur()
 
-        // 隐藏画板
-        this.drawLineClick(null, false)
+        this.fiveDraw.hideDraw()
     }
 
     initUI() {
@@ -148,15 +145,6 @@ export default class GameOptUI extends BaseUI {
         }
         return true
     }
-
-    showColorChoose(dbColor) {
-        let allDrawLayout = cc.find('topBtns/allDrawLayout', this.node)
-        allDrawLayout.children[0].children.forEach((value, i) => {
-            if (value.children[0]) value.children[0].active = i == dbColor
-        })
-        this.dbCell.setDbColor(cc.Color.BLACK.fromHEX(drawColor[dbColor]))
-    }
-
     setGameDur() {
         let gameDur = cc.find('gameDur', this.node)
         for (let i = 0; i < 12; i++) {
@@ -303,11 +291,6 @@ export default class GameOptUI extends BaseUI {
         this.fingerNode.x = pos.x
         this.fingerNode.y = pos.y
     }
-    initPartScrollItem(node, index) {
-        node.part = index + 1
-        ccUtils.setLabel((index + 1).toString(), node, 'lb')
-        cc.find('rdBg', node).active = index + 1 == Data.game.partID
-    }
     // 界面元素通用动作
     gameNodeClickAni(node) {
         let t = cc.tween
@@ -422,44 +405,20 @@ export default class GameOptUI extends BaseUI {
         if (!this.canChoosePart()) return
         Data.game.partID -= 1
         this.changeGame()
+        this.choosePartCell.initCurPart(Data.game.partID)
     }
 
     nextClick() {
         if (!this.canChoosePart()) return
         Data.game.partID += 1
         this.changeGame()
+        this.choosePartCell.initCurPart(Data.game.partID)
     }
 
     titleAudioClick() {
         Mgr.audio.playSFX(PathUtils.addGP(Data.game.curPageNum > 0 ? 'audio1' : 'audio'), Data.game.semeBundle)
     }
 
-    drawLineClick(e, show?: boolean) {
-        let showDraw = !this.dbCell.node.active
-        if (show != undefined) {
-            this.dbCell.node.active = show
-            showDraw = show
-        } else {
-            this.dbCell.node.active = showDraw
-        }
-        let allDrawLayout = cc.find('topBtns/allDrawLayout', this.node)
-        cc.find('drawlayout', allDrawLayout).active = showDraw
-        allDrawLayout.getComponent(cc.Sprite).enabled = showDraw
-    }
-
-    setColorClick(event, color) {
-        let dbColor = parseInt(color) - 1
-        this.dbCell.setDbColor(cc.Color.BLACK.fromHEX(drawColor[dbColor]))
-        this.showColorChoose(dbColor)
-    }
-
-    clearColorClick(event, color) {
-        this.dbCell.db.clearColor()
-        this.scheduleOnce(() => {
-            this.dbCell.drawToImg()
-        })
-    }
-
     videoClick() {
         Mgr.ui.show(UI.VideoUI)
         Mgr.audio.stopBGM()
@@ -477,14 +436,7 @@ export default class GameOptUI extends BaseUI {
         Mgr.ui.show(UI.ClassUI)
     }
 
-    choosePartClick() {
-        if (!this.canChoosePart()) return
-        this.partScrollNode.active = !this.partScrollNode.active
-        this.partScrollList.scrollTo(Data.game.partID - 1, 0)
-    }
-
     partClick(event) {
-        this.partScrollNode.active = false
         Data.game.partID = event.target.part
         this.changeGame()
     }

assets/script/ui/child/SemeGirdUI.ts

@@ -68,7 +68,11 @@ export default class SemeGirdUI extends BaseUI {
         Data.game.gameID = node['gameID']
         Data.game.partID = 1
         this.lastSemeID = Data.game.semeID
-        Mgr.ui.show(UI.GameUI)
+        if (Data.child.isTeacher) {
+            Mgr.ui.show(UI.GuideMainUI)
+        } else {
+            Mgr.ui.show(UI.GameUI)
+        }
         this.hide()
     }
 }

assets/script/ui/public/GuideUI.ts

@@ -3,7 +3,14 @@ import {BaseUI} from '../BaseUI'
 import {ccUtils} from '../../utils/ccUtils'
 import GuideRule from '../../rule/GuideRule'
 import {GAME_TYPE} from '../../enums/Enum'
+import {Data, Mgr} from '../../GameControl'
+import {PathUtils} from '../../utils/PathUtils'
+import {UI} from '../../enums/UI'
+import {DrawBoardCell} from '../../cell/DrawBoardCell'
+import {FiveDrawCell} from '../../cell/FiveDrawCell'
+import {ChoosePartCell} from '../../cell/ChoosePartCell'
 const {ccclass, property} = cc._decorator
+
 @ccclass
 export class GuideUI extends BaseUI {
     // 编辑器序列属性
@@ -19,10 +26,35 @@ export class GuideUI extends BaseUI {
     allNodes: cc.Node[][] = []
     curPageRules: GuideRule[] = []
     canPlay: boolean = false
+    fiveDraw: FiveDrawCell
+    choosePartCell: ChoosePartCell
+    pageNum: number = 0
+    curPage: number = 1
+    protected onLoad() {
+        //初始化五色画板
+        this.fiveDraw = cc.find('allDrawLayout', this.node).getComponent(FiveDrawCell)
+        this.fiveDraw.init(cc.find('dbCell', this.node))
+
+        this.choosePartCell = cc.find('choosePart', this.node).getComponent(ChoosePartCell)
+    }
 
     protected onDisable() {
         this.canPlay = false
     }
+    async onShow(args, fromUI: number) {
+        this.fiveDraw.hideDraw()
+        Data.game.semeBundle = await ccUtils.getBundleAsync(GAME_TYPE[Data.game.curGameType] + Data.game.semeID)
+        let guideJson: cc.JsonAsset = await this.loadSync(
+            Data.game.semeBundle,
+            PathUtils.addGP('guide/guide_' + [Data.game.semeID, Data.game.gameID].join('_'), '', 1),
+            cc.JsonAsset,
+        )
+        this.pageNum = guideJson.json.pages.length
+        await this.initUI(guideJson.json)
+        this.choosePartCell.initCurPart(this.curPage)
+        this.choosePartCell.init(this.pageNum, this, this.partClick)
+        this.loadSemeImg(PathUtils.addGP('guide/bg', '', 1), this.node, 'bg')
+    }
 
     async initUI(json: any, page: number = 1) {
         if (Object.keys(json).length <= 0) return
@@ -47,6 +79,7 @@ export class GuideUI extends BaseUI {
             }
         }
         this.initPage(page)
+        this.initPlayBtn(false)
         this.canPlay = true
     }
     playGuide() {
@@ -54,22 +87,26 @@ export class GuideUI extends BaseUI {
         for (let guideRule of this.curPageRules) {
             guideRule.playAni()
         }
+        this.initPlayBtn(true)
     }
     pauseGuide() {
         for (let guideRule of this.curPageRules) {
             guideRule.pauseAni()
         }
+        this.initPlayBtn(false)
     }
     resetGuide() {
         for (let guideRule of this.curPageRules) {
             guideRule.reset()
         }
+        this.initPlayBtn(false)
     }
     initPage(page) {
+        this.curPage = page
         for (let i = 0; i < this.pages.length; i++) {
-            this.pages[i].active = page == i
+            this.pages[i].active = page == i + 1
         }
-        let nodes = this.allNodes[page]
+        let nodes = this.allNodes[page - 1]
         if (!nodes) return
         this.curPageRules = []
         for (let node of nodes) {
@@ -77,6 +114,9 @@ export class GuideUI extends BaseUI {
             this.curPageRules.push(guideRule)
             guideRule.reset()
         }
+        ccUtils.setBtnInteract(this.curPage < this.pageNum, this.node, 'btnNext')
+        ccUtils.setBtnInteract(this.curPage > 1, this.node, 'btnPre')
+        this.initPlayBtn(false)
     }
     initCurPart(gameType, semeID, gameID, partID) {
         this.gameType = gameType
@@ -84,4 +124,41 @@ export class GuideUI extends BaseUI {
         this.gameID = gameID
         this.partID = partID
     }
+    initPlayBtn(isPlay: boolean) {
+        cc.find('btnPause', this.node).active = isPlay
+        cc.find('btnPlay', this.node).active = !isPlay
+    }
+    onCloseClick() {
+        Mgr.ui.show(UI.GuideMainUI)
+        this.hide()
+    }
+    onPracticeClick() {
+        Mgr.ui.show(UI.GameUI)
+        Mgr.localMsg.sendClassMsg()
+        this.hide()
+    }
+    onPlayClick() {
+        this.playGuide()
+    }
+    onPauseClick() {
+        this.pauseGuide()
+    }
+    onPreClick() {
+        if (this.curPage - 1 >= 1) {
+            this.initPage(this.curPage - 1)
+        }
+    }
+    onNextClick() {
+        if (this.curPage + 1 <= this.pageNum) {
+            this.initPage(this.curPage + 1)
+        }
+    }
+    onFreshClick() {
+        this.resetGuide()
+    }
+    onTipClick() {}
+
+    partClick(event) {
+        this.initPage(event.target.part)
+    }
 }

assets/script/utils/ccUtils.ts

@@ -176,6 +176,27 @@ class CCUtils {
         })
     }
     /**
+     *
+     * @param checkedIndex
+     * @param node(父节点)
+     * @param childUrl
+     */
+    public setTogglesChecked(checkedIndex: number, node: cc.Node, childUrl?: string) {
+        if (!cc.isValid(node)) {
+            return
+        }
+        if (childUrl) {
+            node = cc.find(childUrl, node)
+        }
+        const children = node.children
+        children.forEach((value, index) => {
+            const toggle = value.getComponent(cc.Toggle)
+            if (toggle) {
+                toggle.isChecked = index == index
+            }
+        })
+    }
+    /**
      * 按钮延迟激活
      */
     public btnDelayActive(time: number, node: cc.Node, childUrl?: string) {

assets/texture/GameOptUI/board.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "480995b1-5919-42bf-b2e9-58fb199a3601",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/texture/GameOptUI/board/blue.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "aaaa89c4-5b14-4901-907c-a0bc522d146d",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "blue": {
-      "ver": "1.0.4",
-      "uuid": "bed552da-67aa-4da7-b7c1-634dfd163c55",
-      "rawTextureUuid": "aaaa89c4-5b14-4901-907c-a0bc522d146d",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/blue_.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "f87ba153-a010-4bf2-94ea-27dcf9addbbd",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "blue_": {
-      "ver": "1.0.4",
-      "uuid": "1cbfb7b7-9b5a-43be-ad93-06bc623d30d7",
-      "rawTextureUuid": "f87ba153-a010-4bf2-94ea-27dcf9addbbd",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/frame_board.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "df01aa80-3c0f-41fb-b76b-b4bf2250c150",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 498,
-  "height": 81,
-  "platformSettings": {},
-  "subMetas": {
-    "frame_board": {
-      "ver": "1.0.4",
-      "uuid": "49f3bc54-8752-44a8-b4a1-611ee2a376a9",
-      "rawTextureUuid": "df01aa80-3c0f-41fb-b76b-b4bf2250c150",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 498,
-      "height": 81,
-      "rawWidth": 498,
-      "rawHeight": 81,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 145,
-      "borderRight": 113,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/green.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "be454023-a916-4170-8388-28ad49e00fcb",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "green": {
-      "ver": "1.0.4",
-      "uuid": "0618d852-c658-498d-91d3-f44ad75a69fa",
-      "rawTextureUuid": "be454023-a916-4170-8388-28ad49e00fcb",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/green_.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "d2470fd7-42da-4a61-b9b3-bcd4320aa0a3",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "green_": {
-      "ver": "1.0.4",
-      "uuid": "f2a33759-724c-40b9-bb3a-3cc21ae17fe7",
-      "rawTextureUuid": "d2470fd7-42da-4a61-b9b3-bcd4320aa0a3",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/orange.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "391ab240-b654-4a25-862b-bab679190ee4",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 69,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "orange": {
-      "ver": "1.0.4",
-      "uuid": "fc417158-4603-4d58-b7f8-d39e03d3a44e",
-      "rawTextureUuid": "391ab240-b654-4a25-862b-bab679190ee4",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 69,
-      "height": 71,
-      "rawWidth": 69,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/orange_.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "f5897bb2-98b9-4e93-a550-ed7e721de6b9",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 69,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "orange_": {
-      "ver": "1.0.4",
-      "uuid": "4d4b1b1b-61d4-4de2-9d69-94f57ea301b3",
-      "rawTextureUuid": "f5897bb2-98b9-4e93-a550-ed7e721de6b9",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 69,
-      "height": 71,
-      "rawWidth": 69,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/red.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "214176e9-9a76-4081-b3e8-6dc86c0f7b93",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "red": {
-      "ver": "1.0.4",
-      "uuid": "b25322d2-2765-44c3-913b-33f7de937a32",
-      "rawTextureUuid": "214176e9-9a76-4081-b3e8-6dc86c0f7b93",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/red_.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "72dc3095-3edd-451a-99a2-90e0806975e4",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 72,
-  "platformSettings": {},
-  "subMetas": {
-    "red_": {
-      "ver": "1.0.4",
-      "uuid": "219810d6-ceba-46c3-83ca-04010852c94d",
-      "rawTextureUuid": "72dc3095-3edd-451a-99a2-90e0806975e4",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 72,
-      "rawWidth": 68,
-      "rawHeight": 72,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/violet.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "1c3564de-fcd3-4101-8a38-a24021c87bf0",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "violet": {
-      "ver": "1.0.4",
-      "uuid": "cb812cf8-6b21-4e52-aaf5-dd4898f12c3a",
-      "rawTextureUuid": "1c3564de-fcd3-4101-8a38-a24021c87bf0",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/violet_.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "ca813c29-d149-4f4c-8ae8-7896b05f6a33",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "violet_": {
-      "ver": "1.0.4",
-      "uuid": "36b5b54c-10f8-4db7-8286-c4f4f27b7afc",
-      "rawTextureUuid": "ca813c29-d149-4f4c-8ae8-7896b05f6a33",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/board/white.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "49e89df2-b895-4c4f-94c7-ddb8d9547cdc",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 68,
-  "height": 71,
-  "platformSettings": {},
-  "subMetas": {
-    "white": {
-      "ver": "1.0.4",
-      "uuid": "45e429a5-cfdd-47b2-b632-6430c95e37c0",
-      "rawTextureUuid": "49e89df2-b895-4c4f-94c7-ddb8d9547cdc",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 68,
-      "height": 71,
-      "rawWidth": 68,
-      "rawHeight": 71,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/texture/GameOptUI/btn_board.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "eef97bb2-f568-4157-ae96-305c748889c2",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 82,
-  "height": 81,
-  "platformSettings": {},
-  "subMetas": {
-    "btn_board": {
-      "ver": "1.0.4",
-      "uuid": "713ce7df-96af-424f-acba-34b63646b79b",
-      "rawTextureUuid": "eef97bb2-f568-4157-ae96-305c748889c2",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 82,
-      "height": 81,
-      "rawWidth": 82,
-      "rawHeight": 81,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

packages/CCSceneMenu/panel/editGame.js

@@ -148,16 +148,16 @@ Editor.Panel.extend({
       <div class="layout horizontal around-justified">
       <ui-prop name="页数">
           <ui-select v-value="d.config.guidePage" @change="onGuidePageChange($event)">
-            <option value="0">第1页</option>
-            <option value="1">第2页</option>
-            <option value="2">第3页</option>
-            <option value="3">第4页</option>
-            <option value="4">第5页</option>
-            <option value="5">第6页</option>
-            <option value="6">第7页</option>
-            <option value="7">第8页</option>
-            <option value="8">第9页</option>
-            <option value="9">第10页</option>
+            <option value="1">第1页</option>
+            <option value="2">第2页</option>
+            <option value="3">第3页</option>
+            <option value="4">第4页</option>
+            <option value="5">第5页</option>
+            <option value="6">第6页</option>
+            <option value="7">第7页</option>
+            <option value="8">第8页</option>
+            <option value="9">第9页</option>
+            <option value="10">第10页</option>
           </ui-select>
         </ui-prop>
       <ui-button id="in" @confirm="onGuideImport" class="green">导入引导</ui-button>
@@ -194,7 +194,7 @@ Editor.Panel.extend({
 
         let initWindow = (config) => {
             _config = config;
-            _config.guidePage = 0
+            _config.guidePage = 1
             new window.Vue({
                 el: this.shadowRoot,
                 data: {