diff --git a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts index a7fe6cb6..f7212eb6 100644 --- a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts @@ -86,6 +86,13 @@ export class PastGirlListPanel extends li_BaseView { // 获取已解锁女孩列表 const ids = await this.getUnlockedGirls(); + if (true) { + //!ids || ids.length === 0) { + this._nodeTab.cleanBg.active = true; + } else { + this._nodeTab.cleanBg.active = false; + } + if (this.cacheIds && ids && this.cacheIds.length == ids.length) { let isSame = true; for (let i = 0; i < ids.length; i++) { diff --git a/assets/bundles/Chat18x/PastGirlListPanel.prefab b/assets/bundles/Chat18x/PastGirlListPanel.prefab index aad60fff..01e7bd7c 100644 --- a/assets/bundles/Chat18x/PastGirlListPanel.prefab +++ b/assets/bundles/Chat18x/PastGirlListPanel.prefab @@ -25,20 +25,20 @@ "_active": true, "_components": [ { - "__id__": 200 + "__id__": 214 }, { - "__id__": 202 + "__id__": 216 }, { - "__id__": 204 + "__id__": 218 }, { - "__id__": 206 + "__id__": 220 } ], "_prefab": { - "__id__": 208 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,22 +83,25 @@ }, { "__id__": 149 + }, + { + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 193 + "__id__": 207 }, { - "__id__": 195 + "__id__": 209 }, { - "__id__": 197 + "__id__": 211 } ], "_prefab": { - "__id__": 199 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -4473,6 +4476,330 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "cleanBg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 194 + } + ], + "_active": true, + "_components": [ + { + "__id__": 202 + }, + { + "__id__": 204 + } + ], + "_prefab": { + "__id__": 206 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -114.49000000000001, + "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.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 193 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 195 + }, + { + "__id__": 197 + }, + { + "__id__": 199 + } + ], + "_prefab": { + "__id__": 201 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -228.40299999999996, + "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__": 194 + }, + "_enabled": true, + "__prefab": { + "__id__": 196 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 649.9, + "height": 67.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fcUjhdhQpIRqZVMxWyYrB+" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 194 + }, + "_enabled": true, + "__prefab": { + "__id__": 198 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 87, + "g": 50, + "b": 106, + "a": 255 + }, + "_string": "Haven't chatted with any girls yet", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 40, + "_fontSize": 48, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "2d833118-c040-441c-a2f2-8e56390acb70", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "82j9K1RaRFeZ7i696Ffu2l" + }, + { + "__type__": "d7e4fOii5xNLqH2PF6de4pP", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 194 + }, + "_enabled": true, + "__prefab": { + "__id__": 200 + }, + "languageKey": "pastgirllistpanel.nogirl", + "defaultText": "", + "autoUpdate": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "baqwZS/sdOxJE1VdBdACiG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a7b/5ywUtCk5yRlgjJ+5Is", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 193 + }, + "_enabled": true, + "__prefab": { + "__id__": 203 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 487, + "height": 543 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "84fdXEmV5ASp0uK+oVF4fm" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 193 + }, + "_enabled": true, + "__prefab": { + "__id__": 205 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "c84bc434-5b48-4caa-8936-2763ae7d0c05@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31jMGkJYVJ3Yu/ouUBtD6d" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8cZMUuJM9GpqU402pG3Q96", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -4483,7 +4810,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -4511,7 +4838,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4556,7 +4883,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 212 }, "_alignFlags": 45, "_target": null, @@ -4605,7 +4932,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -4633,7 +4960,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 217 }, "_alignFlags": 45, "_target": null, @@ -4669,7 +4996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 219 }, "_id": "" }, @@ -4687,7 +5014,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 221 }, "m_rootNode": null, "_id": "" @@ -4705,6 +5032,7 @@ "__id__": 0 }, "fileId": "50O8GAOyNKI4WyeNDAmUoh", + "instance": null, "targetOverrides": [] } ] \ No newline at end of file diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index aea48d76..2b1cca1e 100644 Binary files a/assets/bundles/DataTable/tblanguage.bin and b/assets/bundles/DataTable/tblanguage.bin differ diff --git a/assets/resources/ui/girls_list/LT_wjl.png b/assets/resources/ui/girls_list/LT_wjl.png new file mode 100644 index 00000000..d278a040 Binary files /dev/null and b/assets/resources/ui/girls_list/LT_wjl.png differ diff --git a/assets/resources/ui/girls_list/LT_wjl.png.meta b/assets/resources/ui/girls_list/LT_wjl.png.meta new file mode 100644 index 00000000..28e8e216 --- /dev/null +++ b/assets/resources/ui/girls_list/LT_wjl.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "c84bc434-5b48-4caa-8936-2763ae7d0c05", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "c84bc434-5b48-4caa-8936-2763ae7d0c05@6c48a", + "displayName": "LT_wjl", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "c84bc434-5b48-4caa-8936-2763ae7d0c05", + "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": "c84bc434-5b48-4caa-8936-2763ae7d0c05@f9941", + "displayName": "LT_wjl", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 487, + "height": 543, + "rawWidth": 487, + "rawHeight": 543, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -243.5, + -271.5, + 0, + 243.5, + -271.5, + 0, + -243.5, + 271.5, + 0, + 243.5, + 271.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 543, + 487, + 543, + 0, + 0, + 487, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -243.5, + -271.5, + 0 + ], + "maxPos": [ + 243.5, + 271.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "c84bc434-5b48-4caa-8936-2763ae7d0c05@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "c84bc434-5b48-4caa-8936-2763ae7d0c05@6c48a" + } +} diff --git a/xchat_cfg b/xchat_cfg index 65cfbb75..81182e0b 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 65cfbb75ed77070bf30a0555d37784c930189955 +Subproject commit 81182e0bb458735e325c226c215c78c1969fa060