mushroom
/
squidGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mushroom:4150bdfda698e5b5ba7429d8529977fced360b0a
Branches Tags
mushroom:main
mushroom:dajun2
mushroom:feature/xk/loading
mushroom:feature/dajun/origin
mushroom:dev
mushroom:feature/xk/language
..
compare: mushroom:dddbd297b013269cea8a5f17816b0344355f3f10
Branches Tags
mushroom:dajun2
mushroom:feature/xk/loading
mushroom:feature/dajun/origin
mushroom:dev
mushroom:feature/xk/language
mushroom:main

No commits in common. "4150bdfda698e5b5ba7429d8529977fced360b0a" and "dddbd297b013269cea8a5f17816b0344355f3f10" have entirely different histories.
4150bdfda6 ... dddbd297b0

17 changed files with 7933 additions and 25233 deletions
Show Stats Expand all files Collapse all files

19496
tgx-games-client/assets/level2/scene/level2Scene.scene
View File

File diff suppressed because it is too large Load Diff

BIN
tgx-games-client/assets/module_arean/common/bg/加载图1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 678 KiB

44
tgx-games-client/assets/module_arean/common/bg/加载图1.jpg.meta
View File

@ -46,12 +46,12 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 750, "width": 1242,
"height": 1440, "height": 2208,
"rawWidth": 750, "rawWidth": 1242,
"rawHeight": 1440, "rawHeight": 2208,
"borderTop": 371, "borderTop": 0,
"borderBottom": 428, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
"borderRight": 0, "borderRight": 0,
"packable": true, "packable": true,
@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-375, -621,
-720, -1104,
0, 0,
375, 621,
-720, -1104,
0, 0,
-375, -621,
720, 1104,
0, 0,
375, 621,
720, 1104,
0 0
], ],
"indexes": [ "indexes": [
@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
1440, 2208,
750, 1242,
1440, 2208,
0, 0,
0, 0,
750, 1242,
0 0
], ],
"nuv": [ "nuv": [
@ -103,13 +103,13 @@
1 1
], ],
"minPos": [ "minPos": [
-375, -621,
-720, -1104,
0 0
], ],
"maxPos": [ "maxPos": [
375, 621,
720, 1104,
0 0
] ]
}, },

BIN
tgx-games-client/assets/module_arean/common/bg/加载图2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 675 KiB

40
tgx-games-client/assets/module_arean/common/bg/加载图2.jpg.meta
View File

@ -46,10 +46,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 750, "width": 1242,
"height": 1440, "height": 2208,
"rawWidth": 750, "rawWidth": 1242,
"rawHeight": 1440, "rawHeight": 2208,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-375, -621,
-720, -1104,
0, 0,
375, 621,
-720, -1104,
0, 0,
-375, -621,
720, 1104,
0, 0,
375, 621,
720, 1104,
0 0
], ],
"indexes": [ "indexes": [
@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
1440, 2208,
750, 1242,
1440, 2208,
0, 0,
0, 0,
750, 1242,
0 0
], ],
"nuv": [ "nuv": [
@ -103,13 +103,13 @@
1 1
], ],
"minPos": [ "minPos": [
-375, -621,
-720, -1104,
0 0
], ],
"maxPos": [ "maxPos": [
375, 621,
720, 1104,
0 0
] ]
}, },

BIN
tgx-games-client/assets/module_arean/common/bg/加载图3.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 679 KiB

40
tgx-games-client/assets/module_arean/common/bg/加载图3.jpg.meta
View File

@ -46,10 +46,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 750, "width": 1242,
"height": 1440, "height": 2208,
"rawWidth": 750, "rawWidth": 1242,
"rawHeight": 1440, "rawHeight": 2208,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0, "meshType": 0,
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-375, -621,
-720, -1104,
0, 0,
375, 621,
-720, -1104,
0, 0,
-375, -621,
720, 1104,
0, 0,
375, 621,
720, 1104,
0 0
], ],
"indexes": [ "indexes": [
@ -84,12 +84,12 @@
], ],
"uv": [ "uv": [
0, 0,
1440, 2208,
750, 1242,
1440, 2208,
0, 0,
0, 0,
750, 1242,
0 0
], ],
"nuv": [ "nuv": [
@ -103,13 +103,13 @@
1 1
], ],
"minPos": [ "minPos": [
-375, -621,
-720, -1104,
0 0
], ],
"maxPos": [ "maxPos": [
375, 621,
720, 1104,
0 0
] ]
}, },

10355
tgx-games-client/assets/module_arean/lobby_arean.scene
View File

File diff suppressed because it is too large Load Diff

9
tgx-games-client/assets/module_arean/scripts/common.meta
View File

@ -1,9 +0,0 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "b75d291b-9a21-4b77-b318-29cc394dc9a7",
"files": [],
"subMetas": {},
"userData": {}
}

15
tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts
View File

@ -1,15 +0,0 @@
// CameraOrbit.ts
import { _decorator, Component, Node, Vec3, tween } from 'cc';
const { ccclass, property } = _decorator;
@ccclass('CameraOrbit')
export class CameraOrbit extends Component {
start() {
tween(this.node)
.repeatForever(
tween()
.to(360, { eulerAngles: new Vec3(0, 360, 0) })
)
.start();
}
}

9
tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts.meta
View File

@ -1,9 +0,0 @@
{
"ver": "4.0.24",
"importer": "typescript",
"imported": true,
"uuid": "9f069a5c-fe78-4edf-ad57-9b64c9ca5a1b",
"files": [],
"subMetas": {},
"userData": {}
}

12
tgx-games-client/assets/module_basic/scene_login/login.scene
View File

@ -152,7 +152,7 @@
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 375.00000000000006, "x": 375,
"y": 720, "y": 720,
"z": 0 "z": 0
}, },
@ -238,7 +238,7 @@
"_priority": 0, "_priority": 0,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 720, "_orthoHeight": 890.2828467153284,
"_near": 1, "_near": 1,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
@ -336,7 +336,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750,
"height": 1440 "height": 1440
}, },
"_anchorPoint": { "_anchorPoint": {
@ -367,7 +367,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@f9941", "__uuid__": "260d026d-014b-4549-b395-7cb73b7343bb@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
@ -437,7 +437,7 @@
"__id__": 4 "__id__": 4
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 13 "__id__": 13
@ -582,7 +582,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750,
"height": 1440 "height": 1440
}, },
"_anchorPoint": { "_anchorPoint": {

14
tgx-games-client/assets/module_basic/ui_waiting/UI_Waiting.prefab
View File

@ -149,7 +149,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750.0000000000001,
"height": 1440 "height": 1440.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -252,6 +252,8 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "bdlix+gOFH15utKrV6K7Di", "fileId": "bdlix+gOFH15utKrV6K7Di",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
@ -822,7 +824,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750.0000000000001,
"height": 1440 "height": 1440.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -858,7 +860,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "798e07bc-4a9d-40bb-ad75-107caf130115@f9941", "__uuid__": "260d026d-014b-4549-b395-7cb73b7343bb@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
@ -1678,7 +1680,7 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "都准备好了么..", "_string": "正在擦亮武器..",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 24, "_actualFontSize": 24,
@ -1755,7 +1757,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750.0000000000001,
"height": 1440 "height": 1440.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -1832,7 +1834,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750.0000000000001,
"height": 1440 "height": 1440.0000000000002
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",

BIN
tgx-games-client/assets/start/homeBg.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 244 KiB

134
tgx-games-client/assets/start/homeBg.jpg.meta
View File

@ -1,134 +0,0 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "79a33ee6-ba55-4382-a18f-1a99a227d1ff",
"files": [
".jpg",
".json"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@6c48a",
"displayName": "homeBg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "79a33ee6-ba55-4382-a18f-1a99a227d1ff",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@f9941",
"displayName": "homeBg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 750,
"height": 1393,
"rawWidth": 750,
"rawHeight": 1393,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-375,
-696.5,
0,
375,
-696.5,
0,
-375,
696.5,
0,
375,
696.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
1393,
750,
1393,
0,
0,
750,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-375,
-696.5,
0
],
"maxPos": [
375,
696.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": false,
"fixAlphaTransparencyArtifacts": false,
"redirect": "79a33ee6-ba55-4382-a18f-1a99a227d1ff@6c48a"
}
}

3
tgx-games-client/settings/v2/packages/project.json
View File

@ -22,6 +22,5 @@
"1": 5, "1": 5,
"2": 7 "2": 7
} }
}, }
"custom_joint_texture_layouts": []
} }

2991
tgx-games-server/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff