diff --git a/assets/Script/BoardRoot.ts b/assets/Script/BoardRoot.ts index e4064b3..bf5cc35 100644 --- a/assets/Script/BoardRoot.ts +++ b/assets/Script/BoardRoot.ts @@ -1,6 +1,6 @@ import { _decorator, Component, Node } from 'cc'; -import { MapTileType, MapTileTypes } from './MapTileData'; -import { MapTileNode } from './MapTileNode'; +import { MapTileTypes } from './MapTile/MapTileData'; +import { MapTileNode } from './MapTile/MapTileNode'; const { ccclass, property } = _decorator; /// 最底层的地图 图层Component diff --git a/assets/Script/DialogNode.meta b/assets/Script/DialogNode.meta new file mode 100644 index 0000000..674b7cb --- /dev/null +++ b/assets/Script/DialogNode.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "2e9de9a6-2874-4cba-bb52-b2c87dbf9abd", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Script/DialogRoot.ts b/assets/Script/DialogRoot.ts new file mode 100644 index 0000000..21abcee --- /dev/null +++ b/assets/Script/DialogRoot.ts @@ -0,0 +1,14 @@ +import { _decorator, Component, Node } from 'cc'; +const { ccclass, property } = _decorator; + +@ccclass('DialogRoot') +export class DialogRoot extends Component { + start() { + + } + + update(deltaTime: number) { + + } +} + diff --git a/assets/Script/DialogRoot.ts.meta b/assets/Script/DialogRoot.ts.meta new file mode 100644 index 0000000..dabfa91 --- /dev/null +++ b/assets/Script/DialogRoot.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "11718503-cecd-42ad-add9-e4e3abe19e2b", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Script/MapTile.meta b/assets/Script/MapTile.meta new file mode 100644 index 0000000..d83b25b --- /dev/null +++ b/assets/Script/MapTile.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "1554040b-ede2-463f-bced-04c443740947", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Script/MapTileButtonComponent.ts b/assets/Script/MapTile/MapTileButtonComponent.ts similarity index 95% rename from assets/Script/MapTileButtonComponent.ts rename to assets/Script/MapTile/MapTileButtonComponent.ts index 7ae34a9..4bab370 100644 --- a/assets/Script/MapTileButtonComponent.ts +++ b/assets/Script/MapTile/MapTileButtonComponent.ts @@ -10,10 +10,10 @@ import { v3, Vec3, } from "cc"; -import { NpkImage } from "../Tool/NPKImage"; +import { NpkImage } from "../../Tool/NPKImage"; import { MapTileDirection } from "./MapTileData"; -import { BaseSprite } from "../GlobalScript/CommonComponent/BaseSprite"; -import { DiamondCheck, Point } from "./common/InDiamondCheck"; +import { BaseSprite } from "../../GlobalScript/CommonComponent/BaseSprite"; +import { DiamondCheck, Point } from "./../Common/InDiamondCheck"; const { ccclass } = _decorator; enum buttonState { diff --git a/assets/Script/MapTileButtonComponent.ts.meta b/assets/Script/MapTile/MapTileButtonComponent.ts.meta similarity index 100% rename from assets/Script/MapTileButtonComponent.ts.meta rename to assets/Script/MapTile/MapTileButtonComponent.ts.meta diff --git a/assets/Script/MapTileController.ts b/assets/Script/MapTile/MapTileController.ts similarity index 95% rename from assets/Script/MapTileController.ts rename to assets/Script/MapTile/MapTileController.ts index 3a44971..5904862 100644 --- a/assets/Script/MapTileController.ts +++ b/assets/Script/MapTile/MapTileController.ts @@ -1,6 +1,6 @@ import { _decorator, Component, Node } from "cc"; import { MapTileData, MapTileFactory, MapTileType } from "./MapTileData"; -const { ccclass, property } = _decorator; +const { ccclass } = _decorator; @ccclass("MapTileController") export class MapTileController extends Component { diff --git a/assets/Script/MapTileController.ts.meta b/assets/Script/MapTile/MapTileController.ts.meta similarity index 100% rename from assets/Script/MapTileController.ts.meta rename to assets/Script/MapTile/MapTileController.ts.meta diff --git a/assets/Script/MapTileData.ts b/assets/Script/MapTile/MapTileData.ts similarity index 99% rename from assets/Script/MapTileData.ts rename to assets/Script/MapTile/MapTileData.ts index 1677f4d..6d7b592 100644 --- a/assets/Script/MapTileData.ts +++ b/assets/Script/MapTile/MapTileData.ts @@ -1,5 +1,5 @@ import { Vec2, v2 } from "cc"; -import { NpkImage } from "../Tool/NPKImage"; +import { NpkImage } from "../../Tool/NPKImage"; /// 地块类型 export enum MapTileType { /// 赫顿玛尔 diff --git a/assets/Script/MapTileData.ts.meta b/assets/Script/MapTile/MapTileData.ts.meta similarity index 100% rename from assets/Script/MapTileData.ts.meta rename to assets/Script/MapTile/MapTileData.ts.meta diff --git a/assets/Script/MapTileNode.ts b/assets/Script/MapTile/MapTileNode.ts similarity index 96% rename from assets/Script/MapTileNode.ts rename to assets/Script/MapTile/MapTileNode.ts index 04917d7..63ddb1e 100644 --- a/assets/Script/MapTileNode.ts +++ b/assets/Script/MapTile/MapTileNode.ts @@ -1,11 +1,9 @@ import { _decorator, Node } from "cc"; import { - MapTileData, MapTileDirection, - MapTileFactory, MapTileType, } from "./MapTileData"; -import { BaseSprite } from "../GlobalScript/CommonComponent/BaseSprite"; +import { BaseSprite } from "../../GlobalScript/CommonComponent/BaseSprite"; import { MapTileButtonComponent } from "./MapTileButtonComponent"; import { MapTileController } from "./MapTileController"; const { ccclass } = _decorator; diff --git a/assets/Script/MapTileNode.ts.meta b/assets/Script/MapTile/MapTileNode.ts.meta similarity index 100% rename from assets/Script/MapTileNode.ts.meta rename to assets/Script/MapTile/MapTileNode.ts.meta diff --git a/assets/Script/StartGameNode.meta b/assets/Script/StartGameNode.meta new file mode 100644 index 0000000..0079c53 --- /dev/null +++ b/assets/Script/StartGameNode.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "026e885d-7022-43db-bdd8-191d81662a0c", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Script/StartGameUINode.ts b/assets/Script/StartGameNode/StartGameUINode.ts similarity index 89% rename from assets/Script/StartGameUINode.ts rename to assets/Script/StartGameNode/StartGameUINode.ts index 9db326a..b4cec14 100644 --- a/assets/Script/StartGameUINode.ts +++ b/assets/Script/StartGameNode/StartGameUINode.ts @@ -1,11 +1,10 @@ -import { _decorator, BlockInputEvents, Button, Color, Director, director, EventMouse, Label, Node, sp, Sprite, UITransform, v2 } from 'cc'; -import { BaseSprite } from '../GlobalScript/CommonComponent/BaseSprite'; -import { NpkImage } from '../Tool/NPKImage'; -import { BaseButton } from '../GlobalScript/CommonComponent/BaseButton'; -import { AnimationNode } from '../GlobalScript/Animation/AnimationNode'; -import { CharacterType, GamerNode } from './GamerNode'; -import { UIRoot } from './UIRoot'; -import {closeButtonNode } from './common/closeButtonNode'; +import { _decorator, BlockInputEvents, Button, Color, Director, director, EventMouse, Label, Node, UITransform, v2 } from 'cc'; +import { BaseSprite } from '../../GlobalScript/CommonComponent/BaseSprite'; +import { NpkImage } from '../../Tool/NPKImage'; +import { BaseButton } from '../../GlobalScript/CommonComponent/BaseButton'; +import { AnimationNode } from '../../GlobalScript/Animation/AnimationNode'; +import { UIRoot } from '../UIRoot'; +import {CloseButtonNode } from '../Common/CloseButtonNode'; const { ccclass } = _decorator; /// 开始游戏按钮界面 @@ -137,7 +136,7 @@ export class StartGameUINode extends Node { this.pressenNode.addChild(imgNode); /// 关闭按钮 - const closeNode = new closeButtonNode(this.closeOnTouchEnd.bind(this)); + const closeNode = new CloseButtonNode(this.closeOnTouchEnd.bind(this)); closeNode.setPosition(767,-10); imgNode.addChild(closeNode); diff --git a/assets/Script/StartGameUINode.ts.meta b/assets/Script/StartGameNode/StartGameUINode.ts.meta similarity index 100% rename from assets/Script/StartGameUINode.ts.meta rename to assets/Script/StartGameNode/StartGameUINode.ts.meta diff --git a/assets/Script/UINode.meta b/assets/Script/UINode.meta new file mode 100644 index 0000000..b7f780c --- /dev/null +++ b/assets/Script/UINode.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "7385a06a-b90d-4a7e-ab36-bf702f6f220e", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Script/DiceButtonNode.ts b/assets/Script/UINode/DiceButtonNode.ts similarity index 87% rename from assets/Script/DiceButtonNode.ts rename to assets/Script/UINode/DiceButtonNode.ts index 4866c5e..27dfa6f 100644 --- a/assets/Script/DiceButtonNode.ts +++ b/assets/Script/UINode/DiceButtonNode.ts @@ -1,8 +1,8 @@ -import { _decorator, Component, EventMouse, EventTouch, Node, UITransform } from 'cc'; -import { BaseSprite } from '../GlobalScript/CommonComponent/BaseSprite'; -import { NpkImage } from '../Tool/NPKImage'; -import { BaseButton, BaseButtonState } from '../GlobalScript/CommonComponent/BaseButton'; -import { BaseButtonAction } from '../GlobalScript/CommonComponent/BaseButtonAction'; +import { _decorator, EventMouse, Node } from 'cc'; +import { BaseSprite } from '../../GlobalScript/CommonComponent/BaseSprite'; +import { NpkImage } from '../../Tool/NPKImage'; +import { BaseButton, BaseButtonState } from '../../GlobalScript/CommonComponent/BaseButton'; +import { BaseButtonAction } from '../../GlobalScript/CommonComponent/BaseButtonAction'; const { ccclass } = _decorator; diff --git a/assets/Script/DiceButtonNode.ts.meta b/assets/Script/UINode/DiceButtonNode.ts.meta similarity index 100% rename from assets/Script/DiceButtonNode.ts.meta rename to assets/Script/UINode/DiceButtonNode.ts.meta diff --git a/assets/Script/GamerNode.ts b/assets/Script/UINode/GamerNode.ts similarity index 93% rename from assets/Script/GamerNode.ts rename to assets/Script/UINode/GamerNode.ts index 0318701..052af63 100644 --- a/assets/Script/GamerNode.ts +++ b/assets/Script/UINode/GamerNode.ts @@ -1,7 +1,7 @@ -import { _decorator, Color, Director, director, easing, game, Label, Node, Size, Sprite, SpriteFrame, tween, UITransform, VerticalTextAlignment } from 'cc'; -import { BaseSprite } from '../GlobalScript/CommonComponent/BaseSprite'; -import { NpkImage } from '../Tool/NPKImage'; -import { BaseSpriteFrame } from '../GlobalScript/CommonComponent/BaseSpriteFrame'; +import { _decorator, Color, Label, Node, Size, Sprite, SpriteFrame, tween, UITransform, VerticalTextAlignment } from 'cc'; +import { BaseSprite } from '../../GlobalScript/CommonComponent/BaseSprite'; +import { NpkImage } from '../../Tool/NPKImage'; +import { BaseSpriteFrame } from '../../GlobalScript/CommonComponent/BaseSpriteFrame'; const { ccclass } = _decorator; /// 玩家角色类型 diff --git a/assets/Script/GamerNode.ts.meta b/assets/Script/UINode/GamerNode.ts.meta similarity index 100% rename from assets/Script/GamerNode.ts.meta rename to assets/Script/UINode/GamerNode.ts.meta diff --git a/assets/Script/OtherWinNode.ts b/assets/Script/UINode/OtherWinNode.ts similarity index 84% rename from assets/Script/OtherWinNode.ts rename to assets/Script/UINode/OtherWinNode.ts index a1e2f60..f8012d6 100644 --- a/assets/Script/OtherWinNode.ts +++ b/assets/Script/UINode/OtherWinNode.ts @@ -1,7 +1,7 @@ import { _decorator, BlockInputEvents, Component, Node, Size, UITransform, v2 } from 'cc'; -import { BaseSprite } from '../GlobalScript/CommonComponent/BaseSprite'; -import { NpkImage } from '../Tool/NPKImage'; -import { closeButtonNode } from './common/closeButtonNode'; +import { BaseSprite } from '../../GlobalScript/CommonComponent/BaseSprite'; +import { NpkImage } from '../../Tool/NPKImage'; +import { CloseButtonNode } from '../Common/CloseButtonNode'; const { ccclass, property } = _decorator; export enum otherWinType{ @@ -43,7 +43,7 @@ export class OtherWinNode extends Node { /// 关闭按钮 - const closeNode = new closeButtonNode(()=>{ + const closeNode = new CloseButtonNode(()=>{ this.active = false; }); winImgNode.addChild(closeNode); diff --git a/assets/Script/OtherWinNode.ts.meta b/assets/Script/UINode/OtherWinNode.ts.meta similarity index 100% rename from assets/Script/OtherWinNode.ts.meta rename to assets/Script/UINode/OtherWinNode.ts.meta diff --git a/assets/Script/UIRoot.ts b/assets/Script/UIRoot.ts index 143308f..9180636 100644 --- a/assets/Script/UIRoot.ts +++ b/assets/Script/UIRoot.ts @@ -6,15 +6,15 @@ import { Node, UITransform, } from "cc"; -import { StartGameUINode } from "./StartGameUINode"; -import { CharacterType, GamerNode } from "./GamerNode"; +import { CharacterType, GamerNode } from "./UINode/GamerNode"; import { BaseSprite } from "../GlobalScript/CommonComponent/BaseSprite"; import { NpkImage } from "../Tool/NPKImage"; import { AnimationNode } from "../GlobalScript/Animation/AnimationNode"; import { BaseButtonState } from "../GlobalScript/CommonComponent/BaseButton"; -import { DiceButtonNode } from "./DiceButtonNode"; -import { OtherWinNode, otherWinType } from "./OtherWinNode"; +import { DiceButtonNode } from "./UINode/DiceButtonNode"; +import { OtherWinNode, otherWinType } from "./UINode/OtherWinNode"; import { BoardRoot } from "./BoardRoot"; +import { StartGameUINode } from "./StartGameNode/StartGameUINode"; const { ccclass } = _decorator; @ccclass("UIRoot") @@ -68,7 +68,7 @@ export class UIRoot extends Component { this.initDiceButton(); } - /// 初始化加载UI + /// 初始化等待玩家加载UI initAwaitGamerUI() { const node = new Node(); node.setPosition(177.5, -244.5); @@ -136,6 +136,7 @@ export class UIRoot extends Component { this.otherWinNode.active = false; } + /// 动画结束 aniDone() { /// 恢复其他胜利按钮的状态 this.diceButton.winButtonComponent.ButtonState = BaseButtonState.Normal; diff --git a/assets/Script/common/closeButtonNode.ts b/assets/Script/common/closeButtonNode.ts index 781458b..c6de51d 100644 --- a/assets/Script/common/closeButtonNode.ts +++ b/assets/Script/common/closeButtonNode.ts @@ -1,11 +1,11 @@ -import { _decorator, Component, Node } from 'cc'; +import { _decorator, Node } from 'cc'; import { BaseButton } from '../../GlobalScript/CommonComponent/BaseButton'; import { NpkImage } from '../../Tool/NPKImage'; import { BaseButtonAction } from '../../GlobalScript/CommonComponent/BaseButtonAction'; -const { ccclass, property } = _decorator; +const { ccclass } = _decorator; -@ccclass('closeButtonNode') -export class closeButtonNode extends Node { +@ccclass('CloseButtonNode') +export class CloseButtonNode extends Node { constructor(onMouseLeftUp?:Function){ super(); @@ -24,6 +24,5 @@ export class closeButtonNode extends Node { } -} - - +} + diff --git a/assets/Script/common/closeButtonNode.ts.meta b/assets/Script/common/closeButtonNode.ts.meta index edffe9e..ffa0a52 100644 --- a/assets/Script/common/closeButtonNode.ts.meta +++ b/assets/Script/common/closeButtonNode.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "9860c0fa-a57e-4bc5-9466-5d71cc5026ad", + "uuid": "84d89628-9eca-40ec-9991-34ad998a1c71", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/resources/Script/Rindro_Script.pvf b/assets/resources/Script/Rindro_Script.pvf deleted file mode 100644 index 79944e4..0000000 Binary files a/assets/resources/Script/Rindro_Script.pvf and /dev/null differ diff --git a/assets/resources/Script/Rindro_Script.pvf.meta b/assets/resources/Script/Rindro_Script.pvf.meta deleted file mode 100644 index d82b065..0000000 --- a/assets/resources/Script/Rindro_Script.pvf.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "a278bd5f-126a-4884-ab22-ebcacc1ec17c", - "files": [ - ".json", - ".pvf" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/scene/main.scene b/assets/scene/main.scene index 295a141..bf3046c 100644 --- a/assets/scene/main.scene +++ b/assets/scene/main.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 18 + "__id__": 19 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 19 + "__id__": 20 }, "_id": "f713b5ea-a70f-486c-8260-0338f089a5b8" }, @@ -76,14 +76,14 @@ ], "_active": true, "_components": [ - { - "__id__": 15 - }, { "__id__": 16 }, { "__id__": 17 + }, + { + "__id__": 18 } ], "_prefab": null, @@ -175,7 +175,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 522.7763819095478, + "_orthoHeight": 509.95129375951296, "_near": 0, "_far": 1000, "_color": { @@ -452,6 +452,9 @@ "_components": [ { "__id__": 14 + }, + { + "__id__": 15 } ], "_prefab": null, @@ -506,6 +509,18 @@ }, "_id": "28/iYuYk1JyqaQ0l2uDYPY" }, + { + "__type__": "11718UDzs1Cra3Z5OOr4Z4r", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 13 + }, + "_enabled": true, + "__prefab": null, + "_id": "d79jn93oZBELG9gxMlR3iL" + }, { "__type__": "cc.UITransform", "_name": "", @@ -585,29 +600,29 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 20 - }, - "shadows": { "__id__": 21 }, - "_skybox": { + "shadows": { "__id__": 22 }, - "fog": { + "_skybox": { "__id__": 23 }, - "octree": { + "fog": { "__id__": 24 }, - "skin": { + "octree": { "__id__": 25 }, - "lightProbeInfo": { + "skin": { "__id__": 26 }, - "postSettings": { + "lightProbeInfo": { "__id__": 27 }, + "postSettings": { + "__id__": 28 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false },