This commit is contained in:
DESKTOP-5RP3AKU\Jisol
2023-11-14 03:35:48 +08:00
parent c519fae9a4
commit 5a43eb197b
22 changed files with 7585 additions and 1123 deletions

View File

@@ -23,25 +23,22 @@
},
{
"__id__": 10
},
{
"__id__": 16
}
],
"_active": true,
"_components": [
{
"__id__": 29
},
{
"__id__": 31
},
{
"__id__": 33
},
{
"__id__": 35
}
],
"_prefab": {
"__id__": 37
"__id__": 35
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -249,141 +246,7 @@
},
{
"__type__": "cc.Node",
"_name": "spine",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 11
},
{
"__id__": 13
}
],
"_prefab": {
"__id__": 15
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "57eZ8/fvZJMrM7Wj3WO68q"
},
{
"__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 14
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_skeletonData": null,
"defaultSkin": "",
"defaultAnimation": "",
"_premultipliedAlpha": true,
"_timeScale": 1,
"_preCacheMode": -1,
"_cacheMode": 0,
"_defaultCacheMode": 0,
"_sockets": [],
"_useTint": false,
"_debugMesh": false,
"_debugBones": false,
"_debugSlots": false,
"_enableBatch": false,
"loop": true,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "37W02pxDdPjqDU8/T4AAOl"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "3aPdHbGrlJEpmRvxGxJCdp",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "Button",
"_name": "聊天框",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -391,28 +254,31 @@
},
"_children": [
{
"__id__": 17
"__id__": 11
}
],
"_active": true,
"_components": [
{
"__id__": 19
},
{
"__id__": 21
},
{
"__id__": 23
},
{
"__id__": 25
},
{
"__id__": 27
}
],
"_prefab": {
"__id__": 30
"__id__": 28
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -364.234,
"y": -590,
"z": 0
},
"_lrot": {
@@ -441,23 +307,26 @@
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 512,
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 16
"__id__": 10
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 12
},
{
"__id__": 20
"__id__": 14
},
{
"__id__": 16
}
],
"_prefab": {
"__id__": 22
"__id__": 18
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -494,16 +363,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 19
"__id__": 13
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
"width": 294,
"height": 56.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -514,7 +383,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "a9+SjkwpRBtLeZcty/qH1n"
"fileId": "32kvyx305MDKXeBAXCZGln"
},
{
"__type__": "cc.Label",
@@ -522,97 +391,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_string": "核心战斗",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 20,
"_fontSize": 20,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 1,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": false,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2dawV4XTdMuYnCbtT3Cljm"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "69jWhf9aNOtL1KLSUC4G5j",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 16
},
"_enabled": true,
"__prefab": {
"__id__": 24
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "fblznbfCtPipV+qIiTc2gG"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 16
},
"_enabled": true,
"__prefab": {
"__id__": 26
"__id__": 15
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -624,11 +407,123 @@
"b": 255,
"a": 255
},
"_string": "点击打开世界聊天",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 36,
"_fontSize": 36,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": true,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "6fc1n9HEhMSLtbARgitkMd"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 11
},
"_enabled": true,
"__prefab": {
"__id__": 17
},
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_width": 3,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "28jUxUo9FGY4ZjAzw5ajB5"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "e3/R6Ce+dNZ7KN+IAVAxhZ",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 20
},
"_contentSize": {
"__type__": "cc.Size",
"width": 720,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "de48INVM5Dn703wxCA7KF8"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 22
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 187,
"g": 187,
"b": 187,
"a": 255
},
"_spriteFrame": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
"_type": 0,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -645,7 +540,43 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "b6zPpk3tRATK2kgUd5aGfi"
"fileId": "47iddbWj9HxZT0NQ/GsZJP"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 24
},
"_alignFlags": 44,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "9awU3hjhVK9qjW9bMJin6E"
},
{
"__type__": "cc.Button",
@@ -653,24 +584,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 16
"__id__": 10
},
"_enabled": true,
"__prefab": {
"__id__": 28
"__id__": 26
},
"clickEvents": [
{
"__id__": 29
"__id__": 27
}
],
"_interactable": true,
"_transition": 2,
"_transition": 0,
"_normalColor": {
"__type__": "cc.Color",
"r": 214,
"g": 214,
"b": 214,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_hoverColor": {
@@ -694,32 +625,18 @@
"b": 124,
"a": 255
},
"_normalSprite": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_hoverSprite": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_pressedSprite": {
"__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_disabledSprite": {
"__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_normalSprite": null,
"_hoverSprite": null,
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.1,
"_zoomScale": 1.2,
"_target": {
"__id__": 16
},
"_target": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "81yU6sKR9D5rgF4SxiwMUz"
"fileId": "8aKEoy6fBFXIDxKkk6Hws8"
},
{
"__type__": "cc.ClickEvent",
@@ -728,7 +645,7 @@
},
"component": "",
"_componentId": "b51bfKvsidNPKBbFirAFgQI",
"handler": "onClickHome",
"handler": "onOpenChat",
"customEventData": ""
},
{
@@ -739,7 +656,7 @@
"asset": {
"__id__": 0
},
"fileId": "60FAaYqK9Ia5BCiy9jtGNo",
"fileId": "0dwM6BvXxAIb2ADj9Thh37",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -754,7 +671,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 32
"__id__": 30
},
"_contentSize": {
"__type__": "cc.Size",
@@ -782,7 +699,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 32
},
"_alignFlags": 45,
"_target": null,
@@ -818,13 +735,10 @@
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 34
},
"mask": false,
"maskOpcity": 80,
"spine": {
"__id__": 13
},
"_id": ""
},
{

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "4616eb54-bbd1-4689-bf18-f84e7d1cb958",
"files": [],
"subMetas": {},
"userData": {}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,13 @@
{
"ver": "1.1.49",
"importer": "prefab",
"imported": true,
"uuid": "c4847dce-e0b9-4e15-8bff-c42612edf6d1",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "MainChatView"
}
}

View File

@@ -41,10 +41,13 @@
},
{
"__id__": 96
},
{
"__id__": 98
}
],
"_prefab": {
"__id__": 98
"__id__": 100
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -2228,6 +2231,42 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "d9OK97hutHEpKUXR8jY9y6"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 99
},
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 720,
"_originalHeight": 1280,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "16RFBNt0ROAK2JOYSRqgt+"
},
{
"__type__": "cc.PrefabInfo",
"root": {

View File

@@ -1,12 +0,0 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "35e11e81-b6f9-4691-9b51-87135d43f671",
"files": [],
"subMetas": {},
"userData": {
"compressionType": {},
"isRemoteBundle": {}
}
}

View File

@@ -25,10 +25,10 @@ import { StorageData, StorageEnum } from "./consts/GData";
import { JAPI, JAPIConfig } from "../../extensions/ngame/assets/ngame/util/JAPI";
import { AppData } from "./AppData";
let APIPath = `http://localhost:8080`
let WsPath = `ws://localhost:8080/websocket`
// let APIPath = `https://api.pet.jisol.cn`
// let WsPath = `wss://api.pet.jisol.cn/websocket`
// let APIPath = `http://localhost:8080`
// let WsPath = `ws://localhost:8080/websocket`
let APIPath = `https://api.pet.jisol.cn`
let WsPath = `wss://api.pet.jisol.cn/websocket`
//重写UI
class JNGLayer extends JNLayer{

View File

@@ -21,11 +21,11 @@ export class Main extends Component {
//加载 APP
await JNGame.Init(app);
//发生帧同步开始
app.socket.Send(JNSyncAction.NSyncFrameStart);
// //发生帧同步开始
// app.socket.Send(JNSyncAction.NSyncFrameStart);
// 创建世界
director.getScene().addChild(instantiate(this.WorldPrefab));
// // 创建世界
// director.getScene().addChild(instantiate(this.WorldPrefab));
}

View File

@@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "fc9ef739-d244-407b-8214-003bafd6fe69",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -0,0 +1,10 @@
import { _decorator, Component, Node } from 'cc';
import { JNGLayerBase } from '../../../App';
const { ccclass, property } = _decorator;
@ccclass('MainChatView')
export class MainChatView extends JNGLayerBase {
}

View File

@@ -0,0 +1,9 @@
{
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "ec6f0c96-b2be-42ca-93e7-11ba0b7a6625",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@@ -1,27 +1,18 @@
import { _decorator, Component, Label, Node } from 'cc';
import { app, JNGLayerBase } from '../../App';
import { sp } from 'cc';
import PlayerPetData from '../../data/PlayerPetData';
import { GUI } from '../UIConfig';
import { UIPetAnim } from '../../consts/GData';
const { ccclass, property } = _decorator;
@ccclass('MainView')
export class MainView extends JNGLayerBase {
//宠物
@property(sp.Skeleton)
spine:sp.Skeleton;
onJNLoad(data?: any): void {
//显示被选择的宠物
this.spine.skeletonData = app.battleRes.roleSpine[PlayerPetData.getIns().getData()[0].petTbId];
this.spine.setAnimation(0,UIPetAnim.std,true);
}
//点击回到之前的主页
onClickHome(){
app.layer.Open(GUI.Home);
//打开聊天页面
onOpenChat(){
app.layer.Open(GUI.MainChat);
}
}

View File

@@ -13,6 +13,9 @@ export enum GUI{
Loading = "Loading", //加载页面
Tips = "Tips", //提示
/** 主页页面 */
MainChat = "MainChat", //主页聊天页面
/** 新手引导 */
NoviceNamingView = "NoviceNamingView", //新手引导页面 - 取名
NoviceSelectPetView = "NoviceSelectPetView", //新手引导页面 - 选择宠物
@@ -50,6 +53,20 @@ const UISystemConfig:{ [key: string]: JNLayerInfo; } = {
},
}
//主页UI
const UIMainConfig:{ [key: string]: JNLayerInfo; } = {
[GUI.MainChat]:{
layer:GLayer.Tips,
uri: "prefab/ui/主页/聊天/MainChatView",
anims:{
front:JNLayerAnim.Enlarge,
back:JNLayerAnim.Smaller,
frontInfo:{key:"position",start:v3(0,-1280,0),end:v3(0,0,0)},
backInfo:{key:"position",start:v3(0,0,0),end:v3(0,-1280,0)}
}
},
}
//新手引导页面
const UINoviceConfig:{ [key: string]: JNLayerInfo; } = {
@@ -95,5 +112,6 @@ export const UIConfig:{ [key: string]: JNLayerInfo; } = {
},
...UISystemConfig, //系统页面
...UINoviceConfig, //新手引导页面
...UIMainConfig, //主页面
}