diff --git a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts index 352b16d2..47af0505 100644 --- a/assets/Scripts/chat18x/ui/panels/SettingPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/SettingPanel.ts @@ -78,7 +78,11 @@ export class SettingPanel extends li_BaseView { LanguageType.HI, "हिंदी" ); - + this.initLanguageButton( + this._nodeTab.Language3.getComponent(Button), + LanguageType.CN, + "中文" + ); this.languageButtons.forEach((b) => { if (b.language == LanguageUtils.CurrentLanguage) { this.curLanguage.string = b.label.string; diff --git a/assets/bundles/Chat18x/SettingPanel.prefab b/assets/bundles/Chat18x/SettingPanel.prefab index d0b15cbb..fc7805a4 100644 --- a/assets/bundles/Chat18x/SettingPanel.prefab +++ b/assets/bundles/Chat18x/SettingPanel.prefab @@ -28,20 +28,20 @@ "__id__": 28 }, { - "__id__": 252 + "__id__": 272 } ], "_active": true, "_components": [ { - "__id__": 260 + "__id__": 280 }, { - "__id__": 262 + "__id__": 282 } ], "_prefab": { - "__id__": 264 + "__id__": 284 }, "_lpos": { "__type__": "cc.Vec3", @@ -683,11 +683,11 @@ "_active": true, "_components": [ { - "__id__": 249 + "__id__": 269 } ], "_prefab": { - "__id__": 251 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -3766,14 +3766,14 @@ "_active": true, "_components": [ { - "__id__": 244 + "__id__": 264 }, { - "__id__": 246 + "__id__": 266 } ], "_prefab": { - "__id__": 248 + "__id__": 268 }, "_lpos": { "__type__": "cc.Vec3", @@ -4965,22 +4965,28 @@ }, { "__id__": 223 + }, + { + "__id__": 237 + }, + { + "__id__": 243 } ], "_active": true, "_components": [ { - "__id__": 237 + "__id__": 257 }, { - "__id__": 239 + "__id__": 259 }, { - "__id__": 241 + "__id__": 261 } ], "_prefab": { - "__id__": 243 + "__id__": 263 }, "_lpos": { "__type__": "cc.Vec3", @@ -5314,7 +5320,7 @@ }, "clickEvents": [], "_interactable": true, - "_transition": 1, + "_transition": 0, "_normalColor": { "__type__": "cc.Color", "r": 214, @@ -5891,6 +5897,514 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "seperator-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 202 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 238 + }, + { + "__id__": 240 + } + ], + "_prefab": { + "__id__": 242 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -170.2, + "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__": 237 + }, + "_enabled": true, + "__prefab": { + "__id__": 239 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 285, + "height": 5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cVfF8rTVJIITEJ1YmQr10" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 237 + }, + "_enabled": true, + "__prefab": { + "__id__": 241 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "abcf6b7d-4710-47a3-a316-bdabaffb2a17@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": "3cEAq76qBOWqO4/4tzC2Jc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d7xI/P55JGW6o/RYb04rTd", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Language3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 202 + }, + "_children": [ + { + "__id__": 244 + } + ], + "_active": true, + "_components": [ + { + "__id__": 250 + }, + { + "__id__": 252 + }, + { + "__id__": 254 + } + ], + "_prefab": { + "__id__": 256 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -211.54999999999998, + "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": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 243 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 245 + }, + { + "__id__": 247 + } + ], + "_prefab": { + "__id__": 249 + }, + "_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__": 244 + }, + "_enabled": true, + "__prefab": { + "__id__": 246 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 84, + "height": 75.22200000000001 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1NM3weL1DKKmT6wTSrt7Y" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 244 + }, + "_enabled": true, + "__prefab": { + "__id__": 248 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 46, + "g": 28, + "b": 57, + "a": 255 + }, + "_string": "中文", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 42, + "_fontSize": 42, + "_fontFamily": "Arial", + "_lineHeight": 59.7, + "_overflow": 0, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_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": "79ob02zCdL14yzo6D0XTSh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c5h39cmDhDz6CRjC6d99Zh", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 243 + }, + "_enabled": true, + "__prefab": { + "__id__": 251 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 306.7, + "height": 72.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ec6YBwepBPp7VmffeA9npl" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 243 + }, + "_enabled": false, + "__prefab": { + "__id__": 253 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0771Uqw+tGr762Sf0Sj1na" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 243 + }, + "_enabled": true, + "__prefab": { + "__id__": 255 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "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" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 243 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "91a/dfy55D7KhYZdWU2cif" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8aIGTJb8xH7Z52zp9WxCCG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -5901,12 +6415,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", "width": 344, - "height": 175 + "height": 257.7 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5929,7 +6443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5974,7 +6488,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 262 }, "_resizeMode": 1, "_layoutType": 2, @@ -6025,7 +6539,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 265 }, "_contentSize": { "__type__": "cc.Size", @@ -6053,7 +6567,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 247 + "__id__": 267 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6111,7 +6625,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6154,17 +6668,17 @@ "_active": true, "_components": [ { - "__id__": 253 + "__id__": 273 }, { - "__id__": 255 + "__id__": 275 }, { - "__id__": 257 + "__id__": 277 } ], "_prefab": { - "__id__": 259 + "__id__": 279 }, "_lpos": { "__type__": "cc.Vec3", @@ -6201,11 +6715,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 274 }, "_contentSize": { "__type__": "cc.Size", @@ -6229,11 +6743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 276 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6274,11 +6788,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 252 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 278 }, "clickEvents": [], "_interactable": true, @@ -6347,7 +6861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 281 }, "_contentSize": { "__type__": "cc.Size", @@ -6375,7 +6889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 283 }, "m_rootNode": null, "titleLabel": { diff --git a/assets/bundles/DataTable/tbglobalconfig.bin b/assets/bundles/DataTable/tbglobalconfig.bin index 9f42a37c..b49f5c91 100644 Binary files a/assets/bundles/DataTable/tbglobalconfig.bin and b/assets/bundles/DataTable/tbglobalconfig.bin differ diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 02a541da..349e5c65 100644 Binary files a/assets/bundles/DataTable/tblanguage.bin and b/assets/bundles/DataTable/tblanguage.bin differ diff --git a/xchat_cfg b/xchat_cfg index 00e9816c..53e277f1 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 00e9816c33d86c1a32dcf43e86fb4f1b3fe6ac0a +Subproject commit 53e277f100f4af0d931654436ac60d3c6b5968ac