Browse Source

修改BUG

master
cristianoxin 5 months ago
parent
commit
f7530dff17
  1. 75
      assets/10001/10001.scene
  2. BIN
      assets/10001/language/en/10001menu/com_btn_rules.png
  3. 36
      assets/10001/language/en/10001menu/com_btn_rules.png.meta
  4. BIN
      assets/10001/language/en/10001menu/com_font_setting.png
  5. 56
      assets/10001/language/en/10001menu/com_font_setting.png.meta
  6. 4
      assets/10001/language/en/language.json
  7. BIN
      assets/10001/language/in/10001menu/com_btn_rules.png
  8. 56
      assets/10001/language/in/10001menu/com_btn_rules.png.meta
  9. BIN
      assets/10001/language/in/10001menu/com_font_setting.png
  10. 134
      assets/10001/language/in/10001menu/com_font_setting.png.meta
  11. 4
      assets/10001/language/in/language.json
  12. 117
      assets/10001/prefab/TeenPattieGame.prefab
  13. 2361
      assets/10001/prefab/TeenPattieSettingGame.prefab
  14. BIN
      assets/10001/res/game/pop/beishu_bg.png
  15. BIN
      assets/10001/res/game/pop/beishu_bg1.png
  16. BIN
      assets/10001/res/game/pop/beishu_light.png
  17. 134
      assets/10001/res/game/pop/beishu_light.png.meta
  18. BIN
      assets/10001/res/game/pop/btn__off.png
  19. BIN
      assets/10001/res/game/pop/btn__on.png
  20. BIN
      assets/10001/res/game/pop/icon_shengying.png
  21. BIN
      assets/10001/res/game/pop/icon_yinyue.png
  22. 134
      assets/10001/res/game/pop/icon_yinyue.png.meta
  23. BIN
      assets/10001/res/game/pop/pic_bg.png
  24. 134
      assets/10001/res/game/pop/pic_bg.png.meta
  25. BIN
      assets/10001/res/game/pop/pic_bg2.png
  26. 134
      assets/10001/res/game/pop/pic_bg2.png.meta
  27. BIN
      assets/10001/res/game/pop/pic_hu.png
  28. 134
      assets/10001/res/game/pop/pic_hu.png.meta
  29. BIN
      assets/10001/res/game/pop/pic_kuang.png
  30. BIN
      assets/10001/res/game/pop/pic_light.png
  31. 134
      assets/10001/res/game/pop/pic_light.png.meta
  32. BIN
      assets/10001/res/game/pop/pic_light1.png
  33. 134
      assets/10001/res/game/pop/pic_light1.png.meta
  34. BIN
      assets/10001/res/game/pop/pic_line.png
  35. 134
      assets/10001/res/game/pop/pic_line.png.meta
  36. BIN
      assets/10001/res/game/pop/pic_off.png
  37. 134
      assets/10001/res/game/pop/pic_off.png.meta
  38. BIN
      assets/10001/res/game/pop/pic_texeIbg.png
  39. 134
      assets/10001/res/game/pop/pic_texeIbg.png.meta
  40. BIN
      assets/10001/res/game/pop/pic_text_bg3.png
  41. 134
      assets/10001/res/game/pop/pic_text_bg3.png.meta
  42. 12
      assets/10001/res/game/setting.meta
  43. 3
      assets/10001/res/game/setting/auto-atlas.pac
  44. 36
      assets/10001/res/game/setting/auto-atlas.pac.meta
  45. BIN
      assets/10001/res/game/setting/com_pic_tips.png
  46. 56
      assets/10001/res/game/setting/com_pic_tips.png.meta
  47. BIN
      assets/10001/res/game/setting/com_pic_tipsdi.png
  48. 134
      assets/10001/res/game/setting/com_pic_tipsdi.png.meta
  49. BIN
      assets/10001/res/game/setting/grzx_btn_off.png
  50. 56
      assets/10001/res/game/setting/grzx_btn_off.png.meta
  51. BIN
      assets/10001/res/game/setting/grzx_btn_on.png
  52. 56
      assets/10001/res/game/setting/grzx_btn_on.png.meta
  53. 2
      assets/10001/src/game/TeenPattieCommData.ts
  54. 47
      assets/10001/src/game/component/TeenPattieSettingGamePanel.ts
  55. 3
      assets/10001/src/game/logic/TeenPattieUpLayerLogic.ts
  56. 5
      assets/10001/src/game/system/TeenpattieGameProxySystem.ts
  57. 2
      assets/10001/src/sdk/GameVO.ts

75
assets/10001/10001.scene

@ -21,11 +21,11 @@
"_active": true,
"_components": [],
"_prefab": {
"__id__": 21
"__id__": 16
},
"autoReleaseAssets": false,
"_globals": {
"__id__": 22
"__id__": 17
},
"_id": "d1909322-c6a3-4ec5-a6b8-ceddf19ccd9d"
},
@ -47,13 +47,13 @@
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 13
},
{
"__id__": 19
"__id__": 14
},
{
"__id__": 20
"__id__": 15
}
],
"_prefab": null,
@ -213,19 +213,9 @@
},
{
"__id__": 12
},
{
"__id__": 13
},
{
"__id__": 15
}
],
"removedComponents": [
{
"__id__": 17
}
]
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
@ -289,49 +279,6 @@
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 14
},
"propertyPath": [
"_active"
],
"value": false
},
{
"__type__": "cc.TargetInfo",
"localID": [
"92Et3YGotBRYEMrUAtjgfH"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 16
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 289.109,
"y": 316.321,
"z": 0
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"90g7cyfipGAqYQhADMRgAP"
]
},
{
"__type__": "cc.TargetInfo",
"localID": [
"4ado3qslpL/594oeaaI2wM"
]
},
{
"__type__": "cc.UITransform",
"_name": "",
@ -409,19 +356,19 @@
{
"__type__": "cc.SceneGlobals",
"ambient": {
"__id__": 23
"__id__": 18
},
"shadows": {
"__id__": 24
"__id__": 19
},
"_skybox": {
"__id__": 25
"__id__": 20
},
"fog": {
"__id__": 26
"__id__": 21
},
"octree": {
"__id__": 27
"__id__": 22
}
},
{

BIN
assets/10001/language/en/10001menu/com_btn_rules.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

36
assets/10001/res/game/pop/pic_kuang.png.meta → assets/10001/language/en/10001menu/com_btn_rules.png.meta

@ -2,7 +2,7 @@
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "165b7e98-074a-40b4-9982-00ef3e3d84d1",
"uuid": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8",
"files": [
".json",
".png"
@ -10,8 +10,8 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "165b7e98-074a-40b4-9982-00ef3e3d84d1@6c48a",
"displayName": "pic_kuang",
"uuid": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8@6c48a",
"displayName": "com_btn_rules",
"id": "6c48a",
"name": "texture",
"userData": {
@ -22,7 +22,7 @@
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "165b7e98-074a-40b4-9982-00ef3e3d84d1",
"imageUuidOrDatabaseUri": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8",
"visible": false
},
"ver": "1.0.22",
@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "165b7e98-074a-40b4-9982-00ef3e3d84d1@f9941",
"displayName": "pic_kuang",
"uuid": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8@f9941",
"displayName": "com_btn_rules",
"id": "f9941",
"name": "spriteFrame",
"userData": {
@ -46,9 +46,9 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 156,
"width": 123,
"height": 42,
"rawWidth": 156,
"rawWidth": 123,
"rawHeight": 42,
"borderTop": 0,
"borderBottom": 0,
@ -61,16 +61,16 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-78,
-61.5,
-21,
0,
78,
61.5,
-21,
0,
-78,
-61.5,
21,
0,
78,
61.5,
21,
0
],
@ -85,11 +85,11 @@
"uv": [
0,
42,
156,
123,
42,
0,
0,
156,
123,
0
],
"nuv": [
@ -103,18 +103,18 @@
1
],
"minPos": [
-78,
-61.5,
-21,
0
],
"maxPos": [
78,
61.5,
21,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "165b7e98-074a-40b4-9982-00ef3e3d84d1@6c48a",
"imageUuidOrDatabaseUri": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
@ -129,6 +129,6 @@
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "165b7e98-074a-40b4-9982-00ef3e3d84d1@f9941"
"redirect": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8@f9941"
}
}

BIN
assets/10001/language/en/10001menu/com_font_setting.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

56
assets/10001/res/game/pop/icon_shengying.png.meta → assets/10001/language/en/10001menu/com_font_setting.png.meta

@ -2,7 +2,7 @@
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "b9807bfe-ab72-4cc8-8339-6174446e1258",
"uuid": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7",
"files": [
".json",
".png"
@ -10,8 +10,8 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "b9807bfe-ab72-4cc8-8339-6174446e1258@6c48a",
"displayName": "icon_shengying",
"uuid": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7@6c48a",
"displayName": "com_font_setting",
"id": "6c48a",
"name": "texture",
"userData": {
@ -22,7 +22,7 @@
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "b9807bfe-ab72-4cc8-8339-6174446e1258",
"imageUuidOrDatabaseUri": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7",
"visible": false
},
"ver": "1.0.22",
@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "b9807bfe-ab72-4cc8-8339-6174446e1258@f9941",
"displayName": "icon_shengying",
"uuid": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7@f9941",
"displayName": "com_font_setting",
"id": "f9941",
"name": "spriteFrame",
"userData": {
@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 44,
"height": 45,
"rawWidth": 44,
"rawHeight": 45,
"width": 164,
"height": 53,
"rawWidth": 164,
"rawHeight": 53,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-22,
-22.5,
-82,
-26.5,
0,
22,
-22.5,
82,
-26.5,
0,
-22,
22.5,
-82,
26.5,
0,
22,
22.5,
82,
26.5,
0
],
"indexes": [
@ -84,12 +84,12 @@
],
"uv": [
0,
45,
44,
45,
53,
164,
53,
0,
0,
44,
164,
0
],
"nuv": [
@ -103,18 +103,18 @@
1
],
"minPos": [
-22,
-22.5,
-82,
-26.5,
0
],
"maxPos": [
22,
22.5,
82,
26.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "b9807bfe-ab72-4cc8-8339-6174446e1258@6c48a",
"imageUuidOrDatabaseUri": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
@ -129,6 +129,6 @@
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "b9807bfe-ab72-4cc8-8339-6174446e1258@f9941"
"redirect": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7@f9941"
}
}

4
assets/10001/language/en/language.json

@ -467,6 +467,10 @@
"des":"金币",
"value":"Gold"
},
"game.title.tapToClose":{
"des":"点击关闭",
"value":"TAP TO CLOSE"
},
"game.rule.teenpattir_1":{
"des":"玩家每局会收到牌面朝下的三张牌,每局结束时根据手牌的牌型大小决定获胜或失败。\n玩家必须每轮都押注直到牌局结束,或选择弃牌,一般状态下只有一名玩家获胜,并获得彩池内所有注金",
"value":"Players will receive three cards facing down in each game, and at the end of each game, the winner or loser will be determined based on the size of the hand.\nPlayers must bet until the end of each round or choose to discard their cards. In general, only one player wins and receives all the bets in the pool"

BIN
assets/10001/language/in/10001menu/com_btn_rules.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

56
assets/10001/res/game/pop/btn__off.png.meta → assets/10001/language/in/10001menu/com_btn_rules.png.meta

@ -2,7 +2,7 @@
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "f56a25ba-004c-4797-b6d5-83a7b71d8b97",
"uuid": "bd081b95-7e18-4029-855e-cafd7b93ec2d",
"files": [
".json",
".png"
@ -10,8 +10,8 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "f56a25ba-004c-4797-b6d5-83a7b71d8b97@6c48a",
"displayName": "btn__off",
"uuid": "bd081b95-7e18-4029-855e-cafd7b93ec2d@6c48a",
"displayName": "com_btn_rules",
"id": "6c48a",
"name": "texture",
"userData": {
@ -22,7 +22,7 @@
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "f56a25ba-004c-4797-b6d5-83a7b71d8b97",
"imageUuidOrDatabaseUri": "bd081b95-7e18-4029-855e-cafd7b93ec2d",
"visible": false
},
"ver": "1.0.22",
@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "f56a25ba-004c-4797-b6d5-83a7b71d8b97@f9941",
"displayName": "btn__off",
"uuid": "bd081b95-7e18-4029-855e-cafd7b93ec2d@f9941",
"displayName": "com_btn_rules",
"id": "f9941",
"name": "spriteFrame",
"userData": {
@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 162,
"height": 39,
"rawWidth": 162,
"rawHeight": 39,
"width": 123,
"height": 56,
"rawWidth": 123,
"rawHeight": 56,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-81,
-19.5,
-61.5,
-28,
0,
81,
-19.5,
61.5,
-28,
0,
-81,
19.5,
-61.5,
28,
0,
81,
19.5,
61.5,
28,
0
],
"indexes": [
@ -84,12 +84,12 @@
],
"uv": [
0,
39,
162,
39,
56,
123,
56,
0,
0,
162,
123,
0
],
"nuv": [
@ -103,18 +103,18 @@
1
],
"minPos": [
-81,
-19.5,
-61.5,
-28,
0
],
"maxPos": [
81,
19.5,
61.5,
28,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "f56a25ba-004c-4797-b6d5-83a7b71d8b97@6c48a",
"imageUuidOrDatabaseUri": "bd081b95-7e18-4029-855e-cafd7b93ec2d@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
@ -129,6 +129,6 @@
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "f56a25ba-004c-4797-b6d5-83a7b71d8b97@f9941"
"redirect": "bd081b95-7e18-4029-855e-cafd7b93ec2d@f9941"
}
}

BIN
assets/10001/language/in/10001menu/com_font_setting.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

134
assets/10001/language/in/10001menu/com_font_setting.png.meta

@ -0,0 +1,134 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "58fa4014-c26a-4b91-903d-515b703f942e",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "58fa4014-c26a-4b91-903d-515b703f942e@6c48a",
"displayName": "com_font_setting",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "58fa4014-c26a-4b91-903d-515b703f942e",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "58fa4014-c26a-4b91-903d-515b703f942e@f9941",
"displayName": "com_font_setting",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 124,
"height": 59,
"rawWidth": 124,
"rawHeight": 59,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-62,
-29.5,
0,
62,
-29.5,
0,
-62,
29.5,
0,
62,
29.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
59,
124,
59,
0,
0,
124,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-62,
-29.5,
0
],
"maxPos": [
62,
29.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "58fa4014-c26a-4b91-903d-515b703f942e@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "58fa4014-c26a-4b91-903d-515b703f942e@f9941"
}
}

4
assets/10001/language/in/language.json

@ -466,6 +466,10 @@
"des":"金币",
"value":"सोने कोन"
},
"game.title.tapToClose":{
"des":"点击关闭",
"value":"बन्द करने के लिए टैप"
},
"game.rule.teenpattir_1":{
"des":"玩家每局会收到牌面朝下的三张牌,每局结束时根据手牌的牌型大小决定获胜或失败。\n玩家必须每轮都押注直到牌局结束,或选择弃牌,一般状态下只有一名玩家获胜,并获得彩池内所有注金",
"value":"खेलाड़ियों को हर खेल में तीन पत्ता प्राप्त होगा, और हर खेल के अन्त में, विजेता या घाटा हाथ के आकार पर आधारित निर्धारित होगा.\nखेलाड़ियों को प्रत्येक राउन्ड के अंत तक बेट करना चाहिए या अपने कार्डों को छोड़ने के लिए चुनें. सामान्य, सिर्फ एक खेलाड़ी ज"

117
assets/10001/prefab/TeenPattieGame.prefab

@ -27,6 +27,9 @@
],
"_active": true,
"_components": [
{
"__id__": 1910
},
{
"__id__": 1912
},
@ -35,13 +38,10 @@
},
{
"__id__": 1916
},
{
"__id__": 1918
}
],
"_prefab": {
"__id__": 1920
"__id__": 1918
},
"_lpos": {
"__type__": "cc.Vec3",
@ -327,23 +327,23 @@
"__id__": 1871
},
{
"__id__": 1893
"__id__": 1891
},
{
"__id__": 1901
"__id__": 1899
}
],
"_active": true,
"_components": [
{
"__id__": 1907
"__id__": 1905
},
{
"__id__": 1909
"__id__": 1907
}
],
"_prefab": {
"__id__": 1911
"__id__": 1909
},
"_lpos": {
"__type__": "cc.Vec3",
@ -3906,8 +3906,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -4.763,
"y": 17.58,
"x": 289.109,
"y": 316.321,
"z": 0
},
"_lrot": {
@ -40447,14 +40447,14 @@
"_active": false,
"_components": [
{
"__id__": 1888
"__id__": 1886
},
{
"__id__": 1890
"__id__": 1888
}
],
"_prefab": {
"__id__": 1892
"__id__": 1890
},
"_lpos": {
"__type__": "cc.Vec3",
@ -40631,13 +40631,10 @@
},
{
"__id__": 1883
},
{
"__id__": 1885
}
],
"_prefab": {
"__id__": 1887
"__id__": 1885
},
"_lpos": {
"__type__": "cc.Vec3",
@ -40773,24 +40770,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "5dpoAanuNIl4fGernVhJ/n"
},
{
"__type__": "7a86c1i8NBDd4zMiFYtTcWq",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1878
},
"_enabled": true,
"__prefab": {
"__id__": 1886
},
"path": "game.title.waiting",
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4ado3qslpL/594oeaaI2wM"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@ -40810,7 +40789,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1889
"__id__": 1887
},
"_contentSize": {
"__type__": "cc.Size",
@ -40837,7 +40816,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1891
"__id__": 1889
},
"_alignFlags": 45,
"_target": null,
@ -40884,17 +40863,17 @@
"_active": false,
"_components": [
{
"__id__": 1894
"__id__": 1892
},
{
"__id__": 1896
"__id__": 1894
},
{
"__id__": 1898
"__id__": 1896
}
],
"_prefab": {
"__id__": 1900
"__id__": 1898
},
"_lpos": {
"__type__": "cc.Vec3",
@ -40929,11 +40908,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1893
"__id__": 1891
},
"_enabled": true,
"__prefab": {
"__id__": 1895
"__id__": 1893
},
"_contentSize": {
"__type__": "cc.Size",
@ -40956,11 +40935,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1893
"__id__": 1891
},
"_enabled": true,
"__prefab": {
"__id__": 1897
"__id__": 1895
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -41003,11 +40982,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1893
"__id__": 1891
},
"_enabled": true,
"__prefab": {
"__id__": 1899
"__id__": 1897
},
"_alignFlags": 45,
"_target": null,
@ -41054,14 +41033,14 @@
"_active": false,
"_components": [
{
"__id__": 1902
"__id__": 1900
},
{
"__id__": 1904
"__id__": 1902
}
],
"_prefab": {
"__id__": 1906
"__id__": 1904
},
"_lpos": {
"__type__": "cc.Vec3",
@ -41096,11 +41075,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1901
"__id__": 1899
},
"_enabled": true,
"__prefab": {
"__id__": 1903
"__id__": 1901
},
"_contentSize": {
"__type__": "cc.Size",
@ -41123,11 +41102,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1901
"__id__": 1899
},
"_enabled": true,
"__prefab": {
"__id__": 1905
"__id__": 1903
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -41182,7 +41161,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1908
"__id__": 1906
},
"_contentSize": {
"__type__": "cc.Size",
@ -41209,7 +41188,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1910
"__id__": 1908
},
"_alignFlags": 45,
"_target": null,
@ -41254,7 +41233,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1913
"__id__": 1911
},
"_contentSize": {
"__type__": "cc.Size",
@ -41281,7 +41260,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1915
"__id__": 1913
},
"_alignFlags": 45,
"_target": null,
@ -41316,7 +41295,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1917
"__id__": 1915
},
"en_json": {
"__uuid__": "d6878b67-8f2e-4ea5-82da-a60c5b10232c",
@ -41338,6 +41317,14 @@
{
"__uuid__": "b228f826-594c-41c2-b1e8-71ffe325f279@f9941",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "0e5c2b92-f5c6-43d5-808c-e747ead72ac8@f9941",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "4a27942e-fc42-4caa-9b92-996e6d8ba8c7@f9941",
"__expectedType__": "cc.SpriteFrame"
}
],
"in_Sprite": [
@ -41352,6 +41339,14 @@
{
"__uuid__": "e14ec307-184a-443a-883f-2eef4fa82ba0@f9941",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "bd081b95-7e18-4029-855e-cafd7b93ec2d@f9941",
"__expectedType__": "cc.SpriteFrame"
},
{
"__uuid__": "58fa4014-c26a-4b91-903d-515b703f942e@f9941",
"__expectedType__": "cc.SpriteFrame"
}
],
"_id": ""
@ -41369,7 +41364,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1919
"__id__": 1917
},
"_id": ""
},

2361
assets/10001/prefab/TeenPattieSettingGame.prefab

File diff suppressed because it is too large

BIN
assets/10001/res/game/pop/beishu_bg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/10001/res/game/pop/beishu_bg1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

BIN
assets/10001/res/game/pop/beishu_light.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

134
assets/10001/res/game/pop/beishu_light.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "80614a1e-7ade-4594-95ef-ec22abb705bb",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "80614a1e-7ade-4594-95ef-ec22abb705bb@6c48a",
"displayName": "beishu_light",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "80614a1e-7ade-4594-95ef-ec22abb705bb",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "80614a1e-7ade-4594-95ef-ec22abb705bb@f9941",
"displayName": "beishu_light",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 241,
"height": 243,
"rawWidth": 241,
"rawHeight": 243,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-120.5,
-121.5,
0,
120.5,
-121.5,
0,
-120.5,
121.5,
0,
120.5,
121.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
243,
241,
243,
0,
0,
241,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-120.5,
-121.5,
0
],
"maxPos": [
120.5,
121.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "80614a1e-7ade-4594-95ef-ec22abb705bb@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "80614a1e-7ade-4594-95ef-ec22abb705bb@f9941"
}
}

BIN
assets/10001/res/game/pop/btn__off.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
assets/10001/res/game/pop/btn__on.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
assets/10001/res/game/pop/icon_shengying.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
assets/10001/res/game/pop/icon_yinyue.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

134
assets/10001/res/game/pop/icon_yinyue.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "c9338e88-2f66-44d6-a04d-9b5ecb6bf67e",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "c9338e88-2f66-44d6-a04d-9b5ecb6bf67e@6c48a",
"displayName": "icon_yinyue",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "c9338e88-2f66-44d6-a04d-9b5ecb6bf67e",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "c9338e88-2f66-44d6-a04d-9b5ecb6bf67e@f9941",
"displayName": "icon_yinyue",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 44,
"height": 45,
"rawWidth": 44,
"rawHeight": 45,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-22,
-22.5,
0,
22,
-22.5,
0,
-22,
22.5,
0,
22,
22.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
45,
44,
45,
0,
0,
44,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-22,
-22.5,
0
],
"maxPos": [
22,
22.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "c9338e88-2f66-44d6-a04d-9b5ecb6bf67e@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "c9338e88-2f66-44d6-a04d-9b5ecb6bf67e@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_bg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

134
assets/10001/res/game/pop/pic_bg.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "80634c41-0a53-44e2-9a6c-9bda905ff041",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "80634c41-0a53-44e2-9a6c-9bda905ff041@6c48a",
"displayName": "pic_bg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "80634c41-0a53-44e2-9a6c-9bda905ff041",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "80634c41-0a53-44e2-9a6c-9bda905ff041@f9941",
"displayName": "pic_bg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 721,
"height": 167,
"rawWidth": 721,
"rawHeight": 167,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-360.5,
-83.5,
0,
360.5,
-83.5,
0,
-360.5,
83.5,
0,
360.5,
83.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
167,
721,
167,
0,
0,
721,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-360.5,
-83.5,
0
],
"maxPos": [
360.5,
83.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "80634c41-0a53-44e2-9a6c-9bda905ff041@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "80634c41-0a53-44e2-9a6c-9bda905ff041@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_bg2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

134
assets/10001/res/game/pop/pic_bg2.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "3225f5aa-1a86-46c6-a33f-d494e23fb4da",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "3225f5aa-1a86-46c6-a33f-d494e23fb4da@6c48a",
"displayName": "pic_bg2",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "3225f5aa-1a86-46c6-a33f-d494e23fb4da",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "3225f5aa-1a86-46c6-a33f-d494e23fb4da@f9941",
"displayName": "pic_bg2",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 631,
"height": 167,
"rawWidth": 631,
"rawHeight": 167,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-315.5,
-83.5,
0,
315.5,
-83.5,
0,
-315.5,
83.5,
0,
315.5,
83.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
167,
631,
167,
0,
0,
631,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-315.5,
-83.5,
0
],
"maxPos": [
315.5,
83.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "3225f5aa-1a86-46c6-a33f-d494e23fb4da@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "3225f5aa-1a86-46c6-a33f-d494e23fb4da@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_hu.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 KiB

134
assets/10001/res/game/pop/pic_hu.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "0776520c-9aa6-4c3d-af7a-9d64cdf6cef8",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "0776520c-9aa6-4c3d-af7a-9d64cdf6cef8@6c48a",
"displayName": "pic_hu",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "0776520c-9aa6-4c3d-af7a-9d64cdf6cef8",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "0776520c-9aa6-4c3d-af7a-9d64cdf6cef8@f9941",
"displayName": "pic_hu",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 590,
"height": 357,
"rawWidth": 590,
"rawHeight": 357,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-295,
-178.5,
0,
295,
-178.5,
0,
-295,
178.5,
0,
295,
178.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
357,
590,
357,
0,
0,
590,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-295,
-178.5,
0
],
"maxPos": [
295,
178.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "0776520c-9aa6-4c3d-af7a-9d64cdf6cef8@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "0776520c-9aa6-4c3d-af7a-9d64cdf6cef8@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_kuang.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/10001/res/game/pop/pic_light.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

134
assets/10001/res/game/pop/pic_light.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "fb1ad708-da2f-4b41-92ce-a9c1e69c8338",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "fb1ad708-da2f-4b41-92ce-a9c1e69c8338@6c48a",
"displayName": "pic_light",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "fb1ad708-da2f-4b41-92ce-a9c1e69c8338",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "fb1ad708-da2f-4b41-92ce-a9c1e69c8338@f9941",
"displayName": "pic_light",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 269,
"height": 257,
"rawWidth": 269,
"rawHeight": 257,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-134.5,
-128.5,
0,
134.5,
-128.5,
0,
-134.5,
128.5,
0,
134.5,
128.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
257,
269,
257,
0,
0,
269,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-134.5,
-128.5,
0
],
"maxPos": [
134.5,
128.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "fb1ad708-da2f-4b41-92ce-a9c1e69c8338@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "fb1ad708-da2f-4b41-92ce-a9c1e69c8338@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_light1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

134
assets/10001/res/game/pop/pic_light1.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "24d4bdcf-f36e-4c55-8f43-56077b1dab70",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "24d4bdcf-f36e-4c55-8f43-56077b1dab70@6c48a",
"displayName": "pic_light1",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "24d4bdcf-f36e-4c55-8f43-56077b1dab70",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "24d4bdcf-f36e-4c55-8f43-56077b1dab70@f9941",
"displayName": "pic_light1",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 155,
"height": 225,
"rawWidth": 155,
"rawHeight": 225,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-77.5,
-112.5,
0,
77.5,
-112.5,
0,
-77.5,
112.5,
0,
77.5,
112.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
225,
155,
225,
0,
0,
155,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-77.5,
-112.5,
0
],
"maxPos": [
77.5,
112.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "24d4bdcf-f36e-4c55-8f43-56077b1dab70@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "24d4bdcf-f36e-4c55-8f43-56077b1dab70@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_line.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

134
assets/10001/res/game/pop/pic_line.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "3157132c-b74a-4007-b134-040d2c222e96",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "3157132c-b74a-4007-b134-040d2c222e96@6c48a",
"displayName": "pic_line",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "3157132c-b74a-4007-b134-040d2c222e96",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "3157132c-b74a-4007-b134-040d2c222e96@f9941",
"displayName": "pic_line",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 366,
"height": 2,
"rawWidth": 366,
"rawHeight": 2,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-183,
-1,
0,
183,
-1,
0,
-183,
1,
0,
183,
1,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
2,
366,
2,
0,
0,
366,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-183,
-1,
0
],
"maxPos": [
183,
1,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "3157132c-b74a-4007-b134-040d2c222e96@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "3157132c-b74a-4007-b134-040d2c222e96@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_off.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

134
assets/10001/res/game/pop/pic_off.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "c76a6e0a-19ca-4577-976e-60559bd1b857",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "c76a6e0a-19ca-4577-976e-60559bd1b857@6c48a",
"displayName": "pic_off",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "c76a6e0a-19ca-4577-976e-60559bd1b857",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "c76a6e0a-19ca-4577-976e-60559bd1b857@f9941",
"displayName": "pic_off",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 84,
"height": 39,
"rawWidth": 84,
"rawHeight": 39,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-42,
-19.5,
0,
42,
-19.5,
0,
-42,
19.5,
0,
42,
19.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
39,
84,
39,
0,
0,
84,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-42,
-19.5,
0
],
"maxPos": [
42,
19.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "c76a6e0a-19ca-4577-976e-60559bd1b857@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "c76a6e0a-19ca-4577-976e-60559bd1b857@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_texeIbg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

134
assets/10001/res/game/pop/pic_texeIbg.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "90218927-13a2-44f1-82a1-a36016c01b37",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "90218927-13a2-44f1-82a1-a36016c01b37@6c48a",
"displayName": "pic_texeIbg",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "90218927-13a2-44f1-82a1-a36016c01b37",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "90218927-13a2-44f1-82a1-a36016c01b37@f9941",
"displayName": "pic_texeIbg",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 547,
"height": 167,
"rawWidth": 547,
"rawHeight": 167,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-273.5,
-83.5,
0,
273.5,
-83.5,
0,
-273.5,
83.5,
0,
273.5,
83.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
167,
547,
167,
0,
0,
547,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-273.5,
-83.5,
0
],
"maxPos": [
273.5,
83.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "90218927-13a2-44f1-82a1-a36016c01b37@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "90218927-13a2-44f1-82a1-a36016c01b37@f9941"
}
}

BIN
assets/10001/res/game/pop/pic_text_bg3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

134
assets/10001/res/game/pop/pic_text_bg3.png.meta

@ -1,134 +0,0 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "2cbcdb01-4b11-42e4-8d99-c5a408537200",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "2cbcdb01-4b11-42e4-8d99-c5a408537200@6c48a",
"displayName": "pic_text_bg3",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "2cbcdb01-4b11-42e4-8d99-c5a408537200",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "2cbcdb01-4b11-42e4-8d99-c5a408537200@f9941",
"displayName": "pic_text_bg3",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 179,
"height": 32,
"rawWidth": 179,
"rawHeight": 32,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-89.5,
-16,
0,
89.5,
-16,
0,
-89.5,
16,
0,
89.5,
16,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
32,
179,
32,
0,
0,
179,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-89.5,
-16,
0
],
"maxPos": [
89.5,
16,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "2cbcdb01-4b11-42e4-8d99-c5a408537200@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "2cbcdb01-4b11-42e4-8d99-c5a408537200@f9941"
}
}

12
assets/10001/res/game/setting.meta

@ -0,0 +1,12 @@
{
"ver": "1.1.0",
"importer": "directory",
"imported": true,
"uuid": "2dd75bea-4dbc-4926-a8a0-d360cf144985",
"files": [],
"subMetas": {},
"userData": {
"compressionType": {},
"isRemoteBundle": {}
}
}

3
assets/10001/res/game/setting/auto-atlas.pac

@ -0,0 +1,3 @@
{
"__type__": "cc.SpriteAtlas"
}

36
assets/10001/res/game/setting/auto-atlas.pac.meta

@ -0,0 +1,36 @@
{
"ver": "1.0.8",
"importer": "auto-atlas",
"imported": true,
"uuid": "32c7d0f0-0076-4e6b-93eb-df1304fa2666",
"files": [
".json"
],
"subMetas": {},
"userData": {
"maxWidth": 1024,
"maxHeight": 1024,
"padding": 2,
"allowRotation": true,
"forceSquared": false,
"powerOfTwo": false,
"algorithm": "MaxRects",
"format": "png",
"quality": 80,
"contourBleed": true,
"paddingBleed": true,
"filterUnused": true,
"removeTextureInBundle": true,
"removeImageInBundle": true,
"removeSpriteAtlasInBundle": true,
"compressSettings": {},
"textureSetting": {
"wrapModeS": "repeat",
"wrapModeT": "repeat",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
}
}
}

BIN
assets/10001/res/game/setting/com_pic_tips.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 KiB

56
assets/10001/res/game/pop/beishu_bg1.png.meta → assets/10001/res/game/setting/com_pic_tips.png.meta

@ -2,7 +2,7 @@
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "76d7bab0-5c90-44ae-9c26-35f88efd49ad",
"uuid": "492e7f74-b0db-4cbc-b0be-b83623d71904",
"files": [
".json",
".png"
@ -10,8 +10,8 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "76d7bab0-5c90-44ae-9c26-35f88efd49ad@6c48a",
"displayName": "beishu_bg1",
"uuid": "492e7f74-b0db-4cbc-b0be-b83623d71904@6c48a",
"displayName": "com_pic_tips",
"id": "6c48a",
"name": "texture",
"userData": {
@ -22,7 +22,7 @@
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "76d7bab0-5c90-44ae-9c26-35f88efd49ad",
"imageUuidOrDatabaseUri": "492e7f74-b0db-4cbc-b0be-b83623d71904",
"visible": false
},
"ver": "1.0.22",
@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "76d7bab0-5c90-44ae-9c26-35f88efd49ad@f9941",
"displayName": "beishu_bg1",
"uuid": "492e7f74-b0db-4cbc-b0be-b83623d71904@f9941",
"displayName": "com_pic_tips",
"id": "f9941",
"name": "spriteFrame",
"userData": {
@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 224,
"height": 237,
"rawWidth": 224,
"rawHeight": 237,
"width": 661,
"height": 378,
"rawWidth": 661,
"rawHeight": 378,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-112,
-118.5,
-330.5,
-189,
0,
112,
-118.5,
330.5,
-189,
0,
-112,
118.5,
-330.5,
189,
0,
112,
118.5,
330.5,
189,
0
],
"indexes": [
@ -84,12 +84,12 @@
],
"uv": [
0,
237,
224,
237,
378,
661,
378,
0,
0,
224,
661,
0
],
"nuv": [
@ -103,18 +103,18 @@
1
],
"minPos": [
-112,
-118.5,
-330.5,
-189,
0
],
"maxPos": [
112,
118.5,
330.5,
189,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "76d7bab0-5c90-44ae-9c26-35f88efd49ad@6c48a",
"imageUuidOrDatabaseUri": "492e7f74-b0db-4cbc-b0be-b83623d71904@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
@ -129,6 +129,6 @@
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "76d7bab0-5c90-44ae-9c26-35f88efd49ad@f9941"
"redirect": "492e7f74-b0db-4cbc-b0be-b83623d71904@f9941"
}
}

BIN
assets/10001/res/game/setting/com_pic_tipsdi.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 660 B

134
assets/10001/res/game/setting/com_pic_tipsdi.png.meta

@ -0,0 +1,134 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "66cd1e79-e860-4e8d-abd9-431f70ba6373",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "66cd1e79-e860-4e8d-abd9-431f70ba6373@6c48a",
"displayName": "com_pic_tipsdi",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "66cd1e79-e860-4e8d-abd9-431f70ba6373",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "66cd1e79-e860-4e8d-abd9-431f70ba6373@f9941",
"displayName": "com_pic_tipsdi",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 53,
"height": 50,
"rawWidth": 53,
"rawHeight": 50,
"borderTop": 16,
"borderBottom": 16,
"borderLeft": 17,
"borderRight": 23,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-26.5,
-25,
0,
26.5,
-25,
0,
-26.5,
25,
0,
26.5,
25,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
50,
53,
50,
0,
0,
53,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-26.5,
-25,
0
],
"maxPos": [
26.5,
25,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "66cd1e79-e860-4e8d-abd9-431f70ba6373@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "66cd1e79-e860-4e8d-abd9-431f70ba6373@f9941"
}
}

BIN
assets/10001/res/game/setting/grzx_btn_off.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

56
assets/10001/res/game/pop/beishu_bg.png.meta → assets/10001/res/game/setting/grzx_btn_off.png.meta

@ -2,7 +2,7 @@
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "6d70932a-f06f-426c-ac9f-097fd3790c64",
"uuid": "21936f07-793e-423e-bc17-40011098e2ca",
"files": [
".json",
".png"
@ -10,8 +10,8 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "6d70932a-f06f-426c-ac9f-097fd3790c64@6c48a",
"displayName": "beishu_bg",
"uuid": "21936f07-793e-423e-bc17-40011098e2ca@6c48a",
"displayName": "grzx_btn_off",
"id": "6c48a",
"name": "texture",
"userData": {
@ -22,7 +22,7 @@
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "6d70932a-f06f-426c-ac9f-097fd3790c64",
"imageUuidOrDatabaseUri": "21936f07-793e-423e-bc17-40011098e2ca",
"visible": false
},
"ver": "1.0.22",
@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "6d70932a-f06f-426c-ac9f-097fd3790c64@f9941",
"displayName": "beishu_bg",
"uuid": "21936f07-793e-423e-bc17-40011098e2ca@f9941",
"displayName": "grzx_btn_off",
"id": "f9941",
"name": "spriteFrame",
"userData": {
@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 336,
"height": 150,
"rawWidth": 336,
"rawHeight": 150,
"width": 120,
"height": 41,
"rawWidth": 120,
"rawHeight": 41,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-168,
-75,
-60,
-20.5,
0,
168,
-75,
60,
-20.5,
0,
-168,
75,
-60,
20.5,
0,
168,
75,
60,
20.5,
0
],
"indexes": [
@ -84,12 +84,12 @@
],
"uv": [
0,
150,
336,
150,
41,
120,
41,
0,
0,
336,
120,
0
],
"nuv": [
@ -103,18 +103,18 @@
1
],
"minPos": [
-168,
-75,
-60,
-20.5,
0
],
"maxPos": [
168,
75,
60,
20.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "6d70932a-f06f-426c-ac9f-097fd3790c64@6c48a",
"imageUuidOrDatabaseUri": "21936f07-793e-423e-bc17-40011098e2ca@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
@ -129,6 +129,6 @@
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "6d70932a-f06f-426c-ac9f-097fd3790c64@f9941"
"redirect": "21936f07-793e-423e-bc17-40011098e2ca@f9941"
}
}

BIN
assets/10001/res/game/setting/grzx_btn_on.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

56
assets/10001/res/game/pop/btn__on.png.meta → assets/10001/res/game/setting/grzx_btn_on.png.meta

@ -2,7 +2,7 @@
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "b0e7a6b5-9c47-4efe-82ad-80d3ee21f8dd",
"uuid": "01568581-6769-4e82-b7ad-5987895bf49a",
"files": [
".json",
".png"
@ -10,8 +10,8 @@
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "b0e7a6b5-9c47-4efe-82ad-80d3ee21f8dd@6c48a",
"displayName": "btn__on",
"uuid": "01568581-6769-4e82-b7ad-5987895bf49a@6c48a",
"displayName": "grzx_btn_on",
"id": "6c48a",
"name": "texture",
"userData": {
@ -22,7 +22,7 @@
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "b0e7a6b5-9c47-4efe-82ad-80d3ee21f8dd",
"imageUuidOrDatabaseUri": "01568581-6769-4e82-b7ad-5987895bf49a",
"visible": false
},
"ver": "1.0.22",
@ -34,8 +34,8 @@
},
"f9941": {
"importer": "sprite-frame",
"uuid": "b0e7a6b5-9c47-4efe-82ad-80d3ee21f8dd@f9941",
"displayName": "btn__on",
"uuid": "01568581-6769-4e82-b7ad-5987895bf49a@f9941",
"displayName": "grzx_btn_on",
"id": "f9941",
"name": "spriteFrame",
"userData": {
@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 162,
"height": 39,
"rawWidth": 162,
"rawHeight": 39,
"width": 119,
"height": 38,
"rawWidth": 119,
"rawHeight": 38,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-81,
-19.5,
-59.5,
-19,
0,
81,
-19.5,
59.5,
-19,
0,
-81,
19.5,
-59.5,
19,
0,
81,
19.5,
59.5,
19,
0
],
"indexes": [
@ -84,12 +84,12 @@
],
"uv": [
0,
39,
162,
39,
38,
119,
38,
0,
0,
162,
119,
0
],
"nuv": [
@ -103,18 +103,18 @@
1
],
"minPos": [
-81,
-19.5,
-59.5,
-19,
0
],
"maxPos": [
81,
19.5,
59.5,
19,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "b0e7a6b5-9c47-4efe-82ad-80d3ee21f8dd@6c48a",
"imageUuidOrDatabaseUri": "01568581-6769-4e82-b7ad-5987895bf49a@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
@ -129,6 +129,6 @@
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "b0e7a6b5-9c47-4efe-82ad-80d3ee21f8dd@f9941"
"redirect": "01568581-6769-4e82-b7ad-5987895bf49a@f9941"
}
}

2
assets/10001/src/game/TeenPattieCommData.ts

@ -48,6 +48,8 @@ export class TeenPattieCommData{
public playerThinkCountdown:number = 0;
/**最大强制开牌轮数 */
public maxRoundNum:number = 16;
/**等待倒计时 */
public autoDissolutionCountdown:number = 60
/**比牌玩家牌的数据 胜利方 */

47
assets/10001/src/game/component/TeenPattieSettingGamePanel.ts

@ -8,9 +8,13 @@ const { ccclass, property } = _decorator;
export class TeenPattieSettingGamePanel extends Component {
private closeBtn:Button;
private music:Toggle;
private sound:Toggle;
private shock:Toggle;
private music:Node;
private sound:Node;
private music_off:Node;
private music_on:Node;
private sound_off:Node;
private sound_on:Node;
/**当前是否开启音效 */
private isSound:boolean = true;
@ -19,24 +23,26 @@ export class TeenPattieSettingGamePanel extends Component {
protected onLoad(): void {
this.closeBtn = find("content/closeBtn",this.node)?.getComponent(Button);
this.music = find("content/Layout/music",this.node)?.getComponent(Toggle);
this.sound = find("content/Layout/sound",this.node)?.getComponent(Toggle);
this.shock = find("content/Layout/shock",this.node)?.getComponent(Toggle);
this.music = find("content/Layout/music",this.node);
this.sound = find("content/Layout/sound",this.node);
this.music_off = find("content/Layout/music/grzx_btn_off",this.node);
this.music_on = find("content/Layout/music/grzx_btn_on",this.node);
this.sound_off = find("content/Layout/sound/grzx_btn_off",this.node);
this.sound_on = find("content/Layout/sound/grzx_btn_on",this.node);
this.initEvent();
}
start() {
this.closeBtn?.node?.on(Node.EventType.TOUCH_END,this.onClickCloseBtn,this);
this.music?.node?.on(Node.EventType.TOUCH_END,this.onClickBtnMusic,this);
this.sound?.node?.on(Node.EventType.TOUCH_END,this.onClickBtnSound,this);
this.shock?.node?.on(Node.EventType.TOUCH_END,this.onClickBtnShock,this);
this.music?.on(Node.EventType.TOUCH_END,this.onClickBtnMusic,this);
this.sound?.on(Node.EventType.TOUCH_END,this.onClickBtnSound,this);
}
protected onDestroy(): void {
this.closeBtn?.node?.off(Node.EventType.TOUCH_END,this.onClickCloseBtn,this);
this.music?.node?.off(Node.EventType.TOUCH_END,this.onClickBtnMusic,this);
this.sound?.node?.off(Node.EventType.TOUCH_END,this.onClickBtnSound,this);
this.shock?.node?.off(Node.EventType.TOUCH_END,this.onClickBtnShock,this);
if(this.music && this.music.isValid) this.music?.off(Node.EventType.TOUCH_END,this.onClickBtnMusic,this);
if(this.sound && this.sound.isValid) this.sound?.off(Node.EventType.TOUCH_END,this.onClickBtnSound,this);
}
private initEvent(){
@ -44,8 +50,11 @@ export class TeenPattieSettingGamePanel extends Component {
this.isSound = localStorage.getItem("gameEffect")?.length > 0 && localStorage.getItem("gameEffect")=="true";
this.isSound ? AudioManager.getInstance().setSoundVol(1) : AudioManager.getInstance().setSoundVol(0);
this.isMusic ? AudioManager.getInstance().setMusicVol(1):AudioManager.getInstance().setMusicVol(0);
this.sound.isChecked = this.isSound;
this.music.isChecked = this.isMusic;
this.music_on.active = this.isMusic;
this.music_off.active = !this.isMusic;
this.sound_on.active = this.isSound;
this.sound_off.active = !this.isSound;
}
private onClickCloseBtn(){
@ -57,16 +66,18 @@ export class TeenPattieSettingGamePanel extends Component {
this.isMusic = !this.isMusic;
this.isMusic ? AudioManager.getInstance().setMusicVol(1):AudioManager.getInstance().setMusicVol(0);
localStorage.setItem("gameMusic",this.isMusic.toString());
this.music_on.active = this.isMusic;
this.music_off.active = !this.isMusic;
}
/**点击音效 */
private onClickBtnSound(){
this.isSound = !this.isSound;
this.isSound ? AudioManager.getInstance().setSoundVol(1) : AudioManager.getInstance().setSoundVol(0);
localStorage.setItem("gameEffect",this.isSound.toString());
}
/**点击震动 */
private onClickBtnShock(){
TeenPattieCommData.getInstance().isVibration = true;
this.sound_on.active = this.isSound;
this.sound_off.active = !this.isSound;
}
}

3
assets/10001/src/game/logic/TeenPattieUpLayerLogic.ts

@ -177,7 +177,8 @@ export class TeenPattieUpLayerLogic extends Component {
*/
private waitCountDown:number = 60;
public showMatchTips(status: boolean) {
this.waitCountDown = 60;
this.waitCountDown = TeenPattieCommData.getInstance().autoDissolutionCountdown;
if(!this.waitCountDown) this.waitCountDown = 60;
this.matchTips.active = status;
this.matchTipsLabel.string = Game10001Res.getInstance().getString("game.title.waiting").replace("{0}",`(${this.waitCountDown})`);
}

5
assets/10001/src/game/system/TeenpattieGameProxySystem.ts

@ -12,7 +12,7 @@ import { Game10001Res } from "../../comm/Game10001Res";
export class TeenpattieGameProxySystem extends Component {
/**当前出牌玩家ID */
private currChuPaiId: number;
private chagedIndex:number
private chagedIndex:number;
static upPlayer: TeenPattieUpLayerLogic;
static gameSystem:TeenPattieGameSystem;
@ -107,7 +107,7 @@ export class TeenpattieGameProxySystem extends Component {
return
}
if(value.code != 0){
this.exitTip("game.net.code.status.5")
// this.exitTip("game.net.code.status.5")
return;
}
if(!this.isReconnect) return;
@ -129,6 +129,7 @@ export class TeenpattieGameProxySystem extends Component {
TeenPattieCommData.getInstance().gameBaseBet = value.data.data.curBaseBetNum;
TeenPattieCommData.getInstance().playerThinkCountdown = value.data.data.roomConfig.playerThinkCountdown;
TeenPattieCommData.getInstance().maxRoundNum = value.data.data.roomConfig.maxRoundNum;
TeenPattieCommData.getInstance().autoDissolutionCountdown = value.data.data.roomConfig.autoDissolutionCountdown;
TeenpattieGameProxySystem.gameSystem.clearAllPlayerByData();

2
assets/10001/src/sdk/GameVO.ts

@ -38,7 +38,7 @@ export const UserData = window["UserData"] || {
vipLevel: 0,//VIP等级
gameID:10001,//游戏id
roomID:0,//游戏房价ID
tableID:1,//桌子ID
tableID:10327262,//桌子ID
gameLevel:0,//游戏等级
agentID:1,//代理id
srcRoomId:0,//房间场次ID 初级场/中级场 断线重连回来用这个

Loading…
Cancel
Save