diff --git a/assets/Game/Scripts/SlotBar.ts b/assets/Game/Scripts/SlotBar.ts index 8e10202..8906aef 100644 --- a/assets/Game/Scripts/SlotBar.ts +++ b/assets/Game/Scripts/SlotBar.ts @@ -161,6 +161,7 @@ export class SlotBar extends Component { } updateBalanceMsg(balance: number, isReconnect: boolean, callBack: () => void) { + //中奖后播放totalwin到下一次可以点击的间隔 let time = isReconnect ? 0 : 1; let tw = UIManager.instance.tweenScorelinear(this.getBalance(), balance, time); if (tw !== null) { diff --git a/assets/Game/SlotScene.prefab b/assets/Game/SlotScene.prefab index b272112..5326c33 100644 --- a/assets/Game/SlotScene.prefab +++ b/assets/Game/SlotScene.prefab @@ -18771,7 +18771,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 78, - "height": 80 + "height": 77 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -18807,7 +18807,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "121ac080-4602-4b53-a118-05a3673415d5@f9941", + "__uuid__": "ee594cf5-98ff-4e5f-9739-407bd908140b@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -19036,8 +19036,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 84, - "height": 82 + "width": 83, + "height": 78 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -19073,7 +19073,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@f9941", + "__uuid__": "930fb168-8205-41c8-bafd-13d36487b8bb@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -19172,8 +19172,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87, - "height": 82 + "width": 86, + "height": 78 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -19209,7 +19209,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "e40bb2de-fab3-4374-a24f-477e7109bcb4@f9941", + "__uuid__": "8445313a-84a4-41ab-94e7-aeacf29fcdee@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -19886,8 +19886,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87, - "height": 87 + "width": 76, + "height": 76 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -19923,7 +19923,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "93fdb261-9610-4fe6-8d58-dbc806e0878c@f9941", + "__uuid__": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -20366,7 +20366,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "731e2e63-533b-405e-9924-bc3bf0fe43fd@f9941", + "__uuid__": "898599e1-aea5-4f39-8e3b-ba19d016504d@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -20772,8 +20772,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 88, - "height": 88 + "width": 77, + "height": 77 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -20809,7 +20809,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "507bf745-2f3e-425e-9552-a919a6b76228@f9941", + "__uuid__": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -21252,7 +21252,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@f9941", + "__uuid__": "fb63cd45-5ce1-45a1-a788-c3013eacab31@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, diff --git a/assets/Game/Textures/SlotBar/other/Btn_Close_02.png b/assets/Game/Textures/SlotBar/other/Btn_Close.png similarity index 100% rename from assets/Game/Textures/SlotBar/other/Btn_Close_02.png rename to assets/Game/Textures/SlotBar/other/Btn_Close.png diff --git a/assets/Game/Textures/SlotBar/other/Btn_Close_02.png.meta b/assets/Game/Textures/SlotBar/other/Btn_Close.png.meta similarity index 84% rename from assets/Game/Textures/SlotBar/other/Btn_Close_02.png.meta rename to assets/Game/Textures/SlotBar/other/Btn_Close.png.meta index 31115bd..9711f22 100644 --- a/assets/Game/Textures/SlotBar/other/Btn_Close_02.png.meta +++ b/assets/Game/Textures/SlotBar/other/Btn_Close.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b", + "uuid": "fb63cd45-5ce1-45a1-a788-c3013eacab31", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@6c48a", - "displayName": "Btn_Close_02", + "uuid": "fb63cd45-5ce1-45a1-a788-c3013eacab31@6c48a", + "displayName": "Btn_Close", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b", + "imageUuidOrDatabaseUri": "fb63cd45-5ce1-45a1-a788-c3013eacab31", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@f9941", - "displayName": "Btn_Close_02", + "uuid": "fb63cd45-5ce1-45a1-a788-c3013eacab31@f9941", + "displayName": "Btn_Close", "id": "f9941", "name": "spriteFrame", "userData": { @@ -114,7 +114,7 @@ ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@6c48a", + "imageUuidOrDatabaseUri": "fb63cd45-5ce1-45a1-a788-c3013eacab31@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "0fa889be-0d0a-4158-8c4d-8843a7b00b0b@6c48a" + "redirect": "fb63cd45-5ce1-45a1-a788-c3013eacab31@6c48a" } } diff --git a/assets/Game/Textures/SlotBar/other/Btn_History.png b/assets/Game/Textures/SlotBar/other/Btn_History.png new file mode 100644 index 0000000..da816e7 Binary files /dev/null and b/assets/Game/Textures/SlotBar/other/Btn_History.png differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_History.png.meta b/assets/Game/Textures/SlotBar/other/Btn_History.png.meta new file mode 100644 index 0000000..baa2cae --- /dev/null +++ b/assets/Game/Textures/SlotBar/other/Btn_History.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "1481aa23-7b67-49c8-af7d-bfaff8a291d0", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@6c48a", + "displayName": "Btn_History", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "1481aa23-7b67-49c8-af7d-bfaff8a291d0", + "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": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@f9941", + "displayName": "Btn_History", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0.5, + "offsetY": -0.5, + "trimX": 9, + "trimY": 9, + "width": 77, + "height": 77, + "rawWidth": 94, + "rawHeight": 94, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -38.5, + -38.5, + 0, + 38.5, + -38.5, + 0, + -38.5, + 38.5, + 0, + 38.5, + 38.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 9, + 85, + 86, + 85, + 9, + 8, + 86, + 8 + ], + "nuv": [ + 0.09574468085106383, + 0.0851063829787234, + 0.9148936170212766, + 0.0851063829787234, + 0.09574468085106383, + 0.9042553191489362, + 0.9148936170212766, + 0.9042553191489362 + ], + "minPos": [ + -38.5, + -38.5, + 0 + ], + "maxPos": [ + 38.5, + 38.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "1481aa23-7b67-49c8-af7d-bfaff8a291d0@6c48a" + } +} diff --git a/assets/Game/Textures/SlotBar/other/Btn_History_01.png b/assets/Game/Textures/SlotBar/other/Btn_History_01.png deleted file mode 100644 index 3cadc93..0000000 Binary files a/assets/Game/Textures/SlotBar/other/Btn_History_01.png and /dev/null differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_Paytable.png b/assets/Game/Textures/SlotBar/other/Btn_Paytable.png new file mode 100644 index 0000000..8616feb Binary files /dev/null and b/assets/Game/Textures/SlotBar/other/Btn_Paytable.png differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_History_01.png.meta b/assets/Game/Textures/SlotBar/other/Btn_Paytable.png.meta similarity index 61% rename from assets/Game/Textures/SlotBar/other/Btn_History_01.png.meta rename to assets/Game/Textures/SlotBar/other/Btn_Paytable.png.meta index d10db64..7593fe9 100644 --- a/assets/Game/Textures/SlotBar/other/Btn_History_01.png.meta +++ b/assets/Game/Textures/SlotBar/other/Btn_Paytable.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "507bf745-2f3e-425e-9552-a919a6b76228", + "uuid": "106e4f72-7ee8-4c51-9f6c-02f230a6f427", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "507bf745-2f3e-425e-9552-a919a6b76228@6c48a", - "displayName": "Btn_History_01", + "uuid": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@6c48a", + "displayName": "Btn_Paytable", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "507bf745-2f3e-425e-9552-a919a6b76228", + "imageUuidOrDatabaseUri": "106e4f72-7ee8-4c51-9f6c-02f230a6f427", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "507bf745-2f3e-425e-9552-a919a6b76228@f9941", - "displayName": "Btn_History_01", + "uuid": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@f9941", + "displayName": "Btn_Paytable", "id": "f9941", "name": "spriteFrame", "userData": { @@ -44,10 +44,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 3, - "trimY": 3, - "width": 88, - "height": 88, + "trimX": 9, + "trimY": 9, + "width": 76, + "height": 76, "rawWidth": 94, "rawHeight": 94, "borderTop": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -44, - -44, + -38, + -38, 0, - 44, - -44, + 38, + -38, 0, - -44, - 44, + -38, + 38, 0, - 44, - 44, + 38, + 38, 0 ], "indexes": [ @@ -83,38 +83,38 @@ 3 ], "uv": [ - 3, - 91, - 91, - 91, - 3, - 3, - 91, - 3 + 9, + 85, + 85, + 85, + 9, + 9, + 85, + 9 ], "nuv": [ - 0.031914893617021274, - 0.031914893617021274, - 0.9680851063829787, - 0.031914893617021274, - 0.031914893617021274, - 0.9680851063829787, - 0.9680851063829787, - 0.9680851063829787 + 0.09574468085106383, + 0.09574468085106383, + 0.9042553191489362, + 0.09574468085106383, + 0.09574468085106383, + 0.9042553191489362, + 0.9042553191489362, + 0.9042553191489362 ], "minPos": [ - -44, - -44, + -38, + -38, 0 ], "maxPos": [ - 44, - 44, + 38, + 38, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "507bf745-2f3e-425e-9552-a919a6b76228@6c48a", + "imageUuidOrDatabaseUri": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "507bf745-2f3e-425e-9552-a919a6b76228@6c48a" + "redirect": "106e4f72-7ee8-4c51-9f6c-02f230a6f427@6c48a" } } diff --git a/assets/Game/Textures/SlotBar/other/Btn_Paytable_01.png b/assets/Game/Textures/SlotBar/other/Btn_Paytable_01.png deleted file mode 100644 index f1a3f60..0000000 Binary files a/assets/Game/Textures/SlotBar/other/Btn_Paytable_01.png and /dev/null differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_Quit.png b/assets/Game/Textures/SlotBar/other/Btn_Quit.png new file mode 100644 index 0000000..573b208 Binary files /dev/null and b/assets/Game/Textures/SlotBar/other/Btn_Quit.png differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_Quit_01.png.meta b/assets/Game/Textures/SlotBar/other/Btn_Quit.png.meta similarity index 72% rename from assets/Game/Textures/SlotBar/other/Btn_Quit_01.png.meta rename to assets/Game/Textures/SlotBar/other/Btn_Quit.png.meta index 05a1c92..38cc440 100644 --- a/assets/Game/Textures/SlotBar/other/Btn_Quit_01.png.meta +++ b/assets/Game/Textures/SlotBar/other/Btn_Quit.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "121ac080-4602-4b53-a118-05a3673415d5", + "uuid": "ee594cf5-98ff-4e5f-9739-407bd908140b", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "121ac080-4602-4b53-a118-05a3673415d5@6c48a", - "displayName": "Btn_Quit_01", + "uuid": "ee594cf5-98ff-4e5f-9739-407bd908140b@6c48a", + "displayName": "Btn_Quit", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "121ac080-4602-4b53-a118-05a3673415d5", + "imageUuidOrDatabaseUri": "ee594cf5-98ff-4e5f-9739-407bd908140b", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "121ac080-4602-4b53-a118-05a3673415d5@f9941", - "displayName": "Btn_Quit_01", + "uuid": "ee594cf5-98ff-4e5f-9739-407bd908140b@f9941", + "displayName": "Btn_Quit", "id": "f9941", "name": "spriteFrame", "userData": { @@ -43,11 +43,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, + "offsetY": 0.5, "trimX": 8, - "trimY": 7, + "trimY": 8, "width": 78, - "height": 80, + "height": 77, "rawWidth": 94, "rawHeight": 94, "borderTop": 0, @@ -62,16 +62,16 @@ "vertices": { "rawPosition": [ -39, - -40, + -38.5, 0, 39, - -40, + -38.5, 0, -39, - 40, + 38.5, 0, 39, - 40, + 38.5, 0 ], "indexes": [ @@ -84,37 +84,37 @@ ], "uv": [ 8, - 87, 86, - 87, + 86, + 86, 8, - 7, + 9, 86, - 7 + 9 ], "nuv": [ 0.0851063829787234, - 0.07446808510638298, + 0.09574468085106383, 0.9148936170212766, - 0.07446808510638298, + 0.09574468085106383, 0.0851063829787234, - 0.925531914893617, 0.9148936170212766, - 0.925531914893617 + 0.9148936170212766, + 0.9148936170212766 ], "minPos": [ -39, - -40, + -38.5, 0 ], "maxPos": [ 39, - 40, + 38.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "121ac080-4602-4b53-a118-05a3673415d5@6c48a", + "imageUuidOrDatabaseUri": "ee594cf5-98ff-4e5f-9739-407bd908140b@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "121ac080-4602-4b53-a118-05a3673415d5@6c48a" + "redirect": "ee594cf5-98ff-4e5f-9739-407bd908140b@6c48a" } } diff --git a/assets/Game/Textures/SlotBar/other/Btn_Quit_01.png b/assets/Game/Textures/SlotBar/other/Btn_Quit_01.png deleted file mode 100644 index 8587b41..0000000 Binary files a/assets/Game/Textures/SlotBar/other/Btn_Quit_01.png and /dev/null differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_Rule.png b/assets/Game/Textures/SlotBar/other/Btn_Rule.png new file mode 100644 index 0000000..27795aa Binary files /dev/null and b/assets/Game/Textures/SlotBar/other/Btn_Rule.png differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_Rule_01.png.meta b/assets/Game/Textures/SlotBar/other/Btn_Rule.png.meta similarity index 76% rename from assets/Game/Textures/SlotBar/other/Btn_Rule_01.png.meta rename to assets/Game/Textures/SlotBar/other/Btn_Rule.png.meta index 1e778d6..5225ee5 100644 --- a/assets/Game/Textures/SlotBar/other/Btn_Rule_01.png.meta +++ b/assets/Game/Textures/SlotBar/other/Btn_Rule.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "731e2e63-533b-405e-9924-bc3bf0fe43fd", + "uuid": "898599e1-aea5-4f39-8e3b-ba19d016504d", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "731e2e63-533b-405e-9924-bc3bf0fe43fd@6c48a", - "displayName": "Btn_Rule_01", + "uuid": "898599e1-aea5-4f39-8e3b-ba19d016504d@6c48a", + "displayName": "Btn_Rule", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "731e2e63-533b-405e-9924-bc3bf0fe43fd", + "imageUuidOrDatabaseUri": "898599e1-aea5-4f39-8e3b-ba19d016504d", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "731e2e63-533b-405e-9924-bc3bf0fe43fd@f9941", - "displayName": "Btn_Rule_01", + "uuid": "898599e1-aea5-4f39-8e3b-ba19d016504d@f9941", + "displayName": "Btn_Rule", "id": "f9941", "name": "spriteFrame", "userData": { @@ -43,9 +43,9 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, + "offsetY": -0.5, "trimX": 3, - "trimY": 11, + "trimY": 12, "width": 88, "height": 71, "rawWidth": 94, @@ -84,23 +84,23 @@ ], "uv": [ 3, - 83, + 82, 91, - 83, + 82, 3, - 12, + 11, 91, - 12 + 11 ], "nuv": [ 0.031914893617021274, - 0.1276595744680851, + 0.11702127659574468, 0.9680851063829787, - 0.1276595744680851, + 0.11702127659574468, 0.031914893617021274, - 0.8829787234042553, + 0.8723404255319149, 0.9680851063829787, - 0.8829787234042553 + 0.8723404255319149 ], "minPos": [ -44, @@ -114,7 +114,7 @@ ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "731e2e63-533b-405e-9924-bc3bf0fe43fd@6c48a", + "imageUuidOrDatabaseUri": "898599e1-aea5-4f39-8e3b-ba19d016504d@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "731e2e63-533b-405e-9924-bc3bf0fe43fd@6c48a" + "redirect": "898599e1-aea5-4f39-8e3b-ba19d016504d@6c48a" } } diff --git a/assets/Game/Textures/SlotBar/other/Btn_Rule_01.png b/assets/Game/Textures/SlotBar/other/Btn_Rule_01.png deleted file mode 100644 index 7e9dcec..0000000 Binary files a/assets/Game/Textures/SlotBar/other/Btn_Rule_01.png and /dev/null differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png b/assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png new file mode 100644 index 0000000..ef36eff Binary files /dev/null and b/assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_Paytable_01.png.meta b/assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png.meta similarity index 65% rename from assets/Game/Textures/SlotBar/other/Btn_Paytable_01.png.meta rename to assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png.meta index 7236575..2d06e48 100644 --- a/assets/Game/Textures/SlotBar/other/Btn_Paytable_01.png.meta +++ b/assets/Game/Textures/SlotBar/other/Btn_SoundOFF.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "93fdb261-9610-4fe6-8d58-dbc806e0878c", + "uuid": "8445313a-84a4-41ab-94e7-aeacf29fcdee", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "93fdb261-9610-4fe6-8d58-dbc806e0878c@6c48a", - "displayName": "Btn_Paytable_01", + "uuid": "8445313a-84a4-41ab-94e7-aeacf29fcdee@6c48a", + "displayName": "Btn_SoundOFF", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "93fdb261-9610-4fe6-8d58-dbc806e0878c", + "imageUuidOrDatabaseUri": "8445313a-84a4-41ab-94e7-aeacf29fcdee", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,20 +34,20 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "93fdb261-9610-4fe6-8d58-dbc806e0878c@f9941", - "displayName": "Btn_Paytable_01", + "uuid": "8445313a-84a4-41ab-94e7-aeacf29fcdee@f9941", + "displayName": "Btn_SoundOFF", "id": "f9941", "name": "spriteFrame", "userData": { "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 3, - "trimY": 3, - "width": 87, - "height": 87, + "offsetX": 0, + "offsetY": 0, + "trimX": 4, + "trimY": 8, + "width": 86, + "height": 78, "rawWidth": 94, "rawHeight": 94, "borderTop": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -43.5, - -43.5, + -43, + -39, 0, - 43.5, - -43.5, + 43, + -39, 0, - -43.5, - 43.5, + -43, + 39, 0, - 43.5, - 43.5, + 43, + 39, 0 ], "indexes": [ @@ -83,38 +83,38 @@ 3 ], "uv": [ - 3, - 91, - 90, - 91, - 3, 4, + 86, 90, - 4 + 86, + 4, + 8, + 90, + 8 ], "nuv": [ - 0.031914893617021274, 0.0425531914893617, + 0.0851063829787234, 0.9574468085106383, + 0.0851063829787234, 0.0425531914893617, - 0.031914893617021274, - 0.9680851063829787, + 0.9148936170212766, 0.9574468085106383, - 0.9680851063829787 + 0.9148936170212766 ], "minPos": [ - -43.5, - -43.5, + -43, + -39, 0 ], "maxPos": [ - 43.5, - 43.5, + 43, + 39, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "93fdb261-9610-4fe6-8d58-dbc806e0878c@6c48a", + "imageUuidOrDatabaseUri": "8445313a-84a4-41ab-94e7-aeacf29fcdee@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "93fdb261-9610-4fe6-8d58-dbc806e0878c@6c48a" + "redirect": "8445313a-84a4-41ab-94e7-aeacf29fcdee@6c48a" } } diff --git a/assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png b/assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png deleted file mode 100644 index a164302..0000000 Binary files a/assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png and /dev/null differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png.meta b/assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png.meta deleted file mode 100644 index e03b7b2..0000000 --- a/assets/Game/Textures/SlotBar/other/Btn_SoundOFF_01.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "e40bb2de-fab3-4374-a24f-477e7109bcb4", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "e40bb2de-fab3-4374-a24f-477e7109bcb4@6c48a", - "displayName": "Btn_SoundOFF_01", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "e40bb2de-fab3-4374-a24f-477e7109bcb4", - "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": "e40bb2de-fab3-4374-a24f-477e7109bcb4@f9941", - "displayName": "Btn_SoundOFF_01", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 3, - "trimY": 6, - "width": 87, - "height": 82, - "rawWidth": 94, - "rawHeight": 94, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -43.5, - -41, - 0, - 43.5, - -41, - 0, - -43.5, - 41, - 0, - 43.5, - 41, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 3, - 88, - 90, - 88, - 3, - 6, - 90, - 6 - ], - "nuv": [ - 0.031914893617021274, - 0.06382978723404255, - 0.9574468085106383, - 0.06382978723404255, - 0.031914893617021274, - 0.9361702127659575, - 0.9574468085106383, - 0.9361702127659575 - ], - "minPos": [ - -43.5, - -41, - 0 - ], - "maxPos": [ - 43.5, - 41, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "e40bb2de-fab3-4374-a24f-477e7109bcb4@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "e40bb2de-fab3-4374-a24f-477e7109bcb4@6c48a" - } -} diff --git a/assets/Game/Textures/SlotBar/other/Btn_SoundON.png b/assets/Game/Textures/SlotBar/other/Btn_SoundON.png new file mode 100644 index 0000000..6288f36 Binary files /dev/null and b/assets/Game/Textures/SlotBar/other/Btn_SoundON.png differ diff --git a/assets/Game/Textures/SlotBar/other/Btn_SoundON_01.png.meta b/assets/Game/Textures/SlotBar/other/Btn_SoundON.png.meta similarity index 64% rename from assets/Game/Textures/SlotBar/other/Btn_SoundON_01.png.meta rename to assets/Game/Textures/SlotBar/other/Btn_SoundON.png.meta index 6146a08..df99051 100644 --- a/assets/Game/Textures/SlotBar/other/Btn_SoundON_01.png.meta +++ b/assets/Game/Textures/SlotBar/other/Btn_SoundON.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73", + "uuid": "930fb168-8205-41c8-bafd-13d36487b8bb", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@6c48a", - "displayName": "Btn_SoundON_01", + "uuid": "930fb168-8205-41c8-bafd-13d36487b8bb@6c48a", + "displayName": "Btn_SoundON", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73", + "imageUuidOrDatabaseUri": "930fb168-8205-41c8-bafd-13d36487b8bb", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,20 +34,20 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@f9941", - "displayName": "Btn_SoundON_01", + "uuid": "930fb168-8205-41c8-bafd-13d36487b8bb@f9941", + "displayName": "Btn_SoundON", "id": "f9941", "name": "spriteFrame", "userData": { "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -2, + "offsetX": -1.5, "offsetY": 0, - "trimX": 3, - "trimY": 6, - "width": 84, - "height": 82, + "trimX": 4, + "trimY": 8, + "width": 83, + "height": 78, "rawWidth": 94, "rawHeight": 94, "borderTop": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -42, - -41, + -41.5, + -39, 0, - 42, - -41, + 41.5, + -39, 0, - -42, - 41, + -41.5, + 39, 0, - 42, - 41, + 41.5, + 39, 0 ], "indexes": [ @@ -83,38 +83,38 @@ 3 ], "uv": [ - 3, - 88, + 4, + 86, 87, - 88, - 3, - 6, + 86, + 4, + 8, 87, - 6 + 8 ], "nuv": [ - 0.031914893617021274, - 0.06382978723404255, + 0.0425531914893617, + 0.0851063829787234, 0.925531914893617, - 0.06382978723404255, - 0.031914893617021274, - 0.9361702127659575, + 0.0851063829787234, + 0.0425531914893617, + 0.9148936170212766, 0.925531914893617, - 0.9361702127659575 + 0.9148936170212766 ], "minPos": [ - -42, - -41, + -41.5, + -39, 0 ], "maxPos": [ - 42, - 41, + 41.5, + 39, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@6c48a", + "imageUuidOrDatabaseUri": "930fb168-8205-41c8-bafd-13d36487b8bb@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "type": "sprite-frame", "hasAlpha": true, "fixAlphaTransparencyArtifacts": false, - "redirect": "21e74a46-2d92-4de1-a7a4-6664d9c4fb73@6c48a" + "redirect": "930fb168-8205-41c8-bafd-13d36487b8bb@6c48a" } } diff --git a/assets/Game/Textures/SlotBar/other/Btn_SoundON_01.png b/assets/Game/Textures/SlotBar/other/Btn_SoundON_01.png deleted file mode 100644 index 7f14cc0..0000000 Binary files a/assets/Game/Textures/SlotBar/other/Btn_SoundON_01.png and /dev/null differ