From fba0dc79fe1891623c6c8f001767ad75e8b2c83d Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Wed, 15 Oct 2025 19:01:33 +0800 Subject: [PATCH] update --- assets/Scripts/chat18x/ui/panels/ChatPanel.ts | 6 + assets/bundles/Chat18x/ChatPanel.prefab | 478 ++++++++++++------ assets/bundles/DataTable/tblanguage.bin | Bin 33804 -> 33842 bytes xchat_cfg | 2 +- 4 files changed, 330 insertions(+), 156 deletions(-) diff --git a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts index f6895a08..d1ec88de 100644 --- a/assets/Scripts/chat18x/ui/panels/ChatPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ChatPanel.ts @@ -44,6 +44,9 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { @property(Label) girlName: Label = null; + @property(Label) + chatTime: Label = null; + // @property(Sprite) // girlImg: Sprite = null; @@ -291,6 +294,9 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback { const girlData = DataManager.I.getDataById(DataId.Girl); let triggerId = girlData.getTriggerGrilPhotoId(this.categoryId, this.id); + const count = girlData.getChatRemainCount(this.categoryId, this.id); + this.chatTime.string = count + LanguageUtils.getText("chatpanel.times"); + if (triggerId == 0) return; logger.log("Trigger pop up Image id:" + this.id + "--" + triggerId); diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index 6d1be7df..3a9bfa38 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -28,23 +28,23 @@ "__id__": 70 }, { - "__id__": 305 + "__id__": 311 } ], "_active": true, "_components": [ { - "__id__": 335 + "__id__": 341 }, { - "__id__": 337 + "__id__": 343 }, { - "__id__": 339 + "__id__": 345 } ], "_prefab": { - "__id__": 341 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -103,17 +103,17 @@ "_active": true, "_components": [ { - "__id__": 298 + "__id__": 304 }, { - "__id__": 300 + "__id__": 306 }, { - "__id__": 302 + "__id__": 308 } ], "_prefab": { - "__id__": 304 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -4250,17 +4250,17 @@ "_active": true, "_components": [ { - "__id__": 291 + "__id__": 297 }, { - "__id__": 293 + "__id__": 299 }, { - "__id__": 295 + "__id__": 301 } ], "_prefab": { - "__id__": 297 + "__id__": 303 }, "_lpos": { "__type__": "cc.Vec3", @@ -4310,26 +4310,26 @@ "__id__": 225 }, { - "__id__": 242 + "__id__": 248 }, { - "__id__": 248 + "__id__": 254 } ], "_active": true, "_components": [ { - "__id__": 284 + "__id__": 290 }, { - "__id__": 286 + "__id__": 292 }, { - "__id__": 288 + "__id__": 294 } ], "_prefab": { - "__id__": 290 + "__id__": 296 }, "_lpos": { "__type__": "cc.Vec3", @@ -5119,22 +5119,25 @@ "_children": [ { "__id__": 226 + }, + { + "__id__": 234 } ], "_active": true, "_components": [ { - "__id__": 234 + "__id__": 240 }, { - "__id__": 236 + "__id__": 242 }, { - "__id__": 238 + "__id__": 244 } ], "_prefab": { - "__id__": 241 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -5191,8 +5194,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": -31.10200000000009, + "y": -5.684341886080802e-14, "z": 0 }, "_lrot": { @@ -5351,6 +5354,168 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "time", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 225 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 235 + }, + { + "__id__": 237 + } + ], + "_prefab": { + "__id__": 239 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 52.77999999999997, + "y": -5.684341886080802e-14, + "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__": 234 + }, + "_enabled": true, + "__prefab": { + "__id__": 236 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 76.155859, + "height": 50.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1gzZ6O9JF44Zyt6Yswk1t" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 234 + }, + "_enabled": true, + "__prefab": { + "__id__": 238 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "label", + "_horizontalAlign": 1, + "_verticalAlign": 2, + "_actualFontSize": 21, + "_fontSize": 20, + "_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": false, + "_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": "c27d48QExJ9ojb8pgcRiHl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "93AYQmOgJDX5XGdjX8nQWy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -5361,7 +5526,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 241 }, "_contentSize": { "__type__": "cc.Size", @@ -5389,7 +5554,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 243 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5434,11 +5599,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 245 }, "clickEvents": [ { - "__id__": 240 + "__id__": 246 } ], "_interactable": true, @@ -5521,14 +5686,14 @@ "_active": true, "_components": [ { - "__id__": 243 + "__id__": 249 }, { - "__id__": 245 + "__id__": 251 } ], "_prefab": { - "__id__": 247 + "__id__": 253 }, "_lpos": { "__type__": "cc.Vec3", @@ -5565,11 +5730,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 250 }, "_contentSize": { "__type__": "cc.Size", @@ -5593,11 +5758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 252 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5655,35 +5820,35 @@ }, "_children": [ { - "__id__": 249 - }, - { - "__id__": 257 + "__id__": 255 }, { "__id__": 263 }, { "__id__": 269 + }, + { + "__id__": 275 } ], "_active": true, "_components": [ - { - "__id__": 275 - }, - { - "__id__": 277 - }, - { - "__id__": 279 - }, { "__id__": 281 + }, + { + "__id__": 283 + }, + { + "__id__": 285 + }, + { + "__id__": 287 } ], "_prefab": { - "__id__": 283 + "__id__": 289 }, "_lpos": { "__type__": "cc.Vec3", @@ -5720,23 +5885,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 254 }, "_children": [], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 256 }, { - "__id__": 252 + "__id__": 258 }, { - "__id__": 254 + "__id__": 260 } ], "_prefab": { - "__id__": 256 + "__id__": 262 }, "_lpos": { "__type__": "cc.Vec3", @@ -5773,11 +5938,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 257 }, "_contentSize": { "__type__": "cc.Size", @@ -5801,11 +5966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 259 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5846,11 +6011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 261 }, "_alignFlags": 45, "_target": null, @@ -5895,20 +6060,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 254 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 264 }, { - "__id__": 260 + "__id__": 266 } ], "_prefab": { - "__id__": 262 + "__id__": 268 }, "_lpos": { "__type__": "cc.Vec3", @@ -5945,11 +6110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 265 }, "_contentSize": { "__type__": "cc.Size", @@ -5973,11 +6138,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 267 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6031,20 +6196,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 254 }, "_children": [], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 270 }, { - "__id__": 266 + "__id__": 272 } ], "_prefab": { - "__id__": 268 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -6081,11 +6246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 271 }, "_contentSize": { "__type__": "cc.Size", @@ -6109,11 +6274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 269 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 273 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6167,20 +6332,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 248 + "__id__": 254 }, "_children": [], "_active": true, "_components": [ { - "__id__": 270 + "__id__": 276 }, { - "__id__": 272 + "__id__": 278 } ], "_prefab": { - "__id__": 274 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -6217,11 +6382,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 277 }, "_contentSize": { "__type__": "cc.Size", @@ -6245,11 +6410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 269 + "__id__": 275 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 279 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6303,11 +6468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 282 }, "_contentSize": { "__type__": "cc.Size", @@ -6331,11 +6496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": false, "__prefab": { - "__id__": 278 + "__id__": 284 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6376,11 +6541,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": false, "__prefab": { - "__id__": 280 + "__id__": 286 }, "_alignFlags": 42, "_target": null, @@ -6412,11 +6577,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 248 + "__id__": 254 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 288 }, "playOnLoad": true, "_clips": [ @@ -6458,7 +6623,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 285 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", @@ -6486,7 +6651,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 287 + "__id__": 293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6531,7 +6696,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 289 + "__id__": 295 }, "_alignFlags": 40, "_target": null, @@ -6580,7 +6745,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 298 }, "_contentSize": { "__type__": "cc.Size", @@ -6608,7 +6773,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 294 + "__id__": 300 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6653,7 +6818,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 302 }, "_alignFlags": 44, "_target": null, @@ -6702,7 +6867,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 299 + "__id__": 305 }, "_contentSize": { "__type__": "cc.Size", @@ -6730,7 +6895,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 301 + "__id__": 307 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6772,7 +6937,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 309 }, "_alignFlags": 45, "_target": null, @@ -6821,20 +6986,20 @@ }, "_children": [ { - "__id__": 306 + "__id__": 312 } ], "_active": true, "_components": [ { - "__id__": 330 + "__id__": 336 }, { - "__id__": 332 + "__id__": 338 } ], "_prefab": { - "__id__": 334 + "__id__": 340 }, "_lpos": { "__type__": "cc.Vec3", @@ -6871,24 +7036,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 305 + "__id__": 311 }, "_children": [ { - "__id__": 307 + "__id__": 313 } ], "_active": true, "_components": [ { - "__id__": 325 + "__id__": 331 }, { - "__id__": 327 + "__id__": 333 } ], "_prefab": { - "__id__": 329 + "__id__": 335 }, "_lpos": { "__type__": "cc.Vec3", @@ -6925,27 +7090,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 306 + "__id__": 312 }, "_children": [ { - "__id__": 308 + "__id__": 314 } ], "_active": true, "_components": [ { - "__id__": 318 + "__id__": 324 }, { - "__id__": 320 + "__id__": 326 }, { - "__id__": 322 + "__id__": 328 } ], "_prefab": { - "__id__": 324 + "__id__": 330 }, "_lpos": { "__type__": "cc.Vec3", @@ -6982,26 +7147,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 307 + "__id__": 313 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 309 - }, - { - "__id__": 311 - }, - { - "__id__": 313 - }, { "__id__": 315 + }, + { + "__id__": 317 + }, + { + "__id__": 319 + }, + { + "__id__": 321 } ], "_prefab": { - "__id__": 317 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -7038,11 +7203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 316 }, "_contentSize": { "__type__": "cc.Size", @@ -7066,11 +7231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 318 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7108,11 +7273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 320 }, "_alignFlags": 12, "_target": null, @@ -7144,11 +7309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 322 }, "clickEvents": [], "_interactable": true, @@ -7213,11 +7378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 325 }, "_contentSize": { "__type__": "cc.Size", @@ -7241,11 +7406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 327 }, "_type": 3, "_inverted": false, @@ -7263,11 +7428,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 329 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7321,11 +7486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 332 }, "_contentSize": { "__type__": "cc.Size", @@ -7349,11 +7514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 312 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 334 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7407,11 +7572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -7435,14 +7600,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 305 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 339 }, "image": { - "__id__": 311 + "__id__": 317 }, "_id": "" }, @@ -7473,7 +7638,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -7501,7 +7666,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 344 }, "_alignFlags": 45, "_target": null, @@ -7537,7 +7702,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 346 }, "m_rootNode": null, "editBox": { @@ -7546,6 +7711,9 @@ "girlName": { "__id__": 42 }, + "chatTime": { + "__id__": 237 + }, "videoArea": { "__id__": 185 }, @@ -7553,7 +7721,7 @@ "__id__": 67 }, "popUpImage": { - "__id__": 332 + "__id__": 338 }, "_id": "" }, diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 9fa12bb660ac20e18bab7fdb39845a2144b56188..43dd1730edf1479d7b9797a2e4c37e1aee7330a0 100644 GIT binary patch delta 46 ycmeC_VA|Bd#MH2FBhv;pY5wGl#FB!8U delta 18 Zcmdng!PL{i#MH2NBhv=9%{SPhY5_&n2V(#L diff --git a/xchat_cfg b/xchat_cfg index cee552a1..a6d28287 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit cee552a12861a0604b6b5e032cd591913c5f75d5 +Subproject commit a6d28287047ae9776e31a5afb2aaee75381fd48d