diff --git a/Ps/bg/bg.psd b/Ps/bg/bg.psd new file mode 100644 index 00000000..e90ce6c2 Binary files /dev/null and b/Ps/bg/bg.psd differ diff --git a/Ps/bg/list.psd b/Ps/bg/list.psd index 77cbc9bb..75e12eac 100644 Binary files a/Ps/bg/list.psd and b/Ps/bg/list.psd differ diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts index cc572512..59eb68f6 100644 --- a/assets/Scripts/Sub/UI/PreloadUI.ts +++ b/assets/Scripts/Sub/UI/PreloadUI.ts @@ -2,6 +2,7 @@ import { _decorator, AssetManager, AudioClip, + BufferAsset, Button, Component, ImageAsset, @@ -55,7 +56,7 @@ export class PreloadUI extends Component { this.jinduFilled.fillRange = 0; //this.btnLogin.node.active = false; - + this.preloadFiles(); LanguageUtils.setLanguage(LanguageType.CN); @@ -114,7 +115,7 @@ export class PreloadUI extends Component { // {path:"mohu", bundleName: "Materials", ftype: Material}, // {path:"UI/Cross/Cross_UI", bundleName: "PB", ftype: Prefab}, // {path:"UI/StartUI/Start_UI", bundleName: "PB", ftype: Prefab}, - // {path:"commonGlobal", bundleName: "DataTable", ftype: JsonAsset}, + { path: "tblanguage", bundleName: "DataTable", ftype: BufferAsset }, ]; let num_prefab = 0; //已加载数量 let num_succeed = 0; //加载成功数量 diff --git a/assets/resources/chat_ui/chat_bubble.png b/assets/resources/chat_ui/chat_bubble.png index 17d0704a..c3306014 100644 Binary files a/assets/resources/chat_ui/chat_bubble.png and b/assets/resources/chat_ui/chat_bubble.png differ diff --git a/assets/resources/chat_ui/chat_bubble.png.meta b/assets/resources/chat_ui/chat_bubble.png.meta index 5a58272a..cff03e01 100644 --- a/assets/resources/chat_ui/chat_bubble.png.meta +++ b/assets/resources/chat_ui/chat_bubble.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 67, - "height": 58, - "rawWidth": 67, - "rawHeight": 58, + "width": 69, + "height": 60, + "rawWidth": 69, + "rawHeight": 60, "borderTop": 28, "borderBottom": 28, "borderLeft": 30, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -33.5, - -29, + -34.5, + -30, 0, - 33.5, - -29, + 34.5, + -30, 0, - -33.5, - 29, + -34.5, + 30, 0, - 33.5, - 29, + 34.5, + 30, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 58, - 67, - 58, + 60, + 69, + 60, 0, 0, - 67, + 69, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -33.5, - -29, + -34.5, + -30, 0 ], "maxPos": [ - 33.5, - 29, + 34.5, + 30, 0 ] }, diff --git a/settings/v2/packages/builder.json b/settings/v2/packages/builder.json index 5509048a..0a91c3eb 100644 --- a/settings/v2/packages/builder.json +++ b/settings/v2/packages/builder.json @@ -28,7 +28,8 @@ }, "fallbackOptions": { "compressionType": "merge_dep" - } + }, + "overwriteSettings": {} }, "miniGame": { "fallbackOptions": {